238 files changed, 80819 insertions, 204169 deletions

diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index 3af9d7f3011..f3a5474b217 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -907,6 +907,12 @@ AST_Decl::pragmas (void)
   return this->pd_pragmas;
 }
 
+void
+AST_Decl:: pragmas (UTL_StrList *p)
+{
+  this->pd_pragmas = p;
+}
+
 //Narrowing methods for AST_Decl.
 IMPL_NARROW_METHODS0(AST_Decl)
 IMPL_NARROW_FROM_DECL(AST_Decl)
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
index cbe267930d4..737530b9889 100644
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface.cpp
@@ -906,31 +906,42 @@ void
 AST_Interface::redefine (AST_Interface *from,
                          UTL_StrList *p)
 {
-  this->set_inherits (from->inherits ());
-  this->set_n_inherits (from->n_inherits ());
-  this->set_inherits_flat (from->inherits_flat ());
-  this->set_n_inherits_flat (from->n_inherits_flat ());
-
   // 'this' is the full_definition member of a forward
   // declared interface. 'from' is the actual full
   // definition, which may be in a different scope.
   // Since 'this' will replace 'from' upon returning
   // from here, we have to update the scope now.
-  this->set_defined_in (from->defined_in ());
+  this->set_inherits (from->inherits ());
+  this->set_n_inherits (from->n_inherits ());
+  this->set_inherits_flat (from->inherits_flat ());
+  this->set_n_inherits_flat (from->n_inherits_flat ());
+
+  // If we were forward declared in another file, then forward
+  // declared in this file, then fully defined, there's a
+  // possibility of a cycle in the list of pragma strings. We
+  // want only those pragmas associated with the full definition
+  // anyway, so we just replace the list in this case.
+  if (this->imported ())
+    {
+      this->pragmas (p);
+    }
+  else
+    {
+      // If we are being defined from a forward declaration in 
+      // the same scope (i.e., the same opening of the enclosing
+      // module), the two pragma lists will share the same pointer.
+      // In this case, addition would lead to infinite recursion.
+      if (this->pragmas () != p)
+        {
+          this->add_pragmas (p);
+        }
+    }
 
+  this->set_defined_in (from->defined_in ());
   this->set_imported (idl_global->imported ());
   this->set_in_main_file (idl_global->in_main_file ());
   this->set_line (idl_global->lineno ());
   this->set_file_name (idl_global->filename ());
-
-  // If we are being defined from a forward declaration in 
-  // the same scope (i.e., the same opening of the enclosing
-  // module), the two pragma lists will share the same pointer.
-  // In this case, addition would lead to infinite recursion.
-  if (this->pragmas () != p)
-    {
-      this->add_pragmas (p);
-    }
 }
 
 AST_Interface **
diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
index 649c7544b10..18b235ccd9b 100644
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ b/TAO/TAO_IDL/be/be_decl.cpp
@@ -40,6 +40,7 @@ be_decl::be_decl (void)
     cli_hdr_cdr_op_gen_ (I_FALSE),
     cli_stub_cdr_op_gen_ (I_FALSE),
     cli_inline_cdr_op_gen_ (I_FALSE),
+    cli_inline_cdr_decl_gen_ (I_FALSE),
     flat_name_ (0),
     size_type_ (be_decl::SIZE_UNKNOWN),
     has_constructor_ (I_FALSE)
@@ -633,6 +634,12 @@ be_decl::cli_inline_cdr_op_gen (void)
 }
 
 idl_bool
+be_decl::cli_inline_cdr_decl_gen (void)
+{
+  return this->cli_inline_cdr_decl_gen_;
+}
+
+idl_bool
 be_decl::cli_inline_gen (void)
 {
   return this->cli_inline_gen_;
@@ -712,6 +719,12 @@ be_decl::cli_inline_cdr_op_gen (idl_bool val)
 }
 
 void
+be_decl::cli_inline_cdr_decl_gen (idl_bool val)
+{
+  this->cli_inline_cdr_decl_gen_ = val;
+}
+
+void
 be_decl::cli_inline_gen (idl_bool val)
 {
   this->cli_inline_gen_ = val;
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 8cef8a5cc77..b78aa016229 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -816,3 +816,24 @@ BE_GlobalData::destroy (void)
 {
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Node <be_interface *>;
+template class ACE_Unbounded_Queue <be_interface *>;
+template class ACE_Unbounded_Queue_Iterator <be_interface *>;
+
+template class ACE_Node <be_interface_fwd *>;
+template class ACE_Unbounded_Queue <be_interface_fwd *>;
+template class ACE_Unbounded_Queue_Iterator <be_interface_fwd *>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Node <be_interface *>
+#pragma instantiate ACE_Unbounded_Queue <be_interface *>
+#pragma instantiate ACE_Unbounded_Queue_Iterator <be_interface *>
+
+#pragma instantiate ACE_Node <be_interface_fwd *>
+#pragma instantiate ACE_Unbounded_Queue <be_interface_fwd *>
+#pragma instantiate ACE_Unbounded_Queue_Iterator <be_interface_fwd *>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index a1d7ee8e49b..afd4bc01e02 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -480,14 +480,34 @@ be_interface::gen_def_ctors_helper (be_interface* node,
 }
 
 
+void
+be_interface::gen_stub_ctor (TAO_OutStream *os)
+{
+  // Generate the constructor from stub and servant.
+  if (!this->is_local ())
+    {
+      *os << "ACE_INLINE" << be_nl;
+      *os << this->name () << "::" << this->local_name () << " (" 
+          << be_idt << be_idt_nl 
+          << "TAO_Stub *objref," << be_nl
+          << "CORBA::Boolean _tao_collocated," << be_nl 
+	        << "TAO_Abstract_ServantBase *servant" << be_uidt_nl
+	        << ")" // constructor 
+	        << be_nl;
+      *os << ": CORBA_Object (objref, _tao_collocated, servant)" << be_uidt_nl;
+      *os << "{" << be_idt_nl
+	        << "this->" << this->flat_name () 
+          << "_setup_collocation (_tao_collocated);" << be_uidt_nl;
+      *os << "}" << be_nl << be_nl;
+    }
+}
+
 // Generate the var definition. If <interface_name> is not 0, generate
 // the var defn for that name. Otherwise, do it for the interface you
 // are visiting (this).
 int
 be_interface::gen_var_defn (char *interface_name)
 {
-  TAO_OutStream *ch;           // output stream
-  TAO_NL  nl;                  // end line
   char namebuf [NAMEBUFSIZE];  // names
 
   // Decide which name to use.
@@ -505,7 +525,7 @@ be_interface::gen_var_defn (char *interface_name)
                    "%s_var",
                    interface_name);
 
-  ch = tao_cg->client_header ();
+  TAO_OutStream *ch = tao_cg->client_header ();
 
   // Generate the var definition (always in the client header).
   // Depending upon the data type, there are some differences which we account
@@ -513,62 +533,71 @@ be_interface::gen_var_defn (char *interface_name)
 
   ch->indent (); // start with whatever was our current indent level
   *ch << "class " << be_global->stub_export_macro ()
-      << " " << namebuf << " : public TAO_Base_var" << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
+      << " " << namebuf << " : public TAO_Base_var" << be_nl;
+  *ch << "{" << be_nl;
+  *ch << "public:" << be_idt_nl;
 
   // Default constructor.
-  *ch << namebuf << " (void); // default constructor" << nl;
+  *ch << namebuf << " (void); // default constructor" << be_nl;
   *ch << namebuf << " (" << interface_name << "_ptr p)"
-      << " : ptr_ (p) {} " << nl;
+      << " : ptr_ (p) {} " << be_nl;
 
   // Copy constructor.
   *ch << namebuf << " (const " << namebuf
-      << " &); // copy constructor" << nl;
+      << " &); // copy constructor" << be_nl;
 
   // Destructor.
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
+  *ch << "~" << namebuf << " (void); // destructor" << be_nl;
+  *ch << be_nl;
 
   // Assignment operator from a pointer.
-  *ch << namebuf << " &operator= (" << interface_name << "_ptr);" << nl;
+  *ch << namebuf << " &operator= (" << interface_name << "_ptr);" << be_nl;
 
   // Assignment from _var.
   *ch << namebuf << " &operator= (const " << namebuf <<
-    " &);" << nl;
+    " &);" << be_nl;
 
   // Arrow operator
-  *ch << interface_name << "_ptr operator-> (void) const;" << nl;
-  *ch << nl;
+  *ch << interface_name << "_ptr operator-> (void) const;" << be_nl;
+  *ch << be_nl;
 
   // Other extra types (cast operators, [] operator, and others).
-  *ch << "operator const " << interface_name << "_ptr &() const;" << nl;
-  *ch << "operator " << interface_name << "_ptr &();" << nl;
+  *ch << "operator const " << interface_name << "_ptr &() const;" << be_nl;
+  *ch << "operator " << interface_name << "_ptr &();" << be_nl;
 
-  *ch << "// in, inout, out, _retn " << nl;
+  *ch << "// in, inout, out, _retn " << be_nl;
   // The return types of in, out, inout, and _retn are based on the parameter
   // passing rules and the base type.
-  *ch << interface_name << "_ptr in (void) const;" << nl;
-  *ch << interface_name << "_ptr &inout (void);" << nl;
-  *ch << interface_name << "_ptr &out (void);" << nl;
-  *ch << interface_name << "_ptr _retn (void);" << nl;
+  *ch << interface_name << "_ptr in (void) const;" << be_nl;
+  *ch << interface_name << "_ptr &inout (void);" << be_nl;
+  *ch << interface_name << "_ptr &out (void);" << be_nl;
+  *ch << interface_name << "_ptr _retn (void);" << be_nl;
 
-  // Generate an additional member function that returns
-  // the underlying pointer.
-  *ch << interface_name << "_ptr ptr (void) const;\n";
-  *ch << "\n";
-  ch->decr_indent ();
+  // Generate an additional member function that returns the 
+  // underlying pointer.
+  *ch << interface_name << "_ptr ptr (void) const;" << be_nl << be_nl;
+
+  // Hooks for non-defined forward declared interfaces.
+  *ch << "// Hooks used by template sequence and object manager classes"
+      << be_nl
+      << "// for non-defined forward declared interfaces." << be_nl
+      << "static " << interface_name << "_ptr duplicate ("
+      << interface_name << "_ptr);" << be_nl
+      << "static void release (" << interface_name
+      << "_ptr);" << be_nl
+      << "static " << interface_name << "_ptr nil (void);" << be_nl
+      << "static " << interface_name << "_ptr narrow (CORBA::Object *, "
+      << "CORBA::Environment &);" << be_nl
+      << "static CORBA::Object * upcast (void *);" << be_uidt_nl << be_nl;
 
   // Private.
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << interface_name << "_ptr ptr_;" << nl;
-  *ch << "// Unimplemented - prevents widening assignment." << nl;
-  *ch << interface_name << "_var (const TAO_Base_var &rhs);" << nl;
-  *ch << interface_name << "_var &operator= (const TAO_Base_var &rhs);\n";
-
-  ch->decr_indent ();
+  *ch << "private:" << be_idt_nl;
+  *ch << interface_name << "_ptr ptr_;" << be_nl;
+  *ch << "// Unimplemented - prevents widening assignment." << be_nl;
+  *ch << interface_name << "_var (const TAO_Base_var &rhs);" << be_nl;
+  *ch << interface_name << "_var &operator= (const TAO_Base_var &rhs);" 
+      << be_uidt_nl;
+
   *ch << "};\n\n";
 
   return 0;
@@ -582,8 +611,6 @@ int
 be_interface::gen_var_impl (char *interface_local_name,
                             char *interface_full_name)
 {
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
   char fname [NAMEBUFSIZE];  // to hold the full and
   char lname [NAMEBUFSIZE];  // local _var names
 
@@ -612,165 +639,164 @@ be_interface::gen_var_impl (char *interface_local_name,
                    "%s_var",
                    interface_local_name);
 
-  ci = tao_cg->client_inline ();
+  TAO_OutStream *cs = tao_cg->client_stubs ();
 
   // Generate the var implementation in the inline file
   // Depending upon the data type, there are some differences which we
   // account for over here.
 
-  ci->indent (); // start with whatever was our current indent level
+  cs->indent (); // start with whatever was our current indent level
 
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
+  *cs << "// *************************************************************"
+      << be_nl;
+  *cs << "// Operations for class " << fname << be_nl;
+  *cs << "// *************************************************************\n\n";
 
   // Default constructor.
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname
-      << " (void) // default constructor" << nl;
-  *ci << "  " << ": ptr_ (" << interface_local_name
-      << "::_nil ())" << nl;
-  *ci << "{}\n\n";
+  *cs << fname << "::" << lname
+      << " (void) // default constructor" << be_nl;
+  *cs << "  " << ": ptr_ (" << interface_local_name
+      << "::_nil ())" << be_nl;
+  *cs << "{}" << be_nl << be_nl;
 
   // The additional ptr () member function. This member function must be
   // defined before the remaining member functions including the copy
   // constructor because this inline function is used elsewhere. Hence to make
   // inlining of this function possible, we must define it before its use.
-  ci->indent ();
-  *ci << "ACE_INLINE " << "::" << interface_full_name << "_ptr" << nl;
-  *ci << fname << "::ptr (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
+  *cs << "::" << interface_full_name << "_ptr" << be_nl;
+  *cs << fname << "::ptr (void) const" << be_nl;
+  *cs << "{" << be_idt_nl;
+  *cs << "return this->ptr_;" << be_uidt_nl;
+  *cs << "}" << be_nl << be_nl;
 
   // Copy constructor.
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << "::" << interface_full_name
-      << "_var &p) // copy constructor" << nl;
-  *ci << "  : TAO_Base_var ()," << nl;
-  *ci << "    ptr_ (" << interface_local_name << "::_duplicate (p.ptr ()))" << nl;
-  *ci << "{}\n\n";
+  *cs << fname << "::" << lname << " (const " << "::" << interface_full_name
+      << "_var &p) // copy constructor" << be_nl;
+  *cs << "  : TAO_Base_var ()," << be_nl;
+  *cs << "    ptr_ (" << interface_local_name << "::_duplicate (p.ptr ()))" << be_nl;
+  *cs << "{}" << be_nl << be_nl;
 
   // Destructor.
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
+  *cs << fname << "::~" << lname << " (void) // destructor" << be_nl;
+  *cs << "{" << be_idt_nl;
+  *cs << "CORBA::release (this->ptr_);" << be_uidt_nl;
+  *cs << "}" << be_nl << be_nl;
 
   // Assignment operator.
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << interface_local_name
-      << "_ptr p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
+  *cs << fname << " &" << be_nl;
+  *cs << fname << "::operator= (" << interface_local_name
+      << "_ptr p)" << be_nl;
+  *cs << "{" << be_idt_nl;
+  *cs << "CORBA::release (this->ptr_);" << be_nl;
+  *cs << "this->ptr_ = p;" << be_nl;
+  *cs << "return *this;" << be_uidt_nl;
+  *cs << "}" << be_nl << be_nl;
 
   // Assignment operator from _var.
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const "
-      << "::" << interface_full_name << "_var &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << "::" << interface_full_name
-      << "::_duplicate (p.ptr ());\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
+  *cs << fname << " &" << be_nl;
+  *cs << fname << "::operator= (const "
+      << "::" << interface_full_name << "_var &p)" << be_nl;
+  *cs << "{" << be_idt_nl;
+  *cs << "if (this != &p)" << be_nl;
+  *cs << "{" << be_idt_nl;
+  *cs << "CORBA::release (this->ptr_);" << be_nl;
+  *cs << "this->ptr_ = " << "::" << interface_full_name
+      << "::_duplicate (p.ptr ());" << be_uidt_nl;
+  *cs << "}" << be_nl;
+  *cs << "return *this;" << be_uidt_nl;
+  *cs << "}" << be_nl << be_nl;
 
   // Other extra methods - cast operator ().
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << "::" << interface_full_name
-      << "_ptr &() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << "::" << interface_full_name
-      << "_ptr &() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
+  *cs << fname << "::operator const " << "::" << interface_full_name
+      << "_ptr &() const // cast" << be_nl;
+  *cs << "{" << be_idt_nl;
+  *cs << "return this->ptr_;" << be_uidt_nl;
+  *cs << "}" << be_nl << be_nl;
+
+  *cs << fname << "::operator " << "::" << interface_full_name
+      << "_ptr &() // cast " << be_nl;
+  *cs << "{" << be_idt_nl;
+  *cs << "return this->ptr_;" << be_uidt_nl;
+  *cs << "}" << be_nl << be_nl;
 
   // operator->
-  ci->indent ();
-  *ci << "ACE_INLINE " << "::" << interface_full_name << "_ptr" << nl;
-  *ci << fname << "::operator-> (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
+  *cs << "::" << interface_full_name << "_ptr" << be_nl;
+  *cs << fname << "::operator-> (void) const" << be_nl;
+  *cs << "{" << be_idt_nl;
+  *cs << "return this->ptr_;" << be_uidt_nl;
+  *cs << "}" << be_nl << be_nl;
 
   // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE " << "::" << interface_full_name << "_ptr" << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << "::" << interface_full_name << "_ptr &" << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << "::" << interface_full_name << "_ptr &" << nl;
-  *ci << fname << "::out (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << "::" << interface_full_name
-      << "::_nil ();" << nl;
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << "::" << interface_full_name << "_ptr" << nl;
-  *ci << fname << "::_retn (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// yield ownership of managed obj reference" << nl;
-  *ci << "::" << interface_full_name << "_ptr val = this->ptr_;" << nl;
-  *ci << "this->ptr_ = " << "::" << interface_full_name
-      << "::_nil ();" << nl;
-  *ci << "return val;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
+  *cs << "::" << interface_full_name << "_ptr" << be_nl;
+  *cs << fname << "::in (void) const" << be_nl;
+  *cs << "{" << be_idt_nl;
+  *cs << "return this->ptr_;" << be_uidt_nl;
+  *cs << "}" << be_nl << be_nl;
+
+  *cs << "::" << interface_full_name << "_ptr &" << be_nl;
+  *cs << fname << "::inout (void)" << be_nl;
+  *cs << "{" << be_idt_nl;
+  *cs << "return this->ptr_;" << be_uidt_nl;
+  *cs << "}" << be_nl << be_nl;
+
+  *cs << "::" << interface_full_name << "_ptr &" << be_nl;
+  *cs << fname << "::out (void)" << be_nl;
+  *cs << "{" << be_idt_nl;
+  *cs << "CORBA::release (this->ptr_);" << be_nl;
+  *cs << "this->ptr_ = " << "::" << interface_full_name
+      << "::_nil ();" << be_nl;
+  *cs << "return this->ptr_;" << be_uidt_nl;
+  *cs << "}" << be_nl << be_nl;
+
+  *cs << "::" << interface_full_name << "_ptr" << be_nl;
+  *cs << fname << "::_retn (void)" << be_nl;
+  *cs << "{" << be_idt_nl;
+  *cs << "// yield ownership of managed obj reference" << be_nl;
+  *cs << "::" << interface_full_name << "_ptr val = this->ptr_;" << be_nl;
+  *cs << "this->ptr_ = " << "::" << interface_full_name
+      << "::_nil ();" << be_nl;
+  *cs << "return val;" << be_uidt_nl;
+  *cs << "}" << be_nl << be_nl;
+
+  // Hooks for the global static functions used by non-defined interfaces.
+  *cs << "::" << interface_full_name << "_ptr" << be_nl
+      << fname << "::duplicate ("
+      << interface_local_name << "_ptr p)" << be_nl
+      << "{" << be_idt_nl
+      << "return ::" << interface_full_name << "::_duplicate (p);"
+      << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *cs << "void" << be_nl
+      << fname << "::release (" << interface_local_name << "_ptr p)" << be_nl
+      << "{" << be_idt_nl
+      << "CORBA::release (p);" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *cs << "::" << interface_full_name << "_ptr" << be_nl
+      << fname << "::nil (void)" << be_nl
+      << "{" << be_idt_nl
+      << "return ::" << interface_full_name << "::_nil ();" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *cs << "::" << interface_full_name << "_ptr" << be_nl
+      << fname << "::narrow (" << be_idt << be_idt_nl
+      << "CORBA::Object *p," << be_nl
+      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "return ::" << interface_full_name << "::_narrow (p, ACE_TRY_ENV);"
+      << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *cs << "CORBA::Object *" << be_nl
+      << fname << "::upcast (void *src)" << be_nl
+      << "{" << be_idt_nl
+      << interface_local_name << " **tmp =" << be_idt_nl
+      << "ACE_static_cast (" << interface_local_name << " **, src);" 
+      << be_uidt_nl
+      << "return *tmp;" << be_uidt_nl
+      << "}\n\n";
 
   return 0;
 }
@@ -781,8 +807,6 @@ be_interface::gen_var_impl (char *interface_local_name,
 int
 be_interface::gen_out_defn (char *interface_name)
 {
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
   char namebuf [NAMEBUFSIZE];  // to hold the _out name
 
   // Decide which name to use.
@@ -795,54 +819,50 @@ be_interface::gen_out_defn (char *interface_name)
                    "%s_out",
                    interface_name);
 
-  ch = tao_cg->client_header ();
+  TAO_OutStream *ch = tao_cg->client_header ();
 
   // Generate the out definition (always in the client header)
   // start with whatever was our current indent level.
   ch->indent ();
 
   *ch << "class " << be_global->stub_export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
+      << " " << namebuf << be_nl;
+  *ch << "{" << be_nl;
+  *ch << "public:" << be_idt_nl;
 
   // No default constructor.
 
   // Constructor from a pointer.
-  *ch << namebuf << " (" << interface_name << "_ptr &);" << nl;
+  *ch << namebuf << " (" << interface_name << "_ptr &);" << be_nl;
 
   // Constructor from a _var &.
-  *ch << namebuf << " (" << interface_name << "_var &);" << nl;
+  *ch << namebuf << " (" << interface_name << "_var &);" << be_nl;
 
   // Constructor from a _out &.
-  *ch << namebuf << " (const " << namebuf << " &);" << nl;
+  *ch << namebuf << " (const " << namebuf << " &);" << be_nl;
 
   // Assignment operator from a _out &
-  *ch << namebuf << " &operator= (const " << namebuf << " &);" << nl;
+  *ch << namebuf << " &operator= (const " << namebuf << " &);" << be_nl;
 
   // Assignment operator from a pointer &, cast operator, ptr fn, operator
   // -> and any other extra operators.
   // Only interface allows assignment from var &.
-  *ch << namebuf << " &operator= (const " << interface_name << "_var &);" << nl;
-  *ch << namebuf << " &operator= (" << interface_name << "_ptr);" << nl;
+  *ch << namebuf << " &operator= (const " << interface_name 
+      << "_var &);" << be_nl;
+  *ch << namebuf << " &operator= (" << interface_name << "_ptr);" << be_nl;
 
   // Cast.
-  *ch << "operator " << interface_name << "_ptr &();" << nl;
+  *ch << "operator " << interface_name << "_ptr &();" << be_nl;
 
   // ptr fn
-  *ch << interface_name << "_ptr &ptr (void);" << nl;
+  *ch << interface_name << "_ptr &ptr (void);" << be_nl;
 
   // operator ->
-  *ch << interface_name << "_ptr operator-> (void);" << nl;
+  *ch << interface_name << "_ptr operator-> (void);" << be_uidt_nl << be_nl;
 
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << interface_name << "_ptr &ptr_;\n";
+  *ch << "private:" << be_idt_nl;
+  *ch << interface_name << "_ptr &ptr_;" << be_uidt_nl;
 
-  ch->decr_indent ();
   *ch << "};\n\n";
 
   return 0;
@@ -856,8 +876,6 @@ int
 be_interface::gen_out_impl (char *interface_local_name,
                             char *interface_full_name)
 {
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
   char fname [NAMEBUFSIZE];  // to hold the full and
   char lname [NAMEBUFSIZE];  // local _out names
 
@@ -875,7 +893,7 @@ be_interface::gen_out_impl (char *interface_local_name,
   ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
   ACE_OS::sprintf (lname, "%s_out", interface_local_name);
 
-  ci = tao_cg->client_inline ();
+  TAO_OutStream *ci = tao_cg->client_stubs ();
 
   // Generate the var implementation in the inline file
   // Depending upon the data type, there are some differences which we account
@@ -885,113 +903,85 @@ be_interface::gen_out_impl (char *interface_local_name,
   ci->indent ();
 
   *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
+      << be_nl;
+  *ci << "// Inline operations for class " << fname << be_nl;
+  *ci << "// *************************************************************"
+      << be_nl << be_nl;
 
       // Constructor from a _ptr.
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
   *ci << fname << "::" << lname << " ("  << interface_local_name
-      << "_ptr &p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
+      << "_ptr &p)" << be_nl;
+  *ci << "  : ptr_ (p)" << be_nl;
+  *ci << "{" << be_idt_nl;
   *ci << "this->ptr_ = " << "::" << interface_full_name
-      << "::_nil ();\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
+      << "::_nil ();" << be_uidt_nl;
+  *ci << "}" << be_nl << be_nl;
 
   // Constructor from _var &.
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
   *ci << fname << "::" << lname << " (" << interface_local_name
-      << "_var &p) // constructor from _var" << nl;
-  *ci << "  : ptr_ (p.out ())" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
+      << "_var &p) // constructor from _var" << be_nl;
+  *ci << "  : ptr_ (p.out ())" << be_nl;
+  *ci << "{" << be_idt_nl;
+  *ci << "CORBA::release (this->ptr_);" << be_nl;
   *ci << "this->ptr_ = " << "::" << interface_full_name
-      << "::_nil ();\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
+      << "::_nil ();" << be_uidt_nl;
+  *ci << "}" << be_nl << be_nl;
 
   // Copy constructor.
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
   *ci << fname << "::" << lname << " (const " << "::" << interface_full_name
-      << "_out &p) // copy constructor" << nl;
+      << "_out &p) // copy constructor" << be_nl;
   *ci << "  : ptr_ (ACE_const_cast (" << interface_local_name
-      << "_out &, p).ptr_)" << nl;
-  *ci << "{}\n\n";
+      << "_out &, p).ptr_)" << be_nl;
+  *ci << "{}" << be_nl << be_nl;
 
   // Assignment operator from _out &.
-  ci->indent ();
-  *ci << "ACE_INLINE ::" << fname << " &" << nl;
+  *ci << "::" << fname << " &" << be_nl;
   *ci << fname << "::operator= (const " << "::" << interface_full_name
-      << "_out &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
+      << "_out &p)" << be_nl;
+  *ci << "{" << be_idt_nl;
   *ci << "this->ptr_ = ACE_const_cast (" << interface_local_name
-      << "_out&, p).ptr_;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
+      << "_out&, p).ptr_;" << be_nl;
+  *ci << "return *this;" << be_uidt_nl;
+  *ci << "}" << be_nl << be_nl;
 
   // Assignment operator from _var.
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
+  *ci << fname << " &" << be_nl;
   *ci << fname << "::operator= (const " << "::" << interface_full_name
-      << "_var &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
+      << "_var &p)" << be_nl;
+  *ci << "{" << be_idt_nl;
   *ci << "this->ptr_ = " << "::" << interface_full_name
-      << "::_duplicate (p.ptr ());" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
+      << "::_duplicate (p.ptr ());" << be_nl;
+  *ci << "return *this;" << be_uidt_nl;
+  *ci << "}" << be_nl << be_nl;
 
   // Assignment operator from _ptr.
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
+  *ci << fname << " &" << be_nl;
   *ci << fname << "::operator= (" << interface_local_name
-      << "_ptr p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
+      << "_ptr p)" << be_nl;
+  *ci << "{" << be_idt_nl;
+  *ci << "this->ptr_ = p;" << be_nl;
+  *ci << "return *this;" << be_uidt_nl;
+  *ci << "}" << be_nl << be_nl;
 
   // Other extra methods - cast operator ().
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
   *ci << fname << "::operator " << "::" << interface_full_name
-      << "_ptr &() // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
+      << "_ptr &() // cast" << be_nl;
+  *ci << "{" << be_idt_nl;
+  *ci << "return this->ptr_;" << be_uidt_nl;
+  *ci << "}" << be_nl << be_nl;
 
   // ptr function.
-  ci->indent ();
-  *ci << "ACE_INLINE " << "::" << interface_full_name << "_ptr &" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
+  *ci << "::" << interface_full_name << "_ptr &" << be_nl;
+  *ci << fname << "::ptr (void) // ptr" << be_nl;
+  *ci << "{" << be_idt_nl;
+  *ci << "return this->ptr_;" << be_uidt_nl;
+  *ci << "}" << be_nl << be_nl;
 
   // operator->
-  ci->indent ();
-  *ci << "ACE_INLINE " << "::" << interface_full_name << "_ptr" << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
+  *ci << "::" << interface_full_name << "_ptr" << be_nl;
+  *ci << fname << "::operator-> (void)" << be_nl;
+  *ci << "{" << be_idt_nl;
+  *ci << "return this->ptr_;" << be_uidt_nl;
   *ci << "}\n\n";
 
   return 0;
@@ -2430,13 +2420,3 @@ IMPL_NARROW_METHODS3 (be_interface, AST_Interface, be_scope, be_type)
 IMPL_NARROW_FROM_DECL (be_interface)
 IMPL_NARROW_FROM_SCOPE (be_interface)
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node <be_interface*>;
-template class ACE_Unbounded_Queue <be_interface*>;
-template class ACE_Unbounded_Queue_Iterator <be_interface*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Node<be_interface*>
-#pragma instantiate ACE_Unbounded_Queue<be_interface*>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<be_interface*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/TAO_IDL/be/be_interface_fwd.cpp b/TAO/TAO_IDL/be/be_interface_fwd.cpp
index 4a1489c2859..fa14d82cbb8 100644
--- a/TAO/TAO_IDL/be/be_interface_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_interface_fwd.cpp
@@ -49,497 +49,6 @@ be_interface_fwd::~be_interface_fwd (void)
 {
 }
 
-// Generate the var definition.
-int
-be_interface_fwd::gen_var_defn (char *)
-{
-  TAO_OutStream *ch = 0;
-  TAO_NL nl;      
-  char namebuf [NAMEBUFSIZE]; 
-
-  ACE_OS::memset (namebuf, 
-                  '\0', 
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (namebuf, 
-                   "%s_var", 
-                   this->local_name ()->get_string ());
-
-  ch = tao_cg->client_header ();
-
-  // Generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  // Start with whatever was our current indent level.
-  ch->indent (); 
-  *ch << "class " << be_global->stub_export_macro ()
-      << " " << namebuf << " : public TAO_Base_var" << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // Default constructor.
-  *ch << namebuf << " (void); // default constructor" << nl;
-  *ch << namebuf << " (" << this->local_name () << "_ptr p)" 
-      << " : ptr_ (p) {} " << nl;
-
-  // Copy constructor.
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-
-  // Destructor.
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-
-  // Assignment operator from a pointer.
-  *ch << namebuf << " &operator= (" << this->local_name () 
-      << "_ptr);" << nl;
-
-  // Assignment from _var.
-  *ch << namebuf << " &operator= (const " << namebuf <<
-    " &);" << nl;
-
-  // Arrow operator.
-  *ch << this->local_name () << "_ptr operator-> (void) const;" << nl;
-
-  *ch << nl;
-
-  // Other extra types (cast operators, [] operator, and others).
-  *ch << "operator const " << this->local_name () 
-      << "_ptr &() const;" << nl;
-  *ch << "operator " << this->local_name () << "_ptr &();" << nl;
-
-  *ch << "// in, inout, out, _retn " << nl;
-  // The return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type.
-  *ch << this->local_name () << "_ptr in (void) const;" << nl;
-  *ch << this->local_name () << "_ptr &inout (void);" << nl;
-  *ch << this->local_name () << "_ptr &out (void);" << nl;
-  *ch << this->local_name () << "_ptr _retn (void);" << nl;
-
-  // Generate an additional member function that returns the 
-  // underlying pointer.
-  *ch << this->local_name () << "_ptr ptr (void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // Private.
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << this->local_name () << "_ptr ptr_;" << nl;
-  *ch << "// Unimplemented - prevents widening assignment." << nl;
-  *ch << this->local_name () << "_var (const TAO_Base_var &rhs);" << nl;
-  *ch << this->local_name () << "_var &operator= (const TAO_Base_var &rhs);\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-// Implementation of the _var class. All of these get generated in the inline
-// file.
-int
-be_interface_fwd::gen_var_impl (char *, 
-                                char *)
-{
-  TAO_OutStream *ci = 0;
-  TAO_NL nl;
-  char fname [NAMEBUFSIZE];  // To hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names.
-
-  ACE_OS::memset (fname, 
-                  '\0', 
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (fname, 
-                   "%s_var", 
-                   this->full_name ());
-
-  ACE_OS::memset (lname, 
-                  '\0', 
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (lname, 
-                   "%s_var", 
-                   this->local_name ()->get_string ());
-
-  ci = tao_cg->client_inline ();
-
-  // Generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  // Start with whatever was our current indent level.
-  ci->indent ();
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // Default constructor.
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "  " << ": ptr_ (" << this->name () << "::_nil ())" << nl;
-  *ci << "{}\n\n";
-
-  // The additional ptr () member function. This member function must be
-  // defined before the remaining member functions including the copy
-  // constructor because this inline function is used elsewhere. Hence to make
-  // inlining of this function possible, we must define it before its use.
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr " << nl;
-  *ci << fname << "::ptr (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // Copy constructor.
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "  : TAO_Base_var ()," << nl;
-  *ci << "    ptr_ (" << this->local_name () << "::_duplicate (p.ptr ()))" << nl;
-  *ci << "{}\n\n";
-
-  // Destructor.
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // Assignment operator.
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    "_ptr p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // Assignment operator from _var.
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << this->name () 
-      << "::_duplicate (p.ptr ());\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // Other extra methods - cast operator ().
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << this->name () <<
-    "_ptr &() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () 
-      << "_ptr &() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator->
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr " << nl;
-  *ci << fname << "::operator-> (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr" << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr &" << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr &" << nl;
-  *ci << fname << "::out (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();" << nl;
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr " << nl;
-  *ci << fname << "::_retn (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// yield ownership of managed obj reference" << nl;
-  *ci << this->name () << "_ptr val = this->ptr_;" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();" << nl;
-  *ci << "return val;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-// Generate the _out definition.
-int
-be_interface_fwd::gen_out_defn (char *)
-{
-  TAO_OutStream *ch;
-  TAO_NL  nl;
-  char namebuf [NAMEBUFSIZE];
-
-  ACE_OS::memset (namebuf, 
-                  '\0', 
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (namebuf, 
-                   "%s_out", 
-                   this->local_name ()->get_string ());
-
-  ch = tao_cg->client_header ();
-
-  // Generate the out definition (always in the client header)
-  ch->indent (); // start with whatever was our current indent level.
-
-  *ch << "class " << be_global->stub_export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // No default constructor
-
-  // Constructor from a pointer.
-  *ch << namebuf << " (" << this->local_name () << "_ptr &);" << nl;
-
-  // Constructor from a _var &.
-  *ch << namebuf << " (" << this->local_name () << "_var &);" << nl;
-
-  // Constructor from a _out &.
-  *ch << namebuf << " (const " << namebuf << " &);" << nl;
-
-  // Assignment operator from a _out &.
-  *ch << namebuf << " &operator= (const " << namebuf << " &);" << nl;
-
-  // Assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators.
-  // Only interface allows assignment from var &.
-  *ch << namebuf << " &operator= (const " 
-      << this->local_name () << "_var &);" << nl;
-  *ch << namebuf << " &operator= (" 
-      << this->local_name () << "_ptr);" << nl;
-
-  // cast
-  *ch << "operator " << this->local_name () << "_ptr &();" << nl;
-
-  // ptr fn
-  *ch << this->local_name () << "_ptr &ptr (void);" << nl;
-
-  // operator ->
-  *ch << this->local_name () << "_ptr operator-> (void);" << nl;
-
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << this->local_name () << "_ptr &ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-int
-be_interface_fwd::gen_out_impl (char *, char *)
-{
-  TAO_OutStream *ci = 0;
-  TAO_NL nl;
-  char fname [NAMEBUFSIZE];  // To hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names.
-
-  ACE_OS::memset (fname, 
-                  '\0', 
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (fname, 
-                   "%s_out", 
-                   this->full_name ());
-
-  ACE_OS::memset (lname, 
-                  '\0', 
-                  NAMEBUFSIZE);
-
-  ACE_OS::sprintf (lname, 
-                   "%s_out", 
-                   this->local_name ()->get_string ());
-
-  ci = tao_cg->client_inline ();
-
-  // Generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  // Start with whatever was our current indent level.
-  ci->indent ();
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-      // Constructor from a _ptr.
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" 
-      << this->name () << "_ptr &p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // Constructor from _var &.
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
-  *ci << "  : ptr_ (p.out ())" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // Copy constructor.
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (ACE_const_cast (" << fname
-      << "&,p).ptr_)" << nl;
-  *ci << "{}\n\n";
-
-  // Assignment operator from _out &.
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = ACE_const_cast (" << fname << "&,p).ptr_;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // Assignment operator from _var.
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << this->name () <<
-    "_var &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () 
-      << "::_duplicate (p.ptr ());" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // Assignment operator from _ptr.
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    "_ptr p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // Other extra methods - cast operator ().
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    "_ptr &() // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // ptr function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr &" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator->
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr " << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
 void
 be_interface_fwd::destroy (void)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/post_invoke_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/post_invoke_cs.cpp
index 114c6d7a992..5ea660064ca 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/post_invoke_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/post_invoke_cs.cpp
@@ -75,7 +75,7 @@ be_visitor_args_post_invoke_cs::visit_argument (be_argument *node)
 }
 
 int
-be_visitor_args_post_invoke_cs::visit_interface (be_interface *)
+be_visitor_args_post_invoke_cs::visit_interface (be_interface *node)
 {
   // we must narrow the out object reference to the appropriate type
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
@@ -86,10 +86,16 @@ be_visitor_args_post_invoke_cs::visit_interface (be_interface *)
     {
     case AST_Argument::dir_INOUT:
       {
-        os->indent ();
-        // assign the narrowed obj reference
-        *os << "CORBA::release (" << arg->local_name ()
-            << ");\n";
+        // Assign the narrowed obj reference.
+        if (node->is_defined ())
+          {
+            *os << "CORBA::release (" << arg->local_name () << ");" << be_nl;
+          }
+        else
+          {
+            *os << "tao_" << node->flat_name () << "_release (" 
+                << arg->local_name () << ");" << be_nl;
+          }
       }
       break;
     default:
@@ -99,7 +105,7 @@ be_visitor_args_post_invoke_cs::visit_interface (be_interface *)
 }
 
 int
-be_visitor_args_post_invoke_cs::visit_interface_fwd (be_interface_fwd *)
+be_visitor_args_post_invoke_cs::visit_interface_fwd (be_interface_fwd *node)
 {
   // we must narrow the out object reference to the appropriate type
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
@@ -110,10 +116,16 @@ be_visitor_args_post_invoke_cs::visit_interface_fwd (be_interface_fwd *)
     {
     case AST_Argument::dir_INOUT:
       {
-        os->indent ();
-        // assign the narrowed obj reference
-        *os << "CORBA::release (" << arg->local_name ()
-            << ");\n";
+        // Assign the narrowed obj reference.
+        if (node->full_definition ()->is_defined ())
+          {
+            *os << "CORBA::release (" << arg->local_name () << ");" << be_nl;
+          }
+        else
+          {
+            *os << "tao_" << node->flat_name () << "_release (" 
+                << arg->local_name () << ");" << be_nl;
+          }
       }
       break;
     default:
diff --git a/TAO/TAO_IDL/be/be_visitor_factory.cpp b/TAO/TAO_IDL/be/be_visitor_factory.cpp
index e047b3d8f74..b01abaaa357 100644
--- a/TAO/TAO_IDL/be/be_visitor_factory.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_factory.cpp
@@ -259,6 +259,8 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_interface_fwd_cdr_op_ci (new_ctx);
     case TAO_CodeGen::TAO_INTERFACE_FWD_CDR_OP_CS:
       return new be_visitor_decl (new_ctx); // noop
+    case TAO_CodeGen::TAO_INTERFACE_FWD_ANY_OP_CH:
+      return new be_visitor_interface_fwd_any_op_ch (new_ctx);
 
 #   ifdef IDL_HAS_VALUETYPE
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ci.cpp
index d87d5530af8..f8701d4e073 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ci.cpp
@@ -44,48 +44,57 @@ be_visitor_interface_cdr_op_ci::~be_visitor_interface_cdr_op_ci (void)
 int
 be_visitor_interface_cdr_op_ci::visit_interface (be_interface *node)
 {
-  // already generated and/or we are imported. Don't do anything.
-  // No CDR operations for locality constraint interfaces.
-  if (node->cli_inline_cdr_op_gen () ||
-      node->imported () ||
-      node->is_local ())
-    return 0;
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // First generate code for our children. The reason we do this first is
-  // because the inlined code for our children must be available before we use
-  // it in our parent, but we must forward declare the parent
-  // operators, so code like this:
-  //
-  // // IDL
-  // interface Foo {
-  //   exception Bar {Foo foo_member; };
-  // };
-  //
-  // can work properly (the Foo::Bar operators need the Foo operators
-  // defined).
-  //
-
-  // generate the CDR << and >> operator declarations
-  os->indent ();
-  *os << "ACE_INLINE CORBA::Boolean" << be_nl
-      << "operator<< (" << be_idt << be_idt_nl
-      << "TAO_OutputCDR &," << be_nl
-      << "const " << node->full_name () << "_ptr" << be_uidt_nl
-      << ");" << be_uidt_nl;
-  *os << "ACE_INLINE CORBA::Boolean" << be_nl
-      << "operator>> (" << be_idt << be_idt_nl
-      << "TAO_InputCDR &," << be_nl
-      << node->full_name () << "_ptr &" << be_uidt_nl
-      << ");" << be_uidt << "\n\n";
-
-  // Now it really the type to generate the operators for the members
-  // of the interface...
-
-  // set the substate as generating code for the types defined in our scope
-  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_SCOPE);
-  // all we have to do is to visit the scope and generate code
+  // Already generated and/or we are imported. Don't do anything.
+  // No CDR operations for locality constrained interfaces.
+  if (node->cli_inline_cdr_op_gen ()
+      || node->imported () 
+      || node->is_local ())
+    {
+      return 0;
+    }
+
+  if (! node->cli_inline_cdr_decl_gen ())
+    {
+      TAO_OutStream *os = this->ctx_->stream ();
+
+      // First generate code for our children. The reason we do this first is
+      // because the inlined code for our children must be available before
+      // it in our parent, but we must forward declare the parent
+      // we use operators, so code like this:
+      //
+      // // IDL
+      // interface Foo {
+      //   exception Bar {Foo foo_member; };
+      // };
+      //
+      // can work properly (the Foo::Bar operators need the Foo operators
+      // defined).
+      //
+
+      // Generate the CDR << and >> operator declarations.
+      os->indent ();
+      *os << be_global->stub_export_macro () 
+          << " CORBA::Boolean operator<< (" 
+          << be_idt << be_idt_nl
+          << "TAO_OutputCDR &," << be_nl
+          << "const " << node->full_name () << "_ptr" << be_uidt_nl
+          << ");" << be_uidt_nl << be_nl;
+
+      *os << be_global->stub_export_macro () 
+          << " CORBA::Boolean operator>> (" 
+          << be_idt << be_idt_nl
+          << "TAO_InputCDR &," << be_nl
+          << node->full_name () << "_ptr &" << be_uidt_nl
+          << ");" << be_uidt << "\n\n";
+
+      node->cli_inline_cdr_decl_gen (1);
+    }
+
+  // Set the substate as generating code for the types defined in our scope.
+  this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_SCOPE);
+
+  // All we have to do is to visit the scope and generate code.
+  // CDR operators for the interface itself are generated in the .cpp file.
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -94,54 +103,6 @@ be_visitor_interface_cdr_op_ci::visit_interface (be_interface *node)
                          "codegen for scope failed\n"), -1);
     }
 
-  //  set the sub state as generating code for the output operator
-  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
-  // @@ TODO don't use the IIOP interpreter here, we should use << and
-  // >> operators, or even the operator for the base CORBA::Object!!
-  *os << "ACE_INLINE CORBA::Boolean" << be_nl
-      << "operator<< (" << be_idt << be_idt_nl
-      << "TAO_OutputCDR &strm," << be_nl
-      << "const " << node->full_name () << "_ptr _tao_objref" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-  *os << "CORBA::Object_ptr _tao_corba_obj = _tao_objref;" << be_nl;
-  *os << "return (strm << _tao_corba_obj);" << be_uidt_nl
-      << "}\n\n";
-
-  // set the substate as generating code for the input operator
-  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
-  // @@ TODO don't use the IIOP interpreter here, we should use << and
-  // >> operators, or even the operator for the base CORBA::Object!!
-  *os << "ACE_INLINE CORBA::Boolean" << be_nl
-      << "operator>> (" << be_idt << be_idt_nl
-      << "TAO_InputCDR &strm," << be_nl
-      << node->full_name () << "_ptr &_tao_objref" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-  // hand over to the TAO's internal marshaling engine
-  *os << "ACE_TRY_NEW_ENV" << be_nl
-      << "{" << be_idt_nl;
-  *os << "CORBA::Object_var obj;" << be_nl;
-  *os << "if ((strm >> obj.inout ()) == 0)" << be_idt_nl
-      << "return 0;" << be_uidt_nl
-      << "// narrow to the right type" << be_nl;
-  *os << "_tao_objref =" << be_idt_nl
-      << node->full_name () << "::_unchecked_narrow ("
-      << be_idt << be_idt_nl
-      << "obj.in ()," << be_nl
-      << "ACE_TRY_ENV" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl;
-  *os << "ACE_TRY_CHECK;" << be_nl;
-  *os << "return 1;" << be_uidt_nl;
-  *os << "}" << be_nl
-      << "ACE_CATCHANY" << be_nl
-      << "{" << be_idt_nl
-      << "// do nothing" << be_uidt_nl
-      << "}" << be_nl
-      << "ACE_ENDTRY;" << be_nl
-      << "return 0;" << be_uidt_nl;
-  *os << "}\n\n";
-
   node->cli_inline_cdr_op_gen (1);
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
index 257b38b44f9..da043c51de2 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
@@ -41,14 +41,16 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
 {
   // No CDR operations for local interfaces.
   // already generated and/or we are imported. Don't do anything.
-  if (node->cli_stub_cdr_op_gen () ||
-      node->imported () ||
-      node->is_local ())
-    return 0;
+  if (node->cli_stub_cdr_op_gen () 
+      || node->imported () 
+      || node->is_local ())
+    {
+      return 0;
+    }
 
-  // set the substate as generating code for the types defined in our scope
+  // Set the substate as generating code for the types defined in our scope.
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_SCOPE);
-  // all we have to do is to visit the scope and generate code
+  // Visit the scope and generate code.
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -57,6 +59,51 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
                          "codegen for scope failed\n"), -1);
     }
 
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  //  Set the sub state as generating code for the output operator.
+  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
+
+  *os << "CORBA::Boolean operator<< (" << be_idt << be_idt_nl
+      << "TAO_OutputCDR &strm," << be_nl
+      << "const " << node->full_name () << "_ptr _tao_objref" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl;
+  *os << "CORBA::Object_ptr _tao_corba_obj = _tao_objref;" << be_nl;
+  *os << "return (strm << _tao_corba_obj);" << be_uidt_nl
+      << "}\n\n";
+
+  // Set the substate as generating code for the input operator.
+  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
+
+  *os << "CORBA::Boolean operator>> (" << be_idt << be_idt_nl
+      << "TAO_InputCDR &strm," << be_nl
+      << node->full_name () << "_ptr &_tao_objref" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl;
+  *os << "ACE_TRY_NEW_ENV" << be_nl
+      << "{" << be_idt_nl;
+  *os << "CORBA::Object_var obj;" << be_nl;
+  *os << "if ((strm >> obj.inout ()) == 0)" << be_idt_nl
+      << "return 0;" << be_uidt_nl
+      << "// narrow to the right type" << be_nl;
+  *os << "_tao_objref =" << be_idt_nl
+      << node->full_name () << "::_unchecked_narrow ("
+      << be_idt << be_idt_nl
+      << "obj.in ()," << be_nl
+      << "ACE_TRY_ENV" << be_uidt_nl
+      << ");" << be_uidt << be_uidt_nl;
+  *os << "ACE_TRY_CHECK;" << be_nl;
+  *os << "return 1;" << be_uidt_nl;
+  *os << "}" << be_nl
+      << "ACE_CATCHANY" << be_nl
+      << "{" << be_idt_nl
+      << "// do nothing" << be_uidt_nl
+      << "}" << be_nl
+      << "ACE_ENDTRY;" << be_nl
+      << "return 0;" << be_uidt_nl;
+  *os << "}\n\n";
+
   node->cli_stub_cdr_op_gen (1);
   return 0;
 }
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 fd0cb4a9c76..a029bf221d3 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -43,15 +43,12 @@ be_visitor_interface_ch::~be_visitor_interface_ch (void)
 int
 be_visitor_interface_ch::visit_interface (be_interface *node)
 {
-  TAO_OutStream *os = 0;
+  TAO_OutStream *os = this->ctx_->stream ();
   long i;
 
   // If not already generated and not imported.
   if (!node->cli_hdr_gen () && !node->imported ())
     {
-      // Grab the stream.
-      os = this->ctx_->stream ();
-
       // == STEP 1:  generate the class name and class names we inherit ==
 
       // Generate the ifdefined macro for  the _ptr type.
@@ -99,320 +96,328 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
         }
       // Generate the endif macro.
       os->gen_endif ();
+    }
 
-      // Now the interface definition itself.
-      os->gen_ifdef_macro (node->flat_name ());
+  // The above code could have been executed by the forward declaration
+  // as long as it wasn't imported. The code below can only be 
+  // executed by an interface definition, also non-imported.
+  if (node->imported ())
+    {
+      return 0;
+    }
 
-      if (!node->is_local ())
-        {
-          // Forward class declaration
-          *os << "// Forward Classes Declaration" << be_nl
-              << "class " << node->base_proxy_impl_name () << ";" << be_nl
-              << "class " << node->remote_proxy_impl_name () << ";" << be_nl
-              << "class " << node->base_proxy_broker_name () << ";" << be_nl
-              << "class " << node->remote_proxy_broker_name () << ";" 
-              << be_nl << be_nl;
-        }
-      // Now generate the class definition.
-      *os << "class " << be_global->stub_export_macro ()
-          << " " << node->local_name ();
+  // Now the interface definition itself.
+  os->gen_ifdef_macro (node->flat_name ());
+
+  if (!node->is_local ())
+    {
+      // Forward class declaration
+      *os << "// Forward Classes Declaration" << be_nl
+          << "class " << node->base_proxy_impl_name () << ";" << be_nl
+          << "class " << node->remote_proxy_impl_name () << ";" << be_nl
+          << "class " << node->base_proxy_broker_name () << ";" << be_nl
+          << "class " << node->remote_proxy_broker_name () << ";" 
+          << be_nl << be_nl;
+    }
+  // Now generate the class definition.
+  *os << "class " << be_global->stub_export_macro ()
+      << " " << node->local_name ();
 
-      // If node interface inherits from other interfaces.
-      if (node->n_inherits () > 0)
+  // If node interface inherits from other interfaces.
+  if (node->n_inherits () > 0)
+    {
+      *os << ": ";
+      for (i = 0; i < node->n_inherits (); i++)
         {
-          *os << ": ";
-          for (i = 0; i < node->n_inherits (); i++)
-            {
-              be_interface *inherited =
-                be_interface::narrow_from_decl (node->inherits ()[i]);
+          be_interface *inherited =
+            be_interface::narrow_from_decl (node->inherits ()[i]);
 
-              be_decl *scope = 0;
+          be_decl *scope = 0;
 
-              if (inherited->is_nested ())
-                {
-                  // Inherited node is used in the scope of "node" node
-                  scope =
-                    be_scope::narrow_from_scope (node->defined_in ())->decl ();
-                }
+          if (inherited->is_nested ())
+            {
+              // Inherited node is used in the scope of "node" node
+              scope =
+                be_scope::narrow_from_scope (node->defined_in ())->decl ();
+            }
 
-              *os << "public virtual ";
-              *os << inherited->nested_type_name (scope);
+          *os << "public virtual ";
+          *os << inherited->nested_type_name (scope);
 
-              if (i < node->n_inherits () - 1) 
-                {
-                  // Node has multiple inheritance, so put a comma.
-                  *os << ", ";
-                }
-            }  // end of for loop
+          if (i < node->n_inherits () - 1) 
+            {
+              // Node has multiple inheritance, so put a comma.
+              *os << ", ";
+            }
+        }  // end of for loop
 
-          *os << be_nl;
-        }
-      else
-        {
-          // We do not inherit from anybody, hence we do so from the base
-          // CORBA::Object class.
-          *os << " : public virtual CORBA_Object" << be_nl;
-        }
+      *os << be_nl;
+    }
+  else
+    {
+      // We do not inherit from anybody, hence we do so from the base
+      // CORBA::Object class.
+      *os << " : public virtual CORBA_Object" << be_nl;
+    }
+
+  // Generate the body.
+
+  *os << "{" << be_nl
+      << "public:" << be_nl
+
+      // Generate the _ptr_type and _var_type typedefs
+      // but we must protect against certain versions of g++.
+      << "#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)"
+      << be_idt_nl
+      << "typedef " << node->local_name () << "_ptr _ptr_type;" 
+      << be_nl
+      << "typedef " << node->local_name () << "_var _var_type;" 
+      << be_uidt_nl
+      << "#endif /* ! __GNUC__ || g++ >= 2.8 */\n" << be_idt_nl;
+
+      // Generate the static _duplicate, _narrow, and _nil operations.
+  *os << "// the static operations" << be_nl
+      << "static " << node->local_name () << "_ptr " << "_duplicate ("
+      << node->local_name () << "_ptr obj);" << be_nl
+      << "static " << node->local_name () << "_ptr "
+      << "_narrow (" << be_idt << be_idt_nl
+      << "CORBA::Object_ptr obj," << be_nl
+      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
+      << "TAO_default_environment ()"
+      << be_uidt << be_uidt_nl
+      << ");" << be_uidt_nl;
+
+  // There's no need for an _unchecked_narrow for locality 
+  // constrained object.
+  *os << "static " << node->local_name () << "_ptr "
+      << "_unchecked_narrow (" << be_idt << be_idt_nl
+      << "CORBA::Object_ptr obj," << be_nl
+      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
+      << "TAO_default_environment ()"
+      << be_uidt << be_uidt_nl
+      << ");" << be_uidt_nl;
+
+  // This method is defined in the header file to workaround old
+  // g++ problems.
+  *os << "static " << node->local_name () << "_ptr _nil (void)"
+      << be_idt_nl << "{" << be_idt_nl
+      << "return (" << node->local_name ()
+      << "_ptr)0;" << be_uidt_nl
+      << "}" << be_uidt << "\n\n";
+
+  // No Any operator for local interfaces.
+  if (! node->is_local ())
+    {
+      os->indent ();
+      *os << "static void _tao_any_destructor (void*);\n\n";
+    }
 
-      // Generate the body.
+  // Generate code for the interface definition by traversing thru the
+  // elements of its scope. We depend on the front-end to have made sure
+  // that only legal syntactic elements appear in our scope.
 
-      *os << "{" << be_nl
-          << "public:" << be_nl
+  if (this->visit_scope (node) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_interface_ch::"
+                         "visit_interface - "
+                         "codegen for scope failed\n"), -1);
+    }
 
-          // Generate the _ptr_type and _var_type typedefs
-          // but we must protect against certain versions of g++.
-          << "#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)"
-          << be_idt_nl
-          << "typedef " << node->local_name () << "_ptr _ptr_type;" 
-          << be_nl
-          << "typedef " << node->local_name () << "_var _var_type;" 
-          << be_uidt_nl
-          << "#endif /* ! __GNUC__ || g++ >= 2.8 */\n" << be_idt_nl;
-
-          // Generate the static _duplicate, _narrow, and _nil operations.
-      *os << "// the static operations" << be_nl
-          << "static " << node->local_name () << "_ptr " << "_duplicate ("
-          << node->local_name () << "_ptr obj);" << be_nl
-          << "static " << node->local_name () << "_ptr "
-          << "_narrow (" << be_idt << be_idt_nl
-          << "CORBA::Object_ptr obj," << be_nl
-          << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-          << "TAO_default_environment ()"
-          << be_uidt << be_uidt_nl
-          << ");" << be_uidt_nl;
+  // The _is_a method
+  os->indent ();
 
-      // There's no need for an _unchecked_narrow for locality 
-      // constrained object.
-      *os << "static " << node->local_name () << "_ptr "
-          << "_unchecked_narrow (" << be_idt << be_idt_nl
-          << "CORBA::Object_ptr obj," << be_nl
+  if (! node->is_local ())
+    {
+      *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
+          << "const CORBA::Char *type_id, " << be_nl
           << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
           << "TAO_default_environment ()"
           << be_uidt << be_uidt_nl
-          << ");" << be_uidt_nl;
-
-      // This method is defined in the header file to workaround old
-      // g++ problems.
-      *os << "static " << node->local_name () << "_ptr _nil (void)"
-          << be_idt_nl << "{" << be_idt_nl
-          << "return (" << node->local_name ()
-          << "_ptr)0;" << be_uidt_nl
-          << "}" << be_uidt << "\n\n";
-
-      // No Any operator for local interfaces.
-      if (! node->is_local ())
-        {
-          os->indent ();
-          *os << "static void _tao_any_destructor (void*);\n\n";
-        }
+          << ");" << be_uidt << be_nl;
+    }
 
-      // Generate code for the interface definition by traversing thru the
-      // elements of its scope. We depend on the front-end to have made sure
-      // that only legal syntactic elements appear in our scope.
+  // The _tao_QueryInterface method.
+  *os << "virtual void *_tao_QueryInterface (ptr_arith_t type);"
+      << be_nl << be_nl;
 
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_interface_ch::"
-                             "visit_interface - "
-                             "codegen for scope failed\n"), -1);
-        }
+  // The _interface_repository_id method.
+  *os << "virtual const char* _interface_repository_id (void) const;\n"
+      << be_uidt_nl;
 
-      // The _is_a method
-      os->indent ();
+  if (!node->is_local ())
+    {
+      // Add the Proxy Broker member variable.
+      *os << "private:" << be_idt_nl
+          << node->base_proxy_broker_name () << " *" 
+          << "the" << node->base_proxy_broker_name ()
+          << "_;" << be_nl <<  be_uidt_nl;
+    }
 
-      if (! node->is_local ())
-        {
-          *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
-              << "const CORBA::Char *type_id, " << be_nl
-              << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-              << "TAO_default_environment ()"
-              << be_uidt << be_uidt_nl
-              << ");" << be_uidt << be_nl;
-        }
+  *os << "protected:" << be_idt_nl;
 
-      // The _tao_QueryInterface method.
-      *os << "virtual void *_tao_QueryInterface (ptr_arith_t type);"
-          << be_nl << be_nl;
+  if (!node->is_local ())
+    {
+      // Generate the "protected" constructor so that users cannot
+      // instantiate us.
 
-      // The _interface_repository_id method.
-      *os << "virtual const char* _interface_repository_id (void) const;\n"
-          << be_uidt_nl;
+      *os << node->local_name () << " (int collocated = 0);" 
+          << be_nl << be_nl;
 
-      if (!node->is_local ())
-        {
-          // Add the Proxy Broker member variable.
-          *os << "private:" << be_idt_nl
-              << node->base_proxy_broker_name () << " *" 
-              << "the" << node->base_proxy_broker_name ()
-              << "_;" << be_nl <<  be_uidt_nl;
-        }
+      *os << "protected:" << be_idt_nl
+          << "// This methods travese the inheritance tree and set the" 
+          << be_nl
+          << "// parents piece of the given class in the right mode" 
+          << be_nl
+          << "virtual void " << node->flat_name () 
+          << "_setup_collocation (int collocated);" << be_nl << be_nl;
+    }
+  else
+    {
+      *os << node->local_name () << " ();" << be_nl << be_nl;
+    }
 
-      *os << "protected:" << be_idt_nl;
+  // Local interfaces don't support stub objects.
+  if (! node->is_local ())
+    {
+      *os << node->local_name ()
+          << " (" << be_idt << be_nl << "TAO_Stub *objref, " << be_nl
+          << "CORBA::Boolean _tao_collocated = 0," << be_nl
+          << "TAO_Abstract_ServantBase *servant = 0" <<  be_nl
+          << ");" << be_uidt_nl << be_nl;
+
+      // Friends declarations.
+      *os << "friend class " << node->remote_proxy_impl_name () << ";" 
+          << be_nl
+          << "friend class " << node->thru_poa_proxy_impl_name () << ";" 
+          << be_nl
+          << "friend class " << node->direct_proxy_impl_name () << ";" 
+          << be_uidt_nl << be_nl;
+    }
+  // Protected destructor.
+  *os << "virtual ~" << node->local_name () << " (void);" << be_uidt_nl;
+
+  // private copy constructor and assignment operator. These are not
+  // allowed, hence they are private.
+  *os << "private:" << be_idt_nl;
+  *os << node->local_name () << " (const " 
+      << node->local_name () << " &);"
+      << be_nl
+      << "void operator= (const " << node->local_name () << " &);";
+
+  // Generate the embedded RequestInfo classes per operation.
+  // This is to be used by interceptors.
+  be_visitor *visitor = 0;
+  be_visitor_context ctx (*this->ctx_);
+
+  // Interceptor related classes.
+  ctx.state (TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_CH);
+  visitor = tao_cg->make_visitor (&ctx);
+
+  if (!visitor || (node->accept (visitor) == -1))
+    {
+      delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_interface_ch::"
+                             "visit_interface - "
+                             "codegen for interceptor classes failed\n"),
+                            -1);
+    }
 
-      if (!node->is_local ())
-        {
-          // Generate the "protected" constructor so that users cannot
-          // instantiate us.
-
-          *os << node->local_name () << " (int collocated = 0);" 
-              << be_nl << be_nl;
-
-          *os << "protected:" << be_idt_nl
-              << "// This methods travese the inheritance tree and set the" 
-              << be_nl
-              << "// parents piece of the given class in the right mode" 
-              << be_nl
-              << "virtual void " << node->flat_name () 
-              << "_setup_collocation (int collocated);" << be_nl << be_nl;
-        }
-      else
-        {
-          *os << node->local_name () << " ();" << be_nl << be_nl;
-        }
+  delete visitor;
+  visitor = 0;
 
-      // Local interfaces don't support stub objects.
-      if (! node->is_local ())
-        {
-          *os << node->local_name ()
-              << " (" << be_idt << be_nl << "TAO_Stub *objref, " << be_nl
-              << "CORBA::Boolean _tao_collocated = 0," << be_nl
-              << "TAO_Abstract_ServantBase *servant = 0" <<  be_nl
-              << ");" << be_uidt_nl << be_nl;
-
-          // Friends declarations.
-          *os << "friend class " << node->remote_proxy_impl_name () << ";" 
-              << be_nl
-              << "friend class " << node->thru_poa_proxy_impl_name () << ";" 
-              << be_nl
-              << "friend class " << node->direct_proxy_impl_name () << ";" 
-              << be_uidt_nl << be_nl;
-        }
-      // Protected destructor.
-      *os << "virtual ~" << node->local_name () << " (void);" << be_uidt_nl;
-
-      // private copy constructor and assignment operator. These are not
-      // allowed, hence they are private.
-      *os << "private:" << be_idt_nl;
-      *os << node->local_name () << " (const " 
-          << node->local_name () << " &);"
-          << be_nl
-          << "void operator= (const " << node->local_name () << " &);";
+  ctx = *this->ctx_;
 
-      // Generate the embedded RequestInfo classes per operation.
-      // This is to be used by interceptors.
-      be_visitor *visitor = 0;
-      be_visitor_context ctx (*this->ctx_);
+  *os << be_uidt_nl;
+  *os << "};\n\n";
 
-      // Interceptor related classes.
-      ctx.state (TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_CH);
+  // Don't support smart proxies for local interfaces.
+  if (! node->is_local ())
+    {
+      // Smart Proxy related classes.
+      ctx.state (TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CH);
       visitor = tao_cg->make_visitor (&ctx);
 
       if (!visitor || (node->accept (visitor) == -1))
         {
           delete visitor;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "be_visitor_interface_ch::"
-                                 "visit_interface - "
-                                 "codegen for interceptor classes failed\n"),
-                                -1);
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_interface_ch::"
+                             "visit_interface - "
+                             "codegen for smart proxy classes failed\n"),
+                            -1);
         }
 
       delete visitor;
       visitor = 0;
+    }
 
+  if (!node->is_local ())
+    {
+      // Proxy Implementation Declaration.
+      visitor = 0;
       ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CH);
+      visitor = tao_cg->make_visitor (&ctx);
 
-      *os << be_uidt_nl;
-      *os << "};\n\n";
-
-      // Don't support smart proxies for local interfaces.
-      if (! node->is_local ())
+      if (!visitor || (node->accept (visitor) == -1))
         {
-          // Smart Proxy related classes.
-          ctx.state (TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CH);
-          visitor = tao_cg->make_visitor (&ctx);
-
-          if (!visitor || (node->accept (visitor) == -1))
-            {
-              delete visitor;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "be_visitor_interface_ch::"
-                                 "visit_interface - "
-                                 "codegen for smart proxy classes failed\n"),
-                                -1);
-            }
-
           delete visitor;
-          visitor = 0;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_interface_ch::"
+                             "visit_interface - "
+                             "codegen for Proxy Broker classes failed\n"),
+                            -1);
         }
 
-      if (!node->is_local ())
-        {
-          // Proxy Implementation Declaration.
-          visitor = 0;
-          ctx = *this->ctx_;
-          ctx.state (TAO_CodeGen::TAO_INTERFACE_PROXY_IMPLS_CH);
-          visitor = tao_cg->make_visitor (&ctx);
-
-          if (!visitor || (node->accept (visitor) == -1))
-            {
-              delete visitor;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "be_visitor_interface_ch::"
-                                 "visit_interface - "
-                                 "codegen for Proxy Broker classes failed\n"),
-                                -1);
-            }
+      delete visitor;
+    }
 
-          delete visitor;
-        }
+  if (!node->is_local ())
+    {
+      // Proxy Broker Declaration.
+      visitor = 0;
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CH);
+      visitor = tao_cg->make_visitor (&ctx);
 
-      if (!node->is_local ())
+      if (!visitor || (node->accept (visitor) == -1))
         {
-          // Proxy Broker Declaration.
-          visitor = 0;
-          ctx = *this->ctx_;
-          ctx.state (TAO_CodeGen::TAO_INTERFACE_PROXY_BROKERS_CH);
-          visitor = tao_cg->make_visitor (&ctx);
-
-          if (!visitor || (node->accept (visitor) == -1))
-            {
-              delete visitor;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "be_visitor_interface_ch::"
-                                 "visit_interface - "
-                                 "codegen for Proxy Broker classes failed\n"),
-                                -1);
-            }
-
           delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_interface_ch::"
+                             "visit_interface - "
+                             "codegen for Proxy Broker classes failed\n"),
+                            -1);
         }
 
-      os->gen_endif ();
+      delete visitor;
+    }
 
-      if (! node->is_local ())
-        {
-          // By using a visitor to declare and define the TypeCode, we
-          // have the added advantage to conditionally not generate
-          // any code. This will be based on the command line
-          // options. This is still TO-DO be_visitor *visitor;
-          visitor = 0;
-          ctx.state (TAO_CodeGen::TAO_TYPECODE_DECL);
-          visitor = tao_cg->make_visitor (&ctx);
-          if (!visitor || (node->accept (visitor) == -1))
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_interface_ch::"
-                                 "visit_interface - "
-                                 "TypeCode declaration failed\n"
-                                 ), -1);
-            }
+  os->gen_endif ();
 
+  if (! node->is_local ())
+    {
+      // By using a visitor to declare and define the TypeCode, we
+      // have the added advantage to conditionally not generate
+      // any code. This will be based on the command line
+      // options. This is still TO-DO be_visitor *visitor;
+      visitor = 0;
+      ctx.state (TAO_CodeGen::TAO_TYPECODE_DECL);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (node->accept (visitor) == -1))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_interface_ch::"
+                             "visit_interface - "
+                             "TypeCode declaration failed\n"
+                             ), -1);
         }
 
-      node->cli_hdr_gen (I_TRUE);
-    } // if !cli_hdr_gen
+    }
+
+  node->cli_hdr_gen (I_TRUE);
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
index df7700f4e97..039e77d096c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
@@ -43,7 +43,9 @@ int
 be_visitor_interface_ci::visit_interface (be_interface *node)
 {
   if (node->imported ())
-    return 0;
+    {
+      return 0;
+    }
 
   // Generate inline methods for elements of our scope.
   // This will always be done here for any non-imported node,
@@ -59,50 +61,64 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
 
   // A forward declared interface may have set this flag.
   if (node->cli_inline_gen ())
-    return 0;
+    {
+      return 0;
+    }
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  // Generate the constructor from stub and servant.
-  if (! node->is_local ())
-    {
-      os->gen_ifdef_macro (node->flat_name (), "");
-      *os << "ACE_INLINE" << be_nl
-          << node->name () << "::" << node->local_name () << " ("
-          << be_idt << be_idt_nl
-          << "TAO_Stub *objref," << be_nl
-          << "CORBA::Boolean _tao_collocated," << be_nl
-          << "TAO_Abstract_ServantBase *servant" << be_uidt_nl
-          << ")" << be_nl
-          << ": CORBA_Object (objref, _tao_collocated, servant)" 
-          << be_uidt_nl
-          << "{" << be_idt_nl
-          << "this->" << node->flat_name () 
-          << "_setup_collocation (_tao_collocated);" << be_uidt_nl
-          << "}" << be_nl;
-      os->gen_endif ();
-    }
+  os->gen_ifdef_macro (node->flat_name (), "");
 
-  // generate the ifdefined macro for  the _var type
-  os->gen_ifdef_macro (node->flat_name (), "_var");
-  if (node->gen_var_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_ci::"
-                         "visit_interface - "
-                         "codegen for _var failed\n"), -1);
-    }
-  os->gen_endif ();
+  // Global functions to allow non-defined forward declared interfaces
+  // access to some methods in the full definition.
+  *os << "ACE_INLINE " << node->full_name () << "_ptr" << be_nl
+      << "tao_" << node->flat_name () << "_duplicate (" << be_idt << be_idt_nl
+      << node->full_name () << "_ptr p" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "return " << node->full_name () << "::_duplicate (p);" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *os << "ACE_INLINE void" << be_nl
+      << "tao_" << node->flat_name () << "_release (" << be_idt << be_idt_nl
+      << node->full_name () << "_ptr p" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "CORBA::release (p);" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *os << "ACE_INLINE " << node->full_name () <<  "_ptr" << be_nl
+      << "tao_" << node->flat_name () << "_nil (" << be_idt << be_idt_nl
+      << "void" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "return " << node->full_name () << "::_nil ();" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *os << "ACE_INLINE " << node->full_name () << "_ptr" << be_nl
+      << "tao_" << node->flat_name () << "_narrow (" << be_idt << be_idt_nl
+      << "CORBA::Object *p," << be_nl
+      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "return " << node->full_name () << "::_narrow (p, ACE_TRY_ENV);" 
+      << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *os << "ACE_INLINE CORBA::Object *" << be_nl
+      << "tao_" << node->flat_name () << "_upcast (" << be_idt << be_idt_nl
+      << "void *src" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << node->full_name () << " **tmp =" << be_idt_nl
+      << "ACE_static_cast (" << node->full_name () << " **, src);" 
+      << be_uidt_nl
+      << "return *tmp;" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  // Generate the constructor from stub and servant.
+  node->gen_stub_ctor (os);
 
-  // generate the ifdefined macro for  the _out type
-  os->gen_ifdef_macro (node->flat_name (), "_out");
-  if (node->gen_out_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_ci::"
-                         "visit_interface - "
-                         "codegen for _out failed\n"), -1);
-    }
   os->gen_endif ();
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 685074669f9..27524da6dc2 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -43,22 +43,36 @@ be_visitor_interface_cs::~be_visitor_interface_cs (void)
 int
 be_visitor_interface_cs::visit_interface (be_interface *node)
 {
-  TAO_OutStream *os; // output stream
-
   if (node->cli_stub_gen () || node->imported ())
-    return 0;
+    {
+      return 0;
+    }
 
   be_type *bt;
 
-  // set the right type;
+  // Set the right type.
   if (this->ctx_->alias ())
     bt = this->ctx_->alias ();
   else
     bt = node;
 
-  os = this->ctx_->stream ();
+  // Generate the _var class.
+  if (node->gen_var_impl () == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_interface_cs::"
+                         "visit_interface - "
+                         "codegen for _var failed\n"), -1);
+    }
 
-  os->indent (); // start with whatever indentation level we are at
+  // Generate the _out class.
+  if (node->gen_out_impl () == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_interface_cs::"
+                         "visit_interface - "
+                         "codegen for _out failed\n"), -1);
+    }
 
   be_visitor *visitor = 0;
   be_visitor_context ctx;
@@ -72,6 +86,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   ctx.state (TAO_CodeGen::TAO_INTERFACE_INTERCEPTORS_CS);
   visitor = tao_cg->make_visitor (&ctx);
+
   if (!visitor || (node->accept (visitor) == -1))
     {
       delete visitor;
@@ -81,6 +96,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
                          "codegen for interceptors classes failed\n"),
                         -1);
     }
+
   delete visitor;
   visitor = 0;
 
@@ -99,8 +115,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
                              "codegen for Base Proxy Broker class failed\n"),
                             -1);
         }
-      delete visitor;
 
+      delete visitor;
 
       visitor = 0;
       ctx = *this->ctx_;
@@ -116,9 +132,12 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
                              "codegen for Base Proxy Broker class failed\n"),
                             -1);
         }
+
       delete visitor;
     }
 
+  TAO_OutStream *os = this->ctx_->stream ();
+
    // Generate the destructor and default constructor.
   *os << be_nl;
   *os << "// default constructor" << be_nl;
@@ -201,13 +220,15 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   // Then generate the code for the static methods
   // Local interfaces don't have any operators.
   if (! node->is_local ())
-    *os << "void "
-        << node->name () << "::_tao_any_destructor (void *x)" << be_nl
-        << "{" << be_idt_nl
-        << node->local_name () << " *tmp = ACE_static_cast ("
-        << node->local_name () << "*,x);" << be_nl
-        << "CORBA::release (tmp);" << be_uidt_nl
-        << "}\n" << be_nl;
+    {
+      *os << "void "
+          << node->name () << "::_tao_any_destructor (void *x)" << be_nl
+          << "{" << be_idt_nl
+          << node->local_name () << " *tmp = ACE_static_cast ("
+          << node->local_name () << "*,x);" << be_nl
+          << "CORBA::release (tmp);" << be_uidt_nl
+          << "}\n" << be_nl;
+    }
 
   // The _narrow method
 
@@ -237,6 +258,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "::_nil ();" << be_uidt << be_uidt_nl
           << "}" << be_uidt_nl;
     }
+
   *os << "return " << bt->nested_type_name (this->ctx_->scope ())
       << "::_unchecked_narrow (obj, ACE_TRY_ENV);" << be_uidt_nl
       << "}" << be_nl << be_nl;
@@ -299,6 +321,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
           << "ACE_NEW_RETURN (default_proxy, ::" << bt->name ()
           << " (stub, 0, obj->_servant ()), " << bt->nested_type_name (this->ctx_->scope ())
           << "::_nil ());"<< be_uidt_nl;
+
       if (be_global->gen_smart_proxies ())
         {
           *os << "  return TAO_" << node->flat_name ()
@@ -309,11 +332,15 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
         {
           *os << "  return default_proxy;" << be_nl;
         }
+
       *os << "}" << be_uidt_nl
           << "else " << be_idt_nl;
     }
   else
-    *os << be_idt;
+    {
+      *os << be_idt;
+    }
+
   *os << "return" << be_idt_nl
       << "ACE_reinterpret_cast" << be_idt_nl
       <<"(" << be_idt_nl
@@ -352,6 +379,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       os->incr_indent ();
       *os << "if (\n";
       os->incr_indent (0);
+
       if (node->traverse_inheritance_graph (be_interface::is_a_helper, os) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -377,6 +405,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << "{" << be_idt_nl
       << "void *retv = 0;" << be_nl
       << "if ";
+
   if (node->traverse_inheritance_graph (be_interface::queryinterface_helper, os) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -403,17 +432,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   os->decr_indent (0);
 
-  /*
-  *os << node->full_base_proxy_impl_name () << " &"
-      << node->full_name () << "::_proxy_impl (CORBA::Environment &ACE_TRY_ENV)" << be_nl
-      << "{" << be_idt << be_nl
-      << "return this->the"
-      << node->base_proxy_broker_name ()
-      << "_->select_proxy (this, ACE_TRY_ENV);"
-      << be_uidt_nl
-      << "}" << be_nl << be_nl;
-  */
-
   // generate code for the elements of the interface
   if (this->visit_scope (node) == -1)
     {
@@ -424,7 +442,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
     }
 
 
-  // Smart Proxy classes
+  // Smart Proxy classes.
   if (! node->is_local ())
     {
       be_visitor_context ctx (*this->ctx_);
@@ -432,15 +450,16 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
       ctx.state (TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CS);
       visitor = tao_cg->make_visitor (&ctx);
+
       if (!visitor || (node->accept (visitor) == -1))
         {
-          delete visitor;
           ACE_ERROR_RETURN ((LM_ERROR,
                              "be_visitor_interface_cs::"
                              "visit_interface - "
                              "codegen for smart proxy classes failed\n"),
                             -1);
         }
+
       delete visitor;
       visitor = 0;
 
@@ -450,6 +469,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN);
       ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE);
       visitor = tao_cg->make_visitor (&ctx);
+
       if (!visitor || (node->accept (visitor) == -1))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -459,6 +479,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
                             -1);
         }
 
+      delete visitor;
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp
index 95754054ee0..0796b99e556 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp
@@ -29,5 +29,6 @@
 #include "be_visitor_interface_fwd/interface_fwd_ci.cpp"
 #include "be_visitor_interface_fwd/cdr_op_ch.cpp"
 #include "be_visitor_interface_fwd/cdr_op_ci.cpp"
+#include "be_visitor_interface_fwd/any_op_ch.cpp"
 
 ACE_RCSID(be, be_visitor_interface_fwd, "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
new file mode 100644
index 00000000000..4c4f8bc6692
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
@@ -0,0 +1,80 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators for a forward declared interface 
+//    in the client header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+#include        "idl.h"
+#include        "idl_extern.h"
+#include        "be.h"
+
+#include "be_visitor_interface_fwd.h"
+
+ACE_RCSID(be_visitor_interface_fwd, any_op_ch, "$Id$")
+
+
+// ***************************************************************************
+// Generates Any operator declarations in the client header
+// ***************************************************************************
+
+be_visitor_interface_fwd_any_op_ch::be_visitor_interface_fwd_any_op_ch
+(be_visitor_context *ctx)
+  : be_visitor_decl (ctx)
+{
+}
+
+be_visitor_interface_fwd_any_op_ch::~be_visitor_interface_fwd_any_op_ch (void)
+{
+}
+
+int
+be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (be_interface_fwd *node)
+{
+  AST_Interface *fd = node->full_definition ();
+
+  // Only a forward declared interface that is not defined in the same file
+  // needs to have this generated here. The Any operators are needed by
+  // portable interceptor code if the interface is a parameter of an operation.
+  if (fd->is_defined () != 0)
+    {
+      return 0;
+    }
+
+  if (node->cli_hdr_any_op_gen () 
+      || node->imported () 
+      || node->is_local ())
+    {
+      return 0;
+    }
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // Generate the Any <<= and >>= operator declarations.
+  os->indent ();
+  *os << "// Any operators for interface " << node->name () << be_nl;
+  *os << be_global->stub_export_macro () << " void"
+      << " operator<<= (CORBA::Any &, " << node->name ()
+      << "_ptr);" << be_nl;
+  *os << be_global->stub_export_macro () << " CORBA::Boolean"
+      << " operator>>= (const CORBA::Any &, "
+      << node->name () << " *&);\n";
+
+  node->cli_hdr_any_op_gen (1);
+
+  return 0;
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
index 339c49085b1..4b2c33666a8 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
@@ -11,8 +11,8 @@
 //    cdr_op_ch.cpp
 //
 // = DESCRIPTION
-//    Visitor generating code for CDR operators for interfaces. This uses
-//    compiled marshaling.
+//    Visitor generating code for CDR operators for forward declared
+//    interfaces. This uses compiled marshaling.
 //
 // = AUTHOR
 //    Jeff Parsons
@@ -47,10 +47,34 @@ be_visitor_interface_fwd_cdr_op_ch::visit_interface_fwd (be_interface_fwd *node)
 {
   AST_Interface *fd = node->full_definition ();
 
-  if (!fd->is_defined ())
+  // If this forward declared interface is defined later in the file,
+  // the CDR operator declaration (along with the corresponding
+  // declarations for members of the interface's scope) will be
+  // generated then.
+  if (fd->is_defined ())
     {
+      return 0;
     }
 
+  // No CDR operations for locality constraint interfaces.
+  if (node->cli_hdr_cdr_op_gen () 
+      || node->imported () 
+      || node->is_local ())
+    {
+      return 0;
+    }
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  // Generate the CDR << and >> operator declarations.
+  os->indent ();
+  *os << be_global->stub_export_macro () << " CORBA::Boolean "
+      << "operator<< (TAO_OutputCDR &, const " << node->full_name ()
+      << "_ptr );" << be_nl;
+  *os << be_global->stub_export_macro () << " CORBA::Boolean "
+      << "operator>> (TAO_InputCDR &, "
+      << node->full_name () << "_ptr &);\n";
+
   node->cli_hdr_cdr_op_gen (1);
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ci.cpp
index e7edc5c7ad5..7d27f6af919 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ci.cpp
@@ -32,40 +32,54 @@ ACE_RCSID(be_visitor_interface_fwd, cdr_op_ci, "$Id$")
 // client header 
 // ****************************************************************
 
-be_visitor_interface_fwd_cdr_op_ci::
-be_visitor_interface_fwd_cdr_op_ci (be_visitor_context *ctx)
+be_visitor_interface_fwd_cdr_op_ci::be_visitor_interface_fwd_cdr_op_ci (
+    be_visitor_context *ctx
+  )
   : be_visitor_decl (ctx)
 {
 }
 
-be_visitor_interface_fwd_cdr_op_ci::
-~be_visitor_interface_fwd_cdr_op_ci (void)
+be_visitor_interface_fwd_cdr_op_ci::~be_visitor_interface_fwd_cdr_op_ci (
+    void
+  )
 {
 }
 
 int
-be_visitor_interface_fwd_cdr_op_ci::
-visit_interface_fwd (be_interface_fwd *node)
+be_visitor_interface_fwd_cdr_op_ci::visit_interface_fwd (
+    be_interface_fwd *node
+  )
 {
-  if (node->cli_inline_cdr_op_gen () || node->imported ())
-    return 0;
+  if (node->cli_inline_cdr_decl_gen () 
+      || node->imported ()
+      || node->is_local ())
+    {
+      return 0;
+    }
 
   TAO_OutStream *os = this->ctx_->stream ();
 
   // generate the CDR << and >> operator declarations
   os->indent ();
-  *os << "ACE_INLINE CORBA::Boolean" << be_nl
-      << "operator<< (" << be_idt << be_idt_nl
+  *os << be_global->stub_export_macro () << " CORBA::Boolean operator<< (" 
+      << be_idt << be_idt_nl
       << "TAO_OutputCDR &," << be_nl
       << "const " << node->name () << "_ptr" << be_uidt_nl
-      << ");" << be_uidt_nl;
-  *os << "ACE_INLINE CORBA::Boolean" << be_nl
-      << "operator>> (" << be_idt << be_idt_nl
+      << ");" << be_uidt_nl << be_nl;
+
+  *os << be_global->stub_export_macro () << " CORBA::Boolean operator>> (" 
+      << be_idt << be_idt_nl
       << "TAO_InputCDR &," << be_nl
       << node->name () << "_ptr &" << be_uidt_nl
-      << ");" << be_uidt << "\n";
+      << ");" << be_uidt << "\n\n";
+
+  node->cli_inline_cdr_decl_gen (1);
+
+  // Also set the state for our full definition.
+  AST_Interface *fd = node->full_definition ();
+  be_interface *bfd = be_interface::narrow_from_decl (fd);
+  bfd->cli_inline_cdr_decl_gen (1);
 
-  node->cli_inline_cdr_op_gen (1);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
index be16771333c..4c06d4bf7e3 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
@@ -47,51 +47,66 @@ be_visitor_interface_fwd_ch::visit_interface_fwd (be_interface_fwd *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  if (!node->cli_hdr_gen () && !node->imported ())
+  if (node->cli_hdr_gen () || node->imported ())
     {
-      os->indent (); // start from the current
-
-      // all we do in this is generate a forward declaration of the class
-      *os << "class " << node->local_name () << ";" << be_nl;
-
-      // generate the ifdefined macro for the _ptr type
-      os->gen_ifdef_macro (node->flat_name (), "_ptr");
-
-      // generate the _ptr declaration
-      *os << "typedef " << node->local_name () << " *" << node->local_name ()
-          << "_ptr;\n";
-
-      os->gen_endif ();
-
-      // enclose under an ifdef macro
-      os->gen_ifdef_macro (node->flat_name (), "_var");
-
-      // generate the _var declaration
-      if (node->gen_var_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_interface_fwd_ch::"
-                             "visit_interface_fwd - "
-                             "codegen for _var failed\n"), -1);
-        }
-      // gen an endif
-      os->gen_endif ();
-
-      // enclose under an ifdef macro
-      os->gen_ifdef_macro (node->flat_name (), "_out");
-
-      // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
-      if (node->gen_out_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_interface_fwd_ch::"
-                             "visit_interface_fwd - "
-                             "codegen for _out failed\n"), -1);
-        }
-      // generate the endif macro
-      os->gen_endif ();
-      node->cli_hdr_gen (I_TRUE);
+      return 0;
     }
 
+  os->indent (); // start from the current
+
+  // all we do in this is generate a forward declaration of the class
+  *os << "class " << node->local_name () << ";" << be_nl;
+
+  // generate the ifdefined macro for the _ptr type
+  os->gen_ifdef_macro (node->flat_name (), "_ptr");
+
+  os->indent (); // start from the current
+
+  // Generate the _ptr typedef.
+  *os << "typedef " << node->local_name () << " *" << node->local_name ()
+      << "_ptr;\n";
+
+  os->gen_endif ();
+
+  AST_Interface *fd = node->full_definition ();
+  be_interface *bfd = be_interface::narrow_from_decl (fd);
+
+  if (!fd->is_defined ())
+    {
+      // To generate extern declarations after all modules are closed.
+      be_global->non_defined_interfaces.enqueue_tail (node);
+    }
+
+  // Enclose under an ifdef macro.
+  os->gen_ifdef_macro (node->flat_name (), "_var");
+
+  // Generate the _var declaration.
+  if (bfd->gen_var_defn () == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_interface_fwd_ch::"
+                         "visit_interface_fwd - "
+                         "codegen for _var failed\n"), -1);
+    }
+  // gen an endif
+  os->gen_endif ();
+
+  // enclose under an ifdef macro
+  os->gen_ifdef_macro (node->flat_name (), "_out");
+
+  // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
+  if (bfd->gen_out_defn () == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_interface_fwd_ch::"
+                         "visit_interface_fwd - "
+                         "codegen for _out failed\n"), -1);
+    }
+  // generate the endif macro
+  os->gen_endif ();
+
+  node->cli_hdr_gen (I_TRUE);
+  bfd->cli_hdr_gen (I_TRUE);
+
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ci.cpp
index c0a0b05eb52..a9b0982749d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ci.cpp
@@ -41,64 +41,11 @@ be_visitor_interface_fwd_ci::~be_visitor_interface_fwd_ci (void)
 {
 }
 
-// visit the Interface_Fwd_ci node and its scope
 int
 be_visitor_interface_fwd_ci::visit_interface_fwd (be_interface_fwd *node)
 {
-  if (node->cli_inline_gen () || node->imported ())
-    return 0;
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (! node->is_local ())
-    {
-      os->gen_ifdef_macro (node->flat_name (), "");
-
-      *os << "ACE_INLINE" << be_nl;
-      *os << node->name () << "::" << node->local_name () << " (" 
-          << be_idt << be_idt_nl 
-          << "TAO_Stub *objref," << be_nl
-          << "CORBA::Boolean _tao_collocated," << be_nl 
-	        << "TAO_Abstract_ServantBase *servant" << be_uidt_nl
-	        << ")" // constructor 
-	        << be_nl;
-      *os << ": CORBA_Object (objref, _tao_collocated, servant)" << be_uidt_nl;
-      *os << "{" << be_idt_nl
-	        << "this->" << node->flat_name () 
-          << "_setup_collocation (_tao_collocated);" << be_uidt_nl;
-      *os << "}" << be_nl << be_nl;
-      
-      os->gen_endif ();
-    }
-
-  // Generate the constructor from stub and servant.
-  os->gen_ifdef_macro (node->flat_name (), "_var");
-  if (node->gen_var_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_ci::"
-                         "visit_interface - "
-                         "codegen for _var failed\n"), -1);
-    }
-  os->gen_endif ();
-
-  // generate the ifdefined macro for  the _out type
-  os->gen_ifdef_macro (node->flat_name (), "_out");
-  if (node->gen_out_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_interface_ci::"
-                         "visit_interface - "
-                         "codegen for _out failed\n"), -1);
-    }
-  os->gen_endif ();
-
-  node->cli_inline_gen (I_TRUE);
-
-  // Set the flag in the corresponding interface definition as well.
-  AST_Interface *fd = node->full_definition ();
-  be_interface *bfd = be_interface::narrow_from_decl (fd);
-  bfd->cli_inline_gen (I_TRUE);
+  // _var and _out class generation for interfaces has been moved to the
+  // .cpp file - nothing to do here at the moment.
 
   return 0;
- }
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module.cpp b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
index 3e61eedc658..fd4a7b041f9 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
@@ -427,8 +427,12 @@ be_visitor_module::visit_interface_fwd (be_interface_fwd *node)
       ctx.state (TAO_CodeGen::TAO_INTERFACE_FWD_CDR_OP_CS);
       break;
     case TAO_CodeGen::TAO_MODULE_ANY_OP_CH:
-    case TAO_CodeGen::TAO_MODULE_ANY_OP_CS:
+      ctx.state (TAO_CodeGen::TAO_INTERFACE_FWD_ANY_OP_CH);
+      break;
     case TAO_CodeGen::TAO_MODULE_CDR_OP_CH:
+      ctx.state (TAO_CodeGen::TAO_INTERFACE_FWD_CDR_OP_CH);
+      break;
+    case TAO_CodeGen::TAO_MODULE_ANY_OP_CS:
     case TAO_CodeGen::TAO_MODULE_CS:
     case TAO_CodeGen::TAO_MODULE_SH:
     case TAO_CodeGen::TAO_MODULE_SI:
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
index 36a11f2af20..01788ffd0c9 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
@@ -96,8 +96,18 @@ be_visitor_operation_rettype_vardecl_cs::visit_interface (be_interface *node)
     bt = node;
 
   os->indent ();
-  *os << bt->name () << "_ptr _tao_retval = " 
-      << bt->name () << "::_nil ();" << be_nl;
+
+  if (node->is_defined ())
+    {
+      *os << bt->name () << "_ptr _tao_retval = "
+          << bt->name () << "::_nil ();" << be_nl;
+    }
+  else
+    {
+      *os << bt->name () << "_ptr _tao_retval = tao_" 
+          << node->flat_name () << "_nil ();" << be_nl;
+    }
+
   *os << bt->name () << "_var _tao_safe_retval (_tao_retval);";
 
   *os << be_nl << be_nl;
@@ -106,7 +116,9 @@ be_visitor_operation_rettype_vardecl_cs::visit_interface (be_interface *node)
 }
 
 int
-be_visitor_operation_rettype_vardecl_cs::visit_interface_fwd (be_interface_fwd *node)
+be_visitor_operation_rettype_vardecl_cs::visit_interface_fwd (
+    be_interface_fwd *node
+  )
 {
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
   be_type *bt; // return type
@@ -117,8 +129,18 @@ be_visitor_operation_rettype_vardecl_cs::visit_interface_fwd (be_interface_fwd *
     bt = node;
 
   os->indent ();
-  *os << bt->name () << "_ptr _tao_retval = " 
-      << bt->name () << "::_nil ();" << be_nl;
+
+  if (node->full_definition ()->is_defined ())
+    {
+      *os << bt->name () << "_ptr _tao_retval = "
+          << bt->name () << "::_nil ();" << be_nl;
+    }
+  else
+    {
+      *os << bt->name () << "_ptr _tao_retval = tao_" 
+          << node->flat_name () << "_nil ();" << be_nl;
+    }
+
   *os << bt->name () << "_var _tao_safe_retval (_tao_retval);";
 
   *os << be_nl << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index 734ed792527..b6084bc2e32 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -66,30 +66,78 @@ int be_visitor_root::visit_root (be_root *node)
 
 
   // If we are generating the client header file, this is the place to
-  // generate the proxy broker factory function pointer declarations.
+  // generate the proxy broker factory function pointer declarations
+  // and the extern declarations for non-defined interfaces.
   if (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_CH)
     {
       TAO_OutStream *os = this->ctx_->stream ();
 
-      *os << "// Proxy Broker Factory function pointer declarations."
-          << be_nl << be_nl;
-
       size_t size = be_global->non_local_interfaces.size ();
+      be_interface *i = 0;
+      be_interface_fwd *ifwd = 0;
+      size_t index = 0;
 
-      for (size_t index = 0; index < size; ++index)
+      if (size > 0)
+        {
+          *os << "// Proxy Broker Factory function pointer declarations."
+              << be_nl << be_nl;
+        }
+
+      for (index = 0; index < size; ++index)
         {
-          be_interface *i = 0;
           be_global->non_local_interfaces.dequeue_head (i);
 
-          *os << "extern " << be_global->stub_export_macro () << " "
-              << i->full_base_proxy_broker_name () << " * (*"
-              << i->flat_client_enclosing_scope () 
+          *os << "extern " << be_global->stub_export_macro () << be_nl
+              << i->full_base_proxy_broker_name () << " *" << be_nl
+              << "(*" << i->flat_client_enclosing_scope () 
               << i->base_proxy_broker_name () 
               << "_Factory_function_pointer) ("
               << be_idt << be_idt_nl
               << "CORBA::Object_ptr obj" << be_uidt_nl
               << ");" << be_uidt_nl << be_nl;
         }
+
+      size = be_global->non_defined_interfaces.size ();
+
+      for (index = 0; index < size; ++index)
+        {
+          be_global->non_defined_interfaces.dequeue_head (ifwd);
+
+          *os << "// External declarations for undefined interface" << be_nl
+              << "// " << ifwd->full_name () << be_nl;
+
+          *os << "extern " << be_global->stub_export_macro () << be_nl
+              << ifwd->full_name () << "_ptr" << be_nl
+              << "tao_" << ifwd->flat_name () << "_duplicate (" 
+              << be_idt << be_idt_nl
+              << ifwd->full_name  () << "_ptr" << be_uidt_nl
+              << ");" << be_uidt_nl
+              << "extern " << be_global->stub_export_macro () << be_nl
+              << "void" << be_nl
+              << "tao_" << ifwd->flat_name () << "_release ("
+              << be_idt << be_idt_nl
+              << ifwd->full_name () << "_ptr" << be_uidt_nl
+              << ");" << be_uidt_nl
+              << "extern " << be_global->stub_export_macro () << be_nl
+              << ifwd->full_name () << "_ptr" << be_nl
+              << "tao_" << ifwd->flat_name () << "_nil (" 
+              << be_idt << be_idt_nl
+              << "void" << be_uidt_nl
+              << ");" << be_uidt_nl
+              << "extern " << be_global->stub_export_macro () << be_nl
+              << ifwd->full_name () << "_ptr" << be_nl
+              << "tao_" << ifwd->flat_name () << "_narrow (" 
+              << be_idt << be_idt_nl
+              << "CORBA::Object *," << be_nl
+              << "CORBA::Environment &" << be_uidt_nl
+              << ");" << be_uidt_nl
+              << "extern " << be_global->stub_export_macro () << be_nl
+              << "CORBA::Object *" << be_nl
+              << "tao_" << ifwd->flat_name () << "_upcast (" 
+              << be_idt << be_idt_nl
+              << "void *" << be_uidt_nl
+              << ");" << be_uidt_nl << be_nl;
+        }
     }
 
   be_visitor *visitor;
@@ -666,6 +714,8 @@ be_visitor_root::visit_interface_fwd (be_interface_fwd *node)
       ctx.state (TAO_CodeGen::TAO_INTERFACE_FWD_CDR_OP_CH);
       break;
     case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
+      ctx.state (TAO_CodeGen::TAO_INTERFACE_FWD_ANY_OP_CH);
+      break;
     case TAO_CodeGen::TAO_ROOT_ANY_OP_CS:
     case TAO_CodeGen::TAO_ROOT_CS:
     case TAO_CodeGen::TAO_ROOT_SH:
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
index fd3b609d362..42f4ae47409 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
@@ -55,5 +55,6 @@ be_visitor_root_ch::init (void)
 
   // init the stream
   this->ctx_->stream (tao_cg->client_header ());
+
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp
index ac3f2f83458..58a4118a278 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp
@@ -25,7 +25,6 @@
 
 ACE_RCSID(be_visitor_sequence, gen_bounded_obj_sequence_ci, "$Id$")
 
-
 int
 be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
 {
@@ -35,6 +34,7 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
   // retrieve the base type since we may need to do some code
   // generation for the base type.
   bt = be_type::narrow_from_decl (node->base_type ());
+
   if (!bt)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -53,7 +53,26 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
       pt = t->primitive_base_type ();
     }
   else
-    pt = bt;
+    {
+      pt = bt;
+    }
+
+  const char *name = 
+    be_decl::narrow_from_decl (pt)->full_name ();
+
+  idl_bool bt_is_defined;
+
+  // Special cases.
+  if (ACE_OS::strcmp (name, "CORBA::Object") == 0
+      || ACE_OS::strcmp (name, "CORBA::TypeCode") == 0)
+    {
+      bt_is_defined = 1;
+    }
+  else
+    {
+      AST_Interface *ibt = AST_Interface::narrow_from_decl (pt);
+      bt_is_defined = ibt->is_defined ();
+    }
 
   const char * class_name = node->instance_name ();
 
@@ -62,9 +81,13 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
 
   if (node->is_nested ())
     {
-      ACE_OS::sprintf (full_class_name, "%s::%s",
-                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->full_name (),
-                       class_name);
+      be_scope *parent = be_scope::narrow_from_scope (node->defined_in ());
+
+      ACE_OS::sprintf (
+          full_class_name, "%s::%s",
+          parent->decl ()->full_name (),
+          class_name
+        );
     }
   else
     {
@@ -105,38 +128,72 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
                          "base type visit failed\n"),
                         -1);
     }
+
   *os <<" **buf = 0;" << be_nl
       << be_nl
       << "ACE_NEW_RETURN (buf, ";
+
   bt->accept (visitor);
+
   *os << "*[" << node->max_size () << "], 0);" << be_nl
       << be_nl
       << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; i++)" << be_idt_nl
+      << "{" << be_idt_nl
       << "buf[i] = ";
-  bt->accept (visitor);
-  *os << "::_nil ();" << be_uidt_nl
-      << be_nl
+
+  if (bt_is_defined)
+    {
+      bt->accept (visitor);
+
+      *os << "::_nil ();";
+    }
+  else
+    {
+      *os << "tao_" << pt->flat_name () << "_nil ();";
+    }
+
+  *os << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl
       << "return buf;" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
+      << "}" << be_nl << be_nl;
 
   // freebuf
   *os << "ACE_INLINE void" << be_nl
       << full_class_name << "::freebuf (";
+
   bt->accept (visitor);
+
   *os << " **buffer)" << be_nl
       << "{" << be_idt_nl
-      << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; ++i)" << be_idt_nl
-      << "if (buffer[i] != ";
-  bt->accept (visitor);
-  *os << "::_nil ())" << be_nl
+      << "for (CORBA::ULong i = 0; i < " << node->max_size () 
+      << "; ++i)" << be_idt_nl
       << "{" << be_idt_nl
-      << "CORBA::release (buffer[i]);" << be_nl
-      << "buffer[i] = ";
-  bt->accept (visitor);
-  *os << "::_nil ();" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << be_nl
+      << "if (buffer[i] != ";
+
+  if (bt_is_defined)
+    {
+      bt->accept (visitor);
+
+      *os << "::_nil ())" << be_idt_nl
+          << "{" << be_idt_nl
+          << "CORBA::release (buffer[i]);" << be_nl
+          << "buffer[i] = ";
+
+      bt->accept (visitor);
+
+      *os << "::_nil ();" << be_uidt_nl;
+    }
+  else
+    {
+      *os << "tao_" << pt->flat_name () << "_nil ())" << be_nl
+          << "{" << be_idt_nl
+          << "tao_" << pt->flat_name () << "_release (buffer[i]);" << be_nl
+          << "buffer[i] = "
+          << "tao_" << pt->flat_name () << "_nil ();" << be_uidt_nl;
+    }
+
+  *os << "}" << be_uidt << be_uidt_nl 
+      << "}" << be_uidt_nl << be_nl
       << "delete[] buffer;" << be_uidt_nl
       << "} " << be_nl
       << be_nl;
@@ -155,11 +212,14 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
   *os << "ACE_INLINE" << be_nl
       << full_class_name << "::" << class_name
       << " (CORBA::ULong length," << be_idt_nl;
+
   bt->accept (visitor);
+
   *os <<"* *value," << be_nl
       << "CORBA::Boolean release)" << be_uidt_nl
       << "// Constructor from data." << be_nl
-      << "  : TAO_Bounded_Base_Sequence (" << node->max_size () << ", length, value, release)" << be_nl
+      << "  : TAO_Bounded_Base_Sequence (" << node->max_size () 
+      << ", length, value, release)" << be_nl
       << "{" << be_nl
       << "}" << be_nl
       << be_nl;
@@ -173,16 +233,35 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
       << "{" << be_idt_nl
       << "if (rhs.buffer_ != 0)" << be_nl
       << "{" << be_idt_nl;
+
   bt->accept(visitor);
+
   *os <<" **tmp1 = allocbuf (" << node->max_size () << ");" << be_nl;
+
   bt->accept(visitor);
+
   *os <<" ** const tmp2 = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
+
   *os << "** ACE_CAST_CONST, rhs.buffer_);" << be_nl
       << "for (CORBA::ULong i = 0; i < rhs.length_; i++)" << be_idt_nl
-      << "tmp1[i] = "; 
-  bt->accept (visitor); 
-  *os << "::_duplicate (tmp2[i]);" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "tmp1[i] = ";
+
+  if (bt_is_defined)
+    {
+      bt->accept (visitor);
+
+      *os << "::_duplicate (tmp2[i]);";
+    }
+  else
+    {
+      *os << "tao_" << pt->flat_name () << "_duplicate (tmp2[i]);";
+    }
+
+  *os << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl
       << "this->buffer_ = tmp1;" << be_uidt_nl
       << "}" << be_nl
       << "else" << be_nl
@@ -203,18 +282,36 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
       << be_nl
       << "if (this->release_ && this->buffer_ != 0)" << be_nl
       << "{" << be_idt_nl;
+
   bt->accept(visitor);
+
   *os <<" **tmp = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
+
   *os << " **, this->buffer_);" << be_nl
       << be_nl
-      << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_nl
-      << "{" << be_idt_nl
-      << "CORBA::release (tmp[i]);" << be_nl
-      << "tmp[i] = ";
-  bt->accept (visitor);
-  *os << "::_nil ();" << be_uidt_nl
-      << "}" << be_uidt_nl
+      << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
+      << "{" << be_idt_nl;
+
+  if (bt_is_defined)
+    {
+      *os << "CORBA::release (tmp[i]);" << be_nl
+          << "tmp[i] = ";
+
+      bt->accept (visitor);
+
+      *os << "::_nil ();";
+    }
+  else
+    {
+      *os << "tao_" << pt->flat_name () << "_release (tmp[i]);" << be_nl
+          << "tmp[i] = "
+          << "tao_" << pt->flat_name () << "_nil ();";
+    }
+
+  *os << be_uidt_nl
+      << "}" << be_uidt << be_uidt_nl
       << "}" << be_nl
       << "else" << be_idt_nl
       << "this->buffer_ = " << class_name 
@@ -222,24 +319,46 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
       << be_nl
       << "TAO_Bounded_Base_Sequence::operator= (rhs);" << be_nl
       << be_nl;
+
   bt->accept(visitor);
+
   *os <<" **tmp1 = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
+
   *os << " **, this->buffer_);" << be_nl;
+
   bt->accept(visitor);
+
   *os <<" ** const tmp2 = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
+
   *os << " ** ACE_CAST_CONST, rhs.buffer_);" << be_nl
       << "for (CORBA::ULong i=0; i < rhs.length_; ++i)" << be_idt_nl
+      << "{" << be_idt_nl
       << "tmp1[i] = ";
-  bt->accept (visitor);
-  *os << "::_duplicate (tmp2[i]);" << be_uidt_nl
+
+  if (bt_is_defined)
+    {
+      bt->accept (visitor);
+
+      *os << "::_duplicate (tmp2[i]);";
+    }
+  else
+    {
+      *os << "tao_" << pt->flat_name () << "_duplicate (tmp2[i]);";
+    }
+
+  *os << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl
       << "return *this;" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
 
   // operator[]
   be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt);
+
   int is_pseudo_object =
     pt->node_type () == AST_Decl::NT_pre_defined
     && prim && prim->pt () == AST_PredefinedType::PT_pseudo
@@ -264,8 +383,11 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
       << "ACE_ASSERT (index < this->maximum_);" << be_nl;
 
   bt->accept(visitor);
+
   *os <<" **const tmp = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
+
   *os << " ** ACE_CAST_CONST, this->buffer_);" << be_nl;
 
   if (is_pseudo_object)
@@ -285,11 +407,15 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
 
   // get_buffer
   *os << "ACE_INLINE ";
+
   bt->accept(visitor);
+
   *os << " **" << be_nl;
   *os << full_class_name << "::get_buffer (CORBA::Boolean orphan)" << be_nl
       << "{" << be_idt_nl;
+
   bt->accept(visitor);
+
   *os << " **result = 0;" << be_nl
       << "if (orphan == 0)" << be_nl
       << "{" << be_idt_nl
@@ -303,7 +429,9 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
       << "else" << be_nl
       << "{" << be_idt_nl
       << "result = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
+
   *os << "**, this->buffer_);" << be_uidt_nl
       << "}" << be_uidt_nl
       << "}" << be_nl
@@ -314,6 +442,8 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
       << "// We set the state back to default and relinquish" << be_nl
       << "// ownership." << be_nl
       << "result = ACE_reinterpret_cast(";
+
+
   bt->accept (visitor);
   *os << "**,this->buffer_);" << be_nl
       << "this->maximum_ = 0;" << be_nl
@@ -328,12 +458,16 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
 
   // get_buffer
   *os << "ACE_INLINE const ";
+
   bt->accept (visitor);
+
   *os << "* *" << be_nl
       << full_class_name << "::get_buffer (void) const" << be_nl
       << "{" << be_idt_nl
       << "return ACE_reinterpret_cast(const ";
+
   bt->accept (visitor);
+
   *os << " ** ACE_CAST_CONST, this->buffer_);" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
index bdb302e913b..f5d9eff9237 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp
@@ -25,7 +25,6 @@
 
 ACE_RCSID(be_visitor_sequence, gen_bounded_obj_sequence_cs, "$Id$")
 
-
 int
 be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
 {
@@ -35,6 +34,7 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
   // retrieve the base type since we may need to do some code
   // generation for the base type.
   bt = be_type::narrow_from_decl (node->base_type ());
+
   if (!bt)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -53,7 +53,26 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
       pt = t->primitive_base_type ();
     }
   else
-    pt = bt;
+    {
+      pt = bt;
+    }
+
+  const char *name = 
+    be_decl::narrow_from_decl (pt)->full_name ();
+
+  idl_bool bt_is_defined;
+
+  // Special cases.
+  if (ACE_OS::strcmp (name, "CORBA::Object") == 0
+      || ACE_OS::strcmp (name, "CORBA::TypeCode") == 0)
+    {
+      bt_is_defined = 1;
+    }
+  else
+    {
+      AST_Interface *ibt = AST_Interface::narrow_from_decl (pt);
+      bt_is_defined = ibt->is_defined ();
+    }
 
   const char * class_name = node->instance_name ();
 
@@ -62,9 +81,13 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
 
   if (node->is_nested ())
     {
-      ACE_OS::sprintf (full_class_name, "%s::%s",
-                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->full_name (),
-                       class_name);
+      be_scope *parent = be_scope::narrow_from_scope (node->defined_in ());
+
+      ACE_OS::sprintf (
+          full_class_name, "%s::%s",
+          parent->decl ()->full_name (),
+          class_name
+        );
     }
   else
     {
@@ -105,9 +128,13 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
       << "{" << be_idt_nl
       << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl
       << "return;" << be_uidt_nl;
+
   bt->accept(visitor);
+
   *os <<" **tmp = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
+
   *os << " **, this->buffer_);" << be_nl
       << class_name << "::freebuf (tmp);" << be_nl
       << "this->buffer_ = 0;" << be_uidt_nl
@@ -126,21 +153,40 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
   *os << "void" << be_nl
       << full_class_name << "::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)" << be_nl
       << "{" << be_idt_nl;
+
   bt->accept(visitor);
+
   *os <<" **tmp = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
+
   *os << " **, this->buffer_);" << be_nl
       << be_nl
       << "for (CORBA::ULong i = nl; i < ol; ++i)" << be_nl
-      << "{" << be_idt_nl
-      << "CORBA::release (tmp[i]);" << be_nl
-      << "tmp[i] = ";
-  bt->accept (visitor);
-  *os << "::_nil ();" << be_uidt_nl
+      << "{" << be_idt_nl;
+
+  if (bt_is_defined)
+    {
+      *os << "CORBA::release (tmp[i]);" << be_nl
+          << "tmp[i] = ";
+
+      bt->accept (visitor);
+
+      *os << "::_nil ();";
+    }
+  else
+    {
+      *os << "tao_" << pt->flat_name () << "_release (tmp[i]);" << be_nl
+          << "tmp[i] = "
+          << "tao_" << pt->flat_name () << "_nil ();";
+    }
+
+  *os << be_uidt_nl
       << "}" << be_uidt_nl
       << "}\n" << be_nl;
 
   be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt);
+
   if ((pt->node_type () != AST_Decl::NT_pre_defined) ||
       (prim && (prim->pt () == AST_PredefinedType::PT_pseudo) &&
        (!ACE_OS::strcmp (prim->local_name ()->get_string (), "Object"))))
@@ -153,24 +199,52 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
 	        << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
 	        << ")" << be_uidt_nl
 	        << "{" << be_idt_nl;
+
       bt->accept (visitor);
+
       *os << " **tmp = ACE_static_cast (";
+
       bt->accept (visitor);
+
       *os << "**, target);" << be_nl
 	        << "*tmp = ";
-      bt->accept (visitor);
-      *os << "::_narrow (src, ACE_TRY_ENV);" << be_nl
+
+      if (bt_is_defined)
+        {
+          bt->accept (visitor);
+
+          *os << "::_narrow (src, ACE_TRY_ENV);";
+        }
+      else
+        {
+          *os << "tao_" << pt->flat_name () << "_narrow (src, ACE_TRY_ENV);";
+        }
+
+      *os << be_nl
           << "ACE_CHECK;" << be_uidt_nl
 	        << "}\n" << be_nl;
 
       *os << "CORBA_Object*" << be_nl
           << full_class_name << "::_upcast (void *src) const" <<  be_nl
 	        << "{" << be_idt_nl;
-      bt->accept (visitor);
-      *os << " **tmp = ACE_static_cast (";
-      bt->accept (visitor);
-      *os << "**, src);" << be_nl
-	        << "return *tmp;" << be_uidt_nl
+
+      if (bt_is_defined)
+        {
+          bt->accept (visitor);
+
+          *os << " **tmp = ACE_static_cast (";
+
+          bt->accept (visitor);
+
+          *os << "**, src);" << be_nl
+              << "return *tmp;";
+        }
+      else
+        {
+	        *os << "return tao_" << pt->flat_name () << "_upcast (src);";
+        }
+
+      *os << be_uidt_nl
 	        << "}" << be_nl;
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp
index 60e6059f2d8..6da8176468b 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp
@@ -17,26 +17,23 @@
 //    Michael Kircher
 //
 //    Modifications by Aniruddha Gokhale
-//
 // ============================================================================
 
-
 #include	"be.h"
 
 #include "be_visitor_sequence.h"
 
 ACE_RCSID(be_visitor_sequence, gen_unbounded_obj_sequence_ci, "$Id$")
 
-
 int
 be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_type *bt;
 
-  // retrieve the base type since we may need to do some code
+  // Retrieve the base type since we may need to do some code
   // generation for the base type.
-  bt = be_type::narrow_from_decl (node->base_type ());
+  be_type *bt = be_type::narrow_from_decl (node->base_type ());
+
   if (!bt)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -46,7 +43,7 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
     }
 
   // generate the class name
-  be_type  *pt; // base types
+  be_type *pt; // base types
 
   if (bt->node_type () == AST_Decl::NT_typedef)
     {
@@ -55,19 +52,41 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
       pt = t->primitive_base_type ();
     }
   else
-    pt = bt;
+    {
+      pt = bt;
+    }
 
+  const char *name = 
+    be_decl::narrow_from_decl (pt)->full_name ();
 
-  const char * class_name = node->instance_name ();
+  idl_bool bt_is_defined;
+
+  // Special cases.
+  if (ACE_OS::strcmp (name, "CORBA::Object") == 0
+      || ACE_OS::strcmp (name, "CORBA::TypeCode") == 0)
+    {
+      bt_is_defined = 1;
+    }
+  else
+    {
+      AST_Interface *ibt = AST_Interface::narrow_from_decl (pt);
+      bt_is_defined = ibt->is_defined ();
+    }
+
+  const char *class_name = node->instance_name ();
 
   static char full_class_name [NAMEBUFSIZE];
   ACE_OS::memset (full_class_name, '\0', NAMEBUFSIZE);
 
   if (node->is_nested ())
     {
-      ACE_OS::sprintf (full_class_name, "%s::%s",
-                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->full_name (),
-                       class_name);
+      be_scope *parent = be_scope::narrow_from_scope (node->defined_in ());
+
+      ACE_OS::sprintf (
+          full_class_name, "%s::%s",
+          parent->decl ()->full_name (),
+          class_name
+        );
     }
   else
     {
@@ -100,29 +119,47 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
                          "base type visit failed\n"),
                         -1);
     }
+
   *os << " **" << be_nl
       << full_class_name << "::allocbuf (CORBA::ULong nelems)" << be_nl
       << "{" << be_idt_nl;
-  bt->accept(visitor);
+
+  bt->accept (visitor);
+
   *os <<" **buf = 0;" << be_nl
       << be_nl
-      << "ACE_NEW_RETURN (buf, ";
+      << "ACE_NEW_RETURN (buf, "
+      ;
   bt->accept (visitor);
+
   *os << "*[nelems], 0);" << be_nl
       << be_nl
       << "for (CORBA::ULong i = 0; i < nelems; i++)" << be_idt_nl
+      << "{" << be_idt_nl
       << "buf[i] = ";
-  bt->accept (visitor);
-  *os << "::_nil ();" << be_uidt_nl
-      << be_nl
+
+  if (bt_is_defined)
+    {
+      bt->accept (visitor);
+
+      *os << "::_nil ();";
+    }
+  else
+    {
+      *os << "tao_" << pt->flat_name () << "_nil ();";
+    }
+
+  *os << be_uidt_nl 
+      << "}" << be_uidt_nl << be_nl
       << "return buf;" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
+      << "}" << be_nl << be_nl;
 
   // freebuf
   *os << "ACE_INLINE void " << be_nl
       << full_class_name << "::freebuf (";
+
   bt->accept (visitor);
+
   *os << " **buffer)" << be_nl
       << "{" << be_idt_nl
       << "if (buffer == 0)" << be_idt_nl
@@ -151,7 +188,9 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
   *os << "ACE_INLINE" << be_nl
       << full_class_name << "::" << class_name << " (CORBA::ULong maximum," << be_idt_nl
       << "CORBA::ULong length," << be_nl;
+
   bt->accept (visitor);
+
   *os <<"* *value," << be_nl
       << "CORBA::Boolean release)" << be_uidt_nl
       << ": TAO_Unbounded_Base_Sequence (maximum, length, value, release)" << be_nl
@@ -167,17 +206,36 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
       << "{" << be_idt_nl
       << "if (rhs.buffer_ != 0)" << be_nl
       << "{" << be_idt_nl;
+
   bt->accept(visitor);
+
   *os <<" **tmp1 = " << class_name << "::allocbuf (this->maximum_);" << be_nl;
-  bt->accept(visitor);
+
+  bt->accept (visitor);
+
   *os <<" ** const tmp2 = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
+
   *os << " ** ACE_CAST_CONST, rhs.buffer_);" << be_nl
       << be_nl
       << "for (CORBA::ULong i = 0; i < rhs.length_; ++i)" << be_idt_nl
+      << "{" << be_idt_nl
       << "tmp1[i] = ";
-  bt->accept (visitor); *os << "::_duplicate (tmp2[i]);" << be_uidt_nl
-      << be_nl
+
+  if (bt_is_defined)
+    {
+      bt->accept (visitor);
+
+      *os << "::_duplicate (tmp2[i]);";
+    }
+  else
+    {
+      *os << "tao_" << pt->flat_name () << "_duplicate (tmp2[i]);";
+    }
+
+  *os << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl
       << "this->buffer_ = tmp1;" << be_uidt_nl
       << "}" << be_nl
       << "else" << be_nl
@@ -197,17 +255,35 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
       << be_nl
       << "if (this->release_)" << be_nl
       << "{" << be_idt_nl;
-  bt->accept(visitor);
+
+  bt->accept (visitor);
+
   *os <<" **tmp = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
+
   *os << " **, this->buffer_);" << be_nl
       << be_nl
       << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_nl
-      << "{" << be_idt_nl
-      << "CORBA::release (tmp[i]);" << be_nl
-      << "tmp[i] = ";
-  bt->accept (visitor);
-  *os << "::_nil ();" << be_uidt_nl
+      << "{" << be_idt_nl;
+
+  if (bt_is_defined)
+    {
+      *os << "CORBA::release (tmp[i]);" << be_nl
+          << "tmp[i] = ";
+
+      bt->accept (visitor);
+
+      *os << "::_nil ();";
+    }
+  else
+    {
+      *os << "tao_" << pt->flat_name () << "_release (tmp[i]);" << be_nl
+          << "tmp[i] = "
+          << "tao_" << pt->flat_name () << "_nil ();";
+    }
+
+  *os << be_uidt_nl
       << "}" << be_nl
       << "if (this->maximum_ < rhs.maximum_)" << be_nl
       << "{" << be_idt_nl
@@ -222,20 +298,40 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
       << be_nl
       << "TAO_Unbounded_Base_Sequence::operator= (rhs);" << be_nl
       << be_nl;
-  bt->accept(visitor);
+
+  bt->accept (visitor);
+
   *os <<" **tmp1 = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
+
   *os << " **, this->buffer_);" << be_nl;
-  bt->accept(visitor);
+
+  bt->accept (visitor);
+
   *os <<" ** const tmp2 = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
+
   *os << " ** ACE_CAST_CONST, rhs.buffer_);" << be_nl
       << be_nl
       << "for (CORBA::ULong i = 0; i < rhs.length_; ++i)" << be_idt_nl
+      << "{" << be_idt_nl
       << "tmp1[i] = ";
-  bt->accept (visitor);
-  *os << "::_duplicate (tmp2[i]);" << be_uidt_nl
-      << be_nl
+
+  if (bt_is_defined)
+    {
+      bt->accept (visitor);
+
+      *os << "::_duplicate (tmp2[i]);";
+    }
+  else
+    {
+      *os << "tao_" << pt->flat_name () << "_duplicate (tmp2[i]);";
+    }
+
+  *os << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl
       << "return *this;" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
@@ -263,10 +359,15 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
       << "// read-write accessor" << be_nl
       << "{" << be_idt_nl
       << "ACE_ASSERT (index < this->maximum_);" << be_nl;
+
   bt->accept(visitor);
+
   *os <<" ** const tmp = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
+
   *os << " ** ACE_CAST_CONST, this->buffer_);" << be_nl;
+
   if (is_pseudo_object)
     {
       *os << "return TAO_Pseudo_Object_Manager<";
@@ -284,11 +385,15 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
 
   // get_buffer
   *os << "ACE_INLINE ";
+
   bt->accept(visitor);
+
   *os << "* *" << be_nl
       << full_class_name << "::get_buffer (CORBA::Boolean orphan)" << be_nl
       << "{" << be_idt_nl;
+
   bt->accept(visitor);
+
   *os << " **result = 0;" << be_nl
       << "if (orphan == 0)" << be_nl
       << "{" << be_idt_nl
@@ -302,7 +407,9 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
       << "else" << be_nl
       << "{" << be_idt_nl
       << "result = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
+
   *os << "**, this->buffer_);" << be_uidt_nl
       << "}" << be_uidt_nl
       << "}" << be_nl
@@ -313,7 +420,9 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
       << "// We set the state back to default and relinquish" << be_nl
       << "// ownership." << be_nl
       << "result = ACE_reinterpret_cast(";
+
   bt->accept (visitor);
+
   *os << "**,this->buffer_);" << be_nl
       << "this->maximum_ = 0;" << be_nl
       << "this->length_ = 0;" << be_nl
@@ -328,12 +437,16 @@ be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node)
   // get_buffer
   *os << "ACE_INLINE ";
   *os << "const ";
+
   bt->accept (visitor);
+
   *os << "* *" << be_nl
       << full_class_name << "::get_buffer (void) const" << be_nl
       << "{" << be_idt_nl
       << "return ACE_reinterpret_cast(const ";
+
   bt->accept (visitor);
+
   *os << " ** ACE_CAST_CONST, this->buffer_);" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
index b436bf8ba71..4c32b2675b2 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp
@@ -17,17 +17,14 @@
 //    Michael Kircher
 //
 //    Modifications by Aniruddha Gokhale
-//
 // ============================================================================
 
-
 #include	"be.h"
 
 #include "be_visitor_sequence.h"
 
 ACE_RCSID(be_visitor_sequence, gen_unbounded_obj_sequence_cs, "$Id$")
 
-
 int
 be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
 {
@@ -37,6 +34,7 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
   // retrieve the base type since we may need to do some code
   // generation for the base type.
   bt = be_type::narrow_from_decl (node->base_type ());
+
   if (!bt)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -49,14 +47,32 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
   be_type  *pt; // base types
 
   if (bt->node_type () == AST_Decl::NT_typedef)
-  {
-    // get the primitive base type of this typedef node
-    be_typedef *t = be_typedef::narrow_from_decl (bt);
-    pt = t->primitive_base_type ();
-  }
+    {
+      // get the primitive base type of this typedef node
+      be_typedef *t = be_typedef::narrow_from_decl (bt);
+      pt = t->primitive_base_type ();
+    }
   else
-    pt = bt;
+    {
+      pt = bt;
+    }
+
+  const char *name = 
+    be_decl::narrow_from_decl (pt)->full_name ();
+
+  idl_bool bt_is_defined;
 
+  // Special cases.
+  if (ACE_OS::strcmp (name, "CORBA::Object") == 0
+      || ACE_OS::strcmp (name, "CORBA::TypeCode") == 0)
+    {
+      bt_is_defined = 1;
+    }
+  else
+    {
+      AST_Interface *ibt = AST_Interface::narrow_from_decl (pt);
+      bt_is_defined = ibt->is_defined ();
+    }
 
   const char * class_name = node->instance_name ();
 
@@ -65,9 +81,13 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
 
   if (node->is_nested ())
     {
-      ACE_OS::sprintf (full_class_name, "%s::%s",
-                       be_scope::narrow_from_scope (node->defined_in ())->decl ()->full_name (),
-                       class_name);
+      be_scope *parent = be_scope::narrow_from_scope (node->defined_in ());
+
+      ACE_OS::sprintf (
+          full_class_name, "%s::%s",
+          parent->decl ()->full_name (),
+          class_name
+        );
     }
   else
     {
@@ -92,25 +112,50 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
       << "void" << be_nl
       << full_class_name << "::_allocate_buffer (CORBA::ULong length)" << be_nl
       << "{" << be_idt_nl;
-  bt->accept(visitor);
+
+  bt->accept (visitor);
+
   *os <<" **tmp = 0;" << be_nl
       << "tmp = " << class_name << "::allocbuf (length);" << be_nl
       << be_nl
       << "if (this->buffer_ != 0)" << be_nl
       << "{" << be_idt_nl;
+
   bt->accept(visitor);
+
   *os <<" **old = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
+
   *os << "**, this->buffer_);" << be_nl
       << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
+      << "{" << be_idt_nl
       << "if (!this->release_)" << be_idt_nl
+      << "{" << be_idt_nl
       << "tmp[i] = ";
-  bt->accept (visitor);
-  *os << "::_duplicate (old[i]);" << be_uidt_nl
+
+  if (bt_is_defined)
+    {
+      bt->accept (visitor);
+
+      *os << "::_duplicate (old[i]);";
+    }
+  else
+    {
+      *os << "tao_" << pt->flat_name () << "_duplicate (old[i]);";
+    }
+
+  *os << be_uidt_nl
+      << "}" << be_uidt_nl
       << "else" << be_idt_nl
-      << "tmp[i] = old[i];" << be_uidt_nl << be_uidt_nl
+      << "{" << be_idt_nl
+      << "tmp[i] = old[i];" << be_uidt_nl 
+      << "}" << be_uidt << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl
       << "if (this->release_)" << be_idt_nl
-      << "delete[] old;" << be_uidt_nl << be_uidt_nl
+      << "{" << be_idt_nl
+      << "delete[] old;" << be_uidt_nl 
+      << "}" << be_uidt << be_uidt_nl
       << "}" << be_nl
       << "this->buffer_ = tmp;" << be_uidt_nl
       << "}" << be_nl
@@ -122,17 +167,35 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
       << "{" << be_idt_nl
       << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl
       << "return;" << be_uidt_nl;
-  bt->accept(visitor);
-  *os <<" **tmp = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
-  *os << "**, this->buffer_);" << be_nl
-      << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_nl
-      << "{" << be_idt_nl
-      << "CORBA::release (tmp[i]);" << be_nl
-      << "tmp[i] = ";
+
+  *os <<" **tmp = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
-  *os << "::_nil ();" << be_uidt_nl
-      << "}" << be_nl
+
+  *os << "**, this->buffer_);" << be_nl << be_nl
+      << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
+      << "{" << be_idt_nl;
+
+  if (bt_is_defined)
+    {
+      *os << "CORBA::release (tmp[i]);" << be_nl
+          << "tmp[i] = ";
+
+      bt->accept (visitor);
+
+      *os << "::_nil ();";
+    }
+  else
+    {
+      *os << "tao_" << pt->flat_name () << "_release (tmp[i]);" << be_nl
+          << "tmp[i] = "
+          << "tao_" << pt->flat_name () << "_nil ();";
+    }
+
+  *os << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl
       << class_name << "::freebuf (tmp);" << be_nl
       << "this->buffer_ = 0;" << be_uidt_nl
       << "}" << be_nl
@@ -147,24 +210,43 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
 
   // shrink_buffer
   *os << "void" << be_nl
-      << full_class_name << "::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)" << be_nl
+      << full_class_name 
+      << "::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)" << be_nl
       << "{" << be_idt_nl;
-  bt->accept(visitor);
-  *os <<" **tmp = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
-  *os << "**, this->buffer_);" << be_nl
-      << be_nl
-      << "for (CORBA::ULong i = nl; i < ol; ++i)" << be_nl
-      << "{" << be_idt_nl
-      << "CORBA::release (tmp[i]);" << be_nl
-      << "tmp[i] = ";
+
+  *os <<" **tmp = ACE_reinterpret_cast (";
+
   bt->accept (visitor);
-  *os << "::_nil ();" << be_uidt_nl
-      << "}" << be_uidt_nl
-      << "}" << be_nl;
+
+  *os << "**, this->buffer_);" << be_nl << be_nl
+      << "for (CORBA::ULong i = nl; i < ol; ++i)" << be_idt_nl
+      << "{" << be_idt_nl;
+
+  if (bt_is_defined)
+    {
+      *os << "CORBA::release (tmp[i]);" << be_nl
+          << "tmp[i] = ";
+
+      bt->accept (visitor);
+
+      *os << "::_nil ();";
+    }
+  else
+    {
+      *os << "tao_" << pt->flat_name () << "_release (tmp[i]);" << be_nl
+          << "tmp[i] = "
+          << "tao_" << pt->flat_name () << "_nil ();";
+    }
+
+  *os << be_uidt_nl
+      << "}" << be_uidt << be_uidt_nl
+      << "}" << be_nl << be_nl;
 
 
   be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt);
+
   if ((pt->node_type () != AST_Decl::NT_pre_defined) ||
       (prim && (prim->pt () == AST_PredefinedType::PT_pseudo) &&
        (!ACE_OS::strcmp (prim->local_name ()->get_string (), "Object"))))
@@ -178,24 +260,52 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
 	        << be_uidt_nl
 	        << ")" << be_uidt_nl
 	        << "{" << be_idt_nl;
+
       bt->accept (visitor);
+
       *os << " **tmp = ACE_static_cast (";
+
       bt->accept (visitor);
+
       *os << "**, target);" << be_nl
 	        << "*tmp = ";
-      bt->accept (visitor);
-      *os << "::_narrow (src, ACE_TRY_ENV);" << be_nl
+
+      if (bt_is_defined)
+        {
+          bt->accept (visitor);
+
+          *os << "::_narrow (src, ACE_TRY_ENV);";
+        }
+      else
+        {
+          *os << "tao_" << pt->flat_name () << "_narrow (src, ACE_TRY_ENV);";
+        }
+
+      *os << be_nl
           << "ACE_CHECK;" << be_uidt_nl
 	        << "}\n" << be_nl;
 
       *os << "CORBA_Object*" << be_nl
           << full_class_name << "::_upcast (void *src) const" <<  be_nl
 	        << "{" << be_idt_nl;
-      bt->accept (visitor);
-      *os << " **tmp = ACE_static_cast (";
-      bt->accept (visitor);
-      *os << "**, src);" << be_nl
-	        << "return *tmp;" << be_uidt_nl
+
+      if (bt_is_defined)
+        {
+          bt->accept (visitor);
+
+          *os << " **tmp = ACE_static_cast (";
+
+          bt->accept (visitor);
+
+          *os << "**, src);" << be_nl
+              << "return *tmp;";
+        }
+      else
+        {
+	        *os << "return tao_" << pt->flat_name () << "_upcast (src);";
+        }
+
+      *os << be_uidt_nl
 	        << "}" << be_nl;
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
index bf5bfb922f7..80cb8e824ba 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
@@ -55,7 +55,7 @@ be_visitor_union_cdr_op_ch::visit_union (be_union *node)
   os->indent ();
   *os << be_global->stub_export_macro () << " CORBA::Boolean"
       << " operator<< (TAO_OutputCDR &, const " << node->name ()
-      << " &); // " << be_nl;
+      << " &);" << be_nl;
   *os << be_global->stub_export_macro () << " CORBA::Boolean"
       << " operator>> (TAO_InputCDR &, "
       << node->name () << " &);\n";
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
index c0b72747218..a6dd05fc94a 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
@@ -56,14 +56,15 @@ be_visitor_union_branch_public_assign_cs::visit_union_branch (be_union_branch *n
   // Individual assignment of the members takes place inside a case
   // statement because the type of member assigned is based on the value
   // of the discriminant
-  os->indent ();
   for (unsigned long i = 0;
        i < node->label_list_length ();
        ++i)
     {
       // check if we are printing the default case
       if (node->label (i)->label_kind () == AST_UnionLabel::UL_default)
-        *os << "default:" << be_nl;
+        {
+          *os << "default:" << be_nl;
+        }
       else
         {
           *os << "case ";
@@ -71,10 +72,12 @@ be_visitor_union_branch_public_assign_cs::visit_union_branch (be_union_branch *n
           *os << ":" << be_nl;
         }
     }
+
   *os << "{" << be_idt << "\n";
 
   // first generate the type information
   be_type *bt = be_type::narrow_from_decl (node->field_type ());
+
   if (!bt)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -85,6 +88,7 @@ be_visitor_union_branch_public_assign_cs::visit_union_branch (be_union_branch *n
     }
 
   this->ctx_->node (node); // save the node
+
   if (bt->accept (this) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -93,8 +97,10 @@ be_visitor_union_branch_public_assign_cs::visit_union_branch (be_union_branch *n
                          "codegen for union_branch type failed\n"
                          ), -1);
     }
+
   *os << "}" << be_nl;
-  *os << "break;\n";
+  *os << "break;" << be_nl;
+
   return 0;
 }
 
@@ -103,18 +109,21 @@ be_visitor_union_branch_public_assign_cs::visit_union_branch (be_union_branch *n
 int
 be_visitor_union_branch_public_assign_cs::visit_array (be_array *node)
 {
-  TAO_OutStream *os; // output stream
   be_union_branch *ub =
     this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
     this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt;
 
-  // check if we are visiting this node via a visit to a typedef node
+  // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
+    {
+      bt = this->ctx_->alias ();
+    }
   else
-    bt = node;
+    {
+      bt = node;
+    }
 
   if (!ub || !bu)
     {
@@ -124,7 +133,8 @@ be_visitor_union_branch_public_assign_cs::visit_array (be_array *node)
                          "bad context information\n"
                          ), -1);
     }
-  os = this->ctx_->stream ();
+
+  TAO_OutStream *os = this->ctx_->stream ();
 
   // for anonymous arrays, the type name has a _ prepended. We compute the
   // full_name with or without the underscore and use it later on.
@@ -133,6 +143,7 @@ be_visitor_union_branch_public_assign_cs::visit_array (be_array *node)
   // save the node's local name and full name in a buffer for quick use later
   // on
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
+
   if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
       && bt->is_child (bu)) // bt is defined inside the union
     {
@@ -161,9 +172,9 @@ be_visitor_union_branch_public_assign_cs::visit_array (be_array *node)
   // set the discriminant to the appropriate label
   *os << "// make a deep copy" << be_nl;
   *os << "this->u_." << ub->local_name ()
-      << "_  = " << fname
-      << "_dup (u.u_."
-      << ub->local_name () << "_);" << be_uidt_nl;
+      << "_  = " << be_idt_nl
+      << fname << "_dup (u.u_."
+      << ub->local_name () << "_);" << be_uidt << be_uidt_nl;
 
   return 0;
 }
@@ -191,8 +202,9 @@ be_visitor_union_branch_public_assign_cs::visit_enum (be_enum *)
   // set the discriminant to the appropriate label
   // valid label
   *os << "// set the value" << be_nl
-      << "this->u_." << ub->local_name () << "_ = u.u_."
-      << ub->local_name () << "_;" << be_uidt_nl;
+      << "this->u_." << ub->local_name () << "_ = " << be_idt_nl
+      << "u.u_."
+      << ub->local_name () << "_;" << be_uidt << be_uidt_nl;
 
   return 0;
 }
@@ -200,18 +212,21 @@ be_visitor_union_branch_public_assign_cs::visit_enum (be_enum *)
 int
 be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node)
 {
-  TAO_OutStream *os; // output stream
   be_union_branch *ub =
     this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
     this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt;
 
-  // check if we are visiting this node via a visit to a typedef node
+  // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
+    {
+      bt = this->ctx_->alias ();
+    }
   else
-    bt = node;
+    {
+      bt = node;
+    }
 
   if (!ub || !bu)
     {
@@ -221,7 +236,10 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node)
                          "bad context information\n"
                          ), -1);
     }
-  os = this->ctx_->stream ();
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  idl_bool bt_is_defined = node->is_defined ();
 
   os->indent (); // start from current indentation
 
@@ -230,41 +248,68 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node)
       << bt->name () << "_var OBJECT_FIELD;" << be_nl;
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_UNION_COPY_CONSTRUCTOR)
-    // We are generating the copy constructor.
-    *os << "ACE_NEW (" << be_idt << be_idt_nl
-        << "this->u_." << ub->local_name () << "_," << be_nl
-        << "OBJECT_FIELD (" << bt->name ()
-        << "::_duplicate (u.u_." << ub->local_name ()
-        << "_->ptr ()))" << be_uidt_nl
-        << ");" << be_uidt << be_uidt_nl;
+    {
+      // We are generating the copy constructor.
+      *os << "ACE_NEW (" << be_idt << be_idt_nl
+          << "this->u_." << ub->local_name () << "_," << be_nl;
+
+      if (bt_is_defined)
+        {
+          *os << "OBJECT_FIELD (" << bt->name () << "::";
+        }
+      else
+        {
+          *os << "OBJECT_FIELD (tao_" << node->flat_name ();
+        }
+
+      *os << "_duplicate (u.u_." << ub->local_name ()
+          << "_->ptr ()))" << be_uidt_nl
+          << ");" << be_uidt << be_uidt_nl;
+    }
   else
-    // We are generating the assignment operator.
-    *os << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
-        << "this->u_." << ub->local_name () << "_," << be_nl
-        << "OBJECT_FIELD (" << bt->name ()
-        << "::_duplicate (u.u_." << ub->local_name ()
-        << "_->ptr ()))," << be_nl
-        << "*this" << be_uidt_nl
-        << ");" << be_uidt << be_uidt_nl;
+    {
+      // We are generating the assignment operator.
+      *os << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
+          << "this->u_." << ub->local_name () << "_," << be_nl;
+
+      if (bt_is_defined)
+        {
+          *os << "OBJECT_FIELD (" << bt->name () << "::";
+        }
+      else
+        {
+          *os << "OBJECT_FIELD (tao_" << node->flat_name ();
+        }
+
+      *os << "_duplicate (u.u_." << ub->local_name ()
+          << "_->ptr ()))," << be_nl
+          << "*this" << be_uidt_nl
+          << ");" << be_uidt << be_uidt_nl;
+    }
 
   return 0;
 }
 
 int
-be_visitor_union_branch_public_assign_cs::visit_interface_fwd (be_interface_fwd *node)
+be_visitor_union_branch_public_assign_cs::visit_interface_fwd (
+    be_interface_fwd *node
+  )
 {
-  TAO_OutStream *os; // output stream
   be_union_branch *ub =
     this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
     this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt;
 
-  // check if we are visiting this node via a visit to a typedef node
+  // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
+    {
+      bt = this->ctx_->alias ();
+    }
   else
-    bt = node;
+    {
+      bt = node;
+    }
 
   if (!ub || !bu)
     {
@@ -274,7 +319,10 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd (be_interface_fwd
                          "bad context information\n"
                          ), -1);
     }
-  os = this->ctx_->stream ();
+
+  TAO_OutStream *os = this->ctx_->stream ();
+
+  idl_bool bt_is_defined = node->full_definition ()->is_defined ();
 
   os->indent (); // start from current indentation
 
@@ -283,41 +331,68 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd (be_interface_fwd
       << bt->name () << "_var OBJECT_FIELD;" << be_nl;
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_UNION_COPY_CONSTRUCTOR)
-    // We are generating the copy constructor.
-    *os << "ACE_NEW (" << be_idt << be_idt_nl
-        << "this->u_." << ub->local_name () << "_," << be_nl
-        << "OBJECT_FIELD (" << bt->name ()
-        << "::_duplicate (u.u_." << ub->local_name ()
-        << "_->ptr ()))" << be_uidt_nl
-        << ");" << be_uidt << be_uidt_nl;
+    {
+      // We are generating the copy constructor.
+      *os << "ACE_NEW (" << be_idt << be_idt_nl
+          << "this->u_." << ub->local_name () << "_," << be_nl;
+
+      if (bt_is_defined)
+        {
+          *os << "OBJECT_FIELD (" << bt->name () << "::";
+        }
+      else
+        {
+          *os << "OBJECT_FIELD (tao_" << node->flat_name ();
+        }
+
+      *os << "_duplicate (u.u_." << ub->local_name ()
+          << "_->ptr ()))" << be_uidt_nl
+          << ");" << be_uidt << be_uidt_nl;
+    }
   else
-    // We are generating the assignment operator.
-    *os << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
-        << "this->u_." << ub->local_name () << "_," << be_nl
-        << "OBJECT_FIELD (" << bt->name ()
-        << "::_duplicate (u.u_." << ub->local_name ()
-        << "_->ptr ()))," << be_nl
-        << "*this" << be_uidt_nl
-        << ");" << be_uidt << be_uidt_nl;
+    {
+      // We are generating the assignment operator.
+      *os << "ACE_NEW_RETURN (" << be_idt << be_idt_nl
+          << "this->u_." << ub->local_name () << "_," << be_nl;
+
+      if (bt_is_defined)
+        {
+          *os << "OBJECT_FIELD (" << bt->name () << "::";
+        }
+      else
+        {
+          *os << "OBJECT_FIELD (tao_" << node->flat_name ();
+        }
+
+      *os << "_duplicate (u.u_." << ub->local_name ()
+          << "_->ptr ()))," << be_nl
+          << "*this" << be_uidt_nl
+          << ");" << be_uidt << be_uidt_nl;
+    }
 
   return 0;
 }
 
 int
-be_visitor_union_branch_public_assign_cs::visit_predefined_type (be_predefined_type *node)
+be_visitor_union_branch_public_assign_cs::visit_predefined_type (
+    be_predefined_type *node
+  )
 {
-  TAO_OutStream *os; // output stream
   be_union_branch *ub =
     this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
     this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt;
 
-  // check if we are visiting this node via a visit to a typedef node
+  // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
+    {
+      bt = this->ctx_->alias ();
+    }
   else
-    bt = node;
+    {
+      bt = node;
+    }
 
   if (!ub || !bu)
     {
@@ -327,7 +402,8 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type (be_predefined_t
                          "bad context information\n"
                          ), -1);
     }
-  os = this->ctx_->stream ();
+
+  TAO_OutStream *os = this->ctx_->stream ();
 
   os->indent (); // start from current indentation
   // set the discriminant to the appropriate label
@@ -412,18 +488,21 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type (be_predefined_t
 int
 be_visitor_union_branch_public_assign_cs::visit_sequence (be_sequence *node)
 {
-  TAO_OutStream *os; // output stream
   be_union_branch *ub =
     this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
     this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt;
 
-  // check if we are visiting this node via a visit to a typedef node
+  // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
+    {
+      bt = this->ctx_->alias ();
+    }
   else
-    bt = node;
+    {
+      bt = node;
+    }
 
   if (!ub || !bu)
     {
@@ -433,7 +512,8 @@ be_visitor_union_branch_public_assign_cs::visit_sequence (be_sequence *node)
                          "bad context information\n"
                          ), -1);
     }
-  os = this->ctx_->stream ();
+
+  TAO_OutStream *os = this->ctx_->stream ();
 
   os->indent (); // start from current indentation
 
@@ -475,7 +555,6 @@ be_visitor_union_branch_public_assign_cs::visit_sequence (be_sequence *node)
 int
 be_visitor_union_branch_public_assign_cs::visit_string (be_string *node)
 {
-  TAO_OutStream *os; // output stream
   be_union_branch *ub =
     this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
@@ -489,7 +568,8 @@ be_visitor_union_branch_public_assign_cs::visit_string (be_string *node)
                          "bad context information\n"
                          ), -1);
     }
-  os = this->ctx_->stream ();
+
+  TAO_OutStream *os = this->ctx_->stream ();
 
   os->indent (); // start from current indentation
 
@@ -513,18 +593,21 @@ be_visitor_union_branch_public_assign_cs::visit_string (be_string *node)
 int
 be_visitor_union_branch_public_assign_cs::visit_structure (be_structure *node)
 {
-  TAO_OutStream *os; // output stream
   be_union_branch *ub =
     this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
     this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt;
 
-  // check if we are visiting this node via a visit to a typedef node
+  // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
+    {
+      bt = this->ctx_->alias ();
+    }
   else
-    bt = node;
+    {
+      bt = node;
+    }
 
   if (!ub || !bu)
     {
@@ -534,9 +617,11 @@ be_visitor_union_branch_public_assign_cs::visit_structure (be_structure *node)
                          "bad context information\n"
                          ), -1);
     }
-  os = this->ctx_->stream ();
+
+  TAO_OutStream *os = this->ctx_->stream ();
 
   os->indent ();
+
   if (bt->size_type () == be_type::VARIABLE || node->has_constructor ())
     {
       if (this->ctx_->sub_state () == TAO_CodeGen::TAO_UNION_COPY_CONSTRUCTOR)
@@ -588,6 +673,7 @@ be_visitor_union_branch_public_assign_cs::visit_typedef (be_typedef *node)
 
   // the node to be visited in the base primitve type that gets typedefed
   be_type *bt = node->primitive_base_type ();
+
   if (!bt || (bt->accept (this) == -1))
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -604,18 +690,21 @@ be_visitor_union_branch_public_assign_cs::visit_typedef (be_typedef *node)
 int
 be_visitor_union_branch_public_assign_cs::visit_union (be_union *node)
 {
-  TAO_OutStream *os; // output stream
   be_union_branch *ub =
     this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
     this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt;
 
-  // check if we are visiting this node via a visit to a typedef node
+  // Check if we are visiting this node via a visit to a typedef node.
   if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
+    {
+      bt = this->ctx_->alias ();
+    }
   else
-    bt = node;
+    {
+      bt = node;
+    }
 
   if (!ub || !bu)
     {
@@ -625,7 +714,8 @@ be_visitor_union_branch_public_assign_cs::visit_union (be_union *node)
                          "bad context information\n"
                          ), -1);
     }
-  os = this->ctx_->stream ();
+
+  TAO_OutStream *os = this->ctx_->stream ();
 
   os->indent (); // start from current indentation
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
index 5305d8f5763..241d1885cc4 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
@@ -350,14 +350,25 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
       ub->gen_default_label_value (os, bu);
     }
 
+  idl_bool bt_is_defined = node->is_defined ();
+
   *os << ";" << be_nl
       << "typedef "
       << bt->nested_type_name (bu, "_var")
       << " OBJECT_FIELD;" << be_nl
       << "ACE_NEW (" << be_idt << be_idt_nl
-      << "this->u_." << ub->local_name () << "_," << be_nl
-      << "OBJECT_FIELD (" << bt->name ()
-      << "::_duplicate (val))" << be_uidt_nl
+      << "this->u_." << ub->local_name () << "_," << be_nl;
+
+      if (bt_is_defined)
+        {
+          *os << "OBJECT_FIELD (" << bt->name () << "::";
+        }
+      else
+        {
+          *os << "OBJECT_FIELD (tao_" << node->flat_name ();
+        }
+
+  *os << "_duplicate (val))" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
@@ -428,14 +439,25 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node)
       ub->gen_default_label_value (os, bu);
     }
 
+  idl_bool bt_is_defined = node->full_definition ()->is_defined ();
+
   *os << ";" << be_nl
       << "typedef "
       << bt->nested_type_name (bu, "_var")
       << " OBJECT_FIELD;" << be_nl
       << "ACE_NEW (" << be_idt << be_idt_nl
-      << "this->u_." << ub->local_name () << "_," << be_nl
-      << "OBJECT_FIELD (" << bt->name ()
-      << "::_duplicate (val))" << be_uidt_nl
+      << "this->u_." << ub->local_name () << "_," << be_nl;
+
+      if (bt_is_defined)
+        {
+          *os << "OBJECT_FIELD (" << bt->name () << "::";
+        }
+      else
+        {
+          *os << "OBJECT_FIELD (tao_" << node->flat_name ();
+        }
+
+  *os << "_duplicate (val))" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index cf5d8838800..e41f56d0687 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -226,6 +226,7 @@ public:
     TAO_INTERFACE_FWD_CDR_OP_CH,
     TAO_INTERFACE_FWD_CDR_OP_CI,
     TAO_INTERFACE_FWD_CDR_OP_CS,
+    TAO_INTERFACE_FWD_ANY_OP_CH,
 
     // Emitting code for the valuetype.
     TAO_VALUETYPE_CH,
diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h
index 9b3d14101ce..742002a7a7e 100644
--- a/TAO/TAO_IDL/be_include/be_decl.h
+++ b/TAO/TAO_IDL/be_include/be_decl.h
@@ -116,6 +116,7 @@ public:
   idl_bool cli_hdr_cdr_op_gen (void);
   idl_bool cli_stub_cdr_op_gen (void);
   idl_bool cli_inline_cdr_op_gen (void);
+  idl_bool cli_inline_cdr_decl_gen (void);
 
   // Set the flag indicating that code generation is done.
   void cli_hdr_gen (idl_bool);
@@ -131,6 +132,7 @@ public:
   void cli_hdr_cdr_op_gen (idl_bool);
   void cli_stub_cdr_op_gen (idl_bool);
   void cli_inline_cdr_op_gen (idl_bool);
+  void cli_inline_cdr_decl_gen (idl_bool);
 
   idl_bool is_child (be_decl *node);
   // Am I a direct child of node?
@@ -164,6 +166,7 @@ protected:
   idl_bool cli_hdr_cdr_op_gen_;
   idl_bool cli_stub_cdr_op_gen_;
   idl_bool cli_inline_cdr_op_gen_;
+  idl_bool cli_inline_cdr_decl_gen_;
 
   char *flat_name_;
   // Flattened fully scoped name.
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index a86c6d0557e..8326271b019 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -21,6 +21,7 @@
 #define _BE_GLOBAL_H
 
 class be_interface;
+class be_interface_fwd;
 
 // Defines a class containing all back end global data.
 
@@ -343,6 +344,10 @@ public:
   // Used in the generation of declarations for
   // xxx_Proxy_Broker_Factory_function_pointer.
 
+  ACE_Unbounded_Queue<be_interface_fwd *> non_defined_interfaces;
+  // Used in the generation of extern function declarations so we
+  // can use non-defined interfaces as members and parameters.
+
 private:
   size_t changing_standard_include_files_;
   // To switch between changing or non-changing standard include
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index b9103c12af3..ccf54765ed8 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -172,6 +172,10 @@ public:
   virtual void gen_copy_ctors (TAO_OutStream* os);
   // Call the copy constructors of all the base classes.
 
+  virtual void gen_stub_ctor (TAO_OutStream* os);
+  // Generated the global hooks used for non-defined forward
+  // declared interfaces, and the contructor from stub object.
+
   virtual int gen_var_defn (char *interface_name = 0);
   // Generate the var definition. If <interface_name> is not 0, generate
   // the var defn for that name. Otherwise, do it for the interface you
diff --git a/TAO/TAO_IDL/be_include/be_interface_fwd.h b/TAO/TAO_IDL/be_include/be_interface_fwd.h
index 067ff99bf54..3652c7b6495 100644
--- a/TAO/TAO_IDL/be_include/be_interface_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_interface_fwd.h
@@ -50,20 +50,6 @@ public:
   virtual ~be_interface_fwd (void);
   // Destructor.
 
-  virtual int gen_var_defn (char *local_name = 0);
-  // Generate the _var class definition.
-
-  virtual int gen_var_impl (char *local_name = 0,
-                            char *full_name = 0);
-  // Generate the implementation for the _var class.
-
-  virtual int gen_out_defn (char *local_name = 0);
-  // Generate the _out class definition.
-
-  virtual int gen_out_impl (char *local_name = 0,
-                            char *full_name = 0);
-  // Generate the _out implementation.
-
   virtual void destroy (void);
   // Cleanup function.
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h
index d61e2669a7d..00000706930 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h
@@ -29,4 +29,5 @@
 #include "be_visitor_interface_fwd/interface_fwd_ci.h"
 #include "be_visitor_interface_fwd/cdr_op_ch.h"
 #include "be_visitor_interface_fwd/cdr_op_ci.h"
+#include "be_visitor_interface_fwd/any_op_ch.h"
 #endif /* TAO_BE_VISITOR_INTERFACE_FWD_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h
new file mode 100644
index 00000000000..9cf98aa549d
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h
@@ -0,0 +1,47 @@
+//
+// $Id$
+//
+/* -*- c++ -*- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the forward declared Interface node.
+//    This one provides code generation for the Any operators.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+#ifndef _BE_INTERFACE_FWD_ANY_OP_CH_H_
+#define _BE_INTERFACE_FWD_ANY_OP_CH_H_
+
+class be_visitor_interface_fwd_any_op_ch : public be_visitor_decl
+{
+  //
+  // = TITLE
+  //   be_visitor_interface_fwd_any_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for forward declared interfaces that 
+  //   generates the Any operator declaration.
+  //
+
+public:
+  be_visitor_interface_fwd_any_op_ch (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_interface_fwd_any_op_ch (void);
+  // destructor
+
+  virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface_fwd
+};
+
+#endif /* _BE_INTERFACE_FWD_ANY_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index eeabe40d371..9d21bad13c8 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -227,6 +227,8 @@ public:
 
   UTL_StrList *pragmas (void);
 
+  void pragmas (UTL_StrList *p);
+
   idl_bool added (void);
 
   void set_added (idl_bool is_it);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
index 902ffe74b3e..1f7724de564 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
@@ -19,15 +19,24 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_IDL_IFR_BASES_CPP
-#define TAO_IDL_IFR_BASES_CPP
+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_CPP_
+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_CPP_
 
 #include "IFR_BaseS.h"
 
+#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Operation_Table.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/ORB_Core.h"
+#include "tao/Stub.h"
+#include "tao/IFR_Client_Adapter.h"
+#include "tao/PortableServer/ServerRequestInfo.h"
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+#include "ace/Dynamic_Service.h"
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
@@ -43,7 +52,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:43:18 */
+/* starting time is 12:14:19 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IRObject_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -52,46 +61,46 @@ TAO_CORBA_IRObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15,  0,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15,  0,
-     15, 15,  0, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15,  1, 15, 15, 15, 15,  0, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
+     19, 19,  0,  0, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19,  5, 19, 19, 19, 19,  0, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19,
 #else
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15,  0, 15,  0, 15, 15,
-      0, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-     15, 15, 15, 15, 15, 15,  1, 15, 15, 15,
-     15,  0, 15, 15, 15, 15, 15, 15,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19,  0, 19,  0, 19, 19,
+      0,  0, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19,  5, 19, 19, 19,
+     19,  0, 19, 19, 19, 19, 19, 19,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -102,24 +111,27 @@ TAO_CORBA_IRObject_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 {
   enum
     {
-      TOTAL_KEYWORDS = 4,
+      TOTAL_KEYWORDS = 5,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 13,
       MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 14,
-      HASH_VALUE_RANGE = 10,
+      MAX_HASH_VALUE = 18,
+      HASH_VALUE_RANGE = 14,
       DUPLICATES = 0
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},{"",0},
-      {"_is_a",  &POA_CORBA::IRObject::_is_a_skel},
+      {"_is_a",  &POA_CORBA_IRObject::_is_a_skel},
       {"",0},
-      {"destroy", 	&POA_CORBA::IRObject::destroy_skel},
-      {"",0},{"",0},{"",0},{"",0},{"",0},
-      {"_get_def_kind", 	&POA_CORBA::IRObject::_get_def_kind_skel},
-      {"_non_existent",  &POA_CORBA::IRObject::_non_existent_skel},
+      {"destroy", 	&POA_CORBA_IRObject::destroy_skel},
+      {"",0},{"",0},
+      {"_interface",  &POA_CORBA_IRObject::_interface_skel},
+      {"",0},{"",0},
+      {"_get_def_kind", 	&POA_CORBA_IRObject::_get_def_kind_skel},
+      {"",0},{"",0},{"",0},{"",0},
+      {"_non_existent",  &POA_CORBA_IRObject::_non_existent_skel},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -136,17 +148,16 @@ TAO_CORBA_IRObject_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
     }
   return 0;
 }
-/* ending time is 10:43:18 */
+/* ending time is 12:14:19 */
 static TAO_CORBA_IRObject_Perfect_Hash_OpTable tao_CORBA_IRObject_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::IRObject *tao_impl,
+    POA_CORBA_IRObject *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -185,13 +196,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get &);
   
 private:
-  POA_CORBA::IRObject *_tao_impl;
+  POA_CORBA_IRObject *_tao_impl;
   CORBA::DefinitionKind _result;
 };
 
 TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::IRObject *tao_impl,
+    POA_CORBA_IRObject *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -269,7 +280,7 @@ class TAO_ServerRequestInfo_CORBA_IRObject_destroy : public TAO_ServerRequestInf
 public:
   TAO_ServerRequestInfo_CORBA_IRObject_destroy (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::IRObject *tao_impl,
+    POA_CORBA_IRObject *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -307,13 +318,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_IRObject_destroy &);
   
 private:
-  POA_CORBA::IRObject *_tao_impl;
+  POA_CORBA_IRObject *_tao_impl;
   
 };
 
 TAO_ServerRequestInfo_CORBA_IRObject_destroy::TAO_ServerRequestInfo_CORBA_IRObject_destroy (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::IRObject *tao_impl,
+    POA_CORBA_IRObject *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -382,29 +393,29 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker *POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::the_TAO_IRObject_Strategized_Proxy_Broker (void)
+_TAO_CORBA_IRObject_Strategized_Proxy_Broker *_TAO_CORBA_IRObject_Strategized_Proxy_Broker::the_TAO_CORBA_IRObject_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_IRObject_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::_TAO_IRObject_Strategized_Proxy_Broker (void)
+_TAO_CORBA_IRObject_Strategized_Proxy_Broker::_TAO_CORBA_IRObject_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::~_TAO_IRObject_Strategized_Proxy_Broker (void)
+_TAO_CORBA_IRObject_Strategized_Proxy_Broker::~_TAO_CORBA_IRObject_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_IRObject_Proxy_Impl&
-POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::IRObject *object,
+_TAO_CORBA_IRObject_Proxy_Impl&
+_TAO_CORBA_IRObject_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_IRObject *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -422,7 +433,7 @@ POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_IRObject_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -436,7 +447,7 @@ POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_IRObject_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -446,7 +457,7 @@ POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_IRObject_Remote_Proxy_Impl,
+              ::_TAO_CORBA_IRObject_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -463,38 +474,38 @@ POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_IRObject_Proxy_Broker *
-CORBA__TAO_IRObject_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_IRObject_Proxy_Broker *
+_TAO_CORBA_IRObject_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::the_TAO_IRObject_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_IRObject_Strategized_Proxy_Broker::the_TAO_CORBA_IRObject_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_IRObject_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_IRObject_Proxy_Broker_Factory_function;
+  _TAO_CORBA_IRObject_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_IRObject_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_IRObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_IRObject_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_TAO_IRObject_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::DefinitionKind POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::def_kind (
+CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -516,16 +527,16 @@ CORBA::DefinitionKind POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::def_kind (
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
-      POA_CORBA::IRObject_ptr,
+      POA_CORBA_IRObject_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/IRObject:1.0"
+          "IDL:omg.org/CORBA_IRObject:1.0"
         )
     )->def_kind (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
+void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -545,9 +556,9 @@ void POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::IRObject_ptr,
+      POA_CORBA_IRObject_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/IRObject:1.0"
+          "IDL:omg.org/CORBA_IRObject:1.0"
         )
     )->destroy (
         ACE_TRY_ENV
@@ -560,29 +571,29 @@ void POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::IRObject::IRObject (void)
+POA_CORBA_IRObject::POA_CORBA_IRObject (void)
 {
   this->optable_ = &tao_CORBA_IRObject_optable;
 }
 
 // copy ctor
-POA_CORBA::IRObject::IRObject (const IRObject& rhs)
+POA_CORBA_IRObject::POA_CORBA_IRObject (const POA_CORBA_IRObject& rhs)
   :   TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::IRObject::~IRObject (void)
+POA_CORBA_IRObject::~POA_CORBA_IRObject (void)
 {
 }
 
-void POA_CORBA::IRObject::_get_def_kind_skel (
+void POA_CORBA_IRObject::_get_def_kind_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject *_tao_impl = (POA_CORBA::IRObject *)_tao_object_reference;
+  POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *)_tao_object_reference;
   
     CORBA::DefinitionKind _tao_retval;
 
@@ -654,14 +665,14 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::IRObject::destroy_skel (
+void POA_CORBA_IRObject::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject *_tao_impl = (POA_CORBA::IRObject *)_tao_object_reference;
+  POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
   
@@ -724,7 +735,7 @@ void POA_CORBA::IRObject::destroy_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::IRObject::_is_a_skel (
+void POA_CORBA_IRObject::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -732,7 +743,7 @@ void POA_CORBA::IRObject::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::IRObject *_tao_impl = (POA_CORBA::IRObject *) _tao_object_reference;
+  POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -747,14 +758,14 @@ void POA_CORBA::IRObject::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::IRObject::_non_existent_skel (
+void POA_CORBA_IRObject::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject *_tao_impl = (POA_CORBA::IRObject *) _tao_object_reference;
+  POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -764,7 +775,55 @@ void POA_CORBA::IRObject::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::IRObject::_is_a (
+void POA_CORBA_IRObject::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_IRObject::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -773,36 +832,36 @@ CORBA::Boolean POA_CORBA::IRObject::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::IRObject::_downcast (
+void* POA_CORBA_IRObject::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::IRObject::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_IRObject::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::IRObject::_interface_repository_id (void) const
+const char* POA_CORBA_IRObject::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/IRObject:1.0";
+  return "IDL:omg.org/CORBA_IRObject:1.0";
 }
 
-CORBA::IRObject*
-POA_CORBA::IRObject::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_IRObject*
+POA_CORBA_IRObject::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -815,9 +874,10 @@ POA_CORBA::IRObject::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::IRObject::_unchecked_narrow (obj.in ());
+  return ::CORBA_IRObject::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_Contained_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -825,7 +885,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:43:18 */
+/* starting time is 12:14:19 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Contained_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -884,7 +944,7 @@ TAO_CORBA_Contained_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 15,
+      TOTAL_KEYWORDS = 16,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -896,28 +956,29 @@ TAO_CORBA_Contained_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::Contained::move_skel},
-      {"_is_a",  &POA_CORBA::Contained::_is_a_skel},
-      {"_get_id", 	&POA_CORBA::Contained::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::Contained::_set_id_skel},
-      {"describe", 	&POA_CORBA::Contained::describe_skel},
-      {"_get_name", 	&POA_CORBA::Contained::_get_name_skel},
-      {"_set_name", 	&POA_CORBA::Contained::_set_name_skel},
-      {"_get_version", 	&POA_CORBA::Contained::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::Contained::_set_version_skel},
-      {"_get_def_kind", 	&POA_CORBA::Contained::_get_def_kind_skel},
-      {"_get_defined_in", 	&POA_CORBA::Contained::_get_defined_in_skel},
-      {"destroy", 	&POA_CORBA::Contained::destroy_skel},
-      {"_get_absolute_name", 	&POA_CORBA::Contained::_get_absolute_name_skel},
-      {"_non_existent",  &POA_CORBA::Contained::_non_existent_skel},
-      {"_get_containing_repository", 	&POA_CORBA::Contained::_get_containing_repository_skel},
+      {"move", 	&POA_CORBA_Contained::move_skel},
+      {"_is_a",  &POA_CORBA_Contained::_is_a_skel},
+      {"_get_id", 	&POA_CORBA_Contained::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_Contained::_set_id_skel},
+      {"describe", 	&POA_CORBA_Contained::describe_skel},
+      {"_get_name", 	&POA_CORBA_Contained::_get_name_skel},
+      {"_set_name", 	&POA_CORBA_Contained::_set_name_skel},
+      {"_interface",  &POA_CORBA_Contained::_interface_skel},
+      {"_get_version", 	&POA_CORBA_Contained::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_Contained::_set_version_skel},
+      {"_get_def_kind", 	&POA_CORBA_Contained::_get_def_kind_skel},
+      {"_get_defined_in", 	&POA_CORBA_Contained::_get_defined_in_skel},
+      {"destroy", 	&POA_CORBA_Contained::destroy_skel},
+      {"_get_absolute_name", 	&POA_CORBA_Contained::_get_absolute_name_skel},
+      {"_non_existent",  &POA_CORBA_Contained::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_CORBA_Contained::_get_containing_repository_skel},
     };
 
   static const signed char lookup[] =
     {
-       -6,  -2,  -9,  -2,   4,   5,  -1, -43,   8, -43, -11,  -2, -38,  13, 
-       -1,  14,  -1,  15,  16,  -1,  -1,  -1,  -1,  17,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  18, 
+       -9,  -2, -12,  -2,   4,   5,  -1,  48,   8, -45,  11,  -1, -46,  14, 
+       -1,  15,  -1,  16,  17,  -6,  -2,  -1,  -1,  18,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  19, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -951,17 +1012,16 @@ TAO_CORBA_Contained_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 10:43:18 */
+/* ending time is 12:14:19 */
 static TAO_CORBA_Contained_Perfect_Hash_OpTable tao_CORBA_Contained_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_Contained_id_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_Contained_id_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -1000,13 +1060,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_Contained_id_get &);
   
 private:
-  POA_CORBA::Contained *_tao_impl;
+  POA_CORBA_Contained *_tao_impl;
   char * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Contained_id_get::TAO_ServerRequestInfo_CORBA_Contained_id_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -1084,7 +1144,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_id_set : public TAO_ServerRequestInf
 public:
   TAO_ServerRequestInfo_CORBA_Contained_id_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     const char * id,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -1123,14 +1183,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_Contained_id_set &);
   
 private:
-  POA_CORBA::Contained *_tao_impl;
+  POA_CORBA_Contained *_tao_impl;
   const char * id_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contained_id_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     const char * id,
     CORBA::Environment &
   )
@@ -1206,7 +1266,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_name_get : public TAO_ServerRequestI
 public:
   TAO_ServerRequestInfo_CORBA_Contained_name_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -1245,13 +1305,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_Contained_name_get &);
   
 private:
-  POA_CORBA::Contained *_tao_impl;
+  POA_CORBA_Contained *_tao_impl;
   char * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Contained_name_get::TAO_ServerRequestInfo_CORBA_Contained_name_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -1329,7 +1389,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_name_set : public TAO_ServerRequestI
 public:
   TAO_ServerRequestInfo_CORBA_Contained_name_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     const char * name,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -1368,14 +1428,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_Contained_name_set &);
   
 private:
-  POA_CORBA::Contained *_tao_impl;
+  POA_CORBA_Contained *_tao_impl;
   const char * name_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Contained_name_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     const char * name,
     CORBA::Environment &
   )
@@ -1451,7 +1511,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_version_get : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_Contained_version_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -1490,13 +1550,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_Contained_version_get &);
   
 private:
-  POA_CORBA::Contained *_tao_impl;
+  POA_CORBA_Contained *_tao_impl;
   char * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Contained_version_get::TAO_ServerRequestInfo_CORBA_Contained_version_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -1574,7 +1634,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_version_set : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_Contained_version_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     const char * version,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -1613,14 +1673,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_Contained_version_set &);
   
 private:
-  POA_CORBA::Contained *_tao_impl;
+  POA_CORBA_Contained *_tao_impl;
   const char * version_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_Contained_version_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     const char * version,
     CORBA::Environment &
   )
@@ -1696,7 +1756,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_defined_in_get : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_Contained_defined_in_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -1728,20 +1788,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::Container_ptr result);
+  void result (CORBA_Container_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Contained_defined_in_get (const TAO_ServerRequestInfo_CORBA_Contained_defined_in_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Contained_defined_in_get &);
   
 private:
-  POA_CORBA::Contained *_tao_impl;
-  CORBA::Container_ptr _result;
+  POA_CORBA_Contained *_tao_impl;
+  CORBA_Container_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::TAO_ServerRequestInfo_CORBA_Contained_defined_in_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -1808,7 +1868,7 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (CORBA::Container_ptr result)
+TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (CORBA_Container_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -1819,7 +1879,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -1858,13 +1918,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get &);
   
 private:
-  POA_CORBA::Contained *_tao_impl;
+  POA_CORBA_Contained *_tao_impl;
   char * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -1942,7 +2002,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get : public T
 public:
   TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -1974,20 +2034,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::Repository_ptr result);
+  void result (CORBA_Repository_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get (const TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get &);
   
 private:
-  POA_CORBA::Contained *_tao_impl;
-  CORBA::Repository_ptr _result;
+  POA_CORBA_Contained *_tao_impl;
+  CORBA_Repository_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -2054,7 +2114,7 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (CORBA::Repository_ptr result)
+TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (CORBA_Repository_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -2065,7 +2125,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_describe : public TAO_ServerRequestI
 public:
   TAO_ServerRequestInfo_CORBA_Contained_describe (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -2097,20 +2157,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::Contained::Description * result);
+  void result (CORBA_Contained::Description * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Contained_describe (const TAO_ServerRequestInfo_CORBA_Contained_describe &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Contained_describe &);
   
 private:
-  POA_CORBA::Contained *_tao_impl;
-  CORBA::Contained::Description * _result;
+  POA_CORBA_Contained *_tao_impl;
+  CORBA_Contained::Description * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Contained_describe::TAO_ServerRequestInfo_CORBA_Contained_describe (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
+    POA_CORBA_Contained *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -2177,7 +2237,7 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Contained_describe::result (CORBA::Contained::Description * result)
+TAO_ServerRequestInfo_CORBA_Contained_describe::result (CORBA_Contained::Description * result)
 {
   // Update the result.
    this->_result = result;
@@ -2188,8 +2248,8 @@ class TAO_ServerRequestInfo_CORBA_Contained_move : public TAO_ServerRequestInfo
 public:
   TAO_ServerRequestInfo_CORBA_Contained_move (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
-    CORBA::Container_ptr new_container,
+    POA_CORBA_Contained *tao_impl,
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV = 
@@ -2229,8 +2289,8 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_Contained_move &);
   
 private:
-  POA_CORBA::Contained *_tao_impl;
-  CORBA::Container_ptr new_container_;
+  POA_CORBA_Contained *_tao_impl;
+  CORBA_Container_ptr new_container_;
   const char * new_name_;
   const char * new_version_;
   
@@ -2238,8 +2298,8 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Contained_move (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Contained *tao_impl,
-    CORBA::Container_ptr new_container,
+    POA_CORBA_Contained *tao_impl,
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &
@@ -2331,29 +2391,29 @@ TAO_ServerRequestInfo_CORBA_Contained_move::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker *POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker::the_TAO_Contained_Strategized_Proxy_Broker (void)
+_TAO_CORBA_Contained_Strategized_Proxy_Broker *_TAO_CORBA_Contained_Strategized_Proxy_Broker::the_TAO_CORBA_Contained_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_Contained_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker::_TAO_Contained_Strategized_Proxy_Broker (void)
+_TAO_CORBA_Contained_Strategized_Proxy_Broker::_TAO_CORBA_Contained_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker::~_TAO_Contained_Strategized_Proxy_Broker (void)
+_TAO_CORBA_Contained_Strategized_Proxy_Broker::~_TAO_CORBA_Contained_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_Contained_Proxy_Impl&
-POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::Contained *object,
+_TAO_CORBA_Contained_Proxy_Impl&
+_TAO_CORBA_Contained_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_Contained *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -2371,7 +2431,7 @@ POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_Contained_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2385,7 +2445,7 @@ POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_Contained_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_Contained_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -2395,7 +2455,7 @@ POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_Contained_Remote_Proxy_Impl,
+              ::_TAO_CORBA_Contained_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -2412,38 +2472,38 @@ POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_Contained_Proxy_Broker *
-CORBA__TAO_Contained_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_Contained_Proxy_Broker *
+_TAO_CORBA_Contained_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker::the_TAO_Contained_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_Contained_Strategized_Proxy_Broker::the_TAO_CORBA_Contained_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_Contained_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_Contained_Proxy_Broker_Factory_function;
+  _TAO_CORBA_Contained_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_Contained_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_Contained_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_Contained_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_Contained_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_Contained_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::_TAO_Contained_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_Contained_ThruPOA_Proxy_Impl::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-char * POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::id (
+char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2465,16 +2525,16 @@ char * POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::id (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Contained_ptr,
+      POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Contained:1.0"
+          "IDL:omg.org/CORBA_Contained:1.0"
         )
     )->id (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::id (
+void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
@@ -2495,9 +2555,9 @@ void POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::id (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::Contained_ptr,
+      POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Contained:1.0"
+          "IDL:omg.org/CORBA_Contained:1.0"
         )
     )->id (
         id,
@@ -2506,7 +2566,7 @@ void POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::id (
   return;
 }
 
-char * POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::name (
+char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2528,16 +2588,16 @@ char * POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::name (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Contained_ptr,
+      POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Contained:1.0"
+          "IDL:omg.org/CORBA_Contained:1.0"
         )
     )->name (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::name (
+void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
     CORBA_Object *_collocated_tao_target_,
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
@@ -2558,9 +2618,9 @@ void POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::name (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::Contained_ptr,
+      POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Contained:1.0"
+          "IDL:omg.org/CORBA_Contained:1.0"
         )
     )->name (
         name,
@@ -2569,7 +2629,7 @@ void POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::name (
   return;
 }
 
-char * POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::version (
+char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2591,16 +2651,16 @@ char * POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::version (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Contained_ptr,
+      POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Contained:1.0"
+          "IDL:omg.org/CORBA_Contained:1.0"
         )
     )->version (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::version (
+void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
     CORBA_Object *_collocated_tao_target_,
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
@@ -2621,9 +2681,9 @@ void POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::version (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::Contained_ptr,
+      POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Contained:1.0"
+          "IDL:omg.org/CORBA_Contained:1.0"
         )
     )->version (
         version,
@@ -2632,7 +2692,7 @@ void POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::version (
   return;
 }
 
-CORBA::Container_ptr POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::defined_in (
+CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2640,7 +2700,7 @@ CORBA::Container_ptr POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::defined_in (
     CORBA::SystemException
   ))
 {
-    CORBA::Container_var _tao_retval;
+    CORBA_Container_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -2654,16 +2714,16 @@ CORBA::Container_ptr POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::defined_in (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Contained_ptr,
+      POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Contained:1.0"
+          "IDL:omg.org/CORBA_Contained:1.0"
         )
     )->defined_in (
         ACE_TRY_ENV
       );
 }
 
-char * POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::absolute_name (
+char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2685,16 +2745,16 @@ char * POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::absolute_name (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Contained_ptr,
+      POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Contained:1.0"
+          "IDL:omg.org/CORBA_Contained:1.0"
         )
     )->absolute_name (
         ACE_TRY_ENV
       );
 }
 
-CORBA::Repository_ptr POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::containing_repository (
+CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_repository (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2702,7 +2762,7 @@ CORBA::Repository_ptr POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::containing_r
     CORBA::SystemException
   ))
 {
-    CORBA::Repository_var _tao_retval;
+    CORBA_Repository_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -2716,16 +2776,16 @@ CORBA::Repository_ptr POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::containing_r
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Contained_ptr,
+      POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Contained:1.0"
+          "IDL:omg.org/CORBA_Contained:1.0"
         )
     )->containing_repository (
         ACE_TRY_ENV
       );
 }
 
-CORBA::Contained::Description * POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
+CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2733,7 +2793,7 @@ CORBA::Contained::Description * POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::de
     CORBA::SystemException
   ))
 {
-    CORBA::Contained::Description_var _tao_retval;
+    CORBA_Contained::Description_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -2747,18 +2807,18 @@ CORBA::Contained::Description * POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::de
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Contained_ptr,
+      POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Contained:1.0"
+          "IDL:omg.org/CORBA_Contained:1.0"
         )
     )->describe (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
+void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::Container_ptr new_container,
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -2779,9 +2839,9 @@ void POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::Contained_ptr,
+      POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Contained:1.0"
+          "IDL:omg.org/CORBA_Contained:1.0"
         )
     )->move (
         new_container,
@@ -2797,30 +2857,30 @@ void POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl::move (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::Contained::Contained (void)
+POA_CORBA_Contained::POA_CORBA_Contained (void)
 {
   this->optable_ = &tao_CORBA_Contained_optable;
 }
 
 // copy ctor
-POA_CORBA::Contained::Contained (const Contained& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_Contained::POA_CORBA_Contained (const POA_CORBA_Contained& rhs)
+  :   POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::Contained::~Contained (void)
+POA_CORBA_Contained::~POA_CORBA_Contained (void)
 {
 }
 
-void POA_CORBA::Contained::_get_id_skel (
+void POA_CORBA_Contained::_get_id_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference;
+  POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *)_tao_object_reference;
   
     CORBA::String_var _tao_retval;
 
@@ -2893,7 +2953,7 @@ void POA_CORBA::Contained::_get_id_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Contained::_set_id_skel (
+void POA_CORBA_Contained::_set_id_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -2901,7 +2961,7 @@ void POA_CORBA::Contained::_set_id_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference;
+  POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
     CORBA::String_var id;
@@ -2972,14 +3032,14 @@ void POA_CORBA::Contained::_set_id_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Contained::_get_name_skel (
+void POA_CORBA_Contained::_get_name_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference;
+  POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *)_tao_object_reference;
   
     CORBA::String_var _tao_retval;
 
@@ -3052,7 +3112,7 @@ void POA_CORBA::Contained::_get_name_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Contained::_set_name_skel (
+void POA_CORBA_Contained::_set_name_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -3060,7 +3120,7 @@ void POA_CORBA::Contained::_set_name_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference;
+  POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
     CORBA::String_var name;
@@ -3131,14 +3191,14 @@ void POA_CORBA::Contained::_set_name_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Contained::_get_version_skel (
+void POA_CORBA_Contained::_get_version_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference;
+  POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *)_tao_object_reference;
   
     CORBA::String_var _tao_retval;
 
@@ -3211,7 +3271,7 @@ void POA_CORBA::Contained::_get_version_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Contained::_set_version_skel (
+void POA_CORBA_Contained::_set_version_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -3219,7 +3279,7 @@ void POA_CORBA::Contained::_set_version_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference;
+  POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
     CORBA::String_var version;
@@ -3290,16 +3350,16 @@ void POA_CORBA::Contained::_set_version_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Contained::_get_defined_in_skel (
+void POA_CORBA_Contained::_get_defined_in_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference;
+  POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *)_tao_object_reference;
   
-    CORBA::Container_var _tao_retval;
+    CORBA_Container_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -3326,7 +3386,7 @@ void POA_CORBA::Contained::_get_defined_in_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Container_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_Container_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -3370,14 +3430,14 @@ void POA_CORBA::Contained::_get_defined_in_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Contained::_get_absolute_name_skel (
+void POA_CORBA_Contained::_get_absolute_name_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference;
+  POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *)_tao_object_reference;
   
     CORBA::String_var _tao_retval;
 
@@ -3450,16 +3510,16 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Contained::_get_containing_repository_skel (
+void POA_CORBA_Contained::_get_containing_repository_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference;
+  POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *)_tao_object_reference;
   
-    CORBA::Repository_var _tao_retval;
+    CORBA_Repository_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -3486,7 +3546,7 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Repository_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_Repository_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -3530,16 +3590,16 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Contained::describe_skel (
+void POA_CORBA_Contained::describe_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference;
+  POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *)_tao_object_reference;
   
-    CORBA::Contained::Description_var _tao_retval;
+    CORBA_Contained::Description_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -3566,7 +3626,7 @@ void POA_CORBA::Contained::describe_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Contained::Description * _tao_retval_info = _tao_retval._retn ();
+      CORBA_Contained::Description * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -3610,7 +3670,7 @@ void POA_CORBA::Contained::describe_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Contained::move_skel (
+void POA_CORBA_Contained::move_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -3618,10 +3678,10 @@ void POA_CORBA::Contained::move_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *)_tao_object_reference;
+  POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::Container_var new_container;
+    CORBA_Container_var new_container;
   CORBA::String_var new_name;
   CORBA::String_var new_version;
   if (!(
@@ -3697,7 +3757,7 @@ void POA_CORBA::Contained::move_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Contained::_is_a_skel (
+void POA_CORBA_Contained::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -3705,7 +3765,7 @@ void POA_CORBA::Contained::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *) _tao_object_reference;
+  POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -3720,14 +3780,14 @@ void POA_CORBA::Contained::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::Contained::_non_existent_skel (
+void POA_CORBA_Contained::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained *_tao_impl = (POA_CORBA::Contained *) _tao_object_reference;
+  POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -3737,7 +3797,55 @@ void POA_CORBA::Contained::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::Contained::_is_a (
+void POA_CORBA_Contained::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_Contained::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3746,39 +3854,39 @@ CORBA::Boolean POA_CORBA::Contained::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::Contained::_downcast (
+void* POA_CORBA_Contained::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::Contained::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_Contained::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::Contained::_interface_repository_id (void) const
+const char* POA_CORBA_Contained::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/Contained:1.0";
+  return "IDL:omg.org/CORBA_Contained:1.0";
 }
 
-CORBA::Contained*
-POA_CORBA::Contained::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_Contained*
+POA_CORBA_Contained::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -3791,9 +3899,10 @@ POA_CORBA::Contained::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::Contained::_unchecked_narrow (obj.in ());
+  return ::CORBA_Contained::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_Container_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -3801,7 +3910,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:43:18 */
+/* starting time is 12:14:19 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Container_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -3810,46 +3919,46 @@ TAO_CORBA_Container_Perfect_Hash_OpTable::hash (const char *str, unsigned int le
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 15,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 10,
-     34,  0,  0,  0, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34,  0, 20,  5,
-     34,  0, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 15,  5, 34, 34, 34, 10,  0, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 20,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 10,
+     39,  0,  0,  0, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39,  0, 20,  5,
+     39,  0, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 15,  5, 39, 39, 39, 10,  0, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39,
 #else
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 15, 34, 10, 34,  0,
-      0,  0, 34, 34, 34, 34, 34, 34,  0, 20,
-      5, 34,  0, 34, 34, 15,  5, 34, 34, 34,
-     10,  0, 34, 34, 34, 34, 34, 34,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
+     39, 39, 39, 39, 39, 20, 39, 10, 39,  0,
+      0,  0, 39, 39, 39, 39, 39, 39,  0, 20,
+      5, 39,  0, 39, 39, 15,  5, 39, 39, 39,
+     10,  0, 39, 39, 39, 39, 39, 39,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -3860,46 +3969,47 @@ TAO_CORBA_Container_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 21,
+      TOTAL_KEYWORDS = 22,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 25,
       MIN_HASH_VALUE = 6,
-      MAX_HASH_VALUE = 33,
-      HASH_VALUE_RANGE = 28,
+      MAX_HASH_VALUE = 38,
+      HASH_VALUE_RANGE = 33,
       DUPLICATES = 2
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
-      {"lookup", 	&POA_CORBA::Container::lookup_skel},
-      {"destroy", 	&POA_CORBA::Container::destroy_skel},
-      {"lookup_name", 	&POA_CORBA::Container::lookup_name_skel},
-      {"create_value", 	&POA_CORBA::Container::create_value_skel},
-      {"create_module", 	&POA_CORBA::Container::create_module_skel},
-      {"create_native", 	&POA_CORBA::Container::create_native_skel},
-      {"create_interface", 	&POA_CORBA::Container::create_interface_skel},
-      {"create_union", 	&POA_CORBA::Container::create_union_skel},
-      {"create_struct", 	&POA_CORBA::Container::create_struct_skel},
-      {"create_constant", 	&POA_CORBA::Container::create_constant_skel},
-      {"create_exception", 	&POA_CORBA::Container::create_exception_skel},
-      {"create_local_interface", 	&POA_CORBA::Container::create_local_interface_skel},
-      {"contents", 	&POA_CORBA::Container::contents_skel},
-      {"create_abstract_interface", 	&POA_CORBA::Container::create_abstract_interface_skel},
-      {"create_value_box", 	&POA_CORBA::Container::create_value_box_skel},
-      {"create_alias", 	&POA_CORBA::Container::create_alias_skel},
-      {"_get_def_kind", 	&POA_CORBA::Container::_get_def_kind_skel},
-      {"_is_a",  &POA_CORBA::Container::_is_a_skel},
-      {"create_enum", 	&POA_CORBA::Container::create_enum_skel},
-      {"describe_contents", 	&POA_CORBA::Container::describe_contents_skel},
-      {"_non_existent",  &POA_CORBA::Container::_non_existent_skel},
+      {"lookup", 	&POA_CORBA_Container::lookup_skel},
+      {"destroy", 	&POA_CORBA_Container::destroy_skel},
+      {"lookup_name", 	&POA_CORBA_Container::lookup_name_skel},
+      {"create_value", 	&POA_CORBA_Container::create_value_skel},
+      {"create_module", 	&POA_CORBA_Container::create_module_skel},
+      {"create_native", 	&POA_CORBA_Container::create_native_skel},
+      {"create_interface", 	&POA_CORBA_Container::create_interface_skel},
+      {"create_union", 	&POA_CORBA_Container::create_union_skel},
+      {"create_struct", 	&POA_CORBA_Container::create_struct_skel},
+      {"create_constant", 	&POA_CORBA_Container::create_constant_skel},
+      {"create_exception", 	&POA_CORBA_Container::create_exception_skel},
+      {"create_local_interface", 	&POA_CORBA_Container::create_local_interface_skel},
+      {"contents", 	&POA_CORBA_Container::contents_skel},
+      {"create_abstract_interface", 	&POA_CORBA_Container::create_abstract_interface_skel},
+      {"create_value_box", 	&POA_CORBA_Container::create_value_box_skel},
+      {"create_alias", 	&POA_CORBA_Container::create_alias_skel},
+      {"_interface",  &POA_CORBA_Container::_interface_skel},
+      {"create_enum", 	&POA_CORBA_Container::create_enum_skel},
+      {"describe_contents", 	&POA_CORBA_Container::describe_contents_skel},
+      {"_get_def_kind", 	&POA_CORBA_Container::_get_def_kind_skel},
+      {"_is_a",  &POA_CORBA_Container::_is_a_skel},
+      {"_non_existent",  &POA_CORBA_Container::_non_existent_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,  -1,   6,   7,  -1, -10,  -2,   8,   9, -37, 
+       -1,  -1,  -1,  -1,  -1,  -1,   6,   7,  -1, -10,  -2,   8,   9, -42, 
        -1,  -1,  12,  13,  14,  -1,  15,  16,  17,  18,  -1,  19,  20,  21, 
-       22,  -1,  23,  24,  25,  26, 
+       -1,  -1,  22,  23,  24,  25,  -1,  26,  -1,  -1,  27, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3933,17 +4043,16 @@ TAO_CORBA_Container_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 10:43:18 */
+/* ending time is 12:14:19 */
 static TAO_CORBA_Container_Perfect_Hash_OpTable tao_CORBA_Container_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_Container_lookup : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_Container_lookup (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -3976,21 +4085,21 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::Contained_ptr result);
+  void result (CORBA_Contained_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_lookup (const TAO_ServerRequestInfo_CORBA_Container_lookup &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_lookup &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const char * search_name_;
-  CORBA::Contained_ptr _result;
+  CORBA_Contained_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_lookup::TAO_ServerRequestInfo_CORBA_Container_lookup (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * search_name,
     CORBA::Environment &
   )
@@ -4066,7 +4175,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_lookup::result (CORBA::Contained_ptr result)
+TAO_ServerRequestInfo_CORBA_Container_lookup::result (CORBA_Contained_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -4077,7 +4186,7 @@ class TAO_ServerRequestInfo_CORBA_Container_contents : public TAO_ServerRequestI
 public:
   TAO_ServerRequestInfo_CORBA_Container_contents (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited,
     CORBA::Environment &ACE_TRY_ENV = 
@@ -4111,22 +4220,22 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ContainedSeq * result);
+  void result (CORBA_ContainedSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_contents (const TAO_ServerRequestInfo_CORBA_Container_contents &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_contents &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const CORBA::DefinitionKind & limit_type_;
   const CORBA::Boolean & exclude_inherited_;
-  CORBA::ContainedSeq * _result;
+  CORBA_ContainedSeq * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_contents::TAO_ServerRequestInfo_CORBA_Container_contents (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited,
     CORBA::Environment &
@@ -4210,7 +4319,7 @@ TAO_ServerRequestInfo_CORBA_Container_contents::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_contents::result (CORBA::ContainedSeq * result)
+TAO_ServerRequestInfo_CORBA_Container_contents::result (CORBA_ContainedSeq * result)
 {
   // Update the result.
    this->_result = result;
@@ -4221,7 +4330,7 @@ class TAO_ServerRequestInfo_CORBA_Container_lookup_name : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_Container_lookup_name (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * search_name,
     const CORBA::Long & levels_to_search,
     CORBA::DefinitionKind & limit_type,
@@ -4257,24 +4366,24 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ContainedSeq * result);
+  void result (CORBA_ContainedSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_lookup_name (const TAO_ServerRequestInfo_CORBA_Container_lookup_name &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_lookup_name &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const char * search_name_;
   const CORBA::Long & levels_to_search_;
   const CORBA::DefinitionKind & limit_type_;
   const CORBA::Boolean & exclude_inherited_;
-  CORBA::ContainedSeq * _result;
+  CORBA_ContainedSeq * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_lookup_name::TAO_ServerRequestInfo_CORBA_Container_lookup_name (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * search_name,
     const CORBA::Long & levels_to_search,
     CORBA::DefinitionKind & limit_type,
@@ -4372,7 +4481,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (CORBA::ContainedSeq * result)
+TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (CORBA_ContainedSeq * result)
 {
   // Update the result.
    this->_result = result;
@@ -4383,7 +4492,7 @@ class TAO_ServerRequestInfo_CORBA_Container_describe_contents : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_Container_describe_contents (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited,
     const CORBA::Long & max_returned_objs,
@@ -4418,23 +4527,23 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::Container::DescriptionSeq * result);
+  void result (CORBA_Container::DescriptionSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_describe_contents (const TAO_ServerRequestInfo_CORBA_Container_describe_contents &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_describe_contents &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const CORBA::DefinitionKind & limit_type_;
   const CORBA::Boolean & exclude_inherited_;
   const CORBA::Long & max_returned_objs_;
-  CORBA::Container::DescriptionSeq * _result;
+  CORBA_Container::DescriptionSeq * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_describe_contents::TAO_ServerRequestInfo_CORBA_Container_describe_contents (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited,
     const CORBA::Long & max_returned_objs,
@@ -4525,7 +4634,7 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (CORBA::Container::DescriptionSeq * result)
+TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (CORBA_Container::DescriptionSeq * result)
 {
   // Update the result.
    this->_result = result;
@@ -4536,7 +4645,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_module : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_module (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
@@ -4571,23 +4680,23 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ModuleDef_ptr result);
+  void result (CORBA_ModuleDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_create_module (const TAO_ServerRequestInfo_CORBA_Container_create_module &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_module &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::ModuleDef_ptr _result;
+  CORBA_ModuleDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_create_module::TAO_ServerRequestInfo_CORBA_Container_create_module (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
@@ -4677,7 +4786,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_create_module::result (CORBA::ModuleDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Container_create_module::result (CORBA_ModuleDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -4688,11 +4797,11 @@ class TAO_ServerRequestInfo_CORBA_Container_create_constant : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_constant (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -4725,29 +4834,29 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ConstantDef_ptr result);
+  void result (CORBA_ConstantDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_create_constant (const TAO_ServerRequestInfo_CORBA_Container_create_constant &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_constant &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr type_;
+  CORBA_IDLType_ptr type_;
   const CORBA::Any & value_;
-  CORBA::ConstantDef_ptr _result;
+  CORBA_ConstantDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_CORBA_Container_create_constant (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &
   )
@@ -4848,7 +4957,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_create_constant::result (CORBA::ConstantDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Container_create_constant::result (CORBA_ConstantDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -4859,11 +4968,11 @@ class TAO_ServerRequestInfo_CORBA_Container_create_struct : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_struct (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -4895,28 +5004,28 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::StructDef_ptr result);
+  void result (CORBA_StructDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_create_struct (const TAO_ServerRequestInfo_CORBA_Container_create_struct &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_struct &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::StructMemberSeq & members_;
-  CORBA::StructDef_ptr _result;
+  const CORBA_StructMemberSeq & members_;
+  CORBA_StructDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA_Container_create_struct (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -5010,7 +5119,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_create_struct::result (CORBA::StructDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Container_create_struct::result (CORBA_StructDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -5021,12 +5130,12 @@ class TAO_ServerRequestInfo_CORBA_Container_create_union : public TAO_ServerRequ
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_union (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -5058,30 +5167,30 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::UnionDef_ptr result);
+  void result (CORBA_UnionDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_create_union (const TAO_ServerRequestInfo_CORBA_Container_create_union &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_union &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr discriminator_type_;
-  const CORBA::UnionMemberSeq & members_;
-  CORBA::UnionDef_ptr _result;
+  CORBA_IDLType_ptr discriminator_type_;
+  const CORBA_UnionMemberSeq & members_;
+  CORBA_UnionDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_Container_create_union (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -5182,7 +5291,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_create_union::result (CORBA::UnionDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Container_create_union::result (CORBA_UnionDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -5193,11 +5302,11 @@ class TAO_ServerRequestInfo_CORBA_Container_create_enum : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_enum (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -5229,28 +5338,28 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::EnumDef_ptr result);
+  void result (CORBA_EnumDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_create_enum (const TAO_ServerRequestInfo_CORBA_Container_create_enum &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_enum &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::EnumMemberSeq & members_;
-  CORBA::EnumDef_ptr _result;
+  const CORBA_EnumMemberSeq & members_;
+  CORBA_EnumDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_Container_create_enum (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -5344,7 +5453,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_create_enum::result (CORBA::EnumDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Container_create_enum::result (CORBA_EnumDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -5355,11 +5464,11 @@ class TAO_ServerRequestInfo_CORBA_Container_create_alias : public TAO_ServerRequ
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_alias (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -5391,28 +5500,28 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::AliasDef_ptr result);
+  void result (CORBA_AliasDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_create_alias (const TAO_ServerRequestInfo_CORBA_Container_create_alias &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_alias &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr original_type_;
-  CORBA::AliasDef_ptr _result;
+  CORBA_IDLType_ptr original_type_;
+  CORBA_AliasDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_Container_create_alias (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -5506,7 +5615,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_create_alias::result (CORBA::AliasDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Container_create_alias::result (CORBA_AliasDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -5517,11 +5626,11 @@ class TAO_ServerRequestInfo_CORBA_Container_create_interface : public TAO_Server
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_interface (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -5553,28 +5662,28 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::InterfaceDef_ptr result);
+  void result (CORBA_InterfaceDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_create_interface (const TAO_ServerRequestInfo_CORBA_Container_create_interface &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_interface &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::InterfaceDefSeq & base_interfaces_;
-  CORBA::InterfaceDef_ptr _result;
+  const CORBA_InterfaceDefSeq & base_interfaces_;
+  CORBA_InterfaceDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CORBA_Container_create_interface (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -5668,7 +5777,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_create_interface::result (CORBA::InterfaceDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Container_create_interface::result (CORBA_InterfaceDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -5679,17 +5788,17 @@ class TAO_ServerRequestInfo_CORBA_Container_create_value : public TAO_ServerRequ
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_value (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
     const CORBA::Boolean & is_custom,
     const CORBA::Boolean & is_abstract,
-    CORBA::ValueDef_ptr base_value,
+    CORBA_ValueDef_ptr base_value,
     const CORBA::Boolean & is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -5721,40 +5830,40 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ValueDef_ptr result);
+  void result (CORBA_ValueDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_create_value (const TAO_ServerRequestInfo_CORBA_Container_create_value &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_value &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
   const CORBA::Boolean & is_custom_;
   const CORBA::Boolean & is_abstract_;
-  CORBA::ValueDef_ptr base_value_;
+  CORBA_ValueDef_ptr base_value_;
   const CORBA::Boolean & is_truncatable_;
-  const CORBA::ValueDefSeq & abstract_base_values_;
-  const CORBA::InterfaceDefSeq & supported_interfaces_;
-  const CORBA::InitializerSeq & initializers_;
-  CORBA::ValueDef_ptr _result;
+  const CORBA_ValueDefSeq & abstract_base_values_;
+  const CORBA_InterfaceDefSeq & supported_interfaces_;
+  const CORBA_InitializerSeq & initializers_;
+  CORBA_ValueDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_Container_create_value (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
     const CORBA::Boolean & is_custom,
     const CORBA::Boolean & is_abstract,
-    CORBA::ValueDef_ptr base_value,
+    CORBA_ValueDef_ptr base_value,
     const CORBA::Boolean & is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -5887,7 +5996,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_create_value::result (CORBA::ValueDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Container_create_value::result (CORBA_ValueDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -5898,11 +6007,11 @@ class TAO_ServerRequestInfo_CORBA_Container_create_value_box : public TAO_Server
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_value_box (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -5934,28 +6043,28 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ValueBoxDef_ptr result);
+  void result (CORBA_ValueBoxDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_create_value_box (const TAO_ServerRequestInfo_CORBA_Container_create_value_box &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_value_box &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr original_type_def_;
-  CORBA::ValueBoxDef_ptr _result;
+  CORBA_IDLType_ptr original_type_def_;
+  CORBA_ValueBoxDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CORBA_Container_create_value_box (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -6049,7 +6158,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (CORBA::ValueBoxDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (CORBA_ValueBoxDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -6060,11 +6169,11 @@ class TAO_ServerRequestInfo_CORBA_Container_create_exception : public TAO_Server
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_exception (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -6096,28 +6205,28 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ExceptionDef_ptr result);
+  void result (CORBA_ExceptionDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_create_exception (const TAO_ServerRequestInfo_CORBA_Container_create_exception &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_exception &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::StructMemberSeq & members_;
-  CORBA::ExceptionDef_ptr _result;
+  const CORBA_StructMemberSeq & members_;
+  CORBA_ExceptionDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CORBA_Container_create_exception (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -6211,7 +6320,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_create_exception::result (CORBA::ExceptionDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Container_create_exception::result (CORBA_ExceptionDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -6222,7 +6331,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_native : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_native (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
@@ -6257,23 +6366,23 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::NativeDef_ptr result);
+  void result (CORBA_NativeDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_create_native (const TAO_ServerRequestInfo_CORBA_Container_create_native &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_native &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::NativeDef_ptr _result;
+  CORBA_NativeDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_create_native::TAO_ServerRequestInfo_CORBA_Container_create_native (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
@@ -6363,7 +6472,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_create_native::result (CORBA::NativeDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Container_create_native::result (CORBA_NativeDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -6374,11 +6483,11 @@ class TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface : public T
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -6410,28 +6519,28 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::AbstractInterfaceDef_ptr result);
+  void result (CORBA_AbstractInterfaceDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface (const TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::AbstractInterfaceDefSeq & base_interfaces_;
-  CORBA::AbstractInterfaceDef_ptr _result;
+  const CORBA_AbstractInterfaceDefSeq & base_interfaces_;
+  CORBA_AbstractInterfaceDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -6525,7 +6634,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (CORBA::AbstractInterfaceDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (CORBA_AbstractInterfaceDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -6536,11 +6645,11 @@ class TAO_ServerRequestInfo_CORBA_Container_create_local_interface : public TAO_
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_local_interface (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -6572,28 +6681,28 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::LocalInterfaceDef_ptr result);
+  void result (CORBA_LocalInterfaceDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Container_create_local_interface (const TAO_ServerRequestInfo_CORBA_Container_create_local_interface &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Container_create_local_interface &);
   
 private:
-  POA_CORBA::Container *_tao_impl;
+  POA_CORBA_Container *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::InterfaceDefSeq & base_interfaces_;
-  CORBA::LocalInterfaceDef_ptr _result;
+  const CORBA_InterfaceDefSeq & base_interfaces_;
+  CORBA_LocalInterfaceDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestInfo_CORBA_Container_create_local_interface (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Container *tao_impl,
+    POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -6687,7 +6796,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (CORBA::LocalInterfaceDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (CORBA_LocalInterfaceDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -6700,29 +6809,29 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (CORBA::Loc
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_Container_Strategized_Proxy_Broker *POA_CORBA::_TAO_Container_Strategized_Proxy_Broker::the_TAO_Container_Strategized_Proxy_Broker (void)
+_TAO_CORBA_Container_Strategized_Proxy_Broker *_TAO_CORBA_Container_Strategized_Proxy_Broker::the_TAO_CORBA_Container_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_Container_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_Container_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_Container_Strategized_Proxy_Broker::_TAO_Container_Strategized_Proxy_Broker (void)
+_TAO_CORBA_Container_Strategized_Proxy_Broker::_TAO_CORBA_Container_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_Container_Strategized_Proxy_Broker::~_TAO_Container_Strategized_Proxy_Broker (void)
+_TAO_CORBA_Container_Strategized_Proxy_Broker::~_TAO_CORBA_Container_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_Container_Proxy_Impl&
-POA_CORBA::_TAO_Container_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::Container *object,
+_TAO_CORBA_Container_Proxy_Impl&
+_TAO_CORBA_Container_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_Container *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -6740,7 +6849,7 @@ POA_CORBA::_TAO_Container_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_Container_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_Container_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6754,7 +6863,7 @@ POA_CORBA::_TAO_Container_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_Container_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_Container_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -6764,7 +6873,7 @@ POA_CORBA::_TAO_Container_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_Container_Remote_Proxy_Impl,
+              ::_TAO_CORBA_Container_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -6781,38 +6890,38 @@ POA_CORBA::_TAO_Container_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_Container_Proxy_Broker *
-CORBA__TAO_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_Container_Proxy_Broker *
+_TAO_CORBA_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_Container_Strategized_Proxy_Broker::the_TAO_Container_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_Container_Strategized_Proxy_Broker::the_TAO_CORBA_Container_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_Container_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_Container_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_Container_Proxy_Broker_Factory_function;
+  _TAO_CORBA_Container_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_Container_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_Container_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_Container_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_Container_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_Container_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::_TAO_Container_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_Container_ThruPOA_Proxy_Impl::_TAO_CORBA_Container_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::Contained_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
+CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup (
     CORBA_Object *_collocated_tao_target_,
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV
@@ -6821,7 +6930,7 @@ CORBA::Contained_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
     CORBA::SystemException
   ))
 {
-    CORBA::Contained_var _tao_retval;
+    CORBA_Contained_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -6835,9 +6944,9 @@ CORBA::Contained_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->lookup (
         search_name,
@@ -6845,7 +6954,7 @@ CORBA::Contained_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup (
       );
 }
 
-CORBA::ContainedSeq * POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
+CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents (
     CORBA_Object *_collocated_tao_target_,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
@@ -6855,7 +6964,7 @@ CORBA::ContainedSeq * POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
     CORBA::SystemException
   ))
 {
-    CORBA::ContainedSeq_var _tao_retval;
+    CORBA_ContainedSeq_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -6869,9 +6978,9 @@ CORBA::ContainedSeq * POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->contents (
         limit_type,
@@ -6880,7 +6989,7 @@ CORBA::ContainedSeq * POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::contents (
       );
 }
 
-CORBA::ContainedSeq * POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
+CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name (
     CORBA_Object *_collocated_tao_target_,
     const char * search_name,
     CORBA::Long levels_to_search,
@@ -6892,7 +7001,7 @@ CORBA::ContainedSeq * POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name
     CORBA::SystemException
   ))
 {
-    CORBA::ContainedSeq_var _tao_retval;
+    CORBA_ContainedSeq_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -6906,9 +7015,9 @@ CORBA::ContainedSeq * POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->lookup_name (
         search_name,
@@ -6919,7 +7028,7 @@ CORBA::ContainedSeq * POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name
       );
 }
 
-CORBA::Container::DescriptionSeq * POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
+CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::describe_contents (
     CORBA_Object *_collocated_tao_target_,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
@@ -6930,7 +7039,7 @@ CORBA::Container::DescriptionSeq * POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl:
     CORBA::SystemException
   ))
 {
-    CORBA::Container::DescriptionSeq_var _tao_retval;
+    CORBA_Container::DescriptionSeq_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -6944,9 +7053,9 @@ CORBA::Container::DescriptionSeq * POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl:
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->describe_contents (
         limit_type,
@@ -6956,7 +7065,7 @@ CORBA::Container::DescriptionSeq * POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl:
       );
 }
 
-CORBA::ModuleDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
+CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -6967,7 +7076,7 @@ CORBA::ModuleDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module
     CORBA::SystemException
   ))
 {
-    CORBA::ModuleDef_var _tao_retval;
+    CORBA_ModuleDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -6981,9 +7090,9 @@ CORBA::ModuleDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->create_module (
         id,
@@ -6993,12 +7102,12 @@ CORBA::ModuleDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_module
       );
 }
 
-CORBA::ConstantDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
+CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7006,7 +7115,7 @@ CORBA::ConstantDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_cons
     CORBA::SystemException
   ))
 {
-    CORBA::ConstantDef_var _tao_retval;
+    CORBA_ConstantDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -7020,9 +7129,9 @@ CORBA::ConstantDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_cons
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->create_constant (
         id,
@@ -7034,19 +7143,19 @@ CORBA::ConstantDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_cons
       );
 }
 
-CORBA::StructDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
+CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-    CORBA::StructDef_var _tao_retval;
+    CORBA_StructDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -7060,9 +7169,9 @@ CORBA::StructDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->create_struct (
         id,
@@ -7073,20 +7182,20 @@ CORBA::StructDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_struct
       );
 }
 
-CORBA::UnionDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
+CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-    CORBA::UnionDef_var _tao_retval;
+    CORBA_UnionDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -7100,9 +7209,9 @@ CORBA::UnionDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->create_union (
         id,
@@ -7114,19 +7223,19 @@ CORBA::UnionDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
       );
 }
 
-CORBA::EnumDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
+CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-    CORBA::EnumDef_var _tao_retval;
+    CORBA_EnumDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -7140,9 +7249,9 @@ CORBA::EnumDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->create_enum (
         id,
@@ -7153,19 +7262,19 @@ CORBA::EnumDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
       );
 }
 
-CORBA::AliasDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
+CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-    CORBA::AliasDef_var _tao_retval;
+    CORBA_AliasDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -7179,9 +7288,9 @@ CORBA::AliasDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->create_alias (
         id,
@@ -7192,19 +7301,19 @@ CORBA::AliasDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
       );
 }
 
-CORBA::InterfaceDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
+CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-    CORBA::InterfaceDef_var _tao_retval;
+    CORBA_InterfaceDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -7218,9 +7327,9 @@ CORBA::InterfaceDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_int
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->create_interface (
         id,
@@ -7231,25 +7340,25 @@ CORBA::InterfaceDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_int
       );
 }
 
-CORBA::ValueDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
+CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
     CORBA::Boolean is_custom,
     CORBA::Boolean is_abstract,
-    CORBA::ValueDef_ptr base_value,
+    CORBA_ValueDef_ptr base_value,
     CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-    CORBA::ValueDef_var _tao_retval;
+    CORBA_ValueDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -7263,9 +7372,9 @@ CORBA::ValueDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->create_value (
         id,
@@ -7282,19 +7391,19 @@ CORBA::ValueDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
       );
 }
 
-CORBA::ValueBoxDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
+CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-    CORBA::ValueBoxDef_var _tao_retval;
+    CORBA_ValueBoxDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -7308,9 +7417,9 @@ CORBA::ValueBoxDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_valu
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->create_value_box (
         id,
@@ -7321,19 +7430,19 @@ CORBA::ValueBoxDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_valu
       );
 }
 
-CORBA::ExceptionDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
+CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-    CORBA::ExceptionDef_var _tao_retval;
+    CORBA_ExceptionDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -7347,9 +7456,9 @@ CORBA::ExceptionDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exc
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->create_exception (
         id,
@@ -7360,7 +7469,7 @@ CORBA::ExceptionDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_exc
       );
 }
 
-CORBA::NativeDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
+CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
@@ -7371,7 +7480,7 @@ CORBA::NativeDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native
     CORBA::SystemException
   ))
 {
-    CORBA::NativeDef_var _tao_retval;
+    CORBA_NativeDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -7385,9 +7494,9 @@ CORBA::NativeDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->create_native (
         id,
@@ -7397,19 +7506,19 @@ CORBA::NativeDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_native
       );
 }
 
-CORBA::AbstractInterfaceDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
+CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_abstract_interface (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-    CORBA::AbstractInterfaceDef_var _tao_retval;
+    CORBA_AbstractInterfaceDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -7423,9 +7532,9 @@ CORBA::AbstractInterfaceDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::cr
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->create_abstract_interface (
         id,
@@ -7436,19 +7545,19 @@ CORBA::AbstractInterfaceDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::cr
       );
 }
 
-CORBA::LocalInterfaceDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::create_local_interface (
+CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_local_interface (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-    CORBA::LocalInterfaceDef_var _tao_retval;
+    CORBA_LocalInterfaceDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -7462,9 +7571,9 @@ CORBA::LocalInterfaceDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::creat
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Container_ptr,
+      POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Container:1.0"
+          "IDL:omg.org/CORBA_Container:1.0"
         )
     )->create_local_interface (
         id,
@@ -7480,23 +7589,23 @@ CORBA::LocalInterfaceDef_ptr POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl::creat
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::Container::Container (void)
+POA_CORBA_Container::POA_CORBA_Container (void)
 {
   this->optable_ = &tao_CORBA_Container_optable;
 }
 
 // copy ctor
-POA_CORBA::Container::Container (const Container& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_Container::POA_CORBA_Container (const POA_CORBA_Container& rhs)
+  :   POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::Container::~Container (void)
+POA_CORBA_Container::~POA_CORBA_Container (void)
 {
 }
 
-void POA_CORBA::Container::lookup_skel (
+void POA_CORBA_Container::lookup_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -7504,9 +7613,9 @@ void POA_CORBA::Container::lookup_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::Contained_var _tao_retval;
+    CORBA_Contained_var _tao_retval;
   CORBA::String_var search_name;
   if (!(
     (_tao_in >> search_name.out ())
@@ -7541,7 +7650,7 @@ void POA_CORBA::Container::lookup_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Contained_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_Contained_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -7585,7 +7694,7 @@ void POA_CORBA::Container::lookup_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::contents_skel (
+void POA_CORBA_Container::contents_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -7593,9 +7702,9 @@ void POA_CORBA::Container::contents_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::ContainedSeq_var _tao_retval;
+    CORBA_ContainedSeq_var _tao_retval;
   CORBA::DefinitionKind limit_type;
   CORBA::Boolean exclude_inherited;
   if (!(
@@ -7634,7 +7743,7 @@ void POA_CORBA::Container::contents_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ContainedSeq * _tao_retval_info = _tao_retval._retn ();
+      CORBA_ContainedSeq * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -7678,7 +7787,7 @@ void POA_CORBA::Container::contents_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::lookup_name_skel (
+void POA_CORBA_Container::lookup_name_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -7686,9 +7795,9 @@ void POA_CORBA::Container::lookup_name_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::ContainedSeq_var _tao_retval;
+    CORBA_ContainedSeq_var _tao_retval;
   CORBA::String_var search_name;
   CORBA::Long levels_to_search;
   CORBA::DefinitionKind limit_type;
@@ -7735,7 +7844,7 @@ void POA_CORBA::Container::lookup_name_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ContainedSeq * _tao_retval_info = _tao_retval._retn ();
+      CORBA_ContainedSeq * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -7779,7 +7888,7 @@ void POA_CORBA::Container::lookup_name_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::describe_contents_skel (
+void POA_CORBA_Container::describe_contents_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -7787,9 +7896,9 @@ void POA_CORBA::Container::describe_contents_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::Container::DescriptionSeq_var _tao_retval;
+    CORBA_Container::DescriptionSeq_var _tao_retval;
   CORBA::DefinitionKind limit_type;
   CORBA::Boolean exclude_inherited;
   CORBA::Long max_returned_objs;
@@ -7832,7 +7941,7 @@ void POA_CORBA::Container::describe_contents_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Container::DescriptionSeq * _tao_retval_info = _tao_retval._retn ();
+      CORBA_Container::DescriptionSeq * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -7876,7 +7985,7 @@ void POA_CORBA::Container::describe_contents_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::create_module_skel (
+void POA_CORBA_Container::create_module_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -7884,9 +7993,9 @@ void POA_CORBA::Container::create_module_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::ModuleDef_var _tao_retval;
+    CORBA_ModuleDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
@@ -7929,7 +8038,7 @@ void POA_CORBA::Container::create_module_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ModuleDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_ModuleDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -7973,7 +8082,7 @@ void POA_CORBA::Container::create_module_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::create_constant_skel (
+void POA_CORBA_Container::create_constant_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -7981,13 +8090,13 @@ void POA_CORBA::Container::create_constant_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::ConstantDef_var _tao_retval;
+    CORBA_ConstantDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::IDLType_var type;
+  CORBA_IDLType_var type;
   CORBA::Any value;
   if (!(
     (_tao_in >> id.out ()) &&
@@ -8034,7 +8143,7 @@ void POA_CORBA::Container::create_constant_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ConstantDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_ConstantDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -8078,7 +8187,7 @@ void POA_CORBA::Container::create_constant_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::create_struct_skel (
+void POA_CORBA_Container::create_struct_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -8086,13 +8195,13 @@ void POA_CORBA::Container::create_struct_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::StructDef_var _tao_retval;
+    CORBA_StructDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::StructMemberSeq members;
+  CORBA_StructMemberSeq members;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -8135,7 +8244,7 @@ void POA_CORBA::Container::create_struct_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::StructDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_StructDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -8179,7 +8288,7 @@ void POA_CORBA::Container::create_struct_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::create_union_skel (
+void POA_CORBA_Container::create_union_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -8187,14 +8296,14 @@ void POA_CORBA::Container::create_union_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::UnionDef_var _tao_retval;
+    CORBA_UnionDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::IDLType_var discriminator_type;
-  CORBA::UnionMemberSeq members;
+  CORBA_IDLType_var discriminator_type;
+  CORBA_UnionMemberSeq members;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -8240,7 +8349,7 @@ void POA_CORBA::Container::create_union_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::UnionDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_UnionDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -8284,7 +8393,7 @@ void POA_CORBA::Container::create_union_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::create_enum_skel (
+void POA_CORBA_Container::create_enum_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -8292,13 +8401,13 @@ void POA_CORBA::Container::create_enum_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::EnumDef_var _tao_retval;
+    CORBA_EnumDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::EnumMemberSeq members;
+  CORBA_EnumMemberSeq members;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -8341,7 +8450,7 @@ void POA_CORBA::Container::create_enum_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::EnumDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_EnumDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -8385,7 +8494,7 @@ void POA_CORBA::Container::create_enum_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::create_alias_skel (
+void POA_CORBA_Container::create_alias_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -8393,13 +8502,13 @@ void POA_CORBA::Container::create_alias_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::AliasDef_var _tao_retval;
+    CORBA_AliasDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::IDLType_var original_type;
+  CORBA_IDLType_var original_type;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -8442,7 +8551,7 @@ void POA_CORBA::Container::create_alias_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::AliasDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_AliasDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -8486,7 +8595,7 @@ void POA_CORBA::Container::create_alias_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::create_interface_skel (
+void POA_CORBA_Container::create_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -8494,13 +8603,13 @@ void POA_CORBA::Container::create_interface_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::InterfaceDef_var _tao_retval;
+    CORBA_InterfaceDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::InterfaceDefSeq base_interfaces;
+  CORBA_InterfaceDefSeq base_interfaces;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -8543,7 +8652,7 @@ void POA_CORBA::Container::create_interface_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -8587,7 +8696,7 @@ void POA_CORBA::Container::create_interface_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::create_value_skel (
+void POA_CORBA_Container::create_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -8595,19 +8704,19 @@ void POA_CORBA::Container::create_value_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::ValueDef_var _tao_retval;
+    CORBA_ValueDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
   CORBA::Boolean is_custom;
   CORBA::Boolean is_abstract;
-  CORBA::ValueDef_var base_value;
+  CORBA_ValueDef_var base_value;
   CORBA::Boolean is_truncatable;
-  CORBA::ValueDefSeq abstract_base_values;
-  CORBA::InterfaceDefSeq supported_interfaces;
-  CORBA::InitializerSeq initializers;
+  CORBA_ValueDefSeq abstract_base_values;
+  CORBA_InterfaceDefSeq supported_interfaces;
+  CORBA_InitializerSeq initializers;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -8668,7 +8777,7 @@ void POA_CORBA::Container::create_value_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -8712,7 +8821,7 @@ void POA_CORBA::Container::create_value_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::create_value_box_skel (
+void POA_CORBA_Container::create_value_box_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -8720,13 +8829,13 @@ void POA_CORBA::Container::create_value_box_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::ValueBoxDef_var _tao_retval;
+    CORBA_ValueBoxDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::IDLType_var original_type_def;
+  CORBA_IDLType_var original_type_def;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -8769,7 +8878,7 @@ void POA_CORBA::Container::create_value_box_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ValueBoxDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_ValueBoxDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -8813,7 +8922,7 @@ void POA_CORBA::Container::create_value_box_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::create_exception_skel (
+void POA_CORBA_Container::create_exception_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -8821,13 +8930,13 @@ void POA_CORBA::Container::create_exception_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::ExceptionDef_var _tao_retval;
+    CORBA_ExceptionDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::StructMemberSeq members;
+  CORBA_StructMemberSeq members;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -8870,7 +8979,7 @@ void POA_CORBA::Container::create_exception_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ExceptionDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_ExceptionDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -8914,7 +9023,7 @@ void POA_CORBA::Container::create_exception_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::create_native_skel (
+void POA_CORBA_Container::create_native_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -8922,9 +9031,9 @@ void POA_CORBA::Container::create_native_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::NativeDef_var _tao_retval;
+    CORBA_NativeDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
@@ -8967,7 +9076,7 @@ void POA_CORBA::Container::create_native_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::NativeDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_NativeDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -9011,7 +9120,7 @@ void POA_CORBA::Container::create_native_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::create_abstract_interface_skel (
+void POA_CORBA_Container::create_abstract_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -9019,13 +9128,13 @@ void POA_CORBA::Container::create_abstract_interface_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::AbstractInterfaceDef_var _tao_retval;
+    CORBA_AbstractInterfaceDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::AbstractInterfaceDefSeq base_interfaces;
+  CORBA_AbstractInterfaceDefSeq base_interfaces;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -9068,7 +9177,7 @@ void POA_CORBA::Container::create_abstract_interface_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::AbstractInterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_AbstractInterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -9112,7 +9221,7 @@ void POA_CORBA::Container::create_abstract_interface_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::create_local_interface_skel (
+void POA_CORBA_Container::create_local_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -9120,13 +9229,13 @@ void POA_CORBA::Container::create_local_interface_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *)_tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *)_tao_object_reference;
   
-    CORBA::LocalInterfaceDef_var _tao_retval;
+    CORBA_LocalInterfaceDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::InterfaceDefSeq base_interfaces;
+  CORBA_InterfaceDefSeq base_interfaces;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -9169,7 +9278,7 @@ void POA_CORBA::Container::create_local_interface_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::LocalInterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_LocalInterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -9213,7 +9322,7 @@ void POA_CORBA::Container::create_local_interface_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Container::_is_a_skel (
+void POA_CORBA_Container::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -9221,7 +9330,7 @@ void POA_CORBA::Container::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *) _tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -9236,14 +9345,14 @@ void POA_CORBA::Container::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::Container::_non_existent_skel (
+void POA_CORBA_Container::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container *_tao_impl = (POA_CORBA::Container *) _tao_object_reference;
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -9253,7 +9362,55 @@ void POA_CORBA::Container::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::Container::_is_a (
+void POA_CORBA_Container::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_Container::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -9262,39 +9419,39 @@ CORBA::Boolean POA_CORBA::Container::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::Container::_downcast (
+void* POA_CORBA_Container::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Container_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::Container::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_Container::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::Container::_interface_repository_id (void) const
+const char* POA_CORBA_Container::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/Container:1.0";
+  return "IDL:omg.org/CORBA_Container:1.0";
 }
 
-CORBA::Container*
-POA_CORBA::Container::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_Container*
+POA_CORBA_Container::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -9307,9 +9464,10 @@ POA_CORBA::Container::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::Container::_unchecked_narrow (obj.in ());
+  return ::CORBA_Container::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_IDLType_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -9317,7 +9475,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:43:19 */
+/* starting time is 12:14:19 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IDLType_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -9376,7 +9534,7 @@ TAO_CORBA_IDLType_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
 {
   enum
     {
-      TOTAL_KEYWORDS = 5,
+      TOTAL_KEYWORDS = 6,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 13,
       MIN_HASH_VALUE = 5,
@@ -9388,15 +9546,16 @@ TAO_CORBA_IDLType_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},{"",0},
-      {"_is_a",  &POA_CORBA::IDLType::_is_a_skel},
+      {"_is_a",  &POA_CORBA_IDLType::_is_a_skel},
       {"",0},
-      {"destroy", 	&POA_CORBA::IDLType::destroy_skel},
+      {"destroy", 	&POA_CORBA_IDLType::destroy_skel},
       {"",0},
-      {"_get_type", 	&POA_CORBA::IDLType::_get_type_skel},
-      {"",0},{"",0},{"",0},
-      {"_get_def_kind", 	&POA_CORBA::IDLType::_get_def_kind_skel},
+      {"_get_type", 	&POA_CORBA_IDLType::_get_type_skel},
+      {"_interface",  &POA_CORBA_IDLType::_interface_skel},
+      {"",0},{"",0},
+      {"_get_def_kind", 	&POA_CORBA_IDLType::_get_def_kind_skel},
       {"",0},{"",0},{"",0},{"",0},
-      {"_non_existent",  &POA_CORBA::IDLType::_non_existent_skel},
+      {"_non_existent",  &POA_CORBA_IDLType::_non_existent_skel},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -9413,17 +9572,16 @@ TAO_CORBA_IDLType_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
     }
   return 0;
 }
-/* ending time is 10:43:19 */
+/* ending time is 12:14:19 */
 static TAO_CORBA_IDLType_Perfect_Hash_OpTable tao_CORBA_IDLType_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_IDLType_type_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_IDLType_type_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::IDLType *tao_impl,
+    POA_CORBA_IDLType *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -9462,13 +9620,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_IDLType_type_get &);
   
 private:
-  POA_CORBA::IDLType *_tao_impl;
+  POA_CORBA_IDLType *_tao_impl;
   CORBA::TypeCode_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_IDLType_type_get::TAO_ServerRequestInfo_CORBA_IDLType_type_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::IDLType *tao_impl,
+    POA_CORBA_IDLType *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -9548,29 +9706,29 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (CORBA::TypeCode_ptr result
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker *POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker::the_TAO_IDLType_Strategized_Proxy_Broker (void)
+_TAO_CORBA_IDLType_Strategized_Proxy_Broker *_TAO_CORBA_IDLType_Strategized_Proxy_Broker::the_TAO_CORBA_IDLType_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_IDLType_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker::_TAO_IDLType_Strategized_Proxy_Broker (void)
+_TAO_CORBA_IDLType_Strategized_Proxy_Broker::_TAO_CORBA_IDLType_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker::~_TAO_IDLType_Strategized_Proxy_Broker (void)
+_TAO_CORBA_IDLType_Strategized_Proxy_Broker::~_TAO_CORBA_IDLType_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_IDLType_Proxy_Impl&
-POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::IDLType *object,
+_TAO_CORBA_IDLType_Proxy_Impl&
+_TAO_CORBA_IDLType_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_IDLType *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -9588,7 +9746,7 @@ POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_IDLType_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -9602,7 +9760,7 @@ POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_IDLType_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -9612,7 +9770,7 @@ POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_IDLType_Remote_Proxy_Impl,
+              ::_TAO_CORBA_IDLType_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -9629,38 +9787,38 @@ POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_IDLType_Proxy_Broker *
-CORBA__TAO_IDLType_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_IDLType_Proxy_Broker *
+_TAO_CORBA_IDLType_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker::the_TAO_IDLType_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_IDLType_Strategized_Proxy_Broker::the_TAO_CORBA_IDLType_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_IDLType_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_IDLType_Proxy_Broker_Factory_function;
+  _TAO_CORBA_IDLType_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_IDLType_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_IDLType_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_IDLType_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::_TAO_IDLType_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::TypeCode_ptr POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::type (
+CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -9682,9 +9840,9 @@ CORBA::TypeCode_ptr POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::type (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::IDLType_ptr,
+      POA_CORBA_IDLType_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/IDLType:1.0"
+          "IDL:omg.org/CORBA_IDLType:1.0"
         )
     )->type (
         ACE_TRY_ENV
@@ -9696,30 +9854,30 @@ CORBA::TypeCode_ptr POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl::type (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::IDLType::IDLType (void)
+POA_CORBA_IDLType::POA_CORBA_IDLType (void)
 {
   this->optable_ = &tao_CORBA_IDLType_optable;
 }
 
 // copy ctor
-POA_CORBA::IDLType::IDLType (const IDLType& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_IDLType::POA_CORBA_IDLType (const POA_CORBA_IDLType& rhs)
+  :   POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::IDLType::~IDLType (void)
+POA_CORBA_IDLType::~POA_CORBA_IDLType (void)
 {
 }
 
-void POA_CORBA::IDLType::_get_type_skel (
+void POA_CORBA_IDLType::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType *_tao_impl = (POA_CORBA::IDLType *)_tao_object_reference;
+  POA_CORBA_IDLType *_tao_impl = (POA_CORBA_IDLType *)_tao_object_reference;
   
     CORBA::TypeCode_var _tao_retval;
 
@@ -9792,7 +9950,7 @@ void POA_CORBA::IDLType::_get_type_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::IDLType::_is_a_skel (
+void POA_CORBA_IDLType::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -9800,7 +9958,7 @@ void POA_CORBA::IDLType::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::IDLType *_tao_impl = (POA_CORBA::IDLType *) _tao_object_reference;
+  POA_CORBA_IDLType *_tao_impl = (POA_CORBA_IDLType *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -9815,14 +9973,14 @@ void POA_CORBA::IDLType::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::IDLType::_non_existent_skel (
+void POA_CORBA_IDLType::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType *_tao_impl = (POA_CORBA::IDLType *) _tao_object_reference;
+  POA_CORBA_IDLType *_tao_impl = (POA_CORBA_IDLType *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -9832,7 +9990,55 @@ void POA_CORBA::IDLType::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::IDLType::_is_a (
+void POA_CORBA_IDLType::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_IDLType *_tao_impl = (POA_CORBA_IDLType *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_IDLType::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -9841,39 +10047,39 @@ CORBA::Boolean POA_CORBA::IDLType::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::IDLType::_downcast (
+void* POA_CORBA_IDLType::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::IDLType::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_IDLType::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::IDLType::_interface_repository_id (void) const
+const char* POA_CORBA_IDLType::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/IDLType:1.0";
+  return "IDL:omg.org/CORBA_IDLType:1.0";
 }
 
-CORBA::IDLType*
-POA_CORBA::IDLType::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_IDLType*
+POA_CORBA_IDLType::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -9886,7 +10092,7 @@ POA_CORBA::IDLType::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::IDLType::_unchecked_narrow (obj.in ());
+  return ::CORBA_IDLType::_unchecked_narrow (obj.in ());
 }
 
 
@@ -9897,7 +10103,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:43:19 */
+/* starting time is 12:14:19 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_TypedefDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -9956,7 +10162,7 @@ TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 16,
+      TOTAL_KEYWORDS = 17,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -9968,29 +10174,30 @@ TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::TypedefDef::move_skel},
-      {"_is_a",  &POA_CORBA::TypedefDef::_is_a_skel},
-      {"_get_id", 	&POA_CORBA::TypedefDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::TypedefDef::_set_id_skel},
-      {"describe", 	&POA_CORBA::TypedefDef::describe_skel},
-      {"_get_name", 	&POA_CORBA::TypedefDef::_get_name_skel},
-      {"_get_type", 	&POA_CORBA::TypedefDef::_get_type_skel},
-      {"_set_name", 	&POA_CORBA::TypedefDef::_set_name_skel},
-      {"_get_version", 	&POA_CORBA::TypedefDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::TypedefDef::_set_version_skel},
-      {"_get_def_kind", 	&POA_CORBA::TypedefDef::_get_def_kind_skel},
-      {"_get_defined_in", 	&POA_CORBA::TypedefDef::_get_defined_in_skel},
-      {"destroy", 	&POA_CORBA::TypedefDef::destroy_skel},
-      {"_get_absolute_name", 	&POA_CORBA::TypedefDef::_get_absolute_name_skel},
-      {"_non_existent",  &POA_CORBA::TypedefDef::_non_existent_skel},
-      {"_get_containing_repository", 	&POA_CORBA::TypedefDef::_get_containing_repository_skel},
+      {"move", 	&POA_CORBA_TypedefDef::move_skel},
+      {"_is_a",  &POA_CORBA_TypedefDef::_is_a_skel},
+      {"_get_id", 	&POA_CORBA_TypedefDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_TypedefDef::_set_id_skel},
+      {"describe", 	&POA_CORBA_TypedefDef::describe_skel},
+      {"_get_name", 	&POA_CORBA_TypedefDef::_get_name_skel},
+      {"_get_type", 	&POA_CORBA_TypedefDef::_get_type_skel},
+      {"_set_name", 	&POA_CORBA_TypedefDef::_set_name_skel},
+      {"_interface",  &POA_CORBA_TypedefDef::_interface_skel},
+      {"_get_version", 	&POA_CORBA_TypedefDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_TypedefDef::_set_version_skel},
+      {"_get_def_kind", 	&POA_CORBA_TypedefDef::_get_def_kind_skel},
+      {"_get_defined_in", 	&POA_CORBA_TypedefDef::_get_defined_in_skel},
+      {"destroy", 	&POA_CORBA_TypedefDef::destroy_skel},
+      {"_get_absolute_name", 	&POA_CORBA_TypedefDef::_get_absolute_name_skel},
+      {"_non_existent",  &POA_CORBA_TypedefDef::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_CORBA_TypedefDef::_get_containing_repository_skel},
     };
 
   static const signed char lookup[] =
     {
-       -6,  -2,  -9,  -3,   4,   5,  -1, -43,   8, -43, -12,  -2, -38,  14, 
-       -1,  15,  -1,  16,  17,  -1,  -1,  -1,  -1,  18,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  19, 
+       -9,  -3, -13,  -2,   4,   5,  -1,  48,   8, -45,  12,  -1, -46,  15, 
+       -1,  16,  -1,  17,  18,  -6,  -2,  -1,  -1,  19,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  20, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -10024,7 +10231,7 @@ TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 10:43:19 */
+/* ending time is 12:14:19 */
 static TAO_CORBA_TypedefDef_Perfect_Hash_OpTable tao_CORBA_TypedefDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -10035,29 +10242,29 @@ static TAO_CORBA_TypedefDef_Perfect_Hash_OpTable tao_CORBA_TypedefDef_optable;
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker::the_TAO_TypedefDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_TypedefDef_Strategized_Proxy_Broker *_TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::the_TAO_CORBA_TypedefDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker::_TAO_TypedefDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::_TAO_CORBA_TypedefDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker::~_TAO_TypedefDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::~_TAO_CORBA_TypedefDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_TypedefDef_Proxy_Impl&
-POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::TypedefDef *object,
+_TAO_CORBA_TypedefDef_Proxy_Impl&
+_TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_TypedefDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -10075,7 +10282,7 @@ POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -10089,7 +10296,7 @@ POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_TypedefDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -10099,7 +10306,7 @@ POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_TypedefDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_TypedefDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -10116,33 +10323,33 @@ POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_TypedefDef_Proxy_Broker *
-CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_TypedefDef_Proxy_Broker *
+_TAO_CORBA_TypedefDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker::the_TAO_TypedefDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::the_TAO_CORBA_TypedefDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_TypedefDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_TypedefDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_TypedefDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_TypedefDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_TypedefDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_TAO_TypedefDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
@@ -10152,25 +10359,25 @@ POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl::_TAO_TypedefDef_ThruPOA_Proxy_Imp
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::TypedefDef::TypedefDef (void)
+POA_CORBA_TypedefDef::POA_CORBA_TypedefDef (void)
 {
   this->optable_ = &tao_CORBA_TypedefDef_optable;
 }
 
 // copy ctor
-POA_CORBA::TypedefDef::TypedefDef (const TypedefDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_TypedefDef::POA_CORBA_TypedefDef (const POA_CORBA_TypedefDef& rhs)
+  :   POA_CORBA_Contained (rhs),
+    POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::TypedefDef::~TypedefDef (void)
+POA_CORBA_TypedefDef::~POA_CORBA_TypedefDef (void)
 {
 }
 
-void POA_CORBA::TypedefDef::_is_a_skel (
+void POA_CORBA_TypedefDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -10178,7 +10385,7 @@ void POA_CORBA::TypedefDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::TypedefDef *_tao_impl = (POA_CORBA::TypedefDef *) _tao_object_reference;
+  POA_CORBA_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -10193,14 +10400,14 @@ void POA_CORBA::TypedefDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::TypedefDef::_non_existent_skel (
+void POA_CORBA_TypedefDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::TypedefDef *_tao_impl = (POA_CORBA::TypedefDef *) _tao_object_reference;
+  POA_CORBA_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -10210,7 +10417,55 @@ void POA_CORBA::TypedefDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::TypedefDef::_is_a (
+void POA_CORBA_TypedefDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_TypedefDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -10219,45 +10474,45 @@ CORBA::Boolean POA_CORBA::TypedefDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::TypedefDef::_downcast (
+void* POA_CORBA_TypedefDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::TypedefDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::TypedefDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_TypedefDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::TypedefDef::_interface_repository_id (void) const
+const char* POA_CORBA_TypedefDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/TypedefDef:1.0";
+  return "IDL:omg.org/CORBA_TypedefDef:1.0";
 }
 
-CORBA::TypedefDef*
-POA_CORBA::TypedefDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_TypedefDef*
+POA_CORBA_TypedefDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -10270,7 +10525,9 @@ POA_CORBA::TypedefDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::TypedefDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_TypedefDef::_unchecked_narrow (obj.in ());
 }
 
+
+
 #endif /* ifndef */
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.h b/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
index 2b6faaa9f0d..98cc954ac43 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
@@ -19,25 +19,22 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_ID_IFR_BASES_H
-#define TAO_ID_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 "tao/IFR_Client/IFR_ExtendedC.h"
+#include "tao/IFR_Client/IFR_BaseC.h"
+
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Base.h"
+#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"
-#include "tao/PortableServer/Object_Adapter.h"
-#include "tao/PortableServer/Operation_Table.h"
-#include "tao/PortableInterceptor.h"
-#include "tao/TAO_Server_Request.h"
-
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -49,158 +46,166 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-TAO_NAMESPACE  POA_CORBA
+class POA_CORBA_IRObject;
+typedef POA_CORBA_IRObject *POA_CORBA_IRObject_ptr;
+// Forward Classes Declaration
+class _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_IRObject_Strategized_Proxy_Broker;
+
+class  POA_CORBA_IRObject :  public virtual PortableServer::ServantBase
 {
-  class IRObject;
-  typedef IRObject *IRObject_ptr;
-  // Forward Classes Declaration
-  class _TAO_IRObject_ThruPOA_Proxy_Impl;
-  class _TAO_IRObject_Strategized_Proxy_Broker;
-  
-  class  IRObject :  public virtual PortableServer::ServantBase
-  {
-  protected:
-    IRObject (void);
-
-  public:
-    IRObject (const IRObject& rhs);
-    virtual ~IRObject (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 ()
-      );
-
-    virtual void _dispatch (
-        TAO_ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::IRObject *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
+protected:
+  POA_CORBA_IRObject (void);
 
-    virtual CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_def_kind_skel (
-        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 = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void destroy_skel (
-        TAO_ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-  };
+public:
+  POA_CORBA_IRObject (const POA_CORBA_IRObject& rhs);
+  virtual ~POA_CORBA_IRObject (void);
 
-  
-  ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
-  //
-  
-  class  _TAO_IRObject_Strategized_Proxy_Broker : public virtual ::_TAO_IRObject_Proxy_Broker
-  {
-  public: 
-    _TAO_IRObject_Strategized_Proxy_Broker (void);
-    
-    virtual ~_TAO_IRObject_Strategized_Proxy_Broker (void);
-    
-    virtual ::_TAO_IRObject_Proxy_Impl &select_proxy (
-      ::CORBA::IRObject *object,
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+
+  virtual CORBA::Boolean _is_a (
+      const char* logical_type_id,
+      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 strategy,
-      CORBA::Environment &ACE_TRY_ENV
+
+  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_IRObject *_this (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+
+  virtual const char* _interface_repository_id (void) const;
+
+  virtual CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  static void _get_def_kind_skel (
+      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 = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  static void destroy_skel (
+      TAO_ServerRequest &_tao_req, 
+      void *_tao_obj, 
+      void *_tao_context, 
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+
+
+};
+
+
+///////////////////////////////////////////////////////////////////////
+//               Strategized Proxy Broker Declaration 
+//
+
+class  _TAO_CORBA_IRObject_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_IRObject_Proxy_Broker
+{
+public: 
+  _TAO_CORBA_IRObject_Strategized_Proxy_Broker (void);
   
-  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.
-    ::_TAO_IRObject_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_IRObject_Strategized_Proxy_Broker *the_TAO_IRObject_Strategized_Proxy_Broker (void);
-  };
-  
+  virtual ~_TAO_CORBA_IRObject_Strategized_Proxy_Broker (void);
   
-  //
-  //            End Strategized Proxy Broker Declaration 
-  ///////////////////////////////////////////////////////////////////////
+  virtual ::_TAO_CORBA_IRObject_Proxy_Impl &select_proxy (
+    ::CORBA_IRObject *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.
+  ::_TAO_CORBA_IRObject_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_CORBA_IRObject_Strategized_Proxy_Broker *the_TAO_CORBA_IRObject_Strategized_Proxy_Broker (void);
+};
+
+
+//
+//            End Strategized Proxy Broker Declaration 
+///////////////////////////////////////////////////////////////////////
+
+
 ///////////////////////////////////////////////////////////////////////
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_IRObject_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_IRObject_Proxy_Impl,
+class  _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_IRObject_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl
 {
 public:
-  _TAO_IRObject_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_IRObject_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl (void) { }
   
     virtual CORBA::DefinitionKind def_kind (
       CORBA_Object *_collocated_tao_target_,
@@ -225,22 +230,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  IRObject_tie : public IRObject
+class  POA_CORBA_IRObject_tie : public POA_CORBA_IRObject
 {
 public:
-  IRObject_tie (T &t);
+  POA_CORBA_IRObject_tie (T &t);
   // the T& ctor
-  IRObject_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_IRObject_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  IRObject_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_IRObject_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  IRObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_IRObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~IRObject_tie (void);
+  ~POA_CORBA_IRObject_tie (void);
   // dtor
   
   // TIE specific functions
@@ -282,26 +285,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  IRObject_tie (const IRObject_tie &);
-  void operator= (const IRObject_tie &);
+  POA_CORBA_IRObject_tie (const POA_CORBA_IRObject_tie &);
+  void operator= (const POA_CORBA_IRObject_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class Contained;
-typedef Contained *Contained_ptr;
+class POA_CORBA_Contained;
+typedef POA_CORBA_Contained *POA_CORBA_Contained_ptr;
 // Forward Classes Declaration
-class _TAO_Contained_ThruPOA_Proxy_Impl;
-class _TAO_Contained_Strategized_Proxy_Broker;
+class _TAO_CORBA_Contained_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_Contained_Strategized_Proxy_Broker;
 
-class  Contained : public virtual IRObject
+class  POA_CORBA_Contained : public virtual POA_CORBA_IRObject
 {
 protected:
-  Contained (void);
+  POA_CORBA_Contained (void);
 
 public:
-  Contained (const Contained& rhs);
-  virtual ~Contained (void);
+  POA_CORBA_Contained (const POA_CORBA_Contained& rhs);
+  virtual ~POA_CORBA_Contained (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -330,6 +332,14 @@ public:
         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,
@@ -337,7 +347,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::Contained *_this (
+  ::CORBA_Contained *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -443,7 +453,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::Container_ptr defined_in (
+  virtual CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -475,7 +485,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::Repository_ptr containing_repository (
+  virtual CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -491,7 +501,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::Contained::Description * describe (
+  virtual CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -508,7 +518,7 @@ public:
     );
 
   virtual void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -541,6 +551,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -548,15 +560,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_Contained_Strategized_Proxy_Broker : public virtual ::_TAO_Contained_Proxy_Broker
+class  _TAO_CORBA_Contained_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Contained_Proxy_Broker
 {
 public: 
-  _TAO_Contained_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_Contained_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_Contained_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_Contained_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_Contained_Proxy_Impl &select_proxy (
-    ::CORBA::Contained *object,
+  virtual ::_TAO_CORBA_Contained_Proxy_Impl &select_proxy (
+    ::CORBA_Contained *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -565,7 +577,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -574,7 +586,7 @@ 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.
-  ::_TAO_Contained_Proxy_Impl
+  ::_TAO_CORBA_Contained_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -583,7 +595,7 @@ private:
 // interface.
 
 public:
-  static _TAO_Contained_Strategized_Proxy_Broker *the_TAO_Contained_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_Contained_Strategized_Proxy_Broker *the_TAO_CORBA_Contained_Strategized_Proxy_Broker (void);
 };
 
 
@@ -596,16 +608,16 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_Contained_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_Contained_Proxy_Impl,
+class  _TAO_CORBA_Contained_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_Contained_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_Contained_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_Contained_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_Contained_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_Contained_ThruPOA_Proxy_Impl (void) { }
   
     virtual char * id (
       CORBA_Object *_collocated_tao_target_,
@@ -658,7 +670,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::Container_ptr defined_in (
+  virtual CORBA_Container_ptr defined_in (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -674,7 +686,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::Repository_ptr containing_repository (
+  virtual CORBA_Repository_ptr containing_repository (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -682,7 +694,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::Contained::Description * describe (
+  virtual CORBA_Contained::Description * describe (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -692,7 +704,7 @@ public:
 
   virtual void move (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV
@@ -708,22 +720,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  Contained_tie : public Contained
+class  POA_CORBA_Contained_tie : public POA_CORBA_Contained
 {
 public:
-  Contained_tie (T &t);
+  POA_CORBA_Contained_tie (T &t);
   // the T& ctor
-  Contained_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_Contained_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  Contained_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_Contained_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  Contained_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_Contained_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~Contained_tie (void);
+  ~POA_CORBA_Contained_tie (void);
   // dtor
   
   // TIE specific functions
@@ -794,7 +804,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -810,7 +820,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -818,7 +828,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -827,7 +837,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -859,26 +869,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  Contained_tie (const Contained_tie &);
-  void operator= (const Contained_tie &);
+  POA_CORBA_Contained_tie (const POA_CORBA_Contained_tie &);
+  void operator= (const POA_CORBA_Contained_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class Container;
-typedef Container *Container_ptr;
+class POA_CORBA_Container;
+typedef POA_CORBA_Container *POA_CORBA_Container_ptr;
 // Forward Classes Declaration
-class _TAO_Container_ThruPOA_Proxy_Impl;
-class _TAO_Container_Strategized_Proxy_Broker;
+class _TAO_CORBA_Container_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_Container_Strategized_Proxy_Broker;
 
-class  Container : public virtual IRObject
+class  POA_CORBA_Container : public virtual POA_CORBA_IRObject
 {
 protected:
-  Container (void);
+  POA_CORBA_Container (void);
 
 public:
-  Container (const Container& rhs);
-  virtual ~Container (void);
+  POA_CORBA_Container (const POA_CORBA_Container& rhs);
+  virtual ~POA_CORBA_Container (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -907,6 +916,14 @@ public:
         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,
@@ -914,14 +931,14 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::Container *_this (
+  ::CORBA_Container *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
-  virtual CORBA::Contained_ptr lookup (
+  virtual CORBA_Contained_ptr lookup (
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -938,7 +955,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::ContainedSeq * contents (
+  virtual CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -956,7 +973,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::ContainedSeq * lookup_name (
+  virtual CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
@@ -976,7 +993,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::Container::DescriptionSeq * describe_contents (
+  virtual CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs,
@@ -995,7 +1012,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::ModuleDef_ptr create_module (
+  virtual CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
       const char * version,
@@ -1014,11 +1031,11 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::ConstantDef_ptr create_constant (
+  virtual CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -1035,11 +1052,11 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::StructDef_ptr create_struct (
+  virtual CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1055,12 +1072,12 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::UnionDef_ptr create_union (
+  virtual CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1076,11 +1093,11 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::EnumDef_ptr create_enum (
+  virtual CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1096,11 +1113,11 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::AliasDef_ptr create_alias (
+  virtual CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1116,11 +1133,11 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::InterfaceDef_ptr create_interface (
+  virtual CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1136,17 +1153,17 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::ValueDef_ptr create_value (
+  virtual 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_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1162,11 +1179,11 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::ValueBoxDef_ptr create_value_box (
+  virtual CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1182,11 +1199,11 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::ExceptionDef_ptr create_exception (
+  virtual CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1202,7 +1219,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::NativeDef_ptr create_native (
+  virtual CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
       const char * version,
@@ -1221,11 +1238,11 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1241,11 +1258,11 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::LocalInterfaceDef_ptr create_local_interface (
+  virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1276,6 +1293,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -1283,15 +1302,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_Container_Strategized_Proxy_Broker : public virtual ::_TAO_Container_Proxy_Broker
+class  _TAO_CORBA_Container_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Container_Proxy_Broker
 {
 public: 
-  _TAO_Container_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_Container_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_Container_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_Container_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_Container_Proxy_Impl &select_proxy (
-    ::CORBA::Container *object,
+  virtual ::_TAO_CORBA_Container_Proxy_Impl &select_proxy (
+    ::CORBA_Container *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -1300,7 +1319,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -1309,7 +1328,7 @@ 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.
-  ::_TAO_Container_Proxy_Impl
+  ::_TAO_CORBA_Container_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -1318,7 +1337,7 @@ private:
 // interface.
 
 public:
-  static _TAO_Container_Strategized_Proxy_Broker *the_TAO_Container_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_Container_Strategized_Proxy_Broker *the_TAO_CORBA_Container_Strategized_Proxy_Broker (void);
 };
 
 
@@ -1331,18 +1350,18 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_Container_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_Container_Proxy_Impl,
+class  _TAO_CORBA_Container_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_Container_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_Container_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_Container_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_Container_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_Container_ThruPOA_Proxy_Impl (void) { }
   
-    virtual CORBA::Contained_ptr lookup (
+    virtual CORBA_Contained_ptr lookup (
       CORBA_Object *_collocated_tao_target_,
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV
@@ -1351,7 +1370,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ContainedSeq * contents (
+  virtual CORBA_ContainedSeq * contents (
       CORBA_Object *_collocated_tao_target_,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
@@ -1361,7 +1380,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ContainedSeq * lookup_name (
+  virtual CORBA_ContainedSeq * lookup_name (
       CORBA_Object *_collocated_tao_target_,
       const char * search_name,
       CORBA::Long levels_to_search,
@@ -1373,7 +1392,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::Container::DescriptionSeq * describe_contents (
+  virtual CORBA_Container::DescriptionSeq * describe_contents (
       CORBA_Object *_collocated_tao_target_,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
@@ -1384,7 +1403,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ModuleDef_ptr create_module (
+  virtual CORBA_ModuleDef_ptr create_module (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
@@ -1395,12 +1414,12 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ConstantDef_ptr create_constant (
+  virtual CORBA_ConstantDef_ptr create_constant (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1408,110 +1427,110 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::StructDef_ptr create_struct (
+  virtual CORBA_StructDef_ptr create_struct (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::UnionDef_ptr create_union (
+  virtual CORBA_UnionDef_ptr create_union (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::EnumDef_ptr create_enum (
+  virtual CORBA_EnumDef_ptr create_enum (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::AliasDef_ptr create_alias (
+  virtual CORBA_AliasDef_ptr create_alias (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::InterfaceDef_ptr create_interface (
+  virtual CORBA_InterfaceDef_ptr create_interface (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDef_ptr create_value (
+  virtual CORBA_ValueDef_ptr create_value (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
       CORBA::Boolean is_custom,
       CORBA::Boolean is_abstract,
-      CORBA::ValueDef_ptr base_value,
+      CORBA_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueBoxDef_ptr create_value_box (
+  virtual CORBA_ValueBoxDef_ptr create_value_box (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::ExceptionDef_ptr create_exception (
+  virtual CORBA_ExceptionDef_ptr create_exception (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::NativeDef_ptr create_native (
+  virtual CORBA_NativeDef_ptr create_native (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
@@ -1522,24 +1541,24 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::LocalInterfaceDef_ptr create_local_interface (
+  virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -1553,22 +1572,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  Container_tie : public Container
+class  POA_CORBA_Container_tie : public POA_CORBA_Container
 {
 public:
-  Container_tie (T &t);
+  POA_CORBA_Container_tie (T &t);
   // the T& ctor
-  Container_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_Container_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  Container_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_Container_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  Container_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_Container_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~Container_tie (void);
+  ~POA_CORBA_Container_tie (void);
   // dtor
   
   // TIE specific functions
@@ -1588,7 +1605,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  CORBA::Contained_ptr lookup (
+  CORBA_Contained_ptr lookup (
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -1597,7 +1614,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * contents (
+  CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -1607,7 +1624,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * lookup_name (
+  CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
@@ -1619,7 +1636,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container::DescriptionSeq * describe_contents (
+  CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs,
@@ -1630,7 +1647,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ModuleDef_ptr create_module (
+  CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
       const char * version,
@@ -1641,11 +1658,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ConstantDef_ptr create_constant (
+  CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -1654,11 +1671,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::StructDef_ptr create_struct (
+  CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1666,12 +1683,12 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::UnionDef_ptr create_union (
+  CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1679,11 +1696,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::EnumDef_ptr create_enum (
+  CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1691,11 +1708,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AliasDef_ptr create_alias (
+  CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1703,11 +1720,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef_ptr create_interface (
+  CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1715,17 +1732,17 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr create_value (
+  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_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1733,11 +1750,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueBoxDef_ptr create_value_box (
+  CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1745,11 +1762,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ExceptionDef_ptr create_exception (
+  CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1757,7 +1774,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::NativeDef_ptr create_native (
+  CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
       const char * version,
@@ -1768,11 +1785,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1780,11 +1797,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::LocalInterfaceDef_ptr create_local_interface (
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1814,26 +1831,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  Container_tie (const Container_tie &);
-  void operator= (const Container_tie &);
+  POA_CORBA_Container_tie (const POA_CORBA_Container_tie &);
+  void operator= (const POA_CORBA_Container_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class IDLType;
-typedef IDLType *IDLType_ptr;
+class POA_CORBA_IDLType;
+typedef POA_CORBA_IDLType *POA_CORBA_IDLType_ptr;
 // Forward Classes Declaration
-class _TAO_IDLType_ThruPOA_Proxy_Impl;
-class _TAO_IDLType_Strategized_Proxy_Broker;
+class _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_IDLType_Strategized_Proxy_Broker;
 
-class  IDLType : public virtual IRObject
+class  POA_CORBA_IDLType : public virtual POA_CORBA_IRObject
 {
 protected:
-  IDLType (void);
+  POA_CORBA_IDLType (void);
 
 public:
-  IDLType (const IDLType& rhs);
-  virtual ~IDLType (void);
+  POA_CORBA_IDLType (const POA_CORBA_IDLType& rhs);
+  virtual ~POA_CORBA_IDLType (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -1862,6 +1878,14 @@ public:
         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,
@@ -1869,7 +1893,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::IDLType *_this (
+  ::CORBA_IDLType *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -1907,6 +1931,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -1914,15 +1940,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_IDLType_Strategized_Proxy_Broker : public virtual ::_TAO_IDLType_Proxy_Broker
+class  _TAO_CORBA_IDLType_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_IDLType_Proxy_Broker
 {
 public: 
-  _TAO_IDLType_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_IDLType_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_IDLType_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_IDLType_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_IDLType_Proxy_Impl &select_proxy (
-    ::CORBA::IDLType *object,
+  virtual ::_TAO_CORBA_IDLType_Proxy_Impl &select_proxy (
+    ::CORBA_IDLType *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -1931,7 +1957,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -1940,7 +1966,7 @@ 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.
-  ::_TAO_IDLType_Proxy_Impl
+  ::_TAO_CORBA_IDLType_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -1949,7 +1975,7 @@ private:
 // interface.
 
 public:
-  static _TAO_IDLType_Strategized_Proxy_Broker *the_TAO_IDLType_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_IDLType_Strategized_Proxy_Broker *the_TAO_CORBA_IDLType_Strategized_Proxy_Broker (void);
 };
 
 
@@ -1962,16 +1988,16 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_IDLType_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_IDLType_Proxy_Impl,
+class  _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_IDLType_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_IDLType_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_IDLType_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
@@ -1988,22 +2014,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  IDLType_tie : public IDLType
+class  POA_CORBA_IDLType_tie : public POA_CORBA_IDLType
 {
 public:
-  IDLType_tie (T &t);
+  POA_CORBA_IDLType_tie (T &t);
   // the T& ctor
-  IDLType_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_IDLType_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  IDLType_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_IDLType_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  IDLType_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_IDLType_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~IDLType_tie (void);
+  ~POA_CORBA_IDLType_tie (void);
   // dtor
   
   // TIE specific functions
@@ -2053,26 +2077,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  IDLType_tie (const IDLType_tie &);
-  void operator= (const IDLType_tie &);
+  POA_CORBA_IDLType_tie (const POA_CORBA_IDLType_tie &);
+  void operator= (const POA_CORBA_IDLType_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class TypedefDef;
-typedef TypedefDef *TypedefDef_ptr;
+class POA_CORBA_TypedefDef;
+typedef POA_CORBA_TypedefDef *POA_CORBA_TypedefDef_ptr;
 // Forward Classes Declaration
-class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
-class _TAO_TypedefDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker;
 
-class  TypedefDef : public virtual Contained, public virtual IDLType
+class  POA_CORBA_TypedefDef : public virtual POA_CORBA_Contained, public virtual POA_CORBA_IDLType
 {
 protected:
-  TypedefDef (void);
+  POA_CORBA_TypedefDef (void);
 
 public:
-  TypedefDef (const TypedefDef& rhs);
-  virtual ~TypedefDef (void);
+  POA_CORBA_TypedefDef (const POA_CORBA_TypedefDef& rhs);
+  virtual ~POA_CORBA_TypedefDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -2101,6 +2124,14 @@ public:
         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,
@@ -2108,7 +2139,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::TypedefDef *_this (
+  ::CORBA_TypedefDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -2226,6 +2257,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -2233,15 +2266,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_TypedefDef_Strategized_Proxy_Broker : public virtual ::_TAO_TypedefDef_Proxy_Broker
+class  _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_TypedefDef_Proxy_Broker
 {
 public: 
-  _TAO_TypedefDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_TypedefDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_TypedefDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_TypedefDef_Proxy_Impl &select_proxy (
-    ::CORBA::TypedefDef *object,
+  virtual ::_TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy (
+    ::CORBA_TypedefDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -2250,7 +2283,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -2259,7 +2292,7 @@ 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.
-  ::_TAO_TypedefDef_Proxy_Impl
+  ::_TAO_CORBA_TypedefDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -2268,7 +2301,7 @@ private:
 // interface.
 
 public:
-  static _TAO_TypedefDef_Strategized_Proxy_Broker *the_TAO_TypedefDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker *the_TAO_CORBA_TypedefDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -2281,17 +2314,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_TypedefDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_TypedefDef_Proxy_Impl,
+class  _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_TypedefDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl, 
-  public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_TypedefDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_TypedefDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl (void) { }
   
   };
 
@@ -2300,22 +2333,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  TypedefDef_tie : public TypedefDef
+class  POA_CORBA_TypedefDef_tie : public POA_CORBA_TypedefDef
 {
 public:
-  TypedefDef_tie (T &t);
+  POA_CORBA_TypedefDef_tie (T &t);
   // the T& ctor
-  TypedefDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_TypedefDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  TypedefDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_TypedefDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  TypedefDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_TypedefDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~TypedefDef_tie (void);
+  ~POA_CORBA_TypedefDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -2386,7 +2417,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2402,7 +2433,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2410,7 +2441,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2419,7 +2450,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -2459,14 +2490,10 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  TypedefDef_tie (const TypedefDef_tie &);
-  void operator= (const TypedefDef_tie &);
+  POA_CORBA_TypedefDef_tie (const POA_CORBA_TypedefDef_tie &);
+  void operator= (const POA_CORBA_TypedefDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-}
-TAO_NAMESPACE_CLOSE
 
 #include "IFR_BaseS_T.h"
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.i b/TAO/orbsvcs/IFR_Service/IFR_BaseS.i
index 2b807866b6a..31bdd6252fd 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.i
@@ -19,302 +19,302 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-ACE_INLINE void POA_CORBA::Contained::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_Contained::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::Contained_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_Contained_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Contained::destroy_skel (
+ACE_INLINE void POA_CORBA_Contained::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::Contained_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_Contained_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Container::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_Container::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::Container_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_Container_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Container::destroy_skel (
+ACE_INLINE void POA_CORBA_Container::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::Container_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_Container_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::IDLType::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_IDLType::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::IDLType_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_IDLType_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::IDLType::destroy_skel (
+ACE_INLINE void POA_CORBA_IDLType::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::IDLType_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_IDLType_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::TypedefDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_TypedefDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::TypedefDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_TypedefDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::TypedefDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_TypedefDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::TypedefDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_TypedefDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::TypedefDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_TypedefDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::TypedefDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_TypedefDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::TypedefDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_TypedefDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::TypedefDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_TypedefDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::TypedefDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_TypedefDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::TypedefDef::describe_skel (
+ACE_INLINE void POA_CORBA_TypedefDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::TypedefDef::move_skel (
+ACE_INLINE void POA_CORBA_TypedefDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::TypedefDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_TypedefDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::TypedefDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_TypedefDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::TypedefDef::destroy_skel (
+ACE_INLINE void POA_CORBA_TypedefDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::TypedefDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.cpp b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.cpp
index b3defa3805b..60596d28367 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.cpp
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_IDL_IFR_BASES_T_CPP
-#define TAO_IDL_IFR_BASES_T_CPP
+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_T_CPP_
+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_T_CPP_
 
 #include "IFR_BaseS_T.h"
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h
index 87a3a17f2ac..20261361d0d 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_ID_IFR_BASES_T_H
-#define TAO_ID_IFR_BASES_T_H
+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_T_H_
+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_T_H_
 
 #include "ace/pre.h"
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i
index 5e48aa4d140..70070affc11 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i
@@ -19,50 +19,48 @@
 // 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>::IRObject_tie (T &t)
+POA_CORBA_IRObject_tie<T>::POA_CORBA_IRObject_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::IRObject_tie<T>::IRObject_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_IRObject_tie<T>::POA_CORBA_IRObject_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::IRObject_tie<T>::IRObject_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_IRObject_tie<T>::POA_CORBA_IRObject_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::IRObject_tie<T>::IRObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_IRObject_tie<T>::POA_CORBA_IRObject_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::IRObject_tie<T>::~IRObject_tie (void)
+POA_CORBA_IRObject_tie<T>::~POA_CORBA_IRObject_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::IRObject_tie<T>::_tied_object (void)
+POA_CORBA_IRObject_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::IRObject_tie<T>::_tied_object (T &obj)
+POA_CORBA_IRObject_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -70,7 +68,7 @@ POA_CORBA::IRObject_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::IRObject_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_IRObject_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -78,28 +76,28 @@ POA_CORBA::IRObject_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::IRObject_tie<T>::_is_owner (void)
+POA_CORBA_IRObject_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::IRObject_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_IRObject_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::IRObject_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_IRObject_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->IRObject::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_IRObject::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::IRObject_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_IRObject_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -112,7 +110,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::IRObject_tie<T>::destroy  (
+void POA_CORBA_IRObject_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -124,51 +122,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::Contained_tie<T>::Contained_tie (T &t)
+POA_CORBA_Contained_tie<T>::POA_CORBA_Contained_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::Contained_tie<T>::Contained_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_Contained_tie<T>::POA_CORBA_Contained_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::Contained_tie<T>::Contained_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_Contained_tie<T>::POA_CORBA_Contained_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::Contained_tie<T>::Contained_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_Contained_tie<T>::POA_CORBA_Contained_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::Contained_tie<T>::~Contained_tie (void)
+POA_CORBA_Contained_tie<T>::~POA_CORBA_Contained_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::Contained_tie<T>::_tied_object (void)
+POA_CORBA_Contained_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::Contained_tie<T>::_tied_object (T &obj)
+POA_CORBA_Contained_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -176,7 +171,7 @@ POA_CORBA::Contained_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::Contained_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_Contained_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -184,28 +179,28 @@ POA_CORBA::Contained_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::Contained_tie<T>::_is_owner (void)
+POA_CORBA_Contained_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::Contained_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_Contained_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Contained_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_Contained_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->Contained::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_Contained::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::Contained_tie<T>::id  (
+char * POA_CORBA_Contained_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -218,7 +213,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::Contained_tie<T>::id  (
+void POA_CORBA_Contained_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -233,7 +228,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::Contained_tie<T>::name  (
+char * POA_CORBA_Contained_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -246,7 +241,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::Contained_tie<T>::name  (
+void POA_CORBA_Contained_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -261,7 +256,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::Contained_tie<T>::version  (
+char * POA_CORBA_Contained_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -274,7 +269,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::Contained_tie<T>::version  (
+void POA_CORBA_Contained_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -289,7 +284,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::Contained_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_Contained_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -302,7 +297,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::Contained_tie<T>::absolute_name  (
+char * POA_CORBA_Contained_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -315,7 +310,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::Contained_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_Contained_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -328,7 +323,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::Contained_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_Contained_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -341,8 +336,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::Contained_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_Contained_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -360,7 +355,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::Contained_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_Contained_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -373,7 +368,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::Contained_tie<T>::destroy  (
+void POA_CORBA_Contained_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -385,51 +380,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::Container_tie<T>::Container_tie (T &t)
+POA_CORBA_Container_tie<T>::POA_CORBA_Container_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::Container_tie<T>::Container_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_Container_tie<T>::POA_CORBA_Container_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::Container_tie<T>::Container_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_Container_tie<T>::POA_CORBA_Container_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::Container_tie<T>::Container_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_Container_tie<T>::POA_CORBA_Container_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::Container_tie<T>::~Container_tie (void)
+POA_CORBA_Container_tie<T>::~POA_CORBA_Container_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::Container_tie<T>::_tied_object (void)
+POA_CORBA_Container_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::Container_tie<T>::_tied_object (T &obj)
+POA_CORBA_Container_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -437,7 +429,7 @@ POA_CORBA::Container_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::Container_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_Container_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -445,28 +437,28 @@ POA_CORBA::Container_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::Container_tie<T>::_is_owner (void)
+POA_CORBA_Container_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::Container_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_Container_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Container_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_Container_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->Container::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_Container::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained_ptr POA_CORBA::Container_tie<T>::lookup  (
+CORBA_Contained_ptr POA_CORBA_Container_tie<T>::lookup  (
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -481,7 +473,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::Container_tie<T>::contents  (
+CORBA_ContainedSeq * POA_CORBA_Container_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Environment &ACE_TRY_ENV
@@ -498,7 +490,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::Container_tie<T>::lookup_name  (
+CORBA_ContainedSeq * POA_CORBA_Container_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
@@ -519,7 +511,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container::DescriptionSeq * POA_CORBA::Container_tie<T>::describe_contents  (
+CORBA_Container::DescriptionSeq * POA_CORBA_Container_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs,
@@ -538,7 +530,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ModuleDef_ptr POA_CORBA::Container_tie<T>::create_module  (
+CORBA_ModuleDef_ptr POA_CORBA_Container_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version,
@@ -557,11 +549,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ConstantDef_ptr POA_CORBA::Container_tie<T>::create_constant  (
+CORBA_ConstantDef_ptr POA_CORBA_Container_tie<T>::create_constant  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -580,11 +572,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::StructDef_ptr POA_CORBA::Container_tie<T>::create_struct  (
+CORBA_StructDef_ptr POA_CORBA_Container_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -601,12 +593,12 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::UnionDef_ptr POA_CORBA::Container_tie<T>::create_union  (
+CORBA_UnionDef_ptr POA_CORBA_Container_tie<T>::create_union  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -624,11 +616,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::EnumDef_ptr POA_CORBA::Container_tie<T>::create_enum  (
+CORBA_EnumDef_ptr POA_CORBA_Container_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -645,11 +637,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AliasDef_ptr POA_CORBA::Container_tie<T>::create_alias  (
+CORBA_AliasDef_ptr POA_CORBA_Container_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -666,11 +658,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef_ptr POA_CORBA::Container_tie<T>::create_interface  (
+CORBA_InterfaceDef_ptr POA_CORBA_Container_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -687,17 +679,17 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_CORBA::Container_tie<T>::create_value  (
+CORBA_ValueDef_ptr POA_CORBA_Container_tie<T>::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_ValueDef_ptr base_value,
     CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -720,11 +712,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueBoxDef_ptr POA_CORBA::Container_tie<T>::create_value_box  (
+CORBA_ValueBoxDef_ptr POA_CORBA_Container_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -741,11 +733,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ExceptionDef_ptr POA_CORBA::Container_tie<T>::create_exception  (
+CORBA_ExceptionDef_ptr POA_CORBA_Container_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -762,7 +754,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::NativeDef_ptr POA_CORBA::Container_tie<T>::create_native  (
+CORBA_NativeDef_ptr POA_CORBA_Container_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version,
@@ -781,11 +773,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AbstractInterfaceDef_ptr POA_CORBA::Container_tie<T>::create_abstract_interface  (
+CORBA_AbstractInterfaceDef_ptr POA_CORBA_Container_tie<T>::create_abstract_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -802,11 +794,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::LocalInterfaceDef_ptr POA_CORBA::Container_tie<T>::create_local_interface  (
+CORBA_LocalInterfaceDef_ptr POA_CORBA_Container_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -823,7 +815,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::Container_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_Container_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -836,7 +828,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::Container_tie<T>::destroy  (
+void POA_CORBA_Container_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -848,51 +840,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::IDLType_tie<T>::IDLType_tie (T &t)
+POA_CORBA_IDLType_tie<T>::POA_CORBA_IDLType_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::IDLType_tie<T>::IDLType_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_IDLType_tie<T>::POA_CORBA_IDLType_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::IDLType_tie<T>::IDLType_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_IDLType_tie<T>::POA_CORBA_IDLType_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::IDLType_tie<T>::IDLType_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_IDLType_tie<T>::POA_CORBA_IDLType_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::IDLType_tie<T>::~IDLType_tie (void)
+POA_CORBA_IDLType_tie<T>::~POA_CORBA_IDLType_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::IDLType_tie<T>::_tied_object (void)
+POA_CORBA_IDLType_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::IDLType_tie<T>::_tied_object (T &obj)
+POA_CORBA_IDLType_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -900,7 +889,7 @@ POA_CORBA::IDLType_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::IDLType_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_IDLType_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -908,28 +897,28 @@ POA_CORBA::IDLType_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::IDLType_tie<T>::_is_owner (void)
+POA_CORBA_IDLType_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::IDLType_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_IDLType_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::IDLType_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_IDLType_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->IDLType::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_IDLType::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::IDLType_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_IDLType_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -942,7 +931,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::IDLType_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_IDLType_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -955,7 +944,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::IDLType_tie<T>::destroy  (
+void POA_CORBA_IDLType_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -967,51 +956,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::TypedefDef_tie<T>::TypedefDef_tie (T &t)
+POA_CORBA_TypedefDef_tie<T>::POA_CORBA_TypedefDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::TypedefDef_tie<T>::TypedefDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_TypedefDef_tie<T>::POA_CORBA_TypedefDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::TypedefDef_tie<T>::TypedefDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_TypedefDef_tie<T>::POA_CORBA_TypedefDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::TypedefDef_tie<T>::TypedefDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_TypedefDef_tie<T>::POA_CORBA_TypedefDef_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::TypedefDef_tie<T>::~TypedefDef_tie (void)
+POA_CORBA_TypedefDef_tie<T>::~POA_CORBA_TypedefDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::TypedefDef_tie<T>::_tied_object (void)
+POA_CORBA_TypedefDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::TypedefDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_TypedefDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -1019,7 +1005,7 @@ POA_CORBA::TypedefDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::TypedefDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_TypedefDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -1027,28 +1013,28 @@ POA_CORBA::TypedefDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::TypedefDef_tie<T>::_is_owner (void)
+POA_CORBA_TypedefDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::TypedefDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_TypedefDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::TypedefDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_TypedefDef_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->TypedefDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_TypedefDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::TypedefDef_tie<T>::id  (
+char * POA_CORBA_TypedefDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1061,7 +1047,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::TypedefDef_tie<T>::id  (
+void POA_CORBA_TypedefDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1076,7 +1062,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::TypedefDef_tie<T>::name  (
+char * POA_CORBA_TypedefDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1089,7 +1075,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::TypedefDef_tie<T>::name  (
+void POA_CORBA_TypedefDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1104,7 +1090,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::TypedefDef_tie<T>::version  (
+char * POA_CORBA_TypedefDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1117,7 +1103,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::TypedefDef_tie<T>::version  (
+void POA_CORBA_TypedefDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1132,7 +1118,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::TypedefDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_TypedefDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1145,7 +1131,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::TypedefDef_tie<T>::absolute_name  (
+char * POA_CORBA_TypedefDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1158,7 +1144,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::TypedefDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_TypedefDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1171,7 +1157,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::TypedefDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_TypedefDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1184,8 +1170,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::TypedefDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_TypedefDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -1203,7 +1189,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::TypedefDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_TypedefDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1216,7 +1202,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::TypedefDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_TypedefDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1229,7 +1215,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::TypedefDef_tie<T>::destroy  (
+void POA_CORBA_TypedefDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1241,4 +1227,3 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
index 60db51b1577..632826babd0 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
@@ -19,15 +19,23 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_IDL_IFR_BASICS_CPP
-#define TAO_IDL_IFR_BASICS_CPP
+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_CPP_
+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_CPP_
 
 #include "IFR_BasicS.h"
 
+#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Operation_Table.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/ORB_Core.h"
+#include "tao/Stub.h"
+#include "tao/IFR_Client_Adapter.h"
+#include "tao/PortableServer/ServerRequestInfo.h"
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+#include "ace/Dynamic_Service.h"
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
@@ -43,7 +51,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:37 */
+/* starting time is 13:56:20 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Repository_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -66,9 +74,9 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::hash (const char *str, unsigned int l
      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
      52, 52, 52, 52, 52, 52, 52, 52, 52,  5,
      52,  0,  4, 10, 52,  5, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52,  8, 30, 15,
+     52, 52, 52, 52, 52, 52, 52,  8, 25, 15,
      52,  0, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 30,  0, 52, 52, 52, 20,  0, 52,
+     52, 52, 30,  0, 52, 52, 52, 25,  0, 52,
      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
@@ -89,9 +97,9 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::hash (const char *str, unsigned int l
      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
      52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
      52, 52, 52, 52, 52, 30, 52,  5, 52,  0,
-      4, 10, 52,  5, 52, 52, 52, 52,  8, 30,
+      4, 10, 52,  5, 52, 52, 52, 52,  8, 25,
      15, 52,  0, 52, 52, 30,  0, 52, 52, 52,
-     20,  0, 52, 52, 52, 52, 52, 52,
+     25,  0, 52, 52, 52, 52, 52, 52,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -102,7 +110,7 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 29,
+      TOTAL_KEYWORDS = 30,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 25,
       MIN_HASH_VALUE = 11,
@@ -115,35 +123,36 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     {
       {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
       {"",0},{"",0},
-      {"destroy", 	&POA_CORBA::Repository::destroy_skel},
-      {"create_array", 	&POA_CORBA::Repository::create_array_skel},
-      {"create_struct", 	&POA_CORBA::Repository::create_struct_skel},
-      {"lookup", 	&POA_CORBA::Repository::lookup_skel},
-      {"create_constant", 	&POA_CORBA::Repository::create_constant_skel},
-      {"create_fixed", 	&POA_CORBA::Repository::create_fixed_skel},
-      {"create_string", 	&POA_CORBA::Repository::create_string_skel},
-      {"create_wstring", 	&POA_CORBA::Repository::create_wstring_skel},
-      {"lookup_id", 	&POA_CORBA::Repository::lookup_id_skel},
-      {"create_value", 	&POA_CORBA::Repository::create_value_skel},
-      {"create_module", 	&POA_CORBA::Repository::create_module_skel},
-      {"create_native", 	&POA_CORBA::Repository::create_native_skel},
-      {"create_sequence", 	&POA_CORBA::Repository::create_sequence_skel},
-      {"create_interface", 	&POA_CORBA::Repository::create_interface_skel},
-      {"create_union", 	&POA_CORBA::Repository::create_union_skel},
-      {"get_primitive", 	&POA_CORBA::Repository::get_primitive_skel},
-      {"lookup_name", 	&POA_CORBA::Repository::lookup_name_skel},
-      {"create_exception", 	&POA_CORBA::Repository::create_exception_skel},
-      {"create_local_interface", 	&POA_CORBA::Repository::create_local_interface_skel},
-      {"create_abstract_interface", 	&POA_CORBA::Repository::create_abstract_interface_skel},
-      {"create_value_box", 	&POA_CORBA::Repository::create_value_box_skel},
-      {"get_canonical_typecode", 	&POA_CORBA::Repository::get_canonical_typecode_skel},
-      {"contents", 	&POA_CORBA::Repository::contents_skel},
-      {"_is_a",  &POA_CORBA::Repository::_is_a_skel},
-      {"create_enum", 	&POA_CORBA::Repository::create_enum_skel},
-      {"create_alias", 	&POA_CORBA::Repository::create_alias_skel},
-      {"_non_existent",  &POA_CORBA::Repository::_non_existent_skel},
-      {"_get_def_kind", 	&POA_CORBA::Repository::_get_def_kind_skel},
-      {"describe_contents", 	&POA_CORBA::Repository::describe_contents_skel},
+      {"destroy", 	&POA_CORBA_Repository::destroy_skel},
+      {"create_array", 	&POA_CORBA_Repository::create_array_skel},
+      {"create_struct", 	&POA_CORBA_Repository::create_struct_skel},
+      {"lookup", 	&POA_CORBA_Repository::lookup_skel},
+      {"create_constant", 	&POA_CORBA_Repository::create_constant_skel},
+      {"create_fixed", 	&POA_CORBA_Repository::create_fixed_skel},
+      {"create_string", 	&POA_CORBA_Repository::create_string_skel},
+      {"create_wstring", 	&POA_CORBA_Repository::create_wstring_skel},
+      {"lookup_id", 	&POA_CORBA_Repository::lookup_id_skel},
+      {"create_value", 	&POA_CORBA_Repository::create_value_skel},
+      {"create_module", 	&POA_CORBA_Repository::create_module_skel},
+      {"create_native", 	&POA_CORBA_Repository::create_native_skel},
+      {"create_sequence", 	&POA_CORBA_Repository::create_sequence_skel},
+      {"create_interface", 	&POA_CORBA_Repository::create_interface_skel},
+      {"create_union", 	&POA_CORBA_Repository::create_union_skel},
+      {"get_primitive", 	&POA_CORBA_Repository::get_primitive_skel},
+      {"lookup_name", 	&POA_CORBA_Repository::lookup_name_skel},
+      {"create_exception", 	&POA_CORBA_Repository::create_exception_skel},
+      {"create_local_interface", 	&POA_CORBA_Repository::create_local_interface_skel},
+      {"create_abstract_interface", 	&POA_CORBA_Repository::create_abstract_interface_skel},
+      {"create_enum", 	&POA_CORBA_Repository::create_enum_skel},
+      {"get_canonical_typecode", 	&POA_CORBA_Repository::get_canonical_typecode_skel},
+      {"contents", 	&POA_CORBA_Repository::contents_skel},
+      {"_is_a",  &POA_CORBA_Repository::_is_a_skel},
+      {"create_value_box", 	&POA_CORBA_Repository::create_value_box_skel},
+      {"create_alias", 	&POA_CORBA_Repository::create_alias_skel},
+      {"_non_existent",  &POA_CORBA_Repository::_non_existent_skel},
+      {"_get_def_kind", 	&POA_CORBA_Repository::_get_def_kind_skel},
+      {"_interface",  &POA_CORBA_Repository::_interface_skel},
+      {"describe_contents", 	&POA_CORBA_Repository::describe_contents_skel},
     };
 
   static const signed char lookup[] =
@@ -151,7 +160,7 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, -21,  -2,  11,  12,  13, 
        14,  15,  16,  -1,  17,  18,  -1,  19,  20, -65,  -1,  23,  24,  25, 
        26,  27,  -1,  28,  29,  -1,  -1,  30,  31,  32,  33,  -1,  34,  35, 
-       36,  37,  -1,  -1,  -1,  38,  -1,  -1,  -1,  39, 
+       36,  37,  -1,  -1,  -1,  38,  -1,  -1,  39,  40, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -185,17 +194,16 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 10:44:37 */
+/* ending time is 13:56:20 */
 static TAO_CORBA_Repository_Perfect_Hash_OpTable tao_CORBA_Repository_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_Repository_lookup_id : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_Repository_lookup_id (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Repository *tao_impl,
+    POA_CORBA_Repository *tao_impl,
     const char * search_id,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -228,21 +236,21 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::Contained_ptr result);
+  void result (CORBA_Contained_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Repository_lookup_id (const TAO_ServerRequestInfo_CORBA_Repository_lookup_id &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Repository_lookup_id &);
   
 private:
-  POA_CORBA::Repository *_tao_impl;
+  POA_CORBA_Repository *_tao_impl;
   const char * search_id_;
-  CORBA::Contained_ptr _result;
+  CORBA_Contained_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Repository_lookup_id::TAO_ServerRequestInfo_CORBA_Repository_lookup_id (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Repository *tao_impl,
+    POA_CORBA_Repository *tao_impl,
     const char * search_id,
     CORBA::Environment &
   )
@@ -318,7 +326,7 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (CORBA::Contained_ptr result)
+TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (CORBA_Contained_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -329,7 +337,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode : public TAO
 public:
   TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Repository *tao_impl,
+    POA_CORBA_Repository *tao_impl,
     CORBA::TypeCode_ptr tc,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -369,14 +377,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode &);
   
 private:
-  POA_CORBA::Repository *_tao_impl;
+  POA_CORBA_Repository *_tao_impl;
   CORBA::TypeCode_ptr tc_;
   CORBA::TypeCode_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Repository *tao_impl,
+    POA_CORBA_Repository *tao_impl,
     CORBA::TypeCode_ptr tc,
     CORBA::Environment &
   )
@@ -463,7 +471,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_get_primitive : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_Repository_get_primitive (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Repository *tao_impl,
+    POA_CORBA_Repository *tao_impl,
     CORBA::PrimitiveKind & kind,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -496,21 +504,21 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::PrimitiveDef_ptr result);
+  void result (CORBA_PrimitiveDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Repository_get_primitive (const TAO_ServerRequestInfo_CORBA_Repository_get_primitive &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Repository_get_primitive &);
   
 private:
-  POA_CORBA::Repository *_tao_impl;
+  POA_CORBA_Repository *_tao_impl;
   const CORBA::PrimitiveKind & kind_;
-  CORBA::PrimitiveDef_ptr _result;
+  CORBA_PrimitiveDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Repository_get_primitive::TAO_ServerRequestInfo_CORBA_Repository_get_primitive (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Repository *tao_impl,
+    POA_CORBA_Repository *tao_impl,
     CORBA::PrimitiveKind & kind,
     CORBA::Environment &
   )
@@ -587,7 +595,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (CORBA::PrimitiveDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (CORBA_PrimitiveDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -598,7 +606,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_create_string : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_Repository_create_string (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Repository *tao_impl,
+    POA_CORBA_Repository *tao_impl,
     const CORBA::ULong & bound,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -631,21 +639,21 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::StringDef_ptr result);
+  void result (CORBA_StringDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Repository_create_string (const TAO_ServerRequestInfo_CORBA_Repository_create_string &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Repository_create_string &);
   
 private:
-  POA_CORBA::Repository *_tao_impl;
+  POA_CORBA_Repository *_tao_impl;
   const CORBA::ULong & bound_;
-  CORBA::StringDef_ptr _result;
+  CORBA_StringDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Repository_create_string::TAO_ServerRequestInfo_CORBA_Repository_create_string (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Repository *tao_impl,
+    POA_CORBA_Repository *tao_impl,
     const CORBA::ULong & bound,
     CORBA::Environment &
   )
@@ -721,7 +729,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Repository_create_string::result (CORBA::StringDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Repository_create_string::result (CORBA_StringDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -732,7 +740,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_create_wstring : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_Repository_create_wstring (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Repository *tao_impl,
+    POA_CORBA_Repository *tao_impl,
     const CORBA::ULong & bound,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -765,21 +773,21 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::WstringDef_ptr result);
+  void result (CORBA_WstringDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Repository_create_wstring (const TAO_ServerRequestInfo_CORBA_Repository_create_wstring &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Repository_create_wstring &);
   
 private:
-  POA_CORBA::Repository *_tao_impl;
+  POA_CORBA_Repository *_tao_impl;
   const CORBA::ULong & bound_;
-  CORBA::WstringDef_ptr _result;
+  CORBA_WstringDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Repository_create_wstring::TAO_ServerRequestInfo_CORBA_Repository_create_wstring (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Repository *tao_impl,
+    POA_CORBA_Repository *tao_impl,
     const CORBA::ULong & bound,
     CORBA::Environment &
   )
@@ -855,7 +863,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (CORBA::WstringDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (CORBA_WstringDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -866,9 +874,9 @@ class TAO_ServerRequestInfo_CORBA_Repository_create_sequence : public TAO_Server
 public:
   TAO_ServerRequestInfo_CORBA_Repository_create_sequence (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Repository *tao_impl,
+    POA_CORBA_Repository *tao_impl,
     const CORBA::ULong & bound,
-    CORBA::IDLType_ptr element_type,
+    CORBA_IDLType_ptr element_type,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -900,24 +908,24 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::SequenceDef_ptr result);
+  void result (CORBA_SequenceDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Repository_create_sequence (const TAO_ServerRequestInfo_CORBA_Repository_create_sequence &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Repository_create_sequence &);
   
 private:
-  POA_CORBA::Repository *_tao_impl;
+  POA_CORBA_Repository *_tao_impl;
   const CORBA::ULong & bound_;
-  CORBA::IDLType_ptr element_type_;
-  CORBA::SequenceDef_ptr _result;
+  CORBA_IDLType_ptr element_type_;
+  CORBA_SequenceDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Repository_create_sequence::TAO_ServerRequestInfo_CORBA_Repository_create_sequence (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Repository *tao_impl,
+    POA_CORBA_Repository *tao_impl,
     const CORBA::ULong & bound,
-    CORBA::IDLType_ptr element_type,
+    CORBA_IDLType_ptr element_type,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -999,7 +1007,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (CORBA::SequenceDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (CORBA_SequenceDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -1010,9 +1018,9 @@ class TAO_ServerRequestInfo_CORBA_Repository_create_array : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_Repository_create_array (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Repository *tao_impl,
+    POA_CORBA_Repository *tao_impl,
     const CORBA::ULong & length,
-    CORBA::IDLType_ptr element_type,
+    CORBA_IDLType_ptr element_type,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -1044,24 +1052,24 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ArrayDef_ptr result);
+  void result (CORBA_ArrayDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Repository_create_array (const TAO_ServerRequestInfo_CORBA_Repository_create_array &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Repository_create_array &);
   
 private:
-  POA_CORBA::Repository *_tao_impl;
+  POA_CORBA_Repository *_tao_impl;
   const CORBA::ULong & length_;
-  CORBA::IDLType_ptr element_type_;
-  CORBA::ArrayDef_ptr _result;
+  CORBA_IDLType_ptr element_type_;
+  CORBA_ArrayDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Repository_create_array::TAO_ServerRequestInfo_CORBA_Repository_create_array (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Repository *tao_impl,
+    POA_CORBA_Repository *tao_impl,
     const CORBA::ULong & length,
-    CORBA::IDLType_ptr element_type,
+    CORBA_IDLType_ptr element_type,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -1143,7 +1151,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Repository_create_array::result (CORBA::ArrayDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Repository_create_array::result (CORBA_ArrayDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -1154,7 +1162,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_create_fixed : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_Repository_create_fixed (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Repository *tao_impl,
+    POA_CORBA_Repository *tao_impl,
     const CORBA::UShort & digits,
     const CORBA::Short & scale,
     CORBA::Environment &ACE_TRY_ENV = 
@@ -1188,22 +1196,22 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::FixedDef_ptr result);
+  void result (CORBA_FixedDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Repository_create_fixed (const TAO_ServerRequestInfo_CORBA_Repository_create_fixed &);
   void operator= (const TAO_ServerRequestInfo_CORBA_Repository_create_fixed &);
   
 private:
-  POA_CORBA::Repository *_tao_impl;
+  POA_CORBA_Repository *_tao_impl;
   const CORBA::UShort & digits_;
   const CORBA::Short & scale_;
-  CORBA::FixedDef_ptr _result;
+  CORBA_FixedDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_Repository_create_fixed::TAO_ServerRequestInfo_CORBA_Repository_create_fixed (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::Repository *tao_impl,
+    POA_CORBA_Repository *tao_impl,
     const CORBA::UShort & digits,
     const CORBA::Short & scale,
     CORBA::Environment &
@@ -1286,7 +1294,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (CORBA::FixedDef_ptr result)
+TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (CORBA_FixedDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -1299,29 +1307,29 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (CORBA::FixedDef_ptr
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker *POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker::the_TAO_Repository_Strategized_Proxy_Broker (void)
+_TAO_CORBA_Repository_Strategized_Proxy_Broker *_TAO_CORBA_Repository_Strategized_Proxy_Broker::the_TAO_CORBA_Repository_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_Repository_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker::_TAO_Repository_Strategized_Proxy_Broker (void)
+_TAO_CORBA_Repository_Strategized_Proxy_Broker::_TAO_CORBA_Repository_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker::~_TAO_Repository_Strategized_Proxy_Broker (void)
+_TAO_CORBA_Repository_Strategized_Proxy_Broker::~_TAO_CORBA_Repository_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_Repository_Proxy_Impl&
-POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::Repository *object,
+_TAO_CORBA_Repository_Proxy_Impl&
+_TAO_CORBA_Repository_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_Repository *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -1339,7 +1347,7 @@ POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_Repository_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1353,7 +1361,7 @@ POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_Repository_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_Repository_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -1363,7 +1371,7 @@ POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_Repository_Remote_Proxy_Impl,
+              ::_TAO_CORBA_Repository_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -1380,38 +1388,38 @@ POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_Repository_Proxy_Broker *
-CORBA__TAO_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_Repository_Proxy_Broker *
+_TAO_CORBA_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker::the_TAO_Repository_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_Repository_Strategized_Proxy_Broker::the_TAO_CORBA_Repository_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_Repository_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_Repository_Proxy_Broker_Factory_function;
+  _TAO_CORBA_Repository_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_Repository_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_Repository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_Repository_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::_TAO_Repository_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_Repository_ThruPOA_Proxy_Impl::_TAO_CORBA_Repository_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::Contained_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::lookup_id (
+CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id (
     CORBA_Object *_collocated_tao_target_,
     const char * search_id,
     CORBA::Environment &ACE_TRY_ENV
@@ -1420,7 +1428,7 @@ CORBA::Contained_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::lookup_id (
     CORBA::SystemException
   ))
 {
-    CORBA::Contained_var _tao_retval;
+    CORBA_Contained_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -1434,9 +1442,9 @@ CORBA::Contained_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::lookup_id (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Repository_ptr,
+      POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Repository:1.0"
+          "IDL:omg.org/CORBA_Repository:1.0"
         )
     )->lookup_id (
         search_id,
@@ -1444,7 +1452,7 @@ CORBA::Contained_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::lookup_id (
       );
 }
 
-CORBA::TypeCode_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::get_canonical_typecode (
+CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_typecode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::TypeCode_ptr tc,
     CORBA::Environment &ACE_TRY_ENV
@@ -1467,9 +1475,9 @@ CORBA::TypeCode_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::get_canonical
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Repository_ptr,
+      POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Repository:1.0"
+          "IDL:omg.org/CORBA_Repository:1.0"
         )
     )->get_canonical_typecode (
         tc,
@@ -1477,7 +1485,7 @@ CORBA::TypeCode_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::get_canonical
       );
 }
 
-CORBA::PrimitiveDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::get_primitive (
+CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive (
     CORBA_Object *_collocated_tao_target_,
     CORBA::PrimitiveKind kind,
     CORBA::Environment &ACE_TRY_ENV
@@ -1486,7 +1494,7 @@ CORBA::PrimitiveDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::get_primi
     CORBA::SystemException
   ))
 {
-    CORBA::PrimitiveDef_var _tao_retval;
+    CORBA_PrimitiveDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -1500,9 +1508,9 @@ CORBA::PrimitiveDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::get_primi
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Repository_ptr,
+      POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Repository:1.0"
+          "IDL:omg.org/CORBA_Repository:1.0"
         )
     )->get_primitive (
         kind,
@@ -1510,7 +1518,7 @@ CORBA::PrimitiveDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::get_primi
       );
 }
 
-CORBA::StringDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_string (
+CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
@@ -1519,7 +1527,7 @@ CORBA::StringDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_strin
     CORBA::SystemException
   ))
 {
-    CORBA::StringDef_var _tao_retval;
+    CORBA_StringDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -1533,9 +1541,9 @@ CORBA::StringDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_strin
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Repository_ptr,
+      POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Repository:1.0"
+          "IDL:omg.org/CORBA_Repository:1.0"
         )
     )->create_string (
         bound,
@@ -1543,7 +1551,7 @@ CORBA::StringDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_strin
       );
 }
 
-CORBA::WstringDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_wstring (
+CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
@@ -1552,7 +1560,7 @@ CORBA::WstringDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_wstr
     CORBA::SystemException
   ))
 {
-    CORBA::WstringDef_var _tao_retval;
+    CORBA_WstringDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -1566,9 +1574,9 @@ CORBA::WstringDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_wstr
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Repository_ptr,
+      POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Repository:1.0"
+          "IDL:omg.org/CORBA_Repository:1.0"
         )
     )->create_wstring (
         bound,
@@ -1576,17 +1584,17 @@ CORBA::WstringDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_wstr
       );
 }
 
-CORBA::SequenceDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_sequence (
+CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
-    CORBA::IDLType_ptr element_type,
+    CORBA_IDLType_ptr element_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-    CORBA::SequenceDef_var _tao_retval;
+    CORBA_SequenceDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -1600,9 +1608,9 @@ CORBA::SequenceDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_seq
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Repository_ptr,
+      POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Repository:1.0"
+          "IDL:omg.org/CORBA_Repository:1.0"
         )
     )->create_sequence (
         bound,
@@ -1611,17 +1619,17 @@ CORBA::SequenceDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_seq
       );
 }
 
-CORBA::ArrayDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_array (
+CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong length,
-    CORBA::IDLType_ptr element_type,
+    CORBA_IDLType_ptr element_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-    CORBA::ArrayDef_var _tao_retval;
+    CORBA_ArrayDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -1635,9 +1643,9 @@ CORBA::ArrayDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_array
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Repository_ptr,
+      POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Repository:1.0"
+          "IDL:omg.org/CORBA_Repository:1.0"
         )
     )->create_array (
         length,
@@ -1646,7 +1654,7 @@ CORBA::ArrayDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_array
       );
 }
 
-CORBA::FixedDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_fixed (
+CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed (
     CORBA_Object *_collocated_tao_target_,
     CORBA::UShort digits,
     CORBA::Short scale,
@@ -1656,7 +1664,7 @@ CORBA::FixedDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_fixed
     CORBA::SystemException
   ))
 {
-    CORBA::FixedDef_var _tao_retval;
+    CORBA_FixedDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -1670,9 +1678,9 @@ CORBA::FixedDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_fixed
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::Repository_ptr,
+      POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Repository:1.0"
+          "IDL:omg.org/CORBA_Repository:1.0"
         )
     )->create_fixed (
         digits,
@@ -1686,24 +1694,24 @@ CORBA::FixedDef_ptr POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl::create_fixed
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::Repository::Repository (void)
+POA_CORBA_Repository::POA_CORBA_Repository (void)
 {
   this->optable_ = &tao_CORBA_Repository_optable;
 }
 
 // copy ctor
-POA_CORBA::Repository::Repository (const Repository& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_Repository::POA_CORBA_Repository (const POA_CORBA_Repository& rhs)
+  :   POA_CORBA_Container (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::Repository::~Repository (void)
+POA_CORBA_Repository::~POA_CORBA_Repository (void)
 {
 }
 
-void POA_CORBA::Repository::lookup_id_skel (
+void POA_CORBA_Repository::lookup_id_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -1711,9 +1719,9 @@ void POA_CORBA::Repository::lookup_id_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Repository *_tao_impl = (POA_CORBA::Repository *)_tao_object_reference;
+  POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *)_tao_object_reference;
   
-    CORBA::Contained_var _tao_retval;
+    CORBA_Contained_var _tao_retval;
   CORBA::String_var search_id;
   if (!(
     (_tao_in >> search_id.out ())
@@ -1748,7 +1756,7 @@ void POA_CORBA::Repository::lookup_id_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::Contained_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_Contained_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -1792,7 +1800,7 @@ void POA_CORBA::Repository::lookup_id_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Repository::get_canonical_typecode_skel (
+void POA_CORBA_Repository::get_canonical_typecode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -1800,7 +1808,7 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Repository *_tao_impl = (POA_CORBA::Repository *)_tao_object_reference;
+  POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *)_tao_object_reference;
   
     CORBA::TypeCode_var _tao_retval;
   CORBA::TypeCode_var tc;
@@ -1881,7 +1889,7 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Repository::get_primitive_skel (
+void POA_CORBA_Repository::get_primitive_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -1889,9 +1897,9 @@ void POA_CORBA::Repository::get_primitive_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Repository *_tao_impl = (POA_CORBA::Repository *)_tao_object_reference;
+  POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *)_tao_object_reference;
   
-    CORBA::PrimitiveDef_var _tao_retval;
+    CORBA_PrimitiveDef_var _tao_retval;
   CORBA::PrimitiveKind kind;
   if (!(
     (_tao_in >> kind)
@@ -1926,7 +1934,7 @@ void POA_CORBA::Repository::get_primitive_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::PrimitiveDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_PrimitiveDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -1970,7 +1978,7 @@ void POA_CORBA::Repository::get_primitive_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Repository::create_string_skel (
+void POA_CORBA_Repository::create_string_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -1978,9 +1986,9 @@ void POA_CORBA::Repository::create_string_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Repository *_tao_impl = (POA_CORBA::Repository *)_tao_object_reference;
+  POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *)_tao_object_reference;
   
-    CORBA::StringDef_var _tao_retval;
+    CORBA_StringDef_var _tao_retval;
   CORBA::ULong bound;
   if (!(
     (_tao_in >> bound)
@@ -2015,7 +2023,7 @@ void POA_CORBA::Repository::create_string_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::StringDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_StringDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2059,7 +2067,7 @@ void POA_CORBA::Repository::create_string_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Repository::create_wstring_skel (
+void POA_CORBA_Repository::create_wstring_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -2067,9 +2075,9 @@ void POA_CORBA::Repository::create_wstring_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Repository *_tao_impl = (POA_CORBA::Repository *)_tao_object_reference;
+  POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *)_tao_object_reference;
   
-    CORBA::WstringDef_var _tao_retval;
+    CORBA_WstringDef_var _tao_retval;
   CORBA::ULong bound;
   if (!(
     (_tao_in >> bound)
@@ -2104,7 +2112,7 @@ void POA_CORBA::Repository::create_wstring_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::WstringDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_WstringDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2148,7 +2156,7 @@ void POA_CORBA::Repository::create_wstring_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Repository::create_sequence_skel (
+void POA_CORBA_Repository::create_sequence_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -2156,11 +2164,11 @@ void POA_CORBA::Repository::create_sequence_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Repository *_tao_impl = (POA_CORBA::Repository *)_tao_object_reference;
+  POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *)_tao_object_reference;
   
-    CORBA::SequenceDef_var _tao_retval;
+    CORBA_SequenceDef_var _tao_retval;
   CORBA::ULong bound;
-  CORBA::IDLType_var element_type;
+  CORBA_IDLType_var element_type;
   if (!(
     (_tao_in >> bound) &&
     (_tao_in >> element_type.out ())
@@ -2197,7 +2205,7 @@ void POA_CORBA::Repository::create_sequence_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::SequenceDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_SequenceDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2241,7 +2249,7 @@ void POA_CORBA::Repository::create_sequence_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Repository::create_array_skel (
+void POA_CORBA_Repository::create_array_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -2249,11 +2257,11 @@ void POA_CORBA::Repository::create_array_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Repository *_tao_impl = (POA_CORBA::Repository *)_tao_object_reference;
+  POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *)_tao_object_reference;
   
-    CORBA::ArrayDef_var _tao_retval;
+    CORBA_ArrayDef_var _tao_retval;
   CORBA::ULong length;
-  CORBA::IDLType_var element_type;
+  CORBA_IDLType_var element_type;
   if (!(
     (_tao_in >> length) &&
     (_tao_in >> element_type.out ())
@@ -2290,7 +2298,7 @@ void POA_CORBA::Repository::create_array_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ArrayDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_ArrayDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2334,7 +2342,7 @@ void POA_CORBA::Repository::create_array_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Repository::create_fixed_skel (
+void POA_CORBA_Repository::create_fixed_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -2342,9 +2350,9 @@ void POA_CORBA::Repository::create_fixed_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Repository *_tao_impl = (POA_CORBA::Repository *)_tao_object_reference;
+  POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *)_tao_object_reference;
   
-    CORBA::FixedDef_var _tao_retval;
+    CORBA_FixedDef_var _tao_retval;
   CORBA::UShort digits;
   CORBA::Short scale;
   if (!(
@@ -2383,7 +2391,7 @@ void POA_CORBA::Repository::create_fixed_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::FixedDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_FixedDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2427,7 +2435,7 @@ void POA_CORBA::Repository::create_fixed_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::Repository::_is_a_skel (
+void POA_CORBA_Repository::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -2435,7 +2443,7 @@ void POA_CORBA::Repository::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::Repository *_tao_impl = (POA_CORBA::Repository *) _tao_object_reference;
+  POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -2450,14 +2458,14 @@ void POA_CORBA::Repository::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::Repository::_non_existent_skel (
+void POA_CORBA_Repository::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Repository *_tao_impl = (POA_CORBA::Repository *) _tao_object_reference;
+  POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -2467,7 +2475,55 @@ void POA_CORBA::Repository::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::Repository::_is_a (
+void POA_CORBA_Repository::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_Repository::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2476,42 +2532,42 @@ CORBA::Boolean POA_CORBA::Repository::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Repository:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::Repository::_downcast (
+void* POA_CORBA_Repository::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Repository:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Repository_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Repository:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Repository_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Container_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::Repository::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_Repository::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::Repository::_interface_repository_id (void) const
+const char* POA_CORBA_Repository::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/Repository:1.0";
+  return "IDL:omg.org/CORBA_Repository:1.0";
 }
 
-CORBA::Repository*
-POA_CORBA::Repository::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_Repository*
+POA_CORBA_Repository::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -2524,9 +2580,10 @@ POA_CORBA::Repository::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::Repository::_unchecked_narrow (obj.in ());
+  return ::CORBA_Repository::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_ModuleDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -2534,7 +2591,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:37 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ModuleDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -2543,46 +2600,46 @@ TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int le
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 10,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48,  0,
-     48,  0,  0,  0, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 15,  0, 15,
-     48, 20, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 30, 20, 48, 48, 48,  5,  0, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 20,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 10,
+     64,  0, 20,  0, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 20,  0,  5,
+     64, 10, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 15, 30, 64, 64, 64, 10,  5, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64,
 #else
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
-     48, 48, 48, 48, 48, 10, 48,  0, 48,  0,
-      0,  0, 48, 48, 48, 48, 48, 48, 15,  0,
-     15, 48, 20, 48, 48, 30, 20, 48, 48, 48,
-      5,  0, 48, 48, 48, 48, 48, 48,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
+     64, 64, 64, 64, 64, 20, 64, 10, 64,  0,
+     20,  0, 64, 64, 64, 64, 64, 64, 20,  0,
+      5, 64, 10, 64, 64, 15, 30, 64, 64, 64,
+     10,  5, 64, 64, 64, 64, 64, 64,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -2593,58 +2650,60 @@ TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 32,
+      TOTAL_KEYWORDS = 33,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 47,
-      HASH_VALUE_RANGE = 44,
+      MAX_HASH_VALUE = 63,
+      HASH_VALUE_RANGE = 60,
       DUPLICATES = 5
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::ModuleDef::move_skel},
-      {"destroy", 	&POA_CORBA::ModuleDef::destroy_skel},
-      {"describe", 	&POA_CORBA::ModuleDef::describe_skel},
-      {"create_enum", 	&POA_CORBA::ModuleDef::create_enum_skel},
-      {"create_value", 	&POA_CORBA::ModuleDef::create_value_skel},
-      {"create_module", 	&POA_CORBA::ModuleDef::create_module_skel},
-      {"create_native", 	&POA_CORBA::ModuleDef::create_native_skel},
-      {"_is_a",  &POA_CORBA::ModuleDef::_is_a_skel},
-      {"create_interface", 	&POA_CORBA::ModuleDef::create_interface_skel},
-      {"_get_id", 	&POA_CORBA::ModuleDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::ModuleDef::_set_id_skel},
-      {"_get_name", 	&POA_CORBA::ModuleDef::_get_name_skel},
-      {"_set_name", 	&POA_CORBA::ModuleDef::_set_name_skel},
-      {"create_value_box", 	&POA_CORBA::ModuleDef::create_value_box_skel},
-      {"create_local_interface", 	&POA_CORBA::ModuleDef::create_local_interface_skel},
-      {"_get_def_kind", 	&POA_CORBA::ModuleDef::_get_def_kind_skel},
-      {"create_abstract_interface", 	&POA_CORBA::ModuleDef::create_abstract_interface_skel},
-      {"lookup_name", 	&POA_CORBA::ModuleDef::lookup_name_skel},
-      {"create_union", 	&POA_CORBA::ModuleDef::create_union_skel},
-      {"_get_absolute_name", 	&POA_CORBA::ModuleDef::_get_absolute_name_skel},
-      {"create_exception", 	&POA_CORBA::ModuleDef::create_exception_skel},
-      {"create_struct", 	&POA_CORBA::ModuleDef::create_struct_skel},
-      {"create_constant", 	&POA_CORBA::ModuleDef::create_constant_skel},
-      {"_get_containing_repository", 	&POA_CORBA::ModuleDef::_get_containing_repository_skel},
-      {"_get_version", 	&POA_CORBA::ModuleDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::ModuleDef::_set_version_skel},
-      {"contents", 	&POA_CORBA::ModuleDef::contents_skel},
-      {"_get_defined_in", 	&POA_CORBA::ModuleDef::_get_defined_in_skel},
-      {"lookup", 	&POA_CORBA::ModuleDef::lookup_skel},
-      {"create_alias", 	&POA_CORBA::ModuleDef::create_alias_skel},
-      {"_non_existent",  &POA_CORBA::ModuleDef::_non_existent_skel},
-      {"describe_contents", 	&POA_CORBA::ModuleDef::describe_contents_skel},
+      {"move", 	&POA_CORBA_ModuleDef::move_skel},
+      {"create_enum", 	&POA_CORBA_ModuleDef::create_enum_skel},
+      {"create_value", 	&POA_CORBA_ModuleDef::create_value_skel},
+      {"create_module", 	&POA_CORBA_ModuleDef::create_module_skel},
+      {"create_native", 	&POA_CORBA_ModuleDef::create_native_skel},
+      {"create_interface", 	&POA_CORBA_ModuleDef::create_interface_skel},
+      {"create_union", 	&POA_CORBA_ModuleDef::create_union_skel},
+      {"create_exception", 	&POA_CORBA_ModuleDef::create_exception_skel},
+      {"create_local_interface", 	&POA_CORBA_ModuleDef::create_local_interface_skel},
+      {"contents", 	&POA_CORBA_ModuleDef::contents_skel},
+      {"create_abstract_interface", 	&POA_CORBA_ModuleDef::create_abstract_interface_skel},
+      {"create_value_box", 	&POA_CORBA_ModuleDef::create_value_box_skel},
+      {"create_alias", 	&POA_CORBA_ModuleDef::create_alias_skel},
+      {"describe", 	&POA_CORBA_ModuleDef::describe_skel},
+      {"_get_name", 	&POA_CORBA_ModuleDef::_get_name_skel},
+      {"_set_name", 	&POA_CORBA_ModuleDef::_set_name_skel},
+      {"_interface",  &POA_CORBA_ModuleDef::_interface_skel},
+      {"lookup_name", 	&POA_CORBA_ModuleDef::lookup_name_skel},
+      {"destroy", 	&POA_CORBA_ModuleDef::destroy_skel},
+      {"_is_a",  &POA_CORBA_ModuleDef::_is_a_skel},
+      {"lookup", 	&POA_CORBA_ModuleDef::lookup_skel},
+      {"_get_version", 	&POA_CORBA_ModuleDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_ModuleDef::_set_version_skel},
+      {"_get_absolute_name", 	&POA_CORBA_ModuleDef::_get_absolute_name_skel},
+      {"_get_defined_in", 	&POA_CORBA_ModuleDef::_get_defined_in_skel},
+      {"create_struct", 	&POA_CORBA_ModuleDef::create_struct_skel},
+      {"create_constant", 	&POA_CORBA_ModuleDef::create_constant_skel},
+      {"_get_id", 	&POA_CORBA_ModuleDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_ModuleDef::_set_id_skel},
+      {"_get_containing_repository", 	&POA_CORBA_ModuleDef::_get_containing_repository_skel},
+      {"describe_contents", 	&POA_CORBA_ModuleDef::describe_contents_skel},
+      {"_get_def_kind", 	&POA_CORBA_ModuleDef::_get_def_kind_skel},
+      {"_non_existent",  &POA_CORBA_ModuleDef::_non_existent_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -9,  -2,   4, -13,  -2,   5,   6, -15,  -2,   7,   8, -58, 
-       -1,  11,  12, -59,  -1, -57,  -1,  17,  18,  19,  -1,  20,  21,  22, 
-       23, -28,  -2,  24,  -1,  25,  -1,  26,  27, -55,  30,  -1,  31,  32, 
-       33,  34,  -1,  -1,  -1,  35, 
+       -1,  -1,  -1,  -1,   4,  -1,  -1,  -1,  -1,  -7,  -2,   5,   6, -67, 
+       -1,  -1,   9,  10,  -1, -18,  -2,  11,  12,  13,  -1,  14,  15,  16, 
+       17, -73,  20,  21,  22, -25,  -2,  23,  24, -67,  27,  -1,  28, -31, 
+       -2,  29,  -1,  30,  -1, -69,  -1,  -1,  -1,  33,  34,  35,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  36, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -2678,7 +2737,7 @@ TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 10:44:37 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_ModuleDef_Perfect_Hash_OpTable tao_CORBA_ModuleDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -2689,29 +2748,29 @@ static TAO_CORBA_ModuleDef_Perfect_Hash_OpTable tao_CORBA_ModuleDef_optable;
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker::the_TAO_ModuleDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker *_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::the_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker::_TAO_ModuleDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker::~_TAO_ModuleDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::~_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_ModuleDef_Proxy_Impl&
-POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::ModuleDef *object,
+_TAO_CORBA_ModuleDef_Proxy_Impl&
+_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_ModuleDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -2729,7 +2788,7 @@ POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2743,7 +2802,7 @@ POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_ModuleDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -2753,7 +2812,7 @@ POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_ModuleDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_ModuleDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -2770,33 +2829,33 @@ POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_ModuleDef_Proxy_Broker *
-CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_ModuleDef_Proxy_Broker *
+_TAO_CORBA_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker::the_TAO_ModuleDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::the_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_ModuleDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_ModuleDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_ModuleDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_ModuleDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_ModuleDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_TAO_ModuleDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
@@ -2806,25 +2865,25 @@ POA_CORBA::_TAO_ModuleDef_ThruPOA_Proxy_Impl::_TAO_ModuleDef_ThruPOA_Proxy_Impl
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::ModuleDef::ModuleDef (void)
+POA_CORBA_ModuleDef::POA_CORBA_ModuleDef (void)
 {
   this->optable_ = &tao_CORBA_ModuleDef_optable;
 }
 
 // copy ctor
-POA_CORBA::ModuleDef::ModuleDef (const ModuleDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_ModuleDef::POA_CORBA_ModuleDef (const POA_CORBA_ModuleDef& rhs)
+  :   POA_CORBA_Container (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::ModuleDef::~ModuleDef (void)
+POA_CORBA_ModuleDef::~POA_CORBA_ModuleDef (void)
 {
 }
 
-void POA_CORBA::ModuleDef::_is_a_skel (
+void POA_CORBA_ModuleDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -2832,7 +2891,7 @@ void POA_CORBA::ModuleDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ModuleDef *_tao_impl = (POA_CORBA::ModuleDef *) _tao_object_reference;
+  POA_CORBA_ModuleDef *_tao_impl = (POA_CORBA_ModuleDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -2847,14 +2906,14 @@ void POA_CORBA::ModuleDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::ModuleDef::_non_existent_skel (
+void POA_CORBA_ModuleDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ModuleDef *_tao_impl = (POA_CORBA::ModuleDef *) _tao_object_reference;
+  POA_CORBA_ModuleDef *_tao_impl = (POA_CORBA_ModuleDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -2864,7 +2923,55 @@ void POA_CORBA::ModuleDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::ModuleDef::_is_a (
+void POA_CORBA_ModuleDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_ModuleDef *_tao_impl = (POA_CORBA_ModuleDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_ModuleDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2873,45 +2980,45 @@ CORBA::Boolean POA_CORBA::ModuleDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ModuleDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ModuleDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::ModuleDef::_downcast (
+void* POA_CORBA_ModuleDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ModuleDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::ModuleDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ModuleDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_ModuleDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Container_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::ModuleDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ModuleDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::ModuleDef::_interface_repository_id (void) const
+const char* POA_CORBA_ModuleDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/ModuleDef:1.0";
+  return "IDL:omg.org/CORBA_ModuleDef:1.0";
 }
 
-CORBA::ModuleDef*
-POA_CORBA::ModuleDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_ModuleDef*
+POA_CORBA_ModuleDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -2924,9 +3031,10 @@ POA_CORBA::ModuleDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::ModuleDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_ModuleDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_ConstantDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -2934,7 +3042,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:37 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstantDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -2993,45 +3101,46 @@ TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 {
   enum
     {
-      TOTAL_KEYWORDS = 20,
+      TOTAL_KEYWORDS = 21,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
-      DUPLICATES = 7
+      DUPLICATES = 8
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::ConstantDef::move_skel},
-      {"_is_a",  &POA_CORBA::ConstantDef::_is_a_skel},
-      {"_get_id", 	&POA_CORBA::ConstantDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::ConstantDef::_set_id_skel},
-      {"describe", 	&POA_CORBA::ConstantDef::describe_skel},
-      {"_get_type", 	&POA_CORBA::ConstantDef::_get_type_skel},
-      {"_set_name", 	&POA_CORBA::ConstantDef::_set_name_skel},
-      {"_get_name", 	&POA_CORBA::ConstantDef::_get_name_skel},
-      {"_get_value", 	&POA_CORBA::ConstantDef::_get_value_skel},
-      {"_set_value", 	&POA_CORBA::ConstantDef::_set_value_skel},
-      {"_get_version", 	&POA_CORBA::ConstantDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::ConstantDef::_set_version_skel},
-      {"_get_def_kind", 	&POA_CORBA::ConstantDef::_get_def_kind_skel},
-      {"_get_defined_in", 	&POA_CORBA::ConstantDef::_get_defined_in_skel},
-      {"destroy", 	&POA_CORBA::ConstantDef::destroy_skel},
-      {"_get_absolute_name", 	&POA_CORBA::ConstantDef::_get_absolute_name_skel},
-      {"_get_type_def", 	&POA_CORBA::ConstantDef::_get_type_def_skel},
-      {"_set_type_def", 	&POA_CORBA::ConstantDef::_set_type_def_skel},
-      {"_non_existent",  &POA_CORBA::ConstantDef::_non_existent_skel},
-      {"_get_containing_repository", 	&POA_CORBA::ConstantDef::_get_containing_repository_skel},
+      {"move", 	&POA_CORBA_ConstantDef::move_skel},
+      {"_is_a",  &POA_CORBA_ConstantDef::_is_a_skel},
+      {"_get_id", 	&POA_CORBA_ConstantDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_ConstantDef::_set_id_skel},
+      {"describe", 	&POA_CORBA_ConstantDef::describe_skel},
+      {"_get_type", 	&POA_CORBA_ConstantDef::_get_type_skel},
+      {"_set_name", 	&POA_CORBA_ConstantDef::_set_name_skel},
+      {"_get_name", 	&POA_CORBA_ConstantDef::_get_name_skel},
+      {"_get_value", 	&POA_CORBA_ConstantDef::_get_value_skel},
+      {"_interface",  &POA_CORBA_ConstantDef::_interface_skel},
+      {"_set_value", 	&POA_CORBA_ConstantDef::_set_value_skel},
+      {"_get_version", 	&POA_CORBA_ConstantDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_ConstantDef::_set_version_skel},
+      {"_get_def_kind", 	&POA_CORBA_ConstantDef::_get_def_kind_skel},
+      {"_get_defined_in", 	&POA_CORBA_ConstantDef::_get_defined_in_skel},
+      {"destroy", 	&POA_CORBA_ConstantDef::destroy_skel},
+      {"_get_absolute_name", 	&POA_CORBA_ConstantDef::_get_absolute_name_skel},
+      {"_get_type_def", 	&POA_CORBA_ConstantDef::_get_type_def_skel},
+      {"_set_type_def", 	&POA_CORBA_ConstantDef::_set_type_def_skel},
+      {"_non_existent",  &POA_CORBA_ConstantDef::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_CORBA_ConstantDef::_get_containing_repository_skel},
     };
 
   static const signed char lookup[] =
     {
-      -12,  -2, -14,  -2,   4,   5,  -1,  53,   8,  46, -46,  -1, -46,  16, 
-       -1,  17,  -1,  18,  19,  -9,  -3, -20,  -2, -38,  -6,  -2,  -1,  -1, 
-       22,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23, 
+      -12,  -3, -15,  -2,   4,   5,  -1,  53,   8,  46, -46,  -1, -46,  17, 
+       -1,  18,  -1,  19,  20,  -9,  -3, -21,  -2, -38,  -6,  -2,  -1,  -1, 
+       23,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3065,7 +3174,7 @@ TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
     }
   return 0;
 }
-/* ending time is 10:44:37 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_ConstantDef_Perfect_Hash_OpTable tao_CORBA_ConstantDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -3074,7 +3183,7 @@ class TAO_ServerRequestInfo_CORBA_ConstantDef_type_get : public TAO_ServerReques
 public:
   TAO_ServerRequestInfo_CORBA_ConstantDef_type_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ConstantDef *tao_impl,
+    POA_CORBA_ConstantDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -3113,13 +3222,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ConstantDef_type_get &);
   
 private:
-  POA_CORBA::ConstantDef *_tao_impl;
+  POA_CORBA_ConstantDef *_tao_impl;
   CORBA::TypeCode_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::TAO_ServerRequestInfo_CORBA_ConstantDef_type_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ConstantDef *tao_impl,
+    POA_CORBA_ConstantDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -3197,7 +3306,7 @@ class TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ConstantDef *tao_impl,
+    POA_CORBA_ConstantDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -3229,20 +3338,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get (const TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get &);
   
 private:
-  POA_CORBA::ConstantDef *_tao_impl;
-  CORBA::IDLType_ptr _result;
+  POA_CORBA_ConstantDef *_tao_impl;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ConstantDef *tao_impl,
+    POA_CORBA_ConstantDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -3309,7 +3418,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (CORBA::IDLType_ptr result)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (CORBA_IDLType_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -3320,8 +3429,8 @@ class TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ConstantDef *tao_impl,
-    CORBA::IDLType_ptr type_def,
+    POA_CORBA_ConstantDef *tao_impl,
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -3359,15 +3468,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set &);
   
 private:
-  POA_CORBA::ConstantDef *_tao_impl;
-  CORBA::IDLType_ptr type_def_;
+  POA_CORBA_ConstantDef *_tao_impl;
+  CORBA_IDLType_ptr type_def_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ConstantDef *tao_impl,
-    CORBA::IDLType_ptr type_def,
+    POA_CORBA_ConstantDef *tao_impl,
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -3443,7 +3552,7 @@ class TAO_ServerRequestInfo_CORBA_ConstantDef_value_get : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_ConstantDef_value_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ConstantDef *tao_impl,
+    POA_CORBA_ConstantDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -3482,13 +3591,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ConstantDef_value_get &);
   
 private:
-  POA_CORBA::ConstantDef *_tao_impl;
+  POA_CORBA_ConstantDef *_tao_impl;
   CORBA::Any * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::TAO_ServerRequestInfo_CORBA_ConstantDef_value_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ConstantDef *tao_impl,
+    POA_CORBA_ConstantDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -3566,7 +3675,7 @@ class TAO_ServerRequestInfo_CORBA_ConstantDef_value_set : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_ConstantDef_value_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ConstantDef *tao_impl,
+    POA_CORBA_ConstantDef *tao_impl,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -3605,14 +3714,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ConstantDef_value_set &);
   
 private:
-  POA_CORBA::ConstantDef *_tao_impl;
+  POA_CORBA_ConstantDef *_tao_impl;
   const CORBA::Any & value_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::TAO_ServerRequestInfo_CORBA_ConstantDef_value_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ConstantDef *tao_impl,
+    POA_CORBA_ConstantDef *tao_impl,
     const CORBA::Any & value,
     CORBA::Environment &
   )
@@ -3690,29 +3799,29 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker::the_TAO_ConstantDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker *_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::the_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker::_TAO_ConstantDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker::~_TAO_ConstantDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::~_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_ConstantDef_Proxy_Impl&
-POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::ConstantDef *object,
+_TAO_CORBA_ConstantDef_Proxy_Impl&
+_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_ConstantDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -3730,7 +3839,7 @@ POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3744,7 +3853,7 @@ POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_ConstantDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -3754,7 +3863,7 @@ POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_ConstantDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_ConstantDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -3771,38 +3880,38 @@ POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_ConstantDef_Proxy_Broker *
-CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_ConstantDef_Proxy_Broker *
+_TAO_CORBA_ConstantDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker::the_TAO_ConstantDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::the_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_ConstantDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_ConstantDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_ConstantDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_ConstantDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_ConstantDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::_TAO_ConstantDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::TypeCode_ptr POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type (
+CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3824,16 +3933,16 @@ CORBA::TypeCode_ptr POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ConstantDef_ptr,
+      POA_CORBA_ConstantDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ConstantDef:1.0"
+          "IDL:omg.org/CORBA_ConstantDef:1.0"
         )
     )->type (
         ACE_TRY_ENV
       );
 }
 
-CORBA::IDLType_ptr POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
+CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3841,7 +3950,7 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
     CORBA::SystemException
   ))
 {
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -3855,18 +3964,18 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ConstantDef_ptr,
+      POA_CORBA_ConstantDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ConstantDef:1.0"
+          "IDL:omg.org/CORBA_ConstantDef:1.0"
         )
     )->type_def (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
+void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr type_def,
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3885,9 +3994,9 @@ void POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::ConstantDef_ptr,
+      POA_CORBA_ConstantDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ConstantDef:1.0"
+          "IDL:omg.org/CORBA_ConstantDef:1.0"
         )
     )->type_def (
         type_def,
@@ -3896,7 +4005,7 @@ void POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
   return;
 }
 
-CORBA::Any * POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::value (
+CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3918,16 +4027,16 @@ CORBA::Any * POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::value (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ConstantDef_ptr,
+      POA_CORBA_ConstantDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ConstantDef:1.0"
+          "IDL:omg.org/CORBA_ConstantDef:1.0"
         )
     )->value (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::value (
+void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
     CORBA_Object *_collocated_tao_target_,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
@@ -3948,9 +4057,9 @@ void POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::value (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::ConstantDef_ptr,
+      POA_CORBA_ConstantDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ConstantDef:1.0"
+          "IDL:omg.org/CORBA_ConstantDef:1.0"
         )
     )->value (
         value,
@@ -3964,31 +4073,31 @@ void POA_CORBA::_TAO_ConstantDef_ThruPOA_Proxy_Impl::value (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::ConstantDef::ConstantDef (void)
+POA_CORBA_ConstantDef::POA_CORBA_ConstantDef (void)
 {
   this->optable_ = &tao_CORBA_ConstantDef_optable;
 }
 
 // copy ctor
-POA_CORBA::ConstantDef::ConstantDef (const ConstantDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_ConstantDef::POA_CORBA_ConstantDef (const POA_CORBA_ConstantDef& rhs)
+  :   POA_CORBA_Contained (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::ConstantDef::~ConstantDef (void)
+POA_CORBA_ConstantDef::~POA_CORBA_ConstantDef (void)
 {
 }
 
-void POA_CORBA::ConstantDef::_get_type_skel (
+void POA_CORBA_ConstantDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ConstantDef *_tao_impl = (POA_CORBA::ConstantDef *)_tao_object_reference;
+  POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *)_tao_object_reference;
   
     CORBA::TypeCode_var _tao_retval;
 
@@ -4061,16 +4170,16 @@ void POA_CORBA::ConstantDef::_get_type_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ConstantDef::_get_type_def_skel (
+void POA_CORBA_ConstantDef::_get_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ConstantDef *_tao_impl = (POA_CORBA::ConstantDef *)_tao_object_reference;
+  POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *)_tao_object_reference;
   
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -4097,7 +4206,7 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -4141,7 +4250,7 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ConstantDef::_set_type_def_skel (
+void POA_CORBA_ConstantDef::_set_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -4149,10 +4258,10 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ConstantDef *_tao_impl = (POA_CORBA::ConstantDef *)_tao_object_reference;
+  POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::IDLType_var type_def;
+    CORBA_IDLType_var type_def;
   if (!(
     (_tao_in >> type_def.out ())
   ))
@@ -4220,14 +4329,14 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ConstantDef::_get_value_skel (
+void POA_CORBA_ConstantDef::_get_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ConstantDef *_tao_impl = (POA_CORBA::ConstantDef *)_tao_object_reference;
+  POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *)_tao_object_reference;
   
     CORBA::Any_var _tao_retval;
 
@@ -4300,7 +4409,7 @@ void POA_CORBA::ConstantDef::_get_value_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ConstantDef::_set_value_skel (
+void POA_CORBA_ConstantDef::_set_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -4308,7 +4417,7 @@ void POA_CORBA::ConstantDef::_set_value_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ConstantDef *_tao_impl = (POA_CORBA::ConstantDef *)_tao_object_reference;
+  POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
     CORBA::Any value;
@@ -4379,7 +4488,7 @@ void POA_CORBA::ConstantDef::_set_value_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ConstantDef::_is_a_skel (
+void POA_CORBA_ConstantDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -4387,7 +4496,7 @@ void POA_CORBA::ConstantDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ConstantDef *_tao_impl = (POA_CORBA::ConstantDef *) _tao_object_reference;
+  POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -4402,14 +4511,14 @@ void POA_CORBA::ConstantDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::ConstantDef::_non_existent_skel (
+void POA_CORBA_ConstantDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ConstantDef *_tao_impl = (POA_CORBA::ConstantDef *) _tao_object_reference;
+  POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -4419,7 +4528,55 @@ void POA_CORBA::ConstantDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::ConstantDef::_is_a (
+void POA_CORBA_ConstantDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_ConstantDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -4428,42 +4585,42 @@ CORBA::Boolean POA_CORBA::ConstantDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstantDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ConstantDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::ConstantDef::_downcast (
+void* POA_CORBA_ConstantDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ConstantDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::ConstantDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ConstantDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_ConstantDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::ConstantDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ConstantDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::ConstantDef::_interface_repository_id (void) const
+const char* POA_CORBA_ConstantDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/ConstantDef:1.0";
+  return "IDL:omg.org/CORBA_ConstantDef:1.0";
 }
 
-CORBA::ConstantDef*
-POA_CORBA::ConstantDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_ConstantDef*
+POA_CORBA_ConstantDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -4476,9 +4633,10 @@ POA_CORBA::ConstantDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::ConstantDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_ConstantDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_StructDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -4486,7 +4644,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:37 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StructDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -4508,10 +4666,10 @@ TAO_CORBA_StructDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int le
      61, 61, 61, 61, 61, 61, 61, 61, 61,  0,
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
      61, 61, 61, 61, 61, 61, 61, 61, 61,  0,
-     61, 25,  3,  0, 61, 61, 61, 61, 61, 61,
-     61, 61, 61, 61, 61, 61, 61, 10,  0,  5,
-     61, 10, 61, 61, 61, 61, 61, 61, 61, 61,
-     61, 61, 20, 20, 61, 61, 61, 10,  5, 61,
+     61, 25,  8,  0, 61, 61, 61, 61, 61, 61,
+     61, 61, 61, 61, 61, 61, 61,  0, 15,  5,
+     61,  0, 61, 61, 61, 61, 61, 61, 61, 61,
+     61, 61, 20, 20, 61, 61, 61, 15, 10, 61,
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
@@ -4532,9 +4690,9 @@ TAO_CORBA_StructDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int le
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
      61, 61, 61, 61, 61,  0, 61,  0, 61, 25,
-      3,  0, 61, 61, 61, 61, 61, 61, 10,  0,
-      5, 61, 10, 61, 61, 20, 20, 61, 61, 61,
-     10,  5, 61, 61, 61, 61, 61, 61,
+      8,  0, 61, 61, 61, 61, 61, 61,  0, 15,
+      5, 61,  0, 61, 61, 20, 20, 61, 61, 61,
+     15, 10, 61, 61, 61, 61, 61, 61,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -4545,62 +4703,63 @@ TAO_CORBA_StructDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 35,
+      TOTAL_KEYWORDS = 36,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
-      MIN_HASH_VALUE = 4,
+      MIN_HASH_VALUE = 5,
       MAX_HASH_VALUE = 60,
-      HASH_VALUE_RANGE = 57,
+      HASH_VALUE_RANGE = 56,
       DUPLICATES = 7
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
-      {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::StructDef::move_skel},
-      {"_is_a",  &POA_CORBA::StructDef::_is_a_skel},
-      {"_get_name", 	&POA_CORBA::StructDef::_get_name_skel},
-      {"_get_type", 	&POA_CORBA::StructDef::_get_type_skel},
-      {"_set_name", 	&POA_CORBA::StructDef::_set_name_skel},
-      {"_get_id", 	&POA_CORBA::StructDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::StructDef::_set_id_skel},
-      {"describe", 	&POA_CORBA::StructDef::describe_skel},
-      {"destroy", 	&POA_CORBA::StructDef::destroy_skel},
-      {"_get_def_kind", 	&POA_CORBA::StructDef::_get_def_kind_skel},
-      {"_get_version", 	&POA_CORBA::StructDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::StructDef::_set_version_skel},
-      {"_get_absolute_name", 	&POA_CORBA::StructDef::_get_absolute_name_skel},
-      {"_get_defined_in", 	&POA_CORBA::StructDef::_get_defined_in_skel},
-      {"lookup_name", 	&POA_CORBA::StructDef::lookup_name_skel},
-      {"lookup", 	&POA_CORBA::StructDef::lookup_skel},
-      {"_get_containing_repository", 	&POA_CORBA::StructDef::_get_containing_repository_skel},
-      {"_get_members", 	&POA_CORBA::StructDef::_get_members_skel},
-      {"_set_members", 	&POA_CORBA::StructDef::_set_members_skel},
-      {"_non_existent",  &POA_CORBA::StructDef::_non_existent_skel},
-      {"create_enum", 	&POA_CORBA::StructDef::create_enum_skel},
-      {"create_value", 	&POA_CORBA::StructDef::create_value_skel},
-      {"create_module", 	&POA_CORBA::StructDef::create_module_skel},
-      {"create_native", 	&POA_CORBA::StructDef::create_native_skel},
-      {"describe_contents", 	&POA_CORBA::StructDef::describe_contents_skel},
-      {"create_interface", 	&POA_CORBA::StructDef::create_interface_skel},
-      {"create_union", 	&POA_CORBA::StructDef::create_union_skel},
-      {"create_exception", 	&POA_CORBA::StructDef::create_exception_skel},
-      {"create_local_interface", 	&POA_CORBA::StructDef::create_local_interface_skel},
-      {"create_abstract_interface", 	&POA_CORBA::StructDef::create_abstract_interface_skel},
-      {"create_value_box", 	&POA_CORBA::StructDef::create_value_box_skel},
-      {"contents", 	&POA_CORBA::StructDef::contents_skel},
-      {"create_alias", 	&POA_CORBA::StructDef::create_alias_skel},
-      {"create_struct", 	&POA_CORBA::StructDef::create_struct_skel},
-      {"create_constant", 	&POA_CORBA::StructDef::create_constant_skel},
+      {"",0},{"",0},{"",0},{"",0},{"",0},
+      {"_is_a",  &POA_CORBA_StructDef::_is_a_skel},
+      {"lookup", 	&POA_CORBA_StructDef::lookup_skel},
+      {"_get_name", 	&POA_CORBA_StructDef::_get_name_skel},
+      {"_get_type", 	&POA_CORBA_StructDef::_get_type_skel},
+      {"_set_name", 	&POA_CORBA_StructDef::_set_name_skel},
+      {"_interface",  &POA_CORBA_StructDef::_interface_skel},
+      {"lookup_name", 	&POA_CORBA_StructDef::lookup_name_skel},
+      {"_get_id", 	&POA_CORBA_StructDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_StructDef::_set_id_skel},
+      {"describe", 	&POA_CORBA_StructDef::describe_skel},
+      {"_get_version", 	&POA_CORBA_StructDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_StructDef::_set_version_skel},
+      {"_get_absolute_name", 	&POA_CORBA_StructDef::_get_absolute_name_skel},
+      {"move", 	&POA_CORBA_StructDef::move_skel},
+      {"_get_defined_in", 	&POA_CORBA_StructDef::_get_defined_in_skel},
+      {"_get_def_kind", 	&POA_CORBA_StructDef::_get_def_kind_skel},
+      {"destroy", 	&POA_CORBA_StructDef::destroy_skel},
+      {"_get_members", 	&POA_CORBA_StructDef::_get_members_skel},
+      {"_set_members", 	&POA_CORBA_StructDef::_set_members_skel},
+      {"_non_existent",  &POA_CORBA_StructDef::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_CORBA_StructDef::_get_containing_repository_skel},
+      {"create_value", 	&POA_CORBA_StructDef::create_value_skel},
+      {"create_module", 	&POA_CORBA_StructDef::create_module_skel},
+      {"create_native", 	&POA_CORBA_StructDef::create_native_skel},
+      {"create_interface", 	&POA_CORBA_StructDef::create_interface_skel},
+      {"create_union", 	&POA_CORBA_StructDef::create_union_skel},
+      {"describe_contents", 	&POA_CORBA_StructDef::describe_contents_skel},
+      {"create_exception", 	&POA_CORBA_StructDef::create_exception_skel},
+      {"create_local_interface", 	&POA_CORBA_StructDef::create_local_interface_skel},
+      {"create_abstract_interface", 	&POA_CORBA_StructDef::create_abstract_interface_skel},
+      {"create_enum", 	&POA_CORBA_StructDef::create_enum_skel},
+      {"contents", 	&POA_CORBA_StructDef::contents_skel},
+      {"create_value_box", 	&POA_CORBA_StructDef::create_value_box_skel},
+      {"create_alias", 	&POA_CORBA_StructDef::create_alias_skel},
+      {"create_struct", 	&POA_CORBA_StructDef::create_struct_skel},
+      {"create_constant", 	&POA_CORBA_StructDef::create_constant_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -6,  -3,   4,   5,  -1,  -9,  -2, -67, -63,  11,  -1, -14, 
-       -2,  12,  13, -64,  16,  -1,  17,  18,  -1,  -1,  -1,  -1,  19,  -1, 
-       -1, -21,  -2,  20, -63,  23, -26,  -2,  24,  25, -64,  -1,  28,  29, 
-       30,  -1,  -1,  -1,  31,  32,  -1,  -1,  33,  34,  -1,  35,  -1,  -1, 
-       -1,  36,  37,  -1,  38, 
+       -1,  -1,  -1,  -7,  -3,   5,   6, -12,  -2, -66,  10,  11,  -1, -15, 
+       -2, -68,  14, -64,  17,  18,  19,  20,  -1,  -1,  -1,  21,  -1,  -1, 
+       -1,  -1, -22,  -2, -62,  24, -27,  -2,  25,  26, -64,  -1,  -1,  29, 
+       30,  -1,  -1,  31,  32,  33,  -1,  -1,  34,  35,  -1,  36,  -1,  -1, 
+       37,  38,  39,  -1,  40, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -4634,17 +4793,16 @@ TAO_CORBA_StructDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 10:44:37 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_StructDef_Perfect_Hash_OpTable tao_CORBA_StructDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_StructDef_members_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_StructDef_members_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::StructDef *tao_impl,
+    POA_CORBA_StructDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -4676,20 +4834,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::StructMemberSeq * result);
+  void result (CORBA_StructMemberSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_StructDef_members_get (const TAO_ServerRequestInfo_CORBA_StructDef_members_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_StructDef_members_get &);
   
 private:
-  POA_CORBA::StructDef *_tao_impl;
-  CORBA::StructMemberSeq * _result;
+  POA_CORBA_StructDef *_tao_impl;
+  CORBA_StructMemberSeq * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_StructDef_members_get::TAO_ServerRequestInfo_CORBA_StructDef_members_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::StructDef *tao_impl,
+    POA_CORBA_StructDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -4756,7 +4914,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (CORBA::StructMemberSeq * result)
+TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (CORBA_StructMemberSeq * result)
 {
   // Update the result.
    this->_result = result;
@@ -4767,8 +4925,8 @@ class TAO_ServerRequestInfo_CORBA_StructDef_members_set : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_StructDef_members_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::StructDef *tao_impl,
-    const CORBA::StructMemberSeq & members,
+    POA_CORBA_StructDef *tao_impl,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -4806,15 +4964,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_StructDef_members_set &);
   
 private:
-  POA_CORBA::StructDef *_tao_impl;
-  const CORBA::StructMemberSeq & members_;
+  POA_CORBA_StructDef *_tao_impl;
+  const CORBA_StructMemberSeq & members_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_StructDef_members_set::TAO_ServerRequestInfo_CORBA_StructDef_members_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::StructDef *tao_impl,
-    const CORBA::StructMemberSeq & members,
+    POA_CORBA_StructDef *tao_impl,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -4892,29 +5050,29 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker::the_TAO_StructDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_StructDef_Strategized_Proxy_Broker *_TAO_CORBA_StructDef_Strategized_Proxy_Broker::the_TAO_CORBA_StructDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_StructDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker::_TAO_StructDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_StructDef_Strategized_Proxy_Broker::_TAO_CORBA_StructDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker::~_TAO_StructDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_StructDef_Strategized_Proxy_Broker::~_TAO_CORBA_StructDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_StructDef_Proxy_Impl&
-POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::StructDef *object,
+_TAO_CORBA_StructDef_Proxy_Impl&
+_TAO_CORBA_StructDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_StructDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -4932,7 +5090,7 @@ POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_StructDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -4946,7 +5104,7 @@ POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_StructDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -4956,7 +5114,7 @@ POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_StructDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_StructDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -4973,38 +5131,38 @@ POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_StructDef_Proxy_Broker *
-CORBA__TAO_StructDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_StructDef_Proxy_Broker *
+_TAO_CORBA_StructDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker::the_TAO_StructDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_StructDef_Strategized_Proxy_Broker::the_TAO_CORBA_StructDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_StructDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_StructDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_StructDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_StructDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_StructDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_StructDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::_TAO_StructDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::_TAO_CORBA_StructDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::StructMemberSeq * POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
+CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5012,7 +5170,7 @@ CORBA::StructMemberSeq * POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
     CORBA::SystemException
   ))
 {
-    CORBA::StructMemberSeq_var _tao_retval;
+    CORBA_StructMemberSeq_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -5026,18 +5184,18 @@ CORBA::StructMemberSeq * POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::StructDef_ptr,
+      POA_CORBA_StructDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/StructDef:1.0"
+          "IDL:omg.org/CORBA_StructDef:1.0"
         )
     )->members (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
+void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5056,9 +5214,9 @@ void POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::StructDef_ptr,
+      POA_CORBA_StructDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/StructDef:1.0"
+          "IDL:omg.org/CORBA_StructDef:1.0"
         )
     )->members (
         members,
@@ -5072,36 +5230,36 @@ void POA_CORBA::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::StructDef::StructDef (void)
+POA_CORBA_StructDef::POA_CORBA_StructDef (void)
 {
   this->optable_ = &tao_CORBA_StructDef_optable;
 }
 
 // copy ctor
-POA_CORBA::StructDef::StructDef (const StructDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,TypedefDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_StructDef::POA_CORBA_StructDef (const POA_CORBA_StructDef& rhs)
+  :   POA_CORBA_TypedefDef (rhs),
+    POA_CORBA_Container (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::StructDef::~StructDef (void)
+POA_CORBA_StructDef::~POA_CORBA_StructDef (void)
 {
 }
 
-void POA_CORBA::StructDef::_get_members_skel (
+void POA_CORBA_StructDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::StructDef *_tao_impl = (POA_CORBA::StructDef *)_tao_object_reference;
+  POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *)_tao_object_reference;
   
-    CORBA::StructMemberSeq_var _tao_retval;
+    CORBA_StructMemberSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -5128,7 +5286,7 @@ void POA_CORBA::StructDef::_get_members_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::StructMemberSeq * _tao_retval_info = _tao_retval._retn ();
+      CORBA_StructMemberSeq * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -5172,7 +5330,7 @@ void POA_CORBA::StructDef::_get_members_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::StructDef::_set_members_skel (
+void POA_CORBA_StructDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -5180,10 +5338,10 @@ void POA_CORBA::StructDef::_set_members_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::StructDef *_tao_impl = (POA_CORBA::StructDef *)_tao_object_reference;
+  POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::StructMemberSeq members;
+    CORBA_StructMemberSeq members;
   if (!(
     (_tao_in >> members)
   ))
@@ -5251,7 +5409,7 @@ void POA_CORBA::StructDef::_set_members_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::StructDef::_is_a_skel (
+void POA_CORBA_StructDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -5259,7 +5417,7 @@ void POA_CORBA::StructDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::StructDef *_tao_impl = (POA_CORBA::StructDef *) _tao_object_reference;
+  POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -5274,14 +5432,14 @@ void POA_CORBA::StructDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::StructDef::_non_existent_skel (
+void POA_CORBA_StructDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::StructDef *_tao_impl = (POA_CORBA::StructDef *) _tao_object_reference;
+  POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -5291,7 +5449,55 @@ void POA_CORBA::StructDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::StructDef::_is_a (
+void POA_CORBA_StructDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_StructDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5300,51 +5506,51 @@ CORBA::Boolean POA_CORBA::StructDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StructDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_StructDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::StructDef::_downcast (
+void* POA_CORBA_StructDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/StructDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::StructDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::TypedefDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_StructDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_StructDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Container_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::StructDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_StructDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::StructDef::_interface_repository_id (void) const
+const char* POA_CORBA_StructDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/StructDef:1.0";
+  return "IDL:omg.org/CORBA_StructDef:1.0";
 }
 
-CORBA::StructDef*
-POA_CORBA::StructDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_StructDef*
+POA_CORBA_StructDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -5357,7 +5563,7 @@ POA_CORBA::StructDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::StructDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_StructDef::_unchecked_narrow (obj.in ());
 }
 
 
@@ -5368,7 +5574,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:37 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_UnionDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -5390,10 +5596,10 @@ TAO_CORBA_UnionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len
      61, 61, 61, 61, 61, 61, 61, 61, 61,  0,
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
      61, 61, 61, 61, 61, 61, 61, 61, 61,  0,
-     61, 25,  3,  0,  0, 61, 61, 61, 61, 61,
-     61, 61, 61, 61, 61, 61, 61, 10,  0,  5,
-     61, 10, 61, 61, 61, 61, 61, 61, 61, 61,
-     61, 61, 20, 20, 61, 61, 61, 10,  5, 61,
+     61, 25,  8,  0,  0, 61, 61, 61, 61, 61,
+     61, 61, 61, 61, 61, 61, 61,  0, 15,  5,
+     61,  0, 61, 61, 61, 61, 61, 61, 61, 61,
+     61, 61, 20, 20, 61, 61, 61, 15, 10, 61,
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
@@ -5414,9 +5620,9 @@ TAO_CORBA_UnionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
      61, 61, 61, 61, 61,  0, 61,  0, 61, 25,
-      3,  0,  0, 61, 61, 61, 61, 61, 10,  0,
-      5, 61, 10, 61, 61, 20, 20, 61, 61, 61,
-     10,  5, 61, 61, 61, 61, 61, 61,
+      8,  0,  0, 61, 61, 61, 61, 61,  0, 15,
+      5, 61,  0, 61, 61, 20, 20, 61, 61, 61,
+     15, 10, 61, 61, 61, 61, 61, 61,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -5427,65 +5633,66 @@ TAO_CORBA_UnionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 {
   enum
     {
-      TOTAL_KEYWORDS = 38,
+      TOTAL_KEYWORDS = 39,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 27,
-      MIN_HASH_VALUE = 4,
+      MIN_HASH_VALUE = 5,
       MAX_HASH_VALUE = 60,
-      HASH_VALUE_RANGE = 57,
+      HASH_VALUE_RANGE = 56,
       DUPLICATES = 8
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
-      {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::UnionDef::move_skel},
-      {"_is_a",  &POA_CORBA::UnionDef::_is_a_skel},
-      {"_get_name", 	&POA_CORBA::UnionDef::_get_name_skel},
-      {"_get_type", 	&POA_CORBA::UnionDef::_get_type_skel},
-      {"_set_name", 	&POA_CORBA::UnionDef::_set_name_skel},
-      {"_get_id", 	&POA_CORBA::UnionDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::UnionDef::_set_id_skel},
-      {"describe", 	&POA_CORBA::UnionDef::describe_skel},
-      {"destroy", 	&POA_CORBA::UnionDef::destroy_skel},
-      {"_get_def_kind", 	&POA_CORBA::UnionDef::_get_def_kind_skel},
-      {"_get_version", 	&POA_CORBA::UnionDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::UnionDef::_set_version_skel},
-      {"_get_absolute_name", 	&POA_CORBA::UnionDef::_get_absolute_name_skel},
-      {"_get_defined_in", 	&POA_CORBA::UnionDef::_get_defined_in_skel},
-      {"lookup_name", 	&POA_CORBA::UnionDef::lookup_name_skel},
-      {"_get_discriminator_type", 	&POA_CORBA::UnionDef::_get_discriminator_type_skel},
-      {"lookup", 	&POA_CORBA::UnionDef::lookup_skel},
-      {"_get_discriminator_type_def", 	&POA_CORBA::UnionDef::_get_discriminator_type_def_skel},
-      {"_set_discriminator_type_def", 	&POA_CORBA::UnionDef::_set_discriminator_type_def_skel},
-      {"_get_containing_repository", 	&POA_CORBA::UnionDef::_get_containing_repository_skel},
-      {"_get_members", 	&POA_CORBA::UnionDef::_get_members_skel},
-      {"_set_members", 	&POA_CORBA::UnionDef::_set_members_skel},
-      {"_non_existent",  &POA_CORBA::UnionDef::_non_existent_skel},
-      {"create_enum", 	&POA_CORBA::UnionDef::create_enum_skel},
-      {"create_value", 	&POA_CORBA::UnionDef::create_value_skel},
-      {"create_module", 	&POA_CORBA::UnionDef::create_module_skel},
-      {"create_native", 	&POA_CORBA::UnionDef::create_native_skel},
-      {"describe_contents", 	&POA_CORBA::UnionDef::describe_contents_skel},
-      {"create_interface", 	&POA_CORBA::UnionDef::create_interface_skel},
-      {"create_union", 	&POA_CORBA::UnionDef::create_union_skel},
-      {"create_exception", 	&POA_CORBA::UnionDef::create_exception_skel},
-      {"create_local_interface", 	&POA_CORBA::UnionDef::create_local_interface_skel},
-      {"create_abstract_interface", 	&POA_CORBA::UnionDef::create_abstract_interface_skel},
-      {"create_value_box", 	&POA_CORBA::UnionDef::create_value_box_skel},
-      {"contents", 	&POA_CORBA::UnionDef::contents_skel},
-      {"create_alias", 	&POA_CORBA::UnionDef::create_alias_skel},
-      {"create_struct", 	&POA_CORBA::UnionDef::create_struct_skel},
-      {"create_constant", 	&POA_CORBA::UnionDef::create_constant_skel},
+      {"",0},{"",0},{"",0},{"",0},{"",0},
+      {"_is_a",  &POA_CORBA_UnionDef::_is_a_skel},
+      {"lookup", 	&POA_CORBA_UnionDef::lookup_skel},
+      {"_get_name", 	&POA_CORBA_UnionDef::_get_name_skel},
+      {"_get_type", 	&POA_CORBA_UnionDef::_get_type_skel},
+      {"_set_name", 	&POA_CORBA_UnionDef::_set_name_skel},
+      {"_interface",  &POA_CORBA_UnionDef::_interface_skel},
+      {"lookup_name", 	&POA_CORBA_UnionDef::lookup_name_skel},
+      {"_get_id", 	&POA_CORBA_UnionDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_UnionDef::_set_id_skel},
+      {"describe", 	&POA_CORBA_UnionDef::describe_skel},
+      {"_get_version", 	&POA_CORBA_UnionDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_UnionDef::_set_version_skel},
+      {"_get_absolute_name", 	&POA_CORBA_UnionDef::_get_absolute_name_skel},
+      {"move", 	&POA_CORBA_UnionDef::move_skel},
+      {"_get_defined_in", 	&POA_CORBA_UnionDef::_get_defined_in_skel},
+      {"_get_def_kind", 	&POA_CORBA_UnionDef::_get_def_kind_skel},
+      {"_get_discriminator_type", 	&POA_CORBA_UnionDef::_get_discriminator_type_skel},
+      {"destroy", 	&POA_CORBA_UnionDef::destroy_skel},
+      {"_get_discriminator_type_def", 	&POA_CORBA_UnionDef::_get_discriminator_type_def_skel},
+      {"_set_discriminator_type_def", 	&POA_CORBA_UnionDef::_set_discriminator_type_def_skel},
+      {"_get_members", 	&POA_CORBA_UnionDef::_get_members_skel},
+      {"_set_members", 	&POA_CORBA_UnionDef::_set_members_skel},
+      {"_non_existent",  &POA_CORBA_UnionDef::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_CORBA_UnionDef::_get_containing_repository_skel},
+      {"create_value", 	&POA_CORBA_UnionDef::create_value_skel},
+      {"create_module", 	&POA_CORBA_UnionDef::create_module_skel},
+      {"create_native", 	&POA_CORBA_UnionDef::create_native_skel},
+      {"create_interface", 	&POA_CORBA_UnionDef::create_interface_skel},
+      {"create_union", 	&POA_CORBA_UnionDef::create_union_skel},
+      {"describe_contents", 	&POA_CORBA_UnionDef::describe_contents_skel},
+      {"create_exception", 	&POA_CORBA_UnionDef::create_exception_skel},
+      {"create_local_interface", 	&POA_CORBA_UnionDef::create_local_interface_skel},
+      {"create_abstract_interface", 	&POA_CORBA_UnionDef::create_abstract_interface_skel},
+      {"create_enum", 	&POA_CORBA_UnionDef::create_enum_skel},
+      {"contents", 	&POA_CORBA_UnionDef::contents_skel},
+      {"create_value_box", 	&POA_CORBA_UnionDef::create_value_box_skel},
+      {"create_alias", 	&POA_CORBA_UnionDef::create_alias_skel},
+      {"create_struct", 	&POA_CORBA_UnionDef::create_struct_skel},
+      {"create_constant", 	&POA_CORBA_UnionDef::create_constant_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -6,  -3,   4,   5,  -1,  -9,  -2, -67, -63,  11,  -1, -14, 
-       -2,  12,  13, -64,  16,  -1,  17,  18,  -1,  19, -21,  -2,  20, -63, 
-       -1, -24,  -2,  23, -63,  26, -29,  -2,  27,  28, -64,  -1,  31,  32, 
-       33,  -1,  -1,  -1,  34,  35,  -1,  -1,  36,  37,  -1,  38,  -1,  -1, 
-       -1,  39,  40,  -1,  41, 
+       -1,  -7,  -3, -12,  -2,   5,   6, -15,  -2, -68,  10,  11,  -1, -23, 
+       -2, -72,  14, -70,  17,  18,  19,  20,  -1,  21,  -1,  22,  -1, -74, 
+       -1,  -1, -25,  -2, -62,  27, -30,  -2,  28,  29, -64,  -1,  -1,  32, 
+       33,  -1,  -1,  34,  35,  36,  -1,  -1,  37,  38,  -1,  39,  -1,  -1, 
+       40,  41,  42,  -1,  43, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -5519,17 +5726,16 @@ TAO_CORBA_UnionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
     }
   return 0;
 }
-/* ending time is 10:44:37 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_UnionDef_Perfect_Hash_OpTable tao_CORBA_UnionDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::UnionDef *tao_impl,
+    POA_CORBA_UnionDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -5568,13 +5774,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get &);
   
 private:
-  POA_CORBA::UnionDef *_tao_impl;
+  POA_CORBA_UnionDef *_tao_impl;
   CORBA::TypeCode_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::UnionDef *tao_impl,
+    POA_CORBA_UnionDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -5652,7 +5858,7 @@ class TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get : public T
 public:
   TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::UnionDef *tao_impl,
+    POA_CORBA_UnionDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -5684,20 +5890,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get (const TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get &);
   
 private:
-  POA_CORBA::UnionDef *_tao_impl;
-  CORBA::IDLType_ptr _result;
+  POA_CORBA_UnionDef *_tao_impl;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::UnionDef *tao_impl,
+    POA_CORBA_UnionDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -5764,7 +5970,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (CORBA::IDLType_ptr result)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (CORBA_IDLType_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -5775,8 +5981,8 @@ class TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set : public T
 public:
   TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::UnionDef *tao_impl,
-    CORBA::IDLType_ptr discriminator_type_def,
+    POA_CORBA_UnionDef *tao_impl,
+    CORBA_IDLType_ptr discriminator_type_def,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -5814,15 +6020,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set &);
   
 private:
-  POA_CORBA::UnionDef *_tao_impl;
-  CORBA::IDLType_ptr discriminator_type_def_;
+  POA_CORBA_UnionDef *_tao_impl;
+  CORBA_IDLType_ptr discriminator_type_def_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::UnionDef *tao_impl,
-    CORBA::IDLType_ptr discriminator_type_def,
+    POA_CORBA_UnionDef *tao_impl,
+    CORBA_IDLType_ptr discriminator_type_def,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -5898,7 +6104,7 @@ class TAO_ServerRequestInfo_CORBA_UnionDef_members_get : public TAO_ServerReques
 public:
   TAO_ServerRequestInfo_CORBA_UnionDef_members_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::UnionDef *tao_impl,
+    POA_CORBA_UnionDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -5930,20 +6136,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::UnionMemberSeq * result);
+  void result (CORBA_UnionMemberSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_UnionDef_members_get (const TAO_ServerRequestInfo_CORBA_UnionDef_members_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_UnionDef_members_get &);
   
 private:
-  POA_CORBA::UnionDef *_tao_impl;
-  CORBA::UnionMemberSeq * _result;
+  POA_CORBA_UnionDef *_tao_impl;
+  CORBA_UnionMemberSeq * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_UnionDef_members_get::TAO_ServerRequestInfo_CORBA_UnionDef_members_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::UnionDef *tao_impl,
+    POA_CORBA_UnionDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -6010,7 +6216,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (CORBA::UnionMemberSeq * result)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (CORBA_UnionMemberSeq * result)
 {
   // Update the result.
    this->_result = result;
@@ -6021,8 +6227,8 @@ class TAO_ServerRequestInfo_CORBA_UnionDef_members_set : public TAO_ServerReques
 public:
   TAO_ServerRequestInfo_CORBA_UnionDef_members_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::UnionDef *tao_impl,
-    const CORBA::UnionMemberSeq & members,
+    POA_CORBA_UnionDef *tao_impl,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -6060,15 +6266,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_UnionDef_members_set &);
   
 private:
-  POA_CORBA::UnionDef *_tao_impl;
-  const CORBA::UnionMemberSeq & members_;
+  POA_CORBA_UnionDef *_tao_impl;
+  const CORBA_UnionMemberSeq & members_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_UnionDef_members_set::TAO_ServerRequestInfo_CORBA_UnionDef_members_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::UnionDef *tao_impl,
-    const CORBA::UnionMemberSeq & members,
+    POA_CORBA_UnionDef *tao_impl,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -6146,29 +6352,29 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker::the_TAO_UnionDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_UnionDef_Strategized_Proxy_Broker *_TAO_CORBA_UnionDef_Strategized_Proxy_Broker::the_TAO_CORBA_UnionDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_UnionDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker::_TAO_UnionDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_UnionDef_Strategized_Proxy_Broker::_TAO_CORBA_UnionDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker::~_TAO_UnionDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_UnionDef_Strategized_Proxy_Broker::~_TAO_CORBA_UnionDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_UnionDef_Proxy_Impl&
-POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::UnionDef *object,
+_TAO_CORBA_UnionDef_Proxy_Impl&
+_TAO_CORBA_UnionDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_UnionDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -6186,7 +6392,7 @@ POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_UnionDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6200,7 +6406,7 @@ POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_UnionDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -6210,7 +6416,7 @@ POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_UnionDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_UnionDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -6227,38 +6433,38 @@ POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_UnionDef_Proxy_Broker *
-CORBA__TAO_UnionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_UnionDef_Proxy_Broker *
+_TAO_CORBA_UnionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker::the_TAO_UnionDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_UnionDef_Strategized_Proxy_Broker::the_TAO_CORBA_UnionDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_UnionDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_UnionDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_UnionDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_UnionDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_UnionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_UnionDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::_TAO_UnionDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::_TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::TypeCode_ptr POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type (
+CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6280,16 +6486,16 @@ CORBA::TypeCode_ptr POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_t
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::UnionDef_ptr,
+      POA_CORBA_UnionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/UnionDef:1.0"
+          "IDL:omg.org/CORBA_UnionDef:1.0"
         )
     )->discriminator_type (
         ACE_TRY_ENV
       );
 }
 
-CORBA::IDLType_ptr POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
+CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6297,7 +6503,7 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_ty
     CORBA::SystemException
   ))
 {
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -6311,18 +6517,18 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_ty
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::UnionDef_ptr,
+      POA_CORBA_UnionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/UnionDef:1.0"
+          "IDL:omg.org/CORBA_UnionDef:1.0"
         )
     )->discriminator_type_def (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
+void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr discriminator_type_def,
+    CORBA_IDLType_ptr discriminator_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6341,9 +6547,9 @@ void POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::UnionDef_ptr,
+      POA_CORBA_UnionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/UnionDef:1.0"
+          "IDL:omg.org/CORBA_UnionDef:1.0"
         )
     )->discriminator_type_def (
         discriminator_type_def,
@@ -6352,7 +6558,7 @@ void POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
   return;
 }
 
-CORBA::UnionMemberSeq * POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
+CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6360,7 +6566,7 @@ CORBA::UnionMemberSeq * POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
     CORBA::SystemException
   ))
 {
-    CORBA::UnionMemberSeq_var _tao_retval;
+    CORBA_UnionMemberSeq_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -6374,18 +6580,18 @@ CORBA::UnionMemberSeq * POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::UnionDef_ptr,
+      POA_CORBA_UnionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/UnionDef:1.0"
+          "IDL:omg.org/CORBA_UnionDef:1.0"
         )
     )->members (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
+void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::UnionMemberSeq & members,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6404,9 +6610,9 @@ void POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::UnionDef_ptr,
+      POA_CORBA_UnionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/UnionDef:1.0"
+          "IDL:omg.org/CORBA_UnionDef:1.0"
         )
     )->members (
         members,
@@ -6420,34 +6626,34 @@ void POA_CORBA::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::UnionDef::UnionDef (void)
+POA_CORBA_UnionDef::POA_CORBA_UnionDef (void)
 {
   this->optable_ = &tao_CORBA_UnionDef_optable;
 }
 
 // copy ctor
-POA_CORBA::UnionDef::UnionDef (const UnionDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,TypedefDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_UnionDef::POA_CORBA_UnionDef (const POA_CORBA_UnionDef& rhs)
+  :   POA_CORBA_TypedefDef (rhs),
+    POA_CORBA_Container (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::UnionDef::~UnionDef (void)
+POA_CORBA_UnionDef::~POA_CORBA_UnionDef (void)
 {
 }
 
-void POA_CORBA::UnionDef::_get_discriminator_type_skel (
+void POA_CORBA_UnionDef::_get_discriminator_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::UnionDef *_tao_impl = (POA_CORBA::UnionDef *)_tao_object_reference;
+  POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *)_tao_object_reference;
   
     CORBA::TypeCode_var _tao_retval;
 
@@ -6520,16 +6726,16 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
+void POA_CORBA_UnionDef::_get_discriminator_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::UnionDef *_tao_impl = (POA_CORBA::UnionDef *)_tao_object_reference;
+  POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *)_tao_object_reference;
   
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -6556,7 +6762,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -6600,7 +6806,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
+void POA_CORBA_UnionDef::_set_discriminator_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -6608,10 +6814,10 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::UnionDef *_tao_impl = (POA_CORBA::UnionDef *)_tao_object_reference;
+  POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::IDLType_var discriminator_type_def;
+    CORBA_IDLType_var discriminator_type_def;
   if (!(
     (_tao_in >> discriminator_type_def.out ())
   ))
@@ -6679,16 +6885,16 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::UnionDef::_get_members_skel (
+void POA_CORBA_UnionDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::UnionDef *_tao_impl = (POA_CORBA::UnionDef *)_tao_object_reference;
+  POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *)_tao_object_reference;
   
-    CORBA::UnionMemberSeq_var _tao_retval;
+    CORBA_UnionMemberSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -6715,7 +6921,7 @@ void POA_CORBA::UnionDef::_get_members_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::UnionMemberSeq * _tao_retval_info = _tao_retval._retn ();
+      CORBA_UnionMemberSeq * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -6759,7 +6965,7 @@ void POA_CORBA::UnionDef::_get_members_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::UnionDef::_set_members_skel (
+void POA_CORBA_UnionDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -6767,10 +6973,10 @@ void POA_CORBA::UnionDef::_set_members_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::UnionDef *_tao_impl = (POA_CORBA::UnionDef *)_tao_object_reference;
+  POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::UnionMemberSeq members;
+    CORBA_UnionMemberSeq members;
   if (!(
     (_tao_in >> members)
   ))
@@ -6838,7 +7044,7 @@ void POA_CORBA::UnionDef::_set_members_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::UnionDef::_is_a_skel (
+void POA_CORBA_UnionDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -6846,7 +7052,7 @@ void POA_CORBA::UnionDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::UnionDef *_tao_impl = (POA_CORBA::UnionDef *) _tao_object_reference;
+  POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -6861,14 +7067,14 @@ void POA_CORBA::UnionDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::UnionDef::_non_existent_skel (
+void POA_CORBA_UnionDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::UnionDef *_tao_impl = (POA_CORBA::UnionDef *) _tao_object_reference;
+  POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -6878,7 +7084,55 @@ void POA_CORBA::UnionDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::UnionDef::_is_a (
+void POA_CORBA_UnionDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_UnionDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6887,51 +7141,51 @@ CORBA::Boolean POA_CORBA::UnionDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/UnionDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_UnionDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::UnionDef::_downcast (
+void* POA_CORBA_UnionDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/UnionDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::UnionDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::TypedefDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_UnionDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_UnionDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Container_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::UnionDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_UnionDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::UnionDef::_interface_repository_id (void) const
+const char* POA_CORBA_UnionDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/UnionDef:1.0";
+  return "IDL:omg.org/CORBA_UnionDef:1.0";
 }
 
-CORBA::UnionDef*
-POA_CORBA::UnionDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_UnionDef*
+POA_CORBA_UnionDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -6944,9 +7198,10 @@ POA_CORBA::UnionDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::UnionDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_UnionDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_EnumDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -6954,7 +7209,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:37 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_EnumDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -7013,7 +7268,7 @@ TAO_CORBA_EnumDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
 {
   enum
     {
-      TOTAL_KEYWORDS = 18,
+      TOTAL_KEYWORDS = 19,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -7025,31 +7280,32 @@ TAO_CORBA_EnumDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::EnumDef::move_skel},
-      {"_is_a",  &POA_CORBA::EnumDef::_is_a_skel},
-      {"_get_id", 	&POA_CORBA::EnumDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::EnumDef::_set_id_skel},
-      {"describe", 	&POA_CORBA::EnumDef::describe_skel},
-      {"_get_name", 	&POA_CORBA::EnumDef::_get_name_skel},
-      {"_get_type", 	&POA_CORBA::EnumDef::_get_type_skel},
-      {"_set_name", 	&POA_CORBA::EnumDef::_set_name_skel},
-      {"_get_version", 	&POA_CORBA::EnumDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::EnumDef::_set_version_skel},
-      {"_get_def_kind", 	&POA_CORBA::EnumDef::_get_def_kind_skel},
-      {"_get_defined_in", 	&POA_CORBA::EnumDef::_get_defined_in_skel},
-      {"destroy", 	&POA_CORBA::EnumDef::destroy_skel},
-      {"_get_absolute_name", 	&POA_CORBA::EnumDef::_get_absolute_name_skel},
-      {"_get_members", 	&POA_CORBA::EnumDef::_get_members_skel},
-      {"_set_members", 	&POA_CORBA::EnumDef::_set_members_skel},
-      {"_non_existent",  &POA_CORBA::EnumDef::_non_existent_skel},
-      {"_get_containing_repository", 	&POA_CORBA::EnumDef::_get_containing_repository_skel},
+      {"move", 	&POA_CORBA_EnumDef::move_skel},
+      {"_is_a",  &POA_CORBA_EnumDef::_is_a_skel},
+      {"_get_id", 	&POA_CORBA_EnumDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_EnumDef::_set_id_skel},
+      {"describe", 	&POA_CORBA_EnumDef::describe_skel},
+      {"_get_name", 	&POA_CORBA_EnumDef::_get_name_skel},
+      {"_get_type", 	&POA_CORBA_EnumDef::_get_type_skel},
+      {"_set_name", 	&POA_CORBA_EnumDef::_set_name_skel},
+      {"_interface",  &POA_CORBA_EnumDef::_interface_skel},
+      {"_get_version", 	&POA_CORBA_EnumDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_EnumDef::_set_version_skel},
+      {"_get_def_kind", 	&POA_CORBA_EnumDef::_get_def_kind_skel},
+      {"_get_defined_in", 	&POA_CORBA_EnumDef::_get_defined_in_skel},
+      {"destroy", 	&POA_CORBA_EnumDef::destroy_skel},
+      {"_get_absolute_name", 	&POA_CORBA_EnumDef::_get_absolute_name_skel},
+      {"_get_members", 	&POA_CORBA_EnumDef::_get_members_skel},
+      {"_set_members", 	&POA_CORBA_EnumDef::_set_members_skel},
+      {"_non_existent",  &POA_CORBA_EnumDef::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_CORBA_EnumDef::_get_containing_repository_skel},
     };
 
   static const signed char lookup[] =
     {
-       -6,  -2,  -9,  -3,   4,   5,  -1, -43,   8, -43, -12,  -2, -38,  14, 
-       -1,  15,  -1,  16,  17,  -1, -18,  -2, -38,  20,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  21, 
+       -9,  -3, -13,  -2,   4,   5,  -1,  53,   8, -45,  12,  -1, -46,  15, 
+       -1,  16,  -1,  17,  18,  -1, -19,  -2, -38,  21,  -6,  -2,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -7083,17 +7339,16 @@ TAO_CORBA_EnumDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
     }
   return 0;
 }
-/* ending time is 10:44:37 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_EnumDef_Perfect_Hash_OpTable tao_CORBA_EnumDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_EnumDef_members_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_EnumDef_members_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::EnumDef *tao_impl,
+    POA_CORBA_EnumDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -7125,20 +7380,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::EnumMemberSeq * result);
+  void result (CORBA_EnumMemberSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_EnumDef_members_get (const TAO_ServerRequestInfo_CORBA_EnumDef_members_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_EnumDef_members_get &);
   
 private:
-  POA_CORBA::EnumDef *_tao_impl;
-  CORBA::EnumMemberSeq * _result;
+  POA_CORBA_EnumDef *_tao_impl;
+  CORBA_EnumMemberSeq * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_EnumDef_members_get::TAO_ServerRequestInfo_CORBA_EnumDef_members_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::EnumDef *tao_impl,
+    POA_CORBA_EnumDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -7205,7 +7460,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (CORBA::EnumMemberSeq * result)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (CORBA_EnumMemberSeq * result)
 {
   // Update the result.
    this->_result = result;
@@ -7216,8 +7471,8 @@ class TAO_ServerRequestInfo_CORBA_EnumDef_members_set : public TAO_ServerRequest
 public:
   TAO_ServerRequestInfo_CORBA_EnumDef_members_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::EnumDef *tao_impl,
-    const CORBA::EnumMemberSeq & members,
+    POA_CORBA_EnumDef *tao_impl,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -7255,15 +7510,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_EnumDef_members_set &);
   
 private:
-  POA_CORBA::EnumDef *_tao_impl;
-  const CORBA::EnumMemberSeq & members_;
+  POA_CORBA_EnumDef *_tao_impl;
+  const CORBA_EnumMemberSeq & members_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_EnumDef_members_set::TAO_ServerRequestInfo_CORBA_EnumDef_members_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::EnumDef *tao_impl,
-    const CORBA::EnumMemberSeq & members,
+    POA_CORBA_EnumDef *tao_impl,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -7341,29 +7596,29 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker::the_TAO_EnumDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_EnumDef_Strategized_Proxy_Broker *_TAO_CORBA_EnumDef_Strategized_Proxy_Broker::the_TAO_CORBA_EnumDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_EnumDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker::_TAO_EnumDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_EnumDef_Strategized_Proxy_Broker::_TAO_CORBA_EnumDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker::~_TAO_EnumDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_EnumDef_Strategized_Proxy_Broker::~_TAO_CORBA_EnumDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_EnumDef_Proxy_Impl&
-POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::EnumDef *object,
+_TAO_CORBA_EnumDef_Proxy_Impl&
+_TAO_CORBA_EnumDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_EnumDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -7381,7 +7636,7 @@ POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_EnumDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7395,7 +7650,7 @@ POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_EnumDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -7405,7 +7660,7 @@ POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_EnumDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_EnumDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -7422,38 +7677,38 @@ POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_EnumDef_Proxy_Broker *
-CORBA__TAO_EnumDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_EnumDef_Proxy_Broker *
+_TAO_CORBA_EnumDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker::the_TAO_EnumDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_EnumDef_Strategized_Proxy_Broker::the_TAO_CORBA_EnumDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_EnumDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_EnumDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_EnumDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_EnumDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_EnumDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_EnumDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::_TAO_EnumDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::_TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::EnumMemberSeq * POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::members (
+CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7461,7 +7716,7 @@ CORBA::EnumMemberSeq * POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::members (
     CORBA::SystemException
   ))
 {
-    CORBA::EnumMemberSeq_var _tao_retval;
+    CORBA_EnumMemberSeq_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -7475,18 +7730,18 @@ CORBA::EnumMemberSeq * POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::members (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::EnumDef_ptr,
+      POA_CORBA_EnumDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/EnumDef:1.0"
+          "IDL:omg.org/CORBA_EnumDef:1.0"
         )
     )->members (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::members (
+void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7505,9 +7760,9 @@ void POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::members (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::EnumDef_ptr,
+      POA_CORBA_EnumDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/EnumDef:1.0"
+          "IDL:omg.org/CORBA_EnumDef:1.0"
         )
     )->members (
         members,
@@ -7521,35 +7776,35 @@ void POA_CORBA::_TAO_EnumDef_ThruPOA_Proxy_Impl::members (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::EnumDef::EnumDef (void)
+POA_CORBA_EnumDef::POA_CORBA_EnumDef (void)
 {
   this->optable_ = &tao_CORBA_EnumDef_optable;
 }
 
 // copy ctor
-POA_CORBA::EnumDef::EnumDef (const EnumDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,TypedefDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_EnumDef::POA_CORBA_EnumDef (const POA_CORBA_EnumDef& rhs)
+  :   POA_CORBA_TypedefDef (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::EnumDef::~EnumDef (void)
+POA_CORBA_EnumDef::~POA_CORBA_EnumDef (void)
 {
 }
 
-void POA_CORBA::EnumDef::_get_members_skel (
+void POA_CORBA_EnumDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::EnumDef *_tao_impl = (POA_CORBA::EnumDef *)_tao_object_reference;
+  POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *)_tao_object_reference;
   
-    CORBA::EnumMemberSeq_var _tao_retval;
+    CORBA_EnumMemberSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -7576,7 +7831,7 @@ void POA_CORBA::EnumDef::_get_members_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::EnumMemberSeq * _tao_retval_info = _tao_retval._retn ();
+      CORBA_EnumMemberSeq * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -7620,7 +7875,7 @@ void POA_CORBA::EnumDef::_get_members_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::EnumDef::_set_members_skel (
+void POA_CORBA_EnumDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -7628,10 +7883,10 @@ void POA_CORBA::EnumDef::_set_members_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::EnumDef *_tao_impl = (POA_CORBA::EnumDef *)_tao_object_reference;
+  POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::EnumMemberSeq members;
+    CORBA_EnumMemberSeq members;
   if (!(
     (_tao_in >> members)
   ))
@@ -7699,7 +7954,7 @@ void POA_CORBA::EnumDef::_set_members_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::EnumDef::_is_a_skel (
+void POA_CORBA_EnumDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -7707,7 +7962,7 @@ void POA_CORBA::EnumDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::EnumDef *_tao_impl = (POA_CORBA::EnumDef *) _tao_object_reference;
+  POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -7722,14 +7977,14 @@ void POA_CORBA::EnumDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::EnumDef::_non_existent_skel (
+void POA_CORBA_EnumDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::EnumDef *_tao_impl = (POA_CORBA::EnumDef *) _tao_object_reference;
+  POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -7739,7 +7994,55 @@ void POA_CORBA::EnumDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::EnumDef::_is_a (
+void POA_CORBA_EnumDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_EnumDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7748,48 +8051,48 @@ CORBA::Boolean POA_CORBA::EnumDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/EnumDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_EnumDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::EnumDef::_downcast (
+void* POA_CORBA_EnumDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/EnumDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::EnumDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::TypedefDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_EnumDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_EnumDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::EnumDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_EnumDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::EnumDef::_interface_repository_id (void) const
+const char* POA_CORBA_EnumDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/EnumDef:1.0";
+  return "IDL:omg.org/CORBA_EnumDef:1.0";
 }
 
-CORBA::EnumDef*
-POA_CORBA::EnumDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_EnumDef*
+POA_CORBA_EnumDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -7802,9 +8105,10 @@ POA_CORBA::EnumDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::EnumDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_EnumDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_AliasDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -7812,7 +8116,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:37 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AliasDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -7871,7 +8175,7 @@ TAO_CORBA_AliasDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 {
   enum
     {
-      TOTAL_KEYWORDS = 18,
+      TOTAL_KEYWORDS = 19,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -7883,31 +8187,32 @@ TAO_CORBA_AliasDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::AliasDef::move_skel},
-      {"_is_a",  &POA_CORBA::AliasDef::_is_a_skel},
-      {"_get_id", 	&POA_CORBA::AliasDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::AliasDef::_set_id_skel},
-      {"describe", 	&POA_CORBA::AliasDef::describe_skel},
-      {"_get_name", 	&POA_CORBA::AliasDef::_get_name_skel},
-      {"_get_type", 	&POA_CORBA::AliasDef::_get_type_skel},
-      {"_set_name", 	&POA_CORBA::AliasDef::_set_name_skel},
-      {"_get_version", 	&POA_CORBA::AliasDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::AliasDef::_set_version_skel},
-      {"_get_def_kind", 	&POA_CORBA::AliasDef::_get_def_kind_skel},
-      {"_get_defined_in", 	&POA_CORBA::AliasDef::_get_defined_in_skel},
-      {"destroy", 	&POA_CORBA::AliasDef::destroy_skel},
-      {"_get_absolute_name", 	&POA_CORBA::AliasDef::_get_absolute_name_skel},
-      {"_get_original_type_def", 	&POA_CORBA::AliasDef::_get_original_type_def_skel},
-      {"_set_original_type_def", 	&POA_CORBA::AliasDef::_set_original_type_def_skel},
-      {"_non_existent",  &POA_CORBA::AliasDef::_non_existent_skel},
-      {"_get_containing_repository", 	&POA_CORBA::AliasDef::_get_containing_repository_skel},
+      {"move", 	&POA_CORBA_AliasDef::move_skel},
+      {"_is_a",  &POA_CORBA_AliasDef::_is_a_skel},
+      {"_get_id", 	&POA_CORBA_AliasDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_AliasDef::_set_id_skel},
+      {"describe", 	&POA_CORBA_AliasDef::describe_skel},
+      {"_get_name", 	&POA_CORBA_AliasDef::_get_name_skel},
+      {"_get_type", 	&POA_CORBA_AliasDef::_get_type_skel},
+      {"_set_name", 	&POA_CORBA_AliasDef::_set_name_skel},
+      {"_interface",  &POA_CORBA_AliasDef::_interface_skel},
+      {"_get_version", 	&POA_CORBA_AliasDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_AliasDef::_set_version_skel},
+      {"_get_def_kind", 	&POA_CORBA_AliasDef::_get_def_kind_skel},
+      {"_get_defined_in", 	&POA_CORBA_AliasDef::_get_defined_in_skel},
+      {"destroy", 	&POA_CORBA_AliasDef::destroy_skel},
+      {"_get_absolute_name", 	&POA_CORBA_AliasDef::_get_absolute_name_skel},
+      {"_get_original_type_def", 	&POA_CORBA_AliasDef::_get_original_type_def_skel},
+      {"_set_original_type_def", 	&POA_CORBA_AliasDef::_set_original_type_def_skel},
+      {"_non_existent",  &POA_CORBA_AliasDef::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_CORBA_AliasDef::_get_containing_repository_skel},
     };
 
   static const signed char lookup[] =
     {
-       -6,  -2,  -9,  -3,   4,   5,  -1, -43,   8, -43, -12,  -2, -38,  14, 
-       -1,  15,  -1,  16,  17,  -1, -18,  -2, -38,  20,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  21, 
+       -9,  -3, -13,  -2,   4,   5,  -1,  53,   8, -45,  12,  -1, -46,  15, 
+       -1,  16,  -1,  17,  18,  -1, -19,  -2, -38,  21,  -6,  -2,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -7941,17 +8246,16 @@ TAO_CORBA_AliasDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
     }
   return 0;
 }
-/* ending time is 10:44:37 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_AliasDef_Perfect_Hash_OpTable tao_CORBA_AliasDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::AliasDef *tao_impl,
+    POA_CORBA_AliasDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -7983,20 +8287,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get (const TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get &);
   
 private:
-  POA_CORBA::AliasDef *_tao_impl;
-  CORBA::IDLType_ptr _result;
+  POA_CORBA_AliasDef *_tao_impl;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::AliasDef *tao_impl,
+    POA_CORBA_AliasDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -8063,7 +8367,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (CORBA::IDLType_ptr result)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (CORBA_IDLType_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -8074,8 +8378,8 @@ class TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set : public TAO_Se
 public:
   TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::AliasDef *tao_impl,
-    CORBA::IDLType_ptr original_type_def,
+    POA_CORBA_AliasDef *tao_impl,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -8113,15 +8417,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set &);
   
 private:
-  POA_CORBA::AliasDef *_tao_impl;
-  CORBA::IDLType_ptr original_type_def_;
+  POA_CORBA_AliasDef *_tao_impl;
+  CORBA_IDLType_ptr original_type_def_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::AliasDef *tao_impl,
-    CORBA::IDLType_ptr original_type_def,
+    POA_CORBA_AliasDef *tao_impl,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -8199,29 +8503,29 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker::the_TAO_AliasDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_AliasDef_Strategized_Proxy_Broker *_TAO_CORBA_AliasDef_Strategized_Proxy_Broker::the_TAO_CORBA_AliasDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_AliasDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker::_TAO_AliasDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_AliasDef_Strategized_Proxy_Broker::_TAO_CORBA_AliasDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker::~_TAO_AliasDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_AliasDef_Strategized_Proxy_Broker::~_TAO_CORBA_AliasDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_AliasDef_Proxy_Impl&
-POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::AliasDef *object,
+_TAO_CORBA_AliasDef_Proxy_Impl&
+_TAO_CORBA_AliasDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_AliasDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -8239,7 +8543,7 @@ POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_AliasDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8253,7 +8557,7 @@ POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_AliasDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -8263,7 +8567,7 @@ POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_AliasDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_AliasDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -8280,38 +8584,38 @@ POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_AliasDef_Proxy_Broker *
-CORBA__TAO_AliasDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_AliasDef_Proxy_Broker *
+_TAO_CORBA_AliasDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker::the_TAO_AliasDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_AliasDef_Strategized_Proxy_Broker::the_TAO_CORBA_AliasDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_AliasDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_AliasDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_AliasDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_AliasDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_AliasDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_AliasDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::_TAO_AliasDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::_TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::IDLType_ptr POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
+CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8319,7 +8623,7 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_de
     CORBA::SystemException
   ))
 {
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -8333,18 +8637,18 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_de
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::AliasDef_ptr,
+      POA_CORBA_AliasDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/AliasDef:1.0"
+          "IDL:omg.org/CORBA_AliasDef:1.0"
         )
     )->original_type_def (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
+void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -8363,9 +8667,9 @@ void POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::AliasDef_ptr,
+      POA_CORBA_AliasDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/AliasDef:1.0"
+          "IDL:omg.org/CORBA_AliasDef:1.0"
         )
     )->original_type_def (
         original_type_def,
@@ -8379,35 +8683,35 @@ void POA_CORBA::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::AliasDef::AliasDef (void)
+POA_CORBA_AliasDef::POA_CORBA_AliasDef (void)
 {
   this->optable_ = &tao_CORBA_AliasDef_optable;
 }
 
 // copy ctor
-POA_CORBA::AliasDef::AliasDef (const AliasDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,TypedefDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_AliasDef::POA_CORBA_AliasDef (const POA_CORBA_AliasDef& rhs)
+  :   POA_CORBA_TypedefDef (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::AliasDef::~AliasDef (void)
+POA_CORBA_AliasDef::~POA_CORBA_AliasDef (void)
 {
 }
 
-void POA_CORBA::AliasDef::_get_original_type_def_skel (
+void POA_CORBA_AliasDef::_get_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::AliasDef *_tao_impl = (POA_CORBA::AliasDef *)_tao_object_reference;
+  POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *)_tao_object_reference;
   
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -8434,7 +8738,7 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -8478,7 +8782,7 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::AliasDef::_set_original_type_def_skel (
+void POA_CORBA_AliasDef::_set_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -8486,10 +8790,10 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::AliasDef *_tao_impl = (POA_CORBA::AliasDef *)_tao_object_reference;
+  POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::IDLType_var original_type_def;
+    CORBA_IDLType_var original_type_def;
   if (!(
     (_tao_in >> original_type_def.out ())
   ))
@@ -8557,7 +8861,7 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::AliasDef::_is_a_skel (
+void POA_CORBA_AliasDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -8565,7 +8869,7 @@ void POA_CORBA::AliasDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::AliasDef *_tao_impl = (POA_CORBA::AliasDef *) _tao_object_reference;
+  POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -8580,14 +8884,14 @@ void POA_CORBA::AliasDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::AliasDef::_non_existent_skel (
+void POA_CORBA_AliasDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::AliasDef *_tao_impl = (POA_CORBA::AliasDef *) _tao_object_reference;
+  POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -8597,7 +8901,55 @@ void POA_CORBA::AliasDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::AliasDef::_is_a (
+void POA_CORBA_AliasDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_AliasDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8606,48 +8958,48 @@ CORBA::Boolean POA_CORBA::AliasDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AliasDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AliasDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::AliasDef::_downcast (
+void* POA_CORBA_AliasDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AliasDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::AliasDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::TypedefDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AliasDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_AliasDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::AliasDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_AliasDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::AliasDef::_interface_repository_id (void) const
+const char* POA_CORBA_AliasDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/AliasDef:1.0";
+  return "IDL:omg.org/CORBA_AliasDef:1.0";
 }
 
-CORBA::AliasDef*
-POA_CORBA::AliasDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_AliasDef*
+POA_CORBA_AliasDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -8660,9 +9012,10 @@ POA_CORBA::AliasDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::AliasDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_AliasDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_NativeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -8670,7 +9023,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:37 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_NativeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -8729,7 +9082,7 @@ TAO_CORBA_NativeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 16,
+      TOTAL_KEYWORDS = 17,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -8741,29 +9094,30 @@ TAO_CORBA_NativeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::NativeDef::move_skel},
-      {"_is_a",  &POA_CORBA::NativeDef::_is_a_skel},
-      {"_get_id", 	&POA_CORBA::NativeDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::NativeDef::_set_id_skel},
-      {"describe", 	&POA_CORBA::NativeDef::describe_skel},
-      {"_get_name", 	&POA_CORBA::NativeDef::_get_name_skel},
-      {"_get_type", 	&POA_CORBA::NativeDef::_get_type_skel},
-      {"_set_name", 	&POA_CORBA::NativeDef::_set_name_skel},
-      {"_get_version", 	&POA_CORBA::NativeDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::NativeDef::_set_version_skel},
-      {"_get_def_kind", 	&POA_CORBA::NativeDef::_get_def_kind_skel},
-      {"_get_defined_in", 	&POA_CORBA::NativeDef::_get_defined_in_skel},
-      {"destroy", 	&POA_CORBA::NativeDef::destroy_skel},
-      {"_get_absolute_name", 	&POA_CORBA::NativeDef::_get_absolute_name_skel},
-      {"_non_existent",  &POA_CORBA::NativeDef::_non_existent_skel},
-      {"_get_containing_repository", 	&POA_CORBA::NativeDef::_get_containing_repository_skel},
+      {"move", 	&POA_CORBA_NativeDef::move_skel},
+      {"_is_a",  &POA_CORBA_NativeDef::_is_a_skel},
+      {"_get_id", 	&POA_CORBA_NativeDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_NativeDef::_set_id_skel},
+      {"describe", 	&POA_CORBA_NativeDef::describe_skel},
+      {"_get_name", 	&POA_CORBA_NativeDef::_get_name_skel},
+      {"_get_type", 	&POA_CORBA_NativeDef::_get_type_skel},
+      {"_set_name", 	&POA_CORBA_NativeDef::_set_name_skel},
+      {"_interface",  &POA_CORBA_NativeDef::_interface_skel},
+      {"_get_version", 	&POA_CORBA_NativeDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_NativeDef::_set_version_skel},
+      {"_get_def_kind", 	&POA_CORBA_NativeDef::_get_def_kind_skel},
+      {"_get_defined_in", 	&POA_CORBA_NativeDef::_get_defined_in_skel},
+      {"destroy", 	&POA_CORBA_NativeDef::destroy_skel},
+      {"_get_absolute_name", 	&POA_CORBA_NativeDef::_get_absolute_name_skel},
+      {"_non_existent",  &POA_CORBA_NativeDef::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_CORBA_NativeDef::_get_containing_repository_skel},
     };
 
   static const signed char lookup[] =
     {
-       -6,  -2,  -9,  -3,   4,   5,  -1, -43,   8, -43, -12,  -2, -38,  14, 
-       -1,  15,  -1,  16,  17,  -1,  -1,  -1,  -1,  18,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  19, 
+       -9,  -3, -13,  -2,   4,   5,  -1,  48,   8, -45,  12,  -1, -46,  15, 
+       -1,  16,  -1,  17,  18,  -6,  -2,  -1,  -1,  19,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  20, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -8797,7 +9151,7 @@ TAO_CORBA_NativeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 10:44:37 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_NativeDef_Perfect_Hash_OpTable tao_CORBA_NativeDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -8808,29 +9162,29 @@ static TAO_CORBA_NativeDef_Perfect_Hash_OpTable tao_CORBA_NativeDef_optable;
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker::the_TAO_NativeDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_NativeDef_Strategized_Proxy_Broker *_TAO_CORBA_NativeDef_Strategized_Proxy_Broker::the_TAO_CORBA_NativeDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_NativeDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker::_TAO_NativeDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_NativeDef_Strategized_Proxy_Broker::_TAO_CORBA_NativeDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker::~_TAO_NativeDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_NativeDef_Strategized_Proxy_Broker::~_TAO_CORBA_NativeDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_NativeDef_Proxy_Impl&
-POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::NativeDef *object,
+_TAO_CORBA_NativeDef_Proxy_Impl&
+_TAO_CORBA_NativeDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_NativeDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -8848,7 +9202,7 @@ POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_NativeDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8862,7 +9216,7 @@ POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_NativeDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -8872,7 +9226,7 @@ POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_NativeDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_NativeDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -8889,33 +9243,33 @@ POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_NativeDef_Proxy_Broker *
-CORBA__TAO_NativeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_NativeDef_Proxy_Broker *
+_TAO_CORBA_NativeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker::the_TAO_NativeDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_NativeDef_Strategized_Proxy_Broker::the_TAO_CORBA_NativeDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_NativeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_NativeDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_NativeDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_NativeDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_NativeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_NativeDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::_TAO_NativeDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl::_TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
@@ -8925,26 +9279,26 @@ POA_CORBA::_TAO_NativeDef_ThruPOA_Proxy_Impl::_TAO_NativeDef_ThruPOA_Proxy_Impl
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::NativeDef::NativeDef (void)
+POA_CORBA_NativeDef::POA_CORBA_NativeDef (void)
 {
   this->optable_ = &tao_CORBA_NativeDef_optable;
 }
 
 // copy ctor
-POA_CORBA::NativeDef::NativeDef (const NativeDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,TypedefDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_NativeDef::POA_CORBA_NativeDef (const POA_CORBA_NativeDef& rhs)
+  :   POA_CORBA_TypedefDef (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::NativeDef::~NativeDef (void)
+POA_CORBA_NativeDef::~POA_CORBA_NativeDef (void)
 {
 }
 
-void POA_CORBA::NativeDef::_is_a_skel (
+void POA_CORBA_NativeDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -8952,7 +9306,7 @@ void POA_CORBA::NativeDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::NativeDef *_tao_impl = (POA_CORBA::NativeDef *) _tao_object_reference;
+  POA_CORBA_NativeDef *_tao_impl = (POA_CORBA_NativeDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -8967,14 +9321,14 @@ void POA_CORBA::NativeDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::NativeDef::_non_existent_skel (
+void POA_CORBA_NativeDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::NativeDef *_tao_impl = (POA_CORBA::NativeDef *) _tao_object_reference;
+  POA_CORBA_NativeDef *_tao_impl = (POA_CORBA_NativeDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -8984,7 +9338,55 @@ void POA_CORBA::NativeDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::NativeDef::_is_a (
+void POA_CORBA_NativeDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_NativeDef *_tao_impl = (POA_CORBA_NativeDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_NativeDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8993,48 +9395,48 @@ CORBA::Boolean POA_CORBA::NativeDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/NativeDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_NativeDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::NativeDef::_downcast (
+void* POA_CORBA_NativeDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/NativeDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::NativeDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::TypedefDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_NativeDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_NativeDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::NativeDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_NativeDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::NativeDef::_interface_repository_id (void) const
+const char* POA_CORBA_NativeDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/NativeDef:1.0";
+  return "IDL:omg.org/CORBA_NativeDef:1.0";
 }
 
-CORBA::NativeDef*
-POA_CORBA::NativeDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_NativeDef*
+POA_CORBA_NativeDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -9047,9 +9449,10 @@ POA_CORBA::NativeDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::NativeDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_NativeDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -9057,7 +9460,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:37 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -9116,7 +9519,7 @@ TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 {
   enum
     {
-      TOTAL_KEYWORDS = 6,
+      TOTAL_KEYWORDS = 7,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 13,
       MIN_HASH_VALUE = 5,
@@ -9128,16 +9531,17 @@ TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},{"",0},
-      {"_is_a",  &POA_CORBA::PrimitiveDef::_is_a_skel},
+      {"_is_a",  &POA_CORBA_PrimitiveDef::_is_a_skel},
       {"",0},
-      {"destroy", 	&POA_CORBA::PrimitiveDef::destroy_skel},
+      {"destroy", 	&POA_CORBA_PrimitiveDef::destroy_skel},
       {"",0},
-      {"_get_kind", 	&POA_CORBA::PrimitiveDef::_get_kind_skel},
+      {"_get_kind", 	&POA_CORBA_PrimitiveDef::_get_kind_skel},
       {"",0},{"",0},{"",0},
-      {"_get_def_kind", 	&POA_CORBA::PrimitiveDef::_get_def_kind_skel},
-      {"_get_type", 	&POA_CORBA::PrimitiveDef::_get_type_skel},
-      {"",0},{"",0},{"",0},
-      {"_non_existent",  &POA_CORBA::PrimitiveDef::_non_existent_skel},
+      {"_get_def_kind", 	&POA_CORBA_PrimitiveDef::_get_def_kind_skel},
+      {"_get_type", 	&POA_CORBA_PrimitiveDef::_get_type_skel},
+      {"_interface",  &POA_CORBA_PrimitiveDef::_interface_skel},
+      {"",0},{"",0},
+      {"_non_existent",  &POA_CORBA_PrimitiveDef::_non_existent_skel},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -9154,17 +9558,16 @@ TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
     }
   return 0;
 }
-/* ending time is 10:44:37 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable tao_CORBA_PrimitiveDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::PrimitiveDef *tao_impl,
+    POA_CORBA_PrimitiveDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -9203,13 +9606,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get &);
   
 private:
-  POA_CORBA::PrimitiveDef *_tao_impl;
+  POA_CORBA_PrimitiveDef *_tao_impl;
   CORBA::PrimitiveKind _result;
 };
 
 TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::PrimitiveDef *tao_impl,
+    POA_CORBA_PrimitiveDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -9289,29 +9692,29 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (CORBA::PrimitiveKind
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker::the_TAO_PrimitiveDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker *_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::the_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker::_TAO_PrimitiveDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker::~_TAO_PrimitiveDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::~_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_PrimitiveDef_Proxy_Impl&
-POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::PrimitiveDef *object,
+_TAO_CORBA_PrimitiveDef_Proxy_Impl&
+_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_PrimitiveDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -9329,7 +9732,7 @@ POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -9343,7 +9746,7 @@ POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_PrimitiveDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -9353,7 +9756,7 @@ POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_PrimitiveDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -9370,38 +9773,38 @@ POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_PrimitiveDef_Proxy_Broker *
-CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_PrimitiveDef_Proxy_Broker *
+_TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker::the_TAO_PrimitiveDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::the_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::_TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::PrimitiveKind POA_CORBA::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
+CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -9423,9 +9826,9 @@ CORBA::PrimitiveKind POA_CORBA::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
-      POA_CORBA::PrimitiveDef_ptr,
+      POA_CORBA_PrimitiveDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/PrimitiveDef:1.0"
+          "IDL:omg.org/CORBA_PrimitiveDef:1.0"
         )
     )->kind (
         ACE_TRY_ENV
@@ -9437,31 +9840,31 @@ CORBA::PrimitiveKind POA_CORBA::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::PrimitiveDef::PrimitiveDef (void)
+POA_CORBA_PrimitiveDef::POA_CORBA_PrimitiveDef (void)
 {
   this->optable_ = &tao_CORBA_PrimitiveDef_optable;
 }
 
 // copy ctor
-POA_CORBA::PrimitiveDef::PrimitiveDef (const PrimitiveDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_PrimitiveDef::POA_CORBA_PrimitiveDef (const POA_CORBA_PrimitiveDef& rhs)
+  :   POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::PrimitiveDef::~PrimitiveDef (void)
+POA_CORBA_PrimitiveDef::~POA_CORBA_PrimitiveDef (void)
 {
 }
 
-void POA_CORBA::PrimitiveDef::_get_kind_skel (
+void POA_CORBA_PrimitiveDef::_get_kind_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::PrimitiveDef *_tao_impl = (POA_CORBA::PrimitiveDef *)_tao_object_reference;
+  POA_CORBA_PrimitiveDef *_tao_impl = (POA_CORBA_PrimitiveDef *)_tao_object_reference;
   
     CORBA::PrimitiveKind _tao_retval;
 
@@ -9533,7 +9936,7 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::PrimitiveDef::_is_a_skel (
+void POA_CORBA_PrimitiveDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -9541,7 +9944,7 @@ void POA_CORBA::PrimitiveDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::PrimitiveDef *_tao_impl = (POA_CORBA::PrimitiveDef *) _tao_object_reference;
+  POA_CORBA_PrimitiveDef *_tao_impl = (POA_CORBA_PrimitiveDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -9556,14 +9959,14 @@ void POA_CORBA::PrimitiveDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::PrimitiveDef::_non_existent_skel (
+void POA_CORBA_PrimitiveDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::PrimitiveDef *_tao_impl = (POA_CORBA::PrimitiveDef *) _tao_object_reference;
+  POA_CORBA_PrimitiveDef *_tao_impl = (POA_CORBA_PrimitiveDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -9573,7 +9976,55 @@ void POA_CORBA::PrimitiveDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::PrimitiveDef::_is_a (
+void POA_CORBA_PrimitiveDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_PrimitiveDef *_tao_impl = (POA_CORBA_PrimitiveDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_PrimitiveDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -9582,42 +10033,42 @@ CORBA::Boolean POA_CORBA::PrimitiveDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PrimitiveDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_PrimitiveDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::PrimitiveDef::_downcast (
+void* POA_CORBA_PrimitiveDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/PrimitiveDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::PrimitiveDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_PrimitiveDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_PrimitiveDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::PrimitiveDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_PrimitiveDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::PrimitiveDef::_interface_repository_id (void) const
+const char* POA_CORBA_PrimitiveDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/PrimitiveDef:1.0";
+  return "IDL:omg.org/CORBA_PrimitiveDef:1.0";
 }
 
-CORBA::PrimitiveDef*
-POA_CORBA::PrimitiveDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_PrimitiveDef*
+POA_CORBA_PrimitiveDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -9630,9 +10081,10 @@ POA_CORBA::PrimitiveDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::PrimitiveDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_PrimitiveDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_StringDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -9640,7 +10092,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:37 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StringDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -9662,7 +10114,7 @@ TAO_CORBA_StringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int le
      19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
-     19, 19,  0,  0, 19, 19, 19, 19, 19, 19,
+     19, 19,  0,  5, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19,  5, 19, 19, 19, 19,  0, 19,
@@ -9686,7 +10138,7 @@ TAO_CORBA_StringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int le
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19,  0, 19,  0, 19, 19,
-      0,  0, 19, 19, 19, 19, 19, 19, 19, 19,
+      0,  5, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19,  5, 19, 19, 19,
      19,  0, 19, 19, 19, 19, 19, 19,
 #endif /* ACE_MVS */
@@ -9699,7 +10151,7 @@ TAO_CORBA_StringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 7,
+      TOTAL_KEYWORDS = 8,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 13,
       MIN_HASH_VALUE = 5,
@@ -9711,19 +10163,20 @@ TAO_CORBA_StringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},{"",0},
-      {"_is_a",  &POA_CORBA::StringDef::_is_a_skel},
-      {"destroy", 	&POA_CORBA::StringDef::destroy_skel},
-      {"_get_type", 	&POA_CORBA::StringDef::_get_type_skel},
-      {"_get_bound", 	&POA_CORBA::StringDef::_get_bound_skel},
-      {"_set_bound", 	&POA_CORBA::StringDef::_set_bound_skel},
-      {"_get_def_kind", 	&POA_CORBA::StringDef::_get_def_kind_skel},
-      {"_non_existent",  &POA_CORBA::StringDef::_non_existent_skel},
+      {"_is_a",  &POA_CORBA_StringDef::_is_a_skel},
+      {"destroy", 	&POA_CORBA_StringDef::destroy_skel},
+      {"_get_bound", 	&POA_CORBA_StringDef::_get_bound_skel},
+      {"_set_bound", 	&POA_CORBA_StringDef::_set_bound_skel},
+      {"_get_def_kind", 	&POA_CORBA_StringDef::_get_def_kind_skel},
+      {"_get_type", 	&POA_CORBA_StringDef::_get_type_skel},
+      {"_interface",  &POA_CORBA_StringDef::_interface_skel},
+      {"_non_existent",  &POA_CORBA_StringDef::_non_existent_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -8,  -2,   5,  -1,   6,  -1,   7, -25,  -1,  -1,  10, 
-       -1,  -1,  -1,  -1,  11, 
+       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -20,  -1,  -1,   9, 
+       10,  11,  -1,  -1,  12, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -9757,17 +10210,16 @@ TAO_CORBA_StringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 10:44:37 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_StringDef_Perfect_Hash_OpTable tao_CORBA_StringDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_StringDef_bound_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_StringDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::StringDef *tao_impl,
+    POA_CORBA_StringDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -9806,13 +10258,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_StringDef_bound_get &);
   
 private:
-  POA_CORBA::StringDef *_tao_impl;
+  POA_CORBA_StringDef *_tao_impl;
   CORBA::ULong _result;
 };
 
 TAO_ServerRequestInfo_CORBA_StringDef_bound_get::TAO_ServerRequestInfo_CORBA_StringDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::StringDef *tao_impl,
+    POA_CORBA_StringDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -9890,7 +10342,7 @@ class TAO_ServerRequestInfo_CORBA_StringDef_bound_set : public TAO_ServerRequest
 public:
   TAO_ServerRequestInfo_CORBA_StringDef_bound_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::StringDef *tao_impl,
+    POA_CORBA_StringDef *tao_impl,
     const CORBA::ULong & bound,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -9929,14 +10381,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_StringDef_bound_set &);
   
 private:
-  POA_CORBA::StringDef *_tao_impl;
+  POA_CORBA_StringDef *_tao_impl;
   const CORBA::ULong & bound_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_StringDef_bound_set::TAO_ServerRequestInfo_CORBA_StringDef_bound_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::StringDef *tao_impl,
+    POA_CORBA_StringDef *tao_impl,
     const CORBA::ULong & bound,
     CORBA::Environment &
   )
@@ -10014,29 +10466,29 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker::the_TAO_StringDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_StringDef_Strategized_Proxy_Broker *_TAO_CORBA_StringDef_Strategized_Proxy_Broker::the_TAO_CORBA_StringDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_StringDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker::_TAO_StringDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_StringDef_Strategized_Proxy_Broker::_TAO_CORBA_StringDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker::~_TAO_StringDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_StringDef_Strategized_Proxy_Broker::~_TAO_CORBA_StringDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_StringDef_Proxy_Impl&
-POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::StringDef *object,
+_TAO_CORBA_StringDef_Proxy_Impl&
+_TAO_CORBA_StringDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_StringDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -10054,7 +10506,7 @@ POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_StringDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -10068,7 +10520,7 @@ POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_StringDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -10078,7 +10530,7 @@ POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_StringDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_StringDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -10095,38 +10547,38 @@ POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_StringDef_Proxy_Broker *
-CORBA__TAO_StringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_StringDef_Proxy_Broker *
+_TAO_CORBA_StringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker::the_TAO_StringDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_StringDef_Strategized_Proxy_Broker::the_TAO_CORBA_StringDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_StringDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_StringDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_StringDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_StringDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_StringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_StringDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::_TAO_StringDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::_TAO_CORBA_StringDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::ULong POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::bound (
+CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -10148,16 +10600,16 @@ CORBA::ULong POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::bound (
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
-      POA_CORBA::StringDef_ptr,
+      POA_CORBA_StringDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/StringDef:1.0"
+          "IDL:omg.org/CORBA_StringDef:1.0"
         )
     )->bound (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::bound (
+void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
@@ -10178,9 +10630,9 @@ void POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::bound (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::StringDef_ptr,
+      POA_CORBA_StringDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/StringDef:1.0"
+          "IDL:omg.org/CORBA_StringDef:1.0"
         )
     )->bound (
         bound,
@@ -10194,31 +10646,31 @@ void POA_CORBA::_TAO_StringDef_ThruPOA_Proxy_Impl::bound (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::StringDef::StringDef (void)
+POA_CORBA_StringDef::POA_CORBA_StringDef (void)
 {
   this->optable_ = &tao_CORBA_StringDef_optable;
 }
 
 // copy ctor
-POA_CORBA::StringDef::StringDef (const StringDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_StringDef::POA_CORBA_StringDef (const POA_CORBA_StringDef& rhs)
+  :   POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::StringDef::~StringDef (void)
+POA_CORBA_StringDef::~POA_CORBA_StringDef (void)
 {
 }
 
-void POA_CORBA::StringDef::_get_bound_skel (
+void POA_CORBA_StringDef::_get_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::StringDef *_tao_impl = (POA_CORBA::StringDef *)_tao_object_reference;
+  POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *)_tao_object_reference;
   
     CORBA::ULong _tao_retval = 0;
 
@@ -10290,7 +10742,7 @@ void POA_CORBA::StringDef::_get_bound_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::StringDef::_set_bound_skel (
+void POA_CORBA_StringDef::_set_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -10298,7 +10750,7 @@ void POA_CORBA::StringDef::_set_bound_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::StringDef *_tao_impl = (POA_CORBA::StringDef *)_tao_object_reference;
+  POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
     CORBA::ULong bound;
@@ -10369,7 +10821,7 @@ void POA_CORBA::StringDef::_set_bound_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::StringDef::_is_a_skel (
+void POA_CORBA_StringDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -10377,7 +10829,7 @@ void POA_CORBA::StringDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::StringDef *_tao_impl = (POA_CORBA::StringDef *) _tao_object_reference;
+  POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -10392,14 +10844,14 @@ void POA_CORBA::StringDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::StringDef::_non_existent_skel (
+void POA_CORBA_StringDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::StringDef *_tao_impl = (POA_CORBA::StringDef *) _tao_object_reference;
+  POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -10409,7 +10861,55 @@ void POA_CORBA::StringDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::StringDef::_is_a (
+void POA_CORBA_StringDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_StringDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -10418,42 +10918,42 @@ CORBA::Boolean POA_CORBA::StringDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StringDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_StringDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::StringDef::_downcast (
+void* POA_CORBA_StringDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/StringDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::StringDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_StringDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_StringDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::StringDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_StringDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::StringDef::_interface_repository_id (void) const
+const char* POA_CORBA_StringDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/StringDef:1.0";
+  return "IDL:omg.org/CORBA_StringDef:1.0";
 }
 
-CORBA::StringDef*
-POA_CORBA::StringDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_StringDef*
+POA_CORBA_StringDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -10466,9 +10966,10 @@ POA_CORBA::StringDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::StringDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_StringDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_WstringDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -10476,7 +10977,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:37 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_WstringDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -10498,7 +10999,7 @@ TAO_CORBA_WstringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int l
      19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
-     19, 19,  0,  0, 19, 19, 19, 19, 19, 19,
+     19, 19,  0,  5, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19,  5, 19, 19, 19, 19,  0, 19,
@@ -10522,7 +11023,7 @@ TAO_CORBA_WstringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int l
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19,  0, 19,  0, 19, 19,
-      0,  0, 19, 19, 19, 19, 19, 19, 19, 19,
+      0,  5, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19,  5, 19, 19, 19,
      19,  0, 19, 19, 19, 19, 19, 19,
 #endif /* ACE_MVS */
@@ -10535,7 +11036,7 @@ TAO_CORBA_WstringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 7,
+      TOTAL_KEYWORDS = 8,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 13,
       MIN_HASH_VALUE = 5,
@@ -10547,19 +11048,20 @@ TAO_CORBA_WstringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},{"",0},
-      {"_is_a",  &POA_CORBA::WstringDef::_is_a_skel},
-      {"destroy", 	&POA_CORBA::WstringDef::destroy_skel},
-      {"_get_type", 	&POA_CORBA::WstringDef::_get_type_skel},
-      {"_get_bound", 	&POA_CORBA::WstringDef::_get_bound_skel},
-      {"_set_bound", 	&POA_CORBA::WstringDef::_set_bound_skel},
-      {"_get_def_kind", 	&POA_CORBA::WstringDef::_get_def_kind_skel},
-      {"_non_existent",  &POA_CORBA::WstringDef::_non_existent_skel},
+      {"_is_a",  &POA_CORBA_WstringDef::_is_a_skel},
+      {"destroy", 	&POA_CORBA_WstringDef::destroy_skel},
+      {"_get_bound", 	&POA_CORBA_WstringDef::_get_bound_skel},
+      {"_set_bound", 	&POA_CORBA_WstringDef::_set_bound_skel},
+      {"_get_def_kind", 	&POA_CORBA_WstringDef::_get_def_kind_skel},
+      {"_get_type", 	&POA_CORBA_WstringDef::_get_type_skel},
+      {"_interface",  &POA_CORBA_WstringDef::_interface_skel},
+      {"_non_existent",  &POA_CORBA_WstringDef::_non_existent_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -8,  -2,   5,  -1,   6,  -1,   7, -25,  -1,  -1,  10, 
-       -1,  -1,  -1,  -1,  11, 
+       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -20,  -1,  -1,   9, 
+       10,  11,  -1,  -1,  12, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -10593,17 +11095,16 @@ TAO_CORBA_WstringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 10:44:37 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_WstringDef_Perfect_Hash_OpTable tao_CORBA_WstringDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_WstringDef_bound_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_WstringDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::WstringDef *tao_impl,
+    POA_CORBA_WstringDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -10642,13 +11143,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_WstringDef_bound_get &);
   
 private:
-  POA_CORBA::WstringDef *_tao_impl;
+  POA_CORBA_WstringDef *_tao_impl;
   CORBA::ULong _result;
 };
 
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::TAO_ServerRequestInfo_CORBA_WstringDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::WstringDef *tao_impl,
+    POA_CORBA_WstringDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -10726,7 +11227,7 @@ class TAO_ServerRequestInfo_CORBA_WstringDef_bound_set : public TAO_ServerReques
 public:
   TAO_ServerRequestInfo_CORBA_WstringDef_bound_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::WstringDef *tao_impl,
+    POA_CORBA_WstringDef *tao_impl,
     const CORBA::ULong & bound,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -10765,14 +11266,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_WstringDef_bound_set &);
   
 private:
-  POA_CORBA::WstringDef *_tao_impl;
+  POA_CORBA_WstringDef *_tao_impl;
   const CORBA::ULong & bound_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::TAO_ServerRequestInfo_CORBA_WstringDef_bound_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::WstringDef *tao_impl,
+    POA_CORBA_WstringDef *tao_impl,
     const CORBA::ULong & bound,
     CORBA::Environment &
   )
@@ -10850,29 +11351,29 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker::the_TAO_WstringDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_WstringDef_Strategized_Proxy_Broker *_TAO_CORBA_WstringDef_Strategized_Proxy_Broker::the_TAO_CORBA_WstringDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_WstringDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker::_TAO_WstringDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_WstringDef_Strategized_Proxy_Broker::_TAO_CORBA_WstringDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker::~_TAO_WstringDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_WstringDef_Strategized_Proxy_Broker::~_TAO_CORBA_WstringDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_WstringDef_Proxy_Impl&
-POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::WstringDef *object,
+_TAO_CORBA_WstringDef_Proxy_Impl&
+_TAO_CORBA_WstringDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_WstringDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -10890,7 +11391,7 @@ POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_WstringDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -10904,7 +11405,7 @@ POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_WstringDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -10914,7 +11415,7 @@ POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_WstringDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_WstringDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -10931,38 +11432,38 @@ POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_WstringDef_Proxy_Broker *
-CORBA__TAO_WstringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_WstringDef_Proxy_Broker *
+_TAO_CORBA_WstringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker::the_TAO_WstringDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_WstringDef_Strategized_Proxy_Broker::the_TAO_CORBA_WstringDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_WstringDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_WstringDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_WstringDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_WstringDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_WstringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_WstringDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::_TAO_WstringDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::_TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::ULong POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::bound (
+CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -10984,16 +11485,16 @@ CORBA::ULong POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::bound (
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
-      POA_CORBA::WstringDef_ptr,
+      POA_CORBA_WstringDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/WstringDef:1.0"
+          "IDL:omg.org/CORBA_WstringDef:1.0"
         )
     )->bound (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::bound (
+void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
@@ -11014,9 +11515,9 @@ void POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::bound (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::WstringDef_ptr,
+      POA_CORBA_WstringDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/WstringDef:1.0"
+          "IDL:omg.org/CORBA_WstringDef:1.0"
         )
     )->bound (
         bound,
@@ -11030,31 +11531,31 @@ void POA_CORBA::_TAO_WstringDef_ThruPOA_Proxy_Impl::bound (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::WstringDef::WstringDef (void)
+POA_CORBA_WstringDef::POA_CORBA_WstringDef (void)
 {
   this->optable_ = &tao_CORBA_WstringDef_optable;
 }
 
 // copy ctor
-POA_CORBA::WstringDef::WstringDef (const WstringDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_WstringDef::POA_CORBA_WstringDef (const POA_CORBA_WstringDef& rhs)
+  :   POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::WstringDef::~WstringDef (void)
+POA_CORBA_WstringDef::~POA_CORBA_WstringDef (void)
 {
 }
 
-void POA_CORBA::WstringDef::_get_bound_skel (
+void POA_CORBA_WstringDef::_get_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::WstringDef *_tao_impl = (POA_CORBA::WstringDef *)_tao_object_reference;
+  POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *)_tao_object_reference;
   
     CORBA::ULong _tao_retval = 0;
 
@@ -11126,7 +11627,7 @@ void POA_CORBA::WstringDef::_get_bound_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::WstringDef::_set_bound_skel (
+void POA_CORBA_WstringDef::_set_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -11134,7 +11635,7 @@ void POA_CORBA::WstringDef::_set_bound_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::WstringDef *_tao_impl = (POA_CORBA::WstringDef *)_tao_object_reference;
+  POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
     CORBA::ULong bound;
@@ -11205,7 +11706,7 @@ void POA_CORBA::WstringDef::_set_bound_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::WstringDef::_is_a_skel (
+void POA_CORBA_WstringDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -11213,7 +11714,7 @@ void POA_CORBA::WstringDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::WstringDef *_tao_impl = (POA_CORBA::WstringDef *) _tao_object_reference;
+  POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -11228,14 +11729,14 @@ void POA_CORBA::WstringDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::WstringDef::_non_existent_skel (
+void POA_CORBA_WstringDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::WstringDef *_tao_impl = (POA_CORBA::WstringDef *) _tao_object_reference;
+  POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -11245,7 +11746,55 @@ void POA_CORBA::WstringDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::WstringDef::_is_a (
+void POA_CORBA_WstringDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_WstringDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -11254,42 +11803,42 @@ CORBA::Boolean POA_CORBA::WstringDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/WstringDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_WstringDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::WstringDef::_downcast (
+void* POA_CORBA_WstringDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/WstringDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::WstringDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_WstringDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_WstringDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::WstringDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_WstringDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::WstringDef::_interface_repository_id (void) const
+const char* POA_CORBA_WstringDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/WstringDef:1.0";
+  return "IDL:omg.org/CORBA_WstringDef:1.0";
 }
 
-CORBA::WstringDef*
-POA_CORBA::WstringDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_WstringDef*
+POA_CORBA_WstringDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -11302,9 +11851,10 @@ POA_CORBA::WstringDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::WstringDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_WstringDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_SequenceDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -11312,7 +11862,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:37 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_SequenceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -11334,10 +11884,10 @@ TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int
      22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
      22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
-     22, 22,  0,  0,  0, 22, 22, 22, 22, 22,
+     22, 22,  5,  0,  0, 22, 22, 22, 22, 22,
      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22,  5, 22, 22, 22, 22,  0, 22,
+     22, 22, 22,  0, 22, 22, 22, 22, 22, 22,
      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
@@ -11358,9 +11908,9 @@ TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int
      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
      22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
      22, 22, 22, 22, 22,  0, 22,  0, 22, 22,
-      0,  0,  0, 22, 22, 22, 22, 22, 22, 22,
-     22, 22, 22, 22, 22, 22,  5, 22, 22, 22,
-     22,  0, 22, 22, 22, 22, 22, 22,
+      5,  0,  0, 22, 22, 22, 22, 22, 22, 22,
+     22, 22, 22, 22, 22, 22,  0, 22, 22, 22,
+     22, 22, 22, 22, 22, 22, 22, 22,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -11371,7 +11921,7 @@ TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 {
   enum
     {
-      TOTAL_KEYWORDS = 10,
+      TOTAL_KEYWORDS = 8,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 21,
       MIN_HASH_VALUE = 5,
@@ -11383,22 +11933,20 @@ TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},{"",0},
-      {"_is_a",  &POA_CORBA::SequenceDef::_is_a_skel},
-      {"destroy", 	&POA_CORBA::SequenceDef::destroy_skel},
-      {"_get_type", 	&POA_CORBA::SequenceDef::_get_type_skel},
-      {"_get_bound", 	&POA_CORBA::SequenceDef::_get_bound_skel},
-      {"_set_bound", 	&POA_CORBA::SequenceDef::_set_bound_skel},
-      {"_get_def_kind", 	&POA_CORBA::SequenceDef::_get_def_kind_skel},
-      {"_get_element_type", 	&POA_CORBA::SequenceDef::_get_element_type_skel},
-      {"_non_existent",  &POA_CORBA::SequenceDef::_non_existent_skel},
-      {"_get_element_type_def", 	&POA_CORBA::SequenceDef::_get_element_type_def_skel},
-      {"_set_element_type_def", 	&POA_CORBA::SequenceDef::_set_element_type_def_skel},
+      {"_is_a",  &POA_CORBA_SequenceDef::_is_a_skel},
+      {"_interface",  &POA_CORBA_SequenceDef::_interface_skel},
+      {"_non_existent",  &POA_CORBA_SequenceDef::_non_existent_skel},
+      {"_get_bound", 	&POA_CORBA_SequenceDef::_get_bound_skel},
+      {"_set_bound", 	&POA_CORBA_SequenceDef::_set_bound_skel},
+      {"_get_element_type", 	&POA_CORBA_SequenceDef::_get_element_type_skel},
+      {"_get_element_type_def", 	&POA_CORBA_SequenceDef::_get_element_type_def_skel},
+      {"_set_element_type_def", 	&POA_CORBA_SequenceDef::_set_element_type_def_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -8,  -2,   5,  -1,   6,  -1,   7, -28,  -1,  -1,  10, 
-       -1,  -1,  -1,  11,  12, -13,  -2, -23, 
+       -1,  -1,  -1,  -1,  -1,   5,  -1,  -1,  -1,  -1,   6,  -8,  -2,   7, 
+       -1, -25,  -1,  10,  -1, -11,  -2, -23, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -11432,17 +11980,16 @@ TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
     }
   return 0;
 }
-/* ending time is 10:44:37 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_SequenceDef_Perfect_Hash_OpTable tao_CORBA_SequenceDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::SequenceDef *tao_impl,
+    POA_CORBA_SequenceDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -11481,13 +12028,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get &);
   
 private:
-  POA_CORBA::SequenceDef *_tao_impl;
+  POA_CORBA_SequenceDef *_tao_impl;
   CORBA::ULong _result;
 };
 
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::SequenceDef *tao_impl,
+    POA_CORBA_SequenceDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -11565,7 +12112,7 @@ class TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::SequenceDef *tao_impl,
+    POA_CORBA_SequenceDef *tao_impl,
     const CORBA::ULong & bound,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -11604,14 +12151,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set &);
   
 private:
-  POA_CORBA::SequenceDef *_tao_impl;
+  POA_CORBA_SequenceDef *_tao_impl;
   const CORBA::ULong & bound_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::SequenceDef *tao_impl,
+    POA_CORBA_SequenceDef *tao_impl,
     const CORBA::ULong & bound,
     CORBA::Environment &
   )
@@ -11687,7 +12234,7 @@ class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get : public TAO_Serv
 public:
   TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::SequenceDef *tao_impl,
+    POA_CORBA_SequenceDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -11726,13 +12273,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get &);
   
 private:
-  POA_CORBA::SequenceDef *_tao_impl;
+  POA_CORBA_SequenceDef *_tao_impl;
   CORBA::TypeCode_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::SequenceDef *tao_impl,
+    POA_CORBA_SequenceDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -11810,7 +12357,7 @@ class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get : public TAO_
 public:
   TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::SequenceDef *tao_impl,
+    POA_CORBA_SequenceDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -11842,20 +12389,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get (const TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get &);
   
 private:
-  POA_CORBA::SequenceDef *_tao_impl;
-  CORBA::IDLType_ptr _result;
+  POA_CORBA_SequenceDef *_tao_impl;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::SequenceDef *tao_impl,
+    POA_CORBA_SequenceDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -11922,7 +12469,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (CORBA::IDLType_ptr result)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (CORBA_IDLType_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -11933,8 +12480,8 @@ class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set : public TAO_
 public:
   TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::SequenceDef *tao_impl,
-    CORBA::IDLType_ptr element_type_def,
+    POA_CORBA_SequenceDef *tao_impl,
+    CORBA_IDLType_ptr element_type_def,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -11972,15 +12519,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set &);
   
 private:
-  POA_CORBA::SequenceDef *_tao_impl;
-  CORBA::IDLType_ptr element_type_def_;
+  POA_CORBA_SequenceDef *_tao_impl;
+  CORBA_IDLType_ptr element_type_def_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::SequenceDef *tao_impl,
-    CORBA::IDLType_ptr element_type_def,
+    POA_CORBA_SequenceDef *tao_impl,
+    CORBA_IDLType_ptr element_type_def,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -12058,29 +12605,29 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker::the_TAO_SequenceDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker *_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::the_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker::_TAO_SequenceDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker::~_TAO_SequenceDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::~_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_SequenceDef_Proxy_Impl&
-POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::SequenceDef *object,
+_TAO_CORBA_SequenceDef_Proxy_Impl&
+_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_SequenceDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -12098,7 +12645,7 @@ POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -12112,7 +12659,7 @@ POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_SequenceDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -12122,7 +12669,7 @@ POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_SequenceDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_SequenceDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -12139,38 +12686,38 @@ POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_SequenceDef_Proxy_Broker *
-CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_SequenceDef_Proxy_Broker *
+_TAO_CORBA_SequenceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker::the_TAO_SequenceDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::the_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_SequenceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_SequenceDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_SequenceDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_SequenceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_SequenceDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::_TAO_SequenceDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::_TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::ULong POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::bound (
+CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -12192,16 +12739,16 @@ CORBA::ULong POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::bound (
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
-      POA_CORBA::SequenceDef_ptr,
+      POA_CORBA_SequenceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/SequenceDef:1.0"
+          "IDL:omg.org/CORBA_SequenceDef:1.0"
         )
     )->bound (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::bound (
+void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
@@ -12222,9 +12769,9 @@ void POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::bound (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::SequenceDef_ptr,
+      POA_CORBA_SequenceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/SequenceDef:1.0"
+          "IDL:omg.org/CORBA_SequenceDef:1.0"
         )
     )->bound (
         bound,
@@ -12233,7 +12780,7 @@ void POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::bound (
   return;
 }
 
-CORBA::TypeCode_ptr POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type (
+CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -12255,16 +12802,16 @@ CORBA::TypeCode_ptr POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::SequenceDef_ptr,
+      POA_CORBA_SequenceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/SequenceDef:1.0"
+          "IDL:omg.org/CORBA_SequenceDef:1.0"
         )
     )->element_type (
         ACE_TRY_ENV
       );
 }
 
-CORBA::IDLType_ptr POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
+CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -12272,7 +12819,7 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_
     CORBA::SystemException
   ))
 {
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -12286,18 +12833,18 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::SequenceDef_ptr,
+      POA_CORBA_SequenceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/SequenceDef:1.0"
+          "IDL:omg.org/CORBA_SequenceDef:1.0"
         )
     )->element_type_def (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
+void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr element_type_def,
+    CORBA_IDLType_ptr element_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -12316,9 +12863,9 @@ void POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::SequenceDef_ptr,
+      POA_CORBA_SequenceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/SequenceDef:1.0"
+          "IDL:omg.org/CORBA_SequenceDef:1.0"
         )
     )->element_type_def (
         element_type_def,
@@ -12332,31 +12879,31 @@ void POA_CORBA::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::SequenceDef::SequenceDef (void)
+POA_CORBA_SequenceDef::POA_CORBA_SequenceDef (void)
 {
   this->optable_ = &tao_CORBA_SequenceDef_optable;
 }
 
 // copy ctor
-POA_CORBA::SequenceDef::SequenceDef (const SequenceDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_SequenceDef::POA_CORBA_SequenceDef (const POA_CORBA_SequenceDef& rhs)
+  :   POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::SequenceDef::~SequenceDef (void)
+POA_CORBA_SequenceDef::~POA_CORBA_SequenceDef (void)
 {
 }
 
-void POA_CORBA::SequenceDef::_get_bound_skel (
+void POA_CORBA_SequenceDef::_get_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::SequenceDef *_tao_impl = (POA_CORBA::SequenceDef *)_tao_object_reference;
+  POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *)_tao_object_reference;
   
     CORBA::ULong _tao_retval = 0;
 
@@ -12428,7 +12975,7 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::SequenceDef::_set_bound_skel (
+void POA_CORBA_SequenceDef::_set_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -12436,7 +12983,7 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::SequenceDef *_tao_impl = (POA_CORBA::SequenceDef *)_tao_object_reference;
+  POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
     CORBA::ULong bound;
@@ -12507,14 +13054,14 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::SequenceDef::_get_element_type_skel (
+void POA_CORBA_SequenceDef::_get_element_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::SequenceDef *_tao_impl = (POA_CORBA::SequenceDef *)_tao_object_reference;
+  POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *)_tao_object_reference;
   
     CORBA::TypeCode_var _tao_retval;
 
@@ -12587,16 +13134,16 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::SequenceDef::_get_element_type_def_skel (
+void POA_CORBA_SequenceDef::_get_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::SequenceDef *_tao_impl = (POA_CORBA::SequenceDef *)_tao_object_reference;
+  POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *)_tao_object_reference;
   
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -12623,7 +13170,7 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -12667,7 +13214,7 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::SequenceDef::_set_element_type_def_skel (
+void POA_CORBA_SequenceDef::_set_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -12675,10 +13222,10 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::SequenceDef *_tao_impl = (POA_CORBA::SequenceDef *)_tao_object_reference;
+  POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::IDLType_var element_type_def;
+    CORBA_IDLType_var element_type_def;
   if (!(
     (_tao_in >> element_type_def.out ())
   ))
@@ -12746,7 +13293,7 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::SequenceDef::_is_a_skel (
+void POA_CORBA_SequenceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -12754,7 +13301,7 @@ void POA_CORBA::SequenceDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::SequenceDef *_tao_impl = (POA_CORBA::SequenceDef *) _tao_object_reference;
+  POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -12769,14 +13316,14 @@ void POA_CORBA::SequenceDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::SequenceDef::_non_existent_skel (
+void POA_CORBA_SequenceDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::SequenceDef *_tao_impl = (POA_CORBA::SequenceDef *) _tao_object_reference;
+  POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -12786,7 +13333,55 @@ void POA_CORBA::SequenceDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::SequenceDef::_is_a (
+void POA_CORBA_SequenceDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_SequenceDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -12795,42 +13390,42 @@ CORBA::Boolean POA_CORBA::SequenceDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/SequenceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_SequenceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::SequenceDef::_downcast (
+void* POA_CORBA_SequenceDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/SequenceDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::SequenceDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_SequenceDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_SequenceDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::SequenceDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_SequenceDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::SequenceDef::_interface_repository_id (void) const
+const char* POA_CORBA_SequenceDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/SequenceDef:1.0";
+  return "IDL:omg.org/CORBA_SequenceDef:1.0";
 }
 
-CORBA::SequenceDef*
-POA_CORBA::SequenceDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_SequenceDef*
+POA_CORBA_SequenceDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -12843,9 +13438,10 @@ POA_CORBA::SequenceDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::SequenceDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_SequenceDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_ArrayDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -12853,7 +13449,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:37 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ArrayDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -12912,7 +13508,7 @@ TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 {
   enum
     {
-      TOTAL_KEYWORDS = 10,
+      TOTAL_KEYWORDS = 11,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 21,
       MIN_HASH_VALUE = 5,
@@ -12924,22 +13520,23 @@ TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},{"",0},
-      {"_is_a",  &POA_CORBA::ArrayDef::_is_a_skel},
-      {"destroy", 	&POA_CORBA::ArrayDef::destroy_skel},
-      {"_get_type", 	&POA_CORBA::ArrayDef::_get_type_skel},
-      {"_get_length", 	&POA_CORBA::ArrayDef::_get_length_skel},
-      {"_set_length", 	&POA_CORBA::ArrayDef::_set_length_skel},
-      {"_get_def_kind", 	&POA_CORBA::ArrayDef::_get_def_kind_skel},
-      {"_get_element_type", 	&POA_CORBA::ArrayDef::_get_element_type_skel},
-      {"_non_existent",  &POA_CORBA::ArrayDef::_non_existent_skel},
-      {"_get_element_type_def", 	&POA_CORBA::ArrayDef::_get_element_type_def_skel},
-      {"_set_element_type_def", 	&POA_CORBA::ArrayDef::_set_element_type_def_skel},
+      {"_is_a",  &POA_CORBA_ArrayDef::_is_a_skel},
+      {"destroy", 	&POA_CORBA_ArrayDef::destroy_skel},
+      {"_get_type", 	&POA_CORBA_ArrayDef::_get_type_skel},
+      {"_interface",  &POA_CORBA_ArrayDef::_interface_skel},
+      {"_get_length", 	&POA_CORBA_ArrayDef::_get_length_skel},
+      {"_set_length", 	&POA_CORBA_ArrayDef::_set_length_skel},
+      {"_get_def_kind", 	&POA_CORBA_ArrayDef::_get_def_kind_skel},
+      {"_get_element_type", 	&POA_CORBA_ArrayDef::_get_element_type_skel},
+      {"_non_existent",  &POA_CORBA_ArrayDef::_non_existent_skel},
+      {"_get_element_type_def", 	&POA_CORBA_ArrayDef::_get_element_type_def_skel},
+      {"_set_element_type_def", 	&POA_CORBA_ArrayDef::_set_element_type_def_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -8,  -2,   5,  -1,   6,  -1,   7,  -1, -29,  -1,  10, 
-       -1,  -1,  -1,  11,  12, -13,  -2, -23, 
+       -1,  -1,  -1,  -9,  -2,   5,  -1,   6,  -1,   7,   8, -29,  -1,  11, 
+       -1,  -1,  -1,  12,  13, -14,  -2, -23, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -12973,17 +13570,16 @@ TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
     }
   return 0;
 }
-/* ending time is 10:44:37 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_ArrayDef_Perfect_Hash_OpTable tao_CORBA_ArrayDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_ArrayDef_length_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_ArrayDef_length_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ArrayDef *tao_impl,
+    POA_CORBA_ArrayDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -13022,13 +13618,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ArrayDef_length_get &);
   
 private:
-  POA_CORBA::ArrayDef *_tao_impl;
+  POA_CORBA_ArrayDef *_tao_impl;
   CORBA::ULong _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::TAO_ServerRequestInfo_CORBA_ArrayDef_length_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ArrayDef *tao_impl,
+    POA_CORBA_ArrayDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -13106,7 +13702,7 @@ class TAO_ServerRequestInfo_CORBA_ArrayDef_length_set : public TAO_ServerRequest
 public:
   TAO_ServerRequestInfo_CORBA_ArrayDef_length_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ArrayDef *tao_impl,
+    POA_CORBA_ArrayDef *tao_impl,
     const CORBA::ULong & length,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -13145,14 +13741,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ArrayDef_length_set &);
   
 private:
-  POA_CORBA::ArrayDef *_tao_impl;
+  POA_CORBA_ArrayDef *_tao_impl;
   const CORBA::ULong & length_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::TAO_ServerRequestInfo_CORBA_ArrayDef_length_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ArrayDef *tao_impl,
+    POA_CORBA_ArrayDef *tao_impl,
     const CORBA::ULong & length,
     CORBA::Environment &
   )
@@ -13228,7 +13824,7 @@ class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ArrayDef *tao_impl,
+    POA_CORBA_ArrayDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -13267,13 +13863,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get &);
   
 private:
-  POA_CORBA::ArrayDef *_tao_impl;
+  POA_CORBA_ArrayDef *_tao_impl;
   CORBA::TypeCode_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ArrayDef *tao_impl,
+    POA_CORBA_ArrayDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -13351,7 +13947,7 @@ class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get : public TAO_Ser
 public:
   TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ArrayDef *tao_impl,
+    POA_CORBA_ArrayDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -13383,20 +13979,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get (const TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get &);
   
 private:
-  POA_CORBA::ArrayDef *_tao_impl;
-  CORBA::IDLType_ptr _result;
+  POA_CORBA_ArrayDef *_tao_impl;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ArrayDef *tao_impl,
+    POA_CORBA_ArrayDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -13463,7 +14059,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (CORBA::IDLType_ptr result)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (CORBA_IDLType_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -13474,8 +14070,8 @@ class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set : public TAO_Ser
 public:
   TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ArrayDef *tao_impl,
-    CORBA::IDLType_ptr element_type_def,
+    POA_CORBA_ArrayDef *tao_impl,
+    CORBA_IDLType_ptr element_type_def,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -13513,15 +14109,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set &);
   
 private:
-  POA_CORBA::ArrayDef *_tao_impl;
-  CORBA::IDLType_ptr element_type_def_;
+  POA_CORBA_ArrayDef *_tao_impl;
+  CORBA_IDLType_ptr element_type_def_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ArrayDef *tao_impl,
-    CORBA::IDLType_ptr element_type_def,
+    POA_CORBA_ArrayDef *tao_impl,
+    CORBA_IDLType_ptr element_type_def,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -13599,29 +14195,29 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker::the_TAO_ArrayDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker *_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::the_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker::_TAO_ArrayDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker::~_TAO_ArrayDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::~_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_ArrayDef_Proxy_Impl&
-POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::ArrayDef *object,
+_TAO_CORBA_ArrayDef_Proxy_Impl&
+_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_ArrayDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -13639,7 +14235,7 @@ POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -13653,7 +14249,7 @@ POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_ArrayDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -13663,7 +14259,7 @@ POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_ArrayDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_ArrayDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -13680,38 +14276,38 @@ POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_ArrayDef_Proxy_Broker *
-CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_ArrayDef_Proxy_Broker *
+_TAO_CORBA_ArrayDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker::the_TAO_ArrayDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::the_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_ArrayDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_ArrayDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_ArrayDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_ArrayDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_ArrayDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::_TAO_ArrayDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::ULong POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::length (
+CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -13733,16 +14329,16 @@ CORBA::ULong POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::length (
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
-      POA_CORBA::ArrayDef_ptr,
+      POA_CORBA_ArrayDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ArrayDef:1.0"
+          "IDL:omg.org/CORBA_ArrayDef:1.0"
         )
     )->length (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::length (
+void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong length,
     CORBA::Environment &ACE_TRY_ENV
@@ -13763,9 +14359,9 @@ void POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::length (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::ArrayDef_ptr,
+      POA_CORBA_ArrayDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ArrayDef:1.0"
+          "IDL:omg.org/CORBA_ArrayDef:1.0"
         )
     )->length (
         length,
@@ -13774,7 +14370,7 @@ void POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::length (
   return;
 }
 
-CORBA::TypeCode_ptr POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type (
+CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -13796,16 +14392,16 @@ CORBA::TypeCode_ptr POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ArrayDef_ptr,
+      POA_CORBA_ArrayDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ArrayDef:1.0"
+          "IDL:omg.org/CORBA_ArrayDef:1.0"
         )
     )->element_type (
         ACE_TRY_ENV
       );
 }
 
-CORBA::IDLType_ptr POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
+CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -13813,7 +14409,7 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def
     CORBA::SystemException
   ))
 {
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -13827,18 +14423,18 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ArrayDef_ptr,
+      POA_CORBA_ArrayDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ArrayDef:1.0"
+          "IDL:omg.org/CORBA_ArrayDef:1.0"
         )
     )->element_type_def (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
+void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr element_type_def,
+    CORBA_IDLType_ptr element_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -13857,9 +14453,9 @@ void POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::ArrayDef_ptr,
+      POA_CORBA_ArrayDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ArrayDef:1.0"
+          "IDL:omg.org/CORBA_ArrayDef:1.0"
         )
     )->element_type_def (
         element_type_def,
@@ -13873,31 +14469,31 @@ void POA_CORBA::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::ArrayDef::ArrayDef (void)
+POA_CORBA_ArrayDef::POA_CORBA_ArrayDef (void)
 {
   this->optable_ = &tao_CORBA_ArrayDef_optable;
 }
 
 // copy ctor
-POA_CORBA::ArrayDef::ArrayDef (const ArrayDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_ArrayDef::POA_CORBA_ArrayDef (const POA_CORBA_ArrayDef& rhs)
+  :   POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::ArrayDef::~ArrayDef (void)
+POA_CORBA_ArrayDef::~POA_CORBA_ArrayDef (void)
 {
 }
 
-void POA_CORBA::ArrayDef::_get_length_skel (
+void POA_CORBA_ArrayDef::_get_length_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ArrayDef *_tao_impl = (POA_CORBA::ArrayDef *)_tao_object_reference;
+  POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *)_tao_object_reference;
   
     CORBA::ULong _tao_retval = 0;
 
@@ -13969,7 +14565,7 @@ void POA_CORBA::ArrayDef::_get_length_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ArrayDef::_set_length_skel (
+void POA_CORBA_ArrayDef::_set_length_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -13977,7 +14573,7 @@ void POA_CORBA::ArrayDef::_set_length_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ArrayDef *_tao_impl = (POA_CORBA::ArrayDef *)_tao_object_reference;
+  POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
     CORBA::ULong length;
@@ -14048,14 +14644,14 @@ void POA_CORBA::ArrayDef::_set_length_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ArrayDef::_get_element_type_skel (
+void POA_CORBA_ArrayDef::_get_element_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ArrayDef *_tao_impl = (POA_CORBA::ArrayDef *)_tao_object_reference;
+  POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *)_tao_object_reference;
   
     CORBA::TypeCode_var _tao_retval;
 
@@ -14128,16 +14724,16 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ArrayDef::_get_element_type_def_skel (
+void POA_CORBA_ArrayDef::_get_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ArrayDef *_tao_impl = (POA_CORBA::ArrayDef *)_tao_object_reference;
+  POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *)_tao_object_reference;
   
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -14164,7 +14760,7 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -14208,7 +14804,7 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ArrayDef::_set_element_type_def_skel (
+void POA_CORBA_ArrayDef::_set_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -14216,10 +14812,10 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ArrayDef *_tao_impl = (POA_CORBA::ArrayDef *)_tao_object_reference;
+  POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::IDLType_var element_type_def;
+    CORBA_IDLType_var element_type_def;
   if (!(
     (_tao_in >> element_type_def.out ())
   ))
@@ -14287,7 +14883,7 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ArrayDef::_is_a_skel (
+void POA_CORBA_ArrayDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -14295,7 +14891,7 @@ void POA_CORBA::ArrayDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ArrayDef *_tao_impl = (POA_CORBA::ArrayDef *) _tao_object_reference;
+  POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -14310,14 +14906,14 @@ void POA_CORBA::ArrayDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::ArrayDef::_non_existent_skel (
+void POA_CORBA_ArrayDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ArrayDef *_tao_impl = (POA_CORBA::ArrayDef *) _tao_object_reference;
+  POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -14327,7 +14923,55 @@ void POA_CORBA::ArrayDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::ArrayDef::_is_a (
+void POA_CORBA_ArrayDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_ArrayDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -14336,42 +14980,42 @@ CORBA::Boolean POA_CORBA::ArrayDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ArrayDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ArrayDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::ArrayDef::_downcast (
+void* POA_CORBA_ArrayDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ArrayDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::ArrayDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ArrayDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_ArrayDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::ArrayDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ArrayDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::ArrayDef::_interface_repository_id (void) const
+const char* POA_CORBA_ArrayDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/ArrayDef:1.0";
+  return "IDL:omg.org/CORBA_ArrayDef:1.0";
 }
 
-CORBA::ArrayDef*
-POA_CORBA::ArrayDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_ArrayDef*
+POA_CORBA_ArrayDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -14384,9 +15028,10 @@ POA_CORBA::ArrayDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::ArrayDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_ArrayDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -14394,7 +15039,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:37 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -14416,10 +15061,10 @@ TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int
      61, 61, 61, 61, 61, 61, 61, 61, 61,  0,
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
      61, 61, 61, 61, 61, 61, 61, 61, 61,  0,
-     61, 25,  3,  0, 61, 61, 61, 61, 61, 61,
-     61, 61, 61, 61, 61, 61, 61, 10,  0,  5,
-     61, 10, 61, 61, 61, 61, 61, 61, 61, 61,
-     61, 61, 20, 20, 61, 61, 61, 10,  5, 61,
+     61, 25,  8,  0, 61, 61, 61, 61, 61, 61,
+     61, 61, 61, 61, 61, 61, 61,  0, 15,  5,
+     61,  0, 61, 61, 61, 61, 61, 61, 61, 61,
+     61, 61, 20, 20, 61, 61, 61, 15, 10, 61,
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
@@ -14440,9 +15085,9 @@ TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
      61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
      61, 61, 61, 61, 61,  0, 61,  0, 61, 25,
-      3,  0, 61, 61, 61, 61, 61, 61, 10,  0,
-      5, 61, 10, 61, 61, 20, 20, 61, 61, 61,
-     10,  5, 61, 61, 61, 61, 61, 61,
+      8,  0, 61, 61, 61, 61, 61, 61,  0, 15,
+      5, 61,  0, 61, 61, 20, 20, 61, 61, 61,
+     15, 10, 61, 61, 61, 61, 61, 61,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -14453,62 +15098,63 @@ TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 {
   enum
     {
-      TOTAL_KEYWORDS = 35,
+      TOTAL_KEYWORDS = 36,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
-      MIN_HASH_VALUE = 4,
+      MIN_HASH_VALUE = 5,
       MAX_HASH_VALUE = 60,
-      HASH_VALUE_RANGE = 57,
+      HASH_VALUE_RANGE = 56,
       DUPLICATES = 7
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
-      {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::ExceptionDef::move_skel},
-      {"_is_a",  &POA_CORBA::ExceptionDef::_is_a_skel},
-      {"_get_type", 	&POA_CORBA::ExceptionDef::_get_type_skel},
-      {"_set_name", 	&POA_CORBA::ExceptionDef::_set_name_skel},
-      {"_get_name", 	&POA_CORBA::ExceptionDef::_get_name_skel},
-      {"_get_id", 	&POA_CORBA::ExceptionDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::ExceptionDef::_set_id_skel},
-      {"describe", 	&POA_CORBA::ExceptionDef::describe_skel},
-      {"destroy", 	&POA_CORBA::ExceptionDef::destroy_skel},
-      {"_get_def_kind", 	&POA_CORBA::ExceptionDef::_get_def_kind_skel},
-      {"_get_version", 	&POA_CORBA::ExceptionDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::ExceptionDef::_set_version_skel},
-      {"_get_absolute_name", 	&POA_CORBA::ExceptionDef::_get_absolute_name_skel},
-      {"_get_defined_in", 	&POA_CORBA::ExceptionDef::_get_defined_in_skel},
-      {"lookup_name", 	&POA_CORBA::ExceptionDef::lookup_name_skel},
-      {"lookup", 	&POA_CORBA::ExceptionDef::lookup_skel},
-      {"_get_containing_repository", 	&POA_CORBA::ExceptionDef::_get_containing_repository_skel},
-      {"_get_members", 	&POA_CORBA::ExceptionDef::_get_members_skel},
-      {"_set_members", 	&POA_CORBA::ExceptionDef::_set_members_skel},
-      {"_non_existent",  &POA_CORBA::ExceptionDef::_non_existent_skel},
-      {"create_enum", 	&POA_CORBA::ExceptionDef::create_enum_skel},
-      {"create_value", 	&POA_CORBA::ExceptionDef::create_value_skel},
-      {"create_module", 	&POA_CORBA::ExceptionDef::create_module_skel},
-      {"create_native", 	&POA_CORBA::ExceptionDef::create_native_skel},
-      {"describe_contents", 	&POA_CORBA::ExceptionDef::describe_contents_skel},
-      {"create_interface", 	&POA_CORBA::ExceptionDef::create_interface_skel},
-      {"create_union", 	&POA_CORBA::ExceptionDef::create_union_skel},
-      {"create_exception", 	&POA_CORBA::ExceptionDef::create_exception_skel},
-      {"create_local_interface", 	&POA_CORBA::ExceptionDef::create_local_interface_skel},
-      {"create_abstract_interface", 	&POA_CORBA::ExceptionDef::create_abstract_interface_skel},
-      {"create_value_box", 	&POA_CORBA::ExceptionDef::create_value_box_skel},
-      {"contents", 	&POA_CORBA::ExceptionDef::contents_skel},
-      {"create_alias", 	&POA_CORBA::ExceptionDef::create_alias_skel},
-      {"create_struct", 	&POA_CORBA::ExceptionDef::create_struct_skel},
-      {"create_constant", 	&POA_CORBA::ExceptionDef::create_constant_skel},
+      {"",0},{"",0},{"",0},{"",0},{"",0},
+      {"_is_a",  &POA_CORBA_ExceptionDef::_is_a_skel},
+      {"lookup", 	&POA_CORBA_ExceptionDef::lookup_skel},
+      {"_get_type", 	&POA_CORBA_ExceptionDef::_get_type_skel},
+      {"_set_name", 	&POA_CORBA_ExceptionDef::_set_name_skel},
+      {"_get_name", 	&POA_CORBA_ExceptionDef::_get_name_skel},
+      {"_interface",  &POA_CORBA_ExceptionDef::_interface_skel},
+      {"lookup_name", 	&POA_CORBA_ExceptionDef::lookup_name_skel},
+      {"_get_id", 	&POA_CORBA_ExceptionDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_ExceptionDef::_set_id_skel},
+      {"describe", 	&POA_CORBA_ExceptionDef::describe_skel},
+      {"_get_version", 	&POA_CORBA_ExceptionDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_ExceptionDef::_set_version_skel},
+      {"_get_absolute_name", 	&POA_CORBA_ExceptionDef::_get_absolute_name_skel},
+      {"move", 	&POA_CORBA_ExceptionDef::move_skel},
+      {"_get_defined_in", 	&POA_CORBA_ExceptionDef::_get_defined_in_skel},
+      {"_get_def_kind", 	&POA_CORBA_ExceptionDef::_get_def_kind_skel},
+      {"destroy", 	&POA_CORBA_ExceptionDef::destroy_skel},
+      {"_get_members", 	&POA_CORBA_ExceptionDef::_get_members_skel},
+      {"_set_members", 	&POA_CORBA_ExceptionDef::_set_members_skel},
+      {"_non_existent",  &POA_CORBA_ExceptionDef::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_CORBA_ExceptionDef::_get_containing_repository_skel},
+      {"create_value", 	&POA_CORBA_ExceptionDef::create_value_skel},
+      {"create_module", 	&POA_CORBA_ExceptionDef::create_module_skel},
+      {"create_native", 	&POA_CORBA_ExceptionDef::create_native_skel},
+      {"create_interface", 	&POA_CORBA_ExceptionDef::create_interface_skel},
+      {"create_union", 	&POA_CORBA_ExceptionDef::create_union_skel},
+      {"describe_contents", 	&POA_CORBA_ExceptionDef::describe_contents_skel},
+      {"create_exception", 	&POA_CORBA_ExceptionDef::create_exception_skel},
+      {"create_local_interface", 	&POA_CORBA_ExceptionDef::create_local_interface_skel},
+      {"create_abstract_interface", 	&POA_CORBA_ExceptionDef::create_abstract_interface_skel},
+      {"create_enum", 	&POA_CORBA_ExceptionDef::create_enum_skel},
+      {"contents", 	&POA_CORBA_ExceptionDef::contents_skel},
+      {"create_value_box", 	&POA_CORBA_ExceptionDef::create_value_box_skel},
+      {"create_alias", 	&POA_CORBA_ExceptionDef::create_alias_skel},
+      {"create_struct", 	&POA_CORBA_ExceptionDef::create_struct_skel},
+      {"create_constant", 	&POA_CORBA_ExceptionDef::create_constant_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -6,  -3,   4,   5,  -1,  -9,  -2, -67, -63,  11,  -1, -14, 
-       -2,  12,  13, -64,  16,  -1,  17,  18,  -1,  -1,  -1,  -1,  19,  -1, 
-       -1, -21,  -2,  20, -63,  23, -26,  -2,  24,  25, -64,  -1,  28,  29, 
-       30,  -1,  -1,  -1,  31,  32,  -1,  -1,  33,  34,  -1,  35,  -1,  -1, 
-       -1,  36,  37,  -1,  38, 
+       -1,  -1,  -1,  -7,  -3,   5,   6, -12,  -2, -66,  10,  11,  -1, -15, 
+       -2, -68,  14, -64,  17,  18,  19,  20,  -1,  -1,  -1,  21,  -1,  -1, 
+       -1,  -1, -22,  -2, -62,  24, -27,  -2,  25,  26, -64,  -1,  -1,  29, 
+       30,  -1,  -1,  31,  32,  33,  -1,  -1,  34,  35,  -1,  36,  -1,  -1, 
+       37,  38,  39,  -1,  40, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -14542,17 +15188,16 @@ TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
     }
   return 0;
 }
-/* ending time is 10:44:37 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable tao_CORBA_ExceptionDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ExceptionDef *tao_impl,
+    POA_CORBA_ExceptionDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -14591,13 +15236,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get &);
   
 private:
-  POA_CORBA::ExceptionDef *_tao_impl;
+  POA_CORBA_ExceptionDef *_tao_impl;
   CORBA::TypeCode_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ExceptionDef *tao_impl,
+    POA_CORBA_ExceptionDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -14675,7 +15320,7 @@ class TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ExceptionDef *tao_impl,
+    POA_CORBA_ExceptionDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -14707,20 +15352,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::StructMemberSeq * result);
+  void result (CORBA_StructMemberSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get (const TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get &);
   
 private:
-  POA_CORBA::ExceptionDef *_tao_impl;
-  CORBA::StructMemberSeq * _result;
+  POA_CORBA_ExceptionDef *_tao_impl;
+  CORBA_StructMemberSeq * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ExceptionDef *tao_impl,
+    POA_CORBA_ExceptionDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -14787,7 +15432,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (CORBA::StructMemberSeq * result)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (CORBA_StructMemberSeq * result)
 {
   // Update the result.
    this->_result = result;
@@ -14798,8 +15443,8 @@ class TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ExceptionDef *tao_impl,
-    const CORBA::StructMemberSeq & members,
+    POA_CORBA_ExceptionDef *tao_impl,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -14837,15 +15482,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set &);
   
 private:
-  POA_CORBA::ExceptionDef *_tao_impl;
-  const CORBA::StructMemberSeq & members_;
+  POA_CORBA_ExceptionDef *_tao_impl;
+  const CORBA_StructMemberSeq & members_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ExceptionDef *tao_impl,
-    const CORBA::StructMemberSeq & members,
+    POA_CORBA_ExceptionDef *tao_impl,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -14923,29 +15568,29 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker::the_TAO_ExceptionDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker *_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::the_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker::_TAO_ExceptionDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker::~_TAO_ExceptionDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::~_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_ExceptionDef_Proxy_Impl&
-POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::ExceptionDef *object,
+_TAO_CORBA_ExceptionDef_Proxy_Impl&
+_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_ExceptionDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -14963,7 +15608,7 @@ POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -14977,7 +15622,7 @@ POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_ExceptionDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -14987,7 +15632,7 @@ POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_ExceptionDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_ExceptionDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -15004,38 +15649,38 @@ POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_ExceptionDef_Proxy_Broker *
-CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_ExceptionDef_Proxy_Broker *
+_TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker::the_TAO_ExceptionDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::the_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::_TAO_ExceptionDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::TypeCode_ptr POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::type (
+CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -15057,16 +15702,16 @@ CORBA::TypeCode_ptr POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::type (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ExceptionDef_ptr,
+      POA_CORBA_ExceptionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ExceptionDef:1.0"
+          "IDL:omg.org/CORBA_ExceptionDef:1.0"
         )
     )->type (
         ACE_TRY_ENV
       );
 }
 
-CORBA::StructMemberSeq * POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::members (
+CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -15074,7 +15719,7 @@ CORBA::StructMemberSeq * POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::member
     CORBA::SystemException
   ))
 {
-    CORBA::StructMemberSeq_var _tao_retval;
+    CORBA_StructMemberSeq_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -15088,18 +15733,18 @@ CORBA::StructMemberSeq * POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::member
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ExceptionDef_ptr,
+      POA_CORBA_ExceptionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ExceptionDef:1.0"
+          "IDL:omg.org/CORBA_ExceptionDef:1.0"
         )
     )->members (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::members (
+void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -15118,9 +15763,9 @@ void POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::members (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::ExceptionDef_ptr,
+      POA_CORBA_ExceptionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ExceptionDef:1.0"
+          "IDL:omg.org/CORBA_ExceptionDef:1.0"
         )
     )->members (
         members,
@@ -15134,32 +15779,32 @@ void POA_CORBA::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::members (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::ExceptionDef::ExceptionDef (void)
+POA_CORBA_ExceptionDef::POA_CORBA_ExceptionDef (void)
 {
   this->optable_ = &tao_CORBA_ExceptionDef_optable;
 }
 
 // copy ctor
-POA_CORBA::ExceptionDef::ExceptionDef (const ExceptionDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_ExceptionDef::POA_CORBA_ExceptionDef (const POA_CORBA_ExceptionDef& rhs)
+  :   POA_CORBA_Contained (rhs),
+    POA_CORBA_Container (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::ExceptionDef::~ExceptionDef (void)
+POA_CORBA_ExceptionDef::~POA_CORBA_ExceptionDef (void)
 {
 }
 
-void POA_CORBA::ExceptionDef::_get_type_skel (
+void POA_CORBA_ExceptionDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ExceptionDef *_tao_impl = (POA_CORBA::ExceptionDef *)_tao_object_reference;
+  POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *)_tao_object_reference;
   
     CORBA::TypeCode_var _tao_retval;
 
@@ -15232,16 +15877,16 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ExceptionDef::_get_members_skel (
+void POA_CORBA_ExceptionDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ExceptionDef *_tao_impl = (POA_CORBA::ExceptionDef *)_tao_object_reference;
+  POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *)_tao_object_reference;
   
-    CORBA::StructMemberSeq_var _tao_retval;
+    CORBA_StructMemberSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -15268,7 +15913,7 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::StructMemberSeq * _tao_retval_info = _tao_retval._retn ();
+      CORBA_StructMemberSeq * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -15312,7 +15957,7 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ExceptionDef::_set_members_skel (
+void POA_CORBA_ExceptionDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -15320,10 +15965,10 @@ void POA_CORBA::ExceptionDef::_set_members_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ExceptionDef *_tao_impl = (POA_CORBA::ExceptionDef *)_tao_object_reference;
+  POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::StructMemberSeq members;
+    CORBA_StructMemberSeq members;
   if (!(
     (_tao_in >> members)
   ))
@@ -15391,7 +16036,7 @@ void POA_CORBA::ExceptionDef::_set_members_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ExceptionDef::_is_a_skel (
+void POA_CORBA_ExceptionDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -15399,7 +16044,7 @@ void POA_CORBA::ExceptionDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ExceptionDef *_tao_impl = (POA_CORBA::ExceptionDef *) _tao_object_reference;
+  POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -15414,14 +16059,14 @@ void POA_CORBA::ExceptionDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::ExceptionDef::_non_existent_skel (
+void POA_CORBA_ExceptionDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ExceptionDef *_tao_impl = (POA_CORBA::ExceptionDef *) _tao_object_reference;
+  POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -15431,7 +16076,55 @@ void POA_CORBA::ExceptionDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::ExceptionDef::_is_a (
+void POA_CORBA_ExceptionDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_ExceptionDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -15440,45 +16133,45 @@ CORBA::Boolean POA_CORBA::ExceptionDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ExceptionDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ExceptionDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::ExceptionDef::_downcast (
+void* POA_CORBA_ExceptionDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ExceptionDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::ExceptionDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ExceptionDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_ExceptionDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Container_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::ExceptionDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ExceptionDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::ExceptionDef::_interface_repository_id (void) const
+const char* POA_CORBA_ExceptionDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/ExceptionDef:1.0";
+  return "IDL:omg.org/CORBA_ExceptionDef:1.0";
 }
 
-CORBA::ExceptionDef*
-POA_CORBA::ExceptionDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_ExceptionDef*
+POA_CORBA_ExceptionDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -15491,9 +16184,10 @@ POA_CORBA::ExceptionDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::ExceptionDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_ExceptionDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_AttributeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -15501,7 +16195,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:37 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AttributeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -15560,7 +16254,7 @@ TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 {
   enum
     {
-      TOTAL_KEYWORDS = 20,
+      TOTAL_KEYWORDS = 21,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -15572,33 +16266,34 @@ TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::AttributeDef::move_skel},
-      {"_is_a",  &POA_CORBA::AttributeDef::_is_a_skel},
-      {"_get_id", 	&POA_CORBA::AttributeDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::AttributeDef::_set_id_skel},
-      {"describe", 	&POA_CORBA::AttributeDef::describe_skel},
-      {"_get_type", 	&POA_CORBA::AttributeDef::_get_type_skel},
-      {"_set_name", 	&POA_CORBA::AttributeDef::_set_name_skel},
-      {"_get_name", 	&POA_CORBA::AttributeDef::_get_name_skel},
-      {"_set_mode", 	&POA_CORBA::AttributeDef::_set_mode_skel},
-      {"_get_mode", 	&POA_CORBA::AttributeDef::_get_mode_skel},
-      {"_get_version", 	&POA_CORBA::AttributeDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::AttributeDef::_set_version_skel},
-      {"_get_def_kind", 	&POA_CORBA::AttributeDef::_get_def_kind_skel},
-      {"_get_defined_in", 	&POA_CORBA::AttributeDef::_get_defined_in_skel},
-      {"destroy", 	&POA_CORBA::AttributeDef::destroy_skel},
-      {"_get_absolute_name", 	&POA_CORBA::AttributeDef::_get_absolute_name_skel},
-      {"_get_type_def", 	&POA_CORBA::AttributeDef::_get_type_def_skel},
-      {"_set_type_def", 	&POA_CORBA::AttributeDef::_set_type_def_skel},
-      {"_non_existent",  &POA_CORBA::AttributeDef::_non_existent_skel},
-      {"_get_containing_repository", 	&POA_CORBA::AttributeDef::_get_containing_repository_skel},
+      {"move", 	&POA_CORBA_AttributeDef::move_skel},
+      {"_is_a",  &POA_CORBA_AttributeDef::_is_a_skel},
+      {"_get_id", 	&POA_CORBA_AttributeDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_AttributeDef::_set_id_skel},
+      {"describe", 	&POA_CORBA_AttributeDef::describe_skel},
+      {"_get_type", 	&POA_CORBA_AttributeDef::_get_type_skel},
+      {"_set_name", 	&POA_CORBA_AttributeDef::_set_name_skel},
+      {"_get_name", 	&POA_CORBA_AttributeDef::_get_name_skel},
+      {"_set_mode", 	&POA_CORBA_AttributeDef::_set_mode_skel},
+      {"_get_mode", 	&POA_CORBA_AttributeDef::_get_mode_skel},
+      {"_interface",  &POA_CORBA_AttributeDef::_interface_skel},
+      {"_get_version", 	&POA_CORBA_AttributeDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_AttributeDef::_set_version_skel},
+      {"_get_def_kind", 	&POA_CORBA_AttributeDef::_get_def_kind_skel},
+      {"_get_defined_in", 	&POA_CORBA_AttributeDef::_get_defined_in_skel},
+      {"destroy", 	&POA_CORBA_AttributeDef::destroy_skel},
+      {"_get_absolute_name", 	&POA_CORBA_AttributeDef::_get_absolute_name_skel},
+      {"_get_type_def", 	&POA_CORBA_AttributeDef::_get_type_def_skel},
+      {"_set_type_def", 	&POA_CORBA_AttributeDef::_set_type_def_skel},
+      {"_non_existent",  &POA_CORBA_AttributeDef::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_CORBA_AttributeDef::_get_containing_repository_skel},
     };
 
   static const signed char lookup[] =
     {
-       -6,  -2,  -9,  -5,   4,   5,  -1, -43,   8, -43, -14,  -2, -38,  16, 
-       -1,  17,  -1,  18,  19,  -1,  -1, -20,  -2, -38,  -1,  -1,  -1,  -1, 
-       22,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23, 
+       -9,  -5, -15,  -2,   4,   5,  -1,  48,   8, -45,  14,  -1, -46,  17, 
+       -1,  18,  -1,  19,  20,  -6,  -2, -21,  -2, -38,  -1,  -1,  -1,  -1, 
+       23,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -15632,17 +16327,16 @@ TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
     }
   return 0;
 }
-/* ending time is 10:44:37 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_AttributeDef_Perfect_Hash_OpTable tao_CORBA_AttributeDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_AttributeDef_type_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_AttributeDef_type_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::AttributeDef *tao_impl,
+    POA_CORBA_AttributeDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -15681,13 +16375,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_AttributeDef_type_get &);
   
 private:
-  POA_CORBA::AttributeDef *_tao_impl;
+  POA_CORBA_AttributeDef *_tao_impl;
   CORBA::TypeCode_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::TAO_ServerRequestInfo_CORBA_AttributeDef_type_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::AttributeDef *tao_impl,
+    POA_CORBA_AttributeDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -15765,7 +16459,7 @@ class TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::AttributeDef *tao_impl,
+    POA_CORBA_AttributeDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -15797,20 +16491,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get (const TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get &);
   
 private:
-  POA_CORBA::AttributeDef *_tao_impl;
-  CORBA::IDLType_ptr _result;
+  POA_CORBA_AttributeDef *_tao_impl;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::AttributeDef *tao_impl,
+    POA_CORBA_AttributeDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -15877,7 +16571,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (CORBA::IDLType_ptr result)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (CORBA_IDLType_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -15888,8 +16582,8 @@ class TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::AttributeDef *tao_impl,
-    CORBA::IDLType_ptr type_def,
+    POA_CORBA_AttributeDef *tao_impl,
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -15927,15 +16621,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set &);
   
 private:
-  POA_CORBA::AttributeDef *_tao_impl;
-  CORBA::IDLType_ptr type_def_;
+  POA_CORBA_AttributeDef *_tao_impl;
+  CORBA_IDLType_ptr type_def_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::AttributeDef *tao_impl,
-    CORBA::IDLType_ptr type_def,
+    POA_CORBA_AttributeDef *tao_impl,
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -16011,7 +16705,7 @@ class TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::AttributeDef *tao_impl,
+    POA_CORBA_AttributeDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -16050,13 +16744,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get &);
   
 private:
-  POA_CORBA::AttributeDef *_tao_impl;
+  POA_CORBA_AttributeDef *_tao_impl;
   CORBA::AttributeMode _result;
 };
 
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::AttributeDef *tao_impl,
+    POA_CORBA_AttributeDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -16134,7 +16828,7 @@ class TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::AttributeDef *tao_impl,
+    POA_CORBA_AttributeDef *tao_impl,
     CORBA::AttributeMode & mode,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -16173,14 +16867,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set &);
   
 private:
-  POA_CORBA::AttributeDef *_tao_impl;
+  POA_CORBA_AttributeDef *_tao_impl;
   const CORBA::AttributeMode & mode_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::AttributeDef *tao_impl,
+    POA_CORBA_AttributeDef *tao_impl,
     CORBA::AttributeMode & mode,
     CORBA::Environment &
   )
@@ -16259,29 +16953,29 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker::the_TAO_AttributeDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker *_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::the_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker::_TAO_AttributeDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker::~_TAO_AttributeDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::~_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_AttributeDef_Proxy_Impl&
-POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::AttributeDef *object,
+_TAO_CORBA_AttributeDef_Proxy_Impl&
+_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_AttributeDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -16299,7 +16993,7 @@ POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -16313,7 +17007,7 @@ POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_AttributeDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -16323,7 +17017,7 @@ POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_AttributeDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_AttributeDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -16340,38 +17034,38 @@ POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_AttributeDef_Proxy_Broker *
-CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_AttributeDef_Proxy_Broker *
+_TAO_CORBA_AttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker::the_TAO_AttributeDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::the_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_AttributeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_AttributeDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_AttributeDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_AttributeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_AttributeDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::_TAO_AttributeDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::_TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::TypeCode_ptr POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type (
+CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -16393,16 +17087,16 @@ CORBA::TypeCode_ptr POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::AttributeDef_ptr,
+      POA_CORBA_AttributeDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/AttributeDef:1.0"
+          "IDL:omg.org/CORBA_AttributeDef:1.0"
         )
     )->type (
         ACE_TRY_ENV
       );
 }
 
-CORBA::IDLType_ptr POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
+CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -16410,7 +17104,7 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
     CORBA::SystemException
   ))
 {
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -16424,18 +17118,18 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::AttributeDef_ptr,
+      POA_CORBA_AttributeDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/AttributeDef:1.0"
+          "IDL:omg.org/CORBA_AttributeDef:1.0"
         )
     )->type_def (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
+void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr type_def,
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -16454,9 +17148,9 @@ void POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::AttributeDef_ptr,
+      POA_CORBA_AttributeDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/AttributeDef:1.0"
+          "IDL:omg.org/CORBA_AttributeDef:1.0"
         )
     )->type_def (
         type_def,
@@ -16465,7 +17159,7 @@ void POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
   return;
 }
 
-CORBA::AttributeMode POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
+CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -16487,16 +17181,16 @@ CORBA::AttributeMode POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
-      POA_CORBA::AttributeDef_ptr,
+      POA_CORBA_AttributeDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/AttributeDef:1.0"
+          "IDL:omg.org/CORBA_AttributeDef:1.0"
         )
     )->mode (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
+void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::AttributeMode mode,
     CORBA::Environment &ACE_TRY_ENV
@@ -16517,9 +17211,9 @@ void POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::AttributeDef_ptr,
+      POA_CORBA_AttributeDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/AttributeDef:1.0"
+          "IDL:omg.org/CORBA_AttributeDef:1.0"
         )
     )->mode (
         mode,
@@ -16533,31 +17227,31 @@ void POA_CORBA::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::AttributeDef::AttributeDef (void)
+POA_CORBA_AttributeDef::POA_CORBA_AttributeDef (void)
 {
   this->optable_ = &tao_CORBA_AttributeDef_optable;
 }
 
 // copy ctor
-POA_CORBA::AttributeDef::AttributeDef (const AttributeDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_AttributeDef::POA_CORBA_AttributeDef (const POA_CORBA_AttributeDef& rhs)
+  :   POA_CORBA_Contained (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::AttributeDef::~AttributeDef (void)
+POA_CORBA_AttributeDef::~POA_CORBA_AttributeDef (void)
 {
 }
 
-void POA_CORBA::AttributeDef::_get_type_skel (
+void POA_CORBA_AttributeDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::AttributeDef *_tao_impl = (POA_CORBA::AttributeDef *)_tao_object_reference;
+  POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *)_tao_object_reference;
   
     CORBA::TypeCode_var _tao_retval;
 
@@ -16630,16 +17324,16 @@ void POA_CORBA::AttributeDef::_get_type_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::AttributeDef::_get_type_def_skel (
+void POA_CORBA_AttributeDef::_get_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::AttributeDef *_tao_impl = (POA_CORBA::AttributeDef *)_tao_object_reference;
+  POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *)_tao_object_reference;
   
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -16666,7 +17360,7 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -16710,7 +17404,7 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::AttributeDef::_set_type_def_skel (
+void POA_CORBA_AttributeDef::_set_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -16718,10 +17412,10 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::AttributeDef *_tao_impl = (POA_CORBA::AttributeDef *)_tao_object_reference;
+  POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::IDLType_var type_def;
+    CORBA_IDLType_var type_def;
   if (!(
     (_tao_in >> type_def.out ())
   ))
@@ -16789,14 +17483,14 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::AttributeDef::_get_mode_skel (
+void POA_CORBA_AttributeDef::_get_mode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::AttributeDef *_tao_impl = (POA_CORBA::AttributeDef *)_tao_object_reference;
+  POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *)_tao_object_reference;
   
     CORBA::AttributeMode _tao_retval;
 
@@ -16868,7 +17562,7 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::AttributeDef::_set_mode_skel (
+void POA_CORBA_AttributeDef::_set_mode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -16876,7 +17570,7 @@ void POA_CORBA::AttributeDef::_set_mode_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::AttributeDef *_tao_impl = (POA_CORBA::AttributeDef *)_tao_object_reference;
+  POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
     CORBA::AttributeMode mode;
@@ -16947,7 +17641,7 @@ void POA_CORBA::AttributeDef::_set_mode_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::AttributeDef::_is_a_skel (
+void POA_CORBA_AttributeDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -16955,7 +17649,7 @@ void POA_CORBA::AttributeDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::AttributeDef *_tao_impl = (POA_CORBA::AttributeDef *) _tao_object_reference;
+  POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -16970,14 +17664,14 @@ void POA_CORBA::AttributeDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::AttributeDef::_non_existent_skel (
+void POA_CORBA_AttributeDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::AttributeDef *_tao_impl = (POA_CORBA::AttributeDef *) _tao_object_reference;
+  POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -16987,7 +17681,55 @@ void POA_CORBA::AttributeDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::AttributeDef::_is_a (
+void POA_CORBA_AttributeDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_AttributeDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -16996,42 +17738,42 @@ CORBA::Boolean POA_CORBA::AttributeDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AttributeDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AttributeDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::AttributeDef::_downcast (
+void* POA_CORBA_AttributeDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AttributeDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::AttributeDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AttributeDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_AttributeDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::AttributeDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_AttributeDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::AttributeDef::_interface_repository_id (void) const
+const char* POA_CORBA_AttributeDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/AttributeDef:1.0";
+  return "IDL:omg.org/CORBA_AttributeDef:1.0";
 }
 
-CORBA::AttributeDef*
-POA_CORBA::AttributeDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_AttributeDef*
+POA_CORBA_AttributeDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -17044,9 +17786,10 @@ POA_CORBA::AttributeDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::AttributeDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_AttributeDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_OperationDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -17054,7 +17797,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:38 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_OperationDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -17113,7 +17856,7 @@ TAO_CORBA_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 {
   enum
     {
-      TOTAL_KEYWORDS = 26,
+      TOTAL_KEYWORDS = 27,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -17125,32 +17868,33 @@ TAO_CORBA_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::OperationDef::move_skel},
-      {"_is_a",  &POA_CORBA::OperationDef::_is_a_skel},
-      {"_get_mode", 	&POA_CORBA::OperationDef::_get_mode_skel},
-      {"_set_name", 	&POA_CORBA::OperationDef::_set_name_skel},
-      {"_get_name", 	&POA_CORBA::OperationDef::_get_name_skel},
-      {"_set_mode", 	&POA_CORBA::OperationDef::_set_mode_skel},
-      {"_get_params", 	&POA_CORBA::OperationDef::_get_params_skel},
-      {"_set_params", 	&POA_CORBA::OperationDef::_set_params_skel},
-      {"_get_contexts", 	&POA_CORBA::OperationDef::_get_contexts_skel},
-      {"_set_contexts", 	&POA_CORBA::OperationDef::_set_contexts_skel},
-      {"_get_exceptions", 	&POA_CORBA::OperationDef::_get_exceptions_skel},
-      {"_set_exceptions", 	&POA_CORBA::OperationDef::_set_exceptions_skel},
-      {"_get_version", 	&POA_CORBA::OperationDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::OperationDef::_set_version_skel},
-      {"_get_absolute_name", 	&POA_CORBA::OperationDef::_get_absolute_name_skel},
-      {"_get_defined_in", 	&POA_CORBA::OperationDef::_get_defined_in_skel},
-      {"_get_id", 	&POA_CORBA::OperationDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::OperationDef::_set_id_skel},
-      {"describe", 	&POA_CORBA::OperationDef::describe_skel},
-      {"_get_result_def", 	&POA_CORBA::OperationDef::_get_result_def_skel},
-      {"_set_result_def", 	&POA_CORBA::OperationDef::_set_result_def_skel},
-      {"_get_def_kind", 	&POA_CORBA::OperationDef::_get_def_kind_skel},
-      {"_get_result", 	&POA_CORBA::OperationDef::_get_result_skel},
-      {"destroy", 	&POA_CORBA::OperationDef::destroy_skel},
-      {"_non_existent",  &POA_CORBA::OperationDef::_non_existent_skel},
-      {"_get_containing_repository", 	&POA_CORBA::OperationDef::_get_containing_repository_skel},
+      {"move", 	&POA_CORBA_OperationDef::move_skel},
+      {"_is_a",  &POA_CORBA_OperationDef::_is_a_skel},
+      {"_get_mode", 	&POA_CORBA_OperationDef::_get_mode_skel},
+      {"_set_name", 	&POA_CORBA_OperationDef::_set_name_skel},
+      {"_get_name", 	&POA_CORBA_OperationDef::_get_name_skel},
+      {"_set_mode", 	&POA_CORBA_OperationDef::_set_mode_skel},
+      {"_interface",  &POA_CORBA_OperationDef::_interface_skel},
+      {"_get_params", 	&POA_CORBA_OperationDef::_get_params_skel},
+      {"_set_params", 	&POA_CORBA_OperationDef::_set_params_skel},
+      {"_get_contexts", 	&POA_CORBA_OperationDef::_get_contexts_skel},
+      {"_set_contexts", 	&POA_CORBA_OperationDef::_set_contexts_skel},
+      {"_get_exceptions", 	&POA_CORBA_OperationDef::_get_exceptions_skel},
+      {"_set_exceptions", 	&POA_CORBA_OperationDef::_set_exceptions_skel},
+      {"_get_version", 	&POA_CORBA_OperationDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_OperationDef::_set_version_skel},
+      {"_get_absolute_name", 	&POA_CORBA_OperationDef::_get_absolute_name_skel},
+      {"_get_defined_in", 	&POA_CORBA_OperationDef::_get_defined_in_skel},
+      {"_get_id", 	&POA_CORBA_OperationDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_OperationDef::_set_id_skel},
+      {"describe", 	&POA_CORBA_OperationDef::describe_skel},
+      {"_get_result_def", 	&POA_CORBA_OperationDef::_get_result_def_skel},
+      {"_set_result_def", 	&POA_CORBA_OperationDef::_set_result_def_skel},
+      {"_get_def_kind", 	&POA_CORBA_OperationDef::_get_def_kind_skel},
+      {"_get_result", 	&POA_CORBA_OperationDef::_get_result_skel},
+      {"destroy", 	&POA_CORBA_OperationDef::destroy_skel},
+      {"_non_existent",  &POA_CORBA_OperationDef::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_CORBA_OperationDef::_get_containing_repository_skel},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -17178,58 +17922,60 @@ TAO_CORBA_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
                   resword = &wordlist[9];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   return 0;
+                case  10:
+                  resword = &wordlist[10]; break;
                 case  11:
-                  resword = &wordlist[10];
-                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   resword = &wordlist[11];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-                  return 0;
-                case  13:
                   resword = &wordlist[12];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  return 0;
+                case  13:
                   resword = &wordlist[13];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-                  return 0;
-                case  15:
                   resword = &wordlist[14];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  return 0;
+                case  15:
                   resword = &wordlist[15];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-                  return 0;
-                case  17:
                   resword = &wordlist[16];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  return 0;
+                case  17:
                   resword = &wordlist[17];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  resword = &wordlist[18];
+                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   return 0;
                 case  18:
-                  resword = &wordlist[18]; break;
-                case  20:
                   resword = &wordlist[19]; break;
+                case  20:
+                  resword = &wordlist[20]; break;
                 case  22:
-                  resword = &wordlist[20];
-                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   resword = &wordlist[21];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  resword = &wordlist[22];
+                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   return 0;
                 case  23:
-                  resword = &wordlist[22]; break;
+                  resword = &wordlist[23]; break;
                 case  25:
-                  resword = &wordlist[23];
-                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   resword = &wordlist[24];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  resword = &wordlist[25];
+                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   return 0;
                 case  28:
-                  resword = &wordlist[25]; break;
-                case  31:
                   resword = &wordlist[26]; break;
-                case  32:
+                case  31:
                   resword = &wordlist[27]; break;
-                case  33:
+                case  32:
                   resword = &wordlist[28]; break;
-                case  36:
+                case  33:
                   resword = &wordlist[29]; break;
+                case  36:
+                  resword = &wordlist[30]; break;
                 default: return 0;
                 }
               if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1))
@@ -17240,17 +17986,16 @@ TAO_CORBA_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
     }
   return 0;
 }
-/* ending time is 10:44:38 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_OperationDef_Perfect_Hash_OpTable tao_CORBA_OperationDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_OperationDef_result_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_result_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
+    POA_CORBA_OperationDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -17289,13 +18034,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_result_get &);
   
 private:
-  POA_CORBA::OperationDef *_tao_impl;
+  POA_CORBA_OperationDef *_tao_impl;
   CORBA::TypeCode_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_OperationDef_result_get::TAO_ServerRequestInfo_CORBA_OperationDef_result_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
+    POA_CORBA_OperationDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -17373,7 +18118,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
+    POA_CORBA_OperationDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -17405,20 +18150,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get (const TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get &);
   
 private:
-  POA_CORBA::OperationDef *_tao_impl;
-  CORBA::IDLType_ptr _result;
+  POA_CORBA_OperationDef *_tao_impl;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
+    POA_CORBA_OperationDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -17485,7 +18230,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (CORBA::IDLType_ptr result)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (CORBA_IDLType_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -17496,8 +18241,8 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
-    CORBA::IDLType_ptr result_def,
+    POA_CORBA_OperationDef *tao_impl,
+    CORBA_IDLType_ptr result_def,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -17535,15 +18280,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set &);
   
 private:
-  POA_CORBA::OperationDef *_tao_impl;
-  CORBA::IDLType_ptr result_def_;
+  POA_CORBA_OperationDef *_tao_impl;
+  CORBA_IDLType_ptr result_def_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
-    CORBA::IDLType_ptr result_def,
+    POA_CORBA_OperationDef *tao_impl,
+    CORBA_IDLType_ptr result_def,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -17619,7 +18364,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_params_get : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_params_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
+    POA_CORBA_OperationDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -17651,20 +18396,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ParDescriptionSeq * result);
+  void result (CORBA_ParDescriptionSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_OperationDef_params_get (const TAO_ServerRequestInfo_CORBA_OperationDef_params_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_params_get &);
   
 private:
-  POA_CORBA::OperationDef *_tao_impl;
-  CORBA::ParDescriptionSeq * _result;
+  POA_CORBA_OperationDef *_tao_impl;
+  CORBA_ParDescriptionSeq * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_OperationDef_params_get::TAO_ServerRequestInfo_CORBA_OperationDef_params_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
+    POA_CORBA_OperationDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -17731,7 +18476,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (CORBA::ParDescriptionSeq * result)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (CORBA_ParDescriptionSeq * result)
 {
   // Update the result.
    this->_result = result;
@@ -17742,8 +18487,8 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_params_set : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_params_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
-    const CORBA::ParDescriptionSeq & params,
+    POA_CORBA_OperationDef *tao_impl,
+    const CORBA_ParDescriptionSeq & params,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -17781,15 +18526,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_params_set &);
   
 private:
-  POA_CORBA::OperationDef *_tao_impl;
-  const CORBA::ParDescriptionSeq & params_;
+  POA_CORBA_OperationDef *_tao_impl;
+  const CORBA_ParDescriptionSeq & params_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_OperationDef_params_set::TAO_ServerRequestInfo_CORBA_OperationDef_params_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
-    const CORBA::ParDescriptionSeq & params,
+    POA_CORBA_OperationDef *tao_impl,
+    const CORBA_ParDescriptionSeq & params,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -17865,7 +18610,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_mode_get : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_mode_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
+    POA_CORBA_OperationDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -17904,13 +18649,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_mode_get &);
   
 private:
-  POA_CORBA::OperationDef *_tao_impl;
+  POA_CORBA_OperationDef *_tao_impl;
   CORBA::OperationMode _result;
 };
 
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::TAO_ServerRequestInfo_CORBA_OperationDef_mode_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
+    POA_CORBA_OperationDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -17988,7 +18733,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_mode_set : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_mode_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
+    POA_CORBA_OperationDef *tao_impl,
     CORBA::OperationMode & mode,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -18027,14 +18772,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_mode_set &);
   
 private:
-  POA_CORBA::OperationDef *_tao_impl;
+  POA_CORBA_OperationDef *_tao_impl;
   const CORBA::OperationMode & mode_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::TAO_ServerRequestInfo_CORBA_OperationDef_mode_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
+    POA_CORBA_OperationDef *tao_impl,
     CORBA::OperationMode & mode,
     CORBA::Environment &
   )
@@ -18111,7 +18856,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
+    POA_CORBA_OperationDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -18143,20 +18888,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ContextIdSeq * result);
+  void result (CORBA_ContextIdSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get (const TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get &);
   
 private:
-  POA_CORBA::OperationDef *_tao_impl;
-  CORBA::ContextIdSeq * _result;
+  POA_CORBA_OperationDef *_tao_impl;
+  CORBA_ContextIdSeq * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
+    POA_CORBA_OperationDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -18223,7 +18968,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (CORBA::ContextIdSeq * result)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (CORBA_ContextIdSeq * result)
 {
   // Update the result.
    this->_result = result;
@@ -18234,8 +18979,8 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
-    const CORBA::ContextIdSeq & contexts,
+    POA_CORBA_OperationDef *tao_impl,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -18273,15 +19018,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set &);
   
 private:
-  POA_CORBA::OperationDef *_tao_impl;
-  const CORBA::ContextIdSeq & contexts_;
+  POA_CORBA_OperationDef *_tao_impl;
+  const CORBA_ContextIdSeq & contexts_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
-    const CORBA::ContextIdSeq & contexts,
+    POA_CORBA_OperationDef *tao_impl,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -18357,7 +19102,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
+    POA_CORBA_OperationDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -18389,20 +19134,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ExceptionDefSeq * result);
+  void result (CORBA_ExceptionDefSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get (const TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get &);
   
 private:
-  POA_CORBA::OperationDef *_tao_impl;
-  CORBA::ExceptionDefSeq * _result;
+  POA_CORBA_OperationDef *_tao_impl;
+  CORBA_ExceptionDefSeq * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
+    POA_CORBA_OperationDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -18469,7 +19214,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (CORBA::ExceptionDefSeq * result)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (CORBA_ExceptionDefSeq * result)
 {
   // Update the result.
    this->_result = result;
@@ -18480,8 +19225,8 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
-    const CORBA::ExceptionDefSeq & exceptions,
+    POA_CORBA_OperationDef *tao_impl,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -18519,15 +19264,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set &);
   
 private:
-  POA_CORBA::OperationDef *_tao_impl;
-  const CORBA::ExceptionDefSeq & exceptions_;
+  POA_CORBA_OperationDef *_tao_impl;
+  const CORBA_ExceptionDefSeq & exceptions_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::OperationDef *tao_impl,
-    const CORBA::ExceptionDefSeq & exceptions,
+    POA_CORBA_OperationDef *tao_impl,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -18605,29 +19350,29 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker::the_TAO_OperationDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_OperationDef_Strategized_Proxy_Broker *_TAO_CORBA_OperationDef_Strategized_Proxy_Broker::the_TAO_CORBA_OperationDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_OperationDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker::_TAO_OperationDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_OperationDef_Strategized_Proxy_Broker::_TAO_CORBA_OperationDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker::~_TAO_OperationDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_OperationDef_Strategized_Proxy_Broker::~_TAO_CORBA_OperationDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_OperationDef_Proxy_Impl&
-POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::OperationDef *object,
+_TAO_CORBA_OperationDef_Proxy_Impl&
+_TAO_CORBA_OperationDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_OperationDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -18645,7 +19390,7 @@ POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_OperationDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -18659,7 +19404,7 @@ POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_OperationDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -18669,7 +19414,7 @@ POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_OperationDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_OperationDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -18686,38 +19431,38 @@ POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_OperationDef_Proxy_Broker *
-CORBA__TAO_OperationDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_OperationDef_Proxy_Broker *
+_TAO_CORBA_OperationDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker::the_TAO_OperationDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_OperationDef_Strategized_Proxy_Broker::the_TAO_CORBA_OperationDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_OperationDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_OperationDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_OperationDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_OperationDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_OperationDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_OperationDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::_TAO_OperationDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::_TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::TypeCode_ptr POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::result (
+CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -18739,16 +19484,16 @@ CORBA::TypeCode_ptr POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::result (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::OperationDef_ptr,
+      POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/OperationDef:1.0"
+          "IDL:omg.org/CORBA_OperationDef:1.0"
         )
     )->result (
         ACE_TRY_ENV
       );
 }
 
-CORBA::IDLType_ptr POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
+CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -18756,7 +19501,7 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
     CORBA::SystemException
   ))
 {
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -18770,18 +19515,18 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::OperationDef_ptr,
+      POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/OperationDef:1.0"
+          "IDL:omg.org/CORBA_OperationDef:1.0"
         )
     )->result_def (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
+void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr result_def,
+    CORBA_IDLType_ptr result_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -18800,9 +19545,9 @@ void POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::OperationDef_ptr,
+      POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/OperationDef:1.0"
+          "IDL:omg.org/CORBA_OperationDef:1.0"
         )
     )->result_def (
         result_def,
@@ -18811,7 +19556,7 @@ void POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
   return;
 }
 
-CORBA::ParDescriptionSeq * POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
+CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -18819,7 +19564,7 @@ CORBA::ParDescriptionSeq * POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::para
     CORBA::SystemException
   ))
 {
-    CORBA::ParDescriptionSeq_var _tao_retval;
+    CORBA_ParDescriptionSeq_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -18833,18 +19578,18 @@ CORBA::ParDescriptionSeq * POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::para
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::OperationDef_ptr,
+      POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/OperationDef:1.0"
+          "IDL:omg.org/CORBA_OperationDef:1.0"
         )
     )->params (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
+void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::ParDescriptionSeq & params,
+    const CORBA_ParDescriptionSeq & params,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -18863,9 +19608,9 @@ void POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::OperationDef_ptr,
+      POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/OperationDef:1.0"
+          "IDL:omg.org/CORBA_OperationDef:1.0"
         )
     )->params (
         params,
@@ -18874,7 +19619,7 @@ void POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
   return;
 }
 
-CORBA::OperationMode POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
+CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -18896,16 +19641,16 @@ CORBA::OperationMode POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
-      POA_CORBA::OperationDef_ptr,
+      POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/OperationDef:1.0"
+          "IDL:omg.org/CORBA_OperationDef:1.0"
         )
     )->mode (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
+void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::OperationMode mode,
     CORBA::Environment &ACE_TRY_ENV
@@ -18926,9 +19671,9 @@ void POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::OperationDef_ptr,
+      POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/OperationDef:1.0"
+          "IDL:omg.org/CORBA_OperationDef:1.0"
         )
     )->mode (
         mode,
@@ -18937,7 +19682,7 @@ void POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
   return;
 }
 
-CORBA::ContextIdSeq * POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
+CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -18945,7 +19690,7 @@ CORBA::ContextIdSeq * POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts
     CORBA::SystemException
   ))
 {
-    CORBA::ContextIdSeq_var _tao_retval;
+    CORBA_ContextIdSeq_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -18959,18 +19704,18 @@ CORBA::ContextIdSeq * POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::OperationDef_ptr,
+      POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/OperationDef:1.0"
+          "IDL:omg.org/CORBA_OperationDef:1.0"
         )
     )->contexts (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
+void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -18989,9 +19734,9 @@ void POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::OperationDef_ptr,
+      POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/OperationDef:1.0"
+          "IDL:omg.org/CORBA_OperationDef:1.0"
         )
     )->contexts (
         contexts,
@@ -19000,7 +19745,7 @@ void POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
   return;
 }
 
-CORBA::ExceptionDefSeq * POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::exceptions (
+CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -19008,7 +19753,7 @@ CORBA::ExceptionDefSeq * POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::except
     CORBA::SystemException
   ))
 {
-    CORBA::ExceptionDefSeq_var _tao_retval;
+    CORBA_ExceptionDefSeq_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -19022,18 +19767,18 @@ CORBA::ExceptionDefSeq * POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::except
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::OperationDef_ptr,
+      POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/OperationDef:1.0"
+          "IDL:omg.org/CORBA_OperationDef:1.0"
         )
     )->exceptions (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::exceptions (
+void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -19052,9 +19797,9 @@ void POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::exceptions (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::OperationDef_ptr,
+      POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/OperationDef:1.0"
+          "IDL:omg.org/CORBA_OperationDef:1.0"
         )
     )->exceptions (
         exceptions,
@@ -19068,31 +19813,31 @@ void POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl::exceptions (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::OperationDef::OperationDef (void)
+POA_CORBA_OperationDef::POA_CORBA_OperationDef (void)
 {
   this->optable_ = &tao_CORBA_OperationDef_optable;
 }
 
 // copy ctor
-POA_CORBA::OperationDef::OperationDef (const OperationDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_OperationDef::POA_CORBA_OperationDef (const POA_CORBA_OperationDef& rhs)
+  :   POA_CORBA_Contained (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::OperationDef::~OperationDef (void)
+POA_CORBA_OperationDef::~POA_CORBA_OperationDef (void)
 {
 }
 
-void POA_CORBA::OperationDef::_get_result_skel (
+void POA_CORBA_OperationDef::_get_result_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference;
+  POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *)_tao_object_reference;
   
     CORBA::TypeCode_var _tao_retval;
 
@@ -19165,16 +19910,16 @@ void POA_CORBA::OperationDef::_get_result_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::OperationDef::_get_result_def_skel (
+void POA_CORBA_OperationDef::_get_result_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference;
+  POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *)_tao_object_reference;
   
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -19201,7 +19946,7 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -19245,7 +19990,7 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::OperationDef::_set_result_def_skel (
+void POA_CORBA_OperationDef::_set_result_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -19253,10 +19998,10 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference;
+  POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::IDLType_var result_def;
+    CORBA_IDLType_var result_def;
   if (!(
     (_tao_in >> result_def.out ())
   ))
@@ -19324,16 +20069,16 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::OperationDef::_get_params_skel (
+void POA_CORBA_OperationDef::_get_params_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference;
+  POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *)_tao_object_reference;
   
-    CORBA::ParDescriptionSeq_var _tao_retval;
+    CORBA_ParDescriptionSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -19360,7 +20105,7 @@ void POA_CORBA::OperationDef::_get_params_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ParDescriptionSeq * _tao_retval_info = _tao_retval._retn ();
+      CORBA_ParDescriptionSeq * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -19404,7 +20149,7 @@ void POA_CORBA::OperationDef::_get_params_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::OperationDef::_set_params_skel (
+void POA_CORBA_OperationDef::_set_params_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -19412,10 +20157,10 @@ void POA_CORBA::OperationDef::_set_params_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference;
+  POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::ParDescriptionSeq params;
+    CORBA_ParDescriptionSeq params;
   if (!(
     (_tao_in >> params)
   ))
@@ -19483,14 +20228,14 @@ void POA_CORBA::OperationDef::_set_params_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::OperationDef::_get_mode_skel (
+void POA_CORBA_OperationDef::_get_mode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference;
+  POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *)_tao_object_reference;
   
     CORBA::OperationMode _tao_retval;
 
@@ -19562,7 +20307,7 @@ void POA_CORBA::OperationDef::_get_mode_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::OperationDef::_set_mode_skel (
+void POA_CORBA_OperationDef::_set_mode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -19570,7 +20315,7 @@ void POA_CORBA::OperationDef::_set_mode_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference;
+  POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
     CORBA::OperationMode mode;
@@ -19641,16 +20386,16 @@ void POA_CORBA::OperationDef::_set_mode_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::OperationDef::_get_contexts_skel (
+void POA_CORBA_OperationDef::_get_contexts_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference;
+  POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *)_tao_object_reference;
   
-    CORBA::ContextIdSeq_var _tao_retval;
+    CORBA_ContextIdSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -19677,7 +20422,7 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ContextIdSeq * _tao_retval_info = _tao_retval._retn ();
+      CORBA_ContextIdSeq * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -19721,7 +20466,7 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::OperationDef::_set_contexts_skel (
+void POA_CORBA_OperationDef::_set_contexts_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -19729,10 +20474,10 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference;
+  POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::ContextIdSeq contexts;
+    CORBA_ContextIdSeq contexts;
   if (!(
     (_tao_in >> contexts)
   ))
@@ -19800,16 +20545,16 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::OperationDef::_get_exceptions_skel (
+void POA_CORBA_OperationDef::_get_exceptions_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference;
+  POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *)_tao_object_reference;
   
-    CORBA::ExceptionDefSeq_var _tao_retval;
+    CORBA_ExceptionDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -19836,7 +20581,7 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ExceptionDefSeq * _tao_retval_info = _tao_retval._retn ();
+      CORBA_ExceptionDefSeq * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -19880,7 +20625,7 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::OperationDef::_set_exceptions_skel (
+void POA_CORBA_OperationDef::_set_exceptions_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -19888,10 +20633,10 @@ void POA_CORBA::OperationDef::_set_exceptions_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *)_tao_object_reference;
+  POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::ExceptionDefSeq exceptions;
+    CORBA_ExceptionDefSeq exceptions;
   if (!(
     (_tao_in >> exceptions)
   ))
@@ -19959,7 +20704,7 @@ void POA_CORBA::OperationDef::_set_exceptions_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::OperationDef::_is_a_skel (
+void POA_CORBA_OperationDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -19967,7 +20712,7 @@ void POA_CORBA::OperationDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *) _tao_object_reference;
+  POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -19982,14 +20727,14 @@ void POA_CORBA::OperationDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::OperationDef::_non_existent_skel (
+void POA_CORBA_OperationDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef *_tao_impl = (POA_CORBA::OperationDef *) _tao_object_reference;
+  POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -19999,7 +20744,55 @@ void POA_CORBA::OperationDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::OperationDef::_is_a (
+void POA_CORBA_OperationDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_OperationDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -20008,42 +20801,42 @@ CORBA::Boolean POA_CORBA::OperationDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::OperationDef::_downcast (
+void* POA_CORBA_OperationDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::OperationDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_OperationDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::OperationDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_OperationDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::OperationDef::_interface_repository_id (void) const
+const char* POA_CORBA_OperationDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/OperationDef:1.0";
+  return "IDL:omg.org/CORBA_OperationDef:1.0";
 }
 
-CORBA::OperationDef*
-POA_CORBA::OperationDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_OperationDef*
+POA_CORBA_OperationDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -20056,9 +20849,10 @@ POA_CORBA::OperationDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::OperationDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_OperationDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -20066,7 +20860,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:38 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -20075,46 +20869,46 @@ TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 15,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59,  0,
-     59,  0, 20,  0, 59, 59, 59,  5, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 20,  0,  5,
-     59, 10, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 15, 30, 59, 59, 59, 10, 10, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 25,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71,  0,
+     71,  0, 20,  0, 71, 71, 71,  5, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 20,  0,  5,
+     71, 15, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 25, 11, 71, 71, 71, 20,  0, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71,
 #else
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 15, 59,  0, 59,  0,
-     20,  0, 59, 59, 59,  5, 59, 59, 20,  0,
-      5, 59, 10, 59, 59, 15, 30, 59, 59, 59,
-     10, 10, 59, 59, 59, 59, 59, 59,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 25, 71,  0, 71,  0,
+     20,  0, 71, 71, 71,  5, 71, 71, 20,  0,
+      5, 71, 15, 71, 71, 25, 11, 71, 71, 71,
+     20,  0, 71, 71, 71, 71, 71, 71,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -20125,66 +20919,68 @@ TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 {
   enum
     {
-      TOTAL_KEYWORDS = 39,
+      TOTAL_KEYWORDS = 40,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 58,
-      HASH_VALUE_RANGE = 55,
+      MAX_HASH_VALUE = 70,
+      HASH_VALUE_RANGE = 67,
       DUPLICATES = 9
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::InterfaceDef::move_skel},
-      {"is_a", 	&POA_CORBA::InterfaceDef::is_a_skel},
-      {"create_enum", 	&POA_CORBA::InterfaceDef::create_enum_skel},
-      {"create_value", 	&POA_CORBA::InterfaceDef::create_value_skel},
-      {"create_module", 	&POA_CORBA::InterfaceDef::create_module_skel},
-      {"create_native", 	&POA_CORBA::InterfaceDef::create_native_skel},
-      {"create_attribute", 	&POA_CORBA::InterfaceDef::create_attribute_skel},
-      {"create_interface", 	&POA_CORBA::InterfaceDef::create_interface_skel},
-      {"create_union", 	&POA_CORBA::InterfaceDef::create_union_skel},
-      {"_is_a",  &POA_CORBA::InterfaceDef::_is_a_skel},
-      {"create_operation", 	&POA_CORBA::InterfaceDef::create_operation_skel},
-      {"create_exception", 	&POA_CORBA::InterfaceDef::create_exception_skel},
-      {"create_local_interface", 	&POA_CORBA::InterfaceDef::create_local_interface_skel},
-      {"contents", 	&POA_CORBA::InterfaceDef::contents_skel},
-      {"_get_name", 	&POA_CORBA::InterfaceDef::_get_name_skel},
-      {"_get_type", 	&POA_CORBA::InterfaceDef::_get_type_skel},
-      {"_set_name", 	&POA_CORBA::InterfaceDef::_set_name_skel},
-      {"create_abstract_interface", 	&POA_CORBA::InterfaceDef::create_abstract_interface_skel},
-      {"create_value_box", 	&POA_CORBA::InterfaceDef::create_value_box_skel},
-      {"create_alias", 	&POA_CORBA::InterfaceDef::create_alias_skel},
-      {"describe", 	&POA_CORBA::InterfaceDef::describe_skel},
-      {"lookup_name", 	&POA_CORBA::InterfaceDef::lookup_name_skel},
-      {"_get_version", 	&POA_CORBA::InterfaceDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::InterfaceDef::_set_version_skel},
-      {"_get_absolute_name", 	&POA_CORBA::InterfaceDef::_get_absolute_name_skel},
-      {"_get_defined_in", 	&POA_CORBA::InterfaceDef::_get_defined_in_skel},
-      {"lookup", 	&POA_CORBA::InterfaceDef::lookup_skel},
-      {"destroy", 	&POA_CORBA::InterfaceDef::destroy_skel},
-      {"describe_interface", 	&POA_CORBA::InterfaceDef::describe_interface_skel},
-      {"_get_id", 	&POA_CORBA::InterfaceDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::InterfaceDef::_set_id_skel},
-      {"create_struct", 	&POA_CORBA::InterfaceDef::create_struct_skel},
-      {"create_constant", 	&POA_CORBA::InterfaceDef::create_constant_skel},
-      {"_get_def_kind", 	&POA_CORBA::InterfaceDef::_get_def_kind_skel},
-      {"_get_base_interfaces", 	&POA_CORBA::InterfaceDef::_get_base_interfaces_skel},
-      {"_set_base_interfaces", 	&POA_CORBA::InterfaceDef::_set_base_interfaces_skel},
-      {"_get_containing_repository", 	&POA_CORBA::InterfaceDef::_get_containing_repository_skel},
-      {"describe_contents", 	&POA_CORBA::InterfaceDef::describe_contents_skel},
-      {"_non_existent",  &POA_CORBA::InterfaceDef::_non_existent_skel},
+      {"move", 	&POA_CORBA_InterfaceDef::move_skel},
+      {"is_a", 	&POA_CORBA_InterfaceDef::is_a_skel},
+      {"create_enum", 	&POA_CORBA_InterfaceDef::create_enum_skel},
+      {"create_value", 	&POA_CORBA_InterfaceDef::create_value_skel},
+      {"create_module", 	&POA_CORBA_InterfaceDef::create_module_skel},
+      {"create_native", 	&POA_CORBA_InterfaceDef::create_native_skel},
+      {"create_attribute", 	&POA_CORBA_InterfaceDef::create_attribute_skel},
+      {"create_interface", 	&POA_CORBA_InterfaceDef::create_interface_skel},
+      {"create_union", 	&POA_CORBA_InterfaceDef::create_union_skel},
+      {"create_operation", 	&POA_CORBA_InterfaceDef::create_operation_skel},
+      {"create_exception", 	&POA_CORBA_InterfaceDef::create_exception_skel},
+      {"create_local_interface", 	&POA_CORBA_InterfaceDef::create_local_interface_skel},
+      {"create_struct", 	&POA_CORBA_InterfaceDef::create_struct_skel},
+      {"create_abstract_interface", 	&POA_CORBA_InterfaceDef::create_abstract_interface_skel},
+      {"create_constant", 	&POA_CORBA_InterfaceDef::create_constant_skel},
+      {"destroy", 	&POA_CORBA_InterfaceDef::destroy_skel},
+      {"describe", 	&POA_CORBA_InterfaceDef::describe_skel},
+      {"_is_a",  &POA_CORBA_InterfaceDef::_is_a_skel},
+      {"lookup_name", 	&POA_CORBA_InterfaceDef::lookup_name_skel},
+      {"contents", 	&POA_CORBA_InterfaceDef::contents_skel},
+      {"_get_name", 	&POA_CORBA_InterfaceDef::_get_name_skel},
+      {"_get_type", 	&POA_CORBA_InterfaceDef::_get_type_skel},
+      {"_set_name", 	&POA_CORBA_InterfaceDef::_set_name_skel},
+      {"_interface",  &POA_CORBA_InterfaceDef::_interface_skel},
+      {"create_value_box", 	&POA_CORBA_InterfaceDef::create_value_box_skel},
+      {"create_alias", 	&POA_CORBA_InterfaceDef::create_alias_skel},
+      {"describe_interface", 	&POA_CORBA_InterfaceDef::describe_interface_skel},
+      {"lookup", 	&POA_CORBA_InterfaceDef::lookup_skel},
+      {"_get_version", 	&POA_CORBA_InterfaceDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_InterfaceDef::_set_version_skel},
+      {"_get_absolute_name", 	&POA_CORBA_InterfaceDef::_get_absolute_name_skel},
+      {"_get_defined_in", 	&POA_CORBA_InterfaceDef::_get_defined_in_skel},
+      {"_non_existent",  &POA_CORBA_InterfaceDef::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_CORBA_InterfaceDef::_get_containing_repository_skel},
+      {"_get_id", 	&POA_CORBA_InterfaceDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_InterfaceDef::_set_id_skel},
+      {"_get_def_kind", 	&POA_CORBA_InterfaceDef::_get_def_kind_skel},
+      {"describe_contents", 	&POA_CORBA_InterfaceDef::describe_contents_skel},
+      {"_get_base_interfaces", 	&POA_CORBA_InterfaceDef::_get_base_interfaces_skel},
+      {"_set_base_interfaces", 	&POA_CORBA_InterfaceDef::_set_base_interfaces_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,  -8,  -2, -10,  -2,   5,  -1,   6,   7, -66, 
-      -14,  -2, -67,  12, -18,  -3,  13, -65,  16,  17, -64,  21,  22,  23, 
-       24, -26,  -2,  25, -61,  28,  -1,  29,  30,  31,  32,  -1, -33,  -2, 
-      -60,  35,  -1,  36, -38,  -2,  37,  -1, -62,  40,  41,  -1,  -1,  -1, 
-       -1,  -1,  42, 
+       -1,  -1,  -1,  -1,   4,  -8,  -2, -10,  -2,   5,  -1,   6,   7, -78, 
+      -13,  -2, -79,  12,  -1, -24,  -3, -77,  15,  -1,  16,  17,  18,  19, 
+       20,  -1,  21,  22,  -1,  23, -85,  27,  28,  29,  30, -32,  -2,  31, 
+      -73,  34,  -1,  35,  -1, -38,  -2,  36,  -1,  37, -75,  -1,  -1,  -1, 
+       -1,  -1,  40,  -1,  -1,  -1,  41,  -1,  -1,  -1,  -1,  -1, -42,  -2, 
+      -72, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -20218,17 +21014,16 @@ TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
     }
   return 0;
 }
-/* ending time is 10:44:38 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable tao_CORBA_InterfaceDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::InterfaceDef *tao_impl,
+    POA_CORBA_InterfaceDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -20260,20 +21055,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::InterfaceDefSeq * result);
+  void result (CORBA_InterfaceDefSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get (const TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get &);
   
 private:
-  POA_CORBA::InterfaceDef *_tao_impl;
-  CORBA::InterfaceDefSeq * _result;
+  POA_CORBA_InterfaceDef *_tao_impl;
+  CORBA_InterfaceDefSeq * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::InterfaceDef *tao_impl,
+    POA_CORBA_InterfaceDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -20340,7 +21135,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (CORBA::InterfaceDefSeq * result)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (CORBA_InterfaceDefSeq * result)
 {
   // Update the result.
    this->_result = result;
@@ -20351,8 +21146,8 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set : public TAO_
 public:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::InterfaceDef *tao_impl,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    POA_CORBA_InterfaceDef *tao_impl,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -20390,15 +21185,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set &);
   
 private:
-  POA_CORBA::InterfaceDef *_tao_impl;
-  const CORBA::InterfaceDefSeq & base_interfaces_;
+  POA_CORBA_InterfaceDef *_tao_impl;
+  const CORBA_InterfaceDefSeq & base_interfaces_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::InterfaceDef *tao_impl,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    POA_CORBA_InterfaceDef *tao_impl,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -20474,7 +21269,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a : public TAO_ServerRequestIn
 public:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::InterfaceDef *tao_impl,
+    POA_CORBA_InterfaceDef *tao_impl,
     const char * interface_id,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -20514,14 +21309,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a &);
   
 private:
-  POA_CORBA::InterfaceDef *_tao_impl;
+  POA_CORBA_InterfaceDef *_tao_impl;
   const char * interface_id_;
   CORBA::Boolean _result;
 };
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::InterfaceDef *tao_impl,
+    POA_CORBA_InterfaceDef *tao_impl,
     const char * interface_id,
     CORBA::Environment &
   )
@@ -20608,7 +21403,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface : public TAO_S
 public:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::InterfaceDef *tao_impl,
+    POA_CORBA_InterfaceDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -20640,20 +21435,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::InterfaceDef::FullInterfaceDescription * result);
+  void result (CORBA_InterfaceDef::FullInterfaceDescription * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface (const TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface &);
   void operator= (const TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface &);
   
 private:
-  POA_CORBA::InterfaceDef *_tao_impl;
-  CORBA::InterfaceDef::FullInterfaceDescription * _result;
+  POA_CORBA_InterfaceDef *_tao_impl;
+  CORBA_InterfaceDef::FullInterfaceDescription * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::InterfaceDef *tao_impl,
+    POA_CORBA_InterfaceDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -20720,7 +21515,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (CORBA::InterfaceDef::FullInterfaceDescription * result)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (CORBA_InterfaceDef::FullInterfaceDescription * result)
 {
   // Update the result.
    this->_result = result;
@@ -20731,11 +21526,11 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute : public TAO_Ser
 public:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::InterfaceDef *tao_impl,
+    POA_CORBA_InterfaceDef *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode & mode,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -20768,29 +21563,29 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::AttributeDef_ptr result);
+  void result (CORBA_AttributeDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute (const TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute &);
   void operator= (const TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute &);
   
 private:
-  POA_CORBA::InterfaceDef *_tao_impl;
+  POA_CORBA_InterfaceDef *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr type_;
+  CORBA_IDLType_ptr type_;
   const CORBA::AttributeMode & mode_;
-  CORBA::AttributeDef_ptr _result;
+  CORBA_AttributeDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::InterfaceDef *tao_impl,
+    POA_CORBA_InterfaceDef *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode & mode,
     CORBA::Environment &
   )
@@ -20892,7 +21687,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (CORBA::AttributeDef_ptr result)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (CORBA_AttributeDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -20903,15 +21698,15 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation : public TAO_Ser
 public:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::InterfaceDef *tao_impl,
+    POA_CORBA_InterfaceDef *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode & mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -20943,36 +21738,36 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::OperationDef_ptr result);
+  void result (CORBA_OperationDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation (const TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation &);
   void operator= (const TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation &);
   
 private:
-  POA_CORBA::InterfaceDef *_tao_impl;
+  POA_CORBA_InterfaceDef *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr result_;
+  CORBA_IDLType_ptr result_;
   const CORBA::OperationMode & mode_;
-  const CORBA::ParDescriptionSeq & params_;
-  const CORBA::ExceptionDefSeq & exceptions_;
-  const CORBA::ContextIdSeq & contexts_;
-  CORBA::OperationDef_ptr _result;
+  const CORBA_ParDescriptionSeq & params_;
+  const CORBA_ExceptionDefSeq & exceptions_;
+  const CORBA_ContextIdSeq & contexts_;
+  CORBA_OperationDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::InterfaceDef *tao_impl,
+    POA_CORBA_InterfaceDef *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode & mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -21094,7 +21889,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA::OperationDef_ptr result)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA_OperationDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -21107,29 +21902,29 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA::Operat
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::the_TAO_InterfaceDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker *_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::the_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::_TAO_InterfaceDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::~_TAO_InterfaceDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_InterfaceDef_Proxy_Impl&
-POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::InterfaceDef *object,
+_TAO_CORBA_InterfaceDef_Proxy_Impl&
+_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_InterfaceDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -21147,7 +21942,7 @@ POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -21161,7 +21956,7 @@ POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_InterfaceDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -21171,7 +21966,7 @@ POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_InterfaceDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_InterfaceDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -21188,38 +21983,38 @@ POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_InterfaceDef_Proxy_Broker *
-CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_InterfaceDef_Proxy_Broker *
+_TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::the_TAO_InterfaceDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::the_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::InterfaceDefSeq * POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
+CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -21227,7 +22022,7 @@ CORBA::InterfaceDefSeq * POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_i
     CORBA::SystemException
   ))
 {
-    CORBA::InterfaceDefSeq_var _tao_retval;
+    CORBA_InterfaceDefSeq_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -21241,18 +22036,18 @@ CORBA::InterfaceDefSeq * POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_i
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::InterfaceDef_ptr,
+      POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/InterfaceDef:1.0"
+          "IDL:omg.org/CORBA_InterfaceDef:1.0"
         )
     )->base_interfaces (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
+void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -21271,9 +22066,9 @@ void POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::InterfaceDef_ptr,
+      POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/InterfaceDef:1.0"
+          "IDL:omg.org/CORBA_InterfaceDef:1.0"
         )
     )->base_interfaces (
         base_interfaces,
@@ -21282,7 +22077,7 @@ void POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
   return;
 }
 
-CORBA::Boolean POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
+CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
     const char * interface_id,
     CORBA::Environment &ACE_TRY_ENV
@@ -21305,9 +22100,9 @@ CORBA::Boolean POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
-      POA_CORBA::InterfaceDef_ptr,
+      POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/InterfaceDef:1.0"
+          "IDL:omg.org/CORBA_InterfaceDef:1.0"
         )
     )->is_a (
         interface_id,
@@ -21315,7 +22110,7 @@ CORBA::Boolean POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
       );
 }
 
-CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
+CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -21323,7 +22118,7 @@ CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::_TAO_InterfaceDef_Thr
     CORBA::SystemException
   ))
 {
-    CORBA::InterfaceDef::FullInterfaceDescription_var _tao_retval;
+    CORBA_InterfaceDef::FullInterfaceDescription_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -21337,21 +22132,21 @@ CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::_TAO_InterfaceDef_Thr
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::InterfaceDef_ptr,
+      POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/InterfaceDef:1.0"
+          "IDL:omg.org/CORBA_InterfaceDef:1.0"
         )
     )->describe_interface (
         ACE_TRY_ENV
       );
 }
 
-CORBA::AttributeDef_ptr POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
+CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -21359,7 +22154,7 @@ CORBA::AttributeDef_ptr POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_
     CORBA::SystemException
   ))
 {
-    CORBA::AttributeDef_var _tao_retval;
+    CORBA_AttributeDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -21373,9 +22168,9 @@ CORBA::AttributeDef_ptr POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::InterfaceDef_ptr,
+      POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/InterfaceDef:1.0"
+          "IDL:omg.org/CORBA_InterfaceDef:1.0"
         )
     )->create_attribute (
         id,
@@ -21387,23 +22182,23 @@ CORBA::AttributeDef_ptr POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_
       );
 }
 
-CORBA::OperationDef_ptr POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
+CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-    CORBA::OperationDef_var _tao_retval;
+    CORBA_OperationDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -21417,9 +22212,9 @@ CORBA::OperationDef_ptr POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::InterfaceDef_ptr,
+      POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/InterfaceDef:1.0"
+          "IDL:omg.org/CORBA_InterfaceDef:1.0"
         )
     )->create_operation (
         id,
@@ -21439,35 +22234,35 @@ CORBA::OperationDef_ptr POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::InterfaceDef::InterfaceDef (void)
+POA_CORBA_InterfaceDef::POA_CORBA_InterfaceDef (void)
 {
   this->optable_ = &tao_CORBA_InterfaceDef_optable;
 }
 
 // copy ctor
-POA_CORBA::InterfaceDef::InterfaceDef (const InterfaceDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_InterfaceDef::POA_CORBA_InterfaceDef (const POA_CORBA_InterfaceDef& rhs)
+  :   POA_CORBA_Container (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::InterfaceDef::~InterfaceDef (void)
+POA_CORBA_InterfaceDef::~POA_CORBA_InterfaceDef (void)
 {
 }
 
-void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
+void POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef *_tao_impl = (POA_CORBA::InterfaceDef *)_tao_object_reference;
+  POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *)_tao_object_reference;
   
-    CORBA::InterfaceDefSeq_var _tao_retval;
+    CORBA_InterfaceDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -21494,7 +22289,7 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
+      CORBA_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -21538,7 +22333,7 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
+void POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -21546,10 +22341,10 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::InterfaceDef *_tao_impl = (POA_CORBA::InterfaceDef *)_tao_object_reference;
+  POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::InterfaceDefSeq base_interfaces;
+    CORBA_InterfaceDefSeq base_interfaces;
   if (!(
     (_tao_in >> base_interfaces)
   ))
@@ -21617,7 +22412,7 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::InterfaceDef::is_a_skel (
+void POA_CORBA_InterfaceDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -21625,7 +22420,7 @@ void POA_CORBA::InterfaceDef::is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::InterfaceDef *_tao_impl = (POA_CORBA::InterfaceDef *)_tao_object_reference;
+  POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *)_tao_object_reference;
   
     CORBA::Boolean _tao_retval = 0;
   CORBA::String_var interface_id;
@@ -21705,16 +22500,16 @@ void POA_CORBA::InterfaceDef::is_a_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::InterfaceDef::describe_interface_skel (
+void POA_CORBA_InterfaceDef::describe_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef *_tao_impl = (POA_CORBA::InterfaceDef *)_tao_object_reference;
+  POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *)_tao_object_reference;
   
-    CORBA::InterfaceDef::FullInterfaceDescription_var _tao_retval;
+    CORBA_InterfaceDef::FullInterfaceDescription_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -21741,7 +22536,7 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::InterfaceDef::FullInterfaceDescription * _tao_retval_info = _tao_retval._retn ();
+      CORBA_InterfaceDef::FullInterfaceDescription * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -21785,7 +22580,7 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::InterfaceDef::create_attribute_skel (
+void POA_CORBA_InterfaceDef::create_attribute_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -21793,13 +22588,13 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::InterfaceDef *_tao_impl = (POA_CORBA::InterfaceDef *)_tao_object_reference;
+  POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *)_tao_object_reference;
   
-    CORBA::AttributeDef_var _tao_retval;
+    CORBA_AttributeDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::IDLType_var type;
+  CORBA_IDLType_var type;
   CORBA::AttributeMode mode;
   if (!(
     (_tao_in >> id.out ()) &&
@@ -21846,7 +22641,7 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -21890,7 +22685,7 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::InterfaceDef::create_operation_skel (
+void POA_CORBA_InterfaceDef::create_operation_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -21898,17 +22693,17 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::InterfaceDef *_tao_impl = (POA_CORBA::InterfaceDef *)_tao_object_reference;
+  POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *)_tao_object_reference;
   
-    CORBA::OperationDef_var _tao_retval;
+    CORBA_OperationDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::IDLType_var result;
+  CORBA_IDLType_var result;
   CORBA::OperationMode mode;
-  CORBA::ParDescriptionSeq params;
-  CORBA::ExceptionDefSeq exceptions;
-  CORBA::ContextIdSeq contexts;
+  CORBA_ParDescriptionSeq params;
+  CORBA_ExceptionDefSeq exceptions;
+  CORBA_ContextIdSeq contexts;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -21963,7 +22758,7 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -22007,7 +22802,7 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::InterfaceDef::_is_a_skel (
+void POA_CORBA_InterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -22015,7 +22810,7 @@ void POA_CORBA::InterfaceDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::InterfaceDef *_tao_impl = (POA_CORBA::InterfaceDef *) _tao_object_reference;
+  POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -22030,14 +22825,14 @@ void POA_CORBA::InterfaceDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::InterfaceDef::_non_existent_skel (
+void POA_CORBA_InterfaceDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef *_tao_impl = (POA_CORBA::InterfaceDef *) _tao_object_reference;
+  POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -22047,7 +22842,55 @@ void POA_CORBA::InterfaceDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::InterfaceDef::_is_a (
+void POA_CORBA_InterfaceDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_InterfaceDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -22056,48 +22899,48 @@ CORBA::Boolean POA_CORBA::InterfaceDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::InterfaceDef::_downcast (
+void* POA_CORBA_InterfaceDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::InterfaceDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Container_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::InterfaceDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_InterfaceDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::InterfaceDef::_interface_repository_id (void) const
+const char* POA_CORBA_InterfaceDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/InterfaceDef:1.0";
+  return "IDL:omg.org/CORBA_InterfaceDef:1.0";
 }
 
-CORBA::InterfaceDef*
-POA_CORBA::InterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_InterfaceDef*
+POA_CORBA_InterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -22110,9 +22953,10 @@ POA_CORBA::InterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::InterfaceDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_InterfaceDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -22120,7 +22964,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:38 */
+/* starting time is 13:56:21 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -22129,46 +22973,46 @@ TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsi
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 15,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59,  0,
-     59,  0, 20,  0, 59, 59, 59,  5, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 20,  0,  5,
-     59, 10, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 15, 30, 59, 59, 59, 10, 10, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 25,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71,  0,
+     71,  0, 20,  0, 71, 71, 71,  5, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 20,  0,  5,
+     71, 15, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 25, 11, 71, 71, 71, 20,  0, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71,
 #else
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 15, 59,  0, 59,  0,
-     20,  0, 59, 59, 59,  5, 59, 59, 20,  0,
-      5, 59, 10, 59, 59, 15, 30, 59, 59, 59,
-     10, 10, 59, 59, 59, 59, 59, 59,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 25, 71,  0, 71,  0,
+     20,  0, 71, 71, 71,  5, 71, 71, 20,  0,
+      5, 71, 15, 71, 71, 25, 11, 71, 71, 71,
+     20,  0, 71, 71, 71, 71, 71, 71,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -22179,66 +23023,68 @@ TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
 {
   enum
     {
-      TOTAL_KEYWORDS = 39,
+      TOTAL_KEYWORDS = 40,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 58,
-      HASH_VALUE_RANGE = 55,
+      MAX_HASH_VALUE = 70,
+      HASH_VALUE_RANGE = 67,
       DUPLICATES = 9
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::AbstractInterfaceDef::move_skel},
-      {"is_a", 	&POA_CORBA::AbstractInterfaceDef::is_a_skel},
-      {"create_enum", 	&POA_CORBA::AbstractInterfaceDef::create_enum_skel},
-      {"create_value", 	&POA_CORBA::AbstractInterfaceDef::create_value_skel},
-      {"create_module", 	&POA_CORBA::AbstractInterfaceDef::create_module_skel},
-      {"create_native", 	&POA_CORBA::AbstractInterfaceDef::create_native_skel},
-      {"create_attribute", 	&POA_CORBA::AbstractInterfaceDef::create_attribute_skel},
-      {"create_interface", 	&POA_CORBA::AbstractInterfaceDef::create_interface_skel},
-      {"create_union", 	&POA_CORBA::AbstractInterfaceDef::create_union_skel},
-      {"_is_a",  &POA_CORBA::AbstractInterfaceDef::_is_a_skel},
-      {"create_operation", 	&POA_CORBA::AbstractInterfaceDef::create_operation_skel},
-      {"create_exception", 	&POA_CORBA::AbstractInterfaceDef::create_exception_skel},
-      {"create_local_interface", 	&POA_CORBA::AbstractInterfaceDef::create_local_interface_skel},
-      {"contents", 	&POA_CORBA::AbstractInterfaceDef::contents_skel},
-      {"_get_name", 	&POA_CORBA::AbstractInterfaceDef::_get_name_skel},
-      {"_get_type", 	&POA_CORBA::AbstractInterfaceDef::_get_type_skel},
-      {"_set_name", 	&POA_CORBA::AbstractInterfaceDef::_set_name_skel},
-      {"create_abstract_interface", 	&POA_CORBA::AbstractInterfaceDef::create_abstract_interface_skel},
-      {"create_value_box", 	&POA_CORBA::AbstractInterfaceDef::create_value_box_skel},
-      {"create_alias", 	&POA_CORBA::AbstractInterfaceDef::create_alias_skel},
-      {"describe", 	&POA_CORBA::AbstractInterfaceDef::describe_skel},
-      {"lookup_name", 	&POA_CORBA::AbstractInterfaceDef::lookup_name_skel},
-      {"_get_version", 	&POA_CORBA::AbstractInterfaceDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::AbstractInterfaceDef::_set_version_skel},
-      {"_get_absolute_name", 	&POA_CORBA::AbstractInterfaceDef::_get_absolute_name_skel},
-      {"_get_defined_in", 	&POA_CORBA::AbstractInterfaceDef::_get_defined_in_skel},
-      {"lookup", 	&POA_CORBA::AbstractInterfaceDef::lookup_skel},
-      {"destroy", 	&POA_CORBA::AbstractInterfaceDef::destroy_skel},
-      {"describe_interface", 	&POA_CORBA::AbstractInterfaceDef::describe_interface_skel},
-      {"_get_id", 	&POA_CORBA::AbstractInterfaceDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::AbstractInterfaceDef::_set_id_skel},
-      {"create_struct", 	&POA_CORBA::AbstractInterfaceDef::create_struct_skel},
-      {"create_constant", 	&POA_CORBA::AbstractInterfaceDef::create_constant_skel},
-      {"_get_def_kind", 	&POA_CORBA::AbstractInterfaceDef::_get_def_kind_skel},
-      {"_get_base_interfaces", 	&POA_CORBA::AbstractInterfaceDef::_get_base_interfaces_skel},
-      {"_set_base_interfaces", 	&POA_CORBA::AbstractInterfaceDef::_set_base_interfaces_skel},
-      {"_get_containing_repository", 	&POA_CORBA::AbstractInterfaceDef::_get_containing_repository_skel},
-      {"describe_contents", 	&POA_CORBA::AbstractInterfaceDef::describe_contents_skel},
-      {"_non_existent",  &POA_CORBA::AbstractInterfaceDef::_non_existent_skel},
+      {"move", 	&POA_CORBA_AbstractInterfaceDef::move_skel},
+      {"is_a", 	&POA_CORBA_AbstractInterfaceDef::is_a_skel},
+      {"create_enum", 	&POA_CORBA_AbstractInterfaceDef::create_enum_skel},
+      {"create_value", 	&POA_CORBA_AbstractInterfaceDef::create_value_skel},
+      {"create_module", 	&POA_CORBA_AbstractInterfaceDef::create_module_skel},
+      {"create_native", 	&POA_CORBA_AbstractInterfaceDef::create_native_skel},
+      {"create_attribute", 	&POA_CORBA_AbstractInterfaceDef::create_attribute_skel},
+      {"create_interface", 	&POA_CORBA_AbstractInterfaceDef::create_interface_skel},
+      {"create_union", 	&POA_CORBA_AbstractInterfaceDef::create_union_skel},
+      {"create_operation", 	&POA_CORBA_AbstractInterfaceDef::create_operation_skel},
+      {"create_exception", 	&POA_CORBA_AbstractInterfaceDef::create_exception_skel},
+      {"create_local_interface", 	&POA_CORBA_AbstractInterfaceDef::create_local_interface_skel},
+      {"create_struct", 	&POA_CORBA_AbstractInterfaceDef::create_struct_skel},
+      {"create_abstract_interface", 	&POA_CORBA_AbstractInterfaceDef::create_abstract_interface_skel},
+      {"create_constant", 	&POA_CORBA_AbstractInterfaceDef::create_constant_skel},
+      {"destroy", 	&POA_CORBA_AbstractInterfaceDef::destroy_skel},
+      {"describe", 	&POA_CORBA_AbstractInterfaceDef::describe_skel},
+      {"_is_a",  &POA_CORBA_AbstractInterfaceDef::_is_a_skel},
+      {"lookup_name", 	&POA_CORBA_AbstractInterfaceDef::lookup_name_skel},
+      {"contents", 	&POA_CORBA_AbstractInterfaceDef::contents_skel},
+      {"_get_name", 	&POA_CORBA_AbstractInterfaceDef::_get_name_skel},
+      {"_get_type", 	&POA_CORBA_AbstractInterfaceDef::_get_type_skel},
+      {"_set_name", 	&POA_CORBA_AbstractInterfaceDef::_set_name_skel},
+      {"_interface",  &POA_CORBA_AbstractInterfaceDef::_interface_skel},
+      {"create_value_box", 	&POA_CORBA_AbstractInterfaceDef::create_value_box_skel},
+      {"create_alias", 	&POA_CORBA_AbstractInterfaceDef::create_alias_skel},
+      {"describe_interface", 	&POA_CORBA_AbstractInterfaceDef::describe_interface_skel},
+      {"lookup", 	&POA_CORBA_AbstractInterfaceDef::lookup_skel},
+      {"_get_version", 	&POA_CORBA_AbstractInterfaceDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_AbstractInterfaceDef::_set_version_skel},
+      {"_get_absolute_name", 	&POA_CORBA_AbstractInterfaceDef::_get_absolute_name_skel},
+      {"_get_defined_in", 	&POA_CORBA_AbstractInterfaceDef::_get_defined_in_skel},
+      {"_non_existent",  &POA_CORBA_AbstractInterfaceDef::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_CORBA_AbstractInterfaceDef::_get_containing_repository_skel},
+      {"_get_id", 	&POA_CORBA_AbstractInterfaceDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_AbstractInterfaceDef::_set_id_skel},
+      {"_get_def_kind", 	&POA_CORBA_AbstractInterfaceDef::_get_def_kind_skel},
+      {"describe_contents", 	&POA_CORBA_AbstractInterfaceDef::describe_contents_skel},
+      {"_get_base_interfaces", 	&POA_CORBA_AbstractInterfaceDef::_get_base_interfaces_skel},
+      {"_set_base_interfaces", 	&POA_CORBA_AbstractInterfaceDef::_set_base_interfaces_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,  -8,  -2, -10,  -2,   5,  -1,   6,   7, -66, 
-      -14,  -2, -67,  12, -18,  -3,  13, -65,  16,  17, -64,  21,  22,  23, 
-       24, -26,  -2,  25, -61,  28,  -1,  29,  30,  31,  32,  -1, -33,  -2, 
-      -60,  35,  -1,  36, -38,  -2,  37,  -1, -62,  40,  41,  -1,  -1,  -1, 
-       -1,  -1,  42, 
+       -1,  -1,  -1,  -1,   4,  -8,  -2, -10,  -2,   5,  -1,   6,   7, -78, 
+      -13,  -2, -79,  12,  -1, -24,  -3, -77,  15,  -1,  16,  17,  18,  19, 
+       20,  -1,  21,  22,  -1,  23, -85,  27,  28,  29,  30, -32,  -2,  31, 
+      -73,  34,  -1,  35,  -1, -38,  -2,  36,  -1,  37, -75,  -1,  -1,  -1, 
+       -1,  -1,  40,  -1,  -1,  -1,  41,  -1,  -1,  -1,  -1,  -1, -42,  -2, 
+      -72, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -22272,7 +23118,7 @@ TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
     }
   return 0;
 }
-/* ending time is 10:44:38 */
+/* ending time is 13:56:21 */
 static TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable tao_CORBA_AbstractInterfaceDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -22283,29 +23129,29 @@ static TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable tao_CORBA_AbstractInt
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker::the_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker *_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::the_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker::~_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_AbstractInterfaceDef_Proxy_Impl&
-POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::AbstractInterfaceDef *object,
+_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl&
+_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_AbstractInterfaceDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -22323,7 +23169,7 @@ POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -22337,7 +23183,7 @@ POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -22347,7 +23193,7 @@ POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_AbstractInterfaceDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -22364,33 +23210,33 @@ POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_AbstractInterfaceDef_Proxy_Broker *
-CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker *
+_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker::the_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::the_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
@@ -22400,27 +23246,27 @@ POA_CORBA::_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl::_TAO_AbstractInterfaceD
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::AbstractInterfaceDef::AbstractInterfaceDef (void)
+POA_CORBA_AbstractInterfaceDef::POA_CORBA_AbstractInterfaceDef (void)
 {
   this->optable_ = &tao_CORBA_AbstractInterfaceDef_optable;
 }
 
 // copy ctor
-POA_CORBA::AbstractInterfaceDef::AbstractInterfaceDef (const AbstractInterfaceDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,InterfaceDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_AbstractInterfaceDef::POA_CORBA_AbstractInterfaceDef (const POA_CORBA_AbstractInterfaceDef& rhs)
+  :   POA_CORBA_InterfaceDef (rhs),
+    POA_CORBA_Container (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::AbstractInterfaceDef::~AbstractInterfaceDef (void)
+POA_CORBA_AbstractInterfaceDef::~POA_CORBA_AbstractInterfaceDef (void)
 {
 }
 
-void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
+void POA_CORBA_AbstractInterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -22428,7 +23274,7 @@ void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::AbstractInterfaceDef *_tao_impl = (POA_CORBA::AbstractInterfaceDef *) _tao_object_reference;
+  POA_CORBA_AbstractInterfaceDef *_tao_impl = (POA_CORBA_AbstractInterfaceDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -22443,14 +23289,14 @@ void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
+void POA_CORBA_AbstractInterfaceDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::AbstractInterfaceDef *_tao_impl = (POA_CORBA::AbstractInterfaceDef *) _tao_object_reference;
+  POA_CORBA_AbstractInterfaceDef *_tao_impl = (POA_CORBA_AbstractInterfaceDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -22460,7 +23306,55 @@ void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::AbstractInterfaceDef::_is_a (
+void POA_CORBA_AbstractInterfaceDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_AbstractInterfaceDef *_tao_impl = (POA_CORBA_AbstractInterfaceDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_AbstractInterfaceDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -22469,51 +23363,51 @@ CORBA::Boolean POA_CORBA::AbstractInterfaceDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::AbstractInterfaceDef::_downcast (
+void* POA_CORBA_AbstractInterfaceDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::AbstractInterfaceDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::InterfaceDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_AbstractInterfaceDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Container_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::AbstractInterfaceDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_AbstractInterfaceDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::AbstractInterfaceDef::_interface_repository_id (void) const
+const char* POA_CORBA_AbstractInterfaceDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0";
+  return "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0";
 }
 
-CORBA::AbstractInterfaceDef*
-POA_CORBA::AbstractInterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_AbstractInterfaceDef*
+POA_CORBA_AbstractInterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -22526,11 +23420,9 @@ POA_CORBA::AbstractInterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::AbstractInterfaceDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_AbstractInterfaceDef::_unchecked_narrow (obj.in ());
 }
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-#endif /* TAO_HAS_INTERCEPTORS */
 
 class TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -22539,7 +23431,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:38 */
+/* starting time is 13:56:22 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -22548,46 +23440,46 @@ TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigne
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 15,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59,  0,
-     59,  0, 20,  0, 59, 59, 59,  5, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 20,  0,  5,
-     59, 10, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 15, 30, 59, 59, 59, 10, 10, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 25,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71,  0,
+     71,  0, 20,  0, 71, 71, 71,  5, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 20,  0,  5,
+     71, 15, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 25, 11, 71, 71, 71, 20,  0, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71,
 #else
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 59, 59, 59, 59, 59,
-     59, 59, 59, 59, 59, 15, 59,  0, 59,  0,
-     20,  0, 59, 59, 59,  5, 59, 59, 20,  0,
-      5, 59, 10, 59, 59, 15, 30, 59, 59, 59,
-     10, 10, 59, 59, 59, 59, 59, 59,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 71, 71, 71, 71, 71,
+     71, 71, 71, 71, 71, 25, 71,  0, 71,  0,
+     20,  0, 71, 71, 71,  5, 71, 71, 20,  0,
+      5, 71, 15, 71, 71, 25, 11, 71, 71, 71,
+     20,  0, 71, 71, 71, 71, 71, 71,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -22598,66 +23490,68 @@ TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsig
 {
   enum
     {
-      TOTAL_KEYWORDS = 39,
+      TOTAL_KEYWORDS = 40,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 58,
-      HASH_VALUE_RANGE = 55,
+      MAX_HASH_VALUE = 70,
+      HASH_VALUE_RANGE = 67,
       DUPLICATES = 9
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::LocalInterfaceDef::move_skel},
-      {"is_a", 	&POA_CORBA::LocalInterfaceDef::is_a_skel},
-      {"create_enum", 	&POA_CORBA::LocalInterfaceDef::create_enum_skel},
-      {"create_value", 	&POA_CORBA::LocalInterfaceDef::create_value_skel},
-      {"create_module", 	&POA_CORBA::LocalInterfaceDef::create_module_skel},
-      {"create_native", 	&POA_CORBA::LocalInterfaceDef::create_native_skel},
-      {"create_attribute", 	&POA_CORBA::LocalInterfaceDef::create_attribute_skel},
-      {"create_interface", 	&POA_CORBA::LocalInterfaceDef::create_interface_skel},
-      {"create_union", 	&POA_CORBA::LocalInterfaceDef::create_union_skel},
-      {"_is_a",  &POA_CORBA::LocalInterfaceDef::_is_a_skel},
-      {"create_operation", 	&POA_CORBA::LocalInterfaceDef::create_operation_skel},
-      {"create_exception", 	&POA_CORBA::LocalInterfaceDef::create_exception_skel},
-      {"create_local_interface", 	&POA_CORBA::LocalInterfaceDef::create_local_interface_skel},
-      {"contents", 	&POA_CORBA::LocalInterfaceDef::contents_skel},
-      {"_get_name", 	&POA_CORBA::LocalInterfaceDef::_get_name_skel},
-      {"_get_type", 	&POA_CORBA::LocalInterfaceDef::_get_type_skel},
-      {"_set_name", 	&POA_CORBA::LocalInterfaceDef::_set_name_skel},
-      {"create_abstract_interface", 	&POA_CORBA::LocalInterfaceDef::create_abstract_interface_skel},
-      {"create_value_box", 	&POA_CORBA::LocalInterfaceDef::create_value_box_skel},
-      {"create_alias", 	&POA_CORBA::LocalInterfaceDef::create_alias_skel},
-      {"describe", 	&POA_CORBA::LocalInterfaceDef::describe_skel},
-      {"lookup_name", 	&POA_CORBA::LocalInterfaceDef::lookup_name_skel},
-      {"_get_version", 	&POA_CORBA::LocalInterfaceDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::LocalInterfaceDef::_set_version_skel},
-      {"_get_absolute_name", 	&POA_CORBA::LocalInterfaceDef::_get_absolute_name_skel},
-      {"_get_defined_in", 	&POA_CORBA::LocalInterfaceDef::_get_defined_in_skel},
-      {"lookup", 	&POA_CORBA::LocalInterfaceDef::lookup_skel},
-      {"destroy", 	&POA_CORBA::LocalInterfaceDef::destroy_skel},
-      {"describe_interface", 	&POA_CORBA::LocalInterfaceDef::describe_interface_skel},
-      {"_get_id", 	&POA_CORBA::LocalInterfaceDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::LocalInterfaceDef::_set_id_skel},
-      {"create_struct", 	&POA_CORBA::LocalInterfaceDef::create_struct_skel},
-      {"create_constant", 	&POA_CORBA::LocalInterfaceDef::create_constant_skel},
-      {"_get_def_kind", 	&POA_CORBA::LocalInterfaceDef::_get_def_kind_skel},
-      {"_get_base_interfaces", 	&POA_CORBA::LocalInterfaceDef::_get_base_interfaces_skel},
-      {"_set_base_interfaces", 	&POA_CORBA::LocalInterfaceDef::_set_base_interfaces_skel},
-      {"_get_containing_repository", 	&POA_CORBA::LocalInterfaceDef::_get_containing_repository_skel},
-      {"describe_contents", 	&POA_CORBA::LocalInterfaceDef::describe_contents_skel},
-      {"_non_existent",  &POA_CORBA::LocalInterfaceDef::_non_existent_skel},
+      {"move", 	&POA_CORBA_LocalInterfaceDef::move_skel},
+      {"is_a", 	&POA_CORBA_LocalInterfaceDef::is_a_skel},
+      {"create_enum", 	&POA_CORBA_LocalInterfaceDef::create_enum_skel},
+      {"create_value", 	&POA_CORBA_LocalInterfaceDef::create_value_skel},
+      {"create_module", 	&POA_CORBA_LocalInterfaceDef::create_module_skel},
+      {"create_native", 	&POA_CORBA_LocalInterfaceDef::create_native_skel},
+      {"create_attribute", 	&POA_CORBA_LocalInterfaceDef::create_attribute_skel},
+      {"create_interface", 	&POA_CORBA_LocalInterfaceDef::create_interface_skel},
+      {"create_union", 	&POA_CORBA_LocalInterfaceDef::create_union_skel},
+      {"create_operation", 	&POA_CORBA_LocalInterfaceDef::create_operation_skel},
+      {"create_exception", 	&POA_CORBA_LocalInterfaceDef::create_exception_skel},
+      {"create_local_interface", 	&POA_CORBA_LocalInterfaceDef::create_local_interface_skel},
+      {"create_struct", 	&POA_CORBA_LocalInterfaceDef::create_struct_skel},
+      {"create_abstract_interface", 	&POA_CORBA_LocalInterfaceDef::create_abstract_interface_skel},
+      {"create_constant", 	&POA_CORBA_LocalInterfaceDef::create_constant_skel},
+      {"destroy", 	&POA_CORBA_LocalInterfaceDef::destroy_skel},
+      {"describe", 	&POA_CORBA_LocalInterfaceDef::describe_skel},
+      {"_is_a",  &POA_CORBA_LocalInterfaceDef::_is_a_skel},
+      {"lookup_name", 	&POA_CORBA_LocalInterfaceDef::lookup_name_skel},
+      {"contents", 	&POA_CORBA_LocalInterfaceDef::contents_skel},
+      {"_get_name", 	&POA_CORBA_LocalInterfaceDef::_get_name_skel},
+      {"_get_type", 	&POA_CORBA_LocalInterfaceDef::_get_type_skel},
+      {"_set_name", 	&POA_CORBA_LocalInterfaceDef::_set_name_skel},
+      {"_interface",  &POA_CORBA_LocalInterfaceDef::_interface_skel},
+      {"create_value_box", 	&POA_CORBA_LocalInterfaceDef::create_value_box_skel},
+      {"create_alias", 	&POA_CORBA_LocalInterfaceDef::create_alias_skel},
+      {"describe_interface", 	&POA_CORBA_LocalInterfaceDef::describe_interface_skel},
+      {"lookup", 	&POA_CORBA_LocalInterfaceDef::lookup_skel},
+      {"_get_version", 	&POA_CORBA_LocalInterfaceDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_LocalInterfaceDef::_set_version_skel},
+      {"_get_absolute_name", 	&POA_CORBA_LocalInterfaceDef::_get_absolute_name_skel},
+      {"_get_defined_in", 	&POA_CORBA_LocalInterfaceDef::_get_defined_in_skel},
+      {"_non_existent",  &POA_CORBA_LocalInterfaceDef::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_CORBA_LocalInterfaceDef::_get_containing_repository_skel},
+      {"_get_id", 	&POA_CORBA_LocalInterfaceDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_LocalInterfaceDef::_set_id_skel},
+      {"_get_def_kind", 	&POA_CORBA_LocalInterfaceDef::_get_def_kind_skel},
+      {"describe_contents", 	&POA_CORBA_LocalInterfaceDef::describe_contents_skel},
+      {"_get_base_interfaces", 	&POA_CORBA_LocalInterfaceDef::_get_base_interfaces_skel},
+      {"_set_base_interfaces", 	&POA_CORBA_LocalInterfaceDef::_set_base_interfaces_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,  -8,  -2, -10,  -2,   5,  -1,   6,   7, -66, 
-      -14,  -2, -67,  12, -18,  -3,  13, -65,  16,  17, -64,  21,  22,  23, 
-       24, -26,  -2,  25, -61,  28,  -1,  29,  30,  31,  32,  -1, -33,  -2, 
-      -60,  35,  -1,  36, -38,  -2,  37,  -1, -62,  40,  41,  -1,  -1,  -1, 
-       -1,  -1,  42, 
+       -1,  -1,  -1,  -1,   4,  -8,  -2, -10,  -2,   5,  -1,   6,   7, -78, 
+      -13,  -2, -79,  12,  -1, -24,  -3, -77,  15,  -1,  16,  17,  18,  19, 
+       20,  -1,  21,  22,  -1,  23, -85,  27,  28,  29,  30, -32,  -2,  31, 
+      -73,  34,  -1,  35,  -1, -38,  -2,  36,  -1,  37, -75,  -1,  -1,  -1, 
+       -1,  -1,  40,  -1,  -1,  -1,  41,  -1,  -1,  -1,  -1,  -1, -42,  -2, 
+      -72, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -22691,38 +23585,40 @@ TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsig
     }
   return 0;
 }
-/* ending time is 10:44:38 */
+/* ending time is 13:56:22 */
 static TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable tao_CORBA_LocalInterfaceDef_optable;
 
+#if (TAO_HAS_INTERCEPTORS == 1)
+#endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
 //            Strategized Proxy Broker Implementation
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker::the_TAO_LocalInterfaceDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker *_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::the_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker::~_TAO_LocalInterfaceDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_LocalInterfaceDef_Proxy_Impl&
-POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::LocalInterfaceDef *object,
+_TAO_CORBA_LocalInterfaceDef_Proxy_Impl&
+_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_LocalInterfaceDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -22740,7 +23636,7 @@ POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -22754,7 +23650,7 @@ POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -22764,7 +23660,7 @@ POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_LocalInterfaceDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -22781,33 +23677,33 @@ POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_LocalInterfaceDef_Proxy_Broker *
-CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_LocalInterfaceDef_Proxy_Broker *
+_TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker::the_TAO_LocalInterfaceDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::the_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl::_TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
@@ -22817,27 +23713,27 @@ POA_CORBA::_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl::_TAO_LocalInterfaceDef_Thr
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::LocalInterfaceDef::LocalInterfaceDef (void)
+POA_CORBA_LocalInterfaceDef::POA_CORBA_LocalInterfaceDef (void)
 {
   this->optable_ = &tao_CORBA_LocalInterfaceDef_optable;
 }
 
 // copy ctor
-POA_CORBA::LocalInterfaceDef::LocalInterfaceDef (const LocalInterfaceDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,InterfaceDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_LocalInterfaceDef::POA_CORBA_LocalInterfaceDef (const POA_CORBA_LocalInterfaceDef& rhs)
+  :   POA_CORBA_InterfaceDef (rhs),
+    POA_CORBA_Container (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::LocalInterfaceDef::~LocalInterfaceDef (void)
+POA_CORBA_LocalInterfaceDef::~POA_CORBA_LocalInterfaceDef (void)
 {
 }
 
-void POA_CORBA::LocalInterfaceDef::_is_a_skel (
+void POA_CORBA_LocalInterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -22845,7 +23741,7 @@ void POA_CORBA::LocalInterfaceDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::LocalInterfaceDef *_tao_impl = (POA_CORBA::LocalInterfaceDef *) _tao_object_reference;
+  POA_CORBA_LocalInterfaceDef *_tao_impl = (POA_CORBA_LocalInterfaceDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -22860,14 +23756,14 @@ void POA_CORBA::LocalInterfaceDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
+void POA_CORBA_LocalInterfaceDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::LocalInterfaceDef *_tao_impl = (POA_CORBA::LocalInterfaceDef *) _tao_object_reference;
+  POA_CORBA_LocalInterfaceDef *_tao_impl = (POA_CORBA_LocalInterfaceDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -22877,7 +23773,55 @@ void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::LocalInterfaceDef::_is_a (
+void POA_CORBA_LocalInterfaceDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_LocalInterfaceDef *_tao_impl = (POA_CORBA_LocalInterfaceDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_LocalInterfaceDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -22886,51 +23830,51 @@ CORBA::Boolean POA_CORBA::LocalInterfaceDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_LocalInterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::LocalInterfaceDef::_downcast (
+void* POA_CORBA_LocalInterfaceDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::LocalInterfaceDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::InterfaceDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_LocalInterfaceDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_LocalInterfaceDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Container_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::LocalInterfaceDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_LocalInterfaceDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::LocalInterfaceDef::_interface_repository_id (void) const
+const char* POA_CORBA_LocalInterfaceDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/LocalInterfaceDef:1.0";
+  return "IDL:omg.org/CORBA_LocalInterfaceDef:1.0";
 }
 
-CORBA::LocalInterfaceDef*
-POA_CORBA::LocalInterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_LocalInterfaceDef*
+POA_CORBA_LocalInterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -22943,7 +23887,9 @@ POA_CORBA::LocalInterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::LocalInterfaceDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_LocalInterfaceDef::_unchecked_narrow (obj.in ());
 }
 
+
+
 #endif /* ifndef */
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.h b/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
index 69e8757397a..4c166fc3f71 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
@@ -19,16 +19,23 @@
 // 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"
+#include "tao/IFR_Client/IFR_BasicC.h"
+
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/PortableServer/Collocated_Object.h"
+#include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
+#include "tao/PortableServer/Direct_Object_Proxy_Impl.h"
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -40,422 +47,429 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-TAO_NAMESPACE  POA_CORBA
+class POA_CORBA_Repository;
+typedef POA_CORBA_Repository *POA_CORBA_Repository_ptr;
+// Forward Classes Declaration
+class _TAO_CORBA_Repository_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_Repository_Strategized_Proxy_Broker;
+
+class  POA_CORBA_Repository : public virtual POA_CORBA_Container
 {
-  class Repository;
-  typedef Repository *Repository_ptr;
-  // Forward Classes Declaration
-  class _TAO_Repository_ThruPOA_Proxy_Impl;
-  class _TAO_Repository_Strategized_Proxy_Broker;
-  
-  class  Repository : public virtual Container
-  {
-  protected:
-    Repository (void);
-
-  public:
-    Repository (const Repository& rhs);
-    virtual ~Repository (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 ()
-      );
-
-    virtual void _dispatch (
-        TAO_ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::Repository *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::Contained_ptr lookup_id (
-        const char * search_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void lookup_id_skel (
-        TAO_ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::TypeCode_ptr get_canonical_typecode (
-        CORBA::TypeCode_ptr tc,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void get_canonical_typecode_skel (
-        TAO_ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::PrimitiveDef_ptr get_primitive (
-        CORBA::PrimitiveKind kind,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void get_primitive_skel (
-        TAO_ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::StringDef_ptr create_string (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_string_skel (
-        TAO_ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::WstringDef_ptr create_wstring (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_wstring_skel (
-        TAO_ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual 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
-      )) = 0;
-
-    static void create_sequence_skel (
-        TAO_ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual 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
-      )) = 0;
-
-    static void create_array_skel (
-        TAO_ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::FixedDef_ptr create_fixed (
-        CORBA::UShort digits,
-        CORBA::Short scale,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_fixed_skel (
-        TAO_ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void lookup_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void contents_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void lookup_name_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void describe_contents_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void create_module_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void create_constant_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void create_struct_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void create_union_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void create_enum_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void create_alias_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void create_interface_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void create_value_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void create_value_box_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void create_exception_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void create_native_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void create_abstract_interface_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void create_local_interface_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        TAO_ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+protected:
+  POA_CORBA_Repository (void);
 
-  };
+public:
+  POA_CORBA_Repository (const POA_CORBA_Repository& rhs);
+  virtual ~POA_CORBA_Repository (void);
 
-  
-  ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
-  //
-  
-  class  _TAO_Repository_Strategized_Proxy_Broker : public virtual ::_TAO_Repository_Proxy_Broker
-  {
-  public: 
-    _TAO_Repository_Strategized_Proxy_Broker (void);
-    
-    virtual ~_TAO_Repository_Strategized_Proxy_Broker (void);
-    
-    virtual ::_TAO_Repository_Proxy_Impl &select_proxy (
-      ::CORBA::Repository *object,
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+
+  virtual CORBA::Boolean _is_a (
+      const char* logical_type_id,
+      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 strategy,
-      CORBA::Environment &ACE_TRY_ENV
+
+  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_Repository *_this (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+
+  virtual const char* _interface_repository_id (void) const;
+
+  virtual CORBA_Contained_ptr lookup_id (
+      const char * search_id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  static void lookup_id_skel (
+      TAO_ServerRequest &_tao_req, 
+      void *_tao_obj, 
+      void *_tao_context, 
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+
+  virtual CORBA::TypeCode_ptr get_canonical_typecode (
+      CORBA::TypeCode_ptr tc,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  static void get_canonical_typecode_skel (
+      TAO_ServerRequest &_tao_req, 
+      void *_tao_obj, 
+      void *_tao_context, 
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+
+  virtual CORBA_PrimitiveDef_ptr get_primitive (
+      CORBA::PrimitiveKind kind,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  static void get_primitive_skel (
+      TAO_ServerRequest &_tao_req, 
+      void *_tao_obj, 
+      void *_tao_context, 
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+
+  virtual CORBA_StringDef_ptr create_string (
+      CORBA::ULong bound,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  static void create_string_skel (
+      TAO_ServerRequest &_tao_req, 
+      void *_tao_obj, 
+      void *_tao_context, 
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+
+  virtual CORBA_WstringDef_ptr create_wstring (
+      CORBA::ULong bound,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  static void create_wstring_skel (
+      TAO_ServerRequest &_tao_req, 
+      void *_tao_obj, 
+      void *_tao_context, 
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+
+  virtual 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
+    )) = 0;
+
+  static void create_sequence_skel (
+      TAO_ServerRequest &_tao_req, 
+      void *_tao_obj, 
+      void *_tao_context, 
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+
+  virtual 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
+    )) = 0;
+
+  static void create_array_skel (
+      TAO_ServerRequest &_tao_req, 
+      void *_tao_obj, 
+      void *_tao_context, 
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+
+  virtual CORBA_FixedDef_ptr create_fixed (
+      CORBA::UShort digits,
+      CORBA::Short scale,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  static void create_fixed_skel (
+      TAO_ServerRequest &_tao_req, 
+      void *_tao_obj, 
+      void *_tao_context, 
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+
+  static void lookup_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void contents_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void lookup_name_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void describe_contents_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void create_module_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void create_constant_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void create_struct_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void create_union_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void create_enum_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void create_alias_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void create_interface_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void create_value_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void create_value_box_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void create_exception_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void create_native_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void create_abstract_interface_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void create_local_interface_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void _get_def_kind_skel (
+      TAO_ServerRequest &req,
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void destroy_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+
+};
+
+
+///////////////////////////////////////////////////////////////////////
+//               Strategized Proxy Broker Declaration 
+//
+
+class  _TAO_CORBA_Repository_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Repository_Proxy_Broker
+{
+public: 
+  _TAO_CORBA_Repository_Strategized_Proxy_Broker (void);
   
-  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.
-    ::_TAO_Repository_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_Repository_Strategized_Proxy_Broker *the_TAO_Repository_Strategized_Proxy_Broker (void);
-  };
-  
+  virtual ~_TAO_CORBA_Repository_Strategized_Proxy_Broker (void);
   
-  //
-  //            End Strategized Proxy Broker Declaration 
-  ///////////////////////////////////////////////////////////////////////
+  virtual ::_TAO_CORBA_Repository_Proxy_Impl &select_proxy (
+    ::CORBA_Repository *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.
+  ::_TAO_CORBA_Repository_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_CORBA_Repository_Strategized_Proxy_Broker *the_TAO_CORBA_Repository_Strategized_Proxy_Broker (void);
+};
+
+
+//
+//            End Strategized Proxy Broker Declaration 
+///////////////////////////////////////////////////////////////////////
+
+
 ///////////////////////////////////////////////////////////////////////
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_Repository_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_Repository_Proxy_Impl,
+class  _TAO_CORBA_Repository_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_Repository_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_Repository_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_Repository_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_Repository_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_Repository_ThruPOA_Proxy_Impl (void) { }
   
-    virtual CORBA::Contained_ptr lookup_id (
+    virtual CORBA_Contained_ptr lookup_id (
       CORBA_Object *_collocated_tao_target_,
       const char * search_id,
       CORBA::Environment &ACE_TRY_ENV
@@ -473,7 +487,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::PrimitiveDef_ptr get_primitive (
+  virtual CORBA_PrimitiveDef_ptr get_primitive (
       CORBA_Object *_collocated_tao_target_,
       CORBA::PrimitiveKind kind,
       CORBA::Environment &ACE_TRY_ENV
@@ -482,7 +496,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::StringDef_ptr create_string (
+  virtual CORBA_StringDef_ptr create_string (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
       CORBA::Environment &ACE_TRY_ENV
@@ -491,7 +505,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::WstringDef_ptr create_wstring (
+  virtual CORBA_WstringDef_ptr create_wstring (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
       CORBA::Environment &ACE_TRY_ENV
@@ -500,27 +514,27 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::SequenceDef_ptr create_sequence (
+  virtual CORBA_SequenceDef_ptr create_sequence (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
-      CORBA::IDLType_ptr element_type,
+      CORBA_IDLType_ptr element_type,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::ArrayDef_ptr create_array (
+  virtual CORBA_ArrayDef_ptr create_array (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong length,
-      CORBA::IDLType_ptr element_type,
+      CORBA_IDLType_ptr element_type,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::FixedDef_ptr create_fixed (
+  virtual CORBA_FixedDef_ptr create_fixed (
       CORBA_Object *_collocated_tao_target_,
       CORBA::UShort digits,
       CORBA::Short scale,
@@ -537,22 +551,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  Repository_tie : public Repository
+class  POA_CORBA_Repository_tie : public POA_CORBA_Repository
 {
 public:
-  Repository_tie (T &t);
+  POA_CORBA_Repository_tie (T &t);
   // the T& ctor
-  Repository_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_Repository_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  Repository_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_Repository_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  Repository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_Repository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~Repository_tie (void);
+  ~POA_CORBA_Repository_tie (void);
   // dtor
   
   // TIE specific functions
@@ -572,7 +584,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  CORBA::Contained_ptr lookup_id (
+  CORBA_Contained_ptr lookup_id (
       const char * search_id,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -590,7 +602,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::PrimitiveDef_ptr get_primitive (
+  CORBA_PrimitiveDef_ptr get_primitive (
       CORBA::PrimitiveKind kind,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -599,7 +611,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::StringDef_ptr create_string (
+  CORBA_StringDef_ptr create_string (
       CORBA::ULong bound,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -608,7 +620,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::WstringDef_ptr create_wstring (
+  CORBA_WstringDef_ptr create_wstring (
       CORBA::ULong bound,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -617,9 +629,9 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::SequenceDef_ptr create_sequence (
+  CORBA_SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
-      CORBA::IDLType_ptr element_type,
+      CORBA_IDLType_ptr element_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -627,9 +639,9 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ArrayDef_ptr create_array (
+  CORBA_ArrayDef_ptr create_array (
       CORBA::ULong length,
-      CORBA::IDLType_ptr element_type,
+      CORBA_IDLType_ptr element_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -637,7 +649,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::FixedDef_ptr create_fixed (
+  CORBA_FixedDef_ptr create_fixed (
       CORBA::UShort digits,
       CORBA::Short scale,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -647,7 +659,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained_ptr lookup (
+  CORBA_Contained_ptr lookup (
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -656,7 +668,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * contents (
+  CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -666,7 +678,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * lookup_name (
+  CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
@@ -678,7 +690,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container::DescriptionSeq * describe_contents (
+  CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs,
@@ -689,7 +701,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ModuleDef_ptr create_module (
+  CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
       const char * version,
@@ -700,11 +712,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ConstantDef_ptr create_constant (
+  CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -713,11 +725,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::StructDef_ptr create_struct (
+  CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -725,12 +737,12 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::UnionDef_ptr create_union (
+  CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -738,11 +750,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::EnumDef_ptr create_enum (
+  CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -750,11 +762,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AliasDef_ptr create_alias (
+  CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -762,11 +774,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef_ptr create_interface (
+  CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -774,17 +786,17 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr create_value (
+  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_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -792,11 +804,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueBoxDef_ptr create_value_box (
+  CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -804,11 +816,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ExceptionDef_ptr create_exception (
+  CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -816,7 +828,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::NativeDef_ptr create_native (
+  CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
       const char * version,
@@ -827,11 +839,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -839,11 +851,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::LocalInterfaceDef_ptr create_local_interface (
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -873,26 +885,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  Repository_tie (const Repository_tie &);
-  void operator= (const Repository_tie &);
+  POA_CORBA_Repository_tie (const POA_CORBA_Repository_tie &);
+  void operator= (const POA_CORBA_Repository_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class ModuleDef;
-typedef ModuleDef *ModuleDef_ptr;
+class POA_CORBA_ModuleDef;
+typedef POA_CORBA_ModuleDef *POA_CORBA_ModuleDef_ptr;
 // Forward Classes Declaration
-class _TAO_ModuleDef_ThruPOA_Proxy_Impl;
-class _TAO_ModuleDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker;
 
-class  ModuleDef : public virtual Container, public virtual Contained
+class  POA_CORBA_ModuleDef : public virtual POA_CORBA_Container, public virtual POA_CORBA_Contained
 {
 protected:
-  ModuleDef (void);
+  POA_CORBA_ModuleDef (void);
 
 public:
-  ModuleDef (const ModuleDef& rhs);
-  virtual ~ModuleDef (void);
+  POA_CORBA_ModuleDef (const POA_CORBA_ModuleDef& rhs);
+  virtual ~POA_CORBA_ModuleDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -921,6 +932,14 @@ public:
         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,
@@ -928,7 +947,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::ModuleDef *_this (
+  ::CORBA_ModuleDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -1174,6 +1193,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -1181,15 +1202,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_ModuleDef_Strategized_Proxy_Broker : public virtual ::_TAO_ModuleDef_Proxy_Broker
+class  _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ModuleDef_Proxy_Broker
 {
 public: 
-  _TAO_ModuleDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_ModuleDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_ModuleDef_Proxy_Impl &select_proxy (
-    ::CORBA::ModuleDef *object,
+  virtual ::_TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy (
+    ::CORBA_ModuleDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -1198,7 +1219,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -1207,7 +1228,7 @@ 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.
-  ::_TAO_ModuleDef_Proxy_Impl
+  ::_TAO_CORBA_ModuleDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -1216,7 +1237,7 @@ private:
 // interface.
 
 public:
-  static _TAO_ModuleDef_Strategized_Proxy_Broker *the_TAO_ModuleDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker *the_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -1229,17 +1250,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_ModuleDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_ModuleDef_Proxy_Impl,
+class  _TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_ModuleDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl, 
-  public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_ModuleDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ModuleDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl (void) { }
   
   };
 
@@ -1248,22 +1269,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  ModuleDef_tie : public ModuleDef
+class  POA_CORBA_ModuleDef_tie : public POA_CORBA_ModuleDef
 {
 public:
-  ModuleDef_tie (T &t);
+  POA_CORBA_ModuleDef_tie (T &t);
   // the T& ctor
-  ModuleDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_ModuleDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  ModuleDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_ModuleDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  ModuleDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_ModuleDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~ModuleDef_tie (void);
+  ~POA_CORBA_ModuleDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -1283,7 +1302,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  CORBA::Contained_ptr lookup (
+  CORBA_Contained_ptr lookup (
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -1292,7 +1311,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * contents (
+  CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -1302,7 +1321,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * lookup_name (
+  CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
@@ -1314,7 +1333,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container::DescriptionSeq * describe_contents (
+  CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs,
@@ -1325,7 +1344,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ModuleDef_ptr create_module (
+  CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
       const char * version,
@@ -1336,11 +1355,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ConstantDef_ptr create_constant (
+  CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -1349,11 +1368,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::StructDef_ptr create_struct (
+  CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1361,12 +1380,12 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::UnionDef_ptr create_union (
+  CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1374,11 +1393,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::EnumDef_ptr create_enum (
+  CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1386,11 +1405,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AliasDef_ptr create_alias (
+  CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1398,11 +1417,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef_ptr create_interface (
+  CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1410,17 +1429,17 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr create_value (
+  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_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1428,11 +1447,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueBoxDef_ptr create_value_box (
+  CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1440,11 +1459,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ExceptionDef_ptr create_exception (
+  CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1452,7 +1471,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::NativeDef_ptr create_native (
+  CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
       const char * version,
@@ -1463,11 +1482,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1475,11 +1494,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::LocalInterfaceDef_ptr create_local_interface (
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1538,7 +1557,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1554,7 +1573,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1562,7 +1581,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1571,7 +1590,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -1603,26 +1622,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  ModuleDef_tie (const ModuleDef_tie &);
-  void operator= (const ModuleDef_tie &);
+  POA_CORBA_ModuleDef_tie (const POA_CORBA_ModuleDef_tie &);
+  void operator= (const POA_CORBA_ModuleDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class ConstantDef;
-typedef ConstantDef *ConstantDef_ptr;
+class POA_CORBA_ConstantDef;
+typedef POA_CORBA_ConstantDef *POA_CORBA_ConstantDef_ptr;
 // Forward Classes Declaration
-class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
-class _TAO_ConstantDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker;
 
-class  ConstantDef : public virtual Contained
+class  POA_CORBA_ConstantDef : public virtual POA_CORBA_Contained
 {
 protected:
-  ConstantDef (void);
+  POA_CORBA_ConstantDef (void);
 
 public:
-  ConstantDef (const ConstantDef& rhs);
-  virtual ~ConstantDef (void);
+  POA_CORBA_ConstantDef (const POA_CORBA_ConstantDef& rhs);
+  virtual ~POA_CORBA_ConstantDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -1651,6 +1669,14 @@ public:
         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,
@@ -1658,7 +1684,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::ConstantDef *_this (
+  ::CORBA_ConstantDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -1681,7 +1707,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::IDLType_ptr type_def (
+  virtual CORBA_IDLType_ptr type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1698,7 +1724,7 @@ public:
     );
 
   virtual void type_def (
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1850,6 +1876,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -1857,15 +1885,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_ConstantDef_Strategized_Proxy_Broker : public virtual ::_TAO_ConstantDef_Proxy_Broker
+class  _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ConstantDef_Proxy_Broker
 {
 public: 
-  _TAO_ConstantDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_ConstantDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_ConstantDef_Proxy_Impl &select_proxy (
-    ::CORBA::ConstantDef *object,
+  virtual ::_TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy (
+    ::CORBA_ConstantDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -1874,7 +1902,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -1883,7 +1911,7 @@ 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.
-  ::_TAO_ConstantDef_Proxy_Impl
+  ::_TAO_CORBA_ConstantDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -1892,7 +1920,7 @@ private:
 // interface.
 
 public:
-  static _TAO_ConstantDef_Strategized_Proxy_Broker *the_TAO_ConstantDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker *the_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -1905,16 +1933,16 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_ConstantDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_ConstantDef_Proxy_Impl,
+class  _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_ConstantDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_ConstantDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ConstantDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
@@ -1924,7 +1952,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr type_def (
+  virtual CORBA_IDLType_ptr type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1934,7 +1962,7 @@ public:
 
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -1965,22 +1993,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  ConstantDef_tie : public ConstantDef
+class  POA_CORBA_ConstantDef_tie : public POA_CORBA_ConstantDef
 {
 public:
-  ConstantDef_tie (T &t);
+  POA_CORBA_ConstantDef_tie (T &t);
   // the T& ctor
-  ConstantDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_ConstantDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  ConstantDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_ConstantDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  ConstantDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_ConstantDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~ConstantDef_tie (void);
+  ~POA_CORBA_ConstantDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -2008,7 +2034,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::IDLType_ptr type_def (
+  CORBA_IDLType_ptr type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2017,7 +2043,7 @@ public:
     ));
 
   void type_def (
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2093,7 +2119,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2109,7 +2135,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2117,7 +2143,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2126,7 +2152,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -2158,26 +2184,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  ConstantDef_tie (const ConstantDef_tie &);
-  void operator= (const ConstantDef_tie &);
+  POA_CORBA_ConstantDef_tie (const POA_CORBA_ConstantDef_tie &);
+  void operator= (const POA_CORBA_ConstantDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class StructDef;
-typedef StructDef *StructDef_ptr;
+class POA_CORBA_StructDef;
+typedef POA_CORBA_StructDef *POA_CORBA_StructDef_ptr;
 // Forward Classes Declaration
-class _TAO_StructDef_ThruPOA_Proxy_Impl;
-class _TAO_StructDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_StructDef_Strategized_Proxy_Broker;
 
-class  StructDef : public virtual TypedefDef, public virtual Container
+class  POA_CORBA_StructDef : public virtual POA_CORBA_TypedefDef, public virtual POA_CORBA_Container
 {
 protected:
-  StructDef (void);
+  POA_CORBA_StructDef (void);
 
 public:
-  StructDef (const StructDef& rhs);
-  virtual ~StructDef (void);
+  POA_CORBA_StructDef (const POA_CORBA_StructDef& rhs);
+  virtual ~POA_CORBA_StructDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -2206,6 +2231,14 @@ public:
         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,
@@ -2213,14 +2246,14 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::StructDef *_this (
+  ::CORBA_StructDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
-  virtual CORBA::StructMemberSeq * members (
+  virtual CORBA_StructMemberSeq * members (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2237,7 +2270,7 @@ public:
     );
 
   virtual void members (
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2500,6 +2533,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -2507,15 +2542,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_StructDef_Strategized_Proxy_Broker : public virtual ::_TAO_StructDef_Proxy_Broker
+class  _TAO_CORBA_StructDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_StructDef_Proxy_Broker
 {
 public: 
-  _TAO_StructDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_StructDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_StructDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_StructDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_StructDef_Proxy_Impl &select_proxy (
-    ::CORBA::StructDef *object,
+  virtual ::_TAO_CORBA_StructDef_Proxy_Impl &select_proxy (
+    ::CORBA_StructDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -2524,7 +2559,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -2533,7 +2568,7 @@ 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.
-  ::_TAO_StructDef_Proxy_Impl
+  ::_TAO_CORBA_StructDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -2542,7 +2577,7 @@ private:
 // interface.
 
 public:
-  static _TAO_StructDef_Strategized_Proxy_Broker *the_TAO_StructDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_StructDef_Strategized_Proxy_Broker *the_TAO_CORBA_StructDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -2555,19 +2590,19 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_StructDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_StructDef_Proxy_Impl,
+class  _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_StructDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl, 
-  public virtual ::POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_StructDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_StructDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_StructDef_ThruPOA_Proxy_Impl (void) { }
   
-    virtual CORBA::StructMemberSeq * members (
+    virtual CORBA_StructMemberSeq * members (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -2577,7 +2612,7 @@ public:
 
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -2591,22 +2626,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  StructDef_tie : public StructDef
+class  POA_CORBA_StructDef_tie : public POA_CORBA_StructDef
 {
 public:
-  StructDef_tie (T &t);
+  POA_CORBA_StructDef_tie (T &t);
   // the T& ctor
-  StructDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_StructDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  StructDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_StructDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  StructDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_StructDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~StructDef_tie (void);
+  ~POA_CORBA_StructDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -2626,7 +2659,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  CORBA::StructMemberSeq * members (
+  CORBA_StructMemberSeq * members (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2635,7 +2668,7 @@ public:
     ));
 
   void members (
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2643,7 +2676,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained_ptr lookup (
+  CORBA_Contained_ptr lookup (
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -2652,7 +2685,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * contents (
+  CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -2662,7 +2695,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * lookup_name (
+  CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
@@ -2674,7 +2707,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container::DescriptionSeq * describe_contents (
+  CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs,
@@ -2685,7 +2718,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ModuleDef_ptr create_module (
+  CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
       const char * version,
@@ -2696,11 +2729,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ConstantDef_ptr create_constant (
+  CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -2709,11 +2742,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::StructDef_ptr create_struct (
+  CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2721,12 +2754,12 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::UnionDef_ptr create_union (
+  CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2734,11 +2767,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::EnumDef_ptr create_enum (
+  CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2746,11 +2779,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AliasDef_ptr create_alias (
+  CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2758,11 +2791,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef_ptr create_interface (
+  CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2770,17 +2803,17 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr create_value (
+  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_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2788,11 +2821,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueBoxDef_ptr create_value_box (
+  CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2800,11 +2833,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ExceptionDef_ptr create_exception (
+  CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2812,7 +2845,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::NativeDef_ptr create_native (
+  CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
       const char * version,
@@ -2823,11 +2856,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2835,11 +2868,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::LocalInterfaceDef_ptr create_local_interface (
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2898,7 +2931,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2914,7 +2947,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2922,7 +2955,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2931,7 +2964,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -2971,26 +3004,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  StructDef_tie (const StructDef_tie &);
-  void operator= (const StructDef_tie &);
+  POA_CORBA_StructDef_tie (const POA_CORBA_StructDef_tie &);
+  void operator= (const POA_CORBA_StructDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class UnionDef;
-typedef UnionDef *UnionDef_ptr;
+class POA_CORBA_UnionDef;
+typedef POA_CORBA_UnionDef *POA_CORBA_UnionDef_ptr;
 // Forward Classes Declaration
-class _TAO_UnionDef_ThruPOA_Proxy_Impl;
-class _TAO_UnionDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_UnionDef_Strategized_Proxy_Broker;
 
-class  UnionDef : public virtual TypedefDef, public virtual Container
+class  POA_CORBA_UnionDef : public virtual POA_CORBA_TypedefDef, public virtual POA_CORBA_Container
 {
 protected:
-  UnionDef (void);
+  POA_CORBA_UnionDef (void);
 
 public:
-  UnionDef (const UnionDef& rhs);
-  virtual ~UnionDef (void);
+  POA_CORBA_UnionDef (const POA_CORBA_UnionDef& rhs);
+  virtual ~POA_CORBA_UnionDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -3019,6 +3051,14 @@ public:
         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,
@@ -3026,7 +3066,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::UnionDef *_this (
+  ::CORBA_UnionDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -3049,7 +3089,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::IDLType_ptr discriminator_type_def (
+  virtual CORBA_IDLType_ptr discriminator_type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3066,7 +3106,7 @@ public:
     );
 
   virtual void discriminator_type_def (
-      CORBA::IDLType_ptr discriminator_type_def,
+      CORBA_IDLType_ptr discriminator_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3082,7 +3122,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::UnionMemberSeq * members (
+  virtual CORBA_UnionMemberSeq * members (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3099,7 +3139,7 @@ public:
     );
 
   virtual void members (
-      const CORBA::UnionMemberSeq & members,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3362,6 +3402,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -3369,15 +3411,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_UnionDef_Strategized_Proxy_Broker : public virtual ::_TAO_UnionDef_Proxy_Broker
+class  _TAO_CORBA_UnionDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_UnionDef_Proxy_Broker
 {
 public: 
-  _TAO_UnionDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_UnionDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_UnionDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_UnionDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_UnionDef_Proxy_Impl &select_proxy (
-    ::CORBA::UnionDef *object,
+  virtual ::_TAO_CORBA_UnionDef_Proxy_Impl &select_proxy (
+    ::CORBA_UnionDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -3386,7 +3428,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -3395,7 +3437,7 @@ 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.
-  ::_TAO_UnionDef_Proxy_Impl
+  ::_TAO_CORBA_UnionDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -3404,7 +3446,7 @@ private:
 // interface.
 
 public:
-  static _TAO_UnionDef_Strategized_Proxy_Broker *the_TAO_UnionDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_UnionDef_Strategized_Proxy_Broker *the_TAO_CORBA_UnionDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -3417,17 +3459,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_UnionDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_UnionDef_Proxy_Impl,
+class  _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_UnionDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl, 
-  public virtual ::POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_UnionDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_UnionDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr discriminator_type (
       CORBA_Object *_collocated_tao_target_,
@@ -3437,7 +3479,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr discriminator_type_def (
+  virtual CORBA_IDLType_ptr discriminator_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -3447,14 +3489,14 @@ public:
 
   virtual void discriminator_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr discriminator_type_def,
+      CORBA_IDLType_ptr discriminator_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::UnionMemberSeq * members (
+  virtual CORBA_UnionMemberSeq * members (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -3464,7 +3506,7 @@ public:
 
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::UnionMemberSeq & members,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -3478,22 +3520,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  UnionDef_tie : public UnionDef
+class  POA_CORBA_UnionDef_tie : public POA_CORBA_UnionDef
 {
 public:
-  UnionDef_tie (T &t);
+  POA_CORBA_UnionDef_tie (T &t);
   // the T& ctor
-  UnionDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_UnionDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  UnionDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_UnionDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  UnionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_UnionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~UnionDef_tie (void);
+  ~POA_CORBA_UnionDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -3521,7 +3561,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::IDLType_ptr discriminator_type_def (
+  CORBA_IDLType_ptr discriminator_type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3530,7 +3570,7 @@ public:
     ));
 
   void discriminator_type_def (
-      CORBA::IDLType_ptr discriminator_type_def,
+      CORBA_IDLType_ptr discriminator_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3538,7 +3578,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::UnionMemberSeq * members (
+  CORBA_UnionMemberSeq * members (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3547,7 +3587,7 @@ public:
     ));
 
   void members (
-      const CORBA::UnionMemberSeq & members,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3555,7 +3595,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained_ptr lookup (
+  CORBA_Contained_ptr lookup (
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -3564,7 +3604,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * contents (
+  CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -3574,7 +3614,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * lookup_name (
+  CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
@@ -3586,7 +3626,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container::DescriptionSeq * describe_contents (
+  CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs,
@@ -3597,7 +3637,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ModuleDef_ptr create_module (
+  CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
       const char * version,
@@ -3608,11 +3648,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ConstantDef_ptr create_constant (
+  CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -3621,11 +3661,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::StructDef_ptr create_struct (
+  CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3633,12 +3673,12 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::UnionDef_ptr create_union (
+  CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3646,11 +3686,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::EnumDef_ptr create_enum (
+  CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3658,11 +3698,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AliasDef_ptr create_alias (
+  CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3670,11 +3710,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef_ptr create_interface (
+  CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3682,17 +3722,17 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr create_value (
+  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_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3700,11 +3740,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueBoxDef_ptr create_value_box (
+  CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3712,11 +3752,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ExceptionDef_ptr create_exception (
+  CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3724,7 +3764,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::NativeDef_ptr create_native (
+  CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
       const char * version,
@@ -3735,11 +3775,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3747,11 +3787,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::LocalInterfaceDef_ptr create_local_interface (
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3810,7 +3850,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3826,7 +3866,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3834,7 +3874,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3843,7 +3883,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -3883,26 +3923,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  UnionDef_tie (const UnionDef_tie &);
-  void operator= (const UnionDef_tie &);
+  POA_CORBA_UnionDef_tie (const POA_CORBA_UnionDef_tie &);
+  void operator= (const POA_CORBA_UnionDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class EnumDef;
-typedef EnumDef *EnumDef_ptr;
+class POA_CORBA_EnumDef;
+typedef POA_CORBA_EnumDef *POA_CORBA_EnumDef_ptr;
 // Forward Classes Declaration
-class _TAO_EnumDef_ThruPOA_Proxy_Impl;
-class _TAO_EnumDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_EnumDef_Strategized_Proxy_Broker;
 
-class  EnumDef : public virtual TypedefDef
+class  POA_CORBA_EnumDef : public virtual POA_CORBA_TypedefDef
 {
 protected:
-  EnumDef (void);
+  POA_CORBA_EnumDef (void);
 
 public:
-  EnumDef (const EnumDef& rhs);
-  virtual ~EnumDef (void);
+  POA_CORBA_EnumDef (const POA_CORBA_EnumDef& rhs);
+  virtual ~POA_CORBA_EnumDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -3931,6 +3970,14 @@ public:
         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,
@@ -3938,14 +3985,14 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::EnumDef *_this (
+  ::CORBA_EnumDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
-  virtual CORBA::EnumMemberSeq * members (
+  virtual CORBA_EnumMemberSeq * members (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3962,7 +4009,7 @@ public:
     );
 
   virtual void members (
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4089,6 +4136,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -4096,15 +4145,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_EnumDef_Strategized_Proxy_Broker : public virtual ::_TAO_EnumDef_Proxy_Broker
+class  _TAO_CORBA_EnumDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_EnumDef_Proxy_Broker
 {
 public: 
-  _TAO_EnumDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_EnumDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_EnumDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_EnumDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_EnumDef_Proxy_Impl &select_proxy (
-    ::CORBA::EnumDef *object,
+  virtual ::_TAO_CORBA_EnumDef_Proxy_Impl &select_proxy (
+    ::CORBA_EnumDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -4113,7 +4162,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -4122,7 +4171,7 @@ 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.
-  ::_TAO_EnumDef_Proxy_Impl
+  ::_TAO_CORBA_EnumDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -4131,7 +4180,7 @@ private:
 // interface.
 
 public:
-  static _TAO_EnumDef_Strategized_Proxy_Broker *the_TAO_EnumDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_EnumDef_Strategized_Proxy_Broker *the_TAO_CORBA_EnumDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -4144,18 +4193,18 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_EnumDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_EnumDef_Proxy_Impl,
+class  _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_EnumDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_EnumDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_EnumDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl (void) { }
   
-    virtual CORBA::EnumMemberSeq * members (
+    virtual CORBA_EnumMemberSeq * members (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -4165,7 +4214,7 @@ public:
 
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -4179,22 +4228,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  EnumDef_tie : public EnumDef
+class  POA_CORBA_EnumDef_tie : public POA_CORBA_EnumDef
 {
 public:
-  EnumDef_tie (T &t);
+  POA_CORBA_EnumDef_tie (T &t);
   // the T& ctor
-  EnumDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_EnumDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  EnumDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_EnumDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  EnumDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_EnumDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~EnumDef_tie (void);
+  ~POA_CORBA_EnumDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -4214,7 +4261,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  CORBA::EnumMemberSeq * members (
+  CORBA_EnumMemberSeq * members (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4223,7 +4270,7 @@ public:
     ));
 
   void members (
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4282,7 +4329,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4298,7 +4345,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4306,7 +4353,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4315,7 +4362,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -4355,26 +4402,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  EnumDef_tie (const EnumDef_tie &);
-  void operator= (const EnumDef_tie &);
+  POA_CORBA_EnumDef_tie (const POA_CORBA_EnumDef_tie &);
+  void operator= (const POA_CORBA_EnumDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class AliasDef;
-typedef AliasDef *AliasDef_ptr;
+class POA_CORBA_AliasDef;
+typedef POA_CORBA_AliasDef *POA_CORBA_AliasDef_ptr;
 // Forward Classes Declaration
-class _TAO_AliasDef_ThruPOA_Proxy_Impl;
-class _TAO_AliasDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_AliasDef_Strategized_Proxy_Broker;
 
-class  AliasDef : public virtual TypedefDef
+class  POA_CORBA_AliasDef : public virtual POA_CORBA_TypedefDef
 {
 protected:
-  AliasDef (void);
+  POA_CORBA_AliasDef (void);
 
 public:
-  AliasDef (const AliasDef& rhs);
-  virtual ~AliasDef (void);
+  POA_CORBA_AliasDef (const POA_CORBA_AliasDef& rhs);
+  virtual ~POA_CORBA_AliasDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -4403,6 +4449,14 @@ public:
         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,
@@ -4410,14 +4464,14 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::AliasDef *_this (
+  ::CORBA_AliasDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
-  virtual CORBA::IDLType_ptr original_type_def (
+  virtual CORBA_IDLType_ptr original_type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4434,7 +4488,7 @@ public:
     );
 
   virtual void original_type_def (
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4561,6 +4615,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -4568,15 +4624,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_AliasDef_Strategized_Proxy_Broker : public virtual ::_TAO_AliasDef_Proxy_Broker
+class  _TAO_CORBA_AliasDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_AliasDef_Proxy_Broker
 {
 public: 
-  _TAO_AliasDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_AliasDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_AliasDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_AliasDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_AliasDef_Proxy_Impl &select_proxy (
-    ::CORBA::AliasDef *object,
+  virtual ::_TAO_CORBA_AliasDef_Proxy_Impl &select_proxy (
+    ::CORBA_AliasDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -4585,7 +4641,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -4594,7 +4650,7 @@ 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.
-  ::_TAO_AliasDef_Proxy_Impl
+  ::_TAO_CORBA_AliasDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -4603,7 +4659,7 @@ private:
 // interface.
 
 public:
-  static _TAO_AliasDef_Strategized_Proxy_Broker *the_TAO_AliasDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_AliasDef_Strategized_Proxy_Broker *the_TAO_CORBA_AliasDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -4616,18 +4672,18 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_AliasDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_AliasDef_Proxy_Impl,
+class  _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_AliasDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_AliasDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_AliasDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl (void) { }
   
-    virtual CORBA::IDLType_ptr original_type_def (
+    virtual CORBA_IDLType_ptr original_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -4637,7 +4693,7 @@ public:
 
   virtual void original_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -4651,22 +4707,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  AliasDef_tie : public AliasDef
+class  POA_CORBA_AliasDef_tie : public POA_CORBA_AliasDef
 {
 public:
-  AliasDef_tie (T &t);
+  POA_CORBA_AliasDef_tie (T &t);
   // the T& ctor
-  AliasDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_AliasDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  AliasDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_AliasDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  AliasDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_AliasDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~AliasDef_tie (void);
+  ~POA_CORBA_AliasDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -4686,7 +4740,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  CORBA::IDLType_ptr original_type_def (
+  CORBA_IDLType_ptr original_type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4695,7 +4749,7 @@ public:
     ));
 
   void original_type_def (
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4754,7 +4808,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4770,7 +4824,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4778,7 +4832,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4787,7 +4841,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -4827,26 +4881,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  AliasDef_tie (const AliasDef_tie &);
-  void operator= (const AliasDef_tie &);
+  POA_CORBA_AliasDef_tie (const POA_CORBA_AliasDef_tie &);
+  void operator= (const POA_CORBA_AliasDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class NativeDef;
-typedef NativeDef *NativeDef_ptr;
+class POA_CORBA_NativeDef;
+typedef POA_CORBA_NativeDef *POA_CORBA_NativeDef_ptr;
 // Forward Classes Declaration
-class _TAO_NativeDef_ThruPOA_Proxy_Impl;
-class _TAO_NativeDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_NativeDef_Strategized_Proxy_Broker;
 
-class  NativeDef : public virtual TypedefDef
+class  POA_CORBA_NativeDef : public virtual POA_CORBA_TypedefDef
 {
 protected:
-  NativeDef (void);
+  POA_CORBA_NativeDef (void);
 
 public:
-  NativeDef (const NativeDef& rhs);
-  virtual ~NativeDef (void);
+  POA_CORBA_NativeDef (const POA_CORBA_NativeDef& rhs);
+  virtual ~POA_CORBA_NativeDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -4875,6 +4928,14 @@ public:
         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,
@@ -4882,7 +4943,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::NativeDef *_this (
+  ::CORBA_NativeDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -5000,6 +5061,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -5007,15 +5070,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_NativeDef_Strategized_Proxy_Broker : public virtual ::_TAO_NativeDef_Proxy_Broker
+class  _TAO_CORBA_NativeDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_NativeDef_Proxy_Broker
 {
 public: 
-  _TAO_NativeDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_NativeDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_NativeDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_NativeDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_NativeDef_Proxy_Impl &select_proxy (
-    ::CORBA::NativeDef *object,
+  virtual ::_TAO_CORBA_NativeDef_Proxy_Impl &select_proxy (
+    ::CORBA_NativeDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -5024,7 +5087,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -5033,7 +5096,7 @@ 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.
-  ::_TAO_NativeDef_Proxy_Impl
+  ::_TAO_CORBA_NativeDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -5042,7 +5105,7 @@ private:
 // interface.
 
 public:
-  static _TAO_NativeDef_Strategized_Proxy_Broker *the_TAO_NativeDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_NativeDef_Strategized_Proxy_Broker *the_TAO_CORBA_NativeDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -5055,16 +5118,16 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_NativeDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_NativeDef_Proxy_Impl,
+class  _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_NativeDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_NativeDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_NativeDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl (void) { }
   
   };
 
@@ -5073,22 +5136,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  NativeDef_tie : public NativeDef
+class  POA_CORBA_NativeDef_tie : public POA_CORBA_NativeDef
 {
 public:
-  NativeDef_tie (T &t);
+  POA_CORBA_NativeDef_tie (T &t);
   // the T& ctor
-  NativeDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_NativeDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  NativeDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_NativeDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  NativeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_NativeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~NativeDef_tie (void);
+  ~POA_CORBA_NativeDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -5159,7 +5220,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5175,7 +5236,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5183,7 +5244,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5192,7 +5253,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -5232,26 +5293,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  NativeDef_tie (const NativeDef_tie &);
-  void operator= (const NativeDef_tie &);
+  POA_CORBA_NativeDef_tie (const POA_CORBA_NativeDef_tie &);
+  void operator= (const POA_CORBA_NativeDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class PrimitiveDef;
-typedef PrimitiveDef *PrimitiveDef_ptr;
+class POA_CORBA_PrimitiveDef;
+typedef POA_CORBA_PrimitiveDef *POA_CORBA_PrimitiveDef_ptr;
 // Forward Classes Declaration
-class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
-class _TAO_PrimitiveDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker;
 
-class  PrimitiveDef : public virtual IDLType
+class  POA_CORBA_PrimitiveDef : public virtual POA_CORBA_IDLType
 {
 protected:
-  PrimitiveDef (void);
+  POA_CORBA_PrimitiveDef (void);
 
 public:
-  PrimitiveDef (const PrimitiveDef& rhs);
-  virtual ~PrimitiveDef (void);
+  POA_CORBA_PrimitiveDef (const POA_CORBA_PrimitiveDef& rhs);
+  virtual ~POA_CORBA_PrimitiveDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -5280,6 +5340,14 @@ public:
         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,
@@ -5287,7 +5355,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::PrimitiveDef *_this (
+  ::CORBA_PrimitiveDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -5333,6 +5401,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -5340,15 +5410,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_PrimitiveDef_Strategized_Proxy_Broker : public virtual ::_TAO_PrimitiveDef_Proxy_Broker
+class  _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_PrimitiveDef_Proxy_Broker
 {
 public: 
-  _TAO_PrimitiveDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_PrimitiveDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_PrimitiveDef_Proxy_Impl &select_proxy (
-    ::CORBA::PrimitiveDef *object,
+  virtual ::_TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy (
+    ::CORBA_PrimitiveDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -5357,7 +5427,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -5366,7 +5436,7 @@ 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.
-  ::_TAO_PrimitiveDef_Proxy_Impl
+  ::_TAO_CORBA_PrimitiveDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -5375,7 +5445,7 @@ private:
 // interface.
 
 public:
-  static _TAO_PrimitiveDef_Strategized_Proxy_Broker *the_TAO_PrimitiveDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker *the_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -5388,16 +5458,16 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_PrimitiveDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_PrimitiveDef_Proxy_Impl,
+class  _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_PrimitiveDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl (void) { }
   
     virtual CORBA::PrimitiveKind kind (
       CORBA_Object *_collocated_tao_target_,
@@ -5414,22 +5484,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  PrimitiveDef_tie : public PrimitiveDef
+class  POA_CORBA_PrimitiveDef_tie : public POA_CORBA_PrimitiveDef
 {
 public:
-  PrimitiveDef_tie (T &t);
+  POA_CORBA_PrimitiveDef_tie (T &t);
   // the T& ctor
-  PrimitiveDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_PrimitiveDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  PrimitiveDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_PrimitiveDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  PrimitiveDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_PrimitiveDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~PrimitiveDef_tie (void);
+  ~POA_CORBA_PrimitiveDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -5487,26 +5555,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  PrimitiveDef_tie (const PrimitiveDef_tie &);
-  void operator= (const PrimitiveDef_tie &);
+  POA_CORBA_PrimitiveDef_tie (const POA_CORBA_PrimitiveDef_tie &);
+  void operator= (const POA_CORBA_PrimitiveDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class StringDef;
-typedef StringDef *StringDef_ptr;
+class POA_CORBA_StringDef;
+typedef POA_CORBA_StringDef *POA_CORBA_StringDef_ptr;
 // Forward Classes Declaration
-class _TAO_StringDef_ThruPOA_Proxy_Impl;
-class _TAO_StringDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_StringDef_Strategized_Proxy_Broker;
 
-class  StringDef : public virtual IDLType
+class  POA_CORBA_StringDef : public virtual POA_CORBA_IDLType
 {
 protected:
-  StringDef (void);
+  POA_CORBA_StringDef (void);
 
 public:
-  StringDef (const StringDef& rhs);
-  virtual ~StringDef (void);
+  POA_CORBA_StringDef (const POA_CORBA_StringDef& rhs);
+  virtual ~POA_CORBA_StringDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -5535,6 +5602,14 @@ public:
         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,
@@ -5542,7 +5617,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::StringDef *_this (
+  ::CORBA_StringDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -5605,6 +5680,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -5612,15 +5689,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_StringDef_Strategized_Proxy_Broker : public virtual ::_TAO_StringDef_Proxy_Broker
+class  _TAO_CORBA_StringDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_StringDef_Proxy_Broker
 {
 public: 
-  _TAO_StringDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_StringDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_StringDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_StringDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_StringDef_Proxy_Impl &select_proxy (
-    ::CORBA::StringDef *object,
+  virtual ::_TAO_CORBA_StringDef_Proxy_Impl &select_proxy (
+    ::CORBA_StringDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -5629,7 +5706,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -5638,7 +5715,7 @@ 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.
-  ::_TAO_StringDef_Proxy_Impl
+  ::_TAO_CORBA_StringDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -5647,7 +5724,7 @@ private:
 // interface.
 
 public:
-  static _TAO_StringDef_Strategized_Proxy_Broker *the_TAO_StringDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_StringDef_Strategized_Proxy_Broker *the_TAO_CORBA_StringDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -5660,16 +5737,16 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_StringDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_StringDef_Proxy_Impl,
+class  _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_StringDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_StringDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_StringDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_StringDef_ThruPOA_Proxy_Impl (void) { }
   
     virtual CORBA::ULong bound (
       CORBA_Object *_collocated_tao_target_,
@@ -5695,22 +5772,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  StringDef_tie : public StringDef
+class  POA_CORBA_StringDef_tie : public POA_CORBA_StringDef
 {
 public:
-  StringDef_tie (T &t);
+  POA_CORBA_StringDef_tie (T &t);
   // the T& ctor
-  StringDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_StringDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  StringDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_StringDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  StringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_StringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~StringDef_tie (void);
+  ~POA_CORBA_StringDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -5777,26 +5852,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  StringDef_tie (const StringDef_tie &);
-  void operator= (const StringDef_tie &);
+  POA_CORBA_StringDef_tie (const POA_CORBA_StringDef_tie &);
+  void operator= (const POA_CORBA_StringDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class WstringDef;
-typedef WstringDef *WstringDef_ptr;
+class POA_CORBA_WstringDef;
+typedef POA_CORBA_WstringDef *POA_CORBA_WstringDef_ptr;
 // Forward Classes Declaration
-class _TAO_WstringDef_ThruPOA_Proxy_Impl;
-class _TAO_WstringDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_WstringDef_Strategized_Proxy_Broker;
 
-class  WstringDef : public virtual IDLType
+class  POA_CORBA_WstringDef : public virtual POA_CORBA_IDLType
 {
 protected:
-  WstringDef (void);
+  POA_CORBA_WstringDef (void);
 
 public:
-  WstringDef (const WstringDef& rhs);
-  virtual ~WstringDef (void);
+  POA_CORBA_WstringDef (const POA_CORBA_WstringDef& rhs);
+  virtual ~POA_CORBA_WstringDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -5825,6 +5899,14 @@ public:
         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,
@@ -5832,7 +5914,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::WstringDef *_this (
+  ::CORBA_WstringDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -5895,6 +5977,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -5902,15 +5986,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_WstringDef_Strategized_Proxy_Broker : public virtual ::_TAO_WstringDef_Proxy_Broker
+class  _TAO_CORBA_WstringDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_WstringDef_Proxy_Broker
 {
 public: 
-  _TAO_WstringDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_WstringDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_WstringDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_WstringDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_WstringDef_Proxy_Impl &select_proxy (
-    ::CORBA::WstringDef *object,
+  virtual ::_TAO_CORBA_WstringDef_Proxy_Impl &select_proxy (
+    ::CORBA_WstringDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -5919,7 +6003,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -5928,7 +6012,7 @@ 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.
-  ::_TAO_WstringDef_Proxy_Impl
+  ::_TAO_CORBA_WstringDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -5937,7 +6021,7 @@ private:
 // interface.
 
 public:
-  static _TAO_WstringDef_Strategized_Proxy_Broker *the_TAO_WstringDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_WstringDef_Strategized_Proxy_Broker *the_TAO_CORBA_WstringDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -5950,16 +6034,16 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_WstringDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_WstringDef_Proxy_Impl,
+class  _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_WstringDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_WstringDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_WstringDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl (void) { }
   
     virtual CORBA::ULong bound (
       CORBA_Object *_collocated_tao_target_,
@@ -5985,22 +6069,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  WstringDef_tie : public WstringDef
+class  POA_CORBA_WstringDef_tie : public POA_CORBA_WstringDef
 {
 public:
-  WstringDef_tie (T &t);
+  POA_CORBA_WstringDef_tie (T &t);
   // the T& ctor
-  WstringDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_WstringDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  WstringDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_WstringDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  WstringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_WstringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~WstringDef_tie (void);
+  ~POA_CORBA_WstringDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -6067,26 +6149,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  WstringDef_tie (const WstringDef_tie &);
-  void operator= (const WstringDef_tie &);
+  POA_CORBA_WstringDef_tie (const POA_CORBA_WstringDef_tie &);
+  void operator= (const POA_CORBA_WstringDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class SequenceDef;
-typedef SequenceDef *SequenceDef_ptr;
+class POA_CORBA_SequenceDef;
+typedef POA_CORBA_SequenceDef *POA_CORBA_SequenceDef_ptr;
 // Forward Classes Declaration
-class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
-class _TAO_SequenceDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker;
 
-class  SequenceDef : public virtual IDLType
+class  POA_CORBA_SequenceDef :  public virtual POA_CORBA_IDLType
 {
 protected:
-  SequenceDef (void);
+  POA_CORBA_SequenceDef (void);
 
 public:
-  SequenceDef (const SequenceDef& rhs);
-  virtual ~SequenceDef (void);
+  POA_CORBA_SequenceDef (const POA_CORBA_SequenceDef& rhs);
+  virtual ~POA_CORBA_SequenceDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -6115,6 +6196,14 @@ public:
         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,
@@ -6122,7 +6211,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::SequenceDef *_this (
+  ::CORBA_SequenceDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -6178,7 +6267,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::IDLType_ptr element_type_def (
+  virtual CORBA_IDLType_ptr element_type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6195,7 +6284,7 @@ public:
     );
 
   virtual void element_type_def (
-      CORBA::IDLType_ptr element_type_def,
+      CORBA_IDLType_ptr element_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6234,6 +6323,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -6241,15 +6332,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_SequenceDef_Strategized_Proxy_Broker : public virtual ::_TAO_SequenceDef_Proxy_Broker
+class  _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_SequenceDef_Proxy_Broker
 {
 public: 
-  _TAO_SequenceDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_SequenceDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_SequenceDef_Proxy_Impl &select_proxy (
-    ::CORBA::SequenceDef *object,
+  virtual ::_TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy (
+    ::CORBA_SequenceDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -6258,7 +6349,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -6267,7 +6358,7 @@ 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.
-  ::_TAO_SequenceDef_Proxy_Impl
+  ::_TAO_CORBA_SequenceDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -6276,7 +6367,7 @@ private:
 // interface.
 
 public:
-  static _TAO_SequenceDef_Strategized_Proxy_Broker *the_TAO_SequenceDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker *the_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -6289,16 +6380,16 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_SequenceDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_SequenceDef_Proxy_Impl,
+class  _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_SequenceDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
-  
+  public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
+
 {
 public:
-  _TAO_SequenceDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_SequenceDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl (void) { }
   
     virtual CORBA::ULong bound (
       CORBA_Object *_collocated_tao_target_,
@@ -6325,7 +6416,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr element_type_def (
+  virtual CORBA_IDLType_ptr element_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -6335,7 +6426,7 @@ public:
 
   virtual void element_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr element_type_def,
+      CORBA_IDLType_ptr element_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -6349,22 +6440,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  SequenceDef_tie : public SequenceDef
+class  POA_CORBA_SequenceDef_tie : public POA_CORBA_SequenceDef
 {
 public:
-  SequenceDef_tie (T &t);
+  POA_CORBA_SequenceDef_tie (T &t);
   // the T& ctor
-  SequenceDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_SequenceDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  SequenceDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_SequenceDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  SequenceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_SequenceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~SequenceDef_tie (void);
+  ~POA_CORBA_SequenceDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -6409,7 +6498,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::IDLType_ptr element_type_def (
+  CORBA_IDLType_ptr element_type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6418,7 +6507,7 @@ public:
     ));
 
   void element_type_def (
-      CORBA::IDLType_ptr element_type_def,
+      CORBA_IDLType_ptr element_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6456,26 +6545,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  SequenceDef_tie (const SequenceDef_tie &);
-  void operator= (const SequenceDef_tie &);
+  POA_CORBA_SequenceDef_tie (const POA_CORBA_SequenceDef_tie &);
+  void operator= (const POA_CORBA_SequenceDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class ArrayDef;
-typedef ArrayDef *ArrayDef_ptr;
+class POA_CORBA_ArrayDef;
+typedef POA_CORBA_ArrayDef *POA_CORBA_ArrayDef_ptr;
 // Forward Classes Declaration
-class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
-class _TAO_ArrayDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker;
 
-class  ArrayDef : public virtual IDLType
+class  POA_CORBA_ArrayDef : public virtual POA_CORBA_IDLType
 {
 protected:
-  ArrayDef (void);
+  POA_CORBA_ArrayDef (void);
 
 public:
-  ArrayDef (const ArrayDef& rhs);
-  virtual ~ArrayDef (void);
+  POA_CORBA_ArrayDef (const POA_CORBA_ArrayDef& rhs);
+  virtual ~POA_CORBA_ArrayDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -6504,6 +6592,14 @@ public:
         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,
@@ -6511,7 +6607,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::ArrayDef *_this (
+  ::CORBA_ArrayDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -6567,7 +6663,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::IDLType_ptr element_type_def (
+  virtual CORBA_IDLType_ptr element_type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6584,7 +6680,7 @@ public:
     );
 
   virtual void element_type_def (
-      CORBA::IDLType_ptr element_type_def,
+      CORBA_IDLType_ptr element_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6623,6 +6719,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -6630,15 +6728,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_ArrayDef_Strategized_Proxy_Broker : public virtual ::_TAO_ArrayDef_Proxy_Broker
+class  _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ArrayDef_Proxy_Broker
 {
 public: 
-  _TAO_ArrayDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_ArrayDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_ArrayDef_Proxy_Impl &select_proxy (
-    ::CORBA::ArrayDef *object,
+  virtual ::_TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy (
+    ::CORBA_ArrayDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -6647,7 +6745,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -6656,7 +6754,7 @@ 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.
-  ::_TAO_ArrayDef_Proxy_Impl
+  ::_TAO_CORBA_ArrayDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -6665,7 +6763,7 @@ private:
 // interface.
 
 public:
-  static _TAO_ArrayDef_Strategized_Proxy_Broker *the_TAO_ArrayDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker *the_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -6678,16 +6776,16 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_ArrayDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_ArrayDef_Proxy_Impl,
+class  _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_ArrayDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_ArrayDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ArrayDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl (void) { }
   
     virtual CORBA::ULong length (
       CORBA_Object *_collocated_tao_target_,
@@ -6714,7 +6812,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr element_type_def (
+  virtual CORBA_IDLType_ptr element_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -6724,7 +6822,7 @@ public:
 
   virtual void element_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr element_type_def,
+      CORBA_IDLType_ptr element_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -6738,22 +6836,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  ArrayDef_tie : public ArrayDef
+class  POA_CORBA_ArrayDef_tie : public POA_CORBA_ArrayDef
 {
 public:
-  ArrayDef_tie (T &t);
+  POA_CORBA_ArrayDef_tie (T &t);
   // the T& ctor
-  ArrayDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_ArrayDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  ArrayDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_ArrayDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  ArrayDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_ArrayDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~ArrayDef_tie (void);
+  ~POA_CORBA_ArrayDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -6798,7 +6894,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::IDLType_ptr element_type_def (
+  CORBA_IDLType_ptr element_type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6807,7 +6903,7 @@ public:
     ));
 
   void element_type_def (
-      CORBA::IDLType_ptr element_type_def,
+      CORBA_IDLType_ptr element_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6845,26 +6941,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  ArrayDef_tie (const ArrayDef_tie &);
-  void operator= (const ArrayDef_tie &);
+  POA_CORBA_ArrayDef_tie (const POA_CORBA_ArrayDef_tie &);
+  void operator= (const POA_CORBA_ArrayDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class ExceptionDef;
-typedef ExceptionDef *ExceptionDef_ptr;
+class POA_CORBA_ExceptionDef;
+typedef POA_CORBA_ExceptionDef *POA_CORBA_ExceptionDef_ptr;
 // Forward Classes Declaration
-class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
-class _TAO_ExceptionDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker;
 
-class  ExceptionDef : public virtual Contained, public virtual Container
+class  POA_CORBA_ExceptionDef : public virtual POA_CORBA_Contained, public virtual POA_CORBA_Container
 {
 protected:
-  ExceptionDef (void);
+  POA_CORBA_ExceptionDef (void);
 
 public:
-  ExceptionDef (const ExceptionDef& rhs);
-  virtual ~ExceptionDef (void);
+  POA_CORBA_ExceptionDef (const POA_CORBA_ExceptionDef& rhs);
+  virtual ~POA_CORBA_ExceptionDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -6893,6 +6988,14 @@ public:
         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,
@@ -6900,7 +7003,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::ExceptionDef *_this (
+  ::CORBA_ExceptionDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -6923,7 +7026,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::StructMemberSeq * members (
+  virtual CORBA_StructMemberSeq * members (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6940,7 +7043,7 @@ public:
     );
 
   virtual void members (
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7195,6 +7298,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -7202,15 +7307,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_ExceptionDef_Strategized_Proxy_Broker : public virtual ::_TAO_ExceptionDef_Proxy_Broker
+class  _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ExceptionDef_Proxy_Broker
 {
 public: 
-  _TAO_ExceptionDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_ExceptionDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_ExceptionDef_Proxy_Impl &select_proxy (
-    ::CORBA::ExceptionDef *object,
+  virtual ::_TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy (
+    ::CORBA_ExceptionDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -7219,7 +7324,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -7228,7 +7333,7 @@ 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.
-  ::_TAO_ExceptionDef_Proxy_Impl
+  ::_TAO_CORBA_ExceptionDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -7237,7 +7342,7 @@ private:
 // interface.
 
 public:
-  static _TAO_ExceptionDef_Strategized_Proxy_Broker *the_TAO_ExceptionDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker *the_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -7250,17 +7355,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_ExceptionDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_ExceptionDef_Proxy_Impl,
+class  _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_ExceptionDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl, 
-  public virtual ::POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_ExceptionDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ExceptionDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
@@ -7270,7 +7375,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::StructMemberSeq * members (
+  virtual CORBA_StructMemberSeq * members (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -7280,7 +7385,7 @@ public:
 
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -7294,22 +7399,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  ExceptionDef_tie : public ExceptionDef
+class  POA_CORBA_ExceptionDef_tie : public POA_CORBA_ExceptionDef
 {
 public:
-  ExceptionDef_tie (T &t);
+  POA_CORBA_ExceptionDef_tie (T &t);
   // the T& ctor
-  ExceptionDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_ExceptionDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  ExceptionDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_ExceptionDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  ExceptionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_ExceptionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~ExceptionDef_tie (void);
+  ~POA_CORBA_ExceptionDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -7337,7 +7440,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::StructMemberSeq * members (
+  CORBA_StructMemberSeq * members (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7346,7 +7449,7 @@ public:
     ));
 
   void members (
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7405,7 +7508,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7421,7 +7524,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7429,7 +7532,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7438,7 +7541,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -7448,7 +7551,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained_ptr lookup (
+  CORBA_Contained_ptr lookup (
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -7457,7 +7560,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * contents (
+  CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -7467,7 +7570,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * lookup_name (
+  CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
@@ -7479,7 +7582,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container::DescriptionSeq * describe_contents (
+  CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs,
@@ -7490,7 +7593,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ModuleDef_ptr create_module (
+  CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
       const char * version,
@@ -7501,11 +7604,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ConstantDef_ptr create_constant (
+  CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -7514,11 +7617,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::StructDef_ptr create_struct (
+  CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7526,12 +7629,12 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::UnionDef_ptr create_union (
+  CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7539,11 +7642,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::EnumDef_ptr create_enum (
+  CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7551,11 +7654,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AliasDef_ptr create_alias (
+  CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7563,11 +7666,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef_ptr create_interface (
+  CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7575,17 +7678,17 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr create_value (
+  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_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7593,11 +7696,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueBoxDef_ptr create_value_box (
+  CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7605,11 +7708,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ExceptionDef_ptr create_exception (
+  CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7617,7 +7720,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::NativeDef_ptr create_native (
+  CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
       const char * version,
@@ -7628,11 +7731,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7640,11 +7743,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::LocalInterfaceDef_ptr create_local_interface (
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7674,26 +7777,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  ExceptionDef_tie (const ExceptionDef_tie &);
-  void operator= (const ExceptionDef_tie &);
+  POA_CORBA_ExceptionDef_tie (const POA_CORBA_ExceptionDef_tie &);
+  void operator= (const POA_CORBA_ExceptionDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class AttributeDef;
-typedef AttributeDef *AttributeDef_ptr;
+class POA_CORBA_AttributeDef;
+typedef POA_CORBA_AttributeDef *POA_CORBA_AttributeDef_ptr;
 // Forward Classes Declaration
-class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
-class _TAO_AttributeDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker;
 
-class  AttributeDef : public virtual Contained
+class  POA_CORBA_AttributeDef : public virtual POA_CORBA_Contained
 {
 protected:
-  AttributeDef (void);
+  POA_CORBA_AttributeDef (void);
 
 public:
-  AttributeDef (const AttributeDef& rhs);
-  virtual ~AttributeDef (void);
+  POA_CORBA_AttributeDef (const POA_CORBA_AttributeDef& rhs);
+  virtual ~POA_CORBA_AttributeDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -7722,6 +7824,14 @@ public:
         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,
@@ -7729,7 +7839,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::AttributeDef *_this (
+  ::CORBA_AttributeDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -7752,7 +7862,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::IDLType_ptr type_def (
+  virtual CORBA_IDLType_ptr type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7769,7 +7879,7 @@ public:
     );
 
   virtual void type_def (
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7921,6 +8031,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -7928,15 +8040,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_AttributeDef_Strategized_Proxy_Broker : public virtual ::_TAO_AttributeDef_Proxy_Broker
+class  _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_AttributeDef_Proxy_Broker
 {
 public: 
-  _TAO_AttributeDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_AttributeDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_AttributeDef_Proxy_Impl &select_proxy (
-    ::CORBA::AttributeDef *object,
+  virtual ::_TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy (
+    ::CORBA_AttributeDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -7945,7 +8057,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -7954,7 +8066,7 @@ 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.
-  ::_TAO_AttributeDef_Proxy_Impl
+  ::_TAO_CORBA_AttributeDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -7963,7 +8075,7 @@ private:
 // interface.
 
 public:
-  static _TAO_AttributeDef_Strategized_Proxy_Broker *the_TAO_AttributeDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker *the_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -7976,16 +8088,16 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_AttributeDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_AttributeDef_Proxy_Impl,
+class  _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_AttributeDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_AttributeDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_AttributeDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
@@ -7995,7 +8107,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr type_def (
+  virtual CORBA_IDLType_ptr type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -8005,7 +8117,7 @@ public:
 
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -8036,22 +8148,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  AttributeDef_tie : public AttributeDef
+class  POA_CORBA_AttributeDef_tie : public POA_CORBA_AttributeDef
 {
 public:
-  AttributeDef_tie (T &t);
+  POA_CORBA_AttributeDef_tie (T &t);
   // the T& ctor
-  AttributeDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_AttributeDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  AttributeDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_AttributeDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  AttributeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_AttributeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~AttributeDef_tie (void);
+  ~POA_CORBA_AttributeDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -8079,7 +8189,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::IDLType_ptr type_def (
+  CORBA_IDLType_ptr type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8088,7 +8198,7 @@ public:
     ));
 
   void type_def (
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8164,7 +8274,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8180,7 +8290,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8188,7 +8298,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8197,7 +8307,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -8229,26 +8339,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  AttributeDef_tie (const AttributeDef_tie &);
-  void operator= (const AttributeDef_tie &);
+  POA_CORBA_AttributeDef_tie (const POA_CORBA_AttributeDef_tie &);
+  void operator= (const POA_CORBA_AttributeDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class OperationDef;
-typedef OperationDef *OperationDef_ptr;
+class POA_CORBA_OperationDef;
+typedef POA_CORBA_OperationDef *POA_CORBA_OperationDef_ptr;
 // Forward Classes Declaration
-class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-class _TAO_OperationDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_OperationDef_Strategized_Proxy_Broker;
 
-class  OperationDef : public virtual Contained
+class  POA_CORBA_OperationDef : public virtual POA_CORBA_Contained
 {
 protected:
-  OperationDef (void);
+  POA_CORBA_OperationDef (void);
 
 public:
-  OperationDef (const OperationDef& rhs);
-  virtual ~OperationDef (void);
+  POA_CORBA_OperationDef (const POA_CORBA_OperationDef& rhs);
+  virtual ~POA_CORBA_OperationDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -8277,6 +8386,14 @@ public:
         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,
@@ -8284,7 +8401,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::OperationDef *_this (
+  ::CORBA_OperationDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -8307,7 +8424,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::IDLType_ptr result_def (
+  virtual CORBA_IDLType_ptr result_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8324,7 +8441,7 @@ public:
     );
 
   virtual void result_def (
-      CORBA::IDLType_ptr result_def,
+      CORBA_IDLType_ptr result_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8340,7 +8457,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::ParDescriptionSeq * params (
+  virtual CORBA_ParDescriptionSeq * params (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8357,7 +8474,7 @@ public:
     );
 
   virtual void params (
-      const CORBA::ParDescriptionSeq & params,
+      const CORBA_ParDescriptionSeq & params,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8406,7 +8523,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::ContextIdSeq * contexts (
+  virtual CORBA_ContextIdSeq * contexts (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8423,7 +8540,7 @@ public:
     );
 
   virtual void contexts (
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8439,7 +8556,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::ExceptionDefSeq * exceptions (
+  virtual CORBA_ExceptionDefSeq * exceptions (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8456,7 +8573,7 @@ public:
     );
 
   virtual void exceptions (
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8575,6 +8692,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -8582,15 +8701,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_OperationDef_Strategized_Proxy_Broker : public virtual ::_TAO_OperationDef_Proxy_Broker
+class  _TAO_CORBA_OperationDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_OperationDef_Proxy_Broker
 {
 public: 
-  _TAO_OperationDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_OperationDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_OperationDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_OperationDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_OperationDef_Proxy_Impl &select_proxy (
-    ::CORBA::OperationDef *object,
+  virtual ::_TAO_CORBA_OperationDef_Proxy_Impl &select_proxy (
+    ::CORBA_OperationDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -8599,7 +8718,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -8608,7 +8727,7 @@ 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.
-  ::_TAO_OperationDef_Proxy_Impl
+  ::_TAO_CORBA_OperationDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -8617,7 +8736,7 @@ private:
 // interface.
 
 public:
-  static _TAO_OperationDef_Strategized_Proxy_Broker *the_TAO_OperationDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_OperationDef_Strategized_Proxy_Broker *the_TAO_CORBA_OperationDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -8630,16 +8749,16 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_OperationDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_OperationDef_Proxy_Impl,
+class  _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_OperationDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_OperationDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_OperationDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr result (
       CORBA_Object *_collocated_tao_target_,
@@ -8649,7 +8768,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr result_def (
+  virtual CORBA_IDLType_ptr result_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -8659,14 +8778,14 @@ public:
 
   virtual void result_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr result_def,
+      CORBA_IDLType_ptr result_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::ParDescriptionSeq * params (
+  virtual CORBA_ParDescriptionSeq * params (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -8676,7 +8795,7 @@ public:
 
   virtual void params (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::ParDescriptionSeq & params,
+      const CORBA_ParDescriptionSeq & params,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -8700,7 +8819,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ContextIdSeq * contexts (
+  virtual CORBA_ContextIdSeq * contexts (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -8710,14 +8829,14 @@ public:
 
   virtual void contexts (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::ExceptionDefSeq * exceptions (
+  virtual CORBA_ExceptionDefSeq * exceptions (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -8727,7 +8846,7 @@ public:
 
   virtual void exceptions (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -8741,22 +8860,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  OperationDef_tie : public OperationDef
+class  POA_CORBA_OperationDef_tie : public POA_CORBA_OperationDef
 {
 public:
-  OperationDef_tie (T &t);
+  POA_CORBA_OperationDef_tie (T &t);
   // the T& ctor
-  OperationDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_OperationDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  OperationDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_OperationDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  OperationDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_OperationDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~OperationDef_tie (void);
+  ~POA_CORBA_OperationDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -8784,7 +8901,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::IDLType_ptr result_def (
+  CORBA_IDLType_ptr result_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8793,7 +8910,7 @@ public:
     ));
 
   void result_def (
-      CORBA::IDLType_ptr result_def,
+      CORBA_IDLType_ptr result_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8801,7 +8918,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ParDescriptionSeq * params (
+  CORBA_ParDescriptionSeq * params (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8810,7 +8927,7 @@ public:
     ));
 
   void params (
-      const CORBA::ParDescriptionSeq & params,
+      const CORBA_ParDescriptionSeq & params,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8835,7 +8952,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContextIdSeq * contexts (
+  CORBA_ContextIdSeq * contexts (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8844,7 +8961,7 @@ public:
     ));
 
   void contexts (
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8852,7 +8969,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ExceptionDefSeq * exceptions (
+  CORBA_ExceptionDefSeq * exceptions (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8861,7 +8978,7 @@ public:
     ));
 
   void exceptions (
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8920,7 +9037,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8936,7 +9053,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8944,7 +9061,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -8953,7 +9070,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -8985,26 +9102,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  OperationDef_tie (const OperationDef_tie &);
-  void operator= (const OperationDef_tie &);
+  POA_CORBA_OperationDef_tie (const POA_CORBA_OperationDef_tie &);
+  void operator= (const POA_CORBA_OperationDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class InterfaceDef;
-typedef InterfaceDef *InterfaceDef_ptr;
+class POA_CORBA_InterfaceDef;
+typedef POA_CORBA_InterfaceDef *POA_CORBA_InterfaceDef_ptr;
 // Forward Classes Declaration
-class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-class _TAO_InterfaceDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker;
 
-class  InterfaceDef : public virtual Container, public virtual Contained, public virtual IDLType
+class  POA_CORBA_InterfaceDef : public virtual POA_CORBA_Container, public virtual POA_CORBA_Contained, public virtual POA_CORBA_IDLType
 {
 protected:
-  InterfaceDef (void);
+  POA_CORBA_InterfaceDef (void);
 
 public:
-  InterfaceDef (const InterfaceDef& rhs);
-  virtual ~InterfaceDef (void);
+  POA_CORBA_InterfaceDef (const POA_CORBA_InterfaceDef& rhs);
+  virtual ~POA_CORBA_InterfaceDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -9033,6 +9149,14 @@ public:
         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,
@@ -9040,14 +9164,14 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::InterfaceDef *_this (
+  ::CORBA_InterfaceDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
-  virtual CORBA::InterfaceDefSeq * base_interfaces (
+  virtual CORBA_InterfaceDefSeq * base_interfaces (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9064,7 +9188,7 @@ public:
     );
 
   virtual void base_interfaces (
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9097,7 +9221,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
+  virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9113,11 +9237,11 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::AttributeDef_ptr create_attribute (
+  virtual CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -9134,15 +9258,15 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::OperationDef_ptr create_operation (
+  virtual CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9405,6 +9529,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -9412,15 +9538,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_InterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_InterfaceDef_Proxy_Broker
+class  _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_InterfaceDef_Proxy_Broker
 {
 public: 
-  _TAO_InterfaceDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_InterfaceDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_InterfaceDef_Proxy_Impl &select_proxy (
-    ::CORBA::InterfaceDef *object,
+  virtual ::_TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy (
+    ::CORBA_InterfaceDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -9429,7 +9555,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -9438,7 +9564,7 @@ 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.
-  ::_TAO_InterfaceDef_Proxy_Impl
+  ::_TAO_CORBA_InterfaceDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -9447,7 +9573,7 @@ private:
 // interface.
 
 public:
-  static _TAO_InterfaceDef_Strategized_Proxy_Broker *the_TAO_InterfaceDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker *the_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -9460,20 +9586,20 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_InterfaceDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_InterfaceDef_Proxy_Impl,
+class  _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_InterfaceDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl, 
-  public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl, 
-  public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_InterfaceDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl (void) { }
   
-    virtual CORBA::InterfaceDefSeq * base_interfaces (
+    virtual CORBA_InterfaceDefSeq * base_interfaces (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -9483,7 +9609,7 @@ public:
 
   virtual void base_interfaces (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -9499,7 +9625,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
+  virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -9507,12 +9633,12 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::AttributeDef_ptr create_attribute (
+  virtual CORBA_AttributeDef_ptr create_attribute (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -9520,16 +9646,16 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::OperationDef_ptr create_operation (
+  virtual CORBA_OperationDef_ptr create_operation (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -9543,22 +9669,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  InterfaceDef_tie : public InterfaceDef
+class  POA_CORBA_InterfaceDef_tie : public POA_CORBA_InterfaceDef
 {
 public:
-  InterfaceDef_tie (T &t);
+  POA_CORBA_InterfaceDef_tie (T &t);
   // the T& ctor
-  InterfaceDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_InterfaceDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  InterfaceDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_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);
+  POA_CORBA_InterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~InterfaceDef_tie (void);
+  ~POA_CORBA_InterfaceDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -9578,7 +9702,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  CORBA::InterfaceDefSeq * base_interfaces (
+  CORBA_InterfaceDefSeq * base_interfaces (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9587,7 +9711,7 @@ public:
     ));
 
   void base_interfaces (
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9604,7 +9728,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
+  CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9612,11 +9736,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AttributeDef_ptr create_attribute (
+  CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -9625,15 +9749,15 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::OperationDef_ptr create_operation (
+  CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9641,7 +9765,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained_ptr lookup (
+  CORBA_Contained_ptr lookup (
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -9650,7 +9774,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * contents (
+  CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -9660,7 +9784,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * lookup_name (
+  CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
@@ -9672,7 +9796,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container::DescriptionSeq * describe_contents (
+  CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs,
@@ -9683,7 +9807,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ModuleDef_ptr create_module (
+  CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
       const char * version,
@@ -9694,11 +9818,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ConstantDef_ptr create_constant (
+  CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -9707,11 +9831,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::StructDef_ptr create_struct (
+  CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9719,12 +9843,12 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::UnionDef_ptr create_union (
+  CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9732,11 +9856,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::EnumDef_ptr create_enum (
+  CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9744,11 +9868,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AliasDef_ptr create_alias (
+  CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9756,11 +9880,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef_ptr create_interface (
+  CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9768,17 +9892,17 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr create_value (
+  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_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9786,11 +9910,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueBoxDef_ptr create_value_box (
+  CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9798,11 +9922,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ExceptionDef_ptr create_exception (
+  CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9810,7 +9934,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::NativeDef_ptr create_native (
+  CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
       const char * version,
@@ -9821,11 +9945,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9833,11 +9957,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::LocalInterfaceDef_ptr create_local_interface (
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9896,7 +10020,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9912,7 +10036,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9920,7 +10044,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -9929,7 +10053,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -9969,26 +10093,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  InterfaceDef_tie (const InterfaceDef_tie &);
-  void operator= (const InterfaceDef_tie &);
+  POA_CORBA_InterfaceDef_tie (const POA_CORBA_InterfaceDef_tie &);
+  void operator= (const POA_CORBA_InterfaceDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class AbstractInterfaceDef;
-typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr;
+class POA_CORBA_AbstractInterfaceDef;
+typedef POA_CORBA_AbstractInterfaceDef *POA_CORBA_AbstractInterfaceDef_ptr;
 // Forward Classes Declaration
-class _TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl;
-class _TAO_AbstractInterfaceDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker;
 
-class  AbstractInterfaceDef : public virtual InterfaceDef
+class  POA_CORBA_AbstractInterfaceDef : public virtual POA_CORBA_InterfaceDef
 {
 protected:
-  AbstractInterfaceDef (void);
+  POA_CORBA_AbstractInterfaceDef (void);
 
 public:
-  AbstractInterfaceDef (const AbstractInterfaceDef& rhs);
-  virtual ~AbstractInterfaceDef (void);
+  POA_CORBA_AbstractInterfaceDef (const POA_CORBA_AbstractInterfaceDef& rhs);
+  virtual ~POA_CORBA_AbstractInterfaceDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -10017,6 +10140,14 @@ public:
         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,
@@ -10024,7 +10155,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::AbstractInterfaceDef *_this (
+  ::CORBA_AbstractInterfaceDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -10326,6 +10457,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -10333,15 +10466,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_AbstractInterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_AbstractInterfaceDef_Proxy_Broker
+class  _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker
 {
 public: 
-  _TAO_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_AbstractInterfaceDef_Proxy_Impl &select_proxy (
-    ::CORBA::AbstractInterfaceDef *object,
+  virtual ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy (
+    ::CORBA_AbstractInterfaceDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -10350,7 +10483,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -10359,7 +10492,7 @@ 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.
-  ::_TAO_AbstractInterfaceDef_Proxy_Impl
+  ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -10368,7 +10501,7 @@ private:
 // interface.
 
 public:
-  static _TAO_AbstractInterfaceDef_Strategized_Proxy_Broker *the_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker *the_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -10381,16 +10514,16 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_AbstractInterfaceDef_Proxy_Impl,
+class  _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void) { }
   
   };
 
@@ -10399,22 +10532,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  AbstractInterfaceDef_tie : public AbstractInterfaceDef
+class  POA_CORBA_AbstractInterfaceDef_tie : public POA_CORBA_AbstractInterfaceDef
 {
 public:
-  AbstractInterfaceDef_tie (T &t);
+  POA_CORBA_AbstractInterfaceDef_tie (T &t);
   // the T& ctor
-  AbstractInterfaceDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_AbstractInterfaceDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  AbstractInterfaceDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_AbstractInterfaceDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  AbstractInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_AbstractInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~AbstractInterfaceDef_tie (void);
+  ~POA_CORBA_AbstractInterfaceDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -10434,7 +10565,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  CORBA::InterfaceDefSeq * base_interfaces (
+  CORBA_InterfaceDefSeq * base_interfaces (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10443,7 +10574,7 @@ public:
     ));
 
   void base_interfaces (
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10460,7 +10591,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
+  CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10468,11 +10599,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AttributeDef_ptr create_attribute (
+  CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -10481,15 +10612,15 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::OperationDef_ptr create_operation (
+  CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10497,7 +10628,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained_ptr lookup (
+  CORBA_Contained_ptr lookup (
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -10506,7 +10637,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * contents (
+  CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -10516,7 +10647,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * lookup_name (
+  CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
@@ -10528,7 +10659,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container::DescriptionSeq * describe_contents (
+  CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs,
@@ -10539,7 +10670,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ModuleDef_ptr create_module (
+  CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
       const char * version,
@@ -10550,11 +10681,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ConstantDef_ptr create_constant (
+  CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -10563,11 +10694,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::StructDef_ptr create_struct (
+  CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10575,12 +10706,12 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::UnionDef_ptr create_union (
+  CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10588,11 +10719,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::EnumDef_ptr create_enum (
+  CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10600,11 +10731,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AliasDef_ptr create_alias (
+  CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10612,11 +10743,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef_ptr create_interface (
+  CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10624,17 +10755,17 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr create_value (
+  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_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10642,11 +10773,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueBoxDef_ptr create_value_box (
+  CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10654,11 +10785,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ExceptionDef_ptr create_exception (
+  CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10666,7 +10797,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::NativeDef_ptr create_native (
+  CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
       const char * version,
@@ -10677,11 +10808,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10689,11 +10820,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::LocalInterfaceDef_ptr create_local_interface (
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10752,7 +10883,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10768,7 +10899,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10776,7 +10907,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -10785,7 +10916,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -10825,26 +10956,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  AbstractInterfaceDef_tie (const AbstractInterfaceDef_tie &);
-  void operator= (const AbstractInterfaceDef_tie &);
+  POA_CORBA_AbstractInterfaceDef_tie (const POA_CORBA_AbstractInterfaceDef_tie &);
+  void operator= (const POA_CORBA_AbstractInterfaceDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class LocalInterfaceDef;
-typedef LocalInterfaceDef *LocalInterfaceDef_ptr;
+class POA_CORBA_LocalInterfaceDef;
+typedef POA_CORBA_LocalInterfaceDef *POA_CORBA_LocalInterfaceDef_ptr;
 // Forward Classes Declaration
-class _TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl;
-class _TAO_LocalInterfaceDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker;
 
-class  LocalInterfaceDef : public virtual InterfaceDef
+class  POA_CORBA_LocalInterfaceDef : public virtual POA_CORBA_InterfaceDef
 {
 protected:
-  LocalInterfaceDef (void);
+  POA_CORBA_LocalInterfaceDef (void);
 
 public:
-  LocalInterfaceDef (const LocalInterfaceDef& rhs);
-  virtual ~LocalInterfaceDef (void);
+  POA_CORBA_LocalInterfaceDef (const POA_CORBA_LocalInterfaceDef& rhs);
+  virtual ~POA_CORBA_LocalInterfaceDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -10873,6 +11003,14 @@ public:
         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,
@@ -10880,7 +11018,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::LocalInterfaceDef *_this (
+  ::CORBA_LocalInterfaceDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -11182,6 +11320,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -11189,15 +11329,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_LocalInterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_LocalInterfaceDef_Proxy_Broker
+class  _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_LocalInterfaceDef_Proxy_Broker
 {
 public: 
-  _TAO_LocalInterfaceDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_LocalInterfaceDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_LocalInterfaceDef_Proxy_Impl &select_proxy (
-    ::CORBA::LocalInterfaceDef *object,
+  virtual ::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy (
+    ::CORBA_LocalInterfaceDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -11206,7 +11346,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -11215,7 +11355,7 @@ 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.
-  ::_TAO_LocalInterfaceDef_Proxy_Impl
+  ::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -11224,7 +11364,7 @@ private:
 // interface.
 
 public:
-  static _TAO_LocalInterfaceDef_Strategized_Proxy_Broker *the_TAO_LocalInterfaceDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker *the_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -11237,16 +11377,16 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_LocalInterfaceDef_Proxy_Impl,
+class  _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl (void) { }
   
   };
 
@@ -11255,22 +11395,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  LocalInterfaceDef_tie : public LocalInterfaceDef
+class  POA_CORBA_LocalInterfaceDef_tie : public POA_CORBA_LocalInterfaceDef
 {
 public:
-  LocalInterfaceDef_tie (T &t);
+  POA_CORBA_LocalInterfaceDef_tie (T &t);
   // the T& ctor
-  LocalInterfaceDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_LocalInterfaceDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  LocalInterfaceDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_LocalInterfaceDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  LocalInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_LocalInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~LocalInterfaceDef_tie (void);
+  ~POA_CORBA_LocalInterfaceDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -11290,7 +11428,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  CORBA::InterfaceDefSeq * base_interfaces (
+  CORBA_InterfaceDefSeq * base_interfaces (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11299,7 +11437,7 @@ public:
     ));
 
   void base_interfaces (
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11316,7 +11454,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
+  CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11324,11 +11462,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AttributeDef_ptr create_attribute (
+  CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -11337,15 +11475,15 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::OperationDef_ptr create_operation (
+  CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11353,7 +11491,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained_ptr lookup (
+  CORBA_Contained_ptr lookup (
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -11362,7 +11500,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * contents (
+  CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -11372,7 +11510,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * lookup_name (
+  CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
@@ -11384,7 +11522,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container::DescriptionSeq * describe_contents (
+  CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs,
@@ -11395,7 +11533,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ModuleDef_ptr create_module (
+  CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
       const char * version,
@@ -11406,11 +11544,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ConstantDef_ptr create_constant (
+  CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -11419,11 +11557,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::StructDef_ptr create_struct (
+  CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11431,12 +11569,12 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::UnionDef_ptr create_union (
+  CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11444,11 +11582,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::EnumDef_ptr create_enum (
+  CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11456,11 +11594,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AliasDef_ptr create_alias (
+  CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11468,11 +11606,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef_ptr create_interface (
+  CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11480,17 +11618,17 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr create_value (
+  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_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11498,11 +11636,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueBoxDef_ptr create_value_box (
+  CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11510,11 +11648,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ExceptionDef_ptr create_exception (
+  CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11522,7 +11660,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::NativeDef_ptr create_native (
+  CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
       const char * version,
@@ -11533,11 +11671,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11545,11 +11683,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::LocalInterfaceDef_ptr create_local_interface (
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11608,7 +11746,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11624,7 +11762,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11632,7 +11770,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -11641,7 +11779,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -11681,14 +11819,10 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  LocalInterfaceDef_tie (const LocalInterfaceDef_tie &);
-  void operator= (const LocalInterfaceDef_tie &);
+  POA_CORBA_LocalInterfaceDef_tie (const POA_CORBA_LocalInterfaceDef_tie &);
+  void operator= (const POA_CORBA_LocalInterfaceDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-}
-TAO_NAMESPACE_CLOSE
 
 #include "IFR_BasicS_T.h"
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.i b/TAO/orbsvcs/IFR_Service/IFR_BasicS.i
index 667e2dd95ae..9444278bdea 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.i
@@ -19,5132 +19,5132 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-ACE_INLINE void POA_CORBA::Repository::lookup_skel (
+ACE_INLINE void POA_CORBA_Repository::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::lookup_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::contents_skel (
+ACE_INLINE void POA_CORBA_Repository::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::lookup_name_skel (
+ACE_INLINE void POA_CORBA_Repository::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::lookup_name_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::describe_contents_skel (
+ACE_INLINE void POA_CORBA_Repository::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::describe_contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::create_module_skel (
+ACE_INLINE void POA_CORBA_Repository::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::create_module_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::create_constant_skel (
+ACE_INLINE void POA_CORBA_Repository::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::create_constant_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::create_struct_skel (
+ACE_INLINE void POA_CORBA_Repository::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::create_struct_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::create_union_skel (
+ACE_INLINE void POA_CORBA_Repository::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::create_union_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::create_enum_skel (
+ACE_INLINE void POA_CORBA_Repository::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::create_enum_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::create_alias_skel (
+ACE_INLINE void POA_CORBA_Repository::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::create_alias_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::create_interface_skel (
+ACE_INLINE void POA_CORBA_Repository::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::create_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::create_value_skel (
+ACE_INLINE void POA_CORBA_Repository::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::create_value_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::create_value_box_skel (
+ACE_INLINE void POA_CORBA_Repository::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::create_value_box_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::create_exception_skel (
+ACE_INLINE void POA_CORBA_Repository::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::create_exception_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::create_native_skel (
+ACE_INLINE void POA_CORBA_Repository::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::create_native_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::create_abstract_interface_skel (
+ACE_INLINE void POA_CORBA_Repository::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::create_abstract_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::create_local_interface_skel (
+ACE_INLINE void POA_CORBA_Repository::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_Container::create_local_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_Repository::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::Repository::destroy_skel (
+ACE_INLINE void POA_CORBA_Repository::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::Repository_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_Repository_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::lookup_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::lookup_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::contents_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::lookup_name_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::lookup_name_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::describe_contents_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::describe_contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::create_module_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::create_module_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::create_constant_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::create_constant_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::create_struct_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::create_struct_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::create_union_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::create_union_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::create_enum_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::create_enum_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::create_alias_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::create_alias_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::create_interface_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::create_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::create_value_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::create_value_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::create_value_box_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::create_value_box_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::create_exception_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::create_exception_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::create_native_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::create_native_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::create_abstract_interface_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::create_abstract_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::create_local_interface_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Container::create_local_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::describe_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::move_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ModuleDef::destroy_skel (
+ACE_INLINE void POA_CORBA_ModuleDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ModuleDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ConstantDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_ConstantDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ConstantDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_ConstantDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ConstantDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_ConstantDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ConstantDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_ConstantDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ConstantDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_ConstantDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ConstantDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_ConstantDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ConstantDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_ConstantDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ConstantDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_ConstantDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ConstantDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_ConstantDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ConstantDef::describe_skel (
+ACE_INLINE void POA_CORBA_ConstantDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ConstantDef::move_skel (
+ACE_INLINE void POA_CORBA_ConstantDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ConstantDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_ConstantDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ConstantDef::destroy_skel (
+ACE_INLINE void POA_CORBA_ConstantDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ConstantDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::lookup_skel (
+ACE_INLINE void POA_CORBA_StructDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::lookup_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::contents_skel (
+ACE_INLINE void POA_CORBA_StructDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::lookup_name_skel (
+ACE_INLINE void POA_CORBA_StructDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::lookup_name_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::describe_contents_skel (
+ACE_INLINE void POA_CORBA_StructDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::describe_contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::create_module_skel (
+ACE_INLINE void POA_CORBA_StructDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::create_module_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::create_constant_skel (
+ACE_INLINE void POA_CORBA_StructDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::create_constant_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::create_struct_skel (
+ACE_INLINE void POA_CORBA_StructDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::create_struct_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::create_union_skel (
+ACE_INLINE void POA_CORBA_StructDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::create_union_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::create_enum_skel (
+ACE_INLINE void POA_CORBA_StructDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::create_enum_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::create_alias_skel (
+ACE_INLINE void POA_CORBA_StructDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::create_alias_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::create_interface_skel (
+ACE_INLINE void POA_CORBA_StructDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::create_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::create_value_skel (
+ACE_INLINE void POA_CORBA_StructDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::create_value_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::create_value_box_skel (
+ACE_INLINE void POA_CORBA_StructDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::create_value_box_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::create_exception_skel (
+ACE_INLINE void POA_CORBA_StructDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::create_exception_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::create_native_skel (
+ACE_INLINE void POA_CORBA_StructDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::create_native_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::create_abstract_interface_skel (
+ACE_INLINE void POA_CORBA_StructDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::create_abstract_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::create_local_interface_skel (
+ACE_INLINE void POA_CORBA_StructDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Container::create_local_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_StructDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_StructDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_StructDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_StructDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_StructDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_StructDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_StructDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_StructDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_StructDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::describe_skel (
+ACE_INLINE void POA_CORBA_StructDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::move_skel (
+ACE_INLINE void POA_CORBA_StructDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_StructDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_StructDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StructDef::destroy_skel (
+ACE_INLINE void POA_CORBA_StructDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::StructDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_StructDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::lookup_skel (
+ACE_INLINE void POA_CORBA_UnionDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::lookup_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::contents_skel (
+ACE_INLINE void POA_CORBA_UnionDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::lookup_name_skel (
+ACE_INLINE void POA_CORBA_UnionDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::lookup_name_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::describe_contents_skel (
+ACE_INLINE void POA_CORBA_UnionDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::describe_contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::create_module_skel (
+ACE_INLINE void POA_CORBA_UnionDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::create_module_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::create_constant_skel (
+ACE_INLINE void POA_CORBA_UnionDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::create_constant_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::create_struct_skel (
+ACE_INLINE void POA_CORBA_UnionDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::create_struct_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::create_union_skel (
+ACE_INLINE void POA_CORBA_UnionDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::create_union_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::create_enum_skel (
+ACE_INLINE void POA_CORBA_UnionDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::create_enum_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::create_alias_skel (
+ACE_INLINE void POA_CORBA_UnionDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::create_alias_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::create_interface_skel (
+ACE_INLINE void POA_CORBA_UnionDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::create_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::create_value_skel (
+ACE_INLINE void POA_CORBA_UnionDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::create_value_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::create_value_box_skel (
+ACE_INLINE void POA_CORBA_UnionDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::create_value_box_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::create_exception_skel (
+ACE_INLINE void POA_CORBA_UnionDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::create_exception_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::create_native_skel (
+ACE_INLINE void POA_CORBA_UnionDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::create_native_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::create_abstract_interface_skel (
+ACE_INLINE void POA_CORBA_UnionDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::create_abstract_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::create_local_interface_skel (
+ACE_INLINE void POA_CORBA_UnionDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Container::create_local_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_UnionDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_UnionDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_UnionDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_UnionDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_UnionDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_UnionDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_UnionDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_UnionDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_UnionDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::describe_skel (
+ACE_INLINE void POA_CORBA_UnionDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::move_skel (
+ACE_INLINE void POA_CORBA_UnionDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_UnionDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_UnionDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::UnionDef::destroy_skel (
+ACE_INLINE void POA_CORBA_UnionDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::UnionDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::EnumDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_EnumDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::EnumDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_EnumDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::EnumDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_EnumDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::EnumDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_EnumDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::EnumDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_EnumDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::EnumDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_EnumDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::EnumDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_EnumDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::EnumDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_EnumDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::EnumDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_EnumDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::EnumDef::describe_skel (
+ACE_INLINE void POA_CORBA_EnumDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::EnumDef::move_skel (
+ACE_INLINE void POA_CORBA_EnumDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::EnumDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_EnumDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::EnumDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_EnumDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::EnumDef::destroy_skel (
+ACE_INLINE void POA_CORBA_EnumDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::EnumDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AliasDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_AliasDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AliasDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_AliasDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AliasDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_AliasDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AliasDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_AliasDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AliasDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_AliasDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AliasDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_AliasDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AliasDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_AliasDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AliasDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_AliasDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AliasDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_AliasDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AliasDef::describe_skel (
+ACE_INLINE void POA_CORBA_AliasDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AliasDef::move_skel (
+ACE_INLINE void POA_CORBA_AliasDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AliasDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_AliasDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AliasDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_AliasDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AliasDef::destroy_skel (
+ACE_INLINE void POA_CORBA_AliasDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::AliasDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::NativeDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_NativeDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::NativeDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_NativeDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::NativeDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_NativeDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::NativeDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_NativeDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::NativeDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_NativeDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::NativeDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_NativeDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::NativeDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_NativeDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::NativeDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_NativeDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::NativeDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_NativeDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::NativeDef::describe_skel (
+ACE_INLINE void POA_CORBA_NativeDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::NativeDef::move_skel (
+ACE_INLINE void POA_CORBA_NativeDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::NativeDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_NativeDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::NativeDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_NativeDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::NativeDef::destroy_skel (
+ACE_INLINE void POA_CORBA_NativeDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::NativeDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::PrimitiveDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_PrimitiveDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::PrimitiveDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::PrimitiveDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_PrimitiveDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::PrimitiveDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::PrimitiveDef::destroy_skel (
+ACE_INLINE void POA_CORBA_PrimitiveDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::PrimitiveDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StringDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_StringDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::StringDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_StringDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StringDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_StringDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::StringDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_StringDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::StringDef::destroy_skel (
+ACE_INLINE void POA_CORBA_StringDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::StringDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_StringDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::WstringDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_WstringDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::WstringDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_WstringDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::WstringDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_WstringDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::WstringDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_WstringDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::WstringDef::destroy_skel (
+ACE_INLINE void POA_CORBA_WstringDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::WstringDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_WstringDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::SequenceDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_SequenceDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::SequenceDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_SequenceDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::SequenceDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_SequenceDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::SequenceDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_SequenceDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::SequenceDef::destroy_skel (
+ACE_INLINE void POA_CORBA_SequenceDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::SequenceDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_SequenceDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ArrayDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_ArrayDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::ArrayDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_ArrayDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ArrayDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_ArrayDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ArrayDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_ArrayDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ArrayDef::destroy_skel (
+ACE_INLINE void POA_CORBA_ArrayDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ArrayDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_ArrayDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::describe_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::move_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::lookup_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::lookup_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::contents_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::lookup_name_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::lookup_name_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::describe_contents_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::describe_contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::create_module_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::create_module_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::create_constant_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::create_constant_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::create_struct_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::create_struct_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::create_union_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::create_union_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::create_enum_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::create_enum_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::create_alias_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::create_alias_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::create_interface_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::create_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::create_value_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::create_value_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::create_value_box_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::create_value_box_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::create_exception_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::create_exception_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::create_native_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::create_native_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::create_abstract_interface_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::create_abstract_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::create_local_interface_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_Container::create_local_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ExceptionDef::destroy_skel (
+ACE_INLINE void POA_CORBA_ExceptionDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ExceptionDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AttributeDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_AttributeDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AttributeDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_AttributeDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AttributeDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_AttributeDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AttributeDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_AttributeDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AttributeDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_AttributeDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AttributeDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_AttributeDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AttributeDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_AttributeDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AttributeDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_AttributeDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AttributeDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_AttributeDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AttributeDef::describe_skel (
+ACE_INLINE void POA_CORBA_AttributeDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AttributeDef::move_skel (
+ACE_INLINE void POA_CORBA_AttributeDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AttributeDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_AttributeDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AttributeDef::destroy_skel (
+ACE_INLINE void POA_CORBA_AttributeDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::AttributeDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::OperationDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_OperationDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::OperationDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_OperationDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::OperationDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_OperationDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::OperationDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_OperationDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::OperationDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_OperationDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::OperationDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_OperationDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::OperationDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_OperationDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::OperationDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_OperationDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::OperationDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_OperationDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::OperationDef::describe_skel (
+ACE_INLINE void POA_CORBA_OperationDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::OperationDef::move_skel (
+ACE_INLINE void POA_CORBA_OperationDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::OperationDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_OperationDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::OperationDef::destroy_skel (
+ACE_INLINE void POA_CORBA_OperationDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::OperationDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::lookup_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::lookup_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::contents_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::lookup_name_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::lookup_name_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::describe_contents_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::describe_contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::create_module_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_module_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::create_constant_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_constant_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::create_struct_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_struct_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::create_union_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_union_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::create_enum_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_enum_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::create_alias_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_alias_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::create_interface_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::create_value_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_value_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::create_value_box_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_value_box_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::create_exception_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_exception_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::create_native_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_native_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::create_abstract_interface_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_abstract_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::create_local_interface_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_local_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::describe_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::move_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::InterfaceDef::destroy_skel (
+ACE_INLINE void POA_CORBA_InterfaceDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::InterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_base_interfaces_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_set_base_interfaces_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::is_a_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::is_a_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_InterfaceDef::is_a_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::describe_interface_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::describe_interface_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_InterfaceDef::describe_interface_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_attribute_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_attribute_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_attribute_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_InterfaceDef::create_attribute_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_operation_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_operation_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_operation_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_InterfaceDef::create_operation_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::lookup_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::lookup_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::contents_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::lookup_name_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::lookup_name_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::describe_contents_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::describe_contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_module_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_module_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_constant_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_constant_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_struct_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_struct_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_union_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_union_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_enum_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_enum_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_alias_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_alias_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_interface_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_value_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_value_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_value_box_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_value_box_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_exception_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_exception_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_native_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_native_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_abstract_interface_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_abstract_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::create_local_interface_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_local_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::describe_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::move_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::AbstractInterfaceDef::destroy_skel (
+ACE_INLINE void POA_CORBA_AbstractInterfaceDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::AbstractInterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_base_interfaces_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_set_base_interfaces_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::is_a_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::is_a_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_InterfaceDef::is_a_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::describe_interface_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::describe_interface_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_InterfaceDef::describe_interface_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_attribute_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_attribute_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_attribute_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_InterfaceDef::create_attribute_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_operation_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_operation_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_operation_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_InterfaceDef::create_operation_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::lookup_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::lookup_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::contents_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::lookup_name_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::lookup_name_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::describe_contents_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::describe_contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_module_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_module_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_constant_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_constant_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_struct_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_struct_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_union_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_union_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_enum_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_enum_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_alias_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_alias_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_interface_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_value_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_value_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_value_box_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_value_box_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_exception_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_exception_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_native_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_native_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_abstract_interface_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_abstract_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::create_local_interface_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Container::create_local_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::describe_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::move_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::LocalInterfaceDef::destroy_skel (
+ACE_INLINE void POA_CORBA_LocalInterfaceDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::LocalInterfaceDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.cpp b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.cpp
index 6a77e8de23a..3851472fc93 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.cpp
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_IDL_IFR_BASICS_T_CPP
-#define TAO_IDL_IFR_BASICS_T_CPP
+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_T_CPP_
+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_T_CPP_
 
 #include "IFR_BasicS_T.h"
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h
index 2ac29d3b45a..f8f6673d3a3 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_IFR_BASICS_T_H
-#define TAO_IDL_IFR_BASICS_T_H
+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_T_H_
+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_T_H_
 
 #include "ace/pre.h"
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i
index 4890f61aec8..7c424ecc9bf 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i
@@ -19,50 +19,48 @@
 // 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>::Repository_tie (T &t)
+POA_CORBA_Repository_tie<T>::POA_CORBA_Repository_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::Repository_tie<T>::Repository_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_Repository_tie<T>::POA_CORBA_Repository_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::Repository_tie<T>::Repository_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_Repository_tie<T>::POA_CORBA_Repository_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::Repository_tie<T>::Repository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_Repository_tie<T>::POA_CORBA_Repository_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::Repository_tie<T>::~Repository_tie (void)
+POA_CORBA_Repository_tie<T>::~POA_CORBA_Repository_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::Repository_tie<T>::_tied_object (void)
+POA_CORBA_Repository_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::Repository_tie<T>::_tied_object (T &obj)
+POA_CORBA_Repository_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -70,7 +68,7 @@ POA_CORBA::Repository_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::Repository_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_Repository_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -78,28 +76,28 @@ POA_CORBA::Repository_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::Repository_tie<T>::_is_owner (void)
+POA_CORBA_Repository_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::Repository_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_Repository_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Repository_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_Repository_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->Repository::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_Repository::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained_ptr POA_CORBA::Repository_tie<T>::lookup_id  (
+CORBA_Contained_ptr POA_CORBA_Repository_tie<T>::lookup_id  (
     const char * search_id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -114,7 +112,7 @@ search_id,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::Repository_tie<T>::get_canonical_typecode  (
+CORBA::TypeCode_ptr POA_CORBA_Repository_tie<T>::get_canonical_typecode  (
     CORBA::TypeCode_ptr tc,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -129,7 +127,7 @@ tc,
 }
 
 template <class T> ACE_INLINE
-CORBA::PrimitiveDef_ptr POA_CORBA::Repository_tie<T>::get_primitive  (
+CORBA_PrimitiveDef_ptr POA_CORBA_Repository_tie<T>::get_primitive  (
     CORBA::PrimitiveKind kind,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -144,7 +142,7 @@ kind,
 }
 
 template <class T> ACE_INLINE
-CORBA::StringDef_ptr POA_CORBA::Repository_tie<T>::create_string  (
+CORBA_StringDef_ptr POA_CORBA_Repository_tie<T>::create_string  (
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -159,7 +157,7 @@ bound,
 }
 
 template <class T> ACE_INLINE
-CORBA::WstringDef_ptr POA_CORBA::Repository_tie<T>::create_wstring  (
+CORBA_WstringDef_ptr POA_CORBA_Repository_tie<T>::create_wstring  (
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -174,9 +172,9 @@ bound,
 }
 
 template <class T> ACE_INLINE
-CORBA::SequenceDef_ptr POA_CORBA::Repository_tie<T>::create_sequence  (
+CORBA_SequenceDef_ptr POA_CORBA_Repository_tie<T>::create_sequence  (
     CORBA::ULong bound,
-    CORBA::IDLType_ptr element_type,
+    CORBA_IDLType_ptr element_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -191,9 +189,9 @@ bound,
 }
 
 template <class T> ACE_INLINE
-CORBA::ArrayDef_ptr POA_CORBA::Repository_tie<T>::create_array  (
+CORBA_ArrayDef_ptr POA_CORBA_Repository_tie<T>::create_array  (
     CORBA::ULong length,
-    CORBA::IDLType_ptr element_type,
+    CORBA_IDLType_ptr element_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -208,7 +206,7 @@ length,
 }
 
 template <class T> ACE_INLINE
-CORBA::FixedDef_ptr POA_CORBA::Repository_tie<T>::create_fixed  (
+CORBA_FixedDef_ptr POA_CORBA_Repository_tie<T>::create_fixed  (
     CORBA::UShort digits,
     CORBA::Short scale,
     CORBA::Environment &ACE_TRY_ENV
@@ -225,7 +223,7 @@ digits,
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained_ptr POA_CORBA::Repository_tie<T>::lookup  (
+CORBA_Contained_ptr POA_CORBA_Repository_tie<T>::lookup  (
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -240,7 +238,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::Repository_tie<T>::contents  (
+CORBA_ContainedSeq * POA_CORBA_Repository_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Environment &ACE_TRY_ENV
@@ -257,7 +255,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::Repository_tie<T>::lookup_name  (
+CORBA_ContainedSeq * POA_CORBA_Repository_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
@@ -278,7 +276,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container::DescriptionSeq * POA_CORBA::Repository_tie<T>::describe_contents  (
+CORBA_Container::DescriptionSeq * POA_CORBA_Repository_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs,
@@ -297,7 +295,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ModuleDef_ptr POA_CORBA::Repository_tie<T>::create_module  (
+CORBA_ModuleDef_ptr POA_CORBA_Repository_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version,
@@ -316,11 +314,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ConstantDef_ptr POA_CORBA::Repository_tie<T>::create_constant  (
+CORBA_ConstantDef_ptr POA_CORBA_Repository_tie<T>::create_constant  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -339,11 +337,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::StructDef_ptr POA_CORBA::Repository_tie<T>::create_struct  (
+CORBA_StructDef_ptr POA_CORBA_Repository_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -360,12 +358,12 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::UnionDef_ptr POA_CORBA::Repository_tie<T>::create_union  (
+CORBA_UnionDef_ptr POA_CORBA_Repository_tie<T>::create_union  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -383,11 +381,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::EnumDef_ptr POA_CORBA::Repository_tie<T>::create_enum  (
+CORBA_EnumDef_ptr POA_CORBA_Repository_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -404,11 +402,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AliasDef_ptr POA_CORBA::Repository_tie<T>::create_alias  (
+CORBA_AliasDef_ptr POA_CORBA_Repository_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -425,11 +423,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef_ptr POA_CORBA::Repository_tie<T>::create_interface  (
+CORBA_InterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -446,17 +444,17 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_CORBA::Repository_tie<T>::create_value  (
+CORBA_ValueDef_ptr POA_CORBA_Repository_tie<T>::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_ValueDef_ptr base_value,
     CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -479,11 +477,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueBoxDef_ptr POA_CORBA::Repository_tie<T>::create_value_box  (
+CORBA_ValueBoxDef_ptr POA_CORBA_Repository_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -500,11 +498,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ExceptionDef_ptr POA_CORBA::Repository_tie<T>::create_exception  (
+CORBA_ExceptionDef_ptr POA_CORBA_Repository_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -521,7 +519,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::NativeDef_ptr POA_CORBA::Repository_tie<T>::create_native  (
+CORBA_NativeDef_ptr POA_CORBA_Repository_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version,
@@ -540,11 +538,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AbstractInterfaceDef_ptr POA_CORBA::Repository_tie<T>::create_abstract_interface  (
+CORBA_AbstractInterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_abstract_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -561,11 +559,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::LocalInterfaceDef_ptr POA_CORBA::Repository_tie<T>::create_local_interface  (
+CORBA_LocalInterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -582,7 +580,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::Repository_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_Repository_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -595,7 +593,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::Repository_tie<T>::destroy  (
+void POA_CORBA_Repository_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -607,51 +605,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::ModuleDef_tie<T>::ModuleDef_tie (T &t)
+POA_CORBA_ModuleDef_tie<T>::POA_CORBA_ModuleDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ModuleDef_tie<T>::ModuleDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_ModuleDef_tie<T>::POA_CORBA_ModuleDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ModuleDef_tie<T>::ModuleDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_ModuleDef_tie<T>::POA_CORBA_ModuleDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ModuleDef_tie<T>::ModuleDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_ModuleDef_tie<T>::POA_CORBA_ModuleDef_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::ModuleDef_tie<T>::~ModuleDef_tie (void)
+POA_CORBA_ModuleDef_tie<T>::~POA_CORBA_ModuleDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::ModuleDef_tie<T>::_tied_object (void)
+POA_CORBA_ModuleDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ModuleDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_ModuleDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -659,7 +654,7 @@ POA_CORBA::ModuleDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ModuleDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_ModuleDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -667,28 +662,28 @@ POA_CORBA::ModuleDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ModuleDef_tie<T>::_is_owner (void)
+POA_CORBA_ModuleDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ModuleDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_ModuleDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ModuleDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ModuleDef_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->ModuleDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ModuleDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained_ptr POA_CORBA::ModuleDef_tie<T>::lookup  (
+CORBA_Contained_ptr POA_CORBA_ModuleDef_tie<T>::lookup  (
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -703,7 +698,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::ModuleDef_tie<T>::contents  (
+CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Environment &ACE_TRY_ENV
@@ -720,7 +715,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::ModuleDef_tie<T>::lookup_name  (
+CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
@@ -741,7 +736,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container::DescriptionSeq * POA_CORBA::ModuleDef_tie<T>::describe_contents  (
+CORBA_Container::DescriptionSeq * POA_CORBA_ModuleDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs,
@@ -760,7 +755,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ModuleDef_ptr POA_CORBA::ModuleDef_tie<T>::create_module  (
+CORBA_ModuleDef_ptr POA_CORBA_ModuleDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version,
@@ -779,11 +774,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ConstantDef_ptr POA_CORBA::ModuleDef_tie<T>::create_constant  (
+CORBA_ConstantDef_ptr POA_CORBA_ModuleDef_tie<T>::create_constant  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -802,11 +797,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::StructDef_ptr POA_CORBA::ModuleDef_tie<T>::create_struct  (
+CORBA_StructDef_ptr POA_CORBA_ModuleDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -823,12 +818,12 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::UnionDef_ptr POA_CORBA::ModuleDef_tie<T>::create_union  (
+CORBA_UnionDef_ptr POA_CORBA_ModuleDef_tie<T>::create_union  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -846,11 +841,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::EnumDef_ptr POA_CORBA::ModuleDef_tie<T>::create_enum  (
+CORBA_EnumDef_ptr POA_CORBA_ModuleDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -867,11 +862,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AliasDef_ptr POA_CORBA::ModuleDef_tie<T>::create_alias  (
+CORBA_AliasDef_ptr POA_CORBA_ModuleDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -888,11 +883,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef_ptr POA_CORBA::ModuleDef_tie<T>::create_interface  (
+CORBA_InterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -909,17 +904,17 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_CORBA::ModuleDef_tie<T>::create_value  (
+CORBA_ValueDef_ptr POA_CORBA_ModuleDef_tie<T>::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_ValueDef_ptr base_value,
     CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -942,11 +937,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueBoxDef_ptr POA_CORBA::ModuleDef_tie<T>::create_value_box  (
+CORBA_ValueBoxDef_ptr POA_CORBA_ModuleDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -963,11 +958,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ExceptionDef_ptr POA_CORBA::ModuleDef_tie<T>::create_exception  (
+CORBA_ExceptionDef_ptr POA_CORBA_ModuleDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -984,7 +979,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::NativeDef_ptr POA_CORBA::ModuleDef_tie<T>::create_native  (
+CORBA_NativeDef_ptr POA_CORBA_ModuleDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version,
@@ -1003,11 +998,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AbstractInterfaceDef_ptr POA_CORBA::ModuleDef_tie<T>::create_abstract_interface  (
+CORBA_AbstractInterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_abstract_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1024,11 +1019,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::LocalInterfaceDef_ptr POA_CORBA::ModuleDef_tie<T>::create_local_interface  (
+CORBA_LocalInterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1045,7 +1040,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ModuleDef_tie<T>::id  (
+char * POA_CORBA_ModuleDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1058,7 +1053,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ModuleDef_tie<T>::id  (
+void POA_CORBA_ModuleDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1073,7 +1068,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ModuleDef_tie<T>::name  (
+char * POA_CORBA_ModuleDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1086,7 +1081,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ModuleDef_tie<T>::name  (
+void POA_CORBA_ModuleDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1101,7 +1096,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ModuleDef_tie<T>::version  (
+char * POA_CORBA_ModuleDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1114,7 +1109,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ModuleDef_tie<T>::version  (
+void POA_CORBA_ModuleDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1129,7 +1124,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::ModuleDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_ModuleDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1142,7 +1137,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ModuleDef_tie<T>::absolute_name  (
+char * POA_CORBA_ModuleDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1155,7 +1150,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::ModuleDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_ModuleDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1168,7 +1163,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::ModuleDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_ModuleDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1181,8 +1176,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ModuleDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_ModuleDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -1200,7 +1195,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::ModuleDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_ModuleDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1213,7 +1208,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ModuleDef_tie<T>::destroy  (
+void POA_CORBA_ModuleDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1225,51 +1220,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::ConstantDef_tie<T>::ConstantDef_tie (T &t)
+POA_CORBA_ConstantDef_tie<T>::POA_CORBA_ConstantDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ConstantDef_tie<T>::ConstantDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_ConstantDef_tie<T>::POA_CORBA_ConstantDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ConstantDef_tie<T>::ConstantDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_ConstantDef_tie<T>::POA_CORBA_ConstantDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ConstantDef_tie<T>::ConstantDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_ConstantDef_tie<T>::POA_CORBA_ConstantDef_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::ConstantDef_tie<T>::~ConstantDef_tie (void)
+POA_CORBA_ConstantDef_tie<T>::~POA_CORBA_ConstantDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::ConstantDef_tie<T>::_tied_object (void)
+POA_CORBA_ConstantDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ConstantDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_ConstantDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -1277,7 +1269,7 @@ POA_CORBA::ConstantDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ConstantDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_ConstantDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -1285,28 +1277,28 @@ POA_CORBA::ConstantDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ConstantDef_tie<T>::_is_owner (void)
+POA_CORBA_ConstantDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ConstantDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_ConstantDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ConstantDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ConstantDef_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->ConstantDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ConstantDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ConstantDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_ConstantDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1319,7 +1311,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::IDLType_ptr POA_CORBA::ConstantDef_tie<T>::type_def  (
+CORBA_IDLType_ptr POA_CORBA_ConstantDef_tie<T>::type_def  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1332,8 +1324,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ConstantDef_tie<T>::type_def  (
-    CORBA::IDLType_ptr type_def,
+void POA_CORBA_ConstantDef_tie<T>::type_def  (
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1347,7 +1339,7 @@ type_def,
 }
 
 template <class T> ACE_INLINE
-CORBA::Any * POA_CORBA::ConstantDef_tie<T>::value  (
+CORBA::Any * POA_CORBA_ConstantDef_tie<T>::value  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1360,7 +1352,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ConstantDef_tie<T>::value  (
+void POA_CORBA_ConstantDef_tie<T>::value  (
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1375,7 +1367,7 @@ value,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ConstantDef_tie<T>::id  (
+char * POA_CORBA_ConstantDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1388,7 +1380,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ConstantDef_tie<T>::id  (
+void POA_CORBA_ConstantDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1403,7 +1395,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ConstantDef_tie<T>::name  (
+char * POA_CORBA_ConstantDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1416,7 +1408,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ConstantDef_tie<T>::name  (
+void POA_CORBA_ConstantDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1431,7 +1423,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ConstantDef_tie<T>::version  (
+char * POA_CORBA_ConstantDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1444,7 +1436,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ConstantDef_tie<T>::version  (
+void POA_CORBA_ConstantDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1459,7 +1451,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::ConstantDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_ConstantDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1472,7 +1464,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ConstantDef_tie<T>::absolute_name  (
+char * POA_CORBA_ConstantDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1485,7 +1477,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::ConstantDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_ConstantDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1498,7 +1490,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::ConstantDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_ConstantDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1511,8 +1503,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ConstantDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_ConstantDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -1530,7 +1522,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::ConstantDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_ConstantDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1543,7 +1535,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ConstantDef_tie<T>::destroy  (
+void POA_CORBA_ConstantDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1555,51 +1547,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::StructDef_tie<T>::StructDef_tie (T &t)
+POA_CORBA_StructDef_tie<T>::POA_CORBA_StructDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::StructDef_tie<T>::StructDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_StructDef_tie<T>::POA_CORBA_StructDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::StructDef_tie<T>::StructDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_StructDef_tie<T>::POA_CORBA_StructDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::StructDef_tie<T>::StructDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_StructDef_tie<T>::POA_CORBA_StructDef_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::StructDef_tie<T>::~StructDef_tie (void)
+POA_CORBA_StructDef_tie<T>::~POA_CORBA_StructDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::StructDef_tie<T>::_tied_object (void)
+POA_CORBA_StructDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::StructDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_StructDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -1607,7 +1596,7 @@ POA_CORBA::StructDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::StructDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_StructDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -1615,28 +1604,28 @@ POA_CORBA::StructDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::StructDef_tie<T>::_is_owner (void)
+POA_CORBA_StructDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::StructDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_StructDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::StructDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_StructDef_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->StructDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_StructDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::StructMemberSeq * POA_CORBA::StructDef_tie<T>::members  (
+CORBA_StructMemberSeq * POA_CORBA_StructDef_tie<T>::members  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1649,8 +1638,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::StructDef_tie<T>::members  (
-    const CORBA::StructMemberSeq & members,
+void POA_CORBA_StructDef_tie<T>::members  (
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1664,7 +1653,7 @@ members,
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained_ptr POA_CORBA::StructDef_tie<T>::lookup  (
+CORBA_Contained_ptr POA_CORBA_StructDef_tie<T>::lookup  (
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1679,7 +1668,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::StructDef_tie<T>::contents  (
+CORBA_ContainedSeq * POA_CORBA_StructDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Environment &ACE_TRY_ENV
@@ -1696,7 +1685,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::StructDef_tie<T>::lookup_name  (
+CORBA_ContainedSeq * POA_CORBA_StructDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
@@ -1717,7 +1706,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container::DescriptionSeq * POA_CORBA::StructDef_tie<T>::describe_contents  (
+CORBA_Container::DescriptionSeq * POA_CORBA_StructDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs,
@@ -1736,7 +1725,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ModuleDef_ptr POA_CORBA::StructDef_tie<T>::create_module  (
+CORBA_ModuleDef_ptr POA_CORBA_StructDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version,
@@ -1755,11 +1744,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ConstantDef_ptr POA_CORBA::StructDef_tie<T>::create_constant  (
+CORBA_ConstantDef_ptr POA_CORBA_StructDef_tie<T>::create_constant  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1778,11 +1767,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::StructDef_ptr POA_CORBA::StructDef_tie<T>::create_struct  (
+CORBA_StructDef_ptr POA_CORBA_StructDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1799,12 +1788,12 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::UnionDef_ptr POA_CORBA::StructDef_tie<T>::create_union  (
+CORBA_UnionDef_ptr POA_CORBA_StructDef_tie<T>::create_union  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1822,11 +1811,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::EnumDef_ptr POA_CORBA::StructDef_tie<T>::create_enum  (
+CORBA_EnumDef_ptr POA_CORBA_StructDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1843,11 +1832,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AliasDef_ptr POA_CORBA::StructDef_tie<T>::create_alias  (
+CORBA_AliasDef_ptr POA_CORBA_StructDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1864,11 +1853,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef_ptr POA_CORBA::StructDef_tie<T>::create_interface  (
+CORBA_InterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1885,17 +1874,17 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_CORBA::StructDef_tie<T>::create_value  (
+CORBA_ValueDef_ptr POA_CORBA_StructDef_tie<T>::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_ValueDef_ptr base_value,
     CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1918,11 +1907,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueBoxDef_ptr POA_CORBA::StructDef_tie<T>::create_value_box  (
+CORBA_ValueBoxDef_ptr POA_CORBA_StructDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1939,11 +1928,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ExceptionDef_ptr POA_CORBA::StructDef_tie<T>::create_exception  (
+CORBA_ExceptionDef_ptr POA_CORBA_StructDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1960,7 +1949,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::NativeDef_ptr POA_CORBA::StructDef_tie<T>::create_native  (
+CORBA_NativeDef_ptr POA_CORBA_StructDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version,
@@ -1979,11 +1968,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AbstractInterfaceDef_ptr POA_CORBA::StructDef_tie<T>::create_abstract_interface  (
+CORBA_AbstractInterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_abstract_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2000,11 +1989,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::LocalInterfaceDef_ptr POA_CORBA::StructDef_tie<T>::create_local_interface  (
+CORBA_LocalInterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2021,7 +2010,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::StructDef_tie<T>::id  (
+char * POA_CORBA_StructDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2034,7 +2023,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::StructDef_tie<T>::id  (
+void POA_CORBA_StructDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2049,7 +2038,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::StructDef_tie<T>::name  (
+char * POA_CORBA_StructDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2062,7 +2051,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::StructDef_tie<T>::name  (
+void POA_CORBA_StructDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2077,7 +2066,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::StructDef_tie<T>::version  (
+char * POA_CORBA_StructDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2090,7 +2079,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::StructDef_tie<T>::version  (
+void POA_CORBA_StructDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2105,7 +2094,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::StructDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_StructDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2118,7 +2107,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::StructDef_tie<T>::absolute_name  (
+char * POA_CORBA_StructDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2131,7 +2120,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::StructDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_StructDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2144,7 +2133,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::StructDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_StructDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2157,8 +2146,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::StructDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_StructDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -2176,7 +2165,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::StructDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_StructDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2189,7 +2178,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::StructDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_StructDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2202,7 +2191,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::StructDef_tie<T>::destroy  (
+void POA_CORBA_StructDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2214,51 +2203,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::UnionDef_tie<T>::UnionDef_tie (T &t)
+POA_CORBA_UnionDef_tie<T>::POA_CORBA_UnionDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::UnionDef_tie<T>::UnionDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_UnionDef_tie<T>::POA_CORBA_UnionDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::UnionDef_tie<T>::UnionDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_UnionDef_tie<T>::POA_CORBA_UnionDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::UnionDef_tie<T>::UnionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_UnionDef_tie<T>::POA_CORBA_UnionDef_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::UnionDef_tie<T>::~UnionDef_tie (void)
+POA_CORBA_UnionDef_tie<T>::~POA_CORBA_UnionDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::UnionDef_tie<T>::_tied_object (void)
+POA_CORBA_UnionDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::UnionDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_UnionDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -2266,7 +2252,7 @@ POA_CORBA::UnionDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::UnionDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_UnionDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -2274,28 +2260,28 @@ POA_CORBA::UnionDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::UnionDef_tie<T>::_is_owner (void)
+POA_CORBA_UnionDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::UnionDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_UnionDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::UnionDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_UnionDef_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->UnionDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_UnionDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::UnionDef_tie<T>::discriminator_type  (
+CORBA::TypeCode_ptr POA_CORBA_UnionDef_tie<T>::discriminator_type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2308,7 +2294,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::IDLType_ptr POA_CORBA::UnionDef_tie<T>::discriminator_type_def  (
+CORBA_IDLType_ptr POA_CORBA_UnionDef_tie<T>::discriminator_type_def  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2321,8 +2307,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::UnionDef_tie<T>::discriminator_type_def  (
-    CORBA::IDLType_ptr discriminator_type_def,
+void POA_CORBA_UnionDef_tie<T>::discriminator_type_def  (
+    CORBA_IDLType_ptr discriminator_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2336,7 +2322,7 @@ discriminator_type_def,
 }
 
 template <class T> ACE_INLINE
-CORBA::UnionMemberSeq * POA_CORBA::UnionDef_tie<T>::members  (
+CORBA_UnionMemberSeq * POA_CORBA_UnionDef_tie<T>::members  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2349,8 +2335,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::UnionDef_tie<T>::members  (
-    const CORBA::UnionMemberSeq & members,
+void POA_CORBA_UnionDef_tie<T>::members  (
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2364,7 +2350,7 @@ members,
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained_ptr POA_CORBA::UnionDef_tie<T>::lookup  (
+CORBA_Contained_ptr POA_CORBA_UnionDef_tie<T>::lookup  (
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2379,7 +2365,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::UnionDef_tie<T>::contents  (
+CORBA_ContainedSeq * POA_CORBA_UnionDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Environment &ACE_TRY_ENV
@@ -2396,7 +2382,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::UnionDef_tie<T>::lookup_name  (
+CORBA_ContainedSeq * POA_CORBA_UnionDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
@@ -2417,7 +2403,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container::DescriptionSeq * POA_CORBA::UnionDef_tie<T>::describe_contents  (
+CORBA_Container::DescriptionSeq * POA_CORBA_UnionDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs,
@@ -2436,7 +2422,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ModuleDef_ptr POA_CORBA::UnionDef_tie<T>::create_module  (
+CORBA_ModuleDef_ptr POA_CORBA_UnionDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version,
@@ -2455,11 +2441,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ConstantDef_ptr POA_CORBA::UnionDef_tie<T>::create_constant  (
+CORBA_ConstantDef_ptr POA_CORBA_UnionDef_tie<T>::create_constant  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2478,11 +2464,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::StructDef_ptr POA_CORBA::UnionDef_tie<T>::create_struct  (
+CORBA_StructDef_ptr POA_CORBA_UnionDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2499,12 +2485,12 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::UnionDef_ptr POA_CORBA::UnionDef_tie<T>::create_union  (
+CORBA_UnionDef_ptr POA_CORBA_UnionDef_tie<T>::create_union  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2522,11 +2508,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::EnumDef_ptr POA_CORBA::UnionDef_tie<T>::create_enum  (
+CORBA_EnumDef_ptr POA_CORBA_UnionDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2543,11 +2529,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AliasDef_ptr POA_CORBA::UnionDef_tie<T>::create_alias  (
+CORBA_AliasDef_ptr POA_CORBA_UnionDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2564,11 +2550,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef_ptr POA_CORBA::UnionDef_tie<T>::create_interface  (
+CORBA_InterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2585,17 +2571,17 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_CORBA::UnionDef_tie<T>::create_value  (
+CORBA_ValueDef_ptr POA_CORBA_UnionDef_tie<T>::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_ValueDef_ptr base_value,
     CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2618,11 +2604,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueBoxDef_ptr POA_CORBA::UnionDef_tie<T>::create_value_box  (
+CORBA_ValueBoxDef_ptr POA_CORBA_UnionDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2639,11 +2625,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ExceptionDef_ptr POA_CORBA::UnionDef_tie<T>::create_exception  (
+CORBA_ExceptionDef_ptr POA_CORBA_UnionDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2660,7 +2646,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::NativeDef_ptr POA_CORBA::UnionDef_tie<T>::create_native  (
+CORBA_NativeDef_ptr POA_CORBA_UnionDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version,
@@ -2679,11 +2665,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AbstractInterfaceDef_ptr POA_CORBA::UnionDef_tie<T>::create_abstract_interface  (
+CORBA_AbstractInterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_abstract_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2700,11 +2686,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::LocalInterfaceDef_ptr POA_CORBA::UnionDef_tie<T>::create_local_interface  (
+CORBA_LocalInterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2721,7 +2707,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::UnionDef_tie<T>::id  (
+char * POA_CORBA_UnionDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2734,7 +2720,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::UnionDef_tie<T>::id  (
+void POA_CORBA_UnionDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2749,7 +2735,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::UnionDef_tie<T>::name  (
+char * POA_CORBA_UnionDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2762,7 +2748,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::UnionDef_tie<T>::name  (
+void POA_CORBA_UnionDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2777,7 +2763,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::UnionDef_tie<T>::version  (
+char * POA_CORBA_UnionDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2790,7 +2776,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::UnionDef_tie<T>::version  (
+void POA_CORBA_UnionDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2805,7 +2791,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::UnionDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_UnionDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2818,7 +2804,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::UnionDef_tie<T>::absolute_name  (
+char * POA_CORBA_UnionDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2831,7 +2817,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::UnionDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_UnionDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2844,7 +2830,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::UnionDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_UnionDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2857,8 +2843,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::UnionDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_UnionDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -2876,7 +2862,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::UnionDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_UnionDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2889,7 +2875,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::UnionDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_UnionDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2902,7 +2888,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::UnionDef_tie<T>::destroy  (
+void POA_CORBA_UnionDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2914,51 +2900,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::EnumDef_tie<T>::EnumDef_tie (T &t)
+POA_CORBA_EnumDef_tie<T>::POA_CORBA_EnumDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::EnumDef_tie<T>::EnumDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_EnumDef_tie<T>::POA_CORBA_EnumDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::EnumDef_tie<T>::EnumDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_EnumDef_tie<T>::POA_CORBA_EnumDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::EnumDef_tie<T>::EnumDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_EnumDef_tie<T>::POA_CORBA_EnumDef_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::EnumDef_tie<T>::~EnumDef_tie (void)
+POA_CORBA_EnumDef_tie<T>::~POA_CORBA_EnumDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::EnumDef_tie<T>::_tied_object (void)
+POA_CORBA_EnumDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::EnumDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_EnumDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -2966,7 +2949,7 @@ POA_CORBA::EnumDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::EnumDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_EnumDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -2974,28 +2957,28 @@ POA_CORBA::EnumDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::EnumDef_tie<T>::_is_owner (void)
+POA_CORBA_EnumDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::EnumDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_EnumDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::EnumDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_EnumDef_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->EnumDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_EnumDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::EnumMemberSeq * POA_CORBA::EnumDef_tie<T>::members  (
+CORBA_EnumMemberSeq * POA_CORBA_EnumDef_tie<T>::members  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3008,8 +2991,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::EnumDef_tie<T>::members  (
-    const CORBA::EnumMemberSeq & members,
+void POA_CORBA_EnumDef_tie<T>::members  (
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3023,7 +3006,7 @@ members,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::EnumDef_tie<T>::id  (
+char * POA_CORBA_EnumDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3036,7 +3019,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::EnumDef_tie<T>::id  (
+void POA_CORBA_EnumDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3051,7 +3034,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::EnumDef_tie<T>::name  (
+char * POA_CORBA_EnumDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3064,7 +3047,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::EnumDef_tie<T>::name  (
+void POA_CORBA_EnumDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3079,7 +3062,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::EnumDef_tie<T>::version  (
+char * POA_CORBA_EnumDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3092,7 +3075,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::EnumDef_tie<T>::version  (
+void POA_CORBA_EnumDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3107,7 +3090,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::EnumDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_EnumDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3120,7 +3103,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::EnumDef_tie<T>::absolute_name  (
+char * POA_CORBA_EnumDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3133,7 +3116,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::EnumDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_EnumDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3146,7 +3129,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::EnumDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_EnumDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3159,8 +3142,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::EnumDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_EnumDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -3178,7 +3161,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::EnumDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_EnumDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3191,7 +3174,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::EnumDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_EnumDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3204,7 +3187,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::EnumDef_tie<T>::destroy  (
+void POA_CORBA_EnumDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3216,51 +3199,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::AliasDef_tie<T>::AliasDef_tie (T &t)
+POA_CORBA_AliasDef_tie<T>::POA_CORBA_AliasDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::AliasDef_tie<T>::AliasDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_AliasDef_tie<T>::POA_CORBA_AliasDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::AliasDef_tie<T>::AliasDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_AliasDef_tie<T>::POA_CORBA_AliasDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::AliasDef_tie<T>::AliasDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_AliasDef_tie<T>::POA_CORBA_AliasDef_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::AliasDef_tie<T>::~AliasDef_tie (void)
+POA_CORBA_AliasDef_tie<T>::~POA_CORBA_AliasDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::AliasDef_tie<T>::_tied_object (void)
+POA_CORBA_AliasDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::AliasDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_AliasDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -3268,7 +3248,7 @@ POA_CORBA::AliasDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::AliasDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_AliasDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -3276,28 +3256,28 @@ POA_CORBA::AliasDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::AliasDef_tie<T>::_is_owner (void)
+POA_CORBA_AliasDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::AliasDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_AliasDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::AliasDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_AliasDef_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->AliasDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_AliasDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::IDLType_ptr POA_CORBA::AliasDef_tie<T>::original_type_def  (
+CORBA_IDLType_ptr POA_CORBA_AliasDef_tie<T>::original_type_def  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3310,8 +3290,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AliasDef_tie<T>::original_type_def  (
-    CORBA::IDLType_ptr original_type_def,
+void POA_CORBA_AliasDef_tie<T>::original_type_def  (
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3325,7 +3305,7 @@ original_type_def,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::AliasDef_tie<T>::id  (
+char * POA_CORBA_AliasDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3338,7 +3318,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AliasDef_tie<T>::id  (
+void POA_CORBA_AliasDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3353,7 +3333,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::AliasDef_tie<T>::name  (
+char * POA_CORBA_AliasDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3366,7 +3346,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AliasDef_tie<T>::name  (
+void POA_CORBA_AliasDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3381,7 +3361,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::AliasDef_tie<T>::version  (
+char * POA_CORBA_AliasDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3394,7 +3374,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AliasDef_tie<T>::version  (
+void POA_CORBA_AliasDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3409,7 +3389,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::AliasDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_AliasDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3422,7 +3402,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::AliasDef_tie<T>::absolute_name  (
+char * POA_CORBA_AliasDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3435,7 +3415,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::AliasDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_AliasDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3448,7 +3428,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::AliasDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_AliasDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3461,8 +3441,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AliasDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_AliasDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -3480,7 +3460,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::AliasDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_AliasDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3493,7 +3473,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::AliasDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_AliasDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3506,7 +3486,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AliasDef_tie<T>::destroy  (
+void POA_CORBA_AliasDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3518,51 +3498,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::NativeDef_tie<T>::NativeDef_tie (T &t)
+POA_CORBA_NativeDef_tie<T>::POA_CORBA_NativeDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::NativeDef_tie<T>::NativeDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_NativeDef_tie<T>::POA_CORBA_NativeDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::NativeDef_tie<T>::NativeDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_NativeDef_tie<T>::POA_CORBA_NativeDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::NativeDef_tie<T>::NativeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_NativeDef_tie<T>::POA_CORBA_NativeDef_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::NativeDef_tie<T>::~NativeDef_tie (void)
+POA_CORBA_NativeDef_tie<T>::~POA_CORBA_NativeDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::NativeDef_tie<T>::_tied_object (void)
+POA_CORBA_NativeDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::NativeDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_NativeDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -3570,7 +3547,7 @@ POA_CORBA::NativeDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::NativeDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_NativeDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -3578,28 +3555,28 @@ POA_CORBA::NativeDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::NativeDef_tie<T>::_is_owner (void)
+POA_CORBA_NativeDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::NativeDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_NativeDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::NativeDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_NativeDef_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->NativeDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_NativeDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::NativeDef_tie<T>::id  (
+char * POA_CORBA_NativeDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3612,7 +3589,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::NativeDef_tie<T>::id  (
+void POA_CORBA_NativeDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3627,7 +3604,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::NativeDef_tie<T>::name  (
+char * POA_CORBA_NativeDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3640,7 +3617,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::NativeDef_tie<T>::name  (
+void POA_CORBA_NativeDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3655,7 +3632,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::NativeDef_tie<T>::version  (
+char * POA_CORBA_NativeDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3668,7 +3645,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::NativeDef_tie<T>::version  (
+void POA_CORBA_NativeDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3683,7 +3660,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::NativeDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_NativeDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3696,7 +3673,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::NativeDef_tie<T>::absolute_name  (
+char * POA_CORBA_NativeDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3709,7 +3686,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::NativeDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_NativeDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3722,7 +3699,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::NativeDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_NativeDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3735,8 +3712,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::NativeDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_NativeDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -3754,7 +3731,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::NativeDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_NativeDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3767,7 +3744,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::NativeDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_NativeDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3780,7 +3757,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::NativeDef_tie<T>::destroy  (
+void POA_CORBA_NativeDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3792,51 +3769,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::PrimitiveDef_tie<T>::PrimitiveDef_tie (T &t)
+POA_CORBA_PrimitiveDef_tie<T>::POA_CORBA_PrimitiveDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::PrimitiveDef_tie<T>::PrimitiveDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_PrimitiveDef_tie<T>::POA_CORBA_PrimitiveDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::PrimitiveDef_tie<T>::PrimitiveDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_PrimitiveDef_tie<T>::POA_CORBA_PrimitiveDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::PrimitiveDef_tie<T>::PrimitiveDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_PrimitiveDef_tie<T>::POA_CORBA_PrimitiveDef_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::PrimitiveDef_tie<T>::~PrimitiveDef_tie (void)
+POA_CORBA_PrimitiveDef_tie<T>::~POA_CORBA_PrimitiveDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::PrimitiveDef_tie<T>::_tied_object (void)
+POA_CORBA_PrimitiveDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::PrimitiveDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_PrimitiveDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -3844,7 +3818,7 @@ POA_CORBA::PrimitiveDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::PrimitiveDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_PrimitiveDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -3852,28 +3826,28 @@ POA_CORBA::PrimitiveDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::PrimitiveDef_tie<T>::_is_owner (void)
+POA_CORBA_PrimitiveDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::PrimitiveDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_PrimitiveDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::PrimitiveDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_PrimitiveDef_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->PrimitiveDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_PrimitiveDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::PrimitiveKind POA_CORBA::PrimitiveDef_tie<T>::kind  (
+CORBA::PrimitiveKind POA_CORBA_PrimitiveDef_tie<T>::kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3886,7 +3860,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::PrimitiveDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_PrimitiveDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3899,7 +3873,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::PrimitiveDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_PrimitiveDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3912,7 +3886,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::PrimitiveDef_tie<T>::destroy  (
+void POA_CORBA_PrimitiveDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3924,51 +3898,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::StringDef_tie<T>::StringDef_tie (T &t)
+POA_CORBA_StringDef_tie<T>::POA_CORBA_StringDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::StringDef_tie<T>::StringDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_StringDef_tie<T>::POA_CORBA_StringDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::StringDef_tie<T>::StringDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_StringDef_tie<T>::POA_CORBA_StringDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::StringDef_tie<T>::StringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_StringDef_tie<T>::POA_CORBA_StringDef_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::StringDef_tie<T>::~StringDef_tie (void)
+POA_CORBA_StringDef_tie<T>::~POA_CORBA_StringDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::StringDef_tie<T>::_tied_object (void)
+POA_CORBA_StringDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::StringDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_StringDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -3976,7 +3947,7 @@ POA_CORBA::StringDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::StringDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_StringDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -3984,28 +3955,28 @@ POA_CORBA::StringDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::StringDef_tie<T>::_is_owner (void)
+POA_CORBA_StringDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::StringDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_StringDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::StringDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_StringDef_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->StringDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_StringDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::ULong POA_CORBA::StringDef_tie<T>::bound  (
+CORBA::ULong POA_CORBA_StringDef_tie<T>::bound  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4018,7 +3989,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::StringDef_tie<T>::bound  (
+void POA_CORBA_StringDef_tie<T>::bound  (
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -4033,7 +4004,7 @@ bound,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::StringDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_StringDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4046,7 +4017,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::StringDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_StringDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4059,7 +4030,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::StringDef_tie<T>::destroy  (
+void POA_CORBA_StringDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4071,51 +4042,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::WstringDef_tie<T>::WstringDef_tie (T &t)
+POA_CORBA_WstringDef_tie<T>::POA_CORBA_WstringDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::WstringDef_tie<T>::WstringDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_WstringDef_tie<T>::POA_CORBA_WstringDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::WstringDef_tie<T>::WstringDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_WstringDef_tie<T>::POA_CORBA_WstringDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::WstringDef_tie<T>::WstringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_WstringDef_tie<T>::POA_CORBA_WstringDef_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::WstringDef_tie<T>::~WstringDef_tie (void)
+POA_CORBA_WstringDef_tie<T>::~POA_CORBA_WstringDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::WstringDef_tie<T>::_tied_object (void)
+POA_CORBA_WstringDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::WstringDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_WstringDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -4123,7 +4091,7 @@ POA_CORBA::WstringDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::WstringDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_WstringDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -4131,28 +4099,28 @@ POA_CORBA::WstringDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::WstringDef_tie<T>::_is_owner (void)
+POA_CORBA_WstringDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::WstringDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_WstringDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::WstringDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_WstringDef_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->WstringDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_WstringDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::ULong POA_CORBA::WstringDef_tie<T>::bound  (
+CORBA::ULong POA_CORBA_WstringDef_tie<T>::bound  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4165,7 +4133,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::WstringDef_tie<T>::bound  (
+void POA_CORBA_WstringDef_tie<T>::bound  (
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -4180,7 +4148,7 @@ bound,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::WstringDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_WstringDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4193,7 +4161,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::WstringDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_WstringDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4206,7 +4174,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::WstringDef_tie<T>::destroy  (
+void POA_CORBA_WstringDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4218,51 +4186,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::SequenceDef_tie<T>::SequenceDef_tie (T &t)
+POA_CORBA_SequenceDef_tie<T>::POA_CORBA_SequenceDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::SequenceDef_tie<T>::SequenceDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_SequenceDef_tie<T>::POA_CORBA_SequenceDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::SequenceDef_tie<T>::SequenceDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_SequenceDef_tie<T>::POA_CORBA_SequenceDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::SequenceDef_tie<T>::SequenceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_SequenceDef_tie<T>::POA_CORBA_SequenceDef_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::SequenceDef_tie<T>::~SequenceDef_tie (void)
+POA_CORBA_SequenceDef_tie<T>::~POA_CORBA_SequenceDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::SequenceDef_tie<T>::_tied_object (void)
+POA_CORBA_SequenceDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::SequenceDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_SequenceDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -4270,7 +4235,7 @@ POA_CORBA::SequenceDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::SequenceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_SequenceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -4278,28 +4243,28 @@ POA_CORBA::SequenceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::SequenceDef_tie<T>::_is_owner (void)
+POA_CORBA_SequenceDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::SequenceDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_SequenceDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::SequenceDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_SequenceDef_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->SequenceDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_SequenceDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::ULong POA_CORBA::SequenceDef_tie<T>::bound  (
+CORBA::ULong POA_CORBA_SequenceDef_tie<T>::bound  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4312,7 +4277,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::SequenceDef_tie<T>::bound  (
+void POA_CORBA_SequenceDef_tie<T>::bound  (
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -4327,7 +4292,7 @@ bound,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::SequenceDef_tie<T>::element_type  (
+CORBA::TypeCode_ptr POA_CORBA_SequenceDef_tie<T>::element_type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4340,7 +4305,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::IDLType_ptr POA_CORBA::SequenceDef_tie<T>::element_type_def  (
+CORBA_IDLType_ptr POA_CORBA_SequenceDef_tie<T>::element_type_def  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4353,8 +4318,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::SequenceDef_tie<T>::element_type_def  (
-    CORBA::IDLType_ptr element_type_def,
+void POA_CORBA_SequenceDef_tie<T>::element_type_def  (
+    CORBA_IDLType_ptr element_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4368,7 +4333,7 @@ element_type_def,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::SequenceDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_SequenceDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4381,7 +4346,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::SequenceDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_SequenceDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4394,7 +4359,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::SequenceDef_tie<T>::destroy  (
+void POA_CORBA_SequenceDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4406,51 +4371,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::ArrayDef_tie<T>::ArrayDef_tie (T &t)
+POA_CORBA_ArrayDef_tie<T>::POA_CORBA_ArrayDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ArrayDef_tie<T>::ArrayDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_ArrayDef_tie<T>::POA_CORBA_ArrayDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ArrayDef_tie<T>::ArrayDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_ArrayDef_tie<T>::POA_CORBA_ArrayDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ArrayDef_tie<T>::ArrayDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_ArrayDef_tie<T>::POA_CORBA_ArrayDef_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::ArrayDef_tie<T>::~ArrayDef_tie (void)
+POA_CORBA_ArrayDef_tie<T>::~POA_CORBA_ArrayDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::ArrayDef_tie<T>::_tied_object (void)
+POA_CORBA_ArrayDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ArrayDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_ArrayDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -4458,7 +4420,7 @@ POA_CORBA::ArrayDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ArrayDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_ArrayDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -4466,28 +4428,28 @@ POA_CORBA::ArrayDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ArrayDef_tie<T>::_is_owner (void)
+POA_CORBA_ArrayDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ArrayDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_ArrayDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ArrayDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ArrayDef_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->ArrayDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ArrayDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::ULong POA_CORBA::ArrayDef_tie<T>::length  (
+CORBA::ULong POA_CORBA_ArrayDef_tie<T>::length  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4500,7 +4462,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ArrayDef_tie<T>::length  (
+void POA_CORBA_ArrayDef_tie<T>::length  (
     CORBA::ULong length,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -4515,7 +4477,7 @@ length,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ArrayDef_tie<T>::element_type  (
+CORBA::TypeCode_ptr POA_CORBA_ArrayDef_tie<T>::element_type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4528,7 +4490,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::IDLType_ptr POA_CORBA::ArrayDef_tie<T>::element_type_def  (
+CORBA_IDLType_ptr POA_CORBA_ArrayDef_tie<T>::element_type_def  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4541,8 +4503,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ArrayDef_tie<T>::element_type_def  (
-    CORBA::IDLType_ptr element_type_def,
+void POA_CORBA_ArrayDef_tie<T>::element_type_def  (
+    CORBA_IDLType_ptr element_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4556,7 +4518,7 @@ element_type_def,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ArrayDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_ArrayDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4569,7 +4531,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::ArrayDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_ArrayDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4582,7 +4544,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ArrayDef_tie<T>::destroy  (
+void POA_CORBA_ArrayDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4594,51 +4556,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::ExceptionDef_tie<T>::ExceptionDef_tie (T &t)
+POA_CORBA_ExceptionDef_tie<T>::POA_CORBA_ExceptionDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ExceptionDef_tie<T>::ExceptionDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_ExceptionDef_tie<T>::POA_CORBA_ExceptionDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ExceptionDef_tie<T>::ExceptionDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_ExceptionDef_tie<T>::POA_CORBA_ExceptionDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ExceptionDef_tie<T>::ExceptionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_ExceptionDef_tie<T>::POA_CORBA_ExceptionDef_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::ExceptionDef_tie<T>::~ExceptionDef_tie (void)
+POA_CORBA_ExceptionDef_tie<T>::~POA_CORBA_ExceptionDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::ExceptionDef_tie<T>::_tied_object (void)
+POA_CORBA_ExceptionDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ExceptionDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_ExceptionDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -4646,7 +4605,7 @@ POA_CORBA::ExceptionDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ExceptionDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_ExceptionDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -4654,28 +4613,28 @@ POA_CORBA::ExceptionDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ExceptionDef_tie<T>::_is_owner (void)
+POA_CORBA_ExceptionDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ExceptionDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_ExceptionDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ExceptionDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ExceptionDef_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->ExceptionDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ExceptionDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ExceptionDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_ExceptionDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4688,7 +4647,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::StructMemberSeq * POA_CORBA::ExceptionDef_tie<T>::members  (
+CORBA_StructMemberSeq * POA_CORBA_ExceptionDef_tie<T>::members  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4701,8 +4660,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ExceptionDef_tie<T>::members  (
-    const CORBA::StructMemberSeq & members,
+void POA_CORBA_ExceptionDef_tie<T>::members  (
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4716,7 +4675,7 @@ members,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ExceptionDef_tie<T>::id  (
+char * POA_CORBA_ExceptionDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4729,7 +4688,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ExceptionDef_tie<T>::id  (
+void POA_CORBA_ExceptionDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -4744,7 +4703,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ExceptionDef_tie<T>::name  (
+char * POA_CORBA_ExceptionDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4757,7 +4716,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ExceptionDef_tie<T>::name  (
+void POA_CORBA_ExceptionDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -4772,7 +4731,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ExceptionDef_tie<T>::version  (
+char * POA_CORBA_ExceptionDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4785,7 +4744,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ExceptionDef_tie<T>::version  (
+void POA_CORBA_ExceptionDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -4800,7 +4759,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::ExceptionDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_ExceptionDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4813,7 +4772,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ExceptionDef_tie<T>::absolute_name  (
+char * POA_CORBA_ExceptionDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4826,7 +4785,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::ExceptionDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_ExceptionDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4839,7 +4798,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::ExceptionDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_ExceptionDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4852,8 +4811,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ExceptionDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_ExceptionDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -4871,7 +4830,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained_ptr POA_CORBA::ExceptionDef_tie<T>::lookup  (
+CORBA_Contained_ptr POA_CORBA_ExceptionDef_tie<T>::lookup  (
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -4886,7 +4845,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::ExceptionDef_tie<T>::contents  (
+CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Environment &ACE_TRY_ENV
@@ -4903,7 +4862,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::ExceptionDef_tie<T>::lookup_name  (
+CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
@@ -4924,7 +4883,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container::DescriptionSeq * POA_CORBA::ExceptionDef_tie<T>::describe_contents  (
+CORBA_Container::DescriptionSeq * POA_CORBA_ExceptionDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs,
@@ -4943,7 +4902,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ModuleDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_module  (
+CORBA_ModuleDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version,
@@ -4962,11 +4921,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ConstantDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_constant  (
+CORBA_ConstantDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_constant  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -4985,11 +4944,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::StructDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_struct  (
+CORBA_StructDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5006,12 +4965,12 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::UnionDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_union  (
+CORBA_UnionDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_union  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5029,11 +4988,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::EnumDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_enum  (
+CORBA_EnumDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5050,11 +5009,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AliasDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_alias  (
+CORBA_AliasDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5071,11 +5030,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_interface  (
+CORBA_InterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5092,17 +5051,17 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_value  (
+CORBA_ValueDef_ptr POA_CORBA_ExceptionDef_tie<T>::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_ValueDef_ptr base_value,
     CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5125,11 +5084,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueBoxDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_value_box  (
+CORBA_ValueBoxDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5146,11 +5105,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ExceptionDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_exception  (
+CORBA_ExceptionDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5167,7 +5126,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::NativeDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_native  (
+CORBA_NativeDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version,
@@ -5186,11 +5145,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AbstractInterfaceDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_abstract_interface  (
+CORBA_AbstractInterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_abstract_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5207,11 +5166,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::LocalInterfaceDef_ptr POA_CORBA::ExceptionDef_tie<T>::create_local_interface  (
+CORBA_LocalInterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5228,7 +5187,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::ExceptionDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_ExceptionDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5241,7 +5200,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ExceptionDef_tie<T>::destroy  (
+void POA_CORBA_ExceptionDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5253,51 +5212,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::AttributeDef_tie<T>::AttributeDef_tie (T &t)
+POA_CORBA_AttributeDef_tie<T>::POA_CORBA_AttributeDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::AttributeDef_tie<T>::AttributeDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_AttributeDef_tie<T>::POA_CORBA_AttributeDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::AttributeDef_tie<T>::AttributeDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_AttributeDef_tie<T>::POA_CORBA_AttributeDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::AttributeDef_tie<T>::AttributeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_AttributeDef_tie<T>::POA_CORBA_AttributeDef_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::AttributeDef_tie<T>::~AttributeDef_tie (void)
+POA_CORBA_AttributeDef_tie<T>::~POA_CORBA_AttributeDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::AttributeDef_tie<T>::_tied_object (void)
+POA_CORBA_AttributeDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::AttributeDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_AttributeDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -5305,7 +5261,7 @@ POA_CORBA::AttributeDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::AttributeDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_AttributeDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -5313,28 +5269,28 @@ POA_CORBA::AttributeDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::AttributeDef_tie<T>::_is_owner (void)
+POA_CORBA_AttributeDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::AttributeDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_AttributeDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::AttributeDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_AttributeDef_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->AttributeDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_AttributeDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::AttributeDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_AttributeDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5347,7 +5303,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::IDLType_ptr POA_CORBA::AttributeDef_tie<T>::type_def  (
+CORBA_IDLType_ptr POA_CORBA_AttributeDef_tie<T>::type_def  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5360,8 +5316,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AttributeDef_tie<T>::type_def  (
-    CORBA::IDLType_ptr type_def,
+void POA_CORBA_AttributeDef_tie<T>::type_def  (
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5375,7 +5331,7 @@ type_def,
 }
 
 template <class T> ACE_INLINE
-CORBA::AttributeMode POA_CORBA::AttributeDef_tie<T>::mode  (
+CORBA::AttributeMode POA_CORBA_AttributeDef_tie<T>::mode  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5388,7 +5344,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AttributeDef_tie<T>::mode  (
+void POA_CORBA_AttributeDef_tie<T>::mode  (
     CORBA::AttributeMode mode,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5403,7 +5359,7 @@ mode,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::AttributeDef_tie<T>::id  (
+char * POA_CORBA_AttributeDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5416,7 +5372,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AttributeDef_tie<T>::id  (
+void POA_CORBA_AttributeDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5431,7 +5387,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::AttributeDef_tie<T>::name  (
+char * POA_CORBA_AttributeDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5444,7 +5400,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AttributeDef_tie<T>::name  (
+void POA_CORBA_AttributeDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5459,7 +5415,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::AttributeDef_tie<T>::version  (
+char * POA_CORBA_AttributeDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5472,7 +5428,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AttributeDef_tie<T>::version  (
+void POA_CORBA_AttributeDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5487,7 +5443,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::AttributeDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_AttributeDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5500,7 +5456,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::AttributeDef_tie<T>::absolute_name  (
+char * POA_CORBA_AttributeDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5513,7 +5469,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::AttributeDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_AttributeDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5526,7 +5482,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::AttributeDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_AttributeDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5539,8 +5495,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AttributeDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_AttributeDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -5558,7 +5514,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::AttributeDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_AttributeDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5571,7 +5527,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AttributeDef_tie<T>::destroy  (
+void POA_CORBA_AttributeDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5583,51 +5539,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::OperationDef_tie<T>::OperationDef_tie (T &t)
+POA_CORBA_OperationDef_tie<T>::POA_CORBA_OperationDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::OperationDef_tie<T>::OperationDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_OperationDef_tie<T>::POA_CORBA_OperationDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::OperationDef_tie<T>::OperationDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_OperationDef_tie<T>::POA_CORBA_OperationDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::OperationDef_tie<T>::OperationDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_OperationDef_tie<T>::POA_CORBA_OperationDef_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::OperationDef_tie<T>::~OperationDef_tie (void)
+POA_CORBA_OperationDef_tie<T>::~POA_CORBA_OperationDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::OperationDef_tie<T>::_tied_object (void)
+POA_CORBA_OperationDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::OperationDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_OperationDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -5635,7 +5588,7 @@ POA_CORBA::OperationDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::OperationDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_OperationDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -5643,28 +5596,28 @@ POA_CORBA::OperationDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::OperationDef_tie<T>::_is_owner (void)
+POA_CORBA_OperationDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::OperationDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_OperationDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::OperationDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_OperationDef_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->OperationDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_OperationDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::OperationDef_tie<T>::result  (
+CORBA::TypeCode_ptr POA_CORBA_OperationDef_tie<T>::result  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5677,7 +5630,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::IDLType_ptr POA_CORBA::OperationDef_tie<T>::result_def  (
+CORBA_IDLType_ptr POA_CORBA_OperationDef_tie<T>::result_def  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5690,8 +5643,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::result_def  (
-    CORBA::IDLType_ptr result_def,
+void POA_CORBA_OperationDef_tie<T>::result_def  (
+    CORBA_IDLType_ptr result_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5705,7 +5658,7 @@ result_def,
 }
 
 template <class T> ACE_INLINE
-CORBA::ParDescriptionSeq * POA_CORBA::OperationDef_tie<T>::params  (
+CORBA_ParDescriptionSeq * POA_CORBA_OperationDef_tie<T>::params  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5718,8 +5671,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::params  (
-    const CORBA::ParDescriptionSeq & params,
+void POA_CORBA_OperationDef_tie<T>::params  (
+    const CORBA_ParDescriptionSeq & params,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5733,7 +5686,7 @@ params,
 }
 
 template <class T> ACE_INLINE
-CORBA::OperationMode POA_CORBA::OperationDef_tie<T>::mode  (
+CORBA::OperationMode POA_CORBA_OperationDef_tie<T>::mode  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5746,7 +5699,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::mode  (
+void POA_CORBA_OperationDef_tie<T>::mode  (
     CORBA::OperationMode mode,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5761,7 +5714,7 @@ mode,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContextIdSeq * POA_CORBA::OperationDef_tie<T>::contexts  (
+CORBA_ContextIdSeq * POA_CORBA_OperationDef_tie<T>::contexts  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5774,8 +5727,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::contexts  (
-    const CORBA::ContextIdSeq & contexts,
+void POA_CORBA_OperationDef_tie<T>::contexts  (
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5789,7 +5742,7 @@ contexts,
 }
 
 template <class T> ACE_INLINE
-CORBA::ExceptionDefSeq * POA_CORBA::OperationDef_tie<T>::exceptions  (
+CORBA_ExceptionDefSeq * POA_CORBA_OperationDef_tie<T>::exceptions  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5802,8 +5755,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::exceptions  (
-    const CORBA::ExceptionDefSeq & exceptions,
+void POA_CORBA_OperationDef_tie<T>::exceptions  (
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5817,7 +5770,7 @@ exceptions,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::OperationDef_tie<T>::id  (
+char * POA_CORBA_OperationDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5830,7 +5783,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::id  (
+void POA_CORBA_OperationDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5845,7 +5798,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::OperationDef_tie<T>::name  (
+char * POA_CORBA_OperationDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5858,7 +5811,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::name  (
+void POA_CORBA_OperationDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5873,7 +5826,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::OperationDef_tie<T>::version  (
+char * POA_CORBA_OperationDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5886,7 +5839,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::version  (
+void POA_CORBA_OperationDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5901,7 +5854,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::OperationDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_OperationDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5914,7 +5867,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::OperationDef_tie<T>::absolute_name  (
+char * POA_CORBA_OperationDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5927,7 +5880,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::OperationDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_OperationDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5940,7 +5893,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::OperationDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_OperationDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5953,8 +5906,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_OperationDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -5972,7 +5925,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::OperationDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_OperationDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5985,7 +5938,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::OperationDef_tie<T>::destroy  (
+void POA_CORBA_OperationDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5997,51 +5950,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::InterfaceDef_tie<T>::InterfaceDef_tie (T &t)
+POA_CORBA_InterfaceDef_tie<T>::POA_CORBA_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)
+POA_CORBA_InterfaceDef_tie<T>::POA_CORBA_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)
+POA_CORBA_InterfaceDef_tie<T>::POA_CORBA_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)
+POA_CORBA_InterfaceDef_tie<T>::POA_CORBA_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)
+POA_CORBA_InterfaceDef_tie<T>::~POA_CORBA_InterfaceDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::InterfaceDef_tie<T>::_tied_object (void)
+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)
+POA_CORBA_InterfaceDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -6049,7 +5999,7 @@ POA_CORBA::InterfaceDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::InterfaceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_InterfaceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -6057,28 +6007,28 @@ POA_CORBA::InterfaceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::InterfaceDef_tie<T>::_is_owner (void)
+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)
+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)
+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);
+  return this->POA_CORBA_InterfaceDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDefSeq * POA_CORBA::InterfaceDef_tie<T>::base_interfaces  (
+CORBA_InterfaceDefSeq * POA_CORBA_InterfaceDef_tie<T>::base_interfaces  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6091,8 +6041,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::InterfaceDef_tie<T>::base_interfaces  (
-    const CORBA::InterfaceDefSeq & base_interfaces,
+void POA_CORBA_InterfaceDef_tie<T>::base_interfaces  (
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6106,7 +6056,7 @@ base_interfaces,
 }
 
 template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::InterfaceDef_tie<T>::is_a  (
+CORBA::Boolean POA_CORBA_InterfaceDef_tie<T>::is_a  (
     const char * interface_id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6121,7 +6071,7 @@ interface_id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::InterfaceDef_tie<T>::describe_interface  (
+CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_InterfaceDef_tie<T>::describe_interface  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6134,11 +6084,11 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::AttributeDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_attribute  (
+CORBA_AttributeDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_attribute  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6157,15 +6107,15 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::OperationDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_operation  (
+CORBA_OperationDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_operation  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6186,7 +6136,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained_ptr POA_CORBA::InterfaceDef_tie<T>::lookup  (
+CORBA_Contained_ptr POA_CORBA_InterfaceDef_tie<T>::lookup  (
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6201,7 +6151,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::InterfaceDef_tie<T>::contents  (
+CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Environment &ACE_TRY_ENV
@@ -6218,7 +6168,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::InterfaceDef_tie<T>::lookup_name  (
+CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
@@ -6239,7 +6189,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container::DescriptionSeq * POA_CORBA::InterfaceDef_tie<T>::describe_contents  (
+CORBA_Container::DescriptionSeq * POA_CORBA_InterfaceDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs,
@@ -6258,7 +6208,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ModuleDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_module  (
+CORBA_ModuleDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version,
@@ -6277,11 +6227,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ConstantDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_constant  (
+CORBA_ConstantDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_constant  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6300,11 +6250,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::StructDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_struct  (
+CORBA_StructDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6321,12 +6271,12 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::UnionDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_union  (
+CORBA_UnionDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_union  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6344,11 +6294,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::EnumDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_enum  (
+CORBA_EnumDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6365,11 +6315,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AliasDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_alias  (
+CORBA_AliasDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6386,11 +6336,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_interface  (
+CORBA_InterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6407,17 +6357,17 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_value  (
+CORBA_ValueDef_ptr POA_CORBA_InterfaceDef_tie<T>::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_ValueDef_ptr base_value,
     CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6440,11 +6390,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueBoxDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_value_box  (
+CORBA_ValueBoxDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6461,11 +6411,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ExceptionDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_exception  (
+CORBA_ExceptionDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6482,7 +6432,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::NativeDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_native  (
+CORBA_NativeDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version,
@@ -6501,11 +6451,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AbstractInterfaceDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_abstract_interface  (
+CORBA_AbstractInterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_abstract_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6522,11 +6472,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::LocalInterfaceDef_ptr POA_CORBA::InterfaceDef_tie<T>::create_local_interface  (
+CORBA_LocalInterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6543,7 +6493,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::InterfaceDef_tie<T>::id  (
+char * POA_CORBA_InterfaceDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6556,7 +6506,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::InterfaceDef_tie<T>::id  (
+void POA_CORBA_InterfaceDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6571,7 +6521,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::InterfaceDef_tie<T>::name  (
+char * POA_CORBA_InterfaceDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6584,7 +6534,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::InterfaceDef_tie<T>::name  (
+void POA_CORBA_InterfaceDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6599,7 +6549,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::InterfaceDef_tie<T>::version  (
+char * POA_CORBA_InterfaceDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6612,7 +6562,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::InterfaceDef_tie<T>::version  (
+void POA_CORBA_InterfaceDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6627,7 +6577,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::InterfaceDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_InterfaceDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6640,7 +6590,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::InterfaceDef_tie<T>::absolute_name  (
+char * POA_CORBA_InterfaceDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6653,7 +6603,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::InterfaceDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_InterfaceDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6666,7 +6616,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::InterfaceDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_InterfaceDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6679,8 +6629,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::InterfaceDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_InterfaceDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -6698,7 +6648,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::InterfaceDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_InterfaceDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6711,7 +6661,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::InterfaceDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_InterfaceDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6724,7 +6674,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::InterfaceDef_tie<T>::destroy  (
+void POA_CORBA_InterfaceDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6736,51 +6686,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::AbstractInterfaceDef_tie<T>::AbstractInterfaceDef_tie (T &t)
+POA_CORBA_AbstractInterfaceDef_tie<T>::POA_CORBA_AbstractInterfaceDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::AbstractInterfaceDef_tie<T>::AbstractInterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_AbstractInterfaceDef_tie<T>::POA_CORBA_AbstractInterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::AbstractInterfaceDef_tie<T>::AbstractInterfaceDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_AbstractInterfaceDef_tie<T>::POA_CORBA_AbstractInterfaceDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::AbstractInterfaceDef_tie<T>::AbstractInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_AbstractInterfaceDef_tie<T>::POA_CORBA_AbstractInterfaceDef_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::AbstractInterfaceDef_tie<T>::~AbstractInterfaceDef_tie (void)
+POA_CORBA_AbstractInterfaceDef_tie<T>::~POA_CORBA_AbstractInterfaceDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::AbstractInterfaceDef_tie<T>::_tied_object (void)
+POA_CORBA_AbstractInterfaceDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::AbstractInterfaceDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_AbstractInterfaceDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -6788,7 +6735,7 @@ POA_CORBA::AbstractInterfaceDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::AbstractInterfaceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_AbstractInterfaceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -6796,28 +6743,28 @@ POA_CORBA::AbstractInterfaceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean rel
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::AbstractInterfaceDef_tie<T>::_is_owner (void)
+POA_CORBA_AbstractInterfaceDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::AbstractInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_AbstractInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::AbstractInterfaceDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_AbstractInterfaceDef_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->AbstractInterfaceDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_AbstractInterfaceDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDefSeq * POA_CORBA::AbstractInterfaceDef_tie<T>::base_interfaces  (
+CORBA_InterfaceDefSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::base_interfaces  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6830,8 +6777,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AbstractInterfaceDef_tie<T>::base_interfaces  (
-    const CORBA::InterfaceDefSeq & base_interfaces,
+void POA_CORBA_AbstractInterfaceDef_tie<T>::base_interfaces  (
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6845,7 +6792,7 @@ base_interfaces,
 }
 
 template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::AbstractInterfaceDef_tie<T>::is_a  (
+CORBA::Boolean POA_CORBA_AbstractInterfaceDef_tie<T>::is_a  (
     const char * interface_id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6860,7 +6807,7 @@ interface_id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::AbstractInterfaceDef_tie<T>::describe_interface  (
+CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_AbstractInterfaceDef_tie<T>::describe_interface  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6873,11 +6820,11 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::AttributeDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_attribute  (
+CORBA_AttributeDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_attribute  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6896,15 +6843,15 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::OperationDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_operation  (
+CORBA_OperationDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_operation  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6925,7 +6872,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::lookup  (
+CORBA_Contained_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::lookup  (
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6940,7 +6887,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::AbstractInterfaceDef_tie<T>::contents  (
+CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Environment &ACE_TRY_ENV
@@ -6957,7 +6904,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::AbstractInterfaceDef_tie<T>::lookup_name  (
+CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
@@ -6978,7 +6925,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container::DescriptionSeq * POA_CORBA::AbstractInterfaceDef_tie<T>::describe_contents  (
+CORBA_Container::DescriptionSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs,
@@ -6997,7 +6944,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ModuleDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_module  (
+CORBA_ModuleDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version,
@@ -7016,11 +6963,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ConstantDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_constant  (
+CORBA_ConstantDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_constant  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7039,11 +6986,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::StructDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_struct  (
+CORBA_StructDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7060,12 +7007,12 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::UnionDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_union  (
+CORBA_UnionDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_union  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7083,11 +7030,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::EnumDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_enum  (
+CORBA_EnumDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7104,11 +7051,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AliasDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_alias  (
+CORBA_AliasDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7125,11 +7072,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_interface  (
+CORBA_InterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7146,17 +7093,17 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_value  (
+CORBA_ValueDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::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_ValueDef_ptr base_value,
     CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7179,11 +7126,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueBoxDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_value_box  (
+CORBA_ValueBoxDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7200,11 +7147,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ExceptionDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_exception  (
+CORBA_ExceptionDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7221,7 +7168,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::NativeDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_native  (
+CORBA_NativeDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version,
@@ -7240,11 +7187,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AbstractInterfaceDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_abstract_interface  (
+CORBA_AbstractInterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_abstract_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7261,11 +7208,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::LocalInterfaceDef_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::create_local_interface  (
+CORBA_LocalInterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7282,7 +7229,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::AbstractInterfaceDef_tie<T>::id  (
+char * POA_CORBA_AbstractInterfaceDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7295,7 +7242,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AbstractInterfaceDef_tie<T>::id  (
+void POA_CORBA_AbstractInterfaceDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7310,7 +7257,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::AbstractInterfaceDef_tie<T>::name  (
+char * POA_CORBA_AbstractInterfaceDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7323,7 +7270,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AbstractInterfaceDef_tie<T>::name  (
+void POA_CORBA_AbstractInterfaceDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7338,7 +7285,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::AbstractInterfaceDef_tie<T>::version  (
+char * POA_CORBA_AbstractInterfaceDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7351,7 +7298,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AbstractInterfaceDef_tie<T>::version  (
+void POA_CORBA_AbstractInterfaceDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7366,7 +7313,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7379,7 +7326,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::AbstractInterfaceDef_tie<T>::absolute_name  (
+char * POA_CORBA_AbstractInterfaceDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7392,7 +7339,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7405,7 +7352,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::AbstractInterfaceDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_AbstractInterfaceDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7418,8 +7365,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AbstractInterfaceDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_AbstractInterfaceDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -7437,7 +7384,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::AbstractInterfaceDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7450,7 +7397,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::AbstractInterfaceDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_AbstractInterfaceDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7463,7 +7410,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::AbstractInterfaceDef_tie<T>::destroy  (
+void POA_CORBA_AbstractInterfaceDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7475,51 +7422,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::LocalInterfaceDef_tie<T>::LocalInterfaceDef_tie (T &t)
+POA_CORBA_LocalInterfaceDef_tie<T>::POA_CORBA_LocalInterfaceDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::LocalInterfaceDef_tie<T>::LocalInterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_LocalInterfaceDef_tie<T>::POA_CORBA_LocalInterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::LocalInterfaceDef_tie<T>::LocalInterfaceDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_LocalInterfaceDef_tie<T>::POA_CORBA_LocalInterfaceDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::LocalInterfaceDef_tie<T>::LocalInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_LocalInterfaceDef_tie<T>::POA_CORBA_LocalInterfaceDef_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::LocalInterfaceDef_tie<T>::~LocalInterfaceDef_tie (void)
+POA_CORBA_LocalInterfaceDef_tie<T>::~POA_CORBA_LocalInterfaceDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::LocalInterfaceDef_tie<T>::_tied_object (void)
+POA_CORBA_LocalInterfaceDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::LocalInterfaceDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_LocalInterfaceDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -7527,7 +7471,7 @@ POA_CORBA::LocalInterfaceDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::LocalInterfaceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_LocalInterfaceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -7535,28 +7479,28 @@ POA_CORBA::LocalInterfaceDef_tie<T>::_tied_object (T *obj, CORBA::Boolean releas
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::LocalInterfaceDef_tie<T>::_is_owner (void)
+POA_CORBA_LocalInterfaceDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::LocalInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_LocalInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::LocalInterfaceDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_LocalInterfaceDef_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->LocalInterfaceDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_LocalInterfaceDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDefSeq * POA_CORBA::LocalInterfaceDef_tie<T>::base_interfaces  (
+CORBA_InterfaceDefSeq * POA_CORBA_LocalInterfaceDef_tie<T>::base_interfaces  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7569,8 +7513,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::LocalInterfaceDef_tie<T>::base_interfaces  (
-    const CORBA::InterfaceDefSeq & base_interfaces,
+void POA_CORBA_LocalInterfaceDef_tie<T>::base_interfaces  (
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7584,7 +7528,7 @@ base_interfaces,
 }
 
 template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::LocalInterfaceDef_tie<T>::is_a  (
+CORBA::Boolean POA_CORBA_LocalInterfaceDef_tie<T>::is_a  (
     const char * interface_id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7599,7 +7543,7 @@ interface_id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription * POA_CORBA::LocalInterfaceDef_tie<T>::describe_interface  (
+CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_LocalInterfaceDef_tie<T>::describe_interface  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7612,11 +7556,11 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::AttributeDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_attribute  (
+CORBA_AttributeDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_attribute  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7635,15 +7579,15 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::OperationDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_operation  (
+CORBA_OperationDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_operation  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7664,7 +7608,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained_ptr POA_CORBA::LocalInterfaceDef_tie<T>::lookup  (
+CORBA_Contained_ptr POA_CORBA_LocalInterfaceDef_tie<T>::lookup  (
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7679,7 +7623,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::LocalInterfaceDef_tie<T>::contents  (
+CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Environment &ACE_TRY_ENV
@@ -7696,7 +7640,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::LocalInterfaceDef_tie<T>::lookup_name  (
+CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
@@ -7717,7 +7661,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container::DescriptionSeq * POA_CORBA::LocalInterfaceDef_tie<T>::describe_contents  (
+CORBA_Container::DescriptionSeq * POA_CORBA_LocalInterfaceDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs,
@@ -7736,7 +7680,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ModuleDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_module  (
+CORBA_ModuleDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version,
@@ -7755,11 +7699,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ConstantDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_constant  (
+CORBA_ConstantDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_constant  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7778,11 +7722,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::StructDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_struct  (
+CORBA_StructDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7799,12 +7743,12 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::UnionDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_union  (
+CORBA_UnionDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_union  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7822,11 +7766,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::EnumDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_enum  (
+CORBA_EnumDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7843,11 +7787,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AliasDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_alias  (
+CORBA_AliasDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7864,11 +7808,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_interface  (
+CORBA_InterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7885,17 +7829,17 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_value  (
+CORBA_ValueDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::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_ValueDef_ptr base_value,
     CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7918,11 +7862,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueBoxDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_value_box  (
+CORBA_ValueBoxDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7939,11 +7883,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ExceptionDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_exception  (
+CORBA_ExceptionDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7960,7 +7904,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::NativeDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_native  (
+CORBA_NativeDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version,
@@ -7979,11 +7923,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AbstractInterfaceDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_abstract_interface  (
+CORBA_AbstractInterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_abstract_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -8000,11 +7944,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::LocalInterfaceDef_ptr POA_CORBA::LocalInterfaceDef_tie<T>::create_local_interface  (
+CORBA_LocalInterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -8021,7 +7965,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::LocalInterfaceDef_tie<T>::id  (
+char * POA_CORBA_LocalInterfaceDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -8034,7 +7978,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::LocalInterfaceDef_tie<T>::id  (
+void POA_CORBA_LocalInterfaceDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8049,7 +7993,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::LocalInterfaceDef_tie<T>::name  (
+char * POA_CORBA_LocalInterfaceDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -8062,7 +8006,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::LocalInterfaceDef_tie<T>::name  (
+void POA_CORBA_LocalInterfaceDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8077,7 +8021,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::LocalInterfaceDef_tie<T>::version  (
+char * POA_CORBA_LocalInterfaceDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -8090,7 +8034,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::LocalInterfaceDef_tie<T>::version  (
+void POA_CORBA_LocalInterfaceDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8105,7 +8049,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::LocalInterfaceDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_LocalInterfaceDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -8118,7 +8062,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::LocalInterfaceDef_tie<T>::absolute_name  (
+char * POA_CORBA_LocalInterfaceDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -8131,7 +8075,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::LocalInterfaceDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_LocalInterfaceDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -8144,7 +8088,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::LocalInterfaceDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_LocalInterfaceDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -8157,8 +8101,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::LocalInterfaceDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_LocalInterfaceDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -8176,7 +8120,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::LocalInterfaceDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_LocalInterfaceDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -8189,7 +8133,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::LocalInterfaceDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_LocalInterfaceDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -8202,7 +8146,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::LocalInterfaceDef_tie<T>::destroy  (
+void POA_CORBA_LocalInterfaceDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -8214,4 +8158,3 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
index a2f1cf6c4ef..815e10f576e 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
@@ -19,21 +19,23 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_IDL_IFR_COMPONENTSS_CPP
-#define TAO_IDL_IFR_COMPONENTSS_CPP
+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_COMPONENTSS_CPP_
+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_COMPONENTSS_CPP_
 
 #include "IFR_ComponentsS.h"
+
 #include "tao/PortableServer/Object_Adapter.h"
-#include "tao/PortableInterceptor.h"
-#include "tao/Stub.h"
-#include "tao/ORB_Core.h"
-#include "tao/TAO_Server_Request.h"
 #include "tao/PortableServer/Operation_Table.h"
-
+#include "tao/TAO_Server_Request.h"
+#include "tao/ORB_Core.h"
+#include "tao/Stub.h"
+#include "tao/IFR_Client_Adapter.h"
+#include "tao/PortableServer/ServerRequestInfo.h"
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+#include "ace/Dynamic_Service.h"
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
@@ -49,7 +51,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 11:21:59 */
+/* starting time is 13:56:28 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentRepository_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -58,46 +60,46 @@ TAO_IR_ComponentRepository_Perfect_Hash_OpTable::hash (const char *str, unsigned
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 20,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72,  5,
-     72,  0, 24, 10, 72,  5, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 25,  0,  8,
-     72, 20, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 30,  0, 72, 72, 72, 25,  0, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 11,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 25,
+     66,  0, 31, 15, 66, 10, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 25,  0, 30,
+     66, 25, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66,  0,  5, 66, 66, 66,  0, 20, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66,
 #else
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 72, 72, 72, 72, 72,
-     72, 72, 72, 72, 72, 20, 72,  5, 72,  0,
-     24, 10, 72,  5, 72, 72, 72, 72, 25,  0,
-      8, 72, 20, 72, 72, 30,  0, 72, 72, 72,
-     25,  0, 72, 72, 72, 72, 72, 72,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 66, 66, 66, 66, 66,
+     66, 66, 66, 66, 66, 11, 66, 25, 66,  0,
+     31, 15, 66, 10, 66, 66, 66, 66, 25,  0,
+     30, 66, 25, 66, 66,  0,  5, 66, 66, 66,
+      0, 20, 66, 66, 66, 66, 66, 66,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -108,60 +110,59 @@ TAO_IR_ComponentRepository_Perfect_Hash_OpTable::lookup (const char *str, unsign
 {
   enum
     {
-      TOTAL_KEYWORDS = 31,
+      TOTAL_KEYWORDS = 32,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 25,
-      MIN_HASH_VALUE = 11,
-      MAX_HASH_VALUE = 71,
-      HASH_VALUE_RANGE = 61,
+      MIN_HASH_VALUE = 8,
+      MAX_HASH_VALUE = 65,
+      HASH_VALUE_RANGE = 58,
       DUPLICATES = 2
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
-      {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
-      {"",0},{"",0},
+      {"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},{"",0},
+      {"contents", 	&POA_IR::ComponentRepository::contents_skel},
       {"create_enum", 	&POA_IR::ComponentRepository::create_enum_skel},
-      {"create_array", 	&POA_IR::ComponentRepository::create_array_skel},
+      {"create_alias", 	&POA_IR::ComponentRepository::create_alias_skel},
+      {"create_value_box", 	&POA_IR::ComponentRepository::create_value_box_skel},
       {"create_struct", 	&POA_IR::ComponentRepository::create_struct_skel},
       {"create_constant", 	&POA_IR::ComponentRepository::create_constant_skel},
       {"create_component", 	&POA_IR::ComponentRepository::create_component_skel},
       {"create_string", 	&POA_IR::ComponentRepository::create_string_skel},
       {"create_wstring", 	&POA_IR::ComponentRepository::create_wstring_skel},
-      {"create_union", 	&POA_IR::ComponentRepository::create_union_skel},
       {"create_home", 	&POA_IR::ComponentRepository::create_home_skel},
       {"create_value", 	&POA_IR::ComponentRepository::create_value_skel},
       {"create_module", 	&POA_IR::ComponentRepository::create_module_skel},
       {"create_native", 	&POA_IR::ComponentRepository::create_native_skel},
-      {"create_exception", 	&POA_IR::ComponentRepository::create_exception_skel},
+      {"_non_existent",  &POA_IR::ComponentRepository::_non_existent_skel},
       {"create_sequence", 	&POA_IR::ComponentRepository::create_sequence_skel},
       {"create_interface", 	&POA_IR::ComponentRepository::create_interface_skel},
-      {"get_primitive", 	&POA_IR::ComponentRepository::get_primitive_skel},
-      {"_is_a",  &POA_IR::ComponentRepository::_is_a_skel},
-      {"destroy", 	&POA_IR::ComponentRepository::destroy_skel},
+      {"create_array", 	&POA_IR::ComponentRepository::create_array_skel},
+      {"_interface",  &POA_IR::ComponentRepository::_interface_skel},
       {"create_local_interface", 	&POA_IR::ComponentRepository::create_local_interface_skel},
-      {"_non_existent",  &POA_IR::ComponentRepository::_non_existent_skel},
+      {"get_primitive", 	&POA_IR::ComponentRepository::get_primitive_skel},
       {"create_abstract_interface", 	&POA_IR::ComponentRepository::create_abstract_interface_skel},
+      {"_is_a",  &POA_IR::ComponentRepository::_is_a_skel},
+      {"create_union", 	&POA_IR::ComponentRepository::create_union_skel},
       {"create_fixed", 	&POA_IR::ComponentRepository::create_fixed_skel},
+      {"create_exception", 	&POA_IR::ComponentRepository::create_exception_skel},
       {"get_canonical_typecode", 	&POA_IR::ComponentRepository::get_canonical_typecode_skel},
-      {"contents", 	&POA_IR::ComponentRepository::contents_skel},
-      {"create_value_box", 	&POA_IR::ComponentRepository::create_value_box_skel},
-      {"create_alias", 	&POA_IR::ComponentRepository::create_alias_skel},
+      {"describe_contents", 	&POA_IR::ComponentRepository::describe_contents_skel},
       {"lookup_name", 	&POA_IR::ComponentRepository::lookup_name_skel},
-      {"lookup", 	&POA_IR::ComponentRepository::lookup_skel},
       {"_get_def_kind", 	&POA_IR::ComponentRepository::_get_def_kind_skel},
+      {"lookup", 	&POA_IR::ComponentRepository::lookup_skel},
+      {"destroy", 	&POA_IR::ComponentRepository::destroy_skel},
       {"lookup_id", 	&POA_IR::ComponentRepository::lookup_id_skel},
-      {"describe_contents", 	&POA_IR::ComponentRepository::describe_contents_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, -21,  -2,  11,  12,  13, 
-       -1,  14,  15,  -1,  16,  17,  18,  19,  20, -85,  23,  24,  25,  -1, 
-       26,  -1,  27,  28,  29,  30,  -1,  31,  32,  33,  34,  -1,  -1,  35, 
-       36,  -1,  -1,  -1,  37,  -1,  -1,  -1,  -1,  38,  -1,  -1,  -1,  -1, 
-       -1,  39,  40,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 
-       -1,  41, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   8,  -1,  -1,   9,  10,  -1, 
+      -19,  -2,  11,  -1,  12,  -1,  13,  14,  -1,  15,  16,  -1,  17,  18, 
+      -79,  21,  22,  23,  24,  -1,  -1,  -1,  25,  26,  27,  -1,  28,  29, 
+       30,  31,  -1,  -1,  32,  33,  34,  -1,  -1,  35,  -1,  -1,  -1,  36, 
+       37,  -1,  38,  -1,  -1,  -1,  -1,  -1,  -1,  39, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -195,10 +196,9 @@ TAO_IR_ComponentRepository_Perfect_Hash_OpTable::lookup (const char *str, unsign
     }
   return 0;
 }
-/* ending time is 11:21:59 */
+/* ending time is 13:56:28 */
 static TAO_IR_ComponentRepository_Perfect_Hash_OpTable tao_IR_ComponentRepository_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_IR_ComponentRepository_create_component : public TAO_ServerRequestInfo
 {
@@ -210,7 +210,7 @@ public:
     const char * name,
     const char * version,
     IR::ComponentDef_ptr base_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces,
+    const CORBA_InterfaceDefSeq & supports_interfaces,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -254,7 +254,7 @@ private:
   const char * name_;
   const char * version_;
   IR::ComponentDef_ptr base_component_;
-  const CORBA::InterfaceDefSeq & supports_interfaces_;
+  const CORBA_InterfaceDefSeq & supports_interfaces_;
   IR::ComponentDef_ptr _result;
 };
 
@@ -265,7 +265,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::TAO_ServerRequest
     const char * name,
     const char * version,
     IR::ComponentDef_ptr base_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces,
+    const CORBA_InterfaceDefSeq & supports_interfaces,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -383,7 +383,7 @@ public:
     const char * version,
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
-    CORBA::ValueDef_ptr primary_key,
+    CORBA_ValueDef_ptr primary_key,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -428,7 +428,7 @@ private:
   const char * version_;
   IR::HomeDef_ptr base_home_;
   IR::ComponentDef_ptr managed_component_;
-  CORBA::ValueDef_ptr primary_key_;
+  CORBA_ValueDef_ptr primary_key_;
   IR::HomeDef_ptr _result;
 };
 
@@ -440,7 +440,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::TAO_ServerRequestInfo_
     const char * version,
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
-    CORBA::ValueDef_ptr primary_key,
+    CORBA_ValueDef_ptr primary_key,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -679,7 +679,7 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create
     const char * name,
     const char * version,
     IR::ComponentDef_ptr base_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces,
+    const CORBA_InterfaceDefSeq & supports_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -721,7 +721,7 @@ IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home
     const char * version,
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
-    CORBA::ValueDef_ptr primary_key,
+    CORBA_ValueDef_ptr primary_key,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -769,9 +769,9 @@ POA_IR::ComponentRepository::ComponentRepository (void)
 
 // copy ctor
 POA_IR::ComponentRepository::ComponentRepository (const ComponentRepository& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Repository) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+  :   POA_CORBA_Repository (rhs),
+    POA_CORBA_Container (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
@@ -795,7 +795,7 @@ void POA_IR::ComponentRepository::create_component_skel (
   CORBA::String_var name;
   CORBA::String_var version;
   IR::ComponentDef_var base_component;
-  CORBA::InterfaceDefSeq supports_interfaces;
+  CORBA_InterfaceDefSeq supports_interfaces;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -901,7 +901,7 @@ void POA_IR::ComponentRepository::create_home_skel (
   CORBA::String_var version;
   IR::HomeDef_var base_home;
   IR::ComponentDef_var managed_component;
-  CORBA::ValueDef_var primary_key;
+  CORBA_ValueDef_var primary_key;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -1034,6 +1034,54 @@ void POA_IR::ComponentRepository::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
+void POA_IR::ComponentRepository::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
 CORBA::Boolean POA_IR::ComponentRepository::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
@@ -1044,9 +1092,9 @@ CORBA::Boolean POA_IR::ComponentRepository::_is_a (
   
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentRepository:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Repository:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -1059,12 +1107,12 @@ void* POA_IR::ComponentRepository::_downcast (
 {
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ComponentRepository:1.0") == 0)
     return ACE_static_cast (POA_IR::ComponentRepository_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Repository:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Repository_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Repository:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Repository_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Container_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
@@ -1097,6 +1145,7 @@ POA_IR::ComponentRepository::_this (CORBA_Environment &ACE_TRY_ENV)
   return ::IR::ComponentRepository::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_IR_ProvidesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -1104,7 +1153,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 11:21:59 */
+/* starting time is 13:56:28 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ProvidesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -1163,7 +1212,7 @@ TAO_IR_ProvidesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 {
   enum
     {
-      TOTAL_KEYWORDS = 16,
+      TOTAL_KEYWORDS = 17,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -1182,6 +1231,7 @@ TAO_IR_ProvidesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
       {"describe", 	&POA_IR::ProvidesDef::describe_skel},
       {"_get_name", 	&POA_IR::ProvidesDef::_get_name_skel},
       {"_set_name", 	&POA_IR::ProvidesDef::_set_name_skel},
+      {"_interface",  &POA_IR::ProvidesDef::_interface_skel},
       {"_get_version", 	&POA_IR::ProvidesDef::_get_version_skel},
       {"_set_version", 	&POA_IR::ProvidesDef::_set_version_skel},
       {"_get_def_kind", 	&POA_IR::ProvidesDef::_get_def_kind_skel},
@@ -1195,9 +1245,9 @@ TAO_IR_ProvidesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 
   static const signed char lookup[] =
     {
-       -6,  -2,  -9,  -2,   4,   5,  -1, -43,   8, -43, -11,  -2, -38,  13, 
-       -1,  14,  -1,  15,  16,  17,  -1,  -1,  -1,  18,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  19, 
+       -9,  -2, -12,  -2,   4,   5,  -1,  49,   8, -45,  11,  -1, -46,  14, 
+       -1,  15,  -1,  16,  17,  18,  -6,  -2,  -1,  19,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  20, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1231,10 +1281,9 @@ TAO_IR_ProvidesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
     }
   return 0;
 }
-/* ending time is 11:21:59 */
+/* ending time is 13:56:28 */
 static TAO_IR_ProvidesDef_Perfect_Hash_OpTable tao_IR_ProvidesDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get : public TAO_ServerRequestInfo
 {
@@ -1273,7 +1322,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::InterfaceDef_ptr result);
+  void result (CORBA_InterfaceDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get (const TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get &);
@@ -1281,7 +1330,7 @@ private:
   
 private:
   POA_IR::ProvidesDef *_tao_impl;
-  CORBA::InterfaceDef_ptr _result;
+  CORBA_InterfaceDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get (
@@ -1353,7 +1402,7 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::InterfaceDef_ptr result)
+TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA_InterfaceDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -1478,7 +1527,7 @@ POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_TAO_ProvidesDef_ThruPOA_Proxy_Impl
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_type (
+CORBA_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1486,7 +1535,7 @@ CORBA::InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_t
     CORBA::SystemException
   ))
 {
-    CORBA::InterfaceDef_var _tao_retval;
+    CORBA_InterfaceDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -1521,8 +1570,8 @@ POA_IR::ProvidesDef::ProvidesDef (void)
 
 // copy ctor
 POA_IR::ProvidesDef::ProvidesDef (const ProvidesDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+  :   POA_CORBA_Contained (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
@@ -1540,7 +1589,7 @@ void POA_IR::ProvidesDef::_get_interface_type_skel (
 {
   POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *)_tao_object_reference;
   
-    CORBA::InterfaceDef_var _tao_retval;
+    CORBA_InterfaceDef_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -1567,7 +1616,7 @@ void POA_IR::ProvidesDef::_get_interface_type_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -1651,6 +1700,54 @@ void POA_IR::ProvidesDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
+void POA_IR::ProvidesDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
 CORBA::Boolean POA_IR::ProvidesDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
@@ -1661,8 +1758,8 @@ CORBA::Boolean POA_IR::ProvidesDef::_is_a (
   
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ProvidesDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -1675,10 +1772,10 @@ void* POA_IR::ProvidesDef::_downcast (
 {
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ProvidesDef:1.0") == 0)
     return ACE_static_cast (POA_IR::ProvidesDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
@@ -1711,6 +1808,7 @@ POA_IR::ProvidesDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return ::IR::ProvidesDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_IR_UsesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -1718,7 +1816,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 11:21:59 */
+/* starting time is 13:56:28 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_UsesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -1777,7 +1875,7 @@ TAO_IR_UsesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 17,
+      TOTAL_KEYWORDS = 18,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -1796,6 +1894,7 @@ TAO_IR_UsesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
       {"describe", 	&POA_IR::UsesDef::describe_skel},
       {"_get_name", 	&POA_IR::UsesDef::_get_name_skel},
       {"_set_name", 	&POA_IR::UsesDef::_set_name_skel},
+      {"_interface",  &POA_IR::UsesDef::_interface_skel},
       {"_get_version", 	&POA_IR::UsesDef::_get_version_skel},
       {"_set_version", 	&POA_IR::UsesDef::_set_version_skel},
       {"_get_def_kind", 	&POA_IR::UsesDef::_get_def_kind_skel},
@@ -1810,9 +1909,9 @@ TAO_IR_UsesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
 
   static const signed char lookup[] =
     {
-       -6,  -2,  -9,  -2,   4,   5,  -1, -43,   8, -43, -11,  -2, -38,  13, 
-       -1,  14,  15,  16,  17,  18,  -1,  -1,  -1,  19,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  20, 
+       -9,  -2, -12,  -2,   4,   5,  -1,  49,   8, -45,  11,  -1, -46,  14, 
+       -1,  15,  16,  17,  18,  19,  -6,  -2,  -1,  20,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  21, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1846,10 +1945,9 @@ TAO_IR_UsesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
     }
   return 0;
 }
-/* ending time is 11:21:59 */
+/* ending time is 13:56:28 */
 static TAO_IR_UsesDef_Perfect_Hash_OpTable tao_IR_UsesDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_IR_UsesDef_interface_type_get : public TAO_ServerRequestInfo
 {
@@ -1888,7 +1986,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::InterfaceDef_ptr result);
+  void result (CORBA_InterfaceDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_IR_UsesDef_interface_type_get (const TAO_ServerRequestInfo_IR_UsesDef_interface_type_get &);
@@ -1896,7 +1994,7 @@ private:
   
 private:
   POA_IR::UsesDef *_tao_impl;
-  CORBA::InterfaceDef_ptr _result;
+  CORBA_InterfaceDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get (
@@ -1968,7 +2066,7 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::InterfaceDef_ptr result)
+TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (CORBA_InterfaceDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -2216,7 +2314,7 @@ POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_TAO_UsesDef_ThruPOA_Proxy_Impl (void)
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
+CORBA_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2224,7 +2322,7 @@ CORBA::InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type
     CORBA::SystemException
   ))
 {
-    CORBA::InterfaceDef_var _tao_retval;
+    CORBA_InterfaceDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -2290,8 +2388,8 @@ POA_IR::UsesDef::UsesDef (void)
 
 // copy ctor
 POA_IR::UsesDef::UsesDef (const UsesDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+  :   POA_CORBA_Contained (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
@@ -2309,7 +2407,7 @@ void POA_IR::UsesDef::_get_interface_type_skel (
 {
   POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *)_tao_object_reference;
   
-    CORBA::InterfaceDef_var _tao_retval;
+    CORBA_InterfaceDef_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -2336,7 +2434,7 @@ void POA_IR::UsesDef::_get_interface_type_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2499,6 +2597,54 @@ void POA_IR::UsesDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
+void POA_IR::UsesDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
 CORBA::Boolean POA_IR::UsesDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
@@ -2509,8 +2655,8 @@ CORBA::Boolean POA_IR::UsesDef::_is_a (
   
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UsesDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -2523,10 +2669,10 @@ void* POA_IR::UsesDef::_downcast (
 {
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/UsesDef:1.0") == 0)
     return ACE_static_cast (POA_IR::UsesDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
@@ -2559,6 +2705,7 @@ POA_IR::UsesDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return ::IR::UsesDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_IR_EventDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -2566,7 +2713,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 11:21:59 */
+/* starting time is 13:56:28 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EventDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -2625,7 +2772,7 @@ TAO_IR_EventDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 17,
+      TOTAL_KEYWORDS = 18,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -2644,6 +2791,7 @@ TAO_IR_EventDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
       {"describe", 	&POA_IR::EventDef::describe_skel},
       {"_get_name", 	&POA_IR::EventDef::_get_name_skel},
       {"_set_name", 	&POA_IR::EventDef::_set_name_skel},
+      {"_interface",  &POA_IR::EventDef::_interface_skel},
       {"_get_version", 	&POA_IR::EventDef::_get_version_skel},
       {"_set_version", 	&POA_IR::EventDef::_set_version_skel},
       {"_get_def_kind", 	&POA_IR::EventDef::_get_def_kind_skel},
@@ -2658,9 +2806,9 @@ TAO_IR_EventDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
 
   static const signed char lookup[] =
     {
-       -6,  -2,  -9,  -2,   4,   5,  -1, -43,   8, -43, -11,  -2, -38,  13, 
-       14,  15,  -1,  16,  17,  -1,  18,  -1,  -1,  19,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  20, 
+       -9,  -2, -12,  -2,   4,   5,  -1,  50,   8, -45,  11,  -1, -46,  14, 
+       15,  16,  -1,  17,  18,  -1,  19,  -6,  -2,  20,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  21, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -2694,10 +2842,9 @@ TAO_IR_EventDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
     }
   return 0;
 }
-/* ending time is 11:21:59 */
+/* ending time is 13:56:28 */
 static TAO_IR_EventDef_Perfect_Hash_OpTable tao_IR_EventDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_IR_EventDef_is_a : public TAO_ServerRequestInfo
 {
@@ -2870,7 +3017,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ValueDef_ptr result);
+  void result (CORBA_ValueDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_IR_EventDef_event_get (const TAO_ServerRequestInfo_IR_EventDef_event_get &);
@@ -2878,7 +3025,7 @@ private:
   
 private:
   POA_IR::EventDef *_tao_impl;
-  CORBA::ValueDef_ptr _result;
+  CORBA_ValueDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_IR_EventDef_event_get::TAO_ServerRequestInfo_IR_EventDef_event_get (
@@ -2950,7 +3097,7 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_IR_EventDef_event_get::result (CORBA::ValueDef_ptr result)
+TAO_ServerRequestInfo_IR_EventDef_event_get::result (CORBA_ValueDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -3108,7 +3255,7 @@ CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a (
       );
 }
 
-CORBA::ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
+CORBA_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3116,7 +3263,7 @@ CORBA::ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
     CORBA::SystemException
   ))
 {
-    CORBA::ValueDef_var _tao_retval;
+    CORBA_ValueDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -3151,8 +3298,8 @@ POA_IR::EventDef::EventDef (void)
 
 // copy ctor
 POA_IR::EventDef::EventDef (const EventDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+  :   POA_CORBA_Contained (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
@@ -3258,7 +3405,7 @@ void POA_IR::EventDef::_get_event_skel (
 {
   POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *)_tao_object_reference;
   
-    CORBA::ValueDef_var _tao_retval;
+    CORBA_ValueDef_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -3285,7 +3432,7 @@ void POA_IR::EventDef::_get_event_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -3369,6 +3516,54 @@ void POA_IR::EventDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
+void POA_IR::EventDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
 CORBA::Boolean POA_IR::EventDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
@@ -3379,8 +3574,8 @@ CORBA::Boolean POA_IR::EventDef::_is_a (
   
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -3393,10 +3588,10 @@ void* POA_IR::EventDef::_downcast (
 {
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EventDef:1.0") == 0)
     return ACE_static_cast (POA_IR::EventDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
@@ -3429,6 +3624,7 @@ POA_IR::EventDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return ::IR::EventDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_IR_EmitsDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -3436,7 +3632,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 11:21:59 */
+/* starting time is 13:56:28 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EmitsDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -3495,7 +3691,7 @@ TAO_IR_EmitsDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 17,
+      TOTAL_KEYWORDS = 18,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -3514,6 +3710,7 @@ TAO_IR_EmitsDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
       {"describe", 	&POA_IR::EmitsDef::describe_skel},
       {"_get_name", 	&POA_IR::EmitsDef::_get_name_skel},
       {"_set_name", 	&POA_IR::EmitsDef::_set_name_skel},
+      {"_interface",  &POA_IR::EmitsDef::_interface_skel},
       {"_get_version", 	&POA_IR::EmitsDef::_get_version_skel},
       {"_set_version", 	&POA_IR::EmitsDef::_set_version_skel},
       {"_get_def_kind", 	&POA_IR::EmitsDef::_get_def_kind_skel},
@@ -3528,9 +3725,9 @@ TAO_IR_EmitsDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
 
   static const signed char lookup[] =
     {
-       -6,  -2,  -9,  -2,   4,   5,  -1, -43,   8, -43, -11,  -2, -38,  13, 
-       14,  15,  -1,  16,  17,  -1,  18,  -1,  -1,  19,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  20, 
+       -9,  -2, -12,  -2,   4,   5,  -1,  50,   8, -45,  11,  -1, -46,  14, 
+       15,  16,  -1,  17,  18,  -1,  19,  -6,  -2,  20,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  21, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3564,7 +3761,7 @@ TAO_IR_EmitsDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
     }
   return 0;
 }
-/* ending time is 11:21:59 */
+/* ending time is 13:56:28 */
 static TAO_IR_EmitsDef_Perfect_Hash_OpTable tao_IR_EmitsDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -3700,8 +3897,8 @@ POA_IR::EmitsDef::EmitsDef (void)
 // copy ctor
 POA_IR::EmitsDef::EmitsDef (const EmitsDef& rhs)
   :   ACE_NESTED_CLASS (POA_IR,EventDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
@@ -3750,6 +3947,54 @@ void POA_IR::EmitsDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
+void POA_IR::EmitsDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
 CORBA::Boolean POA_IR::EmitsDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
@@ -3761,8 +4006,8 @@ CORBA::Boolean POA_IR::EmitsDef::_is_a (
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EmitsDef:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -3777,10 +4022,10 @@ void* POA_IR::EmitsDef::_downcast (
     return ACE_static_cast (POA_IR::EmitsDef_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EventDef:1.0") == 0)
     return ACE_static_cast (POA_IR::EventDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
@@ -3813,6 +4058,7 @@ POA_IR::EmitsDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return ::IR::EmitsDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_IR_PublishesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -3820,7 +4066,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 11:21:59 */
+/* starting time is 13:56:28 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PublishesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -3879,7 +4125,7 @@ TAO_IR_PublishesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 17,
+      TOTAL_KEYWORDS = 18,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -3898,6 +4144,7 @@ TAO_IR_PublishesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
       {"describe", 	&POA_IR::PublishesDef::describe_skel},
       {"_get_name", 	&POA_IR::PublishesDef::_get_name_skel},
       {"_set_name", 	&POA_IR::PublishesDef::_set_name_skel},
+      {"_interface",  &POA_IR::PublishesDef::_interface_skel},
       {"_get_version", 	&POA_IR::PublishesDef::_get_version_skel},
       {"_set_version", 	&POA_IR::PublishesDef::_set_version_skel},
       {"_get_def_kind", 	&POA_IR::PublishesDef::_get_def_kind_skel},
@@ -3912,9 +4159,9 @@ TAO_IR_PublishesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -6,  -2,  -9,  -2,   4,   5,  -1, -43,   8, -43, -11,  -2, -38,  13, 
-       14,  15,  -1,  16,  17,  -1,  18,  -1,  -1,  19,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  20, 
+       -9,  -2, -12,  -2,   4,   5,  -1,  50,   8, -45,  11,  -1, -46,  14, 
+       15,  16,  -1,  17,  18,  -1,  19,  -6,  -2,  20,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  21, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3948,7 +4195,7 @@ TAO_IR_PublishesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 11:21:59 */
+/* ending time is 13:56:28 */
 static TAO_IR_PublishesDef_Perfect_Hash_OpTable tao_IR_PublishesDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -4084,8 +4331,8 @@ POA_IR::PublishesDef::PublishesDef (void)
 // copy ctor
 POA_IR::PublishesDef::PublishesDef (const PublishesDef& rhs)
   :   ACE_NESTED_CLASS (POA_IR,EventDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
@@ -4134,6 +4381,54 @@ void POA_IR::PublishesDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
+void POA_IR::PublishesDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
 CORBA::Boolean POA_IR::PublishesDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
@@ -4145,8 +4440,8 @@ CORBA::Boolean POA_IR::PublishesDef::_is_a (
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PublishesDef:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -4161,10 +4456,10 @@ void* POA_IR::PublishesDef::_downcast (
     return ACE_static_cast (POA_IR::PublishesDef_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EventDef:1.0") == 0)
     return ACE_static_cast (POA_IR::EventDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
@@ -4197,6 +4492,7 @@ POA_IR::PublishesDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return ::IR::PublishesDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_IR_ConsumesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -4204,7 +4500,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 11:21:59 */
+/* starting time is 13:56:28 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ConsumesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -4263,7 +4559,7 @@ TAO_IR_ConsumesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 {
   enum
     {
-      TOTAL_KEYWORDS = 17,
+      TOTAL_KEYWORDS = 18,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -4282,6 +4578,7 @@ TAO_IR_ConsumesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
       {"describe", 	&POA_IR::ConsumesDef::describe_skel},
       {"_get_name", 	&POA_IR::ConsumesDef::_get_name_skel},
       {"_set_name", 	&POA_IR::ConsumesDef::_set_name_skel},
+      {"_interface",  &POA_IR::ConsumesDef::_interface_skel},
       {"_get_version", 	&POA_IR::ConsumesDef::_get_version_skel},
       {"_set_version", 	&POA_IR::ConsumesDef::_set_version_skel},
       {"_get_def_kind", 	&POA_IR::ConsumesDef::_get_def_kind_skel},
@@ -4296,9 +4593,9 @@ TAO_IR_ConsumesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 
   static const signed char lookup[] =
     {
-       -6,  -2,  -9,  -2,   4,   5,  -1, -43,   8, -43, -11,  -2, -38,  13, 
-       14,  15,  -1,  16,  17,  -1,  18,  -1,  -1,  19,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  20, 
+       -9,  -2, -12,  -2,   4,   5,  -1,  50,   8, -45,  11,  -1, -46,  14, 
+       15,  16,  -1,  17,  18,  -1,  19,  -6,  -2,  20,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  21, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -4332,7 +4629,7 @@ TAO_IR_ConsumesDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
     }
   return 0;
 }
-/* ending time is 11:21:59 */
+/* ending time is 13:56:28 */
 static TAO_IR_ConsumesDef_Perfect_Hash_OpTable tao_IR_ConsumesDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -4468,8 +4765,8 @@ POA_IR::ConsumesDef::ConsumesDef (void)
 // copy ctor
 POA_IR::ConsumesDef::ConsumesDef (const ConsumesDef& rhs)
   :   ACE_NESTED_CLASS (POA_IR,EventDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
@@ -4518,6 +4815,54 @@ void POA_IR::ConsumesDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
+void POA_IR::ConsumesDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
 CORBA::Boolean POA_IR::ConsumesDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
@@ -4529,8 +4874,8 @@ CORBA::Boolean POA_IR::ConsumesDef::_is_a (
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConsumesDef:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -4545,10 +4890,10 @@ void* POA_IR::ConsumesDef::_downcast (
     return ACE_static_cast (POA_IR::ConsumesDef_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/EventDef:1.0") == 0)
     return ACE_static_cast (POA_IR::EventDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
@@ -4581,6 +4926,7 @@ POA_IR::ConsumesDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return ::IR::ConsumesDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_IR_ComponentDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -4588,7 +4934,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 11:22:00 */
+/* starting time is 13:56:28 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -4597,46 +4943,46 @@ TAO_IR_ComponentDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int le
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92,  0,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92,  0,
-     92, 45, 20, 10, 92, 92, 92,  0, 92, 92,
-     92, 92, 92, 92, 92, 92, 92,  5, 20, 30,
-     92,  0, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92,  0, 30, 92, 92, 92,  5,  5, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108,   0,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108,   0,
+     108,  51,  30,  20, 108, 108, 108,   0, 108, 108,
+     108, 108, 108, 108, 108, 108, 108,   5,  15,  40,
+     108,   0, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108,   0,  15, 108, 108, 108,   5,   5, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108,
 #else
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92,  0, 92,  0, 92, 45,
-     20, 10, 92, 92, 92,  0, 92, 92,  5, 20,
-     30, 92,  0, 92, 92,  0, 30, 92, 92, 92,
-      5,  5, 92, 92, 92, 92, 92, 92,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+     108, 108, 108, 108, 108,   0, 108,   0, 108,  51,
+      30,  20, 108, 108, 108,   0, 108, 108,   5,  15,
+      40, 108,   0, 108, 108,   0,  15, 108, 108, 108,
+       5,   5, 108, 108, 108, 108, 108, 108,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -4647,12 +4993,12 @@ TAO_IR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 53,
+      TOTAL_KEYWORDS = 54,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 91,
-      HASH_VALUE_RANGE = 88,
+      MAX_HASH_VALUE = 107,
+      HASH_VALUE_RANGE = 104,
       DUPLICATES = 14
     };
 
@@ -4663,9 +5009,6 @@ TAO_IR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
       {"_is_a",  &POA_IR::ComponentDef::_is_a_skel},
       {"lookup", 	&POA_IR::ComponentDef::lookup_skel},
       {"_get_emits_events", 	&POA_IR::ComponentDef::_get_emits_events_skel},
-      {"_get_name", 	&POA_IR::ComponentDef::_get_name_skel},
-      {"_get_type", 	&POA_IR::ComponentDef::_get_type_skel},
-      {"_set_name", 	&POA_IR::ComponentDef::_set_name_skel},
       {"_get_uses_interfaces", 	&POA_IR::ComponentDef::_get_uses_interfaces_skel},
       {"_set_base_interfaces", 	&POA_IR::ComponentDef::_set_base_interfaces_skel},
       {"_get_base_interfaces", 	&POA_IR::ComponentDef::_get_base_interfaces_skel},
@@ -4674,22 +5017,25 @@ TAO_IR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
       {"_get_provides_interfaces", 	&POA_IR::ComponentDef::_get_provides_interfaces_skel},
       {"_get_supported_interfaces", 	&POA_IR::ComponentDef::_get_supported_interfaces_skel},
       {"_set_supported_interfaces", 	&POA_IR::ComponentDef::_set_supported_interfaces_skel},
+      {"_non_existent",  &POA_IR::ComponentDef::_non_existent_skel},
+      {"_get_name", 	&POA_IR::ComponentDef::_get_name_skel},
+      {"_get_type", 	&POA_IR::ComponentDef::_get_type_skel},
+      {"_set_name", 	&POA_IR::ComponentDef::_set_name_skel},
+      {"_interface",  &POA_IR::ComponentDef::_interface_skel},
+      {"_get_containing_repository", 	&POA_IR::ComponentDef::_get_containing_repository_skel},
+      {"_get_base_component", 	&POA_IR::ComponentDef::_get_base_component_skel},
       {"lookup_name", 	&POA_IR::ComponentDef::lookup_name_skel},
       {"_get_id", 	&POA_IR::ComponentDef::_get_id_skel},
       {"_set_id", 	&POA_IR::ComponentDef::_set_id_skel},
       {"_get_absolute_name", 	&POA_IR::ComponentDef::_get_absolute_name_skel},
-      {"_get_containing_repository", 	&POA_IR::ComponentDef::_get_containing_repository_skel},
+      {"move", 	&POA_IR::ComponentDef::move_skel},
       {"destroy", 	&POA_IR::ComponentDef::destroy_skel},
       {"_get_def_kind", 	&POA_IR::ComponentDef::_get_def_kind_skel},
-      {"move", 	&POA_IR::ComponentDef::move_skel},
       {"describe_contents", 	&POA_IR::ComponentDef::describe_contents_skel},
-      {"describe", 	&POA_IR::ComponentDef::describe_skel},
       {"_get_version", 	&POA_IR::ComponentDef::_get_version_skel},
       {"_set_version", 	&POA_IR::ComponentDef::_set_version_skel},
-      {"_non_existent",  &POA_IR::ComponentDef::_non_existent_skel},
       {"_get_defined_in", 	&POA_IR::ComponentDef::_get_defined_in_skel},
-      {"describe_interface", 	&POA_IR::ComponentDef::describe_interface_skel},
-      {"_get_base_component", 	&POA_IR::ComponentDef::_get_base_component_skel},
+      {"describe", 	&POA_IR::ComponentDef::describe_skel},
       {"contents", 	&POA_IR::ComponentDef::contents_skel},
       {"create_uses", 	&POA_IR::ComponentDef::create_uses_skel},
       {"create_emits", 	&POA_IR::ComponentDef::create_emits_skel},
@@ -4698,31 +5044,33 @@ TAO_IR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
       {"create_provides", 	&POA_IR::ComponentDef::create_provides_skel},
       {"create_consumes", 	&POA_IR::ComponentDef::create_consumes_skel},
       {"create_publishes", 	&POA_IR::ComponentDef::create_publishes_skel},
+      {"describe_interface", 	&POA_IR::ComponentDef::describe_interface_skel},
       {"create_value_box", 	&POA_IR::ComponentDef::create_value_box_skel},
+      {"create_enum", 	&POA_IR::ComponentDef::create_enum_skel},
+      {"create_struct", 	&POA_IR::ComponentDef::create_struct_skel},
+      {"create_constant", 	&POA_IR::ComponentDef::create_constant_skel},
       {"create_value", 	&POA_IR::ComponentDef::create_value_skel},
       {"create_module", 	&POA_IR::ComponentDef::create_module_skel},
       {"create_native", 	&POA_IR::ComponentDef::create_native_skel},
       {"create_attribute", 	&POA_IR::ComponentDef::create_attribute_skel},
       {"create_interface", 	&POA_IR::ComponentDef::create_interface_skel},
-      {"create_enum", 	&POA_IR::ComponentDef::create_enum_skel},
       {"create_local_interface", 	&POA_IR::ComponentDef::create_local_interface_skel},
       {"create_abstract_interface", 	&POA_IR::ComponentDef::create_abstract_interface_skel},
       {"create_union", 	&POA_IR::ComponentDef::create_union_skel},
-      {"create_struct", 	&POA_IR::ComponentDef::create_struct_skel},
-      {"create_constant", 	&POA_IR::ComponentDef::create_constant_skel},
       {"create_operation", 	&POA_IR::ComponentDef::create_operation_skel},
       {"create_exception", 	&POA_IR::ComponentDef::create_exception_skel},
     };
 
   static const signed char lookup[] =
     {
-        -1,   -1,   -1,   -1,    4,    5,   -1,   -1,   -1,   -8,   -3,    6,   -1,  -11, 
-        -4,  -17,   -2,    7,   -1, -101,  -98,   15,  -20,   -2,   16, -101,   19,  -96, 
-        22,   -1,   -1,   23,   24,   25,   26,   -1,   -1,   27,   28,   -1,  -29,   -2, 
-       -93,   31,   -1,   32,   -1,   -1,   33,   34,   -1,  -37,   -2,   35,  -40,   -2, 
-        36,  -97,   39,   -1,  -97,   42,   -1,   -1,  -45,   -2,   43,   44,  -95,  -47, 
-        -2,  -93,   -1,   -1,   -1,   -1,   49,   50,   -1,   -1,   51,   -1,   -1,   -1, 
-        -1,  -55,   -2,   52,   53,   -1,   54,  -97, 
+        -1,   -1,   -1,   -1,    4,    5,   -1,   -1,   -1,   -1,   -1,    6,   -1,   -1, 
+        -1,   -1,   -1,    7,   -8,   -4, -109,   12,  -14,   -2,   13, -110,  -17,   -3, 
+        16, -110,   20,   21,  -24,   -2,   22,   -1,   23, -112,   26,   27,   -1,   -1, 
+        28,   29,   -1,   -1,   -1,   30,   -1,   -1,  -31,   -2, -109,   -1,   -1,   33, 
+       -37,   -2,   34,   35,  -40,   -2,   36, -114,   39,   -1, -113,   42,   43,   -1, 
+        -1,   -1,   44,   -1,   -1,  -49,   -2,   45,   -1,   46,   -1,   47,   -1,   48, 
+      -116,  -51,   -2, -109,   -1,   -1,   -1,   -1,   -1,   53,   -1,   -1,   54,   -1, 
+        -1,   -1,   -1,   -1,   -1,   55,   -1,  -56,   -2, -109, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -4756,10 +5104,9 @@ TAO_IR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 11:22:00 */
+/* ending time is 13:56:28 */
 static TAO_IR_ComponentDef_Perfect_Hash_OpTable tao_IR_ComponentDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get : public TAO_ServerRequestInfo
 {
@@ -4798,7 +5145,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::InterfaceDefSeq * result);
+  void result (CORBA_InterfaceDefSeq * result);
 
 private:
   TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get (const TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get &);
@@ -4806,7 +5153,7 @@ private:
   
 private:
   POA_IR::ComponentDef *_tao_impl;
-  CORBA::InterfaceDefSeq * _result;
+  CORBA_InterfaceDefSeq * _result;
 };
 
 TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get (
@@ -4878,7 +5225,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::InterfaceDefSeq * result)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA_InterfaceDefSeq * result)
 {
   // Update the result.
    this->_result = result;
@@ -4890,7 +5237,7 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set (
     TAO_ServerRequest &_tao_server_request,
     POA_IR::ComponentDef *tao_impl,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -4929,14 +5276,14 @@ private:
   
 private:
   POA_IR::ComponentDef *_tao_impl;
-  const CORBA::InterfaceDefSeq & supported_interfaces_;
+  const CORBA_InterfaceDefSeq & supported_interfaces_;
   
 };
 
 TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set (
     TAO_ServerRequest &_tao_server_request,
     POA_IR::ComponentDef *tao_impl,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -5877,7 +6224,7 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
+    CORBA_InterfaceDef_ptr interface_type,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -5920,7 +6267,7 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::InterfaceDef_ptr interface_type_;
+  CORBA_InterfaceDef_ptr interface_type_;
   IR::ProvidesDef_ptr _result;
 };
 
@@ -5930,7 +6277,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::TAO_ServerRequestInfo_IR_
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
+    CORBA_InterfaceDef_ptr interface_type,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -6039,7 +6386,7 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
+    CORBA_InterfaceDef_ptr interface_type,
     const CORBA::Boolean & is_multiple,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -6083,7 +6430,7 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::InterfaceDef_ptr interface_type_;
+  CORBA_InterfaceDef_ptr interface_type_;
   const CORBA::Boolean & is_multiple_;
   IR::UsesDef_ptr _result;
 };
@@ -6094,7 +6441,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::TAO_ServerRequestInfo_IR_Comp
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
+    CORBA_InterfaceDef_ptr interface_type,
     const CORBA::Boolean & is_multiple,
     CORBA::Environment &
   )
@@ -6210,7 +6557,7 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -6253,7 +6600,7 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::ValueDef_ptr value_;
+  CORBA_ValueDef_ptr value_;
   IR::EmitsDef_ptr _result;
 };
 
@@ -6263,7 +6610,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::TAO_ServerRequestInfo_IR_Com
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -6372,7 +6719,7 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -6415,7 +6762,7 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::ValueDef_ptr value_;
+  CORBA_ValueDef_ptr value_;
   IR::PublishesDef_ptr _result;
 };
 
@@ -6425,7 +6772,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::TAO_ServerRequestInfo_IR
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -6534,7 +6881,7 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -6577,7 +6924,7 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::ValueDef_ptr value_;
+  CORBA_ValueDef_ptr value_;
   IR::ConsumesDef_ptr _result;
 };
 
@@ -6587,7 +6934,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::TAO_ServerRequestInfo_IR_
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -6806,7 +7153,7 @@ POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_TAO_ComponentDef_ThruPOA_Proxy_Im
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
+CORBA_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6814,7 +7161,7 @@ CORBA::InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported
     CORBA::SystemException
   ))
 {
-    CORBA::InterfaceDefSeq_var _tao_retval;
+    CORBA_InterfaceDefSeq_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -6839,7 +7186,7 @@ CORBA::InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported
 
 void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7091,7 +7438,7 @@ IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provide
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
+    CORBA_InterfaceDef_ptr interface_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7130,7 +7477,7 @@ IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
+    CORBA_InterfaceDef_ptr interface_type,
     CORBA::Boolean is_multiple,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7171,7 +7518,7 @@ IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7210,7 +7557,7 @@ IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publis
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7249,7 +7596,7 @@ IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consume
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7295,11 +7642,11 @@ POA_IR::ComponentDef::ComponentDef (void)
 
 // copy ctor
 POA_IR::ComponentDef::ComponentDef (const ComponentDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,InterfaceDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+  :   POA_CORBA_InterfaceDef (rhs),
+    POA_CORBA_Container (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
@@ -7317,7 +7664,7 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel (
 {
   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
   
-    CORBA::InterfaceDefSeq_var _tao_retval;
+    CORBA_InterfaceDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -7344,7 +7691,7 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
+      CORBA_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -7399,7 +7746,7 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel (
   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::InterfaceDefSeq supported_interfaces;
+    CORBA_InterfaceDefSeq supported_interfaces;
   if (!(
     (_tao_in >> supported_interfaces)
   ))
@@ -8040,7 +8387,7 @@ void POA_IR::ComponentDef::create_provides_skel (
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::InterfaceDef_var interface_type;
+  CORBA_InterfaceDef_var interface_type;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -8141,7 +8488,7 @@ void POA_IR::ComponentDef::create_uses_skel (
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::InterfaceDef_var interface_type;
+  CORBA_InterfaceDef_var interface_type;
   CORBA::Boolean is_multiple;
   if (!(
     (_tao_in >> id.out ()) &&
@@ -8246,7 +8593,7 @@ void POA_IR::ComponentDef::create_emits_skel (
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::ValueDef_var value;
+  CORBA_ValueDef_var value;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -8347,7 +8694,7 @@ void POA_IR::ComponentDef::create_publishes_skel (
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::ValueDef_var value;
+  CORBA_ValueDef_var value;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -8448,7 +8795,7 @@ void POA_IR::ComponentDef::create_consumes_skel (
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::ValueDef_var value;
+  CORBA_ValueDef_var value;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -8575,6 +8922,54 @@ void POA_IR::ComponentDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
+void POA_IR::ComponentDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
 CORBA::Boolean POA_IR::ComponentDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
@@ -8585,11 +8980,11 @@ CORBA::Boolean POA_IR::ComponentDef::_is_a (
   
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -8602,16 +8997,16 @@ void* POA_IR::ComponentDef::_downcast (
 {
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ComponentDef:1.0") == 0)
     return ACE_static_cast (POA_IR::ComponentDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::InterfaceDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Container_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
@@ -8644,6 +9039,7 @@ POA_IR::ComponentDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return ::IR::ComponentDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -8651,7 +9047,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 11:22:00 */
+/* starting time is 13:56:28 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -8710,7 +9106,7 @@ TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 17,
+      TOTAL_KEYWORDS = 18,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -8729,6 +9125,7 @@ TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
       {"describe", 	&POA_IR::PrimaryKeyDef::describe_skel},
       {"_get_name", 	&POA_IR::PrimaryKeyDef::_get_name_skel},
       {"_set_name", 	&POA_IR::PrimaryKeyDef::_set_name_skel},
+      {"_interface",  &POA_IR::PrimaryKeyDef::_interface_skel},
       {"destroy", 	&POA_IR::PrimaryKeyDef::destroy_skel},
       {"_get_def_kind", 	&POA_IR::PrimaryKeyDef::_get_def_kind_skel},
       {"is_a", 	&POA_IR::PrimaryKeyDef::is_a_skel},
@@ -8743,9 +9140,9 @@ TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 
   static const signed char lookup[] =
     {
-       -6,  -2,  -9,  -2,   4,   5,  -1, -38,   8, -38,  -1,  -1,  11,  12, 
-       13, -14,  -2, -33,  16,  -1,  17,  18,  -1,  19,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  20, 
+       -6,  -2,  -9,  -2,   4,   5,  -1, -38,   8, -38,  11,  -1,  12,  13, 
+       14, -15,  -2, -33,  17,  -1,  18,  19,  -1,  20,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  21, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -8779,10 +9176,9 @@ TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     }
   return 0;
 }
-/* ending time is 11:22:00 */
+/* ending time is 13:56:28 */
 static TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable tao_IR_PrimaryKeyDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a : public TAO_ServerRequestInfo
 {
@@ -8955,7 +9351,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ValueDef_ptr result);
+  void result (CORBA_ValueDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get (const TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
@@ -8963,7 +9359,7 @@ private:
   
 private:
   POA_IR::PrimaryKeyDef *_tao_impl;
-  CORBA::ValueDef_ptr _result;
+  CORBA_ValueDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get (
@@ -9035,7 +9431,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::ValueDef_ptr result)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA_ValueDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -9193,7 +9589,7 @@ CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a (
       );
 }
 
-CORBA::ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
+CORBA_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -9201,7 +9597,7 @@ CORBA::ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
     CORBA::SystemException
   ))
 {
-    CORBA::ValueDef_var _tao_retval;
+    CORBA_ValueDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -9236,8 +9632,8 @@ POA_IR::PrimaryKeyDef::PrimaryKeyDef (void)
 
 // copy ctor
 POA_IR::PrimaryKeyDef::PrimaryKeyDef (const PrimaryKeyDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+  :   POA_CORBA_Contained (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
@@ -9343,7 +9739,7 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
 {
   POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *)_tao_object_reference;
   
-    CORBA::ValueDef_var _tao_retval;
+    CORBA_ValueDef_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -9370,7 +9766,7 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -9454,6 +9850,54 @@ void POA_IR::PrimaryKeyDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
+void POA_IR::PrimaryKeyDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
 CORBA::Boolean POA_IR::PrimaryKeyDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
@@ -9464,8 +9908,8 @@ CORBA::Boolean POA_IR::PrimaryKeyDef::_is_a (
   
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimaryKeyDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -9478,10 +9922,10 @@ void* POA_IR::PrimaryKeyDef::_downcast (
 {
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/PrimaryKeyDef:1.0") == 0)
     return ACE_static_cast (POA_IR::PrimaryKeyDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
@@ -9514,6 +9958,7 @@ POA_IR::PrimaryKeyDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return ::IR::PrimaryKeyDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_IR_FactoryDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -9521,7 +9966,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 11:22:00 */
+/* starting time is 13:56:28 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FactoryDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -9580,7 +10025,7 @@ TAO_IR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
 {
   enum
     {
-      TOTAL_KEYWORDS = 26,
+      TOTAL_KEYWORDS = 27,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -9598,6 +10043,7 @@ TAO_IR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
       {"_set_name", 	&POA_IR::FactoryDef::_set_name_skel},
       {"_get_name", 	&POA_IR::FactoryDef::_get_name_skel},
       {"_set_mode", 	&POA_IR::FactoryDef::_set_mode_skel},
+      {"_interface",  &POA_IR::FactoryDef::_interface_skel},
       {"_get_params", 	&POA_IR::FactoryDef::_get_params_skel},
       {"_set_params", 	&POA_IR::FactoryDef::_set_params_skel},
       {"_get_contexts", 	&POA_IR::FactoryDef::_get_contexts_skel},
@@ -9645,58 +10091,60 @@ TAO_IR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
                   resword = &wordlist[9];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   return 0;
+                case  10:
+                  resword = &wordlist[10]; break;
                 case  11:
-                  resword = &wordlist[10];
-                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   resword = &wordlist[11];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-                  return 0;
-                case  13:
                   resword = &wordlist[12];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  return 0;
+                case  13:
                   resword = &wordlist[13];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-                  return 0;
-                case  15:
                   resword = &wordlist[14];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  return 0;
+                case  15:
                   resword = &wordlist[15];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-                  return 0;
-                case  17:
                   resword = &wordlist[16];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  return 0;
+                case  17:
                   resword = &wordlist[17];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  resword = &wordlist[18];
+                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   return 0;
                 case  18:
-                  resword = &wordlist[18]; break;
-                case  20:
                   resword = &wordlist[19]; break;
+                case  20:
+                  resword = &wordlist[20]; break;
                 case  22:
-                  resword = &wordlist[20];
-                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   resword = &wordlist[21];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  resword = &wordlist[22];
+                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   return 0;
                 case  23:
-                  resword = &wordlist[22]; break;
+                  resword = &wordlist[23]; break;
                 case  25:
-                  resword = &wordlist[23];
-                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   resword = &wordlist[24];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  resword = &wordlist[25];
+                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   return 0;
                 case  28:
-                  resword = &wordlist[25]; break;
-                case  31:
                   resword = &wordlist[26]; break;
-                case  32:
+                case  31:
                   resword = &wordlist[27]; break;
-                case  33:
+                case  32:
                   resword = &wordlist[28]; break;
-                case  36:
+                case  33:
                   resword = &wordlist[29]; break;
+                case  36:
+                  resword = &wordlist[30]; break;
                 default: return 0;
                 }
               if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1))
@@ -9707,7 +10155,7 @@ TAO_IR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
     }
   return 0;
 }
-/* ending time is 11:22:00 */
+/* ending time is 13:56:28 */
 static TAO_IR_FactoryDef_Perfect_Hash_OpTable tao_IR_FactoryDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -9842,9 +10290,9 @@ POA_IR::FactoryDef::FactoryDef (void)
 
 // copy ctor
 POA_IR::FactoryDef::FactoryDef (const FactoryDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,OperationDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+  :   POA_CORBA_OperationDef (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
@@ -9893,6 +10341,54 @@ void POA_IR::FactoryDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
+void POA_IR::FactoryDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
 CORBA::Boolean POA_IR::FactoryDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
@@ -9903,9 +10399,9 @@ CORBA::Boolean POA_IR::FactoryDef::_is_a (
   
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -9918,12 +10414,12 @@ void* POA_IR::FactoryDef::_downcast (
 {
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FactoryDef:1.0") == 0)
     return ACE_static_cast (POA_IR::FactoryDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::OperationDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_OperationDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
@@ -9956,6 +10452,7 @@ POA_IR::FactoryDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return ::IR::FactoryDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_IR_FinderDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -9963,7 +10460,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 11:22:00 */
+/* starting time is 13:56:28 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FinderDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -10022,7 +10519,7 @@ TAO_IR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len
 {
   enum
     {
-      TOTAL_KEYWORDS = 26,
+      TOTAL_KEYWORDS = 27,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -10040,6 +10537,7 @@ TAO_IR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len
       {"_set_name", 	&POA_IR::FinderDef::_set_name_skel},
       {"_get_name", 	&POA_IR::FinderDef::_get_name_skel},
       {"_set_mode", 	&POA_IR::FinderDef::_set_mode_skel},
+      {"_interface",  &POA_IR::FinderDef::_interface_skel},
       {"_get_params", 	&POA_IR::FinderDef::_get_params_skel},
       {"_set_params", 	&POA_IR::FinderDef::_set_params_skel},
       {"_get_contexts", 	&POA_IR::FinderDef::_get_contexts_skel},
@@ -10087,58 +10585,60 @@ TAO_IR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len
                   resword = &wordlist[9];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   return 0;
+                case  10:
+                  resword = &wordlist[10]; break;
                 case  11:
-                  resword = &wordlist[10];
-                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   resword = &wordlist[11];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-                  return 0;
-                case  13:
                   resword = &wordlist[12];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  return 0;
+                case  13:
                   resword = &wordlist[13];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-                  return 0;
-                case  15:
                   resword = &wordlist[14];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  return 0;
+                case  15:
                   resword = &wordlist[15];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
-                  return 0;
-                case  17:
                   resword = &wordlist[16];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  return 0;
+                case  17:
                   resword = &wordlist[17];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  resword = &wordlist[18];
+                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   return 0;
                 case  18:
-                  resword = &wordlist[18]; break;
-                case  20:
                   resword = &wordlist[19]; break;
+                case  20:
+                  resword = &wordlist[20]; break;
                 case  22:
-                  resword = &wordlist[20];
-                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   resword = &wordlist[21];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  resword = &wordlist[22];
+                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   return 0;
                 case  23:
-                  resword = &wordlist[22]; break;
+                  resword = &wordlist[23]; break;
                 case  25:
-                  resword = &wordlist[23];
-                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   resword = &wordlist[24];
                   if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
+                  resword = &wordlist[25];
+                  if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1)) return resword;
                   return 0;
                 case  28:
-                  resword = &wordlist[25]; break;
-                case  31:
                   resword = &wordlist[26]; break;
-                case  32:
+                case  31:
                   resword = &wordlist[27]; break;
-                case  33:
+                case  32:
                   resword = &wordlist[28]; break;
-                case  36:
+                case  33:
                   resword = &wordlist[29]; break;
+                case  36:
+                  resword = &wordlist[30]; break;
                 default: return 0;
                 }
               if (*str == *resword->opname_ && !strncmp (str + 1, resword->opname_ + 1, len - 1))
@@ -10149,7 +10649,7 @@ TAO_IR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len
     }
   return 0;
 }
-/* ending time is 11:22:00 */
+/* ending time is 13:56:28 */
 static TAO_IR_FinderDef_Perfect_Hash_OpTable tao_IR_FinderDef_optable;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
@@ -10284,9 +10784,9 @@ POA_IR::FinderDef::FinderDef (void)
 
 // copy ctor
 POA_IR::FinderDef::FinderDef (const FinderDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,OperationDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+  :   POA_CORBA_OperationDef (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
@@ -10335,6 +10835,54 @@ void POA_IR::FinderDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
+void POA_IR::FinderDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
 CORBA::Boolean POA_IR::FinderDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
@@ -10345,9 +10893,9 @@ CORBA::Boolean POA_IR::FinderDef::_is_a (
   
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -10360,12 +10908,12 @@ void* POA_IR::FinderDef::_downcast (
 {
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FinderDef:1.0") == 0)
     return ACE_static_cast (POA_IR::FinderDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::OperationDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_OperationDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
@@ -10398,6 +10946,7 @@ POA_IR::FinderDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return ::IR::FinderDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_IR_HomeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -10405,7 +10954,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 11:22:00 */
+/* starting time is 13:56:28 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_HomeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -10414,46 +10963,46 @@ TAO_IR_HomeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104,   0,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104,   0,
-     104,  20,  50,  35, 104, 104, 104,   0, 104, 104,
-     104, 104, 104, 104, 104, 104, 104,   5,  15,   5,
-     104,   0, 104,  40, 104, 104, 104, 104, 104, 104,
-     104, 104,  20,  25, 104, 104, 104,   0,   5, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91,  0,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91,  0,
+     91, 20,  5, 40, 91, 91, 91,  0, 91, 91,
+     91, 91, 91, 91, 91, 91, 91,  0,  0,  5,
+     91,  0, 91,  5, 91, 91, 91, 91, 91, 91,
+     91, 91, 20, 55, 91, 91, 91,  0, 45, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91,
 #else
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
-     104, 104, 104, 104, 104,   0, 104,   0, 104,  20,
-      50,  35, 104, 104, 104,   0, 104, 104,   5,  15,
-       5, 104,   0, 104,  40,  20,  25, 104, 104, 104,
-       0,   5, 104, 104, 104, 104, 104, 104,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+     91, 91, 91, 91, 91,  0, 91,  0, 91, 20,
+      5, 40, 91, 91, 91,  0, 91, 91,  0,  0,
+      5, 91,  0, 91,  5, 20, 55, 91, 91, 91,
+      0, 45, 91, 91, 91, 91, 91, 91,
 #endif /* ACE_MVS */
     };
   return len + asso_values[str[len - 1]] + asso_values[str[0]];
@@ -10464,12 +11013,12 @@ TAO_IR_HomeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 48,
+      TOTAL_KEYWORDS = 49,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 103,
-      HASH_VALUE_RANGE = 100,
+      MAX_HASH_VALUE = 90,
+      HASH_VALUE_RANGE = 87,
       DUPLICATES = 9
     };
 
@@ -10479,63 +11028,63 @@ TAO_IR_HomeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
       {"is_a", 	&POA_IR::HomeDef::is_a_skel},
       {"_is_a",  &POA_IR::HomeDef::_is_a_skel},
       {"lookup", 	&POA_IR::HomeDef::lookup_skel},
+      {"_get_id", 	&POA_IR::HomeDef::_get_id_skel},
+      {"_set_id", 	&POA_IR::HomeDef::_set_id_skel},
       {"_get_version", 	&POA_IR::HomeDef::_get_version_skel},
       {"_set_version", 	&POA_IR::HomeDef::_set_version_skel},
+      {"_get_def_kind", 	&POA_IR::HomeDef::_get_def_kind_skel},
       {"_get_defined_in", 	&POA_IR::HomeDef::_get_defined_in_skel},
-      {"_get_primary_key", 	&POA_IR::HomeDef::_get_primary_key_skel},
-      {"_get_containing_repository", 	&POA_IR::HomeDef::_get_containing_repository_skel},
+      {"create_enum", 	&POA_IR::HomeDef::create_enum_skel},
       {"_get_finders", 	&POA_IR::HomeDef::_get_finders_skel},
       {"_get_is_basic", 	&POA_IR::HomeDef::_get_is_basic_skel},
       {"_get_factories", 	&POA_IR::HomeDef::_get_factories_skel},
       {"create_value_box", 	&POA_IR::HomeDef::create_value_box_skel},
       {"create_union", 	&POA_IR::HomeDef::create_union_skel},
-      {"_non_existent",  &POA_IR::HomeDef::_non_existent_skel},
-      {"create_factory", 	&POA_IR::HomeDef::create_factory_skel},
+      {"create_finder", 	&POA_IR::HomeDef::create_finder_skel},
       {"_get_base_interfaces", 	&POA_IR::HomeDef::_get_base_interfaces_skel},
       {"_set_base_interfaces", 	&POA_IR::HomeDef::_set_base_interfaces_skel},
       {"create_operation", 	&POA_IR::HomeDef::create_operation_skel},
       {"create_exception", 	&POA_IR::HomeDef::create_exception_skel},
-      {"create_primary_key", 	&POA_IR::HomeDef::create_primary_key_skel},
+      {"describe_contents", 	&POA_IR::HomeDef::describe_contents_skel},
+      {"move", 	&POA_IR::HomeDef::move_skel},
+      {"contents", 	&POA_IR::HomeDef::contents_skel},
       {"_get_name", 	&POA_IR::HomeDef::_get_name_skel},
       {"_get_type", 	&POA_IR::HomeDef::_get_type_skel},
       {"_set_name", 	&POA_IR::HomeDef::_set_name_skel},
-      {"create_enum", 	&POA_IR::HomeDef::create_enum_skel},
-      {"_get_managed_component", 	&POA_IR::HomeDef::_get_managed_component_skel},
-      {"contents", 	&POA_IR::HomeDef::contents_skel},
-      {"_get_base_home", 	&POA_IR::HomeDef::_get_base_home_skel},
+      {"_interface",  &POA_IR::HomeDef::_interface_skel},
       {"lookup_name", 	&POA_IR::HomeDef::lookup_name_skel},
       {"create_alias", 	&POA_IR::HomeDef::create_alias_skel},
-      {"_get_absolute_name", 	&POA_IR::HomeDef::_get_absolute_name_skel},
-      {"move", 	&POA_IR::HomeDef::move_skel},
-      {"_get_id", 	&POA_IR::HomeDef::_get_id_skel},
-      {"_set_id", 	&POA_IR::HomeDef::_set_id_skel},
-      {"create_struct", 	&POA_IR::HomeDef::create_struct_skel},
-      {"create_constant", 	&POA_IR::HomeDef::create_constant_skel},
+      {"describe", 	&POA_IR::HomeDef::describe_skel},
+      {"_get_base_home", 	&POA_IR::HomeDef::_get_base_home_skel},
       {"destroy", 	&POA_IR::HomeDef::destroy_skel},
-      {"_get_def_kind", 	&POA_IR::HomeDef::_get_def_kind_skel},
+      {"_get_absolute_name", 	&POA_IR::HomeDef::_get_absolute_name_skel},
+      {"_get_primary_key", 	&POA_IR::HomeDef::_get_primary_key_skel},
+      {"describe_interface", 	&POA_IR::HomeDef::describe_interface_skel},
+      {"_non_existent",  &POA_IR::HomeDef::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_IR::HomeDef::_get_containing_repository_skel},
       {"create_value", 	&POA_IR::HomeDef::create_value_skel},
       {"create_module", 	&POA_IR::HomeDef::create_module_skel},
       {"create_native", 	&POA_IR::HomeDef::create_native_skel},
       {"create_attribute", 	&POA_IR::HomeDef::create_attribute_skel},
       {"create_interface", 	&POA_IR::HomeDef::create_interface_skel},
-      {"create_finder", 	&POA_IR::HomeDef::create_finder_skel},
+      {"_get_managed_component", 	&POA_IR::HomeDef::_get_managed_component_skel},
+      {"create_factory", 	&POA_IR::HomeDef::create_factory_skel},
       {"create_local_interface", 	&POA_IR::HomeDef::create_local_interface_skel},
+      {"create_primary_key", 	&POA_IR::HomeDef::create_primary_key_skel},
       {"create_abstract_interface", 	&POA_IR::HomeDef::create_abstract_interface_skel},
-      {"describe_contents", 	&POA_IR::HomeDef::describe_contents_skel},
-      {"describe", 	&POA_IR::HomeDef::describe_skel},
-      {"describe_interface", 	&POA_IR::HomeDef::describe_interface_skel},
+      {"create_struct", 	&POA_IR::HomeDef::create_struct_skel},
+      {"create_constant", 	&POA_IR::HomeDef::create_constant_skel},
     };
 
   static const signed char lookup[] =
     {
-        -1,   -1,   -1,   -1,    4,    5,   -1,   -1,   -1,   -1,   -1,    6,   -1,   -1, 
-        -1,   -7,   -2, -105,   -1,   -1,    9,   10,   -1,   -1,   -1,  -19,   -2,  -21, 
-        -2,  -24,   -3,   11,   12,   13,   14,   -1,   15,   16,   17,   18, -118, -117, 
-        -1,   23, -118,   -1,   27,   28,   29,   30,   -1,   31,   32,   33,   34,  -35, 
-        -2, -105,   37,   -1,   38,   -1,   39,   40,   -1,  -42,   -2,   41, -106,  -44, 
-        -2, -105,   -1,   46,   -1,   -1,   -1,   47,   -1,   -1,   48,   -1,   -1,   -1, 
-        -1,   -1,   -1,   49,   -1,   -1,   -1,   -1,   -1,   50,   -1,   -1,   -1,   -1, 
-        -1,   -1,   -1,   -1,   -1,   51, 
+        -1,   -1,   -1,   -1,    4,    5,    6,   -1,   -1,   -1,   -7,   -2,  -92,   -1, 
+        -1,   -9,   -2,  -92,   11,   -1,   12,   -1,   -1,   -1,   -1,   -1,   -1,  -20, 
+        -2,  -22,   -2,   13,   14,   15,   16,   -1,   17,   18,   19,   -1, -103, -102, 
+        24,   -1,   25,   -1,  -27,   -3,   26,  -93,   30,   31,   32,   33,   34,   -1, 
+        -1,   35,   36,   -1,   -1,   37,   -1,   38,   -1,   -1,   -1,   -1,   39,  -42, 
+        -2,   40,   41,  -94,  -44,   -2,  -92,   46,   -1,   47,   -1,   -1,   48,   49, 
+        -1,   50,   -1,   -1,   51,   -1,   52, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -10569,10 +11118,9 @@ TAO_IR_HomeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
     }
   return 0;
 }
-/* ending time is 11:22:00 */
+/* ending time is 13:56:28 */
 static TAO_IR_HomeDef_Perfect_Hash_OpTable tao_IR_HomeDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_IR_HomeDef_base_home_get : public TAO_ServerRequestInfo
 {
@@ -11321,7 +11869,7 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr primary_key,
+    CORBA_ValueDef_ptr primary_key,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -11364,7 +11912,7 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::ValueDef_ptr primary_key_;
+  CORBA_ValueDef_ptr primary_key_;
   IR::PrimaryKeyDef_ptr _result;
 };
 
@@ -11374,7 +11922,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::TAO_ServerRequestInfo_IR_Ho
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr primary_key,
+    CORBA_ValueDef_ptr primary_key,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -11483,8 +12031,8 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -11527,8 +12075,8 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::ParDescriptionSeq & params_;
-  const CORBA::ExceptionDefSeq & exceptions_;
+  const CORBA_ParDescriptionSeq & params_;
+  const CORBA_ExceptionDefSeq & exceptions_;
   IR::FactoryDef_ptr _result;
 };
 
@@ -11538,8 +12086,8 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::TAO_ServerRequestInfo_IR_HomeDe
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -11655,8 +12203,8 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -11699,8 +12247,8 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::ParDescriptionSeq & params_;
-  const CORBA::ExceptionDefSeq & exceptions_;
+  const CORBA_ParDescriptionSeq & params_;
+  const CORBA_ExceptionDefSeq & exceptions_;
   IR::FinderDef_ptr _result;
 };
 
@@ -11710,8 +12258,8 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::TAO_ServerRequestInfo_IR_HomeDef
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -12128,7 +12676,7 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_ke
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr primary_key,
+    CORBA_ValueDef_ptr primary_key,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -12167,8 +12715,8 @@ IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -12208,8 +12756,8 @@ IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -12256,11 +12804,11 @@ POA_IR::HomeDef::HomeDef (void)
 
 // copy ctor
 POA_IR::HomeDef::HomeDef (const HomeDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,InterfaceDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+  :   POA_CORBA_InterfaceDef (rhs),
+    POA_CORBA_Container (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
@@ -12762,7 +13310,7 @@ void POA_IR::HomeDef::create_primary_key_skel (
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::ValueDef_var primary_key;
+  CORBA_ValueDef_var primary_key;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -12863,8 +13411,8 @@ void POA_IR::HomeDef::create_factory_skel (
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::ParDescriptionSeq params;
-  CORBA::ExceptionDefSeq exceptions;
+  CORBA_ParDescriptionSeq params;
+  CORBA_ExceptionDefSeq exceptions;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -12968,8 +13516,8 @@ void POA_IR::HomeDef::create_finder_skel (
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::ParDescriptionSeq params;
-  CORBA::ExceptionDefSeq exceptions;
+  CORBA_ParDescriptionSeq params;
+  CORBA_ExceptionDefSeq exceptions;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -13099,6 +13647,54 @@ void POA_IR::HomeDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
+void POA_IR::HomeDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
 CORBA::Boolean POA_IR::HomeDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
@@ -13109,11 +13705,11 @@ CORBA::Boolean POA_IR::HomeDef::_is_a (
   
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -13126,16 +13722,16 @@ void* POA_IR::HomeDef::_downcast (
 {
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/HomeDef:1.0") == 0)
     return ACE_static_cast (POA_IR::HomeDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::InterfaceDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Container_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
@@ -13168,4 +13764,6 @@ POA_IR::HomeDef::_this (CORBA_Environment &ACE_TRY_ENV)
   return ::IR::HomeDef::_unchecked_narrow (obj.in ());
 }
 
+
+
 #endif /* ifndef */
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
index 21b6530c153..719c035ee12 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
@@ -19,18 +19,23 @@
 // 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"
 #include "tao/IFR_Client/IFR_ComponentsC.h"
 
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "IFR_ExtendedS.h"
-
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/PortableServer/Collocated_Object.h"
+#include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
+#include "tao/PortableServer/Direct_Object_Proxy_Impl.h"
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -50,7 +55,7 @@ TAO_NAMESPACE  POA_IR
   class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
   class _TAO_ComponentRepository_Strategized_Proxy_Broker;
   
-  class  ComponentRepository : public virtual POA_CORBA::Repository
+  class  ComponentRepository : public virtual POA_CORBA_Repository
   {
   protected:
     ComponentRepository (void);
@@ -86,6 +91,14 @@ TAO_NAMESPACE  POA_IR
           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,
@@ -105,7 +118,7 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         IR::ComponentDef_ptr base_component,
-        const CORBA::InterfaceDefSeq & supports_interfaces,
+        const CORBA_InterfaceDefSeq & supports_interfaces,
         CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
@@ -127,7 +140,7 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         IR::HomeDef_ptr base_home,
         IR::ComponentDef_ptr managed_component,
-        CORBA::ValueDef_ptr primary_key,
+        CORBA_ValueDef_ptr primary_key,
         CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
@@ -358,6 +371,8 @@ TAO_NAMESPACE  POA_IR
         CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
+
+
   };
 
   
@@ -382,7 +397,7 @@ TAO_NAMESPACE  POA_IR
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
     void create_proxy (
-      int strategy,
+      int collocation_strategy,
       CORBA::Environment &ACE_TRY_ENV
     );
   
@@ -416,7 +431,7 @@ TAO_NAMESPACE  POA_IR
 class  _TAO_ComponentRepository_ThruPOA_Proxy_Impl : 
   public virtual ::IR::_TAO_ComponentRepository_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_Repository_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_Repository_ThruPOA_Proxy_Impl
   
 {
 public:
@@ -430,7 +445,7 @@ public:
       const char * name,
       const char * version,
       IR::ComponentDef_ptr base_component,
-      const CORBA::InterfaceDefSeq & supports_interfaces,
+      const CORBA_InterfaceDefSeq & supports_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -444,7 +459,7 @@ public:
       const char * version,
       IR::HomeDef_ptr base_home,
       IR::ComponentDef_ptr managed_component,
-      CORBA::ValueDef_ptr primary_key,
+      CORBA_ValueDef_ptr primary_key,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -498,7 +513,7 @@ public:
       const char * name,
       const char * version,
       IR::ComponentDef_ptr base_component,
-      const CORBA::InterfaceDefSeq & supports_interfaces,
+      const CORBA_InterfaceDefSeq & supports_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -512,7 +527,7 @@ public:
       const char * version,
       IR::HomeDef_ptr base_home,
       IR::ComponentDef_ptr managed_component,
-      CORBA::ValueDef_ptr primary_key,
+      CORBA_ValueDef_ptr primary_key,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -520,7 +535,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained_ptr lookup_id (
+  CORBA_Contained_ptr lookup_id (
       const char * search_id,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -538,7 +553,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::PrimitiveDef_ptr get_primitive (
+  CORBA_PrimitiveDef_ptr get_primitive (
       CORBA::PrimitiveKind kind,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -547,7 +562,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::StringDef_ptr create_string (
+  CORBA_StringDef_ptr create_string (
       CORBA::ULong bound,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -556,7 +571,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::WstringDef_ptr create_wstring (
+  CORBA_WstringDef_ptr create_wstring (
       CORBA::ULong bound,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -565,9 +580,9 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::SequenceDef_ptr create_sequence (
+  CORBA_SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
-      CORBA::IDLType_ptr element_type,
+      CORBA_IDLType_ptr element_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -575,9 +590,9 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ArrayDef_ptr create_array (
+  CORBA_ArrayDef_ptr create_array (
       CORBA::ULong length,
-      CORBA::IDLType_ptr element_type,
+      CORBA_IDLType_ptr element_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -585,7 +600,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::FixedDef_ptr create_fixed (
+  CORBA_FixedDef_ptr create_fixed (
       CORBA::UShort digits,
       CORBA::Short scale,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -595,7 +610,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained_ptr lookup (
+  CORBA_Contained_ptr lookup (
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -604,7 +619,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * contents (
+  CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -614,7 +629,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * lookup_name (
+  CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
@@ -626,7 +641,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container::DescriptionSeq * describe_contents (
+  CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs,
@@ -637,7 +652,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ModuleDef_ptr create_module (
+  CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
       const char * version,
@@ -648,11 +663,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ConstantDef_ptr create_constant (
+  CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -661,11 +676,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::StructDef_ptr create_struct (
+  CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -673,12 +688,12 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::UnionDef_ptr create_union (
+  CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -686,11 +701,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::EnumDef_ptr create_enum (
+  CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -698,11 +713,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AliasDef_ptr create_alias (
+  CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -710,11 +725,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef_ptr create_interface (
+  CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -722,17 +737,17 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr create_value (
+  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_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -740,11 +755,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueBoxDef_ptr create_value_box (
+  CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -752,11 +767,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ExceptionDef_ptr create_exception (
+  CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -764,7 +779,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::NativeDef_ptr create_native (
+  CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
       const char * version,
@@ -775,11 +790,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -787,11 +802,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::LocalInterfaceDef_ptr create_local_interface (
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -833,7 +848,7 @@ typedef ProvidesDef *ProvidesDef_ptr;
 class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
 class _TAO_ProvidesDef_Strategized_Proxy_Broker;
 
-class  ProvidesDef : public virtual POA_CORBA::Contained
+class  ProvidesDef : public virtual POA_CORBA_Contained
 {
 protected:
   ProvidesDef (void);
@@ -869,6 +884,14 @@ public:
         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,
@@ -883,7 +906,7 @@ public:
 
   virtual const char* _interface_repository_id (void) const;
 
-  virtual CORBA::InterfaceDef_ptr interface_type (
+  virtual CORBA_InterfaceDef_ptr interface_type (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1002,6 +1025,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -1026,7 +1051,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -1060,7 +1085,7 @@ public:
 class  _TAO_ProvidesDef_ThruPOA_Proxy_Impl : 
   public virtual ::IR::_TAO_ProvidesDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
   
 {
 public:
@@ -1068,7 +1093,7 @@ public:
   
   virtual ~_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void) { }
   
-    virtual CORBA::InterfaceDef_ptr interface_type (
+    virtual CORBA_InterfaceDef_ptr interface_type (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1118,7 +1143,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  CORBA::InterfaceDef_ptr interface_type (
+  CORBA_InterfaceDef_ptr interface_type (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1177,7 +1202,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1193,7 +1218,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1201,7 +1226,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1210,7 +1235,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -1254,7 +1279,7 @@ typedef UsesDef *UsesDef_ptr;
 class _TAO_UsesDef_ThruPOA_Proxy_Impl;
 class _TAO_UsesDef_Strategized_Proxy_Broker;
 
-class  UsesDef : public virtual POA_CORBA::Contained
+class  UsesDef : public virtual POA_CORBA_Contained
 {
 protected:
   UsesDef (void);
@@ -1290,6 +1315,14 @@ public:
         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,
@@ -1304,7 +1337,7 @@ public:
 
   virtual const char* _interface_repository_id (void) const;
 
-  virtual CORBA::InterfaceDef_ptr interface_type (
+  virtual CORBA_InterfaceDef_ptr interface_type (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1439,6 +1472,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -1463,7 +1498,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -1497,7 +1532,7 @@ public:
 class  _TAO_UsesDef_ThruPOA_Proxy_Impl : 
   public virtual ::IR::_TAO_UsesDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
   
 {
 public:
@@ -1505,7 +1540,7 @@ public:
   
   virtual ~_TAO_UsesDef_ThruPOA_Proxy_Impl (void) { }
   
-    virtual CORBA::InterfaceDef_ptr interface_type (
+    virtual CORBA_InterfaceDef_ptr interface_type (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1563,7 +1598,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  CORBA::InterfaceDef_ptr interface_type (
+  CORBA_InterfaceDef_ptr interface_type (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1630,7 +1665,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1646,7 +1681,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1654,7 +1689,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1663,7 +1698,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -1707,7 +1742,7 @@ typedef EventDef *EventDef_ptr;
 class _TAO_EventDef_ThruPOA_Proxy_Impl;
 class _TAO_EventDef_Strategized_Proxy_Broker;
 
-class  EventDef : public virtual POA_CORBA::Contained
+class  EventDef : public virtual POA_CORBA_Contained
 {
 protected:
   EventDef (void);
@@ -1743,6 +1778,14 @@ public:
         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,
@@ -1774,7 +1817,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::ValueDef_ptr event (
+  virtual CORBA_ValueDef_ptr event (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1893,6 +1936,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -1917,7 +1962,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -1951,7 +1996,7 @@ public:
 class  _TAO_EventDef_ThruPOA_Proxy_Impl : 
   public virtual ::IR::_TAO_EventDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
   
 {
 public:
@@ -1968,7 +2013,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDef_ptr event (
+  virtual CORBA_ValueDef_ptr event (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -2027,7 +2072,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr event (
+  CORBA_ValueDef_ptr event (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2086,7 +2131,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2102,7 +2147,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2110,7 +2155,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2119,7 +2164,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -2199,6 +2244,14 @@ public:
         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,
@@ -2332,6 +2385,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -2356,7 +2411,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -2449,7 +2504,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr event (
+  CORBA_ValueDef_ptr event (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2508,7 +2563,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2524,7 +2579,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2532,7 +2587,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2541,7 +2596,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -2621,6 +2676,14 @@ public:
         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,
@@ -2754,6 +2817,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -2778,7 +2843,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -2871,7 +2936,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr event (
+  CORBA_ValueDef_ptr event (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2930,7 +2995,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2946,7 +3011,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2954,7 +3019,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2963,7 +3028,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -3043,6 +3108,14 @@ public:
         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,
@@ -3176,6 +3249,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -3200,7 +3275,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -3293,7 +3368,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr event (
+  CORBA_ValueDef_ptr event (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3352,7 +3427,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3368,7 +3443,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3376,7 +3451,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3385,7 +3460,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -3429,7 +3504,7 @@ typedef ComponentDef *ComponentDef_ptr;
 class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
 class _TAO_ComponentDef_Strategized_Proxy_Broker;
 
-class  ComponentDef : public virtual POA_CORBA::InterfaceDef
+class  ComponentDef : public virtual POA_CORBA_InterfaceDef
 {
 protected:
   ComponentDef (void);
@@ -3465,6 +3540,14 @@ public:
         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,
@@ -3479,7 +3562,7 @@ public:
 
   virtual const char* _interface_repository_id (void) const;
 
-  virtual CORBA::InterfaceDefSeq * supported_interfaces (
+  virtual CORBA_InterfaceDefSeq * supported_interfaces (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3496,7 +3579,7 @@ public:
     );
 
   virtual void supported_interfaces (
-      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3628,7 +3711,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::InterfaceDef_ptr interface_type,
+      CORBA_InterfaceDef_ptr interface_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3648,7 +3731,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::InterfaceDef_ptr interface_type,
+      CORBA_InterfaceDef_ptr interface_type,
       CORBA::Boolean is_multiple,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -3669,7 +3752,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3689,7 +3772,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3709,7 +3792,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4020,6 +4103,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -4044,7 +4129,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -4078,7 +4163,7 @@ public:
 class  _TAO_ComponentDef_ThruPOA_Proxy_Impl : 
   public virtual ::IR::_TAO_ComponentDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl
   
 {
 public:
@@ -4086,7 +4171,7 @@ public:
   
   virtual ~_TAO_ComponentDef_ThruPOA_Proxy_Impl (void) { }
   
-    virtual CORBA::InterfaceDefSeq * supported_interfaces (
+    virtual CORBA_InterfaceDefSeq * supported_interfaces (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -4096,7 +4181,7 @@ public:
 
   virtual void supported_interfaces (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -4164,7 +4249,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::InterfaceDef_ptr interface_type,
+      CORBA_InterfaceDef_ptr interface_type,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -4176,7 +4261,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::InterfaceDef_ptr interface_type,
+      CORBA_InterfaceDef_ptr interface_type,
       CORBA::Boolean is_multiple,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -4189,7 +4274,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -4201,7 +4286,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -4213,7 +4298,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -4262,7 +4347,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  CORBA::InterfaceDefSeq * supported_interfaces (
+  CORBA_InterfaceDefSeq * supported_interfaces (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4271,7 +4356,7 @@ public:
     ));
 
   void supported_interfaces (
-      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4339,7 +4424,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::InterfaceDef_ptr interface_type,
+      CORBA_InterfaceDef_ptr interface_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4351,7 +4436,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::InterfaceDef_ptr interface_type,
+      CORBA_InterfaceDef_ptr interface_type,
       CORBA::Boolean is_multiple,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -4364,7 +4449,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4376,7 +4461,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4388,7 +4473,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4396,7 +4481,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDefSeq * base_interfaces (
+  CORBA_InterfaceDefSeq * base_interfaces (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4405,7 +4490,7 @@ public:
     ));
 
   void base_interfaces (
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4422,7 +4507,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
+  CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4430,11 +4515,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AttributeDef_ptr create_attribute (
+  CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -4443,15 +4528,15 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::OperationDef_ptr create_operation (
+  CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4459,7 +4544,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained_ptr lookup (
+  CORBA_Contained_ptr lookup (
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -4468,7 +4553,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * contents (
+  CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -4478,7 +4563,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * lookup_name (
+  CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
@@ -4490,7 +4575,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container::DescriptionSeq * describe_contents (
+  CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs,
@@ -4501,7 +4586,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ModuleDef_ptr create_module (
+  CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
       const char * version,
@@ -4512,11 +4597,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ConstantDef_ptr create_constant (
+  CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -4525,11 +4610,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::StructDef_ptr create_struct (
+  CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4537,12 +4622,12 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::UnionDef_ptr create_union (
+  CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4550,11 +4635,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::EnumDef_ptr create_enum (
+  CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4562,11 +4647,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AliasDef_ptr create_alias (
+  CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4574,11 +4659,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef_ptr create_interface (
+  CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4586,17 +4671,17 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr create_value (
+  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_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4604,11 +4689,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueBoxDef_ptr create_value_box (
+  CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4616,11 +4701,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ExceptionDef_ptr create_exception (
+  CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4628,7 +4713,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::NativeDef_ptr create_native (
+  CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
       const char * version,
@@ -4639,11 +4724,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4651,11 +4736,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::LocalInterfaceDef_ptr create_local_interface (
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4714,7 +4799,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4730,7 +4815,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4738,7 +4823,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4747,7 +4832,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -4799,7 +4884,7 @@ typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
 class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
 class _TAO_PrimaryKeyDef_Strategized_Proxy_Broker;
 
-class  PrimaryKeyDef : public virtual POA_CORBA::Contained
+class  PrimaryKeyDef : public virtual POA_CORBA_Contained
 {
 protected:
   PrimaryKeyDef (void);
@@ -4835,6 +4920,14 @@ public:
         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,
@@ -4866,7 +4959,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::ValueDef_ptr primary_key (
+  virtual CORBA_ValueDef_ptr primary_key (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4985,6 +5078,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -5009,7 +5104,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -5043,7 +5138,7 @@ public:
 class  _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl : 
   public virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
   
 {
 public:
@@ -5060,7 +5155,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDef_ptr primary_key (
+  virtual CORBA_ValueDef_ptr primary_key (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -5119,7 +5214,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr primary_key (
+  CORBA_ValueDef_ptr primary_key (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5178,7 +5273,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5194,7 +5289,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5202,7 +5297,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5211,7 +5306,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -5255,7 +5350,7 @@ typedef FactoryDef *FactoryDef_ptr;
 class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
 class _TAO_FactoryDef_Strategized_Proxy_Broker;
 
-class  FactoryDef : public virtual POA_CORBA::OperationDef
+class  FactoryDef : public virtual POA_CORBA_OperationDef
 {
 protected:
   FactoryDef (void);
@@ -5291,6 +5386,14 @@ public:
         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,
@@ -5496,6 +5599,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -5520,7 +5625,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -5554,7 +5659,7 @@ public:
 class  _TAO_FactoryDef_ThruPOA_Proxy_Impl : 
   public virtual ::IR::_TAO_FactoryDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl
   
 {
 public:
@@ -5612,7 +5717,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::IDLType_ptr result_def (
+  CORBA_IDLType_ptr result_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5621,7 +5726,7 @@ public:
     ));
 
   void result_def (
-      CORBA::IDLType_ptr result_def,
+      CORBA_IDLType_ptr result_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5629,7 +5734,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ParDescriptionSeq * params (
+  CORBA_ParDescriptionSeq * params (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5638,7 +5743,7 @@ public:
     ));
 
   void params (
-      const CORBA::ParDescriptionSeq & params,
+      const CORBA_ParDescriptionSeq & params,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5663,7 +5768,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContextIdSeq * contexts (
+  CORBA_ContextIdSeq * contexts (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5672,7 +5777,7 @@ public:
     ));
 
   void contexts (
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5680,7 +5785,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ExceptionDefSeq * exceptions (
+  CORBA_ExceptionDefSeq * exceptions (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5689,7 +5794,7 @@ public:
     ));
 
   void exceptions (
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5748,7 +5853,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5764,7 +5869,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5772,7 +5877,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5781,7 +5886,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -5825,7 +5930,7 @@ typedef FinderDef *FinderDef_ptr;
 class _TAO_FinderDef_ThruPOA_Proxy_Impl;
 class _TAO_FinderDef_Strategized_Proxy_Broker;
 
-class  FinderDef : public virtual POA_CORBA::OperationDef
+class  FinderDef : public virtual POA_CORBA_OperationDef
 {
 protected:
   FinderDef (void);
@@ -5861,6 +5966,14 @@ public:
         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,
@@ -6066,6 +6179,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -6090,7 +6205,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -6124,7 +6239,7 @@ public:
 class  _TAO_FinderDef_ThruPOA_Proxy_Impl : 
   public virtual ::IR::_TAO_FinderDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_OperationDef_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl
   
 {
 public:
@@ -6182,7 +6297,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::IDLType_ptr result_def (
+  CORBA_IDLType_ptr result_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6191,7 +6306,7 @@ public:
     ));
 
   void result_def (
-      CORBA::IDLType_ptr result_def,
+      CORBA_IDLType_ptr result_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6199,7 +6314,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ParDescriptionSeq * params (
+  CORBA_ParDescriptionSeq * params (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6208,7 +6323,7 @@ public:
     ));
 
   void params (
-      const CORBA::ParDescriptionSeq & params,
+      const CORBA_ParDescriptionSeq & params,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6233,7 +6348,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContextIdSeq * contexts (
+  CORBA_ContextIdSeq * contexts (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6242,7 +6357,7 @@ public:
     ));
 
   void contexts (
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6250,7 +6365,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ExceptionDefSeq * exceptions (
+  CORBA_ExceptionDefSeq * exceptions (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6259,7 +6374,7 @@ public:
     ));
 
   void exceptions (
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6318,7 +6433,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6334,7 +6449,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6342,7 +6457,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6351,7 +6466,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -6395,7 +6510,7 @@ typedef HomeDef *HomeDef_ptr;
 class _TAO_HomeDef_ThruPOA_Proxy_Impl;
 class _TAO_HomeDef_Strategized_Proxy_Broker;
 
-class  HomeDef : public virtual POA_CORBA::InterfaceDef
+class  HomeDef : public virtual POA_CORBA_InterfaceDef
 {
 protected:
   HomeDef (void);
@@ -6431,6 +6546,14 @@ public:
         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,
@@ -6545,7 +6668,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr primary_key,
+      CORBA_ValueDef_ptr primary_key,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6565,8 +6688,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6586,8 +6709,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6898,6 +7021,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -6922,7 +7047,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -6956,7 +7081,7 @@ public:
 class  _TAO_HomeDef_ThruPOA_Proxy_Impl : 
   public virtual ::IR::_TAO_HomeDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_InterfaceDef_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl
   
 {
 public:
@@ -7017,7 +7142,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr primary_key,
+      CORBA_ValueDef_ptr primary_key,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -7029,8 +7154,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -7042,8 +7167,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -7144,7 +7269,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr primary_key,
+      CORBA_ValueDef_ptr primary_key,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7156,8 +7281,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7169,8 +7294,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7178,7 +7303,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDefSeq * base_interfaces (
+  CORBA_InterfaceDefSeq * base_interfaces (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7187,7 +7312,7 @@ public:
     ));
 
   void base_interfaces (
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7204,7 +7329,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
+  CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7212,11 +7337,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AttributeDef_ptr create_attribute (
+  CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -7225,15 +7350,15 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::OperationDef_ptr create_operation (
+  CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7241,7 +7366,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained_ptr lookup (
+  CORBA_Contained_ptr lookup (
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -7250,7 +7375,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * contents (
+  CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -7260,7 +7385,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * lookup_name (
+  CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
@@ -7272,7 +7397,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container::DescriptionSeq * describe_contents (
+  CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs,
@@ -7283,7 +7408,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ModuleDef_ptr create_module (
+  CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
       const char * version,
@@ -7294,11 +7419,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ConstantDef_ptr create_constant (
+  CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -7307,11 +7432,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::StructDef_ptr create_struct (
+  CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7319,12 +7444,12 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::UnionDef_ptr create_union (
+  CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7332,11 +7457,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::EnumDef_ptr create_enum (
+  CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7344,11 +7469,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AliasDef_ptr create_alias (
+  CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7356,11 +7481,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef_ptr create_interface (
+  CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7368,17 +7493,17 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr create_value (
+  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_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7386,11 +7511,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueBoxDef_ptr create_value_box (
+  CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7398,11 +7523,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ExceptionDef_ptr create_exception (
+  CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7410,7 +7535,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::NativeDef_ptr create_native (
+  CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
       const char * version,
@@ -7421,11 +7546,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7433,11 +7558,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::LocalInterfaceDef_ptr create_local_interface (
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7496,7 +7621,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7512,7 +7637,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7520,7 +7645,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7529,7 +7654,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i
index 74ff0b44edd..4547c6557e1 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i
@@ -26,10 +26,10 @@ ACE_INLINE void POA_IR::ComponentRepository::lookup_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Repository::lookup_id_skel (
+  POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Repository::lookup_id_skel (
       req,
-      (POA_CORBA::Repository_ptr) impl,
+      (POA_CORBA_Repository_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -41,10 +41,10 @@ ACE_INLINE void POA_IR::ComponentRepository::get_canonical_typecode_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Repository::get_canonical_typecode_skel (
+  POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Repository::get_canonical_typecode_skel (
       req,
-      (POA_CORBA::Repository_ptr) impl,
+      (POA_CORBA_Repository_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -56,10 +56,10 @@ ACE_INLINE void POA_IR::ComponentRepository::get_primitive_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Repository::get_primitive_skel (
+  POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Repository::get_primitive_skel (
       req,
-      (POA_CORBA::Repository_ptr) impl,
+      (POA_CORBA_Repository_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -71,10 +71,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_string_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Repository::create_string_skel (
+  POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Repository::create_string_skel (
       req,
-      (POA_CORBA::Repository_ptr) impl,
+      (POA_CORBA_Repository_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -86,10 +86,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_wstring_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Repository::create_wstring_skel (
+  POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Repository::create_wstring_skel (
       req,
-      (POA_CORBA::Repository_ptr) impl,
+      (POA_CORBA_Repository_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -101,10 +101,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_sequence_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Repository::create_sequence_skel (
+  POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Repository::create_sequence_skel (
       req,
-      (POA_CORBA::Repository_ptr) impl,
+      (POA_CORBA_Repository_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -116,10 +116,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_array_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Repository::create_array_skel (
+  POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Repository::create_array_skel (
       req,
-      (POA_CORBA::Repository_ptr) impl,
+      (POA_CORBA_Repository_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -131,10 +131,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_fixed_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Repository::create_fixed_skel (
+  POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Repository::create_fixed_skel (
       req,
-      (POA_CORBA::Repository_ptr) impl,
+      (POA_CORBA_Repository_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -146,10 +146,10 @@ ACE_INLINE void POA_IR::ComponentRepository::lookup_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::lookup_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -161,10 +161,10 @@ ACE_INLINE void POA_IR::ComponentRepository::contents_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -176,10 +176,10 @@ ACE_INLINE void POA_IR::ComponentRepository::lookup_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::lookup_name_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -191,10 +191,10 @@ ACE_INLINE void POA_IR::ComponentRepository::describe_contents_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::describe_contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -206,10 +206,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_module_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::create_module_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -221,10 +221,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_constant_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::create_constant_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -236,10 +236,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_struct_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::create_struct_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -251,10 +251,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_union_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::create_union_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -266,10 +266,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_enum_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::create_enum_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -281,10 +281,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_alias_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::create_alias_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -296,10 +296,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_interface_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::create_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -311,10 +311,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_value_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::create_value_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -326,10 +326,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_value_box_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::create_value_box_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -341,10 +341,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_exception_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::create_exception_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -356,10 +356,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_native_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::create_native_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -371,10 +371,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_abstract_interface_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::create_abstract_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -386,10 +386,10 @@ ACE_INLINE void POA_IR::ComponentRepository::create_local_interface_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_Container::create_local_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -401,10 +401,10 @@ ACE_INLINE void POA_IR::ComponentRepository::_get_def_kind_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -416,10 +416,10 @@ ACE_INLINE void POA_IR::ComponentRepository::destroy_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -431,10 +431,10 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -446,10 +446,10 @@ ACE_INLINE void POA_IR::ProvidesDef::_set_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -461,10 +461,10 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -476,10 +476,10 @@ ACE_INLINE void POA_IR::ProvidesDef::_set_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -491,10 +491,10 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -506,10 +506,10 @@ ACE_INLINE void POA_IR::ProvidesDef::_set_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -521,10 +521,10 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_defined_in_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -536,10 +536,10 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_absolute_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -551,10 +551,10 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_containing_repository_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -566,10 +566,10 @@ ACE_INLINE void POA_IR::ProvidesDef::describe_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -581,10 +581,10 @@ ACE_INLINE void POA_IR::ProvidesDef::move_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -596,10 +596,10 @@ ACE_INLINE void POA_IR::ProvidesDef::_get_def_kind_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -611,10 +611,10 @@ ACE_INLINE void POA_IR::ProvidesDef::destroy_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -626,10 +626,10 @@ ACE_INLINE void POA_IR::UsesDef::_get_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -641,10 +641,10 @@ ACE_INLINE void POA_IR::UsesDef::_set_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -656,10 +656,10 @@ ACE_INLINE void POA_IR::UsesDef::_get_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -671,10 +671,10 @@ ACE_INLINE void POA_IR::UsesDef::_set_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -686,10 +686,10 @@ ACE_INLINE void POA_IR::UsesDef::_get_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -701,10 +701,10 @@ ACE_INLINE void POA_IR::UsesDef::_set_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -716,10 +716,10 @@ ACE_INLINE void POA_IR::UsesDef::_get_defined_in_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -731,10 +731,10 @@ ACE_INLINE void POA_IR::UsesDef::_get_absolute_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -746,10 +746,10 @@ ACE_INLINE void POA_IR::UsesDef::_get_containing_repository_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -761,10 +761,10 @@ ACE_INLINE void POA_IR::UsesDef::describe_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -776,10 +776,10 @@ ACE_INLINE void POA_IR::UsesDef::move_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -791,10 +791,10 @@ ACE_INLINE void POA_IR::UsesDef::_get_def_kind_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -806,10 +806,10 @@ ACE_INLINE void POA_IR::UsesDef::destroy_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -821,10 +821,10 @@ ACE_INLINE void POA_IR::EventDef::_get_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -836,10 +836,10 @@ ACE_INLINE void POA_IR::EventDef::_set_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -851,10 +851,10 @@ ACE_INLINE void POA_IR::EventDef::_get_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -866,10 +866,10 @@ ACE_INLINE void POA_IR::EventDef::_set_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -881,10 +881,10 @@ ACE_INLINE void POA_IR::EventDef::_get_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -896,10 +896,10 @@ ACE_INLINE void POA_IR::EventDef::_set_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -911,10 +911,10 @@ ACE_INLINE void POA_IR::EventDef::_get_defined_in_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -926,10 +926,10 @@ ACE_INLINE void POA_IR::EventDef::_get_absolute_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -941,10 +941,10 @@ ACE_INLINE void POA_IR::EventDef::_get_containing_repository_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -956,10 +956,10 @@ ACE_INLINE void POA_IR::EventDef::describe_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -971,10 +971,10 @@ ACE_INLINE void POA_IR::EventDef::move_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -986,10 +986,10 @@ ACE_INLINE void POA_IR::EventDef::_get_def_kind_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::EventDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::EventDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1001,10 +1001,10 @@ ACE_INLINE void POA_IR::EventDef::destroy_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::EventDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::EventDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1046,10 +1046,10 @@ ACE_INLINE void POA_IR::EmitsDef::_get_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1061,10 +1061,10 @@ ACE_INLINE void POA_IR::EmitsDef::_set_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1076,10 +1076,10 @@ ACE_INLINE void POA_IR::EmitsDef::_get_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1091,10 +1091,10 @@ ACE_INLINE void POA_IR::EmitsDef::_set_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1106,10 +1106,10 @@ ACE_INLINE void POA_IR::EmitsDef::_get_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1121,10 +1121,10 @@ ACE_INLINE void POA_IR::EmitsDef::_set_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1136,10 +1136,10 @@ ACE_INLINE void POA_IR::EmitsDef::_get_defined_in_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1151,10 +1151,10 @@ ACE_INLINE void POA_IR::EmitsDef::_get_absolute_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1166,10 +1166,10 @@ ACE_INLINE void POA_IR::EmitsDef::_get_containing_repository_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1181,10 +1181,10 @@ ACE_INLINE void POA_IR::EmitsDef::describe_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1196,10 +1196,10 @@ ACE_INLINE void POA_IR::EmitsDef::move_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1211,10 +1211,10 @@ ACE_INLINE void POA_IR::EmitsDef::_get_def_kind_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1226,10 +1226,10 @@ ACE_INLINE void POA_IR::EmitsDef::destroy_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1271,10 +1271,10 @@ ACE_INLINE void POA_IR::PublishesDef::_get_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1286,10 +1286,10 @@ ACE_INLINE void POA_IR::PublishesDef::_set_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1301,10 +1301,10 @@ ACE_INLINE void POA_IR::PublishesDef::_get_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1316,10 +1316,10 @@ ACE_INLINE void POA_IR::PublishesDef::_set_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1331,10 +1331,10 @@ ACE_INLINE void POA_IR::PublishesDef::_get_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1346,10 +1346,10 @@ ACE_INLINE void POA_IR::PublishesDef::_set_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1361,10 +1361,10 @@ ACE_INLINE void POA_IR::PublishesDef::_get_defined_in_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1376,10 +1376,10 @@ ACE_INLINE void POA_IR::PublishesDef::_get_absolute_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1391,10 +1391,10 @@ ACE_INLINE void POA_IR::PublishesDef::_get_containing_repository_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1406,10 +1406,10 @@ ACE_INLINE void POA_IR::PublishesDef::describe_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1421,10 +1421,10 @@ ACE_INLINE void POA_IR::PublishesDef::move_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1436,10 +1436,10 @@ ACE_INLINE void POA_IR::PublishesDef::_get_def_kind_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1451,10 +1451,10 @@ ACE_INLINE void POA_IR::PublishesDef::destroy_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1496,10 +1496,10 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1511,10 +1511,10 @@ ACE_INLINE void POA_IR::ConsumesDef::_set_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1526,10 +1526,10 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1541,10 +1541,10 @@ ACE_INLINE void POA_IR::ConsumesDef::_set_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1556,10 +1556,10 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1571,10 +1571,10 @@ ACE_INLINE void POA_IR::ConsumesDef::_set_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1586,10 +1586,10 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_defined_in_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1601,10 +1601,10 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_absolute_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1616,10 +1616,10 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_containing_repository_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1631,10 +1631,10 @@ ACE_INLINE void POA_IR::ConsumesDef::describe_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1646,10 +1646,10 @@ ACE_INLINE void POA_IR::ConsumesDef::move_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1661,10 +1661,10 @@ ACE_INLINE void POA_IR::ConsumesDef::_get_def_kind_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1676,10 +1676,10 @@ ACE_INLINE void POA_IR::ConsumesDef::destroy_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1691,10 +1691,10 @@ ACE_INLINE void POA_IR::ComponentDef::_get_base_interfaces_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1706,10 +1706,10 @@ ACE_INLINE void POA_IR::ComponentDef::_set_base_interfaces_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -1721,10 +1721,10 @@ ACE_INLINE void POA_IR::ComponentDef::is_a_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::InterfaceDef::is_a_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_InterfaceDef::is_a_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1736,10 +1736,10 @@ ACE_INLINE void POA_IR::ComponentDef::describe_interface_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::InterfaceDef::describe_interface_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_InterfaceDef::describe_interface_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1751,10 +1751,10 @@ ACE_INLINE void POA_IR::ComponentDef::create_attribute_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_attribute_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_InterfaceDef::create_attribute_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1766,10 +1766,10 @@ ACE_INLINE void POA_IR::ComponentDef::create_operation_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_operation_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_InterfaceDef::create_operation_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1781,10 +1781,10 @@ ACE_INLINE void POA_IR::ComponentDef::lookup_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::lookup_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1796,10 +1796,10 @@ ACE_INLINE void POA_IR::ComponentDef::contents_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1811,10 +1811,10 @@ ACE_INLINE void POA_IR::ComponentDef::lookup_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::lookup_name_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1826,10 +1826,10 @@ ACE_INLINE void POA_IR::ComponentDef::describe_contents_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::describe_contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1841,10 +1841,10 @@ ACE_INLINE void POA_IR::ComponentDef::create_module_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::create_module_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1856,10 +1856,10 @@ ACE_INLINE void POA_IR::ComponentDef::create_constant_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::create_constant_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1871,10 +1871,10 @@ ACE_INLINE void POA_IR::ComponentDef::create_struct_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::create_struct_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1886,10 +1886,10 @@ ACE_INLINE void POA_IR::ComponentDef::create_union_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::create_union_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1901,10 +1901,10 @@ ACE_INLINE void POA_IR::ComponentDef::create_enum_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::create_enum_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1916,10 +1916,10 @@ ACE_INLINE void POA_IR::ComponentDef::create_alias_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::create_alias_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1931,10 +1931,10 @@ ACE_INLINE void POA_IR::ComponentDef::create_interface_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::create_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1946,10 +1946,10 @@ ACE_INLINE void POA_IR::ComponentDef::create_value_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::create_value_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1961,10 +1961,10 @@ ACE_INLINE void POA_IR::ComponentDef::create_value_box_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::create_value_box_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1976,10 +1976,10 @@ ACE_INLINE void POA_IR::ComponentDef::create_exception_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::create_exception_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -1991,10 +1991,10 @@ ACE_INLINE void POA_IR::ComponentDef::create_native_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::create_native_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -2006,10 +2006,10 @@ ACE_INLINE void POA_IR::ComponentDef::create_abstract_interface_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::create_abstract_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -2021,10 +2021,10 @@ ACE_INLINE void POA_IR::ComponentDef::create_local_interface_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Container::create_local_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -2036,10 +2036,10 @@ ACE_INLINE void POA_IR::ComponentDef::_get_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2051,10 +2051,10 @@ ACE_INLINE void POA_IR::ComponentDef::_set_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2066,10 +2066,10 @@ ACE_INLINE void POA_IR::ComponentDef::_get_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2081,10 +2081,10 @@ ACE_INLINE void POA_IR::ComponentDef::_set_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2096,10 +2096,10 @@ ACE_INLINE void POA_IR::ComponentDef::_get_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2111,10 +2111,10 @@ ACE_INLINE void POA_IR::ComponentDef::_set_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2126,10 +2126,10 @@ ACE_INLINE void POA_IR::ComponentDef::_get_defined_in_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2141,10 +2141,10 @@ ACE_INLINE void POA_IR::ComponentDef::_get_absolute_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2156,10 +2156,10 @@ ACE_INLINE void POA_IR::ComponentDef::_get_containing_repository_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2171,10 +2171,10 @@ ACE_INLINE void POA_IR::ComponentDef::describe_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -2186,10 +2186,10 @@ ACE_INLINE void POA_IR::ComponentDef::move_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -2201,10 +2201,10 @@ ACE_INLINE void POA_IR::ComponentDef::_get_type_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2216,10 +2216,10 @@ ACE_INLINE void POA_IR::ComponentDef::_get_def_kind_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2231,10 +2231,10 @@ ACE_INLINE void POA_IR::ComponentDef::destroy_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -2246,10 +2246,10 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2261,10 +2261,10 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_set_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2276,10 +2276,10 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2291,10 +2291,10 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_set_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2306,10 +2306,10 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2321,10 +2321,10 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_set_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2336,10 +2336,10 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_defined_in_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2351,10 +2351,10 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_absolute_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2366,10 +2366,10 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_containing_repository_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2381,10 +2381,10 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::describe_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -2396,10 +2396,10 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::move_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -2411,10 +2411,10 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::_get_def_kind_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2426,10 +2426,10 @@ ACE_INLINE void POA_IR::PrimaryKeyDef::destroy_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -2441,10 +2441,10 @@ ACE_INLINE void POA_IR::FactoryDef::_get_result_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_result_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_OperationDef::_get_result_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2456,10 +2456,10 @@ ACE_INLINE void POA_IR::FactoryDef::_get_result_def_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_result_def_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_OperationDef::_get_result_def_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2471,10 +2471,10 @@ ACE_INLINE void POA_IR::FactoryDef::_set_result_def_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_result_def_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_OperationDef::_set_result_def_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2486,10 +2486,10 @@ ACE_INLINE void POA_IR::FactoryDef::_get_params_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_params_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_OperationDef::_get_params_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2501,10 +2501,10 @@ ACE_INLINE void POA_IR::FactoryDef::_set_params_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_params_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_OperationDef::_set_params_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2516,10 +2516,10 @@ ACE_INLINE void POA_IR::FactoryDef::_get_mode_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_mode_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_OperationDef::_get_mode_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2531,10 +2531,10 @@ ACE_INLINE void POA_IR::FactoryDef::_set_mode_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_mode_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_OperationDef::_set_mode_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2546,10 +2546,10 @@ ACE_INLINE void POA_IR::FactoryDef::_get_contexts_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_contexts_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_OperationDef::_get_contexts_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2561,10 +2561,10 @@ ACE_INLINE void POA_IR::FactoryDef::_set_contexts_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_contexts_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_OperationDef::_set_contexts_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2576,10 +2576,10 @@ ACE_INLINE void POA_IR::FactoryDef::_get_exceptions_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_exceptions_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_OperationDef::_get_exceptions_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2591,10 +2591,10 @@ ACE_INLINE void POA_IR::FactoryDef::_set_exceptions_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_exceptions_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_OperationDef::_set_exceptions_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2606,10 +2606,10 @@ ACE_INLINE void POA_IR::FactoryDef::_get_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2621,10 +2621,10 @@ ACE_INLINE void POA_IR::FactoryDef::_set_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2636,10 +2636,10 @@ ACE_INLINE void POA_IR::FactoryDef::_get_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2651,10 +2651,10 @@ ACE_INLINE void POA_IR::FactoryDef::_set_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2666,10 +2666,10 @@ ACE_INLINE void POA_IR::FactoryDef::_get_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2681,10 +2681,10 @@ ACE_INLINE void POA_IR::FactoryDef::_set_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2696,10 +2696,10 @@ ACE_INLINE void POA_IR::FactoryDef::_get_defined_in_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2711,10 +2711,10 @@ ACE_INLINE void POA_IR::FactoryDef::_get_absolute_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2726,10 +2726,10 @@ ACE_INLINE void POA_IR::FactoryDef::_get_containing_repository_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2741,10 +2741,10 @@ ACE_INLINE void POA_IR::FactoryDef::describe_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -2756,10 +2756,10 @@ ACE_INLINE void POA_IR::FactoryDef::move_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -2771,10 +2771,10 @@ ACE_INLINE void POA_IR::FactoryDef::_get_def_kind_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2786,10 +2786,10 @@ ACE_INLINE void POA_IR::FactoryDef::destroy_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -2801,10 +2801,10 @@ ACE_INLINE void POA_IR::FinderDef::_get_result_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_result_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_OperationDef::_get_result_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2816,10 +2816,10 @@ ACE_INLINE void POA_IR::FinderDef::_get_result_def_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_result_def_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_OperationDef::_get_result_def_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2831,10 +2831,10 @@ ACE_INLINE void POA_IR::FinderDef::_set_result_def_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_result_def_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_OperationDef::_set_result_def_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2846,10 +2846,10 @@ ACE_INLINE void POA_IR::FinderDef::_get_params_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_params_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_OperationDef::_get_params_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2861,10 +2861,10 @@ ACE_INLINE void POA_IR::FinderDef::_set_params_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_params_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_OperationDef::_set_params_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2876,10 +2876,10 @@ ACE_INLINE void POA_IR::FinderDef::_get_mode_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_mode_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_OperationDef::_get_mode_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2891,10 +2891,10 @@ ACE_INLINE void POA_IR::FinderDef::_set_mode_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_mode_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_OperationDef::_set_mode_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2906,10 +2906,10 @@ ACE_INLINE void POA_IR::FinderDef::_get_contexts_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_contexts_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_OperationDef::_get_contexts_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2921,10 +2921,10 @@ ACE_INLINE void POA_IR::FinderDef::_set_contexts_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_contexts_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_OperationDef::_set_contexts_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2936,10 +2936,10 @@ ACE_INLINE void POA_IR::FinderDef::_get_exceptions_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_get_exceptions_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_OperationDef::_get_exceptions_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2951,10 +2951,10 @@ ACE_INLINE void POA_IR::FinderDef::_set_exceptions_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::OperationDef::_set_exceptions_skel (
+  POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_OperationDef::_set_exceptions_skel (
       req,
-      (POA_CORBA::OperationDef_ptr) impl,
+      (POA_CORBA_OperationDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2966,10 +2966,10 @@ ACE_INLINE void POA_IR::FinderDef::_get_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2981,10 +2981,10 @@ ACE_INLINE void POA_IR::FinderDef::_set_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -2996,10 +2996,10 @@ ACE_INLINE void POA_IR::FinderDef::_get_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3011,10 +3011,10 @@ ACE_INLINE void POA_IR::FinderDef::_set_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3026,10 +3026,10 @@ ACE_INLINE void POA_IR::FinderDef::_get_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3041,10 +3041,10 @@ ACE_INLINE void POA_IR::FinderDef::_set_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3056,10 +3056,10 @@ ACE_INLINE void POA_IR::FinderDef::_get_defined_in_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3071,10 +3071,10 @@ ACE_INLINE void POA_IR::FinderDef::_get_absolute_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3086,10 +3086,10 @@ ACE_INLINE void POA_IR::FinderDef::_get_containing_repository_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3101,10 +3101,10 @@ ACE_INLINE void POA_IR::FinderDef::describe_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3116,10 +3116,10 @@ ACE_INLINE void POA_IR::FinderDef::move_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3131,10 +3131,10 @@ ACE_INLINE void POA_IR::FinderDef::_get_def_kind_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3146,10 +3146,10 @@ ACE_INLINE void POA_IR::FinderDef::destroy_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3161,10 +3161,10 @@ ACE_INLINE void POA_IR::HomeDef::_get_base_interfaces_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3176,10 +3176,10 @@ ACE_INLINE void POA_IR::HomeDef::_set_base_interfaces_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3191,10 +3191,10 @@ ACE_INLINE void POA_IR::HomeDef::is_a_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::InterfaceDef::is_a_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_InterfaceDef::is_a_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3206,10 +3206,10 @@ ACE_INLINE void POA_IR::HomeDef::describe_interface_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::InterfaceDef::describe_interface_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_InterfaceDef::describe_interface_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3221,10 +3221,10 @@ ACE_INLINE void POA_IR::HomeDef::create_attribute_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_attribute_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_InterfaceDef::create_attribute_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3236,10 +3236,10 @@ ACE_INLINE void POA_IR::HomeDef::create_operation_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::InterfaceDef::create_operation_skel (
+  POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_InterfaceDef::create_operation_skel (
       req,
-      (POA_CORBA::InterfaceDef_ptr) impl,
+      (POA_CORBA_InterfaceDef_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3251,10 +3251,10 @@ ACE_INLINE void POA_IR::HomeDef::lookup_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::lookup_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3266,10 +3266,10 @@ ACE_INLINE void POA_IR::HomeDef::contents_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3281,10 +3281,10 @@ ACE_INLINE void POA_IR::HomeDef::lookup_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::lookup_name_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3296,10 +3296,10 @@ ACE_INLINE void POA_IR::HomeDef::describe_contents_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::describe_contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3311,10 +3311,10 @@ ACE_INLINE void POA_IR::HomeDef::create_module_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::create_module_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3326,10 +3326,10 @@ ACE_INLINE void POA_IR::HomeDef::create_constant_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::create_constant_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3341,10 +3341,10 @@ ACE_INLINE void POA_IR::HomeDef::create_struct_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::create_struct_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3356,10 +3356,10 @@ ACE_INLINE void POA_IR::HomeDef::create_union_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::create_union_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3371,10 +3371,10 @@ ACE_INLINE void POA_IR::HomeDef::create_enum_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::create_enum_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3386,10 +3386,10 @@ ACE_INLINE void POA_IR::HomeDef::create_alias_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::create_alias_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3401,10 +3401,10 @@ ACE_INLINE void POA_IR::HomeDef::create_interface_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::create_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3416,10 +3416,10 @@ ACE_INLINE void POA_IR::HomeDef::create_value_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::create_value_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3431,10 +3431,10 @@ ACE_INLINE void POA_IR::HomeDef::create_value_box_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::create_value_box_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3446,10 +3446,10 @@ ACE_INLINE void POA_IR::HomeDef::create_exception_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::create_exception_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3461,10 +3461,10 @@ ACE_INLINE void POA_IR::HomeDef::create_native_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::create_native_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3476,10 +3476,10 @@ ACE_INLINE void POA_IR::HomeDef::create_abstract_interface_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::create_abstract_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3491,10 +3491,10 @@ ACE_INLINE void POA_IR::HomeDef::create_local_interface_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Container::create_local_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3506,10 +3506,10 @@ ACE_INLINE void POA_IR::HomeDef::_get_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3521,10 +3521,10 @@ ACE_INLINE void POA_IR::HomeDef::_set_id_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3536,10 +3536,10 @@ ACE_INLINE void POA_IR::HomeDef::_get_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3551,10 +3551,10 @@ ACE_INLINE void POA_IR::HomeDef::_set_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3566,10 +3566,10 @@ ACE_INLINE void POA_IR::HomeDef::_get_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3581,10 +3581,10 @@ ACE_INLINE void POA_IR::HomeDef::_set_version_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3596,10 +3596,10 @@ ACE_INLINE void POA_IR::HomeDef::_get_defined_in_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3611,10 +3611,10 @@ ACE_INLINE void POA_IR::HomeDef::_get_absolute_name_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3626,10 +3626,10 @@ ACE_INLINE void POA_IR::HomeDef::_get_containing_repository_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3641,10 +3641,10 @@ ACE_INLINE void POA_IR::HomeDef::describe_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3656,10 +3656,10 @@ ACE_INLINE void POA_IR::HomeDef::move_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
@@ -3671,10 +3671,10 @@ ACE_INLINE void POA_IR::HomeDef::_get_type_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3686,10 +3686,10 @@ ACE_INLINE void POA_IR::HomeDef::_get_def_kind_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
@@ -3701,10 +3701,10 @@ ACE_INLINE void POA_IR::HomeDef::destroy_skel (
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.cpp b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.cpp
index 32b55e1aa92..70e649dbdc5 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.cpp
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_IDL_IFR_COMPONENTSS_T_CPP
-#define TAO_IDL_IFR_COMPONENTSS_T_CPP
+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_COMPONENTSS_T_CPP_
+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_COMPONENTSS_T_CPP_
 
 #include "IFR_ComponentsS_T.h"
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h
index 3772d94b112..df4f0cbe8c2 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_IFR_COMPONENTSS_T_H
-#define TAO_IDL_IFR_COMPONENTSS_T_H
+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_COMPONENTSS_T_H_
+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_COMPONENTSS_T_H_
 
 #include "ace/pre.h"
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i
index e36504de584..df5ffd60ea3 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i
@@ -104,7 +104,7 @@ IR::ComponentDef_ptr POA_IR::ComponentRepository_tie<T>::create_component  (
     const char * name,
     const char * version,
     IR::ComponentDef_ptr base_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces,
+    const CORBA_InterfaceDefSeq & supports_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -128,7 +128,7 @@ IR::HomeDef_ptr POA_IR::ComponentRepository_tie<T>::create_home  (
     const char * version,
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
-    CORBA::ValueDef_ptr primary_key,
+    CORBA_ValueDef_ptr primary_key,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -147,7 +147,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained_ptr POA_IR::ComponentRepository_tie<T>::lookup_id  (
+CORBA_Contained_ptr POA_IR::ComponentRepository_tie<T>::lookup_id  (
     const char * search_id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -177,7 +177,7 @@ tc,
 }
 
 template <class T> ACE_INLINE
-CORBA::PrimitiveDef_ptr POA_IR::ComponentRepository_tie<T>::get_primitive  (
+CORBA_PrimitiveDef_ptr POA_IR::ComponentRepository_tie<T>::get_primitive  (
     CORBA::PrimitiveKind kind,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -192,7 +192,7 @@ kind,
 }
 
 template <class T> ACE_INLINE
-CORBA::StringDef_ptr POA_IR::ComponentRepository_tie<T>::create_string  (
+CORBA_StringDef_ptr POA_IR::ComponentRepository_tie<T>::create_string  (
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -207,7 +207,7 @@ bound,
 }
 
 template <class T> ACE_INLINE
-CORBA::WstringDef_ptr POA_IR::ComponentRepository_tie<T>::create_wstring  (
+CORBA_WstringDef_ptr POA_IR::ComponentRepository_tie<T>::create_wstring  (
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -222,9 +222,9 @@ bound,
 }
 
 template <class T> ACE_INLINE
-CORBA::SequenceDef_ptr POA_IR::ComponentRepository_tie<T>::create_sequence  (
+CORBA_SequenceDef_ptr POA_IR::ComponentRepository_tie<T>::create_sequence  (
     CORBA::ULong bound,
-    CORBA::IDLType_ptr element_type,
+    CORBA_IDLType_ptr element_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -239,9 +239,9 @@ bound,
 }
 
 template <class T> ACE_INLINE
-CORBA::ArrayDef_ptr POA_IR::ComponentRepository_tie<T>::create_array  (
+CORBA_ArrayDef_ptr POA_IR::ComponentRepository_tie<T>::create_array  (
     CORBA::ULong length,
-    CORBA::IDLType_ptr element_type,
+    CORBA_IDLType_ptr element_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -256,7 +256,7 @@ length,
 }
 
 template <class T> ACE_INLINE
-CORBA::FixedDef_ptr POA_IR::ComponentRepository_tie<T>::create_fixed  (
+CORBA_FixedDef_ptr POA_IR::ComponentRepository_tie<T>::create_fixed  (
     CORBA::UShort digits,
     CORBA::Short scale,
     CORBA::Environment &ACE_TRY_ENV
@@ -273,7 +273,7 @@ digits,
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained_ptr POA_IR::ComponentRepository_tie<T>::lookup  (
+CORBA_Contained_ptr POA_IR::ComponentRepository_tie<T>::lookup  (
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -288,7 +288,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_IR::ComponentRepository_tie<T>::contents  (
+CORBA_ContainedSeq * POA_IR::ComponentRepository_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Environment &ACE_TRY_ENV
@@ -305,7 +305,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_IR::ComponentRepository_tie<T>::lookup_name  (
+CORBA_ContainedSeq * POA_IR::ComponentRepository_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
@@ -326,7 +326,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container::DescriptionSeq * POA_IR::ComponentRepository_tie<T>::describe_contents  (
+CORBA_Container::DescriptionSeq * POA_IR::ComponentRepository_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs,
@@ -345,7 +345,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ModuleDef_ptr POA_IR::ComponentRepository_tie<T>::create_module  (
+CORBA_ModuleDef_ptr POA_IR::ComponentRepository_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version,
@@ -364,11 +364,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ConstantDef_ptr POA_IR::ComponentRepository_tie<T>::create_constant  (
+CORBA_ConstantDef_ptr POA_IR::ComponentRepository_tie<T>::create_constant  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -387,11 +387,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::StructDef_ptr POA_IR::ComponentRepository_tie<T>::create_struct  (
+CORBA_StructDef_ptr POA_IR::ComponentRepository_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -408,12 +408,12 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::UnionDef_ptr POA_IR::ComponentRepository_tie<T>::create_union  (
+CORBA_UnionDef_ptr POA_IR::ComponentRepository_tie<T>::create_union  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -431,11 +431,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::EnumDef_ptr POA_IR::ComponentRepository_tie<T>::create_enum  (
+CORBA_EnumDef_ptr POA_IR::ComponentRepository_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -452,11 +452,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AliasDef_ptr POA_IR::ComponentRepository_tie<T>::create_alias  (
+CORBA_AliasDef_ptr POA_IR::ComponentRepository_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -473,11 +473,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_interface  (
+CORBA_InterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -494,17 +494,17 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_IR::ComponentRepository_tie<T>::create_value  (
+CORBA_ValueDef_ptr POA_IR::ComponentRepository_tie<T>::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_ValueDef_ptr base_value,
     CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -527,11 +527,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueBoxDef_ptr POA_IR::ComponentRepository_tie<T>::create_value_box  (
+CORBA_ValueBoxDef_ptr POA_IR::ComponentRepository_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -548,11 +548,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ExceptionDef_ptr POA_IR::ComponentRepository_tie<T>::create_exception  (
+CORBA_ExceptionDef_ptr POA_IR::ComponentRepository_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -569,7 +569,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::NativeDef_ptr POA_IR::ComponentRepository_tie<T>::create_native  (
+CORBA_NativeDef_ptr POA_IR::ComponentRepository_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version,
@@ -588,11 +588,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AbstractInterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_abstract_interface  (
+CORBA_AbstractInterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_abstract_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -609,11 +609,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::LocalInterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_local_interface  (
+CORBA_LocalInterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -736,7 +736,7 @@ POA_IR::ProvidesDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef_ptr POA_IR::ProvidesDef_tie<T>::interface_type  (
+CORBA_InterfaceDef_ptr POA_IR::ProvidesDef_tie<T>::interface_type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -833,7 +833,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_IR::ProvidesDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_IR::ProvidesDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -859,7 +859,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_IR::ProvidesDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_IR::ProvidesDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -872,7 +872,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_IR::ProvidesDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_IR::ProvidesDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -886,7 +886,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::ProvidesDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -1010,7 +1010,7 @@ POA_IR::UsesDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef_ptr POA_IR::UsesDef_tie<T>::interface_type  (
+CORBA_InterfaceDef_ptr POA_IR::UsesDef_tie<T>::interface_type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1120,7 +1120,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_IR::UsesDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_IR::UsesDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1146,7 +1146,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_IR::UsesDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_IR::UsesDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1159,7 +1159,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_IR::UsesDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_IR::UsesDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1173,7 +1173,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::UsesDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -1312,7 +1312,7 @@ event_id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_IR::EventDef_tie<T>::event  (
+CORBA_ValueDef_ptr POA_IR::EventDef_tie<T>::event  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1409,7 +1409,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_IR::EventDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_IR::EventDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1435,7 +1435,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_IR::EventDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_IR::EventDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1448,7 +1448,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_IR::EventDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_IR::EventDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1462,7 +1462,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::EventDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -1601,7 +1601,7 @@ event_id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_IR::EmitsDef_tie<T>::event  (
+CORBA_ValueDef_ptr POA_IR::EmitsDef_tie<T>::event  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1698,7 +1698,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_IR::EmitsDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_IR::EmitsDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1724,7 +1724,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_IR::EmitsDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_IR::EmitsDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1737,7 +1737,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_IR::EmitsDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_IR::EmitsDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1751,7 +1751,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::EmitsDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -1890,7 +1890,7 @@ event_id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_IR::PublishesDef_tie<T>::event  (
+CORBA_ValueDef_ptr POA_IR::PublishesDef_tie<T>::event  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1987,7 +1987,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_IR::PublishesDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_IR::PublishesDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2013,7 +2013,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_IR::PublishesDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_IR::PublishesDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2026,7 +2026,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_IR::PublishesDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_IR::PublishesDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2040,7 +2040,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::PublishesDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -2179,7 +2179,7 @@ event_id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_IR::ConsumesDef_tie<T>::event  (
+CORBA_ValueDef_ptr POA_IR::ConsumesDef_tie<T>::event  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2276,7 +2276,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_IR::ConsumesDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_IR::ConsumesDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2302,7 +2302,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_IR::ConsumesDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_IR::ConsumesDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2315,7 +2315,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_IR::ConsumesDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_IR::ConsumesDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2329,7 +2329,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::ConsumesDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -2453,7 +2453,7 @@ POA_IR::ComponentDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDefSeq * POA_IR::ComponentDef_tie<T>::supported_interfaces  (
+CORBA_InterfaceDefSeq * POA_IR::ComponentDef_tie<T>::supported_interfaces  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2467,7 +2467,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::supported_interfaces  (
-    const CORBA::InterfaceDefSeq & supported_interfaces,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2576,7 +2576,7 @@ IR::ProvidesDef_ptr POA_IR::ComponentDef_tie<T>::create_provides  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
+    CORBA_InterfaceDef_ptr interface_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2597,7 +2597,7 @@ IR::UsesDef_ptr POA_IR::ComponentDef_tie<T>::create_uses  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
+    CORBA_InterfaceDef_ptr interface_type,
     CORBA::Boolean is_multiple,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2620,7 +2620,7 @@ IR::EmitsDef_ptr POA_IR::ComponentDef_tie<T>::create_emits  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2641,7 +2641,7 @@ IR::PublishesDef_ptr POA_IR::ComponentDef_tie<T>::create_publishes  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2662,7 +2662,7 @@ IR::ConsumesDef_ptr POA_IR::ComponentDef_tie<T>::create_consumes  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2679,7 +2679,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDefSeq * POA_IR::ComponentDef_tie<T>::base_interfaces  (
+CORBA_InterfaceDefSeq * POA_IR::ComponentDef_tie<T>::base_interfaces  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2693,7 +2693,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::base_interfaces  (
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2722,7 +2722,7 @@ interface_id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription * POA_IR::ComponentDef_tie<T>::describe_interface  (
+CORBA_InterfaceDef::FullInterfaceDescription * POA_IR::ComponentDef_tie<T>::describe_interface  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2735,11 +2735,11 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::AttributeDef_ptr POA_IR::ComponentDef_tie<T>::create_attribute  (
+CORBA_AttributeDef_ptr POA_IR::ComponentDef_tie<T>::create_attribute  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2758,15 +2758,15 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::OperationDef_ptr POA_IR::ComponentDef_tie<T>::create_operation  (
+CORBA_OperationDef_ptr POA_IR::ComponentDef_tie<T>::create_operation  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2787,7 +2787,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained_ptr POA_IR::ComponentDef_tie<T>::lookup  (
+CORBA_Contained_ptr POA_IR::ComponentDef_tie<T>::lookup  (
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2802,7 +2802,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_IR::ComponentDef_tie<T>::contents  (
+CORBA_ContainedSeq * POA_IR::ComponentDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Environment &ACE_TRY_ENV
@@ -2819,7 +2819,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_IR::ComponentDef_tie<T>::lookup_name  (
+CORBA_ContainedSeq * POA_IR::ComponentDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
@@ -2840,7 +2840,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container::DescriptionSeq * POA_IR::ComponentDef_tie<T>::describe_contents  (
+CORBA_Container::DescriptionSeq * POA_IR::ComponentDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs,
@@ -2859,7 +2859,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ModuleDef_ptr POA_IR::ComponentDef_tie<T>::create_module  (
+CORBA_ModuleDef_ptr POA_IR::ComponentDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version,
@@ -2878,11 +2878,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ConstantDef_ptr POA_IR::ComponentDef_tie<T>::create_constant  (
+CORBA_ConstantDef_ptr POA_IR::ComponentDef_tie<T>::create_constant  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2901,11 +2901,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::StructDef_ptr POA_IR::ComponentDef_tie<T>::create_struct  (
+CORBA_StructDef_ptr POA_IR::ComponentDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2922,12 +2922,12 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::UnionDef_ptr POA_IR::ComponentDef_tie<T>::create_union  (
+CORBA_UnionDef_ptr POA_IR::ComponentDef_tie<T>::create_union  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2945,11 +2945,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::EnumDef_ptr POA_IR::ComponentDef_tie<T>::create_enum  (
+CORBA_EnumDef_ptr POA_IR::ComponentDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2966,11 +2966,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AliasDef_ptr POA_IR::ComponentDef_tie<T>::create_alias  (
+CORBA_AliasDef_ptr POA_IR::ComponentDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2987,11 +2987,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_interface  (
+CORBA_InterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3008,17 +3008,17 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_IR::ComponentDef_tie<T>::create_value  (
+CORBA_ValueDef_ptr POA_IR::ComponentDef_tie<T>::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_ValueDef_ptr base_value,
     CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3041,11 +3041,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueBoxDef_ptr POA_IR::ComponentDef_tie<T>::create_value_box  (
+CORBA_ValueBoxDef_ptr POA_IR::ComponentDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3062,11 +3062,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ExceptionDef_ptr POA_IR::ComponentDef_tie<T>::create_exception  (
+CORBA_ExceptionDef_ptr POA_IR::ComponentDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3083,7 +3083,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::NativeDef_ptr POA_IR::ComponentDef_tie<T>::create_native  (
+CORBA_NativeDef_ptr POA_IR::ComponentDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version,
@@ -3102,11 +3102,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AbstractInterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_abstract_interface  (
+CORBA_AbstractInterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_abstract_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3123,11 +3123,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::LocalInterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_local_interface  (
+CORBA_LocalInterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3228,7 +3228,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_IR::ComponentDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_IR::ComponentDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3254,7 +3254,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_IR::ComponentDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_IR::ComponentDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3267,7 +3267,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_IR::ComponentDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_IR::ComponentDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3281,7 +3281,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -3433,7 +3433,7 @@ primary_key_id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_IR::PrimaryKeyDef_tie<T>::primary_key  (
+CORBA_ValueDef_ptr POA_IR::PrimaryKeyDef_tie<T>::primary_key  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3530,7 +3530,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_IR::PrimaryKeyDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_IR::PrimaryKeyDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3556,7 +3556,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_IR::PrimaryKeyDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_IR::PrimaryKeyDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3569,7 +3569,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_IR::PrimaryKeyDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_IR::PrimaryKeyDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3583,7 +3583,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::PrimaryKeyDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -3720,7 +3720,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::IDLType_ptr POA_IR::FactoryDef_tie<T>::result_def  (
+CORBA_IDLType_ptr POA_IR::FactoryDef_tie<T>::result_def  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3734,7 +3734,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::result_def  (
-    CORBA::IDLType_ptr result_def,
+    CORBA_IDLType_ptr result_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3748,7 +3748,7 @@ result_def,
 }
 
 template <class T> ACE_INLINE
-CORBA::ParDescriptionSeq * POA_IR::FactoryDef_tie<T>::params  (
+CORBA_ParDescriptionSeq * POA_IR::FactoryDef_tie<T>::params  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3762,7 +3762,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::params  (
-    const CORBA::ParDescriptionSeq & params,
+    const CORBA_ParDescriptionSeq & params,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3804,7 +3804,7 @@ mode,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContextIdSeq * POA_IR::FactoryDef_tie<T>::contexts  (
+CORBA_ContextIdSeq * POA_IR::FactoryDef_tie<T>::contexts  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3818,7 +3818,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::contexts  (
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3832,7 +3832,7 @@ contexts,
 }
 
 template <class T> ACE_INLINE
-CORBA::ExceptionDefSeq * POA_IR::FactoryDef_tie<T>::exceptions  (
+CORBA_ExceptionDefSeq * POA_IR::FactoryDef_tie<T>::exceptions  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3846,7 +3846,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::exceptions  (
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3944,7 +3944,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_IR::FactoryDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_IR::FactoryDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3970,7 +3970,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_IR::FactoryDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_IR::FactoryDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3983,7 +3983,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_IR::FactoryDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_IR::FactoryDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3997,7 +3997,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -4134,7 +4134,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::IDLType_ptr POA_IR::FinderDef_tie<T>::result_def  (
+CORBA_IDLType_ptr POA_IR::FinderDef_tie<T>::result_def  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4148,7 +4148,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::result_def  (
-    CORBA::IDLType_ptr result_def,
+    CORBA_IDLType_ptr result_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4162,7 +4162,7 @@ result_def,
 }
 
 template <class T> ACE_INLINE
-CORBA::ParDescriptionSeq * POA_IR::FinderDef_tie<T>::params  (
+CORBA_ParDescriptionSeq * POA_IR::FinderDef_tie<T>::params  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4176,7 +4176,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::params  (
-    const CORBA::ParDescriptionSeq & params,
+    const CORBA_ParDescriptionSeq & params,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4218,7 +4218,7 @@ mode,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContextIdSeq * POA_IR::FinderDef_tie<T>::contexts  (
+CORBA_ContextIdSeq * POA_IR::FinderDef_tie<T>::contexts  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4232,7 +4232,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::contexts  (
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4246,7 +4246,7 @@ contexts,
 }
 
 template <class T> ACE_INLINE
-CORBA::ExceptionDefSeq * POA_IR::FinderDef_tie<T>::exceptions  (
+CORBA_ExceptionDefSeq * POA_IR::FinderDef_tie<T>::exceptions  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4260,7 +4260,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::exceptions  (
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4358,7 +4358,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_IR::FinderDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_IR::FinderDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4384,7 +4384,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_IR::FinderDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_IR::FinderDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4397,7 +4397,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_IR::FinderDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_IR::FinderDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4411,7 +4411,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -4617,7 +4617,7 @@ IR::PrimaryKeyDef_ptr POA_IR::HomeDef_tie<T>::create_primary_key  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr primary_key,
+    CORBA_ValueDef_ptr primary_key,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4638,8 +4638,8 @@ IR::FactoryDef_ptr POA_IR::HomeDef_tie<T>::create_factory  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4661,8 +4661,8 @@ IR::FinderDef_ptr POA_IR::HomeDef_tie<T>::create_finder  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4680,7 +4680,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDefSeq * POA_IR::HomeDef_tie<T>::base_interfaces  (
+CORBA_InterfaceDefSeq * POA_IR::HomeDef_tie<T>::base_interfaces  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4694,7 +4694,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::base_interfaces  (
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4723,7 +4723,7 @@ interface_id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription * POA_IR::HomeDef_tie<T>::describe_interface  (
+CORBA_InterfaceDef::FullInterfaceDescription * POA_IR::HomeDef_tie<T>::describe_interface  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4736,11 +4736,11 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::AttributeDef_ptr POA_IR::HomeDef_tie<T>::create_attribute  (
+CORBA_AttributeDef_ptr POA_IR::HomeDef_tie<T>::create_attribute  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -4759,15 +4759,15 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::OperationDef_ptr POA_IR::HomeDef_tie<T>::create_operation  (
+CORBA_OperationDef_ptr POA_IR::HomeDef_tie<T>::create_operation  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4788,7 +4788,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained_ptr POA_IR::HomeDef_tie<T>::lookup  (
+CORBA_Contained_ptr POA_IR::HomeDef_tie<T>::lookup  (
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -4803,7 +4803,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_IR::HomeDef_tie<T>::contents  (
+CORBA_ContainedSeq * POA_IR::HomeDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Environment &ACE_TRY_ENV
@@ -4820,7 +4820,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_IR::HomeDef_tie<T>::lookup_name  (
+CORBA_ContainedSeq * POA_IR::HomeDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
@@ -4841,7 +4841,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container::DescriptionSeq * POA_IR::HomeDef_tie<T>::describe_contents  (
+CORBA_Container::DescriptionSeq * POA_IR::HomeDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs,
@@ -4860,7 +4860,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ModuleDef_ptr POA_IR::HomeDef_tie<T>::create_module  (
+CORBA_ModuleDef_ptr POA_IR::HomeDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version,
@@ -4879,11 +4879,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ConstantDef_ptr POA_IR::HomeDef_tie<T>::create_constant  (
+CORBA_ConstantDef_ptr POA_IR::HomeDef_tie<T>::create_constant  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -4902,11 +4902,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::StructDef_ptr POA_IR::HomeDef_tie<T>::create_struct  (
+CORBA_StructDef_ptr POA_IR::HomeDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4923,12 +4923,12 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::UnionDef_ptr POA_IR::HomeDef_tie<T>::create_union  (
+CORBA_UnionDef_ptr POA_IR::HomeDef_tie<T>::create_union  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4946,11 +4946,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::EnumDef_ptr POA_IR::HomeDef_tie<T>::create_enum  (
+CORBA_EnumDef_ptr POA_IR::HomeDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4967,11 +4967,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AliasDef_ptr POA_IR::HomeDef_tie<T>::create_alias  (
+CORBA_AliasDef_ptr POA_IR::HomeDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4988,11 +4988,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_interface  (
+CORBA_InterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5009,17 +5009,17 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_IR::HomeDef_tie<T>::create_value  (
+CORBA_ValueDef_ptr POA_IR::HomeDef_tie<T>::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_ValueDef_ptr base_value,
     CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5042,11 +5042,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueBoxDef_ptr POA_IR::HomeDef_tie<T>::create_value_box  (
+CORBA_ValueBoxDef_ptr POA_IR::HomeDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5063,11 +5063,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ExceptionDef_ptr POA_IR::HomeDef_tie<T>::create_exception  (
+CORBA_ExceptionDef_ptr POA_IR::HomeDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5084,7 +5084,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::NativeDef_ptr POA_IR::HomeDef_tie<T>::create_native  (
+CORBA_NativeDef_ptr POA_IR::HomeDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version,
@@ -5103,11 +5103,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AbstractInterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_abstract_interface  (
+CORBA_AbstractInterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_abstract_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5124,11 +5124,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::LocalInterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_local_interface  (
+CORBA_LocalInterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5229,7 +5229,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_IR::HomeDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_IR::HomeDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5255,7 +5255,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_IR::HomeDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_IR::HomeDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5268,7 +5268,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_IR::HomeDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_IR::HomeDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5282,7 +5282,7 @@ ACE_TRY_ENV
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
index e7ef60e248d..09e16bb5e83 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
@@ -19,15 +19,23 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_IDL_IFR_EXTENDEDS_CPP
-#define TAO_IDL_IFR_EXTENDEDS_CPP
+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_CPP_
+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_CPP_
 
 #include "IFR_ExtendedS.h"
 
+#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Operation_Table.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/ORB_Core.h"
+#include "tao/Stub.h"
+#include "tao/IFR_Client_Adapter.h"
+#include "tao/PortableServer/ServerRequestInfo.h"
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+#include "ace/Dynamic_Service.h"
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
@@ -43,7 +51,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:40 */
+/* starting time is 13:56:24 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_FixedDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -102,33 +110,34 @@ TAO_CORBA_FixedDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 {
   enum
     {
-      TOTAL_KEYWORDS = 9,
+      TOTAL_KEYWORDS = 10,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 13,
       MIN_HASH_VALUE = 5,
       MAX_HASH_VALUE = 18,
       HASH_VALUE_RANGE = 14,
-      DUPLICATES = 3
+      DUPLICATES = 4
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},{"",0},
-      {"_is_a",  &POA_CORBA::FixedDef::_is_a_skel},
-      {"destroy", 	&POA_CORBA::FixedDef::destroy_skel},
-      {"_get_type", 	&POA_CORBA::FixedDef::_get_type_skel},
-      {"_get_scale", 	&POA_CORBA::FixedDef::_get_scale_skel},
-      {"_set_scale", 	&POA_CORBA::FixedDef::_set_scale_skel},
-      {"_get_digits", 	&POA_CORBA::FixedDef::_get_digits_skel},
-      {"_set_digits", 	&POA_CORBA::FixedDef::_set_digits_skel},
-      {"_get_def_kind", 	&POA_CORBA::FixedDef::_get_def_kind_skel},
-      {"_non_existent",  &POA_CORBA::FixedDef::_non_existent_skel},
+      {"_is_a",  &POA_CORBA_FixedDef::_is_a_skel},
+      {"destroy", 	&POA_CORBA_FixedDef::destroy_skel},
+      {"_get_type", 	&POA_CORBA_FixedDef::_get_type_skel},
+      {"_get_scale", 	&POA_CORBA_FixedDef::_get_scale_skel},
+      {"_interface",  &POA_CORBA_FixedDef::_interface_skel},
+      {"_set_scale", 	&POA_CORBA_FixedDef::_set_scale_skel},
+      {"_get_digits", 	&POA_CORBA_FixedDef::_get_digits_skel},
+      {"_set_digits", 	&POA_CORBA_FixedDef::_set_digits_skel},
+      {"_get_def_kind", 	&POA_CORBA_FixedDef::_get_def_kind_skel},
+      {"_non_existent",  &POA_CORBA_FixedDef::_non_existent_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -8,  -2, -10,  -2,   5,  -1,   6,  -1,   7, -27, -26,  -1,  12, 
-       -1,  -1,  -1,  -1,  13, 
+       -1,  -8,  -3, -11,  -2,   5,  -1,   6,  -1,   7, -27, -26,  -1,  13, 
+       -1,  -1,  -1,  -1,  14, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -162,17 +171,16 @@ TAO_CORBA_FixedDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
     }
   return 0;
 }
-/* ending time is 10:44:40 */
+/* ending time is 13:56:24 */
 static TAO_CORBA_FixedDef_Perfect_Hash_OpTable tao_CORBA_FixedDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_FixedDef_digits_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_FixedDef_digits_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::FixedDef *tao_impl,
+    POA_CORBA_FixedDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -211,13 +219,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_FixedDef_digits_get &);
   
 private:
-  POA_CORBA::FixedDef *_tao_impl;
+  POA_CORBA_FixedDef *_tao_impl;
   CORBA::UShort _result;
 };
 
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::TAO_ServerRequestInfo_CORBA_FixedDef_digits_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::FixedDef *tao_impl,
+    POA_CORBA_FixedDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -295,7 +303,7 @@ class TAO_ServerRequestInfo_CORBA_FixedDef_digits_set : public TAO_ServerRequest
 public:
   TAO_ServerRequestInfo_CORBA_FixedDef_digits_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::FixedDef *tao_impl,
+    POA_CORBA_FixedDef *tao_impl,
     const CORBA::UShort & digits,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -334,14 +342,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_FixedDef_digits_set &);
   
 private:
-  POA_CORBA::FixedDef *_tao_impl;
+  POA_CORBA_FixedDef *_tao_impl;
   const CORBA::UShort & digits_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::TAO_ServerRequestInfo_CORBA_FixedDef_digits_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::FixedDef *tao_impl,
+    POA_CORBA_FixedDef *tao_impl,
     const CORBA::UShort & digits,
     CORBA::Environment &
   )
@@ -417,7 +425,7 @@ class TAO_ServerRequestInfo_CORBA_FixedDef_scale_get : public TAO_ServerRequestI
 public:
   TAO_ServerRequestInfo_CORBA_FixedDef_scale_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::FixedDef *tao_impl,
+    POA_CORBA_FixedDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -456,13 +464,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_FixedDef_scale_get &);
   
 private:
-  POA_CORBA::FixedDef *_tao_impl;
+  POA_CORBA_FixedDef *_tao_impl;
   CORBA::Short _result;
 };
 
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::TAO_ServerRequestInfo_CORBA_FixedDef_scale_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::FixedDef *tao_impl,
+    POA_CORBA_FixedDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -540,7 +548,7 @@ class TAO_ServerRequestInfo_CORBA_FixedDef_scale_set : public TAO_ServerRequestI
 public:
   TAO_ServerRequestInfo_CORBA_FixedDef_scale_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::FixedDef *tao_impl,
+    POA_CORBA_FixedDef *tao_impl,
     const CORBA::Short & scale,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -579,14 +587,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_FixedDef_scale_set &);
   
 private:
-  POA_CORBA::FixedDef *_tao_impl;
+  POA_CORBA_FixedDef *_tao_impl;
   const CORBA::Short & scale_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::TAO_ServerRequestInfo_CORBA_FixedDef_scale_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::FixedDef *tao_impl,
+    POA_CORBA_FixedDef *tao_impl,
     const CORBA::Short & scale,
     CORBA::Environment &
   )
@@ -664,29 +672,29 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::the_TAO_FixedDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_FixedDef_Strategized_Proxy_Broker *_TAO_CORBA_FixedDef_Strategized_Proxy_Broker::the_TAO_CORBA_FixedDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_FixedDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::_TAO_FixedDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_FixedDef_Strategized_Proxy_Broker::_TAO_CORBA_FixedDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::~_TAO_FixedDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_FixedDef_Strategized_Proxy_Broker::~_TAO_CORBA_FixedDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_FixedDef_Proxy_Impl&
-POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::FixedDef *object,
+_TAO_CORBA_FixedDef_Proxy_Impl&
+_TAO_CORBA_FixedDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_FixedDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -704,7 +712,7 @@ POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_FixedDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -718,7 +726,7 @@ POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_FixedDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -728,7 +736,7 @@ POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_FixedDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_FixedDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -745,38 +753,38 @@ POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_FixedDef_Proxy_Broker *
-CORBA__TAO_FixedDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_FixedDef_Proxy_Broker *
+_TAO_CORBA_FixedDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::the_TAO_FixedDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_FixedDef_Strategized_Proxy_Broker::the_TAO_CORBA_FixedDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_FixedDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_FixedDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_FixedDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_FixedDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_FixedDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_FixedDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::_TAO_FixedDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::_TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::UShort POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::digits (
+CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -798,16 +806,16 @@ CORBA::UShort POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::digits (
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
-      POA_CORBA::FixedDef_ptr,
+      POA_CORBA_FixedDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/FixedDef:1.0"
+          "IDL:omg.org/CORBA_FixedDef:1.0"
         )
     )->digits (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::digits (
+void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
     CORBA_Object *_collocated_tao_target_,
     CORBA::UShort digits,
     CORBA::Environment &ACE_TRY_ENV
@@ -828,9 +836,9 @@ void POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::digits (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::FixedDef_ptr,
+      POA_CORBA_FixedDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/FixedDef:1.0"
+          "IDL:omg.org/CORBA_FixedDef:1.0"
         )
     )->digits (
         digits,
@@ -839,7 +847,7 @@ void POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::digits (
   return;
 }
 
-CORBA::Short POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::scale (
+CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -861,16 +869,16 @@ CORBA::Short POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::scale (
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
-      POA_CORBA::FixedDef_ptr,
+      POA_CORBA_FixedDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/FixedDef:1.0"
+          "IDL:omg.org/CORBA_FixedDef:1.0"
         )
     )->scale (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::scale (
+void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Short scale,
     CORBA::Environment &ACE_TRY_ENV
@@ -891,9 +899,9 @@ void POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::scale (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::FixedDef_ptr,
+      POA_CORBA_FixedDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/FixedDef:1.0"
+          "IDL:omg.org/CORBA_FixedDef:1.0"
         )
     )->scale (
         scale,
@@ -907,31 +915,31 @@ void POA_CORBA::_TAO_FixedDef_ThruPOA_Proxy_Impl::scale (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::FixedDef::FixedDef (void)
+POA_CORBA_FixedDef::POA_CORBA_FixedDef (void)
 {
   this->optable_ = &tao_CORBA_FixedDef_optable;
 }
 
 // copy ctor
-POA_CORBA::FixedDef::FixedDef (const FixedDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_FixedDef::POA_CORBA_FixedDef (const POA_CORBA_FixedDef& rhs)
+  :   POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::FixedDef::~FixedDef (void)
+POA_CORBA_FixedDef::~POA_CORBA_FixedDef (void)
 {
 }
 
-void POA_CORBA::FixedDef::_get_digits_skel (
+void POA_CORBA_FixedDef::_get_digits_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::FixedDef *_tao_impl = (POA_CORBA::FixedDef *)_tao_object_reference;
+  POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *)_tao_object_reference;
   
     CORBA::UShort _tao_retval = 0;
 
@@ -1003,7 +1011,7 @@ void POA_CORBA::FixedDef::_get_digits_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::FixedDef::_set_digits_skel (
+void POA_CORBA_FixedDef::_set_digits_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -1011,7 +1019,7 @@ void POA_CORBA::FixedDef::_set_digits_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::FixedDef *_tao_impl = (POA_CORBA::FixedDef *)_tao_object_reference;
+  POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
     CORBA::UShort digits;
@@ -1082,14 +1090,14 @@ void POA_CORBA::FixedDef::_set_digits_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::FixedDef::_get_scale_skel (
+void POA_CORBA_FixedDef::_get_scale_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::FixedDef *_tao_impl = (POA_CORBA::FixedDef *)_tao_object_reference;
+  POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *)_tao_object_reference;
   
     CORBA::Short _tao_retval = 0;
 
@@ -1161,7 +1169,7 @@ void POA_CORBA::FixedDef::_get_scale_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::FixedDef::_set_scale_skel (
+void POA_CORBA_FixedDef::_set_scale_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -1169,7 +1177,7 @@ void POA_CORBA::FixedDef::_set_scale_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::FixedDef *_tao_impl = (POA_CORBA::FixedDef *)_tao_object_reference;
+  POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
     CORBA::Short scale;
@@ -1240,7 +1248,7 @@ void POA_CORBA::FixedDef::_set_scale_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::FixedDef::_is_a_skel (
+void POA_CORBA_FixedDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -1248,7 +1256,7 @@ void POA_CORBA::FixedDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::FixedDef *_tao_impl = (POA_CORBA::FixedDef *) _tao_object_reference;
+  POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -1263,14 +1271,14 @@ void POA_CORBA::FixedDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::FixedDef::_non_existent_skel (
+void POA_CORBA_FixedDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::FixedDef *_tao_impl = (POA_CORBA::FixedDef *) _tao_object_reference;
+  POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -1280,7 +1288,55 @@ void POA_CORBA::FixedDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::FixedDef::_is_a (
+void POA_CORBA_FixedDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_FixedDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1289,42 +1345,42 @@ CORBA::Boolean POA_CORBA::FixedDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/FixedDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_FixedDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::FixedDef::_downcast (
+void* POA_CORBA_FixedDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/FixedDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::FixedDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_FixedDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_FixedDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::FixedDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_FixedDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::FixedDef::_interface_repository_id (void) const
+const char* POA_CORBA_FixedDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/FixedDef:1.0";
+  return "IDL:omg.org/CORBA_FixedDef:1.0";
 }
 
-CORBA::FixedDef*
-POA_CORBA::FixedDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_FixedDef*
+POA_CORBA_FixedDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -1337,9 +1393,10 @@ POA_CORBA::FixedDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::FixedDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_FixedDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -1347,7 +1404,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:40 */
+/* starting time is 13:56:24 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -1406,7 +1463,7 @@ TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned
 {
   enum
     {
-      TOTAL_KEYWORDS = 20,
+      TOTAL_KEYWORDS = 21,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -1418,33 +1475,34 @@ TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::ValueMemberDef::move_skel},
-      {"_is_a",  &POA_CORBA::ValueMemberDef::_is_a_skel},
-      {"_get_id", 	&POA_CORBA::ValueMemberDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::ValueMemberDef::_set_id_skel},
-      {"describe", 	&POA_CORBA::ValueMemberDef::describe_skel},
-      {"_get_type", 	&POA_CORBA::ValueMemberDef::_get_type_skel},
-      {"_set_name", 	&POA_CORBA::ValueMemberDef::_set_name_skel},
-      {"_get_name", 	&POA_CORBA::ValueMemberDef::_get_name_skel},
-      {"_get_access", 	&POA_CORBA::ValueMemberDef::_get_access_skel},
-      {"_set_access", 	&POA_CORBA::ValueMemberDef::_set_access_skel},
-      {"_get_version", 	&POA_CORBA::ValueMemberDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::ValueMemberDef::_set_version_skel},
-      {"_get_def_kind", 	&POA_CORBA::ValueMemberDef::_get_def_kind_skel},
-      {"_get_defined_in", 	&POA_CORBA::ValueMemberDef::_get_defined_in_skel},
-      {"destroy", 	&POA_CORBA::ValueMemberDef::destroy_skel},
-      {"_get_absolute_name", 	&POA_CORBA::ValueMemberDef::_get_absolute_name_skel},
-      {"_get_type_def", 	&POA_CORBA::ValueMemberDef::_get_type_def_skel},
-      {"_set_type_def", 	&POA_CORBA::ValueMemberDef::_set_type_def_skel},
-      {"_non_existent",  &POA_CORBA::ValueMemberDef::_non_existent_skel},
-      {"_get_containing_repository", 	&POA_CORBA::ValueMemberDef::_get_containing_repository_skel},
+      {"move", 	&POA_CORBA_ValueMemberDef::move_skel},
+      {"_is_a",  &POA_CORBA_ValueMemberDef::_is_a_skel},
+      {"_get_id", 	&POA_CORBA_ValueMemberDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_ValueMemberDef::_set_id_skel},
+      {"describe", 	&POA_CORBA_ValueMemberDef::describe_skel},
+      {"_get_type", 	&POA_CORBA_ValueMemberDef::_get_type_skel},
+      {"_set_name", 	&POA_CORBA_ValueMemberDef::_set_name_skel},
+      {"_get_name", 	&POA_CORBA_ValueMemberDef::_get_name_skel},
+      {"_interface",  &POA_CORBA_ValueMemberDef::_interface_skel},
+      {"_get_access", 	&POA_CORBA_ValueMemberDef::_get_access_skel},
+      {"_set_access", 	&POA_CORBA_ValueMemberDef::_set_access_skel},
+      {"_get_version", 	&POA_CORBA_ValueMemberDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_ValueMemberDef::_set_version_skel},
+      {"_get_def_kind", 	&POA_CORBA_ValueMemberDef::_get_def_kind_skel},
+      {"_get_defined_in", 	&POA_CORBA_ValueMemberDef::_get_defined_in_skel},
+      {"destroy", 	&POA_CORBA_ValueMemberDef::destroy_skel},
+      {"_get_absolute_name", 	&POA_CORBA_ValueMemberDef::_get_absolute_name_skel},
+      {"_get_type_def", 	&POA_CORBA_ValueMemberDef::_get_type_def_skel},
+      {"_set_type_def", 	&POA_CORBA_ValueMemberDef::_set_type_def_skel},
+      {"_non_existent",  &POA_CORBA_ValueMemberDef::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_CORBA_ValueMemberDef::_get_containing_repository_skel},
     };
 
   static const signed char lookup[] =
     {
-      -12,  -2, -14,  -2,   4,   5,  -1,  53,   8,  46,  -1, -47, -46,  16, 
-       -1,  17,  -1,  18,  19,  -9,  -3, -20,  -2, -38,  -6,  -2,  -1,  -1, 
-       22,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23, 
+      -13,  -2, -15,  -2,   4,   5,  -1,  53,   8,  46,  12, -47, -46,  17, 
+       -1,  18,  -1,  19,  20,  -9,  -3, -21,  -2, -38,  -6,  -2,  -1,  -1, 
+       23,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1478,17 +1536,16 @@ TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned
     }
   return 0;
 }
-/* ending time is 10:44:40 */
+/* ending time is 13:56:24 */
 static TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable tao_CORBA_ValueMemberDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueMemberDef *tao_impl,
+    POA_CORBA_ValueMemberDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -1527,13 +1584,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get &);
   
 private:
-  POA_CORBA::ValueMemberDef *_tao_impl;
+  POA_CORBA_ValueMemberDef *_tao_impl;
   CORBA::TypeCode_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueMemberDef *tao_impl,
+    POA_CORBA_ValueMemberDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -1611,7 +1668,7 @@ class TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueMemberDef *tao_impl,
+    POA_CORBA_ValueMemberDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -1643,20 +1700,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get (const TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get &);
   
 private:
-  POA_CORBA::ValueMemberDef *_tao_impl;
-  CORBA::IDLType_ptr _result;
+  POA_CORBA_ValueMemberDef *_tao_impl;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueMemberDef *tao_impl,
+    POA_CORBA_ValueMemberDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -1723,7 +1780,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA::IDLType_ptr result)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA_IDLType_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -1734,8 +1791,8 @@ class TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueMemberDef *tao_impl,
-    CORBA::IDLType_ptr type_def,
+    POA_CORBA_ValueMemberDef *tao_impl,
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -1773,15 +1830,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set &);
   
 private:
-  POA_CORBA::ValueMemberDef *_tao_impl;
-  CORBA::IDLType_ptr type_def_;
+  POA_CORBA_ValueMemberDef *_tao_impl;
+  CORBA_IDLType_ptr type_def_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueMemberDef *tao_impl,
-    CORBA::IDLType_ptr type_def,
+    POA_CORBA_ValueMemberDef *tao_impl,
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -1857,7 +1914,7 @@ class TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueMemberDef *tao_impl,
+    POA_CORBA_ValueMemberDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -1896,13 +1953,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get &);
   
 private:
-  POA_CORBA::ValueMemberDef *_tao_impl;
+  POA_CORBA_ValueMemberDef *_tao_impl;
   CORBA::Visibility _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueMemberDef *tao_impl,
+    POA_CORBA_ValueMemberDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -1980,7 +2037,7 @@ class TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueMemberDef *tao_impl,
+    POA_CORBA_ValueMemberDef *tao_impl,
     const CORBA::Visibility & access,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -2019,14 +2076,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set &);
   
 private:
-  POA_CORBA::ValueMemberDef *_tao_impl;
+  POA_CORBA_ValueMemberDef *_tao_impl;
   const CORBA::Visibility & access_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueMemberDef *tao_impl,
+    POA_CORBA_ValueMemberDef *tao_impl,
     const CORBA::Visibility & access,
     CORBA::Environment &
   )
@@ -2104,29 +2161,29 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::the_TAO_ValueMemberDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker *_TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::the_TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::_TAO_ValueMemberDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::_TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::~_TAO_ValueMemberDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_ValueMemberDef_Proxy_Impl&
-POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::ValueMemberDef *object,
+_TAO_CORBA_ValueMemberDef_Proxy_Impl&
+_TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_ValueMemberDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -2144,7 +2201,7 @@ POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2158,7 +2215,7 @@ POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_ValueMemberDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -2168,7 +2225,7 @@ POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_ValueMemberDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -2185,38 +2242,38 @@ POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_ValueMemberDef_Proxy_Broker *
-CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_ValueMemberDef_Proxy_Broker *
+_TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::the_TAO_ValueMemberDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::the_TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::TypeCode_ptr POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type (
+CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2238,16 +2295,16 @@ CORBA::TypeCode_ptr POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ValueMemberDef_ptr,
+      POA_CORBA_ValueMemberDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
+          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
         )
     )->type (
         ACE_TRY_ENV
       );
 }
 
-CORBA::IDLType_ptr POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
+CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2255,7 +2312,7 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
     CORBA::SystemException
   ))
 {
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -2269,18 +2326,18 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ValueMemberDef_ptr,
+      POA_CORBA_ValueMemberDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
+          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
         )
     )->type_def (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
+void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr type_def,
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2299,9 +2356,9 @@ void POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::ValueMemberDef_ptr,
+      POA_CORBA_ValueMemberDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
+          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
         )
     )->type_def (
         type_def,
@@ -2310,7 +2367,7 @@ void POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
   return;
 }
 
-CORBA::Visibility POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::access (
+CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2332,16 +2389,16 @@ CORBA::Visibility POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::access (
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
-      POA_CORBA::ValueMemberDef_ptr,
+      POA_CORBA_ValueMemberDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
+          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
         )
     )->access (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::access (
+void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Visibility access,
     CORBA::Environment &ACE_TRY_ENV
@@ -2362,9 +2419,9 @@ void POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::access (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::ValueMemberDef_ptr,
+      POA_CORBA_ValueMemberDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
+          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
         )
     )->access (
         access,
@@ -2378,31 +2435,31 @@ void POA_CORBA::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::access (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::ValueMemberDef::ValueMemberDef (void)
+POA_CORBA_ValueMemberDef::POA_CORBA_ValueMemberDef (void)
 {
   this->optable_ = &tao_CORBA_ValueMemberDef_optable;
 }
 
 // copy ctor
-POA_CORBA::ValueMemberDef::ValueMemberDef (const ValueMemberDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_ValueMemberDef::POA_CORBA_ValueMemberDef (const POA_CORBA_ValueMemberDef& rhs)
+  :   POA_CORBA_Contained (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::ValueMemberDef::~ValueMemberDef (void)
+POA_CORBA_ValueMemberDef::~POA_CORBA_ValueMemberDef (void)
 {
 }
 
-void POA_CORBA::ValueMemberDef::_get_type_skel (
+void POA_CORBA_ValueMemberDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ValueMemberDef *_tao_impl = (POA_CORBA::ValueMemberDef *)_tao_object_reference;
+  POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *)_tao_object_reference;
   
     CORBA::TypeCode_var _tao_retval;
 
@@ -2475,16 +2532,16 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueMemberDef::_get_type_def_skel (
+void POA_CORBA_ValueMemberDef::_get_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ValueMemberDef *_tao_impl = (POA_CORBA::ValueMemberDef *)_tao_object_reference;
+  POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *)_tao_object_reference;
   
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -2511,7 +2568,7 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2555,7 +2612,7 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueMemberDef::_set_type_def_skel (
+void POA_CORBA_ValueMemberDef::_set_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -2563,10 +2620,10 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueMemberDef *_tao_impl = (POA_CORBA::ValueMemberDef *)_tao_object_reference;
+  POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::IDLType_var type_def;
+    CORBA_IDLType_var type_def;
   if (!(
     (_tao_in >> type_def.out ())
   ))
@@ -2634,14 +2691,14 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueMemberDef::_get_access_skel (
+void POA_CORBA_ValueMemberDef::_get_access_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ValueMemberDef *_tao_impl = (POA_CORBA::ValueMemberDef *)_tao_object_reference;
+  POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *)_tao_object_reference;
   
     CORBA::Visibility _tao_retval = 0;
 
@@ -2713,7 +2770,7 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueMemberDef::_set_access_skel (
+void POA_CORBA_ValueMemberDef::_set_access_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -2721,7 +2778,7 @@ void POA_CORBA::ValueMemberDef::_set_access_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueMemberDef *_tao_impl = (POA_CORBA::ValueMemberDef *)_tao_object_reference;
+  POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
     CORBA::Visibility access;
@@ -2792,7 +2849,7 @@ void POA_CORBA::ValueMemberDef::_set_access_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueMemberDef::_is_a_skel (
+void POA_CORBA_ValueMemberDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -2800,7 +2857,7 @@ void POA_CORBA::ValueMemberDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueMemberDef *_tao_impl = (POA_CORBA::ValueMemberDef *) _tao_object_reference;
+  POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -2815,14 +2872,14 @@ void POA_CORBA::ValueMemberDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::ValueMemberDef::_non_existent_skel (
+void POA_CORBA_ValueMemberDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ValueMemberDef *_tao_impl = (POA_CORBA::ValueMemberDef *) _tao_object_reference;
+  POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -2832,7 +2889,55 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::ValueMemberDef::_is_a (
+void POA_CORBA_ValueMemberDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_ValueMemberDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2841,42 +2946,42 @@ CORBA::Boolean POA_CORBA::ValueMemberDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueMemberDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueMemberDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::ValueMemberDef::_downcast (
+void* POA_CORBA_ValueMemberDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueMemberDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::ValueMemberDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueMemberDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_ValueMemberDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::ValueMemberDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ValueMemberDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::ValueMemberDef::_interface_repository_id (void) const
+const char* POA_CORBA_ValueMemberDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/ValueMemberDef:1.0";
+  return "IDL:omg.org/CORBA_ValueMemberDef:1.0";
 }
 
-CORBA::ValueMemberDef*
-POA_CORBA::ValueMemberDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_ValueMemberDef*
+POA_CORBA_ValueMemberDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -2889,9 +2994,10 @@ POA_CORBA::ValueMemberDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::ValueMemberDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_ValueMemberDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_ValueDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -2899,7 +3005,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:40 */
+/* starting time is 13:56:24 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -2958,7 +3064,7 @@ TAO_CORBA_ValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 {
   enum
     {
-      TOTAL_KEYWORDS = 52,
+      TOTAL_KEYWORDS = 53,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -2970,69 +3076,70 @@ TAO_CORBA_ValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::ValueDef::move_skel},
-      {"_is_a",  &POA_CORBA::ValueDef::_is_a_skel},
-      {"lookup", 	&POA_CORBA::ValueDef::lookup_skel},
-      {"_get_name", 	&POA_CORBA::ValueDef::_get_name_skel},
-      {"_get_type", 	&POA_CORBA::ValueDef::_get_type_skel},
-      {"_set_name", 	&POA_CORBA::ValueDef::_set_name_skel},
-      {"lookup_name", 	&POA_CORBA::ValueDef::lookup_name_skel},
-      {"_get_is_custom", 	&POA_CORBA::ValueDef::_get_is_custom_skel},
-      {"_set_is_custom", 	&POA_CORBA::ValueDef::_set_is_custom_skel},
-      {"_get_base_value", 	&POA_CORBA::ValueDef::_get_base_value_skel},
-      {"_set_base_value", 	&POA_CORBA::ValueDef::_set_base_value_skel},
-      {"_get_version", 	&POA_CORBA::ValueDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::ValueDef::_set_version_skel},
-      {"_get_absolute_name", 	&POA_CORBA::ValueDef::_get_absolute_name_skel},
-      {"_get_is_truncatable", 	&POA_CORBA::ValueDef::_get_is_truncatable_skel},
-      {"_set_is_truncatable", 	&POA_CORBA::ValueDef::_set_is_truncatable_skel},
-      {"_get_defined_in", 	&POA_CORBA::ValueDef::_get_defined_in_skel},
-      {"is_a", 	&POA_CORBA::ValueDef::is_a_skel},
-      {"_non_existent",  &POA_CORBA::ValueDef::_non_existent_skel},
-      {"_get_is_abstract", 	&POA_CORBA::ValueDef::_get_is_abstract_skel},
-      {"_set_is_abstract", 	&POA_CORBA::ValueDef::_set_is_abstract_skel},
-      {"_get_initializers", 	&POA_CORBA::ValueDef::_get_initializers_skel},
-      {"_set_initializers", 	&POA_CORBA::ValueDef::_set_initializers_skel},
-      {"_get_containing_repository", 	&POA_CORBA::ValueDef::_get_containing_repository_skel},
-      {"_get_id", 	&POA_CORBA::ValueDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::ValueDef::_set_id_skel},
-      {"describe", 	&POA_CORBA::ValueDef::describe_skel},
-      {"_get_supported_interfaces", 	&POA_CORBA::ValueDef::_get_supported_interfaces_skel},
-      {"_set_abstract_base_values", 	&POA_CORBA::ValueDef::_set_abstract_base_values_skel},
-      {"_get_abstract_base_values", 	&POA_CORBA::ValueDef::_get_abstract_base_values_skel},
-      {"_set_supported_interfaces", 	&POA_CORBA::ValueDef::_set_supported_interfaces_skel},
-      {"_get_def_kind", 	&POA_CORBA::ValueDef::_get_def_kind_skel},
-      {"describe_value", 	&POA_CORBA::ValueDef::describe_value_skel},
-      {"destroy", 	&POA_CORBA::ValueDef::destroy_skel},
-      {"describe_contents", 	&POA_CORBA::ValueDef::describe_contents_skel},
-      {"create_enum", 	&POA_CORBA::ValueDef::create_enum_skel},
-      {"create_value", 	&POA_CORBA::ValueDef::create_value_skel},
-      {"create_module", 	&POA_CORBA::ValueDef::create_module_skel},
-      {"create_native", 	&POA_CORBA::ValueDef::create_native_skel},
-      {"create_attribute", 	&POA_CORBA::ValueDef::create_attribute_skel},
-      {"create_interface", 	&POA_CORBA::ValueDef::create_interface_skel},
-      {"create_union", 	&POA_CORBA::ValueDef::create_union_skel},
-      {"create_value_member", 	&POA_CORBA::ValueDef::create_value_member_skel},
-      {"create_operation", 	&POA_CORBA::ValueDef::create_operation_skel},
-      {"create_exception", 	&POA_CORBA::ValueDef::create_exception_skel},
-      {"create_local_interface", 	&POA_CORBA::ValueDef::create_local_interface_skel},
-      {"contents", 	&POA_CORBA::ValueDef::contents_skel},
-      {"create_abstract_interface", 	&POA_CORBA::ValueDef::create_abstract_interface_skel},
-      {"create_value_box", 	&POA_CORBA::ValueDef::create_value_box_skel},
-      {"create_alias", 	&POA_CORBA::ValueDef::create_alias_skel},
-      {"create_struct", 	&POA_CORBA::ValueDef::create_struct_skel},
-      {"create_constant", 	&POA_CORBA::ValueDef::create_constant_skel},
+      {"move", 	&POA_CORBA_ValueDef::move_skel},
+      {"_is_a",  &POA_CORBA_ValueDef::_is_a_skel},
+      {"lookup", 	&POA_CORBA_ValueDef::lookup_skel},
+      {"_get_name", 	&POA_CORBA_ValueDef::_get_name_skel},
+      {"_get_type", 	&POA_CORBA_ValueDef::_get_type_skel},
+      {"_set_name", 	&POA_CORBA_ValueDef::_set_name_skel},
+      {"_interface",  &POA_CORBA_ValueDef::_interface_skel},
+      {"lookup_name", 	&POA_CORBA_ValueDef::lookup_name_skel},
+      {"_get_is_custom", 	&POA_CORBA_ValueDef::_get_is_custom_skel},
+      {"_set_is_custom", 	&POA_CORBA_ValueDef::_set_is_custom_skel},
+      {"_get_base_value", 	&POA_CORBA_ValueDef::_get_base_value_skel},
+      {"_set_base_value", 	&POA_CORBA_ValueDef::_set_base_value_skel},
+      {"_get_version", 	&POA_CORBA_ValueDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_ValueDef::_set_version_skel},
+      {"_get_absolute_name", 	&POA_CORBA_ValueDef::_get_absolute_name_skel},
+      {"_get_is_truncatable", 	&POA_CORBA_ValueDef::_get_is_truncatable_skel},
+      {"_set_is_truncatable", 	&POA_CORBA_ValueDef::_set_is_truncatable_skel},
+      {"_get_defined_in", 	&POA_CORBA_ValueDef::_get_defined_in_skel},
+      {"is_a", 	&POA_CORBA_ValueDef::is_a_skel},
+      {"_non_existent",  &POA_CORBA_ValueDef::_non_existent_skel},
+      {"_get_is_abstract", 	&POA_CORBA_ValueDef::_get_is_abstract_skel},
+      {"_set_is_abstract", 	&POA_CORBA_ValueDef::_set_is_abstract_skel},
+      {"_get_initializers", 	&POA_CORBA_ValueDef::_get_initializers_skel},
+      {"_set_initializers", 	&POA_CORBA_ValueDef::_set_initializers_skel},
+      {"_get_containing_repository", 	&POA_CORBA_ValueDef::_get_containing_repository_skel},
+      {"_get_id", 	&POA_CORBA_ValueDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_ValueDef::_set_id_skel},
+      {"describe", 	&POA_CORBA_ValueDef::describe_skel},
+      {"_get_supported_interfaces", 	&POA_CORBA_ValueDef::_get_supported_interfaces_skel},
+      {"_set_abstract_base_values", 	&POA_CORBA_ValueDef::_set_abstract_base_values_skel},
+      {"_get_abstract_base_values", 	&POA_CORBA_ValueDef::_get_abstract_base_values_skel},
+      {"_set_supported_interfaces", 	&POA_CORBA_ValueDef::_set_supported_interfaces_skel},
+      {"_get_def_kind", 	&POA_CORBA_ValueDef::_get_def_kind_skel},
+      {"describe_value", 	&POA_CORBA_ValueDef::describe_value_skel},
+      {"destroy", 	&POA_CORBA_ValueDef::destroy_skel},
+      {"describe_contents", 	&POA_CORBA_ValueDef::describe_contents_skel},
+      {"create_enum", 	&POA_CORBA_ValueDef::create_enum_skel},
+      {"create_value", 	&POA_CORBA_ValueDef::create_value_skel},
+      {"create_module", 	&POA_CORBA_ValueDef::create_module_skel},
+      {"create_native", 	&POA_CORBA_ValueDef::create_native_skel},
+      {"create_attribute", 	&POA_CORBA_ValueDef::create_attribute_skel},
+      {"create_interface", 	&POA_CORBA_ValueDef::create_interface_skel},
+      {"create_union", 	&POA_CORBA_ValueDef::create_union_skel},
+      {"create_value_member", 	&POA_CORBA_ValueDef::create_value_member_skel},
+      {"create_operation", 	&POA_CORBA_ValueDef::create_operation_skel},
+      {"create_exception", 	&POA_CORBA_ValueDef::create_exception_skel},
+      {"create_local_interface", 	&POA_CORBA_ValueDef::create_local_interface_skel},
+      {"contents", 	&POA_CORBA_ValueDef::contents_skel},
+      {"create_abstract_interface", 	&POA_CORBA_ValueDef::create_abstract_interface_skel},
+      {"create_value_box", 	&POA_CORBA_ValueDef::create_value_box_skel},
+      {"create_alias", 	&POA_CORBA_ValueDef::create_alias_skel},
+      {"create_struct", 	&POA_CORBA_ValueDef::create_struct_skel},
+      {"create_constant", 	&POA_CORBA_ValueDef::create_constant_skel},
     };
 
   static const signed char lookup[] =
     {
-       -11,   -2,  -13,   -2,    4,    5,    6,  -15,   -2,  117,   -1,   10,  -18,   -2, 
-       -99,  -98,   -1,  -95,   17,  -92,   20,   -1,  -23,   -2,   21,   -1,  -25,   -2, 
-        22,  -28,   -2,  -94,  -91,   -1,  -31,   -4,   27,  -93,   30,   -1,  -91,   -7, 
-        -3,   35,   36,   -1,   -1,   37,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-        -1,   -1,   -1,   -1,  -41,   -2,   38,   -1,  -43,   -2,   39,   40,  -93,  -47, 
-        -2,  -92,   45,   -1,   46,   -1,  -92,   49,   50,   -1,   51,   52,   53,   54, 
-        -1,   55, 
+       -12,   -2,  -14,   -2,    4,    5,    6,  -16,   -2,  117,   10,   11,  -19,   -2, 
+       -99,  -98,   -1,  -95,   18,  -92,   21,   -1,  -24,   -2,   22,   -1,  -26,   -2, 
+        23,  -29,   -2,  -94,  -91,   -1,  -32,   -4,   28,  -93,   31,   -1,  -91,   -7, 
+        -3,   36,   37,   -1,   -1,   38,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+        -1,   -1,   -1,   -1,  -42,   -2,   39,   -1,  -44,   -2,   40,   41,  -93,  -48, 
+        -2,  -92,   46,   -1,   47,   -1,  -92,   50,   51,   -1,   52,   53,   54,   55, 
+        -1,   56, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3066,17 +3173,16 @@ TAO_CORBA_ValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
     }
   return 0;
 }
-/* ending time is 10:44:40 */
+/* ending time is 13:56:24 */
 static TAO_CORBA_ValueDef_Perfect_Hash_OpTable tao_CORBA_ValueDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -3108,20 +3214,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::InterfaceDefSeq * result);
+  void result (CORBA_InterfaceDefSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get (const TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
-  CORBA::InterfaceDefSeq * _result;
+  POA_CORBA_ValueDef *_tao_impl;
+  CORBA_InterfaceDefSeq * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -3188,7 +3294,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA::InterfaceDefSeq * result)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA_InterfaceDefSeq * result)
 {
   // Update the result.
    this->_result = result;
@@ -3199,8 +3305,8 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set : public TAO
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
+    POA_CORBA_ValueDef *tao_impl,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -3238,15 +3344,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
-  const CORBA::InterfaceDefSeq & supported_interfaces_;
+  POA_CORBA_ValueDef *_tao_impl;
+  const CORBA_InterfaceDefSeq & supported_interfaces_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
+    POA_CORBA_ValueDef *tao_impl,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -3322,7 +3428,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -3354,20 +3460,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::InitializerSeq * result);
+  void result (CORBA_InitializerSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get (const TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
-  CORBA::InitializerSeq * _result;
+  POA_CORBA_ValueDef *_tao_impl;
+  CORBA_InitializerSeq * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -3434,7 +3540,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA::InitializerSeq * result)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA_InitializerSeq * result)
 {
   // Update the result.
    this->_result = result;
@@ -3445,8 +3551,8 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
-    const CORBA::InitializerSeq & initializers,
+    POA_CORBA_ValueDef *tao_impl,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -3484,15 +3590,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
-  const CORBA::InitializerSeq & initializers_;
+  POA_CORBA_ValueDef *_tao_impl;
+  const CORBA_InitializerSeq & initializers_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
-    const CORBA::InitializerSeq & initializers,
+    POA_CORBA_ValueDef *tao_impl,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -3568,7 +3674,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -3600,20 +3706,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ValueDef_ptr result);
+  void result (CORBA_ValueDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get (const TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
-  CORBA::ValueDef_ptr _result;
+  POA_CORBA_ValueDef *_tao_impl;
+  CORBA_ValueDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -3680,7 +3786,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA::ValueDef_ptr result)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA_ValueDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -3691,8 +3797,8 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
-    CORBA::ValueDef_ptr base_value,
+    POA_CORBA_ValueDef *tao_impl,
+    CORBA_ValueDef_ptr base_value,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -3730,15 +3836,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
-  CORBA::ValueDef_ptr base_value_;
+  POA_CORBA_ValueDef *_tao_impl;
+  CORBA_ValueDef_ptr base_value_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
-    CORBA::ValueDef_ptr base_value,
+    POA_CORBA_ValueDef *tao_impl,
+    CORBA_ValueDef_ptr base_value,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -3814,7 +3920,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get : public TAO
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -3846,20 +3952,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ValueDefSeq * result);
+  void result (CORBA_ValueDefSeq * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get (const TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
-  CORBA::ValueDefSeq * _result;
+  POA_CORBA_ValueDef *_tao_impl;
+  CORBA_ValueDefSeq * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -3926,7 +4032,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA::ValueDefSeq * result)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA_ValueDefSeq * result)
 {
   // Update the result.
    this->_result = result;
@@ -3937,8 +4043,8 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set : public TAO
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
-    const CORBA::ValueDefSeq & abstract_base_values,
+    POA_CORBA_ValueDef *tao_impl,
+    const CORBA_ValueDefSeq & abstract_base_values,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -3976,15 +4082,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
-  const CORBA::ValueDefSeq & abstract_base_values_;
+  POA_CORBA_ValueDef *_tao_impl;
+  const CORBA_ValueDefSeq & abstract_base_values_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
-    const CORBA::ValueDefSeq & abstract_base_values,
+    POA_CORBA_ValueDef *tao_impl,
+    const CORBA_ValueDefSeq & abstract_base_values,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -4060,7 +4166,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -4099,13 +4205,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
+  POA_CORBA_ValueDef *_tao_impl;
   CORBA::Boolean _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -4183,7 +4289,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     const CORBA::Boolean & is_abstract,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -4222,14 +4328,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
+  POA_CORBA_ValueDef *_tao_impl;
   const CORBA::Boolean & is_abstract_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     const CORBA::Boolean & is_abstract,
     CORBA::Environment &
   )
@@ -4305,7 +4411,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get : public TAO_ServerRequ
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -4344,13 +4450,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
+  POA_CORBA_ValueDef *_tao_impl;
   CORBA::Boolean _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -4428,7 +4534,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set : public TAO_ServerRequ
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     const CORBA::Boolean & is_custom,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -4467,14 +4573,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
+  POA_CORBA_ValueDef *_tao_impl;
   const CORBA::Boolean & is_custom_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     const CORBA::Boolean & is_custom,
     CORBA::Environment &
   )
@@ -4550,7 +4656,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -4589,13 +4695,13 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
+  POA_CORBA_ValueDef *_tao_impl;
   CORBA::Boolean _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -4673,7 +4779,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     const CORBA::Boolean & is_truncatable,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -4712,14 +4818,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
+  POA_CORBA_ValueDef *_tao_impl;
   const CORBA::Boolean & is_truncatable_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     const CORBA::Boolean & is_truncatable,
     CORBA::Environment &
   )
@@ -4795,7 +4901,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_a : public TAO_ServerRequestInfo
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_a (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     const char * id,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -4835,14 +4941,14 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_is_a &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
+  POA_CORBA_ValueDef *_tao_impl;
   const char * id_;
   CORBA::Boolean _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_a::TAO_ServerRequestInfo_CORBA_ValueDef_is_a (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     const char * id,
     CORBA::Environment &
   )
@@ -4929,7 +5035,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_describe_value : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_describe_value (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -4961,20 +5067,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ValueDef::FullValueDescription * result);
+  void result (CORBA_ValueDef::FullValueDescription * result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_describe_value (const TAO_ServerRequestInfo_CORBA_ValueDef_describe_value &);
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_describe_value &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
-  CORBA::ValueDef::FullValueDescription * _result;
+  POA_CORBA_ValueDef *_tao_impl;
+  CORBA_ValueDef::FullValueDescription * _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::TAO_ServerRequestInfo_CORBA_ValueDef_describe_value (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -5041,7 +5147,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (CORBA::ValueDef::FullValueDescription * result)
+TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (CORBA_ValueDef::FullValueDescription * result)
 {
   // Update the result.
    this->_result = result;
@@ -5052,11 +5158,11 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member : public TAO_Serv
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Visibility & access,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -5089,29 +5195,29 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ValueMemberDef_ptr result);
+  void result (CORBA_ValueMemberDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member (const TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member &);
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
+  POA_CORBA_ValueDef *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr type_;
+  CORBA_IDLType_ptr type_;
   const CORBA::Visibility & access_;
-  CORBA::ValueMemberDef_ptr _result;
+  CORBA_ValueMemberDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Visibility & access,
     CORBA::Environment &
   )
@@ -5212,7 +5318,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA::ValueMemberDef_ptr result)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA_ValueMemberDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -5223,11 +5329,11 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode & mode,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
@@ -5260,29 +5366,29 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::AttributeDef_ptr result);
+  void result (CORBA_AttributeDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute (const TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute &);
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
+  POA_CORBA_ValueDef *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr type_;
+  CORBA_IDLType_ptr type_;
   const CORBA::AttributeMode & mode_;
-  CORBA::AttributeDef_ptr _result;
+  CORBA_AttributeDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode & mode,
     CORBA::Environment &
   )
@@ -5384,7 +5490,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA::AttributeDef_ptr result)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA_AttributeDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -5395,15 +5501,15 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_create_operation : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_create_operation (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode & mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -5435,36 +5541,36 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::OperationDef_ptr result);
+  void result (CORBA_OperationDef_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueDef_create_operation (const TAO_ServerRequestInfo_CORBA_ValueDef_create_operation &);
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueDef_create_operation &);
   
 private:
-  POA_CORBA::ValueDef *_tao_impl;
+  POA_CORBA_ValueDef *_tao_impl;
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr result_;
+  CORBA_IDLType_ptr result_;
   const CORBA::OperationMode & mode_;
-  const CORBA::ParDescriptionSeq & params_;
-  const CORBA::ExceptionDefSeq & exceptions_;
-  const CORBA::ContextIdSeq & contexts_;
-  CORBA::OperationDef_ptr _result;
+  const CORBA_ParDescriptionSeq & params_;
+  const CORBA_ExceptionDefSeq & exceptions_;
+  const CORBA_ContextIdSeq & contexts_;
+  CORBA_OperationDef_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::TAO_ServerRequestInfo_CORBA_ValueDef_create_operation (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueDef *tao_impl,
+    POA_CORBA_ValueDef *tao_impl,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode & mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -5586,7 +5692,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (CORBA::OperationDef_ptr result)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (CORBA_OperationDef_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -5599,29 +5705,29 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (CORBA::OperationD
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::the_TAO_ValueDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ValueDef_Strategized_Proxy_Broker *_TAO_CORBA_ValueDef_Strategized_Proxy_Broker::the_TAO_CORBA_ValueDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_ValueDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::_TAO_ValueDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ValueDef_Strategized_Proxy_Broker::_TAO_CORBA_ValueDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::~_TAO_ValueDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ValueDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_ValueDef_Proxy_Impl&
-POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::ValueDef *object,
+_TAO_CORBA_ValueDef_Proxy_Impl&
+_TAO_CORBA_ValueDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_ValueDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -5639,7 +5745,7 @@ POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_ValueDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5653,7 +5759,7 @@ POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_ValueDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -5663,7 +5769,7 @@ POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_ValueDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_ValueDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -5680,38 +5786,38 @@ POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_ValueDef_Proxy_Broker *
-CORBA__TAO_ValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_ValueDef_Proxy_Broker *
+_TAO_CORBA_ValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::the_TAO_ValueDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_ValueDef_Strategized_Proxy_Broker::the_TAO_CORBA_ValueDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_ValueDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_ValueDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_ValueDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_ValueDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_ValueDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_ValueDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::_TAO_ValueDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::InterfaceDefSeq * POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
+CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5719,7 +5825,7 @@ CORBA::InterfaceDefSeq * POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_
     CORBA::SystemException
   ))
 {
-    CORBA::InterfaceDefSeq_var _tao_retval;
+    CORBA_InterfaceDefSeq_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -5733,18 +5839,18 @@ CORBA::InterfaceDefSeq * POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->supported_interfaces (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
+void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5763,9 +5869,9 @@ void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->supported_interfaces (
         supported_interfaces,
@@ -5774,7 +5880,7 @@ void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
   return;
 }
 
-CORBA::InitializerSeq * POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializers (
+CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5782,7 +5888,7 @@ CORBA::InitializerSeq * POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializer
     CORBA::SystemException
   ))
 {
-    CORBA::InitializerSeq_var _tao_retval;
+    CORBA_InitializerSeq_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -5796,18 +5902,18 @@ CORBA::InitializerSeq * POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializer
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->initializers (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializers (
+void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5826,9 +5932,9 @@ void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializers (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->initializers (
         initializers,
@@ -5837,7 +5943,7 @@ void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializers (
   return;
 }
 
-CORBA::ValueDef_ptr POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
+CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5845,7 +5951,7 @@ CORBA::ValueDef_ptr POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
     CORBA::SystemException
   ))
 {
-    CORBA::ValueDef_var _tao_retval;
+    CORBA_ValueDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -5859,18 +5965,18 @@ CORBA::ValueDef_ptr POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->base_value (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
+void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::ValueDef_ptr base_value,
+    CORBA_ValueDef_ptr base_value,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5889,9 +5995,9 @@ void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->base_value (
         base_value,
@@ -5900,7 +6006,7 @@ void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
   return;
 }
 
-CORBA::ValueDefSeq * POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
+CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5908,7 +6014,7 @@ CORBA::ValueDefSeq * POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_
     CORBA::SystemException
   ))
 {
-    CORBA::ValueDefSeq_var _tao_retval;
+    CORBA_ValueDefSeq_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -5922,18 +6028,18 @@ CORBA::ValueDefSeq * POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->abstract_base_values (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
+void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::ValueDefSeq & abstract_base_values,
+    const CORBA_ValueDefSeq & abstract_base_values,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5952,9 +6058,9 @@ void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->abstract_base_values (
         abstract_base_values,
@@ -5963,7 +6069,7 @@ void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
   return;
 }
 
-CORBA::Boolean POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
+CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5985,16 +6091,16 @@ CORBA::Boolean POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->is_abstract (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
+void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Boolean is_abstract,
     CORBA::Environment &ACE_TRY_ENV
@@ -6015,9 +6121,9 @@ void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->is_abstract (
         is_abstract,
@@ -6026,7 +6132,7 @@ void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
   return;
 }
 
-CORBA::Boolean POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_custom (
+CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6048,16 +6154,16 @@ CORBA::Boolean POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_custom (
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->is_custom (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_custom (
+void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Boolean is_custom,
     CORBA::Environment &ACE_TRY_ENV
@@ -6078,9 +6184,9 @@ void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_custom (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->is_custom (
         is_custom,
@@ -6089,7 +6195,7 @@ void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_custom (
   return;
 }
 
-CORBA::Boolean POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
+CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6111,16 +6217,16 @@ CORBA::Boolean POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->is_truncatable (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
+void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Boolean is_truncatable,
     CORBA::Environment &ACE_TRY_ENV
@@ -6141,9 +6247,9 @@ void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->is_truncatable (
         is_truncatable,
@@ -6152,7 +6258,7 @@ void POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
   return;
 }
 
-CORBA::Boolean POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_a (
+CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
@@ -6175,9 +6281,9 @@ CORBA::Boolean POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_a (
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->is_a (
         id,
@@ -6185,7 +6291,7 @@ CORBA::Boolean POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::is_a (
       );
 }
 
-CORBA::ValueDef::FullValueDescription * POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::describe_value (
+CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::describe_value (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6193,7 +6299,7 @@ CORBA::ValueDef::FullValueDescription * POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_I
     CORBA::SystemException
   ))
 {
-    CORBA::ValueDef::FullValueDescription_var _tao_retval;
+    CORBA_ValueDef::FullValueDescription_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -6207,21 +6313,21 @@ CORBA::ValueDef::FullValueDescription * POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_I
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->describe_value (
         ACE_TRY_ENV
       );
 }
 
-CORBA::ValueMemberDef_ptr POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_value_member (
+CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_member (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::Visibility access,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6229,7 +6335,7 @@ CORBA::ValueMemberDef_ptr POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_va
     CORBA::SystemException
   ))
 {
-    CORBA::ValueMemberDef_var _tao_retval;
+    CORBA_ValueMemberDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -6243,9 +6349,9 @@ CORBA::ValueMemberDef_ptr POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_va
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->create_value_member (
         id,
@@ -6257,12 +6363,12 @@ CORBA::ValueMemberDef_ptr POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_va
       );
 }
 
-CORBA::AttributeDef_ptr POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_attribute (
+CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6270,7 +6376,7 @@ CORBA::AttributeDef_ptr POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_attr
     CORBA::SystemException
   ))
 {
-    CORBA::AttributeDef_var _tao_retval;
+    CORBA_AttributeDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -6284,9 +6390,9 @@ CORBA::AttributeDef_ptr POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_attr
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->create_attribute (
         id,
@@ -6298,23 +6404,23 @@ CORBA::AttributeDef_ptr POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_attr
       );
 }
 
-CORBA::OperationDef_ptr POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_operation (
+CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-    CORBA::OperationDef_var _tao_retval;
+    CORBA_OperationDef_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -6328,9 +6434,9 @@ CORBA::OperationDef_ptr POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_oper
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ValueDef_ptr,
+      POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueDef:1.0"
+          "IDL:omg.org/CORBA_ValueDef:1.0"
         )
     )->create_operation (
         id,
@@ -6350,35 +6456,35 @@ CORBA::OperationDef_ptr POA_CORBA::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_oper
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::ValueDef::ValueDef (void)
+POA_CORBA_ValueDef::POA_CORBA_ValueDef (void)
 {
   this->optable_ = &tao_CORBA_ValueDef_optable;
 }
 
 // copy ctor
-POA_CORBA::ValueDef::ValueDef (const ValueDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Container) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_ValueDef::POA_CORBA_ValueDef (const POA_CORBA_ValueDef& rhs)
+  :   POA_CORBA_Container (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::ValueDef::~ValueDef (void)
+POA_CORBA_ValueDef::~POA_CORBA_ValueDef (void)
 {
 }
 
-void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
+void POA_CORBA_ValueDef::_get_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
-    CORBA::InterfaceDefSeq_var _tao_retval;
+    CORBA_InterfaceDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -6405,7 +6511,7 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
+      CORBA_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -6449,7 +6555,7 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
+void POA_CORBA_ValueDef::_set_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -6457,10 +6563,10 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::InterfaceDefSeq supported_interfaces;
+    CORBA_InterfaceDefSeq supported_interfaces;
   if (!(
     (_tao_in >> supported_interfaces)
   ))
@@ -6528,16 +6634,16 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::_get_initializers_skel (
+void POA_CORBA_ValueDef::_get_initializers_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
-    CORBA::InitializerSeq_var _tao_retval;
+    CORBA_InitializerSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -6564,7 +6670,7 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::InitializerSeq * _tao_retval_info = _tao_retval._retn ();
+      CORBA_InitializerSeq * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -6608,7 +6714,7 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::_set_initializers_skel (
+void POA_CORBA_ValueDef::_set_initializers_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -6616,10 +6722,10 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::InitializerSeq initializers;
+    CORBA_InitializerSeq initializers;
   if (!(
     (_tao_in >> initializers)
   ))
@@ -6687,16 +6793,16 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::_get_base_value_skel (
+void POA_CORBA_ValueDef::_get_base_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
-    CORBA::ValueDef_var _tao_retval;
+    CORBA_ValueDef_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -6723,7 +6829,7 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -6767,7 +6873,7 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::_set_base_value_skel (
+void POA_CORBA_ValueDef::_set_base_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -6775,10 +6881,10 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::ValueDef_var base_value;
+    CORBA_ValueDef_var base_value;
   if (!(
     (_tao_in >> base_value.out ())
   ))
@@ -6846,16 +6952,16 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
+void POA_CORBA_ValueDef::_get_abstract_base_values_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
-    CORBA::ValueDefSeq_var _tao_retval;
+    CORBA_ValueDefSeq_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -6882,7 +6988,7 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ValueDefSeq * _tao_retval_info = _tao_retval._retn ();
+      CORBA_ValueDefSeq * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -6926,7 +7032,7 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
+void POA_CORBA_ValueDef::_set_abstract_base_values_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -6934,10 +7040,10 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::ValueDefSeq abstract_base_values;
+    CORBA_ValueDefSeq abstract_base_values;
   if (!(
     (_tao_in >> abstract_base_values)
   ))
@@ -7005,14 +7111,14 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::_get_is_abstract_skel (
+void POA_CORBA_ValueDef::_get_is_abstract_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
     CORBA::Boolean _tao_retval = 0;
 
@@ -7084,7 +7190,7 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::_set_is_abstract_skel (
+void POA_CORBA_ValueDef::_set_is_abstract_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -7092,7 +7198,7 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
     CORBA::Boolean is_abstract;
@@ -7163,14 +7269,14 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::_get_is_custom_skel (
+void POA_CORBA_ValueDef::_get_is_custom_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
     CORBA::Boolean _tao_retval = 0;
 
@@ -7242,7 +7348,7 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::_set_is_custom_skel (
+void POA_CORBA_ValueDef::_set_is_custom_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -7250,7 +7356,7 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
     CORBA::Boolean is_custom;
@@ -7321,14 +7427,14 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::_get_is_truncatable_skel (
+void POA_CORBA_ValueDef::_get_is_truncatable_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
     CORBA::Boolean _tao_retval = 0;
 
@@ -7400,7 +7506,7 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::_set_is_truncatable_skel (
+void POA_CORBA_ValueDef::_set_is_truncatable_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -7408,7 +7514,7 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
     CORBA::Boolean is_truncatable;
@@ -7479,7 +7585,7 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::is_a_skel (
+void POA_CORBA_ValueDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -7487,7 +7593,7 @@ void POA_CORBA::ValueDef::is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
     CORBA::Boolean _tao_retval = 0;
   CORBA::String_var id;
@@ -7567,16 +7673,16 @@ void POA_CORBA::ValueDef::is_a_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::describe_value_skel (
+void POA_CORBA_ValueDef::describe_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
-    CORBA::ValueDef::FullValueDescription_var _tao_retval;
+    CORBA_ValueDef::FullValueDescription_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -7603,7 +7709,7 @@ void POA_CORBA::ValueDef::describe_value_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ValueDef::FullValueDescription * _tao_retval_info = _tao_retval._retn ();
+      CORBA_ValueDef::FullValueDescription * _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -7647,7 +7753,7 @@ void POA_CORBA::ValueDef::describe_value_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::create_value_member_skel (
+void POA_CORBA_ValueDef::create_value_member_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -7655,13 +7761,13 @@ void POA_CORBA::ValueDef::create_value_member_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
-    CORBA::ValueMemberDef_var _tao_retval;
+    CORBA_ValueMemberDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::IDLType_var type;
+  CORBA_IDLType_var type;
   CORBA::Visibility access;
   if (!(
     (_tao_in >> id.out ()) &&
@@ -7708,7 +7814,7 @@ void POA_CORBA::ValueDef::create_value_member_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::ValueMemberDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_ValueMemberDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -7752,7 +7858,7 @@ void POA_CORBA::ValueDef::create_value_member_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::create_attribute_skel (
+void POA_CORBA_ValueDef::create_attribute_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -7760,13 +7866,13 @@ void POA_CORBA::ValueDef::create_attribute_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
-    CORBA::AttributeDef_var _tao_retval;
+    CORBA_AttributeDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::IDLType_var type;
+  CORBA_IDLType_var type;
   CORBA::AttributeMode mode;
   if (!(
     (_tao_in >> id.out ()) &&
@@ -7813,7 +7919,7 @@ void POA_CORBA::ValueDef::create_attribute_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -7857,7 +7963,7 @@ void POA_CORBA::ValueDef::create_attribute_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::create_operation_skel (
+void POA_CORBA_ValueDef::create_operation_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -7865,17 +7971,17 @@ void POA_CORBA::ValueDef::create_operation_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *)_tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *)_tao_object_reference;
   
-    CORBA::OperationDef_var _tao_retval;
+    CORBA_OperationDef_var _tao_retval;
   CORBA::String_var id;
   CORBA::String_var name;
   CORBA::String_var version;
-  CORBA::IDLType_var result;
+  CORBA_IDLType_var result;
   CORBA::OperationMode mode;
-  CORBA::ParDescriptionSeq params;
-  CORBA::ExceptionDefSeq exceptions;
-  CORBA::ContextIdSeq contexts;
+  CORBA_ParDescriptionSeq params;
+  CORBA_ExceptionDefSeq exceptions;
+  CORBA_ContextIdSeq contexts;
   if (!(
     (_tao_in >> id.out ()) &&
     (_tao_in >> name.out ()) &&
@@ -7930,7 +8036,7 @@ void POA_CORBA::ValueDef::create_operation_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -7974,7 +8080,7 @@ void POA_CORBA::ValueDef::create_operation_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueDef::_is_a_skel (
+void POA_CORBA_ValueDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -7982,7 +8088,7 @@ void POA_CORBA::ValueDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *) _tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -7997,14 +8103,14 @@ void POA_CORBA::ValueDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::ValueDef::_non_existent_skel (
+void POA_CORBA_ValueDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ValueDef *_tao_impl = (POA_CORBA::ValueDef *) _tao_object_reference;
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -8014,7 +8120,55 @@ void POA_CORBA::ValueDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::ValueDef::_is_a (
+void POA_CORBA_ValueDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_ValueDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8023,48 +8177,48 @@ CORBA::Boolean POA_CORBA::ValueDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::ValueDef::_downcast (
+void* POA_CORBA_ValueDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::ValueDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_ValueDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Container_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::ValueDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ValueDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::ValueDef::_interface_repository_id (void) const
+const char* POA_CORBA_ValueDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/ValueDef:1.0";
+  return "IDL:omg.org/CORBA_ValueDef:1.0";
 }
 
-CORBA::ValueDef*
-POA_CORBA::ValueDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_ValueDef*
+POA_CORBA_ValueDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -8077,9 +8231,10 @@ POA_CORBA::ValueDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::ValueDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_ValueDef::_unchecked_narrow (obj.in ());
 }
 
+
 class TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -8087,7 +8242,7 @@ private:
 public:
  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
 };
-/* starting time is 10:44:40 */
+/* starting time is 13:56:24 */
 /* C++ code produced by gperf version 2.8 (ACE version) */
 /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
@@ -8146,7 +8301,7 @@ TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 {
   enum
     {
-      TOTAL_KEYWORDS = 18,
+      TOTAL_KEYWORDS = 19,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
@@ -8158,31 +8313,32 @@ TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0},{"",0},{"",0},{"",0},
-      {"move", 	&POA_CORBA::ValueBoxDef::move_skel},
-      {"_is_a",  &POA_CORBA::ValueBoxDef::_is_a_skel},
-      {"_get_id", 	&POA_CORBA::ValueBoxDef::_get_id_skel},
-      {"_set_id", 	&POA_CORBA::ValueBoxDef::_set_id_skel},
-      {"describe", 	&POA_CORBA::ValueBoxDef::describe_skel},
-      {"_get_name", 	&POA_CORBA::ValueBoxDef::_get_name_skel},
-      {"_get_type", 	&POA_CORBA::ValueBoxDef::_get_type_skel},
-      {"_set_name", 	&POA_CORBA::ValueBoxDef::_set_name_skel},
-      {"_get_version", 	&POA_CORBA::ValueBoxDef::_get_version_skel},
-      {"_set_version", 	&POA_CORBA::ValueBoxDef::_set_version_skel},
-      {"_get_def_kind", 	&POA_CORBA::ValueBoxDef::_get_def_kind_skel},
-      {"_get_defined_in", 	&POA_CORBA::ValueBoxDef::_get_defined_in_skel},
-      {"destroy", 	&POA_CORBA::ValueBoxDef::destroy_skel},
-      {"_get_absolute_name", 	&POA_CORBA::ValueBoxDef::_get_absolute_name_skel},
-      {"_get_original_type_def", 	&POA_CORBA::ValueBoxDef::_get_original_type_def_skel},
-      {"_set_original_type_def", 	&POA_CORBA::ValueBoxDef::_set_original_type_def_skel},
-      {"_non_existent",  &POA_CORBA::ValueBoxDef::_non_existent_skel},
-      {"_get_containing_repository", 	&POA_CORBA::ValueBoxDef::_get_containing_repository_skel},
+      {"move", 	&POA_CORBA_ValueBoxDef::move_skel},
+      {"_is_a",  &POA_CORBA_ValueBoxDef::_is_a_skel},
+      {"_get_id", 	&POA_CORBA_ValueBoxDef::_get_id_skel},
+      {"_set_id", 	&POA_CORBA_ValueBoxDef::_set_id_skel},
+      {"describe", 	&POA_CORBA_ValueBoxDef::describe_skel},
+      {"_get_name", 	&POA_CORBA_ValueBoxDef::_get_name_skel},
+      {"_get_type", 	&POA_CORBA_ValueBoxDef::_get_type_skel},
+      {"_set_name", 	&POA_CORBA_ValueBoxDef::_set_name_skel},
+      {"_interface",  &POA_CORBA_ValueBoxDef::_interface_skel},
+      {"_get_version", 	&POA_CORBA_ValueBoxDef::_get_version_skel},
+      {"_set_version", 	&POA_CORBA_ValueBoxDef::_set_version_skel},
+      {"_get_def_kind", 	&POA_CORBA_ValueBoxDef::_get_def_kind_skel},
+      {"_get_defined_in", 	&POA_CORBA_ValueBoxDef::_get_defined_in_skel},
+      {"destroy", 	&POA_CORBA_ValueBoxDef::destroy_skel},
+      {"_get_absolute_name", 	&POA_CORBA_ValueBoxDef::_get_absolute_name_skel},
+      {"_get_original_type_def", 	&POA_CORBA_ValueBoxDef::_get_original_type_def_skel},
+      {"_set_original_type_def", 	&POA_CORBA_ValueBoxDef::_set_original_type_def_skel},
+      {"_non_existent",  &POA_CORBA_ValueBoxDef::_non_existent_skel},
+      {"_get_containing_repository", 	&POA_CORBA_ValueBoxDef::_get_containing_repository_skel},
     };
 
   static const signed char lookup[] =
     {
-       -6,  -2,  -9,  -3,   4,   5,  -1, -43,   8, -43, -12,  -2, -38,  14, 
-       -1,  15,  -1,  16,  17,  -1, -18,  -2, -38,  20,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  21, 
+       -9,  -3, -13,  -2,   4,   5,  -1,  53,   8, -45,  12,  -1, -46,  15, 
+       -1,  16,  -1,  17,  18,  -1, -19,  -2, -38,  21,  -6,  -2,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -8216,17 +8372,16 @@ TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
     }
   return 0;
 }
-/* ending time is 10:44:40 */
+/* ending time is 13:56:24 */
 static TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable tao_CORBA_ValueBoxDef_optable;
 
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get : public TAO_ServerRequestInfo
 {
 public:
   TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueBoxDef *tao_impl,
+    POA_CORBA_ValueBoxDef *tao_impl,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -8258,20 +8413,20 @@ public:
       CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get (const TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get &);
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get &);
   
 private:
-  POA_CORBA::ValueBoxDef *_tao_impl;
-  CORBA::IDLType_ptr _result;
+  POA_CORBA_ValueBoxDef *_tao_impl;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueBoxDef *tao_impl,
+    POA_CORBA_ValueBoxDef *tao_impl,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -8338,7 +8493,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_is_a (
 }
 
 void 
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA::IDLType_ptr result)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA_IDLType_ptr result)
 {
   // Update the result.
    this->_result = result;
@@ -8349,8 +8504,8 @@ class TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set : public TAO
 public:
   TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueBoxDef *tao_impl,
-    CORBA::IDLType_ptr original_type_def,
+    POA_CORBA_ValueBoxDef *tao_impl,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV = 
       TAO_default_environment ()
   );
@@ -8388,15 +8543,15 @@ private:
   void operator= (const TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set &);
   
 private:
-  POA_CORBA::ValueBoxDef *_tao_impl;
-  CORBA::IDLType_ptr original_type_def_;
+  POA_CORBA_ValueBoxDef *_tao_impl;
+  CORBA_IDLType_ptr original_type_def_;
   
 };
 
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    POA_CORBA::ValueBoxDef *tao_impl,
-    CORBA::IDLType_ptr original_type_def,
+    POA_CORBA_ValueBoxDef *tao_impl,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &
   )
   : TAO_ServerRequestInfo (_tao_server_request),
@@ -8474,29 +8629,29 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_is_a (
 //
 
 // Factory function Implementation.
-POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker *POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::the_TAO_ValueBoxDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker *_TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::the_TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker (void)
 {
-  static POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker strategized_proxy_broker;
+  static _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
 }
 
-POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::_TAO_ValueBoxDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::_TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     this->proxy_cache_[i] = 0;
   
 }
 
-POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::~_TAO_ValueBoxDef_Strategized_Proxy_Broker (void)
+_TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker (void)
 {
   for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
     delete this->proxy_cache_[i];
   
 }
 
-_TAO_ValueBoxDef_Proxy_Impl&
-POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::ValueBoxDef *object,
+_TAO_CORBA_ValueBoxDef_Proxy_Impl&
+_TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::select_proxy (
+    ::CORBA_ValueBoxDef *object,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
@@ -8514,7 +8669,7 @@ POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::select_proxy (
 }
 
 void 
-POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::create_proxy (
+_TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::create_proxy (
     int strategy,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8528,7 +8683,7 @@ POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::create_proxy (
         case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              _TAO_ValueBoxDef_ThruPOA_Proxy_Impl,
+              _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -8538,7 +8693,7 @@ POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::create_proxy (
         default:
           ACE_NEW_THROW_EX (
               this->proxy_cache_[strategy],
-              ::_TAO_ValueBoxDef_Remote_Proxy_Impl,
+              ::_TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl,
               CORBA::NO_MEMORY ()
           );
           ACE_CHECK;
@@ -8555,38 +8710,38 @@ POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 
-_TAO_ValueBoxDef_Proxy_Broker *
-CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+_TAO_CORBA_ValueBoxDef_Proxy_Broker *
+_TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
 {
   ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::the_TAO_ValueBoxDef_Strategized_Proxy_Broker();
+  return ::_TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::the_TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker();
 }
 
 int
-CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (long _dummy_)
+_TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_Initializer (long _dummy_)
 {
   ACE_UNUSED_ARG (_dummy_);
   
-  CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer = 
-    CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function;
+  _TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_function_pointer = 
+    _TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
-static int CORBA__TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-  CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer));
+static int _TAO_CORBA_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
+  _TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_Initializer));
 
 
 ///////////////////////////////////////////////////////////////////////
 //                 ThruPOA Proxy  Implementation
 //
 
-POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void)
+_TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-CORBA::IDLType_ptr POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
+CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8594,7 +8749,7 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type
     CORBA::SystemException
   ))
 {
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
   ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
@@ -8608,18 +8763,18 @@ CORBA::IDLType_ptr POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
-      POA_CORBA::ValueBoxDef_ptr,
+      POA_CORBA_ValueBoxDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueBoxDef:1.0"
+          "IDL:omg.org/CORBA_ValueBoxDef:1.0"
         )
     )->original_type_def (
         ACE_TRY_ENV
       );
 }
 
-void POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
+void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -8638,9 +8793,9 @@ void POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
-      POA_CORBA::ValueBoxDef_ptr,
+      POA_CORBA_ValueBoxDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/ValueBoxDef:1.0"
+          "IDL:omg.org/CORBA_ValueBoxDef:1.0"
         )
     )->original_type_def (
         original_type_def,
@@ -8654,35 +8809,35 @@ void POA_CORBA::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
 ///////////////////////////////////////////////////////////////////////
 
 // skeleton constructor
-POA_CORBA::ValueBoxDef::ValueBoxDef (void)
+POA_CORBA_ValueBoxDef::POA_CORBA_ValueBoxDef (void)
 {
   this->optable_ = &tao_CORBA_ValueBoxDef_optable;
 }
 
 // copy ctor
-POA_CORBA::ValueBoxDef::ValueBoxDef (const ValueBoxDef& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,TypedefDef) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Contained) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IDLType) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
+POA_CORBA_ValueBoxDef::POA_CORBA_ValueBoxDef (const POA_CORBA_ValueBoxDef& rhs)
+  :   POA_CORBA_TypedefDef (rhs),
+    POA_CORBA_Contained (rhs),
+    POA_CORBA_IDLType (rhs),
+    POA_CORBA_IRObject (rhs),
     TAO_ServantBase (rhs)
 {}
 
 // skeleton destructor
-POA_CORBA::ValueBoxDef::~ValueBoxDef (void)
+POA_CORBA_ValueBoxDef::~POA_CORBA_ValueBoxDef (void)
 {
 }
 
-void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
+void POA_CORBA_ValueBoxDef::_get_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ValueBoxDef *_tao_impl = (POA_CORBA::ValueBoxDef *)_tao_object_reference;
+  POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *)_tao_object_reference;
   
-    CORBA::IDLType_var _tao_retval;
+    CORBA_IDLType_var _tao_retval;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
@@ -8709,7 +8864,7 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
       TAO_INTERCEPTOR_CHECK;
       
 #if (TAO_HAS_INTERCEPTORS == 1)
-      CORBA::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
+      CORBA_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -8753,7 +8908,7 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
+void POA_CORBA_ValueBoxDef::_set_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference, 
     void * /* context */, 
@@ -8761,10 +8916,10 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueBoxDef *_tao_impl = (POA_CORBA::ValueBoxDef *)_tao_object_reference;
+  POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *)_tao_object_reference;
   
   _tao_server_request.argument_flag (0);
-    CORBA::IDLType_var original_type_def;
+    CORBA_IDLType_var original_type_def;
   if (!(
     (_tao_in >> original_type_def.out ())
   ))
@@ -8832,7 +8987,7 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
   ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
-void POA_CORBA::ValueBoxDef::_is_a_skel (
+void POA_CORBA_ValueBoxDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
@@ -8840,7 +8995,7 @@ void POA_CORBA::ValueBoxDef::_is_a_skel (
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ValueBoxDef *_tao_impl = (POA_CORBA::ValueBoxDef *) _tao_object_reference;
+  POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
   if (!(_tao_in >> value.out ()))
@@ -8855,14 +9010,14 @@ void POA_CORBA::ValueBoxDef::_is_a_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-void POA_CORBA::ValueBoxDef::_non_existent_skel (
+void POA_CORBA_ValueBoxDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* context */,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::ValueBoxDef *_tao_impl = (POA_CORBA::ValueBoxDef *) _tao_object_reference;
+  POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *) _tao_object_reference;
   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
   ACE_CHECK;
   
@@ -8872,7 +9027,55 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel (
     ACE_THROW (CORBA::MARSHAL ());
 }
 
-CORBA::Boolean POA_CORBA::ValueBoxDef::_is_a (
+void POA_CORBA_ValueBoxDef::_interface_skel (
+    TAO_ServerRequest &_tao_server_request, 
+    void * _tao_object_reference,
+    void * /* context */,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *) _tao_object_reference;
+  CORBA_InterfaceDef_ptr _tao_retval = 0;
+  CORBA::Boolean _tao_result = 0;
+  
+  TAO_IFR_Client_Adapter *_tao_adapter =
+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+        TAO_ORB_Core::ifr_client_adapter_name ()
+      );
+    
+  if (_tao_adapter == 0)
+    {
+      ACE_THROW (CORBA::INTF_REPOS ());
+    }
+  
+  ACE_TRY
+    {
+      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+      
+      _tao_server_request.init_reply ();
+      
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      _tao_result =
+        _tao_adapter->interfacedef_cdr_insert (
+            _tao_out,
+            _tao_retval
+          );
+    }
+  ACE_CATCHALL
+    {
+      _tao_adapter->dispose (_tao_retval);
+    }
+  ACE_ENDTRY;
+  
+  if (_tao_result == 0)
+    {
+      ACE_THROW (CORBA::MARSHAL ());
+    }
+}
+
+CORBA::Boolean POA_CORBA_ValueBoxDef::_is_a (
     const char* value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8881,48 +9084,48 @@ CORBA::Boolean POA_CORBA::ValueBoxDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueBoxDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueBoxDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
       return 0;
 }
 
-void* POA_CORBA::ValueBoxDef::_downcast (
+void* POA_CORBA_ValueBoxDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueBoxDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::ValueBoxDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::TypedefDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueBoxDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_ValueBoxDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_CORBA::ValueBoxDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ValueBoxDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
 {
   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
 }
 
-const char* POA_CORBA::ValueBoxDef::_interface_repository_id (void) const
+const char* POA_CORBA_ValueBoxDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/ValueBoxDef:1.0";
+  return "IDL:omg.org/CORBA_ValueBoxDef:1.0";
 }
 
-CORBA::ValueBoxDef*
-POA_CORBA::ValueBoxDef::_this (CORBA_Environment &ACE_TRY_ENV)
+CORBA_ValueBoxDef*
+POA_CORBA_ValueBoxDef::_this (CORBA_Environment &ACE_TRY_ENV)
 {
   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -8935,7 +9138,9 @@ POA_CORBA::ValueBoxDef::_this (CORBA_Environment &ACE_TRY_ENV)
     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
   
   CORBA::Object_var obj = tmp;
-  return ::CORBA::ValueBoxDef::_unchecked_narrow (obj.in ());
+  return ::CORBA_ValueBoxDef::_unchecked_narrow (obj.in ());
 }
 
+
+
 #endif /* ifndef */
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
index 3716b572a68..48656a330b3 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
@@ -19,16 +19,23 @@
 // 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"
+#include "tao/IFR_Client/IFR_ExtendedC.h"
+
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/PortableServer/Collocated_Object.h"
+#include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
+#include "tao/PortableServer/Direct_Object_Proxy_Impl.h"
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
 #pragma warning(push)
@@ -40,218 +47,226 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-TAO_NAMESPACE  POA_CORBA
+class POA_CORBA_FixedDef;
+typedef POA_CORBA_FixedDef *POA_CORBA_FixedDef_ptr;
+// Forward Classes Declaration
+class _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_FixedDef_Strategized_Proxy_Broker;
+
+class  POA_CORBA_FixedDef : public virtual POA_CORBA_IDLType
 {
-  class FixedDef;
-  typedef FixedDef *FixedDef_ptr;
-  // Forward Classes Declaration
-  class _TAO_FixedDef_ThruPOA_Proxy_Impl;
-  class _TAO_FixedDef_Strategized_Proxy_Broker;
-  
-  class  FixedDef : public virtual IDLType
-  {
-  protected:
-    FixedDef (void);
-
-  public:
-    FixedDef (const FixedDef& rhs);
-    virtual ~FixedDef (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 ()
-      );
-
-    virtual void _dispatch (
-        TAO_ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::FixedDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
+protected:
+  POA_CORBA_FixedDef (void);
 
-    virtual CORBA::UShort digits (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_digits_skel (
-        TAO_ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void digits (
-        CORBA::UShort digits,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_digits_skel (
-        TAO_ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::Short scale (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_scale_skel (
-        TAO_ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void scale (
-        CORBA::Short scale,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_scale_skel (
-        TAO_ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_type_skel (
-        TAO_ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        TAO_ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        TAO_ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
-  };
+public:
+  POA_CORBA_FixedDef (const POA_CORBA_FixedDef& rhs);
+  virtual ~POA_CORBA_FixedDef (void);
 
-  
-  ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
-  //
-  
-  class  _TAO_FixedDef_Strategized_Proxy_Broker : public virtual ::_TAO_FixedDef_Proxy_Broker
-  {
-  public: 
-    _TAO_FixedDef_Strategized_Proxy_Broker (void);
-    
-    virtual ~_TAO_FixedDef_Strategized_Proxy_Broker (void);
-    
-    virtual ::_TAO_FixedDef_Proxy_Impl &select_proxy (
-      ::CORBA::FixedDef *object,
-      CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+
+  virtual CORBA::Boolean _is_a (
+      const char* logical_type_id,
+      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 strategy,
-      CORBA::Environment &ACE_TRY_ENV
+
+  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_FixedDef *_this (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+
+  virtual const char* _interface_repository_id (void) const;
+
+  virtual CORBA::UShort digits (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  static void _get_digits_skel (
+      TAO_ServerRequest &_tao_req, 
+      void *_tao_obj, 
+      void *_tao_context, 
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+
+  virtual void digits (
+      CORBA::UShort digits,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  static void _set_digits_skel (
+      TAO_ServerRequest &_tao_req, 
+      void *_tao_obj, 
+      void *_tao_context, 
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+
+  virtual CORBA::Short scale (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  static void _get_scale_skel (
+      TAO_ServerRequest &_tao_req, 
+      void *_tao_obj, 
+      void *_tao_context, 
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+
+  virtual void scale (
+      CORBA::Short scale,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  static void _set_scale_skel (
+      TAO_ServerRequest &_tao_req, 
+      void *_tao_obj, 
+      void *_tao_context, 
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+
+  static void _get_type_skel (
+      TAO_ServerRequest &req,
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void _get_def_kind_skel (
+      TAO_ServerRequest &req,
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+  static void destroy_skel (
+      TAO_ServerRequest &req, 
+      void *obj,
+      void *context,
+      CORBA::Environment &ACE_TRY_ENV =
+        TAO_default_environment ()
+    );
+
+
+};
+
+
+///////////////////////////////////////////////////////////////////////
+//               Strategized Proxy Broker Declaration 
+//
+
+class  _TAO_CORBA_FixedDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_FixedDef_Proxy_Broker
+{
+public: 
+  _TAO_CORBA_FixedDef_Strategized_Proxy_Broker (void);
   
-  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.
-    ::_TAO_FixedDef_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_FixedDef_Strategized_Proxy_Broker *the_TAO_FixedDef_Strategized_Proxy_Broker (void);
-  };
-  
+  virtual ~_TAO_CORBA_FixedDef_Strategized_Proxy_Broker (void);
   
-  //
-  //            End Strategized Proxy Broker Declaration 
-  ///////////////////////////////////////////////////////////////////////
+  virtual ::_TAO_CORBA_FixedDef_Proxy_Impl &select_proxy (
+    ::CORBA_FixedDef *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.
+  ::_TAO_CORBA_FixedDef_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_CORBA_FixedDef_Strategized_Proxy_Broker *the_TAO_CORBA_FixedDef_Strategized_Proxy_Broker (void);
+};
+
+
+//
+//            End Strategized Proxy Broker Declaration 
+///////////////////////////////////////////////////////////////////////
+
+
 ///////////////////////////////////////////////////////////////////////
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_FixedDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_FixedDef_Proxy_Impl,
+class  _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_FixedDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_FixedDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_FixedDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl (void) { }
   
     virtual CORBA::UShort digits (
       CORBA_Object *_collocated_tao_target_,
@@ -294,22 +309,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  FixedDef_tie : public FixedDef
+class  POA_CORBA_FixedDef_tie : public POA_CORBA_FixedDef
 {
 public:
-  FixedDef_tie (T &t);
+  POA_CORBA_FixedDef_tie (T &t);
   // the T& ctor
-  FixedDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_FixedDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  FixedDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_FixedDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  FixedDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_FixedDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~FixedDef_tie (void);
+  ~POA_CORBA_FixedDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -393,26 +406,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  FixedDef_tie (const FixedDef_tie &);
-  void operator= (const FixedDef_tie &);
+  POA_CORBA_FixedDef_tie (const POA_CORBA_FixedDef_tie &);
+  void operator= (const POA_CORBA_FixedDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class ValueMemberDef;
-typedef ValueMemberDef *ValueMemberDef_ptr;
+class POA_CORBA_ValueMemberDef;
+typedef POA_CORBA_ValueMemberDef *POA_CORBA_ValueMemberDef_ptr;
 // Forward Classes Declaration
-class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
-class _TAO_ValueMemberDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker;
 
-class  ValueMemberDef : public virtual Contained
+class  POA_CORBA_ValueMemberDef : public virtual POA_CORBA_Contained
 {
 protected:
-  ValueMemberDef (void);
+  POA_CORBA_ValueMemberDef (void);
 
 public:
-  ValueMemberDef (const ValueMemberDef& rhs);
-  virtual ~ValueMemberDef (void);
+  POA_CORBA_ValueMemberDef (const POA_CORBA_ValueMemberDef& rhs);
+  virtual ~POA_CORBA_ValueMemberDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -441,6 +453,14 @@ public:
         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,
@@ -448,7 +468,7 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::ValueMemberDef *_this (
+  ::CORBA_ValueMemberDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -471,7 +491,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::IDLType_ptr type_def (
+  virtual CORBA_IDLType_ptr type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -488,7 +508,7 @@ public:
     );
 
   virtual void type_def (
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -640,6 +660,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -647,15 +669,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_ValueMemberDef_Strategized_Proxy_Broker : public virtual ::_TAO_ValueMemberDef_Proxy_Broker
+class  _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ValueMemberDef_Proxy_Broker
 {
 public: 
-  _TAO_ValueMemberDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_ValueMemberDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_ValueMemberDef_Proxy_Impl &select_proxy (
-    ::CORBA::ValueMemberDef *object,
+  virtual ::_TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy (
+    ::CORBA_ValueMemberDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -664,7 +686,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -673,7 +695,7 @@ 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.
-  ::_TAO_ValueMemberDef_Proxy_Impl
+  ::_TAO_CORBA_ValueMemberDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -682,7 +704,7 @@ private:
 // interface.
 
 public:
-  static _TAO_ValueMemberDef_Strategized_Proxy_Broker *the_TAO_ValueMemberDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker *the_TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -695,16 +717,16 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_ValueMemberDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_ValueMemberDef_Proxy_Impl,
+class  _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_ValueMemberDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ValueMemberDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
@@ -714,7 +736,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr type_def (
+  virtual CORBA_IDLType_ptr type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -724,7 +746,7 @@ public:
 
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -755,22 +777,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  ValueMemberDef_tie : public ValueMemberDef
+class  POA_CORBA_ValueMemberDef_tie : public POA_CORBA_ValueMemberDef
 {
 public:
-  ValueMemberDef_tie (T &t);
+  POA_CORBA_ValueMemberDef_tie (T &t);
   // the T& ctor
-  ValueMemberDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_ValueMemberDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  ValueMemberDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_ValueMemberDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  ValueMemberDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_ValueMemberDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~ValueMemberDef_tie (void);
+  ~POA_CORBA_ValueMemberDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -798,7 +818,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::IDLType_ptr type_def (
+  CORBA_IDLType_ptr type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -807,7 +827,7 @@ public:
     ));
 
   void type_def (
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -883,7 +903,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -899,7 +919,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -907,7 +927,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -916,7 +936,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -948,26 +968,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  ValueMemberDef_tie (const ValueMemberDef_tie &);
-  void operator= (const ValueMemberDef_tie &);
+  POA_CORBA_ValueMemberDef_tie (const POA_CORBA_ValueMemberDef_tie &);
+  void operator= (const POA_CORBA_ValueMemberDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class ValueDef;
-typedef ValueDef *ValueDef_ptr;
+class POA_CORBA_ValueDef;
+typedef POA_CORBA_ValueDef *POA_CORBA_ValueDef_ptr;
 // Forward Classes Declaration
-class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-class _TAO_ValueDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_ValueDef_Strategized_Proxy_Broker;
 
-class  ValueDef : public virtual Container, public virtual Contained, public virtual IDLType
+class  POA_CORBA_ValueDef : public virtual POA_CORBA_Container, public virtual POA_CORBA_Contained, public virtual POA_CORBA_IDLType
 {
 protected:
-  ValueDef (void);
+  POA_CORBA_ValueDef (void);
 
 public:
-  ValueDef (const ValueDef& rhs);
-  virtual ~ValueDef (void);
+  POA_CORBA_ValueDef (const POA_CORBA_ValueDef& rhs);
+  virtual ~POA_CORBA_ValueDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -996,6 +1015,14 @@ public:
         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,
@@ -1003,14 +1030,14 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::ValueDef *_this (
+  ::CORBA_ValueDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
-  virtual CORBA::InterfaceDefSeq * supported_interfaces (
+  virtual CORBA_InterfaceDefSeq * supported_interfaces (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1027,7 +1054,7 @@ public:
     );
 
   virtual void supported_interfaces (
-      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1043,7 +1070,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::InitializerSeq * initializers (
+  virtual CORBA_InitializerSeq * initializers (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1060,7 +1087,7 @@ public:
     );
 
   virtual void initializers (
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1076,7 +1103,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::ValueDef_ptr base_value (
+  virtual CORBA_ValueDef_ptr base_value (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1093,7 +1120,7 @@ public:
     );
 
   virtual void base_value (
-      CORBA::ValueDef_ptr base_value,
+      CORBA_ValueDef_ptr base_value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1109,7 +1136,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::ValueDefSeq * abstract_base_values (
+  virtual CORBA_ValueDefSeq * abstract_base_values (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1126,7 +1153,7 @@ public:
     );
 
   virtual void abstract_base_values (
-      const CORBA::ValueDefSeq & abstract_base_values,
+      const CORBA_ValueDefSeq & abstract_base_values,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1258,7 +1285,7 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::ValueDef::FullValueDescription * describe_value (
+  virtual CORBA_ValueDef::FullValueDescription * describe_value (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1274,11 +1301,11 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::ValueMemberDef_ptr create_value_member (
+  virtual CORBA_ValueMemberDef_ptr create_value_member (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::Visibility access,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -1295,11 +1322,11 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::AttributeDef_ptr create_attribute (
+  virtual CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -1316,15 +1343,15 @@ public:
         TAO_default_environment ()
     );
 
-  virtual CORBA::OperationDef_ptr create_operation (
+  virtual CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1587,6 +1614,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -1594,15 +1623,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_ValueDef_Strategized_Proxy_Broker : public virtual ::_TAO_ValueDef_Proxy_Broker
+class  _TAO_CORBA_ValueDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ValueDef_Proxy_Broker
 {
 public: 
-  _TAO_ValueDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_ValueDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_ValueDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_ValueDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_ValueDef_Proxy_Impl &select_proxy (
-    ::CORBA::ValueDef *object,
+  virtual ::_TAO_CORBA_ValueDef_Proxy_Impl &select_proxy (
+    ::CORBA_ValueDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -1611,7 +1640,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -1620,7 +1649,7 @@ 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.
-  ::_TAO_ValueDef_Proxy_Impl
+  ::_TAO_CORBA_ValueDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -1629,7 +1658,7 @@ private:
 // interface.
 
 public:
-  static _TAO_ValueDef_Strategized_Proxy_Broker *the_TAO_ValueDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_ValueDef_Strategized_Proxy_Broker *the_TAO_CORBA_ValueDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -1642,20 +1671,20 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_ValueDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_ValueDef_Proxy_Impl,
+class  _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_ValueDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_Container_ThruPOA_Proxy_Impl, 
-  public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl, 
-  public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_ValueDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ValueDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl (void) { }
   
-    virtual CORBA::InterfaceDefSeq * supported_interfaces (
+    virtual CORBA_InterfaceDefSeq * supported_interfaces (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1665,14 +1694,14 @@ public:
 
   virtual void supported_interfaces (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::InitializerSeq * initializers (
+  virtual CORBA_InitializerSeq * initializers (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1682,14 +1711,14 @@ public:
 
   virtual void initializers (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDef_ptr base_value (
+  virtual CORBA_ValueDef_ptr base_value (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1699,14 +1728,14 @@ public:
 
   virtual void base_value (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::ValueDef_ptr base_value,
+      CORBA_ValueDef_ptr base_value,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDefSeq * abstract_base_values (
+  virtual CORBA_ValueDefSeq * abstract_base_values (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1716,7 +1745,7 @@ public:
 
   virtual void abstract_base_values (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::ValueDefSeq & abstract_base_values,
+      const CORBA_ValueDefSeq & abstract_base_values,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -1783,7 +1812,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDef::FullValueDescription * describe_value (
+  virtual CORBA_ValueDef::FullValueDescription * describe_value (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1791,12 +1820,12 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueMemberDef_ptr create_value_member (
+  virtual CORBA_ValueMemberDef_ptr create_value_member (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::Visibility access,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1804,12 +1833,12 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::AttributeDef_ptr create_attribute (
+  virtual CORBA_AttributeDef_ptr create_attribute (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1817,16 +1846,16 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::OperationDef_ptr create_operation (
+  virtual CORBA_OperationDef_ptr create_operation (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -1840,22 +1869,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  ValueDef_tie : public ValueDef
+class  POA_CORBA_ValueDef_tie : public POA_CORBA_ValueDef
 {
 public:
-  ValueDef_tie (T &t);
+  POA_CORBA_ValueDef_tie (T &t);
   // the T& ctor
-  ValueDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_ValueDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  ValueDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_ValueDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  ValueDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_ValueDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~ValueDef_tie (void);
+  ~POA_CORBA_ValueDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -1875,7 +1902,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  CORBA::InterfaceDefSeq * supported_interfaces (
+  CORBA_InterfaceDefSeq * supported_interfaces (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1884,7 +1911,7 @@ public:
     ));
 
   void supported_interfaces (
-      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1892,7 +1919,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InitializerSeq * initializers (
+  CORBA_InitializerSeq * initializers (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1901,7 +1928,7 @@ public:
     ));
 
   void initializers (
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1909,7 +1936,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr base_value (
+  CORBA_ValueDef_ptr base_value (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1918,7 +1945,7 @@ public:
     ));
 
   void base_value (
-      CORBA::ValueDef_ptr base_value,
+      CORBA_ValueDef_ptr base_value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1926,7 +1953,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDefSeq * abstract_base_values (
+  CORBA_ValueDefSeq * abstract_base_values (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1935,7 +1962,7 @@ public:
     ));
 
   void abstract_base_values (
-      const CORBA::ValueDefSeq & abstract_base_values,
+      const CORBA_ValueDefSeq & abstract_base_values,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2003,7 +2030,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef::FullValueDescription * describe_value (
+  CORBA_ValueDef::FullValueDescription * describe_value (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2011,11 +2038,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueMemberDef_ptr create_value_member (
+  CORBA_ValueMemberDef_ptr create_value_member (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::Visibility access,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -2024,11 +2051,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AttributeDef_ptr create_attribute (
+  CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -2037,15 +2064,15 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::OperationDef_ptr create_operation (
+  CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2053,7 +2080,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained_ptr lookup (
+  CORBA_Contained_ptr lookup (
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -2062,7 +2089,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * contents (
+  CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -2072,7 +2099,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ContainedSeq * lookup_name (
+  CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
@@ -2084,7 +2111,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container::DescriptionSeq * describe_contents (
+  CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs,
@@ -2095,7 +2122,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ModuleDef_ptr create_module (
+  CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
       const char * version,
@@ -2106,11 +2133,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ConstantDef_ptr create_constant (
+  CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -2119,11 +2146,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::StructDef_ptr create_struct (
+  CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2131,12 +2158,12 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::UnionDef_ptr create_union (
+  CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2144,11 +2171,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::EnumDef_ptr create_enum (
+  CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2156,11 +2183,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AliasDef_ptr create_alias (
+  CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2168,11 +2195,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::InterfaceDef_ptr create_interface (
+  CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2180,17 +2207,17 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueDef_ptr create_value (
+  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_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2198,11 +2225,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ValueBoxDef_ptr create_value_box (
+  CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2210,11 +2237,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::ExceptionDef_ptr create_exception (
+  CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2222,7 +2249,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::NativeDef_ptr create_native (
+  CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
       const char * version,
@@ -2233,11 +2260,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2245,11 +2272,11 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::LocalInterfaceDef_ptr create_local_interface (
+  CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2308,7 +2335,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2324,7 +2351,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2332,7 +2359,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2341,7 +2368,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -2381,26 +2408,25 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  ValueDef_tie (const ValueDef_tie &);
-  void operator= (const ValueDef_tie &);
+  POA_CORBA_ValueDef_tie (const POA_CORBA_ValueDef_tie &);
+  void operator= (const POA_CORBA_ValueDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
 
-class ValueBoxDef;
-typedef ValueBoxDef *ValueBoxDef_ptr;
+class POA_CORBA_ValueBoxDef;
+typedef POA_CORBA_ValueBoxDef *POA_CORBA_ValueBoxDef_ptr;
 // Forward Classes Declaration
-class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
-class _TAO_ValueBoxDef_Strategized_Proxy_Broker;
+class _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl;
+class _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker;
 
-class  ValueBoxDef : public virtual TypedefDef
+class  POA_CORBA_ValueBoxDef : public virtual POA_CORBA_TypedefDef
 {
 protected:
-  ValueBoxDef (void);
+  POA_CORBA_ValueBoxDef (void);
 
 public:
-  ValueBoxDef (const ValueBoxDef& rhs);
-  virtual ~ValueBoxDef (void);
+  POA_CORBA_ValueBoxDef (const POA_CORBA_ValueBoxDef& rhs);
+  virtual ~POA_CORBA_ValueBoxDef (void);
 
 
   virtual CORBA::Boolean _is_a (
@@ -2429,6 +2455,14 @@ public:
         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,
@@ -2436,14 +2470,14 @@ public:
         TAO_default_environment ()
     );
 
-  ::CORBA::ValueBoxDef *_this (
+  ::CORBA_ValueBoxDef *_this (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
 
   virtual const char* _interface_repository_id (void) const;
 
-  virtual CORBA::IDLType_ptr original_type_def (
+  virtual CORBA_IDLType_ptr original_type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2460,7 +2494,7 @@ public:
     );
 
   virtual void original_type_def (
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2587,6 +2621,8 @@ public:
       CORBA::Environment &ACE_TRY_ENV =
         TAO_default_environment ()
     );
+
+
 };
 
 
@@ -2594,15 +2630,15 @@ public:
 //               Strategized Proxy Broker Declaration 
 //
 
-class  _TAO_ValueBoxDef_Strategized_Proxy_Broker : public virtual ::_TAO_ValueBoxDef_Proxy_Broker
+class  _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ValueBoxDef_Proxy_Broker
 {
 public: 
-  _TAO_ValueBoxDef_Strategized_Proxy_Broker (void);
+  _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker (void);
   
-  virtual ~_TAO_ValueBoxDef_Strategized_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker (void);
   
-  virtual ::_TAO_ValueBoxDef_Proxy_Impl &select_proxy (
-    ::CORBA::ValueBoxDef *object,
+  virtual ::_TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy (
+    ::CORBA_ValueBoxDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
@@ -2611,7 +2647,7 @@ private:
 // Helper methods that takes care to create the proxy
 // as soon as their use is necessary.
   void create_proxy (
-    int strategy,
+    int collocation_strategy,
     CORBA::Environment &ACE_TRY_ENV
   );
 
@@ -2620,7 +2656,7 @@ 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.
-  ::_TAO_ValueBoxDef_Proxy_Impl
+  ::_TAO_CORBA_ValueBoxDef_Proxy_Impl
    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
   
   TAO_SYNCH_MUTEX mutex_;
@@ -2629,7 +2665,7 @@ private:
 // interface.
 
 public:
-  static _TAO_ValueBoxDef_Strategized_Proxy_Broker *the_TAO_ValueBoxDef_Strategized_Proxy_Broker (void);
+  static _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker *the_TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker (void);
 };
 
 
@@ -2642,18 +2678,18 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_ValueBoxDef_ThruPOA_Proxy_Impl : 
-  public virtual ::_TAO_ValueBoxDef_Proxy_Impl,
+class  _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl : 
+  public virtual ::_TAO_CORBA_ValueBoxDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::POA_CORBA::_TAO_TypedefDef_ThruPOA_Proxy_Impl
+  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl
   
 {
 public:
-  _TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void);
+  _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl (void);
   
-  virtual ~_TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl (void) { }
   
-    virtual CORBA::IDLType_ptr original_type_def (
+    virtual CORBA_IDLType_ptr original_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -2663,7 +2699,7 @@ public:
 
   virtual void original_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -2677,22 +2713,20 @@ public:
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
-
-#if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class  ValueBoxDef_tie : public ValueBoxDef
+class  POA_CORBA_ValueBoxDef_tie : public POA_CORBA_ValueBoxDef
 {
 public:
-  ValueBoxDef_tie (T &t);
+  POA_CORBA_ValueBoxDef_tie (T &t);
   // the T& ctor
-  ValueBoxDef_tie (T &t, PortableServer::POA_ptr poa);
+  POA_CORBA_ValueBoxDef_tie (T &t, PortableServer::POA_ptr poa);
   // ctor taking a POA
-  ValueBoxDef_tie (T *tp, CORBA::Boolean release=1);
+  POA_CORBA_ValueBoxDef_tie (T *tp, CORBA::Boolean release=1);
   // ctor taking pointer and an ownership flag
-  ValueBoxDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
+  POA_CORBA_ValueBoxDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
   // ctor with T*, ownership flag and a POA
-  ~ValueBoxDef_tie (void);
+  ~POA_CORBA_ValueBoxDef_tie (void);
   // dtor
   
   // TIE specific functions
@@ -2712,7 +2746,7 @@ public:
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  CORBA::IDLType_ptr original_type_def (
+  CORBA_IDLType_ptr original_type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2721,7 +2755,7 @@ public:
     ));
 
   void original_type_def (
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2780,7 +2814,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Container_ptr defined_in (
+  CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2796,7 +2830,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Repository_ptr containing_repository (
+  CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2804,7 +2838,7 @@ public:
       CORBA::SystemException
     ));
 
-  CORBA::Contained::Description * describe (
+  CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2813,7 +2847,7 @@ public:
     ));
 
   void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -2853,14 +2887,10 @@ private:
   CORBA::Boolean rel_;
   
   // copy and assignment are not allowed
-  ValueBoxDef_tie (const ValueBoxDef_tie &);
-  void operator= (const ValueBoxDef_tie &);
+  POA_CORBA_ValueBoxDef_tie (const POA_CORBA_ValueBoxDef_tie &);
+  void operator= (const POA_CORBA_ValueBoxDef_tie &);
 };
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-}
-TAO_NAMESPACE_CLOSE
 
 #include "IFR_ExtendedS_T.h"
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i
index 1bc11e85576..6c7be77d4d9 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i
@@ -19,917 +19,917 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-ACE_INLINE void POA_CORBA::FixedDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_FixedDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::FixedDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_FixedDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::FixedDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_FixedDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::FixedDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_FixedDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::FixedDef::destroy_skel (
+ACE_INLINE void POA_CORBA_FixedDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::FixedDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_FixedDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueMemberDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_ValueMemberDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueMemberDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_ValueMemberDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueMemberDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_ValueMemberDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueMemberDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_ValueMemberDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueMemberDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_ValueMemberDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueMemberDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_ValueMemberDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueMemberDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_ValueMemberDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueMemberDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_ValueMemberDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueMemberDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_ValueMemberDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueMemberDef::describe_skel (
+ACE_INLINE void POA_CORBA_ValueMemberDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueMemberDef::move_skel (
+ACE_INLINE void POA_CORBA_ValueMemberDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueMemberDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_ValueMemberDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueMemberDef::destroy_skel (
+ACE_INLINE void POA_CORBA_ValueMemberDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ValueMemberDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::lookup_skel (
+ACE_INLINE void POA_CORBA_ValueDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::lookup_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::lookup_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::contents_skel (
+ACE_INLINE void POA_CORBA_ValueDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::lookup_name_skel (
+ACE_INLINE void POA_CORBA_ValueDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::lookup_name_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::lookup_name_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::describe_contents_skel (
+ACE_INLINE void POA_CORBA_ValueDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::describe_contents_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::describe_contents_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::create_module_skel (
+ACE_INLINE void POA_CORBA_ValueDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_module_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::create_module_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::create_constant_skel (
+ACE_INLINE void POA_CORBA_ValueDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_constant_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::create_constant_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::create_struct_skel (
+ACE_INLINE void POA_CORBA_ValueDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_struct_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::create_struct_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::create_union_skel (
+ACE_INLINE void POA_CORBA_ValueDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_union_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::create_union_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::create_enum_skel (
+ACE_INLINE void POA_CORBA_ValueDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_enum_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::create_enum_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::create_alias_skel (
+ACE_INLINE void POA_CORBA_ValueDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_alias_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::create_alias_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::create_interface_skel (
+ACE_INLINE void POA_CORBA_ValueDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::create_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::create_value_skel (
+ACE_INLINE void POA_CORBA_ValueDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_value_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::create_value_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::create_value_box_skel (
+ACE_INLINE void POA_CORBA_ValueDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_value_box_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::create_value_box_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::create_exception_skel (
+ACE_INLINE void POA_CORBA_ValueDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_exception_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::create_exception_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::create_native_skel (
+ACE_INLINE void POA_CORBA_ValueDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_native_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::create_native_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::create_abstract_interface_skel (
+ACE_INLINE void POA_CORBA_ValueDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_abstract_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::create_abstract_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::create_local_interface_skel (
+ACE_INLINE void POA_CORBA_ValueDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Container_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Container::create_local_interface_skel (
+  POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Container::create_local_interface_skel (
       req,
-      (POA_CORBA::Container_ptr) impl,
+      (POA_CORBA_Container_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_ValueDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_ValueDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_ValueDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_ValueDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_ValueDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_ValueDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_ValueDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_ValueDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_ValueDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::describe_skel (
+ACE_INLINE void POA_CORBA_ValueDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::move_skel (
+ACE_INLINE void POA_CORBA_ValueDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_ValueDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_ValueDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueDef::destroy_skel (
+ACE_INLINE void POA_CORBA_ValueDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ValueDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueBoxDef::_get_id_skel (
+ACE_INLINE void POA_CORBA_ValueBoxDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_get_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
+  POA_CORBA_Contained::_get_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueBoxDef::_set_id_skel (
+ACE_INLINE void POA_CORBA_ValueBoxDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_set_id_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
+  POA_CORBA_Contained::_set_id_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueBoxDef::_get_name_skel (
+ACE_INLINE void POA_CORBA_ValueBoxDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_get_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
+  POA_CORBA_Contained::_get_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueBoxDef::_set_name_skel (
+ACE_INLINE void POA_CORBA_ValueBoxDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_set_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
+  POA_CORBA_Contained::_set_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueBoxDef::_get_version_skel (
+ACE_INLINE void POA_CORBA_ValueBoxDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_get_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
+  POA_CORBA_Contained::_get_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueBoxDef::_set_version_skel (
+ACE_INLINE void POA_CORBA_ValueBoxDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_set_version_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
+  POA_CORBA_Contained::_set_version_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueBoxDef::_get_defined_in_skel (
+ACE_INLINE void POA_CORBA_ValueBoxDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_get_defined_in_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
+  POA_CORBA_Contained::_get_defined_in_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueBoxDef::_get_absolute_name_skel (
+ACE_INLINE void POA_CORBA_ValueBoxDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_get_absolute_name_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
+  POA_CORBA_Contained::_get_absolute_name_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueBoxDef::_get_containing_repository_skel (
+ACE_INLINE void POA_CORBA_ValueBoxDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::_get_containing_repository_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
+  POA_CORBA_Contained::_get_containing_repository_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueBoxDef::describe_skel (
+ACE_INLINE void POA_CORBA_ValueBoxDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::describe_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
+  POA_CORBA_Contained::describe_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueBoxDef::move_skel (
+ACE_INLINE void POA_CORBA_ValueBoxDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::Contained_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::Contained::move_skel (
+  POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
+  POA_CORBA_Contained::move_skel (
       req,
-      (POA_CORBA::Contained_ptr) impl,
+      (POA_CORBA_Contained_ptr) impl,
       context,
        ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueBoxDef::_get_type_skel (
+ACE_INLINE void POA_CORBA_ValueBoxDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IDLType_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::IDLType::_get_type_skel (
+  POA_CORBA_IDLType_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
+  POA_CORBA_IDLType::_get_type_skel (
       req,
-      (POA_CORBA::IDLType_ptr) impl,
+      (POA_CORBA_IDLType_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueBoxDef::_get_def_kind_skel (
+ACE_INLINE void POA_CORBA_ValueBoxDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::IRObject::_get_def_kind_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
+  POA_CORBA_IRObject::_get_def_kind_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
       ACE_TRY_ENV
     );
 }
-ACE_INLINE void POA_CORBA::ValueBoxDef::destroy_skel (
+ACE_INLINE void POA_CORBA_ValueBoxDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
     void *context,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  POA_CORBA::IRObject_ptr impl = (POA_CORBA::ValueBoxDef_ptr) obj;
-  POA_CORBA::IRObject::destroy_skel (
+  POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
+  POA_CORBA_IRObject::destroy_skel (
       req,
-      (POA_CORBA::IRObject_ptr) impl,
+      (POA_CORBA_IRObject_ptr) impl,
       context,
        ACE_TRY_ENV
     );
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.cpp b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.cpp
index 2b71f3ae707..aed7ff4e645 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.cpp
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_IDL_IFR_EXTENDEDS_T_CPP
-#define TAO_IDL_IFR_EXTENDEDS_T_CPP
+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_T_CPP_
+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_T_CPP_
 
 #include "IFR_ExtendedS_T.h"
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h
index 067cbcb37ad..81959991ee5 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_IFR_EXTENDEDS_T_H
-#define TAO_IDL_IFR_EXTENDEDS_T_H
+#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_T_H_
+#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_T_H_
 
 #include "ace/pre.h"
 #if defined(_MSC_VER)
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i
index c21c9b0f9d5..c0c535a0f75 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i
@@ -19,50 +19,48 @@
 // 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>::FixedDef_tie (T &t)
+POA_CORBA_FixedDef_tie<T>::POA_CORBA_FixedDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::FixedDef_tie<T>::FixedDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_FixedDef_tie<T>::POA_CORBA_FixedDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::FixedDef_tie<T>::FixedDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_FixedDef_tie<T>::POA_CORBA_FixedDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::FixedDef_tie<T>::FixedDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_FixedDef_tie<T>::POA_CORBA_FixedDef_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::FixedDef_tie<T>::~FixedDef_tie (void)
+POA_CORBA_FixedDef_tie<T>::~POA_CORBA_FixedDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::FixedDef_tie<T>::_tied_object (void)
+POA_CORBA_FixedDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::FixedDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_FixedDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -70,7 +68,7 @@ POA_CORBA::FixedDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::FixedDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_FixedDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -78,28 +76,28 @@ POA_CORBA::FixedDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::FixedDef_tie<T>::_is_owner (void)
+POA_CORBA_FixedDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::FixedDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_FixedDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::FixedDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_FixedDef_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->FixedDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_FixedDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::UShort POA_CORBA::FixedDef_tie<T>::digits  (
+CORBA::UShort POA_CORBA_FixedDef_tie<T>::digits  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -112,7 +110,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::FixedDef_tie<T>::digits  (
+void POA_CORBA_FixedDef_tie<T>::digits  (
     CORBA::UShort digits,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -127,7 +125,7 @@ digits,
 }
 
 template <class T> ACE_INLINE
-CORBA::Short POA_CORBA::FixedDef_tie<T>::scale  (
+CORBA::Short POA_CORBA_FixedDef_tie<T>::scale  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -140,7 +138,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::FixedDef_tie<T>::scale  (
+void POA_CORBA_FixedDef_tie<T>::scale  (
     CORBA::Short scale,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -155,7 +153,7 @@ scale,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::FixedDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_FixedDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -168,7 +166,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::FixedDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_FixedDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -181,7 +179,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::FixedDef_tie<T>::destroy  (
+void POA_CORBA_FixedDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -193,51 +191,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::ValueMemberDef_tie<T>::ValueMemberDef_tie (T &t)
+POA_CORBA_ValueMemberDef_tie<T>::POA_CORBA_ValueMemberDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ValueMemberDef_tie<T>::ValueMemberDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_ValueMemberDef_tie<T>::POA_CORBA_ValueMemberDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ValueMemberDef_tie<T>::ValueMemberDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_ValueMemberDef_tie<T>::POA_CORBA_ValueMemberDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ValueMemberDef_tie<T>::ValueMemberDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_ValueMemberDef_tie<T>::POA_CORBA_ValueMemberDef_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::ValueMemberDef_tie<T>::~ValueMemberDef_tie (void)
+POA_CORBA_ValueMemberDef_tie<T>::~POA_CORBA_ValueMemberDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::ValueMemberDef_tie<T>::_tied_object (void)
+POA_CORBA_ValueMemberDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ValueMemberDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_ValueMemberDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -245,7 +240,7 @@ POA_CORBA::ValueMemberDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ValueMemberDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_ValueMemberDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -253,28 +248,28 @@ POA_CORBA::ValueMemberDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ValueMemberDef_tie<T>::_is_owner (void)
+POA_CORBA_ValueMemberDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ValueMemberDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_ValueMemberDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ValueMemberDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ValueMemberDef_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->ValueMemberDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ValueMemberDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ValueMemberDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_ValueMemberDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -287,7 +282,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::IDLType_ptr POA_CORBA::ValueMemberDef_tie<T>::type_def  (
+CORBA_IDLType_ptr POA_CORBA_ValueMemberDef_tie<T>::type_def  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -300,8 +295,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueMemberDef_tie<T>::type_def  (
-    CORBA::IDLType_ptr type_def,
+void POA_CORBA_ValueMemberDef_tie<T>::type_def  (
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -315,7 +310,7 @@ type_def,
 }
 
 template <class T> ACE_INLINE
-CORBA::Visibility POA_CORBA::ValueMemberDef_tie<T>::access  (
+CORBA::Visibility POA_CORBA_ValueMemberDef_tie<T>::access  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -328,7 +323,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueMemberDef_tie<T>::access  (
+void POA_CORBA_ValueMemberDef_tie<T>::access  (
     CORBA::Visibility access,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -343,7 +338,7 @@ access,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ValueMemberDef_tie<T>::id  (
+char * POA_CORBA_ValueMemberDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -356,7 +351,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueMemberDef_tie<T>::id  (
+void POA_CORBA_ValueMemberDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -371,7 +366,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ValueMemberDef_tie<T>::name  (
+char * POA_CORBA_ValueMemberDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -384,7 +379,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueMemberDef_tie<T>::name  (
+void POA_CORBA_ValueMemberDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -399,7 +394,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ValueMemberDef_tie<T>::version  (
+char * POA_CORBA_ValueMemberDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -412,7 +407,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueMemberDef_tie<T>::version  (
+void POA_CORBA_ValueMemberDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -427,7 +422,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::ValueMemberDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_ValueMemberDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -440,7 +435,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ValueMemberDef_tie<T>::absolute_name  (
+char * POA_CORBA_ValueMemberDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -453,7 +448,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::ValueMemberDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_ValueMemberDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -466,7 +461,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::ValueMemberDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_ValueMemberDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -479,8 +474,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueMemberDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_ValueMemberDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -498,7 +493,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::ValueMemberDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_ValueMemberDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -511,7 +506,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueMemberDef_tie<T>::destroy  (
+void POA_CORBA_ValueMemberDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -523,51 +518,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::ValueDef_tie<T>::ValueDef_tie (T &t)
+POA_CORBA_ValueDef_tie<T>::POA_CORBA_ValueDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ValueDef_tie<T>::ValueDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_ValueDef_tie<T>::POA_CORBA_ValueDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ValueDef_tie<T>::ValueDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_ValueDef_tie<T>::POA_CORBA_ValueDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ValueDef_tie<T>::ValueDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_ValueDef_tie<T>::POA_CORBA_ValueDef_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::ValueDef_tie<T>::~ValueDef_tie (void)
+POA_CORBA_ValueDef_tie<T>::~POA_CORBA_ValueDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::ValueDef_tie<T>::_tied_object (void)
+POA_CORBA_ValueDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ValueDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_ValueDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -575,7 +567,7 @@ POA_CORBA::ValueDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ValueDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_ValueDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -583,28 +575,28 @@ POA_CORBA::ValueDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ValueDef_tie<T>::_is_owner (void)
+POA_CORBA_ValueDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ValueDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_ValueDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ValueDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ValueDef_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->ValueDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ValueDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDefSeq * POA_CORBA::ValueDef_tie<T>::supported_interfaces  (
+CORBA_InterfaceDefSeq * POA_CORBA_ValueDef_tie<T>::supported_interfaces  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -617,8 +609,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::supported_interfaces  (
-    const CORBA::InterfaceDefSeq & supported_interfaces,
+void POA_CORBA_ValueDef_tie<T>::supported_interfaces  (
+    const CORBA_InterfaceDefSeq & supported_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -632,7 +624,7 @@ supported_interfaces,
 }
 
 template <class T> ACE_INLINE
-CORBA::InitializerSeq * POA_CORBA::ValueDef_tie<T>::initializers  (
+CORBA_InitializerSeq * POA_CORBA_ValueDef_tie<T>::initializers  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -645,8 +637,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::initializers  (
-    const CORBA::InitializerSeq & initializers,
+void POA_CORBA_ValueDef_tie<T>::initializers  (
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -660,7 +652,7 @@ initializers,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_CORBA::ValueDef_tie<T>::base_value  (
+CORBA_ValueDef_ptr POA_CORBA_ValueDef_tie<T>::base_value  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -673,8 +665,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::base_value  (
-    CORBA::ValueDef_ptr base_value,
+void POA_CORBA_ValueDef_tie<T>::base_value  (
+    CORBA_ValueDef_ptr base_value,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -688,7 +680,7 @@ base_value,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDefSeq * POA_CORBA::ValueDef_tie<T>::abstract_base_values  (
+CORBA_ValueDefSeq * POA_CORBA_ValueDef_tie<T>::abstract_base_values  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -701,8 +693,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::abstract_base_values  (
-    const CORBA::ValueDefSeq & abstract_base_values,
+void POA_CORBA_ValueDef_tie<T>::abstract_base_values  (
+    const CORBA_ValueDefSeq & abstract_base_values,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -716,7 +708,7 @@ abstract_base_values,
 }
 
 template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_abstract  (
+CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_abstract  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -729,7 +721,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::is_abstract  (
+void POA_CORBA_ValueDef_tie<T>::is_abstract  (
     CORBA::Boolean is_abstract,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -744,7 +736,7 @@ is_abstract,
 }
 
 template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_custom  (
+CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_custom  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -757,7 +749,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::is_custom  (
+void POA_CORBA_ValueDef_tie<T>::is_custom  (
     CORBA::Boolean is_custom,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -772,7 +764,7 @@ is_custom,
 }
 
 template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_truncatable  (
+CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_truncatable  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -785,7 +777,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::is_truncatable  (
+void POA_CORBA_ValueDef_tie<T>::is_truncatable  (
     CORBA::Boolean is_truncatable,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -800,7 +792,7 @@ is_truncatable,
 }
 
 template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::ValueDef_tie<T>::is_a  (
+CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_a  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -815,7 +807,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef::FullValueDescription * POA_CORBA::ValueDef_tie<T>::describe_value  (
+CORBA_ValueDef::FullValueDescription * POA_CORBA_ValueDef_tie<T>::describe_value  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -828,11 +820,11 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueMemberDef_ptr POA_CORBA::ValueDef_tie<T>::create_value_member  (
+CORBA_ValueMemberDef_ptr POA_CORBA_ValueDef_tie<T>::create_value_member  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::Visibility access,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -851,11 +843,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AttributeDef_ptr POA_CORBA::ValueDef_tie<T>::create_attribute  (
+CORBA_AttributeDef_ptr POA_CORBA_ValueDef_tie<T>::create_attribute  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -874,15 +866,15 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::OperationDef_ptr POA_CORBA::ValueDef_tie<T>::create_operation  (
+CORBA_OperationDef_ptr POA_CORBA_ValueDef_tie<T>::create_operation  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -903,7 +895,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained_ptr POA_CORBA::ValueDef_tie<T>::lookup  (
+CORBA_Contained_ptr POA_CORBA_ValueDef_tie<T>::lookup  (
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -918,7 +910,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::ValueDef_tie<T>::contents  (
+CORBA_ContainedSeq * POA_CORBA_ValueDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Environment &ACE_TRY_ENV
@@ -935,7 +927,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ContainedSeq * POA_CORBA::ValueDef_tie<T>::lookup_name  (
+CORBA_ContainedSeq * POA_CORBA_ValueDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
@@ -956,7 +948,7 @@ search_name,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container::DescriptionSeq * POA_CORBA::ValueDef_tie<T>::describe_contents  (
+CORBA_Container::DescriptionSeq * POA_CORBA_ValueDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs,
@@ -975,7 +967,7 @@ limit_type,
 }
 
 template <class T> ACE_INLINE
-CORBA::ModuleDef_ptr POA_CORBA::ValueDef_tie<T>::create_module  (
+CORBA_ModuleDef_ptr POA_CORBA_ValueDef_tie<T>::create_module  (
     const char * id,
     const char * name,
     const char * version,
@@ -994,11 +986,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ConstantDef_ptr POA_CORBA::ValueDef_tie<T>::create_constant  (
+CORBA_ConstantDef_ptr POA_CORBA_ValueDef_tie<T>::create_constant  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1017,11 +1009,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::StructDef_ptr POA_CORBA::ValueDef_tie<T>::create_struct  (
+CORBA_StructDef_ptr POA_CORBA_ValueDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1038,12 +1030,12 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::UnionDef_ptr POA_CORBA::ValueDef_tie<T>::create_union  (
+CORBA_UnionDef_ptr POA_CORBA_ValueDef_tie<T>::create_union  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1061,11 +1053,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::EnumDef_ptr POA_CORBA::ValueDef_tie<T>::create_enum  (
+CORBA_EnumDef_ptr POA_CORBA_ValueDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1082,11 +1074,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AliasDef_ptr POA_CORBA::ValueDef_tie<T>::create_alias  (
+CORBA_AliasDef_ptr POA_CORBA_ValueDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1103,11 +1095,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::InterfaceDef_ptr POA_CORBA::ValueDef_tie<T>::create_interface  (
+CORBA_InterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1124,17 +1116,17 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueDef_ptr POA_CORBA::ValueDef_tie<T>::create_value  (
+CORBA_ValueDef_ptr POA_CORBA_ValueDef_tie<T>::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_ValueDef_ptr base_value,
     CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1157,11 +1149,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ValueBoxDef_ptr POA_CORBA::ValueDef_tie<T>::create_value_box  (
+CORBA_ValueBoxDef_ptr POA_CORBA_ValueDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1178,11 +1170,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::ExceptionDef_ptr POA_CORBA::ValueDef_tie<T>::create_exception  (
+CORBA_ExceptionDef_ptr POA_CORBA_ValueDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1199,7 +1191,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::NativeDef_ptr POA_CORBA::ValueDef_tie<T>::create_native  (
+CORBA_NativeDef_ptr POA_CORBA_ValueDef_tie<T>::create_native  (
     const char * id,
     const char * name,
     const char * version,
@@ -1218,11 +1210,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::AbstractInterfaceDef_ptr POA_CORBA::ValueDef_tie<T>::create_abstract_interface  (
+CORBA_AbstractInterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_abstract_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1239,11 +1231,11 @@ id,
 }
 
 template <class T> ACE_INLINE
-CORBA::LocalInterfaceDef_ptr POA_CORBA::ValueDef_tie<T>::create_local_interface  (
+CORBA_LocalInterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1260,7 +1252,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ValueDef_tie<T>::id  (
+char * POA_CORBA_ValueDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1273,7 +1265,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::id  (
+void POA_CORBA_ValueDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1288,7 +1280,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ValueDef_tie<T>::name  (
+char * POA_CORBA_ValueDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1301,7 +1293,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::name  (
+void POA_CORBA_ValueDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1316,7 +1308,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ValueDef_tie<T>::version  (
+char * POA_CORBA_ValueDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1329,7 +1321,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::version  (
+void POA_CORBA_ValueDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1344,7 +1336,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::ValueDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_ValueDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1357,7 +1349,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ValueDef_tie<T>::absolute_name  (
+char * POA_CORBA_ValueDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1370,7 +1362,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::ValueDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_ValueDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1383,7 +1375,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::ValueDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_ValueDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1396,8 +1388,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_ValueDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -1415,7 +1407,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ValueDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_ValueDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1428,7 +1420,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::ValueDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_ValueDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1441,7 +1433,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueDef_tie<T>::destroy  (
+void POA_CORBA_ValueDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1453,51 +1445,48 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
 template <class T> ACE_INLINE
-POA_CORBA::ValueBoxDef_tie<T>::ValueBoxDef_tie (T &t)
+POA_CORBA_ValueBoxDef_tie<T>::POA_CORBA_ValueBoxDef_tie (T &t)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ValueBoxDef_tie<T>::ValueBoxDef_tie (T &t, PortableServer::POA_ptr poa)
+POA_CORBA_ValueBoxDef_tie<T>::POA_CORBA_ValueBoxDef_tie (T &t, PortableServer::POA_ptr poa)
 	: ptr_ (&t),
 	  poa_ (PortableServer::POA::_duplicate (poa)),
 	  rel_ (0)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ValueBoxDef_tie<T>::ValueBoxDef_tie (T *tp, CORBA::Boolean release)
+POA_CORBA_ValueBoxDef_tie<T>::POA_CORBA_ValueBoxDef_tie (T *tp, CORBA::Boolean release)
 	: ptr_ (tp),
 	  poa_ (PortableServer::POA::_nil ()),
 	  rel_ (release)
 {}
 
 template <class T> ACE_INLINE
-POA_CORBA::ValueBoxDef_tie<T>::ValueBoxDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
+POA_CORBA_ValueBoxDef_tie<T>::POA_CORBA_ValueBoxDef_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::ValueBoxDef_tie<T>::~ValueBoxDef_tie (void)
+POA_CORBA_ValueBoxDef_tie<T>::~POA_CORBA_ValueBoxDef_tie (void)
 {
   if (this->rel_) delete this->ptr_;
 }
 
 template <class T> ACE_INLINE T *
-POA_CORBA::ValueBoxDef_tie<T>::_tied_object (void)
+POA_CORBA_ValueBoxDef_tie<T>::_tied_object (void)
 {
   return this->ptr_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ValueBoxDef_tie<T>::_tied_object (T &obj)
+POA_CORBA_ValueBoxDef_tie<T>::_tied_object (T &obj)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = &obj;
@@ -1505,7 +1494,7 @@ POA_CORBA::ValueBoxDef_tie<T>::_tied_object (T &obj)
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ValueBoxDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
+POA_CORBA_ValueBoxDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 {
   if (this->rel_) delete this->ptr_;
   this->ptr_ = obj;
@@ -1513,28 +1502,28 @@ POA_CORBA::ValueBoxDef_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
 }
 
 template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ValueBoxDef_tie<T>::_is_owner (void)
+POA_CORBA_ValueBoxDef_tie<T>::_is_owner (void)
 {
   return this->rel_;
 }
 
 template <class T> ACE_INLINE void
-POA_CORBA::ValueBoxDef_tie<T>::_is_owner (CORBA::Boolean b)
+POA_CORBA_ValueBoxDef_tie<T>::_is_owner (CORBA::Boolean b)
 {
   this->rel_ = b;
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ValueBoxDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ValueBoxDef_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->ValueBoxDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ValueBoxDef::_default_POA (ACE_TRY_ENV);
 }
 
 template <class T> ACE_INLINE
-CORBA::IDLType_ptr POA_CORBA::ValueBoxDef_tie<T>::original_type_def  (
+CORBA_IDLType_ptr POA_CORBA_ValueBoxDef_tie<T>::original_type_def  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1547,8 +1536,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueBoxDef_tie<T>::original_type_def  (
-    CORBA::IDLType_ptr original_type_def,
+void POA_CORBA_ValueBoxDef_tie<T>::original_type_def  (
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1562,7 +1551,7 @@ original_type_def,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ValueBoxDef_tie<T>::id  (
+char * POA_CORBA_ValueBoxDef_tie<T>::id  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1575,7 +1564,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueBoxDef_tie<T>::id  (
+void POA_CORBA_ValueBoxDef_tie<T>::id  (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1590,7 +1579,7 @@ id,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ValueBoxDef_tie<T>::name  (
+char * POA_CORBA_ValueBoxDef_tie<T>::name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1603,7 +1592,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueBoxDef_tie<T>::name  (
+void POA_CORBA_ValueBoxDef_tie<T>::name  (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1618,7 +1607,7 @@ name,
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ValueBoxDef_tie<T>::version  (
+char * POA_CORBA_ValueBoxDef_tie<T>::version  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1631,7 +1620,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueBoxDef_tie<T>::version  (
+void POA_CORBA_ValueBoxDef_tie<T>::version  (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1646,7 +1635,7 @@ version,
 }
 
 template <class T> ACE_INLINE
-CORBA::Container_ptr POA_CORBA::ValueBoxDef_tie<T>::defined_in  (
+CORBA_Container_ptr POA_CORBA_ValueBoxDef_tie<T>::defined_in  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1659,7 +1648,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-char * POA_CORBA::ValueBoxDef_tie<T>::absolute_name  (
+char * POA_CORBA_ValueBoxDef_tie<T>::absolute_name  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1672,7 +1661,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Repository_ptr POA_CORBA::ValueBoxDef_tie<T>::containing_repository  (
+CORBA_Repository_ptr POA_CORBA_ValueBoxDef_tie<T>::containing_repository  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1685,7 +1674,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::Contained::Description * POA_CORBA::ValueBoxDef_tie<T>::describe  (
+CORBA_Contained::Description * POA_CORBA_ValueBoxDef_tie<T>::describe  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1698,8 +1687,8 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueBoxDef_tie<T>::move  (
-    CORBA::Container_ptr new_container,
+void POA_CORBA_ValueBoxDef_tie<T>::move  (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -1717,7 +1706,7 @@ new_container,
 }
 
 template <class T> ACE_INLINE
-CORBA::TypeCode_ptr POA_CORBA::ValueBoxDef_tie<T>::type  (
+CORBA::TypeCode_ptr POA_CORBA_ValueBoxDef_tie<T>::type  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1730,7 +1719,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-CORBA::DefinitionKind POA_CORBA::ValueBoxDef_tie<T>::def_kind  (
+CORBA::DefinitionKind POA_CORBA_ValueBoxDef_tie<T>::def_kind  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1743,7 +1732,7 @@ ACE_TRY_ENV
 }
 
 template <class T> ACE_INLINE
-void POA_CORBA::ValueBoxDef_tie<T>::destroy  (
+void POA_CORBA_ValueBoxDef_tie<T>::destroy  (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -1755,4 +1744,3 @@ ACE_TRY_ENV
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
diff --git a/TAO/orbsvcs/IFR_Service/IRObject_i.h b/TAO/orbsvcs/IFR_Service/IRObject_i.h
index 163bf1de855..eca29249604 100644
--- a/TAO/orbsvcs/IFR_Service/IRObject_i.h
+++ b/TAO/orbsvcs/IFR_Service/IRObject_i.h
@@ -20,7 +20,7 @@
 #ifndef TAO_IROBJECT_I_H
 #define TAO_IROBJECT_I_H
 
-#include "IFR_BaseS.h"
+#include "IFR_ExtendedS.h"
 #include "ace/Configuration.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -36,7 +36,7 @@
 
 class TAO_Repository_i;
 
-class TAO_IRObject_i : public POA_CORBA::IRObject
+class TAO_IRObject_i : public POA_CORBA_IRObject
 {
   // = TITLE
   //    TAO_IRObject_i
diff --git a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp
index 0345a69e96c..3c3393cd0d0 100644
--- a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp
+++ b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp
@@ -663,11 +663,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_AttributeDef_i> safety (impl);
 
-      POA_CORBA::AttributeDef_tie<TAO_AttributeDef_i> *impl_tie = 0;
+      POA_CORBA_AttributeDef_tie<TAO_AttributeDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::AttributeDef_tie<TAO_AttributeDef_i> (impl,
-                                                                         poa,
-                                                                         1),
+                        POA_CORBA_AttributeDef_tie<TAO_AttributeDef_i> (impl,
+                                                                        poa,
+                                                                        1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -685,11 +685,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_ConstantDef_i> safety (impl);
 
-      POA_CORBA::ConstantDef_tie<TAO_ConstantDef_i> *impl_tie = 0;
+      POA_CORBA_ConstantDef_tie<TAO_ConstantDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::ConstantDef_tie<TAO_ConstantDef_i> (impl,
-                                                                       poa,
-                                                                       1),
+                        POA_CORBA_ConstantDef_tie<TAO_ConstantDef_i> (impl,
+                                                                      poa,
+                                                                      1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -707,11 +707,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_ExceptionDef_i> safety (impl);
 
-      POA_CORBA::ExceptionDef_tie<TAO_ExceptionDef_i> *impl_tie = 0;
+      POA_CORBA_ExceptionDef_tie<TAO_ExceptionDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::ExceptionDef_tie<TAO_ExceptionDef_i> (impl,
-                                                                         poa,
-                                                                         1),
+                        POA_CORBA_ExceptionDef_tie<TAO_ExceptionDef_i> (impl,
+                                                                        poa,
+                                                                        1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -729,11 +729,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_InterfaceDef_i> safety (impl);
 
-      POA_CORBA::InterfaceDef_tie<TAO_InterfaceDef_i> *impl_tie = 0;
+      POA_CORBA_InterfaceDef_tie<TAO_InterfaceDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::InterfaceDef_tie<TAO_InterfaceDef_i> (impl,
-                                                                         poa,
-                                                                         1),
+                        POA_CORBA_InterfaceDef_tie<TAO_InterfaceDef_i> (impl,
+                                                                        poa,
+                                                                        1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -751,12 +751,12 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_AbstractInterfaceDef_i> safety (impl);
 
-      POA_CORBA::AbstractInterfaceDef_tie<TAO_AbstractInterfaceDef_i> *impl_tie = 0;
+      POA_CORBA_AbstractInterfaceDef_tie<TAO_AbstractInterfaceDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (
           impl_tie,
-          POA_CORBA::AbstractInterfaceDef_tie<TAO_AbstractInterfaceDef_i> (impl,
-                                                                           poa,
-                                                                           1),
+          POA_CORBA_AbstractInterfaceDef_tie<TAO_AbstractInterfaceDef_i> (impl,
+                                                                          poa,
+                                                                          1),
           CORBA::NO_MEMORY ()
         );
       ACE_CHECK_RETURN (0);
@@ -775,12 +775,12 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_LocalInterfaceDef_i> safety (impl);
 
-      POA_CORBA::LocalInterfaceDef_tie<TAO_LocalInterfaceDef_i> *impl_tie = 0;
+      POA_CORBA_LocalInterfaceDef_tie<TAO_LocalInterfaceDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (
           impl_tie,
-          POA_CORBA::LocalInterfaceDef_tie<TAO_LocalInterfaceDef_i> (impl,
-                                                                     poa,
-                                                                     1),
+          POA_CORBA_LocalInterfaceDef_tie<TAO_LocalInterfaceDef_i> (impl,
+                                                                    poa,
+                                                                    1),
           CORBA::NO_MEMORY ()
         );
       ACE_CHECK_RETURN (0);
@@ -799,11 +799,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_ModuleDef_i> safety (impl);
 
-      POA_CORBA::ModuleDef_tie<TAO_ModuleDef_i> *impl_tie = 0;
+      POA_CORBA_ModuleDef_tie<TAO_ModuleDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::ModuleDef_tie<TAO_ModuleDef_i> (impl,
-                                                                   poa,
-                                                                   1),
+                        POA_CORBA_ModuleDef_tie<TAO_ModuleDef_i> (impl,
+                                                                  poa,
+                                                                  1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -821,11 +821,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_OperationDef_i> safety (impl);
 
-      POA_CORBA::OperationDef_tie<TAO_OperationDef_i> *impl_tie = 0;
+      POA_CORBA_OperationDef_tie<TAO_OperationDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::OperationDef_tie<TAO_OperationDef_i> (impl,
-                                                                         poa,
-                                                                         1),
+                        POA_CORBA_OperationDef_tie<TAO_OperationDef_i> (impl,
+                                                                        poa,
+                                                                        1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -843,11 +843,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_AliasDef_i> safety (impl);
 
-      POA_CORBA::AliasDef_tie<TAO_AliasDef_i> *impl_tie = 0;
+      POA_CORBA_AliasDef_tie<TAO_AliasDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::AliasDef_tie<TAO_AliasDef_i> (impl,
-                                                                 poa,
-                                                                 1),
+                        POA_CORBA_AliasDef_tie<TAO_AliasDef_i> (impl,
+                                                                poa,
+                                                                1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -865,11 +865,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_StructDef_i> safety (impl);
 
-      POA_CORBA::StructDef_tie<TAO_StructDef_i> *impl_tie = 0;
+      POA_CORBA_StructDef_tie<TAO_StructDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::StructDef_tie<TAO_StructDef_i> (impl,
-                                                                   poa,
-                                                                   1),
+                        POA_CORBA_StructDef_tie<TAO_StructDef_i> (impl,
+                                                                  poa,
+                                                                  1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -887,11 +887,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_UnionDef_i> safety (impl);
 
-      POA_CORBA::UnionDef_tie<TAO_UnionDef_i> *impl_tie = 0;
+      POA_CORBA_UnionDef_tie<TAO_UnionDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::UnionDef_tie<TAO_UnionDef_i> (impl,
-                                                                 poa,
-                                                                 1),
+                        POA_CORBA_UnionDef_tie<TAO_UnionDef_i> (impl,
+                                                                poa,
+                                                                1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -909,11 +909,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_EnumDef_i> safety (impl);
 
-      POA_CORBA::EnumDef_tie<TAO_EnumDef_i> *impl_tie = 0;
+      POA_CORBA_EnumDef_tie<TAO_EnumDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::EnumDef_tie<TAO_EnumDef_i> (impl,
-                                                               poa,
-                                                               1),
+                        POA_CORBA_EnumDef_tie<TAO_EnumDef_i> (impl,
+                                                              poa,
+                                                              1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -931,11 +931,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_PrimitiveDef_i> safety (impl);
 
-      POA_CORBA::PrimitiveDef_tie<TAO_PrimitiveDef_i> *impl_tie = 0;
+      POA_CORBA_PrimitiveDef_tie<TAO_PrimitiveDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::PrimitiveDef_tie<TAO_PrimitiveDef_i> (impl,
-                                                                         poa,
-                                                                         1),
+                        POA_CORBA_PrimitiveDef_tie<TAO_PrimitiveDef_i> (impl,
+                                                                        poa,
+                                                                        1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -953,11 +953,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_StringDef_i> safety (impl);
 
-      POA_CORBA::StringDef_tie<TAO_StringDef_i> *impl_tie = 0;
+      POA_CORBA_StringDef_tie<TAO_StringDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::StringDef_tie<TAO_StringDef_i> (impl,
-                                                                   poa,
-                                                                   1),
+                        POA_CORBA_StringDef_tie<TAO_StringDef_i> (impl,
+                                                                  poa,
+                                                                  1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -975,11 +975,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_SequenceDef_i> safety (impl);
 
-      POA_CORBA::SequenceDef_tie<TAO_SequenceDef_i> *impl_tie = 0;
+      POA_CORBA_SequenceDef_tie<TAO_SequenceDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::SequenceDef_tie<TAO_SequenceDef_i> (impl,
-                                                                       poa,
-                                                                       1),
+                        POA_CORBA_SequenceDef_tie<TAO_SequenceDef_i> (impl,
+                                                                      poa,
+                                                                      1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -997,11 +997,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_ArrayDef_i> safety (impl);
 
-      POA_CORBA::ArrayDef_tie<TAO_ArrayDef_i> *impl_tie = 0;
+      POA_CORBA_ArrayDef_tie<TAO_ArrayDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::ArrayDef_tie<TAO_ArrayDef_i> (impl,
-                                                                 poa,
-                                                                 1),
+                        POA_CORBA_ArrayDef_tie<TAO_ArrayDef_i> (impl,
+                                                                poa,
+                                                                1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -1019,11 +1019,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_WstringDef_i> safety (impl);
 
-      POA_CORBA::WstringDef_tie<TAO_WstringDef_i> *impl_tie = 0;
+      POA_CORBA_WstringDef_tie<TAO_WstringDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::WstringDef_tie<TAO_WstringDef_i> (impl,
-                                                                     poa,
-                                                                     1),
+                        POA_CORBA_WstringDef_tie<TAO_WstringDef_i> (impl,
+                                                                    poa,
+                                                                    1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -1041,11 +1041,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_FixedDef_i> safety (impl);
 
-      POA_CORBA::FixedDef_tie<TAO_FixedDef_i> *impl_tie = 0;
+      POA_CORBA_FixedDef_tie<TAO_FixedDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::FixedDef_tie<TAO_FixedDef_i> (impl,
-                                                                 poa,
-                                                                 1),
+                        POA_CORBA_FixedDef_tie<TAO_FixedDef_i> (impl,
+                                                                poa,
+                                                                1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -1063,11 +1063,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_ValueDef_i> safety (impl);
 
-      POA_CORBA::ValueDef_tie<TAO_ValueDef_i> *impl_tie = 0;
+      POA_CORBA_ValueDef_tie<TAO_ValueDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::ValueDef_tie<TAO_ValueDef_i> (impl,
-                                                                 poa,
-                                                                 1),
+                        POA_CORBA_ValueDef_tie<TAO_ValueDef_i> (impl,
+                                                                poa,
+                                                                1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -1085,11 +1085,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_ValueBoxDef_i> safety (impl);
 
-      POA_CORBA::ValueBoxDef_tie<TAO_ValueBoxDef_i> *impl_tie = 0;
+      POA_CORBA_ValueBoxDef_tie<TAO_ValueBoxDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::ValueBoxDef_tie<TAO_ValueBoxDef_i> (impl,
-                                                                       poa,
-                                                                       1),
+                        POA_CORBA_ValueBoxDef_tie<TAO_ValueBoxDef_i> (impl,
+                                                                      poa,
+                                                                      1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -1107,12 +1107,12 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_ValueMemberDef_i> safety (impl);
 
-      POA_CORBA::ValueMemberDef_tie<TAO_ValueMemberDef_i> *impl_tie = 0;
+      POA_CORBA_ValueMemberDef_tie<TAO_ValueMemberDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (
           impl_tie,
-          POA_CORBA::ValueMemberDef_tie<TAO_ValueMemberDef_i> (impl,
-                                                               poa,
-                                                               1),
+          POA_CORBA_ValueMemberDef_tie<TAO_ValueMemberDef_i> (impl,
+                                                              poa,
+                                                              1),
           CORBA::NO_MEMORY ()
         );
       ACE_CHECK_RETURN (0);
@@ -1131,11 +1131,11 @@ IFR_Servant_Factory::create_tie (
 
       auto_ptr<TAO_NativeDef_i> safety (impl);
 
-      POA_CORBA::NativeDef_tie<TAO_NativeDef_i> *impl_tie = 0;
+      POA_CORBA_NativeDef_tie<TAO_NativeDef_i> *impl_tie = 0;
       ACE_NEW_THROW_EX (impl_tie,
-                        POA_CORBA::NativeDef_tie<TAO_NativeDef_i> (impl,
-                                                                   poa,
-                                                                   1),
+                        POA_CORBA_NativeDef_tie<TAO_NativeDef_i> (impl,
+                                                                  poa,
+                                                                  1),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.cpp.diff
new file mode 100644
index 00000000000..e24e2b503a8
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.cpp.diff
@@ -0,0 +1,108 @@
+--- orig/IFR_BaseS.cpp	Mon Apr 23 20:55:58 2001
++++ IFR_BaseS.cpp	Mon Apr 23 20:21:20 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:
+@@ -36,6 +36,7 @@
+ #endif  /* TAO_HAS_INTERCEPTORS == 1 */
+ 
+ #include "ace/Dynamic_Service.h"
++
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus
+ #endif /* __BORLANDC__ */
+@@ -51,7 +52,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:55:58 */
++/* starting time is 12:14:19 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IRObject_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -147,7 +148,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:55:58 */
++/* ending time is 12:14:19 */
+ static TAO_CORBA_IRObject_Perfect_Hash_OpTable tao_CORBA_IRObject_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -884,7 +885,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:55:58 */
++/* starting time is 12:14:19 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Contained_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -1011,7 +1012,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:55:58 */
++/* ending time is 12:14:19 */
+ static TAO_CORBA_Contained_Perfect_Hash_OpTable tao_CORBA_Contained_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -3909,7 +3910,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:55:58 */
++/* starting time is 12:14:19 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Container_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -4042,7 +4043,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:55:58 */
++/* ending time is 12:14:19 */
+ static TAO_CORBA_Container_Perfect_Hash_OpTable tao_CORBA_Container_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -9474,7 +9475,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:55:58 */
++/* starting time is 12:14:19 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IDLType_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -9571,7 +9572,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:55:58 */
++/* ending time is 12:14:19 */
+ static TAO_CORBA_IDLType_Perfect_Hash_OpTable tao_CORBA_IDLType_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -10102,7 +10103,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:55:58 */
++/* starting time is 12:14:19 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_TypedefDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -10230,7 +10231,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:55:58 */
++/* ending time is 12:14:19 */
+ static TAO_CORBA_TypedefDef_Perfect_Hash_OpTable tao_CORBA_TypedefDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff
new file mode 100644
index 00000000000..4e4e23693f7
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff
@@ -0,0 +1,31 @@
+--- orig/IFR_BaseS.h	Mon Apr 23 20:55:58 2001
++++ IFR_BaseS.h	Mon Apr 23 20:21:34 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,7 +23,7 @@
+ #define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_H_
+ 
+ #include "ace/pre.h"
+-#include "IFR_BaseC.h"
++#include "tao/IFR_Client/IFR_BaseC.h"
+ 
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+@@ -45,11 +45,6 @@
+ #if defined (__BORLANDC__)
+ #pragma option push -w-rvl -w-rch -w-ccc -w-inl
+ #endif /* __BORLANDC__ */
+-
+-TAO_NAMESPACE  POA_CORBA
+-{
+-}
+-TAO_NAMESPACE_CLOSE
+ 
+ class POA_CORBA_IRObject;
+ typedef POA_CORBA_IRObject *POA_CORBA_IRObject_ptr;
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.i.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.i.diff
new file mode 100644
index 00000000000..ad727c94862
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.i.diff
@@ -0,0 +1,10 @@
+--- orig/IFR_BaseS.i	Mon Apr 23 20:55:58 2001
++++ IFR_BaseS.i	Mon Apr 23 18:37:21 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.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.cpp.diff
new file mode 100644
index 00000000000..858919e756d
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.cpp.diff
@@ -0,0 +1,10 @@
+--- orig/IFR_BaseS_T.cpp	Mon Apr 23 20:55:58 2001
++++ IFR_BaseS_T.cpp	Mon Apr 23 18:43:36 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.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.h.diff
new file mode 100644
index 00000000000..6703d617b17
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.h.diff
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 00000000000..969d4b9ec5d
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS_T.i.diff
@@ -0,0 +1,10 @@
+--- 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.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.cpp.diff
new file mode 100644
index 00000000000..2a28fa177f5
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.cpp.diff
@@ -0,0 +1,482 @@
+--- orig/IFR_BasicS.cpp	Mon Apr 23 20:56:03 2001
++++ IFR_BasicS.cpp	Mon Apr 23 21:28:43 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:
+@@ -51,7 +51,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:02 */
++/* starting time is 13:56:20 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Repository_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -194,7 +194,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:02 */
++/* ending time is 13:56:20 */
+ static TAO_CORBA_Repository_Perfect_Hash_OpTable tao_CORBA_Repository_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -2591,7 +2591,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:02 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ModuleDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -2737,7 +2737,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:02 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_ModuleDef_Perfect_Hash_OpTable tao_CORBA_ModuleDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -3042,7 +3042,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:02 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstantDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -3174,7 +3174,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:02 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_ConstantDef_Perfect_Hash_OpTable tao_CORBA_ConstantDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -4644,7 +4644,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:02 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StructDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -4793,7 +4793,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:02 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_StructDef_Perfect_Hash_OpTable tao_CORBA_StructDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -5574,7 +5574,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:02 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_UnionDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -5726,7 +5726,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:02 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_UnionDef_Perfect_Hash_OpTable tao_CORBA_UnionDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -7209,7 +7209,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:02 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_EnumDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -7339,7 +7339,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:02 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_EnumDef_Perfect_Hash_OpTable tao_CORBA_EnumDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -8116,7 +8116,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:02 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AliasDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -8246,7 +8246,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:02 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_AliasDef_Perfect_Hash_OpTable tao_CORBA_AliasDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -9023,7 +9023,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:02 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_NativeDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -9151,7 +9151,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:02 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_NativeDef_Perfect_Hash_OpTable tao_CORBA_NativeDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -9460,7 +9460,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:02 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -9558,7 +9558,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:02 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable tao_CORBA_PrimitiveDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -10092,7 +10092,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:02 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StringDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -10210,7 +10210,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:02 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_StringDef_Perfect_Hash_OpTable tao_CORBA_StringDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -10977,7 +10977,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:03 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_WstringDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -11095,7 +11095,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:03 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_WstringDef_Perfect_Hash_OpTable tao_CORBA_WstringDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -11862,7 +11862,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:03 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_SequenceDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -11871,46 +11871,46 @@
+   static const unsigned char asso_values[] =
+     {
+ #if defined (ACE_MVS)
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23,  0,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23,  0,
+-     23, 23,  0,  5,  0, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23,  5, 23, 23, 23, 23,  0, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22,  0,
++     22, 22,  5,  0,  0, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22,  0, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22,
+ #else
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23,  0, 23,  0, 23, 23,
+-      0,  5,  0, 23, 23, 23, 23, 23, 23, 23,
+-     23, 23, 23, 23, 23, 23,  5, 23, 23, 23,
+-     23,  0, 23, 23, 23, 23, 23, 23,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22,  0, 22,  0, 22, 22,
++      5,  0,  0, 22, 22, 22, 22, 22, 22, 22,
++     22, 22, 22, 22, 22, 22,  0, 22, 22, 22,
++     22, 22, 22, 22, 22, 22, 22, 22,
+ #endif /* ACE_MVS */
+     };
+   return len + asso_values[str[len - 1]] + asso_values[str[0]];
+@@ -11921,12 +11921,12 @@
+ {
+   enum
+     {
+-      TOTAL_KEYWORDS = 11,
++      TOTAL_KEYWORDS = 8,
+       MIN_WORD_LENGTH = 5,
+       MAX_WORD_LENGTH = 21,
+       MIN_HASH_VALUE = 5,
+-      MAX_HASH_VALUE = 22,
+-      HASH_VALUE_RANGE = 18,
++      MAX_HASH_VALUE = 21,
++      HASH_VALUE_RANGE = 17,
+       DUPLICATES = 3
+     };
+ 
+@@ -11934,22 +11934,19 @@
+     {
+       {"",0},{"",0},{"",0},{"",0},{"",0},
+       {"_is_a",  &POA_CORBA_SequenceDef::_is_a_skel},
+-      {"destroy", 	&POA_CORBA_SequenceDef::destroy_skel},
+-      {"_get_bound", 	&POA_CORBA_SequenceDef::_get_bound_skel},
+-      {"_set_bound", 	&POA_CORBA_SequenceDef::_set_bound_skel},
+-      {"_get_def_kind", 	&POA_CORBA_SequenceDef::_get_def_kind_skel},
+-      {"_get_type", 	&POA_CORBA_SequenceDef::_get_type_skel},
+       {"_interface",  &POA_CORBA_SequenceDef::_interface_skel},
+       {"_non_existent",  &POA_CORBA_SequenceDef::_non_existent_skel},
++      {"_get_bound", 	&POA_CORBA_SequenceDef::_get_bound_skel},
++      {"_set_bound", 	&POA_CORBA_SequenceDef::_set_bound_skel},
++      {"_get_element_type", 	&POA_CORBA_SequenceDef::_get_element_type_skel},
+       {"_get_element_type_def", 	&POA_CORBA_SequenceDef::_get_element_type_def_skel},
+       {"_set_element_type_def", 	&POA_CORBA_SequenceDef::_set_element_type_def_skel},
+-      {"_get_element_type", 	&POA_CORBA_SequenceDef::_get_element_type_skel},
+     };
+ 
+   static const signed char lookup[] =
+     {
+-       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -24,  -1,  -1,   9, 
+-       10,  11,  -1,  -1,  12, -13,  -2, -24,  15, 
++       -1,  -1,  -1,  -1,  -1,   5,  -1,  -1,  -1,  -1,   6,  -8,  -2,   7, 
++       -1, -25,  -1,  10,  -1, -11,  -2, -23, 
+     };
+ 
+   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+@@ -11983,7 +11980,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:03 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_SequenceDef_Perfect_Hash_OpTable tao_CORBA_SequenceDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -13452,7 +13449,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:03 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ArrayDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -13573,7 +13570,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:03 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_ArrayDef_Perfect_Hash_OpTable tao_CORBA_ArrayDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -15042,7 +15039,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:03 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -15191,7 +15188,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:03 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable tao_CORBA_ExceptionDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -16198,7 +16195,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:03 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AttributeDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -16330,7 +16327,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:03 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_AttributeDef_Perfect_Hash_OpTable tao_CORBA_AttributeDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -17800,7 +17797,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:03 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_OperationDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -17989,7 +17986,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:03 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_OperationDef_Perfect_Hash_OpTable tao_CORBA_OperationDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -20863,7 +20860,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:03 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -21017,7 +21014,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:03 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable tao_CORBA_InterfaceDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -22967,7 +22964,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:03 */
++/* starting time is 13:56:21 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -23121,7 +23118,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:03 */
++/* ending time is 13:56:21 */
+ static TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable tao_CORBA_AbstractInterfaceDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -23434,7 +23431,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:03 */
++/* starting time is 13:56:22 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -23588,7 +23585,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:03 */
++/* ending time is 13:56:22 */
+ static TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable tao_CORBA_LocalInterfaceDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff
new file mode 100644
index 00000000000..62849f10ba5
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff
@@ -0,0 +1,31 @@
+--- orig/IFR_BasicS.h	Mon Apr 23 20:56:03 2001
++++ IFR_BasicS.h	Mon Apr 23 21:22: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:
+@@ -24,7 +24,7 @@
+ 
+ #include "ace/pre.h"
+ #include "IFR_BaseS.h"
+-#include "IFR_BasicC.h"
++#include "tao/IFR_Client/IFR_BasicC.h"
+ 
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+@@ -47,11 +47,6 @@
+ #pragma option push -w-rvl -w-rch -w-ccc -w-inl
+ #endif /* __BORLANDC__ */
+ 
+-TAO_NAMESPACE  POA_CORBA
+-{
+-}
+-TAO_NAMESPACE_CLOSE
+-
+ class POA_CORBA_Repository;
+ typedef POA_CORBA_Repository *POA_CORBA_Repository_ptr;
+ // Forward Classes Declaration
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.i.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.i.diff
new file mode 100644
index 00000000000..685cea3cc01
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.i.diff
@@ -0,0 +1,10 @@
+--- orig/IFR_BasicS.i	Mon Apr 23 20:56:03 2001
++++ IFR_BasicS.i	Mon Apr 23 21:17:29 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.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.cpp.diff
new file mode 100644
index 00000000000..9564148f478
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.cpp.diff
@@ -0,0 +1,10 @@
+--- orig/IFR_BasicS_T.cpp	Mon Apr 23 20:56:03 2001
++++ IFR_BasicS_T.cpp	Mon Apr 23 19:02: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:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.h.diff
new file mode 100644
index 00000000000..1b2a750acb8
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.h.diff
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 00000000000..3cd3a23dd43
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS_T.i.diff
@@ -0,0 +1,10 @@
+--- 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.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.cpp.diff
new file mode 100644
index 00000000000..58c7527751d
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.cpp.diff
@@ -0,0 +1,226 @@
+--- orig/IFR_ComponentsS.cpp	Mon Apr 23 20:56:09 2001
++++ IFR_ComponentsS.cpp	Mon Apr 23 19:19:15 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:
+@@ -51,7 +51,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:09 */
++/* starting time is 13:56:28 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentRepository_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -196,7 +196,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:09 */
++/* ending time is 13:56:28 */
+ static TAO_IR_ComponentRepository_Perfect_Hash_OpTable tao_IR_ComponentRepository_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -1153,7 +1153,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:09 */
++/* starting time is 13:56:28 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ProvidesDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -1281,7 +1281,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:09 */
++/* ending time is 13:56:28 */
+ static TAO_IR_ProvidesDef_Perfect_Hash_OpTable tao_IR_ProvidesDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -1816,7 +1816,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:09 */
++/* starting time is 13:56:28 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_UsesDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -1945,7 +1945,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:09 */
++/* ending time is 13:56:28 */
+ static TAO_IR_UsesDef_Perfect_Hash_OpTable tao_IR_UsesDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -2713,7 +2713,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:09 */
++/* starting time is 13:56:28 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EventDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -2842,7 +2842,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:09 */
++/* ending time is 13:56:28 */
+ static TAO_IR_EventDef_Perfect_Hash_OpTable tao_IR_EventDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -3632,7 +3632,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:09 */
++/* starting time is 13:56:28 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EmitsDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -3761,7 +3761,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:09 */
++/* ending time is 13:56:28 */
+ static TAO_IR_EmitsDef_Perfect_Hash_OpTable tao_IR_EmitsDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -4066,7 +4066,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:09 */
++/* starting time is 13:56:28 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PublishesDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -4195,7 +4195,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:09 */
++/* ending time is 13:56:28 */
+ static TAO_IR_PublishesDef_Perfect_Hash_OpTable tao_IR_PublishesDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -4500,7 +4500,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:09 */
++/* starting time is 13:56:28 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ConsumesDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -4629,7 +4629,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:09 */
++/* ending time is 13:56:28 */
+ static TAO_IR_ConsumesDef_Perfect_Hash_OpTable tao_IR_ConsumesDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -4934,7 +4934,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:09 */
++/* starting time is 13:56:28 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -5104,7 +5104,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:09 */
++/* ending time is 13:56:28 */
+ static TAO_IR_ComponentDef_Perfect_Hash_OpTable tao_IR_ComponentDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -9047,7 +9047,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:09 */
++/* starting time is 13:56:28 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -9176,7 +9176,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:09 */
++/* ending time is 13:56:28 */
+ static TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable tao_IR_PrimaryKeyDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -9966,7 +9966,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:09 */
++/* starting time is 13:56:28 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FactoryDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -10155,7 +10155,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:09 */
++/* ending time is 13:56:28 */
+ static TAO_IR_FactoryDef_Perfect_Hash_OpTable tao_IR_FactoryDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -10460,7 +10460,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:09 */
++/* starting time is 13:56:28 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FinderDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -10649,7 +10649,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:09 */
++/* ending time is 13:56:28 */
+ static TAO_IR_FinderDef_Perfect_Hash_OpTable tao_IR_FinderDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -10954,7 +10954,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:09 */
++/* starting time is 13:56:28 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_HomeDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -11118,7 +11118,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:09 */
++/* ending time is 13:56:28 */
+ static TAO_IR_HomeDef_Perfect_Hash_OpTable tao_IR_HomeDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff
new file mode 100644
index 00000000000..d45e1dd9732
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff
@@ -0,0 +1,19 @@
+--- orig/IFR_ComponentsS.h	Mon Apr 23 20:56:09 2001
++++ IFR_ComponentsS.h	Mon Apr 23 20:33:16 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:
+@@ -24,7 +24,7 @@
+ 
+ #include "ace/pre.h"
+ #include "IFR_ExtendedS.h"
+-#include "IFR_ComponentsC.h"
++#include "tao/IFR_Client/IFR_ComponentsC.h"
+ 
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.i.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.i.diff
new file mode 100644
index 00000000000..2c1ad8b4555
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.i.diff
@@ -0,0 +1,10 @@
+--- orig/IFR_ComponentsS.i	Mon Apr 23 20:56:09 2001
++++ IFR_ComponentsS.i	Mon Apr 23 19:19: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:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.cpp.diff
new file mode 100644
index 00000000000..05c248f983a
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.cpp.diff
@@ -0,0 +1,10 @@
+--- orig/IFR_ComponentsS_T.cpp	Mon Apr 23 20:56:09 2001
++++ IFR_ComponentsS_T.cpp	Mon Apr 23 19:18:59 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.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.h.diff
new file mode 100644
index 00000000000..56539425ff1
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.h.diff
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 00000000000..bef6c543871
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS_T.i.diff
@@ -0,0 +1,10 @@
+--- 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.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.cpp.diff
new file mode 100644
index 00000000000..e6125df97ba
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.cpp.diff
@@ -0,0 +1,82 @@
+--- orig/IFR_ExtendedS.cpp	Mon Apr 23 20:56:05 2001
++++ IFR_ExtendedS.cpp	Mon Apr 23 20:30:23 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:
+@@ -51,7 +51,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:05 */
++/* starting time is 13:56:24 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_FixedDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -171,7 +171,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:05 */
++/* ending time is 13:56:24 */
+ static TAO_CORBA_FixedDef_Perfect_Hash_OpTable tao_CORBA_FixedDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -1404,7 +1404,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:05 */
++/* starting time is 13:56:24 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -1536,7 +1536,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:05 */
++/* ending time is 13:56:24 */
+ static TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable tao_CORBA_ValueMemberDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -3005,7 +3005,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:05 */
++/* starting time is 13:56:24 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -3173,7 +3173,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:05 */
++/* ending time is 13:56:24 */
+ static TAO_CORBA_ValueDef_Perfect_Hash_OpTable tao_CORBA_ValueDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -8242,7 +8242,7 @@
+ public:
+  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
+ };
+-/* starting time is 15:56:05 */
++/* starting time is 13:56:24 */
+ /* C++ code produced by gperf version 2.8 (ACE version) */
+ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable -N lookup  */
+ unsigned int
+@@ -8372,7 +8372,7 @@
+     }
+   return 0;
+ }
+-/* ending time is 15:56:05 */
++/* ending time is 13:56:24 */
+ static TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable tao_CORBA_ValueBoxDef_optable;
+ 
+ #if (TAO_HAS_INTERCEPTORS == 1)
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff
new file mode 100644
index 00000000000..a684093028f
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff
@@ -0,0 +1,31 @@
+--- orig/IFR_ExtendedS.h	Mon Apr 23 20:56:05 2001
++++ IFR_ExtendedS.h	Mon Apr 23 20:30:16 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:
+@@ -24,7 +24,7 @@
+ 
+ #include "ace/pre.h"
+ #include "IFR_BasicS.h"
+-#include "IFR_ExtendedC.h"
++#include "tao/IFR_Client/IFR_ExtendedC.h"
+ 
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+@@ -46,11 +46,6 @@
+ #if defined (__BORLANDC__)
+ #pragma option push -w-rvl -w-rch -w-ccc -w-inl
+ #endif /* __BORLANDC__ */
+-
+-TAO_NAMESPACE  POA_CORBA
+-{
+-}
+-TAO_NAMESPACE_CLOSE
+ 
+ class POA_CORBA_FixedDef;
+ typedef POA_CORBA_FixedDef *POA_CORBA_FixedDef_ptr;
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.i.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.i.diff
new file mode 100644
index 00000000000..4e6f29c48a4
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.i.diff
@@ -0,0 +1,10 @@
+--- orig/IFR_ExtendedS.i	Mon Apr 23 20:56:05 2001
++++ IFR_ExtendedS.i	Mon Apr 23 19:10:58 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.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.cpp.diff
new file mode 100644
index 00000000000..ced988e3315
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.cpp.diff
@@ -0,0 +1,10 @@
+--- orig/IFR_ExtendedS_T.cpp	Mon Apr 23 20:56:05 2001
++++ IFR_ExtendedS_T.cpp	Mon Apr 23 19:10:42 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.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.h.diff
new file mode 100644
index 00000000000..b80c79588e2
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.h.diff
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 00000000000..c82f18ee61d
--- /dev/null
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS_T.i.diff
@@ -0,0 +1,10 @@
+--- 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/orbsvcs/IFR_Service/diffs/InterfaceS.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.cpp.diff
deleted file mode 100644
index c7dc8c84170..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.cpp.diff
+++ /dev/null
@@ -1,10966 +0,0 @@
---- orig/InterfaceS.cpp	Fri Mar 09 00:47:29 2001
-+++ ../../orbsvcs/IFR_Service/InterfaceS.cpp	Thu Mar 01 15:34: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,13 +19,15 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#ifndef _TAO_IDL_ORIG_INTERFACES_CPP_
--#define _TAO_IDL_ORIG_INTERFACES_CPP_
-+#ifndef TAO_IDL_INTERFACES_CPP
-+#define TAO_IDL_INTERFACES_CPP
- 
- #include "InterfaceS.h"
- #include "tao/PortableServer/Object_Adapter.h"
- #include "tao/PortableServer/Operation_Table.h"
- 
-+ACE_RCSID(IFR_Service, InterfaceS, "$Id$")
-+
- #if TAO_HAS_INTERCEPTORS == 1
- #include "tao/RequestInfo_Util.h"
- #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-@@ -45,7 +47,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:27 */
-+/* starting time is 22:05:52 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IRObject_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -116,12 +118,12 @@
-   static const class TAO_operation_db_entry  wordlist[] =
-     {
-       {"",0},{"",0},{"",0},{"",0},{"",0},
--      {"_is_a",  &POA_CORBA::IRObject::_is_a_skel},
-+      {"_is_a",  &POA_CORBA_IRObject::_is_a_skel},
-       {"",0},
--      {"destroy", 	&POA_CORBA::IRObject::destroy_skel},
-+      {"destroy",       &POA_CORBA_IRObject::destroy_skel},
-       {"",0},{"",0},{"",0},{"",0},{"",0},
--      {"_get_def_kind", 	&POA_CORBA::IRObject::_get_def_kind_skel},
--      {"_non_existent",  &POA_CORBA::IRObject::_non_existent_skel},
-+      {"_get_def_kind",         &POA_CORBA_IRObject::_get_def_kind_skel},
-+      {"_non_existent",  &POA_CORBA_IRObject::_non_existent_skel},
-     };
- 
-   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-@@ -138,37 +140,37 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:27 */
-+/* ending time is 22:05:52 */
- static TAO_CORBA_IRObject_Perfect_Hash_OpTable tao_CORBA_IRObject_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
- 
- // Factory function Implementation.
--POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker *POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::the_TAO_IRObject_Strategized_Proxy_Broker (void)
-+_TAO_IRObject_Strategized_Proxy_Broker *
-+_TAO_IRObject_Strategized_Proxy_Broker::the_TAO_IRObject_Strategized_Proxy_Broker (void)
- {
--  static POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker strategized_proxy_broker;
-+  static _TAO_IRObject_Strategized_Proxy_Broker strategized_proxy_broker;
-   return &strategized_proxy_broker;
- }
- 
--POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::_TAO_IRObject_Strategized_Proxy_Broker (void)
-+_TAO_IRObject_Strategized_Proxy_Broker::_TAO_IRObject_Strategized_Proxy_Broker (void)
- {
-   for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-     this->proxy_cache_[i] = 0;
-   
- }
- 
--POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::~_TAO_IRObject_Strategized_Proxy_Broker (void)
-+_TAO_IRObject_Strategized_Proxy_Broker::~_TAO_IRObject_Strategized_Proxy_Broker (void)
- {
-   for (int i = 0; i < TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM; ++i)
-     delete this->proxy_cache_[i];
-   
- }
- 
--CORBA::_TAO_IRObject_Proxy_Impl&
--POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::select_proxy (
-+_TAO_IRObject_Proxy_Impl&
-+_TAO_IRObject_Strategized_Proxy_Broker::select_proxy (
-     ::CORBA::IRObject *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -187,7 +189,7 @@
- }
- 
- void 
--POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::create_proxy (
-+_TAO_IRObject_Strategized_Proxy_Broker::create_proxy (
-     TAO_ORB_Core::TAO_Collocation_Strategies strategy,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -201,7 +203,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl,
-+              _TAO_IRObject_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -211,7 +213,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::CORBA::_TAO_IRObject_Remote_Proxy_Impl,
-+              ::_TAO_IRObject_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -228,38 +230,44 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--CORBA::_TAO_IRObject_Proxy_Broker *
--CORBA__TAO_IRObject_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_IRObject_Proxy_Broker *
-+_TAO_IRObject_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
--  return ::POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::the_TAO_IRObject_Strategized_Proxy_Broker();
-+  return _TAO_IRObject_Strategized_Proxy_Broker::the_TAO_IRObject_Strategized_Proxy_Broker();
- }
- 
- int
--CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_IRObject_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer = 
--    CORBA__TAO_IRObject_Proxy_Broker_Factory_function;
-+  _TAO_IRObject_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_IRObject_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int CORBA__TAO_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer));
-+static int _TAO_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_IRObject_Proxy_Broker_Factory_Initializer (
-+      ACE_reinterpret_cast (
-+          long, 
-+          _TAO_IRObject_Proxy_Broker_Factory_Initializer
-+        )
-+    );
- 
- 
- ///////////////////////////////////////////////////////////////////////
- //                 ThruPOA Proxy  Implementation
- //
- 
--POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::_TAO_IRObject_ThruPOA_Proxy_Impl (void)
-+_TAO_IRObject_ThruPOA_Proxy_Impl::_TAO_IRObject_ThruPOA_Proxy_Impl (void)
- {}
- 
- // ThruPOA Implementation of the IDL interface methods
- 
--IR::DefinitionKind POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::def_kind (
-+IR_DefinitionKind 
-+_TAO_IRObject_ThruPOA_Proxy_Impl::def_kind (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -267,7 +275,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::DefinitionKind _tao_retval;
-+    IR_DefinitionKind _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -281,7 +289,7 @@
-     );
-       ACE_CHECK_RETURN  (_tao_retval);
-     return ACE_reinterpret_cast (
--      POA_CORBA::IRObject_ptr,
-+      POA_CORBA_IRObject_ptr,
-       servant_upcall.servant ()->_downcast (
-           "IDL:omg.org/CORBA/IRObject:1.0"
-         )
-@@ -290,7 +298,8 @@
-       );
- }
- 
--void POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-+void 
-+_TAO_IRObject_ThruPOA_Proxy_Impl::destroy (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -310,7 +319,7 @@
-     );
-       ACE_CHECK;
-     ACE_reinterpret_cast (
--      POA_CORBA::IRObject_ptr,
-+      POA_CORBA_IRObject_ptr,
-       servant_upcall.servant ()->_downcast (
-           "IDL:omg.org/CORBA/IRObject:1.0"
-         )
-@@ -325,31 +334,31 @@
- ///////////////////////////////////////////////////////////////////////
- 
- // skeleton constructor
--POA_CORBA::IRObject::IRObject (void)
-+POA_CORBA_IRObject::POA_CORBA_IRObject (void)
- {
-   this->optable_ = &tao_CORBA_IRObject_optable;
- }
- 
- // copy ctor
--POA_CORBA::IRObject::IRObject (const IRObject& rhs)
-+POA_CORBA_IRObject::POA_CORBA_IRObject (const POA_CORBA_IRObject& rhs)
-   :   TAO_ServantBase (rhs)
- {}
- 
- // skeleton destructor
--POA_CORBA::IRObject::~IRObject (void)
-+POA_CORBA_IRObject::~POA_CORBA_IRObject (void)
- {
- }
- 
--void POA_CORBA::IRObject::_get_def_kind_skel (
-+void POA_CORBA_IRObject::_get_def_kind_skel (
-     TAO_ServerRequest &_tao_server_request,
-     void *_tao_object_reference, 
-     void * /* context */, 
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
--  POA_CORBA::IRObject *_tao_impl = (POA_CORBA::IRObject *)_tao_object_reference;
-+  POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *)_tao_object_reference;
-   
--    IR::DefinitionKind _tao_retval;
-+  IR_DefinitionKind _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -357,7 +366,7 @@
-       _tao_server_request.interceptor_count ()
-     );
-   
--  POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get ri (
-+  POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get ri (
-       _tao_server_request,
-       _tao_impl,
-       ACE_TRY_ENV
-@@ -376,7 +385,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::DefinitionKind _tao_retval_info = _tao_retval;
-+      IR_DefinitionKind _tao_retval_info = _tao_retval;
-       ri.result (_tao_retval_info);
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-@@ -419,14 +428,14 @@
-   ACE_UNUSED_ARG (ACE_TRY_ENV);
- }
- 
--void POA_CORBA::IRObject::destroy_skel (
-+void POA_CORBA_IRObject::destroy_skel (
-     TAO_ServerRequest &_tao_server_request,
-     void *_tao_object_reference, 
-     void * /* context */, 
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
--  POA_CORBA::IRObject *_tao_impl = (POA_CORBA::IRObject *)_tao_object_reference;
-+  POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *)_tao_object_reference;
-   
-   _tao_server_request.argument_flag (0);
-   
-@@ -436,7 +445,7 @@
-       _tao_server_request.interceptor_count ()
-     );
-   
--  POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy ri (
-+  POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy ri (
-       _tao_server_request,
-       _tao_impl,
-       ACE_TRY_ENV
-@@ -489,7 +498,7 @@
-   ACE_UNUSED_ARG (ACE_TRY_ENV);
- }
- 
--void POA_CORBA::IRObject::_is_a_skel (
-+void POA_CORBA_IRObject::_is_a_skel (
-     TAO_ServerRequest &_tao_server_request, 
-     void * _tao_object_reference,
-     void * /* context */,
-@@ -497,10 +506,10 @@
-   )
- {
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
--  POA_CORBA::IRObject *_tao_impl = (POA_CORBA::IRObject *) _tao_object_reference;
-+  POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -508,28 +517,28 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
--void POA_CORBA::IRObject::_non_existent_skel (
-+void POA_CORBA_IRObject::_non_existent_skel (
-     TAO_ServerRequest &_tao_server_request, 
-     void * _tao_object_reference,
-     void * /* context */,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
--  POA_CORBA::IRObject *_tao_impl = (POA_CORBA::IRObject *) _tao_object_reference;
-+  POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
-   ACE_CHECK;
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
--CORBA::Boolean POA_CORBA::IRObject::_is_a (
-+CORBA::Boolean POA_CORBA_IRObject::_is_a (
-     const char* value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -542,29 +551,29 @@
-       return 0;
- }
- 
--void* POA_CORBA::IRObject::_downcast (
-+void* POA_CORBA_IRObject::_downcast (
-     const char* logical_type_id
-   )
- {
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
- }
- 
--void POA_CORBA::IRObject::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-+void POA_CORBA_IRObject::_dispatch (TAO_ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
- {
-   this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV);
- }
- 
--const char* POA_CORBA::IRObject::_interface_repository_id (void) const
-+const char* POA_CORBA_IRObject::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/CORBA/IRObject:1.0";
- }
- 
- CORBA::IRObject*
--POA_CORBA::IRObject::_this (CORBA_Environment &ACE_TRY_ENV)
-+POA_CORBA_IRObject::_this (CORBA_Environment &ACE_TRY_ENV)
- {
-   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
-@@ -580,11 +589,10 @@
-   return ::CORBA::IRObject::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
-+POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
-     TAO_ServerRequest &_tao_server_request,
--    POA_CORBA::IRObject *tao_impl,
-+    POA_CORBA_IRObject *tao_impl,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -592,7 +600,7 @@
- {}
- 
- Dynamic::ParameterList *
--POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -604,7 +612,7 @@
- }
- 
- Dynamic::ExceptionList *
--POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -616,7 +624,7 @@
- }
- 
- CORBA::Any * 
--POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
-+POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -633,7 +641,7 @@
- }
- 
- char *
--POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface (
-+POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface (
-     CORBA::Environment &)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-@@ -642,7 +650,7 @@
- }
- 
- CORBA::Boolean
--POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_is_a (
-+POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_is_a (
-     const char * id,
-     CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
-@@ -651,15 +659,15 @@
- }
- 
- void 
--POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (IR::DefinitionKind result)
-+POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (IR::DefinitionKind result)
- {
-   // Update the result.
-    this->_result = result;
- }
- 
--POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::TAO_ServerRequestInfo_CORBA_IRObject_destroy (
-+POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::TAO_ServerRequestInfo_CORBA_IRObject_destroy (
-     TAO_ServerRequest &_tao_server_request,
--    POA_CORBA::IRObject *tao_impl,
-+    POA_CORBA_IRObject *tao_impl,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -667,7 +675,7 @@
- {}
- 
- Dynamic::ParameterList *
--POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
-+POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -679,7 +687,7 @@
- }
- 
- Dynamic::ExceptionList *
--POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -691,7 +699,7 @@
- }
- 
- CORBA::Any * 
--POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TRY_ENV)
-+POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -704,7 +712,7 @@
- }
- 
- char *
--POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface (
-+POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface (
-     CORBA::Environment &)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-@@ -713,7 +721,7 @@
- }
- 
- CORBA::Boolean
--POA_CORBA::IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_is_a (
-+POA_CORBA_IRObject::TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_is_a (
-     const char * id,
-     CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
-@@ -722,6 +730,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_Contained_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -729,7 +738,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:27 */
-+/* starting time is 11:23:09 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_Contained_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -855,16 +864,15 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:27 */
-+/* ending time is 11:23:09 */
- static TAO_IR_Contained_Perfect_Hash_OpTable tao_IR_Contained_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
- 
- // Factory function Implementation.
--POA_IR::_TAO_Contained_Strategized_Proxy_Broker *POA_IR::_TAO_Contained_Strategized_Proxy_Broker::the_TAO_Contained_Strategized_Proxy_Broker (void)
-+POA_IR::_TAO_Contained_Strategized_Proxy_Broker *the_TAO_Contained_Strategized_Proxy_Broker (void)
- {
-   static POA_IR::_TAO_Contained_Strategized_Proxy_Broker strategized_proxy_broker;
-   return &strategized_proxy_broker;
-@@ -884,9 +892,9 @@
-   
- }
- 
--IR::_TAO_Contained_Proxy_Impl&
-+_TAO_Contained_Proxy_Impl&
- POA_IR::_TAO_Contained_Strategized_Proxy_Broker::select_proxy (
--    ::IR::Contained *object,
-+    ::IR_Contained *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -928,7 +936,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_Contained_Remote_Proxy_Impl,
-+              _TAO_Contained_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -945,26 +953,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_Contained_Proxy_Broker *
--IR__TAO_Contained_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_Contained_Proxy_Broker *
-+_TAO_Contained_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
--  return ::POA_IR::_TAO_Contained_Strategized_Proxy_Broker::the_TAO_Contained_Strategized_Proxy_Broker();
-+  return the_TAO_Contained_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_Contained_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_Contained_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_Contained_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_Contained_Proxy_Broker_Factory_function;
-+  _TAO_Contained_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_Contained_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_Contained_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_Contained_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_Contained_Proxy_Broker_Factory_Initializer));
-+static int _TAO_Contained_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_Contained_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_Contained_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -1165,7 +1173,7 @@
-   return;
- }
- 
--IR::Container_ptr POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::defined_in (
-+IR_Container_ptr POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::defined_in (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -1173,7 +1181,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::Container_var _tao_retval;
-+    IR_Container_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -1227,7 +1235,7 @@
-       );
- }
- 
--IR::Repository_ptr POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::containing_repository (
-+IR_Repository_ptr POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::containing_repository (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -1235,7 +1243,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::Repository_var _tao_retval;
-+    IR_Repository_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -1258,7 +1266,7 @@
-       );
- }
- 
--IR::Contained::Description * POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-+IR_Contained::Description * POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::describe (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -1266,7 +1274,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::Contained::Description_var _tao_retval;
-+    IR_Contained::Description_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -1291,7 +1299,7 @@
- 
- void POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl::move (
-     CORBA_Object *_collocated_tao_target_,
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -1337,7 +1345,7 @@
- 
- // copy ctor
- POA_IR::Contained::Contained (const Contained& rhs)
--  :   ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  : POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -1832,7 +1840,7 @@
- {
-   POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
-   
--    IR::Container_var _tao_retval;
-+  IR_Container_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -1859,7 +1867,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::Container_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_Container_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -1992,7 +2000,7 @@
- {
-   POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
-   
--    IR::Repository_var _tao_retval;
-+  IR_Repository_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -2019,7 +2027,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::Repository_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_Repository_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -2072,7 +2080,7 @@
- {
-   POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
-   
--    IR::Contained::Description_var _tao_retval;
-+  IR_Contained::Description_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -2099,7 +2107,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::Contained::Description * _tao_retval_info = _tao_retval._retn ();
-+      IR_Contained::Description * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -2154,7 +2162,7 @@
-   POA_IR::Contained *_tao_impl = (POA_IR::Contained *)_tao_object_reference;
-   
-   _tao_server_request.argument_flag (0);
--    IR::Container_var new_container;
-+    IR_Container_var new_container;
-   CORBA::String_var new_name;
-   CORBA::String_var new_version;
-   if (!(
-@@ -2241,7 +2249,7 @@
-   POA_IR::Contained *_tao_impl = (POA_IR::Contained *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -2249,7 +2257,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -2266,7 +2274,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -2291,7 +2299,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-     return ACE_static_cast (POA_IR::Contained_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -2307,7 +2315,7 @@
-   return "IDL:omg.org/IR/Contained:1.0";
- }
- 
--IR::Contained*
-+IR_Contained*
- POA_IR::Contained::_this (CORBA_Environment &ACE_TRY_ENV)
- {
-   TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-@@ -2321,10 +2329,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::Contained::_unchecked_narrow (obj.in ());
-+  return IR_Contained::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_id_get::TAO_ServerRequestInfo_IR_Contained_id_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -3073,7 +3080,7 @@
- POA_IR::Contained::TAO_ServerRequestInfo_IR_Contained_move::TAO_ServerRequestInfo_IR_Contained_move (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::Contained *tao_impl,
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &
-@@ -3159,6 +3166,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_Container_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -3166,7 +3174,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:27 */
-+/* starting time is 11:23:09 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_Container_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -3296,10 +3304,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:27 */
-+/* ending time is 11:23:09 */
- static TAO_IR_Container_Perfect_Hash_OpTable tao_IR_Container_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -3325,9 +3332,9 @@
-   
- }
- 
--IR::_TAO_Container_Proxy_Impl&
-+_TAO_Container_Proxy_Impl&
- POA_IR::_TAO_Container_Strategized_Proxy_Broker::select_proxy (
--    ::IR::Container *object,
-+    IR_Container *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -3359,7 +3366,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_Container_ThruPOA_Proxy_Impl,
-+              _TAO_Container_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -3369,7 +3376,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_Container_Remote_Proxy_Impl,
-+              _TAO_Container_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -3386,26 +3393,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_Container_Proxy_Broker *
--IR__TAO_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_Container_Proxy_Broker *
-+_TAO_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_Container_Strategized_Proxy_Broker::the_TAO_Container_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_Container_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_Container_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_Container_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_Container_Proxy_Broker_Factory_function;
-+  _TAO_Container_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_Container_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_Container_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_Container_Proxy_Broker_Factory_Initializer));
-+static int _TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_Container_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_Container_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -3426,7 +3433,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::Contained_var _tao_retval;
-+    IR_Contained_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -3450,9 +3457,9 @@
-       );
- }
- 
--IR::ContainedSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-+IR_ContainedSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::contents (
-     CORBA_Object *_collocated_tao_target_,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -3460,7 +3467,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::ContainedSeq_var _tao_retval;
-+    IR_ContainedSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -3485,11 +3492,11 @@
-       );
- }
- 
--IR::ContainedSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-+IR_ContainedSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::lookup_name (
-     CORBA_Object *_collocated_tao_target_,
-     const char * search_name,
-     CORBA::Long levels_to_search,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -3497,7 +3504,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::ContainedSeq_var _tao_retval;
-+    IR_ContainedSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -3524,9 +3531,9 @@
-       );
- }
- 
--IR::Container::DescriptionSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-+IR_Container::DescriptionSeq * POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::describe_contents (
-     CORBA_Object *_collocated_tao_target_,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Long max_returned_objs,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -3535,7 +3542,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::Container::DescriptionSeq_var _tao_retval;
-+    IR_Container::DescriptionSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -3561,7 +3568,7 @@
-       );
- }
- 
--IR::ModuleDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-+IR_ModuleDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_module (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-@@ -3572,7 +3579,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::ModuleDef_var _tao_retval;
-+    IR_ModuleDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -3598,12 +3605,12 @@
-       );
- }
- 
--IR::ConstantDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-+IR_ConstantDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_constant (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -3611,7 +3618,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::ConstantDef_var _tao_retval;
-+    IR_ConstantDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -3639,19 +3646,19 @@
-       );
- }
- 
--IR::StructDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-+IR_StructDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_struct (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::StructDef_var _tao_retval;
-+    IR_StructDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -3678,20 +3685,20 @@
-       );
- }
- 
--IR::UnionDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-+IR_UnionDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_union (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+    IR_IDLType_ptr discriminator_type,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::UnionDef_var _tao_retval;
-+    IR_UnionDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -3719,19 +3726,19 @@
-       );
- }
- 
--IR::EnumDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-+IR_EnumDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_enum (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::EnumDef_var _tao_retval;
-+    IR_EnumDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -3758,19 +3765,19 @@
-       );
- }
- 
--IR::AliasDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-+IR_AliasDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_alias (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+    IR_IDLType_ptr original_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::AliasDef_var _tao_retval;
-+    IR_AliasDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -3797,12 +3804,12 @@
-       );
- }
- 
--IR::InterfaceDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-+IR_InterfaceDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_interface (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Boolean is_abstract,
-     CORBA::Boolean is_local,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -3811,7 +3818,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::InterfaceDef_var _tao_retval;
-+    IR_InterfaceDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -3840,25 +3847,25 @@
-       );
- }
- 
--IR::ValueDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-+IR_ValueDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_value (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
-     CORBA::Boolean is_custom,
-     CORBA::Boolean is_abstract,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Boolean is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+    const IR_ValueDefSeq & abstract_base_values,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::ValueDef_var _tao_retval;
-+    IR_ValueDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -3891,19 +3898,19 @@
-       );
- }
- 
--IR::ValueBoxDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-+IR_ValueBoxDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_value_box (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::ValueBoxDef_var _tao_retval;
-+    IR_ValueBoxDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -3930,19 +3937,19 @@
-       );
- }
- 
--IR::ExceptionDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-+IR_ExceptionDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_exception (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::ExceptionDef_var _tao_retval;
-+    IR_ExceptionDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -3969,7 +3976,7 @@
-       );
- }
- 
--IR::NativeDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-+IR_NativeDef_ptr POA_IR::_TAO_Container_ThruPOA_Proxy_Impl::create_native (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-@@ -3980,7 +3987,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::NativeDef_var _tao_retval;
-+    IR_NativeDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -4018,7 +4025,7 @@
- 
- // copy ctor
- POA_IR::Container::Container (const Container& rhs)
--  :   ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  : POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -4037,14 +4044,13 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-   
--    IR::Contained_var _tao_retval;
-+  IR_Contained_var _tao_retval;
-   CORBA::String_var search_name;
-   if (!(
-     (_tao_in >> search_name.out ())
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -4072,7 +4078,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::Contained_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_Contained_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -4126,8 +4132,8 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-   
--    IR::ContainedSeq_var _tao_retval;
--  IR::DefinitionKind limit_type;
-+  IR_ContainedSeq_var _tao_retval;
-+  IR_DefinitionKind limit_type;
-   CORBA::Boolean exclude_inherited;
-   if (!(
-     (_tao_in >> limit_type) &&
-@@ -4135,7 +4141,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -4165,7 +4170,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ContainedSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_ContainedSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -4219,10 +4224,10 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-   
--    IR::ContainedSeq_var _tao_retval;
-+  IR_ContainedSeq_var _tao_retval;
-   CORBA::String_var search_name;
-   CORBA::Long levels_to_search;
--  IR::DefinitionKind limit_type;
-+  IR_DefinitionKind limit_type;
-   CORBA::Boolean exclude_inherited;
-   if (!(
-     (_tao_in >> search_name.out ()) &&
-@@ -4232,7 +4237,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -4266,7 +4270,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ContainedSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_ContainedSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -4320,8 +4324,8 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-   
--    IR::Container::DescriptionSeq_var _tao_retval;
--  IR::DefinitionKind limit_type;
-+  IR_Container::DescriptionSeq_var _tao_retval;
-+  IR_DefinitionKind limit_type;
-   CORBA::Boolean exclude_inherited;
-   CORBA::Long max_returned_objs;
-   if (!(
-@@ -4331,7 +4335,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -4363,7 +4366,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::Container::DescriptionSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_Container::DescriptionSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -4417,7 +4420,7 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-   
--    IR::ModuleDef_var _tao_retval;
-+  IR_ModuleDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
-@@ -4428,7 +4431,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -4460,7 +4462,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ModuleDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_ModuleDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -4514,11 +4516,11 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-   
--    IR::ConstantDef_var _tao_retval;
-+  IR_ConstantDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::IDLType_var type;
-+  IR_IDLType_var type;
-   CORBA::Any value;
-   if (!(
-     (_tao_in >> id.out ()) &&
-@@ -4529,7 +4531,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -4565,7 +4566,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ConstantDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_ConstantDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -4619,11 +4620,11 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-   
--    IR::StructDef_var _tao_retval;
-+  IR_StructDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::StructMemberSeq members;
-+  IR_StructMemberSeq members;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -4632,7 +4633,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -4666,7 +4666,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::StructDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_StructDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -4720,12 +4720,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-   
--    IR::UnionDef_var _tao_retval;
-+  IR_UnionDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::IDLType_var discriminator_type;
--  IR::UnionMemberSeq members;
-+  IR_IDLType_var discriminator_type;
-+  IR_UnionMemberSeq members;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -4735,7 +4735,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -4771,7 +4770,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::UnionDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_UnionDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -4825,11 +4824,11 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-   
--    IR::EnumDef_var _tao_retval;
-+  IR_EnumDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::EnumMemberSeq members;
-+  IR_EnumMemberSeq members;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -4838,7 +4837,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -4872,7 +4870,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::EnumDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_EnumDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -4926,11 +4924,11 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-   
--    IR::AliasDef_var _tao_retval;
-+  IR_AliasDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::IDLType_var original_type;
-+  IR_IDLType_var original_type;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -4939,7 +4937,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -4973,7 +4970,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::AliasDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_AliasDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -5027,11 +5024,11 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-   
--    IR::InterfaceDef_var _tao_retval;
-+  IR_InterfaceDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::InterfaceDefSeq base_interfaces;
-+  IR_InterfaceDefSeq base_interfaces;
-   CORBA::Boolean is_abstract;
-   CORBA::Boolean is_local;
-   if (!(
-@@ -5044,7 +5041,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -5082,7 +5078,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -5136,17 +5132,17 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-   
--    IR::ValueDef_var _tao_retval;
-+  IR_ValueDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
-   CORBA::Boolean is_custom;
-   CORBA::Boolean is_abstract;
--  IR::ValueDef_var base_value;
-+  IR_ValueDef_var base_value;
-   CORBA::Boolean is_truncatable;
--  IR::ValueDefSeq abstract_base_values;
--  IR::InterfaceDefSeq supported_interfaces;
--  IR::InitializerSeq initializers;
-+  IR_ValueDefSeq abstract_base_values;
-+  IR_InterfaceDefSeq supported_interfaces;
-+  IR_InitializerSeq initializers;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -5161,7 +5157,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -5207,7 +5202,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -5261,11 +5256,11 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-   
--    IR::ValueBoxDef_var _tao_retval;
-+  IR_ValueBoxDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::IDLType_var original_type_def;
-+  IR_IDLType_var original_type_def;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -5274,7 +5269,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -5308,7 +5302,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ValueBoxDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_ValueBoxDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -5362,11 +5356,11 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-   
--    IR::ExceptionDef_var _tao_retval;
-+  IR_ExceptionDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::StructMemberSeq members;
-+  IR_StructMemberSeq members;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -5375,7 +5369,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -5409,7 +5402,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ExceptionDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_ExceptionDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -5463,7 +5456,7 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Container *_tao_impl = (POA_IR::Container *)_tao_object_reference;
-   
--    IR::NativeDef_var _tao_retval;
-+  IR_NativeDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
-@@ -5474,7 +5467,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -5506,7 +5498,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::NativeDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_NativeDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -5561,7 +5553,7 @@
-   POA_IR::Container *_tao_impl = (POA_IR::Container *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -5569,7 +5561,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -5586,7 +5578,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -5611,7 +5603,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-     return ACE_static_cast (POA_IR::Container_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -5641,10 +5633,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::Container::_unchecked_narrow (obj.in ());
-+  return IR_Container::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_lookup::TAO_ServerRequestInfo_IR_Container_lookup (
-     TAO_ServerRequest &_tao_server_request,
-@@ -5733,7 +5724,7 @@
- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_contents::TAO_ServerRequestInfo_IR_Container_contents (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::Container *tao_impl,
--    IR::DefinitionKind & limit_type,
-+    IR_DefinitionKind & limit_type,
-     const CORBA::Boolean & exclude_inherited,
-     CORBA::Environment &
-   )
-@@ -5827,7 +5818,7 @@
-     POA_IR::Container *tao_impl,
-     const char * search_name,
-     const CORBA::Long & levels_to_search,
--    IR::DefinitionKind & limit_type,
-+    IR_DefinitionKind & limit_type,
-     const CORBA::Boolean & exclude_inherited,
-     CORBA::Environment &
-   )
-@@ -5931,7 +5922,7 @@
- POA_IR::Container::TAO_ServerRequestInfo_IR_Container_describe_contents::TAO_ServerRequestInfo_IR_Container_describe_contents (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::Container *tao_impl,
--    IR::DefinitionKind & limit_type,
-+    IR_DefinitionKind & limit_type,
-     const CORBA::Boolean & exclude_inherited,
-     const CORBA::Long & max_returned_objs,
-     CORBA::Environment &
-@@ -6131,7 +6122,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &
-   )
-@@ -6244,7 +6235,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -6350,8 +6341,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+    IR_IDLType_ptr discriminator_type,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -6464,7 +6455,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -6570,7 +6561,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+    IR_IDLType_ptr original_type,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -6676,7 +6667,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     const CORBA::Boolean & is_abstract,
-     const CORBA::Boolean & is_local,
-     CORBA::Environment &
-@@ -6798,11 +6789,11 @@
-     const char * version,
-     const CORBA::Boolean & is_custom,
-     const CORBA::Boolean & is_abstract,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     const CORBA::Boolean & is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+    const IR_ValueDefSeq & abstract_base_values,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -6947,7 +6938,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -7053,7 +7044,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -7252,6 +7243,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_IDLType_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -7259,7 +7251,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:27 */
-+/* starting time is 11:23:09 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_IDLType_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -7355,10 +7347,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:27 */
-+/* ending time is 11:23:09 */
- static TAO_IR_IDLType_Perfect_Hash_OpTable tao_IR_IDLType_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -7384,9 +7375,9 @@
-   
- }
- 
--IR::_TAO_IDLType_Proxy_Impl&
-+_TAO_IDLType_Proxy_Impl&
- POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::select_proxy (
--    ::IR::IDLType *object,
-+    IR_IDLType *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -7418,7 +7409,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl,
-+              _TAO_IDLType_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -7428,7 +7419,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_IDLType_Remote_Proxy_Impl,
-+              _TAO_IDLType_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -7445,26 +7436,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_IDLType_Proxy_Broker *
--IR__TAO_IDLType_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_IDLType_Proxy_Broker *
-+_TAO_IDLType_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_IDLType_Strategized_Proxy_Broker::the_TAO_IDLType_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_IDLType_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_IDLType_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_IDLType_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_IDLType_Proxy_Broker_Factory_function;
-+  _TAO_IDLType_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_IDLType_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_IDLType_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_IDLType_Proxy_Broker_Factory_Initializer));
-+static int _TAO_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_IDLType_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_IDLType_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -7519,7 +7510,7 @@
- 
- // copy ctor
- POA_IR::IDLType::IDLType (const IDLType& rhs)
--  :   ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  : POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -7619,7 +7610,7 @@
-   POA_IR::IDLType *_tao_impl = (POA_IR::IDLType *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -7627,7 +7618,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -7644,7 +7635,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -7669,7 +7660,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -7699,10 +7690,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::IDLType::_unchecked_narrow (obj.in ());
-+  return IR_IDLType::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::IDLType::TAO_ServerRequestInfo_IR_IDLType_type_get::TAO_ServerRequestInfo_IR_IDLType_type_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -7780,6 +7770,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_Repository_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -7787,7 +7778,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:27 */
-+/* starting time is 11:23:09 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_Repository_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -7928,10 +7919,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:27 */
-+/* ending time is 11:23:09 */
- static TAO_IR_Repository_Perfect_Hash_OpTable tao_IR_Repository_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -7957,9 +7947,9 @@
-   
- }
- 
--IR::_TAO_Repository_Proxy_Impl&
-+_TAO_Repository_Proxy_Impl&
- POA_IR::_TAO_Repository_Strategized_Proxy_Broker::select_proxy (
--    ::IR::Repository *object,
-+    IR_Repository *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -7991,7 +7981,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl,
-+              _TAO_Repository_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -8001,7 +7991,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_Repository_Remote_Proxy_Impl,
-+              _TAO_Repository_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -8018,26 +8008,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_Repository_Proxy_Broker *
--IR__TAO_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_Repository_Proxy_Broker *
-+_TAO_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_Repository_Strategized_Proxy_Broker::the_TAO_Repository_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_Repository_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_Repository_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_Repository_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_Repository_Proxy_Broker_Factory_function;
-+  _TAO_Repository_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_Repository_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_Repository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_Repository_Proxy_Broker_Factory_Initializer));
-+static int _TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_Repository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_Repository_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -8058,7 +8048,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::Contained_var _tao_retval;
-+    IR_Contained_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -8115,16 +8105,16 @@
-       );
- }
- 
--IR::PrimitiveDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::get_primitive (
-+IR_PrimitiveDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::get_primitive (
-     CORBA_Object *_collocated_tao_target_,
--    IR::PrimitiveKind kind,
-+    IR_PrimitiveKind kind,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::PrimitiveDef_var _tao_retval;
-+    IR_PrimitiveDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -8148,7 +8138,7 @@
-       );
- }
- 
--IR::StringDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_string (
-+IR_StringDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_string (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::ULong bound,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -8157,7 +8147,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::StringDef_var _tao_retval;
-+    IR_StringDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -8181,7 +8171,7 @@
-       );
- }
- 
--IR::WstringDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_wstring (
-+IR_WstringDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_wstring (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::ULong bound,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -8190,7 +8180,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::WstringDef_var _tao_retval;
-+    IR_WstringDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -8214,17 +8204,17 @@
-       );
- }
- 
--IR::SequenceDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_sequence (
-+IR_SequenceDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_sequence (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::ULong bound,
--    IR::IDLType_ptr element_type,
-+    IR_IDLType_ptr element_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::SequenceDef_var _tao_retval;
-+    IR_SequenceDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -8249,17 +8239,17 @@
-       );
- }
- 
--IR::ArrayDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_array (
-+IR_ArrayDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_array (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::ULong length,
--    IR::IDLType_ptr element_type,
-+    IR_IDLType_ptr element_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::ArrayDef_var _tao_retval;
-+    IR_ArrayDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -8284,7 +8274,7 @@
-       );
- }
- 
--IR::FixedDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_fixed (
-+IR_FixedDef_ptr POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl::create_fixed (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::UShort digits,
-     CORBA::Short scale,
-@@ -8294,7 +8284,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::FixedDef_var _tao_retval;
-+    IR_FixedDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -8332,7 +8322,7 @@
- // copy ctor
- POA_IR::Repository::Repository (const Repository& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,Container) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -8351,14 +8341,13 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-   
--    IR::Contained_var _tao_retval;
-+  IR_Contained_var _tao_retval;
-   CORBA::String_var search_id;
-   if (!(
-     (_tao_in >> search_id.out ())
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -8386,7 +8375,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::Contained_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_Contained_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -8447,7 +8436,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -8529,14 +8517,13 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-   
--    IR::PrimitiveDef_var _tao_retval;
--  IR::PrimitiveKind kind;
-+  IR_PrimitiveDef_var _tao_retval;
-+  IR_PrimitiveKind kind;
-   if (!(
-     (_tao_in >> kind)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -8564,7 +8551,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::PrimitiveDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_PrimitiveDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -8618,14 +8605,13 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-   
--    IR::StringDef_var _tao_retval;
-+  IR_StringDef_var _tao_retval;
-   CORBA::ULong bound;
-   if (!(
-     (_tao_in >> bound)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -8653,7 +8639,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::StringDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_StringDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -8707,14 +8693,13 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-   
--    IR::WstringDef_var _tao_retval;
-+  IR_WstringDef_var _tao_retval;
-   CORBA::ULong bound;
-   if (!(
-     (_tao_in >> bound)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -8742,7 +8727,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::WstringDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_WstringDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -8796,16 +8781,15 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-   
--    IR::SequenceDef_var _tao_retval;
-+  IR_SequenceDef_var _tao_retval;
-   CORBA::ULong bound;
--  IR::IDLType_var element_type;
-+  IR_IDLType_var element_type;
-   if (!(
-     (_tao_in >> bound) &&
-     (_tao_in >> element_type.out ())
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -8835,7 +8819,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::SequenceDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_SequenceDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -8889,16 +8873,15 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-   
--    IR::ArrayDef_var _tao_retval;
-+  IR_ArrayDef_var _tao_retval;
-   CORBA::ULong length;
--  IR::IDLType_var element_type;
-+  IR_IDLType_var element_type;
-   if (!(
-     (_tao_in >> length) &&
-     (_tao_in >> element_type.out ())
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -8928,7 +8911,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ArrayDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_ArrayDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -8982,7 +8965,7 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::Repository *_tao_impl = (POA_IR::Repository *)_tao_object_reference;
-   
--    IR::FixedDef_var _tao_retval;
-+  IR_FixedDef_var _tao_retval;
-   CORBA::UShort digits;
-   CORBA::Short scale;
-   if (!(
-@@ -8991,7 +8974,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -9021,7 +9003,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::FixedDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_FixedDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -9076,7 +9058,7 @@
-   POA_IR::Repository *_tao_impl = (POA_IR::Repository *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -9084,7 +9066,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -9101,7 +9083,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -9129,7 +9111,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-     return ACE_static_cast (POA_IR::Container_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -9159,10 +9141,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::Repository::_unchecked_narrow (obj.in ());
-+  return IR_Repository::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_lookup_id::TAO_ServerRequestInfo_IR_Repository_lookup_id (
-     TAO_ServerRequest &_tao_server_request,
-@@ -9335,7 +9316,7 @@
- POA_IR::Repository::TAO_ServerRequestInfo_IR_Repository_get_primitive::TAO_ServerRequestInfo_IR_Repository_get_primitive (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::Repository *tao_impl,
--    IR::PrimitiveKind & kind,
-+    IR_PrimitiveKind & kind,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -9589,7 +9570,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::Repository *tao_impl,
-     const CORBA::ULong & bound,
--    IR::IDLType_ptr element_type,
-+    IR_IDLType_ptr element_type,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -9681,7 +9662,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::Repository *tao_impl,
-     const CORBA::ULong & length,
--    IR::IDLType_ptr element_type,
-+    IR_IDLType_ptr element_type,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -9861,6 +9842,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_ComponentRepository_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -9868,7 +9850,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:27 */
-+/* starting time is 11:23:09 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentRepository_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -10009,10 +9991,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:27 */
-+/* ending time is 11:23:09 */
- static TAO_IR_ComponentRepository_Perfect_Hash_OpTable tao_IR_ComponentRepository_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -10038,9 +10019,9 @@
-   
- }
- 
--IR::_TAO_ComponentRepository_Proxy_Impl&
-+_TAO_ComponentRepository_Proxy_Impl&
- POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::select_proxy (
--    ::IR::ComponentRepository *object,
-+    IR_ComponentRepository *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -10072,7 +10053,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl,
-+              _TAO_ComponentRepository_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -10082,7 +10063,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_ComponentRepository_Remote_Proxy_Impl,
-+              _TAO_ComponentRepository_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -10099,26 +10080,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_ComponentRepository_Proxy_Broker *
--IR__TAO_ComponentRepository_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_ComponentRepository_Proxy_Broker *
-+_TAO_ComponentRepository_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::the_TAO_ComponentRepository_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_ComponentRepository_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_ComponentRepository_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_ComponentRepository_Proxy_Broker_Factory_function;
-+  _TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_ComponentRepository_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_ComponentRepository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_ComponentRepository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ComponentRepository_Proxy_Broker_Factory_Initializer));
-+static int _TAO_ComponentRepository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_ComponentRepository_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ComponentRepository_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -10130,20 +10111,20 @@
- 
- // ThruPOA Implementation of the IDL interface methods
- 
--IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_component (
-+IR_ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_component (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ComponentDef_ptr base_component,
--    const IR::InterfaceDefSeq & supports_interfaces,
-+    IR_ComponentDef_ptr base_component,
-+    const IR_InterfaceDefSeq & supports_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::ComponentDef_var _tao_retval;
-+    IR_ComponentDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -10171,21 +10152,21 @@
-       );
- }
- 
--IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home (
-+IR_HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::HomeDef_ptr base_home,
--    IR::ComponentDef_ptr managed_component,
--    IR::ValueDef_ptr primary_key,
-+    IR_HomeDef_ptr base_home,
-+    IR_ComponentDef_ptr managed_component,
-+    IR_ValueDef_ptr primary_key,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::HomeDef_var _tao_retval;
-+    IR_HomeDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -10228,7 +10209,7 @@
- POA_IR::ComponentRepository::ComponentRepository (const ComponentRepository& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,Repository) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Container) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -10247,12 +10228,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *)_tao_object_reference;
-   
--    IR::ComponentDef_var _tao_retval;
-+  IR_ComponentDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::ComponentDef_var base_component;
--  IR::InterfaceDefSeq supports_interfaces;
-+  IR_ComponentDef_var base_component;
-+  IR_InterfaceDefSeq supports_interfaces;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -10262,7 +10243,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -10298,7 +10278,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -10352,13 +10332,13 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *)_tao_object_reference;
-   
--    IR::HomeDef_var _tao_retval;
-+  IR_HomeDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::HomeDef_var base_home;
--  IR::ComponentDef_var managed_component;
--  IR::ValueDef_var primary_key;
-+  IR_HomeDef_var base_home;
-+  IR_ComponentDef_var managed_component;
-+  IR_ValueDef_var primary_key;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -10369,7 +10349,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -10407,7 +10386,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::HomeDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_HomeDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -10462,7 +10441,7 @@
-   POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -10470,7 +10449,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -10487,7 +10466,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -10518,7 +10497,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-     return ACE_static_cast (POA_IR::Container_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -10548,10 +10527,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::ComponentRepository::_unchecked_narrow (obj.in ());
-+  return IR_ComponentRepository::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::ComponentRepository::TAO_ServerRequestInfo_IR_ComponentRepository_create_component::TAO_ServerRequestInfo_IR_ComponentRepository_create_component (
-     TAO_ServerRequest &_tao_server_request,
-@@ -10559,8 +10537,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ComponentDef_ptr base_component,
--    const IR::InterfaceDefSeq & supports_interfaces,
-+    IR_ComponentDef_ptr base_component,
-+    const IR_InterfaceDefSeq & supports_interfaces,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -10673,9 +10651,9 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::HomeDef_ptr base_home,
--    IR::ComponentDef_ptr managed_component,
--    IR::ValueDef_ptr primary_key,
-+    IR_HomeDef_ptr base_home,
-+    IR_ComponentDef_ptr managed_component,
-+    IR_ValueDef_ptr primary_key,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -10790,6 +10768,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_ModuleDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -10797,7 +10776,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:27 */
-+/* starting time is 11:23:09 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ModuleDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -10939,10 +10918,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:27 */
-+/* ending time is 11:23:09 */
- static TAO_IR_ModuleDef_Perfect_Hash_OpTable tao_IR_ModuleDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -10968,9 +10946,9 @@
-   
- }
- 
--IR::_TAO_ModuleDef_Proxy_Impl&
-+_TAO_ModuleDef_Proxy_Impl&
- POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::ModuleDef *object,
-+    IR_ModuleDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -11002,7 +10980,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_ModuleDef_ThruPOA_Proxy_Impl,
-+              _TAO_ModuleDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -11012,7 +10990,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_ModuleDef_Remote_Proxy_Impl,
-+              _TAO_ModuleDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -11029,26 +11007,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_ModuleDef_Proxy_Broker *
--IR__TAO_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_ModuleDef_Proxy_Broker *
-+_TAO_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_ModuleDef_Strategized_Proxy_Broker::the_TAO_ModuleDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_ModuleDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_ModuleDef_Proxy_Broker_Factory_function;
-+  _TAO_ModuleDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_ModuleDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_ModuleDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ModuleDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -11074,7 +11052,7 @@
- POA_IR::ModuleDef::ModuleDef (const ModuleDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -11094,7 +11072,7 @@
-   POA_IR::ModuleDef *_tao_impl = (POA_IR::ModuleDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -11102,7 +11080,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -11119,7 +11097,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -11150,7 +11128,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-     return ACE_static_cast (POA_IR::Contained_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -11180,12 +11158,12 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::ModuleDef::_unchecked_narrow (obj.in ());
-+  return IR_ModuleDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_ConstantDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -11193,7 +11171,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:27 */
-+/* starting time is 11:23:09 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ConstantDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -11324,10 +11302,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:27 */
-+/* ending time is 11:23:09 */
- static TAO_IR_ConstantDef_Perfect_Hash_OpTable tao_IR_ConstantDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -11353,9 +11330,9 @@
-   
- }
- 
--IR::_TAO_ConstantDef_Proxy_Impl&
-+_TAO_ConstantDef_Proxy_Impl&
- POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::ConstantDef *object,
-+    IR_ConstantDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -11387,7 +11364,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl,
-+              _TAO_ConstantDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -11397,7 +11374,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_ConstantDef_Remote_Proxy_Impl,
-+              _TAO_ConstantDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -11414,26 +11391,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_ConstantDef_Proxy_Broker *
--IR__TAO_ConstantDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_ConstantDef_Proxy_Broker *
-+_TAO_ConstantDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_ConstantDef_Strategized_Proxy_Broker::the_TAO_ConstantDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_ConstantDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_ConstantDef_Proxy_Broker_Factory_function;
-+  _TAO_ConstantDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_ConstantDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ConstantDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_ConstantDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ConstantDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -11476,7 +11453,7 @@
-       );
- }
- 
--IR::IDLType_ptr POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
-+IR_IDLType_ptr POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -11484,7 +11461,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::IDLType_var _tao_retval;
-+    IR_IDLType_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -11509,7 +11486,7 @@
- 
- void POA_IR::_TAO_ConstantDef_ThruPOA_Proxy_Impl::type_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr type_def,
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -11615,7 +11592,7 @@
- // copy ctor
- POA_IR::ConstantDef::ConstantDef (const ConstantDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -11713,7 +11690,7 @@
- {
-   POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *)_tao_object_reference;
-   
--    IR::IDLType_var _tao_retval;
-+  IR_IDLType_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -11740,7 +11717,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -11794,14 +11771,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::IDLType_var type_def;
-+  IR_IDLType_var type_def;
-   if (!(
-     (_tao_in >> type_def.out ())
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -11953,14 +11928,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
-     CORBA::Any value;
-   if (!(
-     (_tao_in >> value)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -12033,7 +12006,7 @@
-   POA_IR::ConstantDef *_tao_impl = (POA_IR::ConstantDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -12041,7 +12014,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -12058,7 +12031,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -12086,7 +12059,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-     return ACE_static_cast (POA_IR::Contained_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -12116,10 +12089,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::ConstantDef::_unchecked_narrow (obj.in ());
-+  return IR_ConstantDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_get::TAO_ServerRequestInfo_IR_ConstantDef_type_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -12274,7 +12246,7 @@
- POA_IR::ConstantDef::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set::TAO_ServerRequestInfo_IR_ConstantDef_type_def_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ConstantDef *tao_impl,
--    IR::IDLType_ptr type_def,
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -12494,6 +12466,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_TypedefDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -12501,7 +12474,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:27 */
-+/* starting time is 11:23:09 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_TypedefDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -12628,10 +12601,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:27 */
-+/* ending time is 11:23:09 */
- static TAO_IR_TypedefDef_Perfect_Hash_OpTable tao_IR_TypedefDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -12657,9 +12629,9 @@
-   
- }
- 
--IR::_TAO_TypedefDef_Proxy_Impl&
-+_TAO_TypedefDef_Proxy_Impl&
- POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::TypedefDef *object,
-+    IR_TypedefDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -12691,7 +12663,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl,
-+              _TAO_TypedefDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -12701,7 +12673,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_TypedefDef_Remote_Proxy_Impl,
-+              _TAO_TypedefDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -12718,26 +12690,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_TypedefDef_Proxy_Broker *
--IR__TAO_TypedefDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_TypedefDef_Proxy_Broker *
-+_TAO_TypedefDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_TypedefDef_Strategized_Proxy_Broker::the_TAO_TypedefDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_TypedefDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_TypedefDef_Proxy_Broker_Factory_function;
-+  _TAO_TypedefDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_TypedefDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_TypedefDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_TypedefDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_TypedefDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -12763,7 +12735,7 @@
- POA_IR::TypedefDef::TypedefDef (const TypedefDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-     ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -12783,7 +12755,7 @@
-   POA_IR::TypedefDef *_tao_impl = (POA_IR::TypedefDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -12791,7 +12763,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -12808,7 +12780,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -12839,7 +12811,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -12869,12 +12841,12 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::TypedefDef::_unchecked_narrow (obj.in ());
-+  return IR_TypedefDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_StructDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -12882,7 +12854,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:27 */
-+/* starting time is 11:23:09 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_StructDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -13027,10 +12999,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:27 */
-+/* ending time is 11:23:09 */
- static TAO_IR_StructDef_Perfect_Hash_OpTable tao_IR_StructDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -13056,9 +13027,9 @@
-   
- }
- 
--IR::_TAO_StructDef_Proxy_Impl&
-+_TAO_StructDef_Proxy_Impl&
- POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::StructDef *object,
-+    IR_StructDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -13090,7 +13061,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl,
-+              _TAO_StructDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -13100,7 +13071,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_StructDef_Remote_Proxy_Impl,
-+              _TAO_StructDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -13117,26 +13088,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_StructDef_Proxy_Broker *
--IR__TAO_StructDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_StructDef_Proxy_Broker *
-+_TAO_StructDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_StructDef_Strategized_Proxy_Broker::the_TAO_StructDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_StructDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_StructDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_StructDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_StructDef_Proxy_Broker_Factory_function;
-+  _TAO_StructDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_StructDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_StructDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_StructDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_StructDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_StructDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -13148,7 +13119,7 @@
- 
- // ThruPOA Implementation of the IDL interface methods
- 
--IR::StructMemberSeq * POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
-+IR_StructMemberSeq * POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -13156,7 +13127,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::StructMemberSeq_var _tao_retval;
-+    IR_StructMemberSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -13181,7 +13152,7 @@
- 
- void POA_IR::_TAO_StructDef_ThruPOA_Proxy_Impl::members (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -13227,7 +13198,7 @@
-     ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-     ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -13245,7 +13216,7 @@
- {
-   POA_IR::StructDef *_tao_impl = (POA_IR::StructDef *)_tao_object_reference;
-   
--    IR::StructMemberSeq_var _tao_retval;
-+  IR_StructMemberSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -13272,7 +13243,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::StructMemberSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_StructMemberSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -13326,14 +13297,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::StructDef *_tao_impl = (POA_IR::StructDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::StructMemberSeq members;
-+  IR_StructMemberSeq members;
-   if (!(
-     (_tao_in >> members)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -13406,7 +13375,7 @@
-   POA_IR::StructDef *_tao_impl = (POA_IR::StructDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -13414,7 +13383,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -13431,7 +13400,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -13468,7 +13437,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -13498,10 +13467,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::StructDef::_unchecked_narrow (obj.in ());
-+  return IR_StructDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_get::TAO_ServerRequestInfo_IR_StructDef_members_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -13581,7 +13549,7 @@
- POA_IR::StructDef::TAO_ServerRequestInfo_IR_StructDef_members_set::TAO_ServerRequestInfo_IR_StructDef_members_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::StructDef *tao_impl,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -13653,6 +13621,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_UnionDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -13660,7 +13629,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:09 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_UnionDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -13809,10 +13778,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:09 */
- static TAO_IR_UnionDef_Perfect_Hash_OpTable tao_IR_UnionDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -13838,9 +13806,9 @@
-   
- }
- 
--IR::_TAO_UnionDef_Proxy_Impl&
-+_TAO_UnionDef_Proxy_Impl&
- POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::UnionDef *object,
-+    IR_UnionDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -13872,7 +13840,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl,
-+              _TAO_UnionDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -13882,7 +13850,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_UnionDef_Remote_Proxy_Impl,
-+              _TAO_UnionDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -13899,26 +13867,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_UnionDef_Proxy_Broker *
--IR__TAO_UnionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_UnionDef_Proxy_Broker *
-+_TAO_UnionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_UnionDef_Strategized_Proxy_Broker::the_TAO_UnionDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_UnionDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_UnionDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_UnionDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_UnionDef_Proxy_Broker_Factory_function;
-+  _TAO_UnionDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_UnionDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_UnionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_UnionDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_UnionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_UnionDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -13961,7 +13929,7 @@
-       );
- }
- 
--IR::IDLType_ptr POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
-+IR_IDLType_ptr POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -13969,7 +13937,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::IDLType_var _tao_retval;
-+    IR_IDLType_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -13994,7 +13962,7 @@
- 
- void POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr discriminator_type_def,
-+    IR_IDLType_ptr discriminator_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14024,7 +13992,7 @@
-   return;
- }
- 
--IR::UnionMemberSeq * POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
-+IR_UnionMemberSeq * POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -14032,7 +14000,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::UnionMemberSeq_var _tao_retval;
-+    IR_UnionMemberSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -14057,7 +14025,7 @@
- 
- void POA_IR::_TAO_UnionDef_ThruPOA_Proxy_Impl::members (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::UnionMemberSeq & members,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14103,7 +14071,7 @@
-     ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-     ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -14201,7 +14169,7 @@
- {
-   POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
-   
--    IR::IDLType_var _tao_retval;
-+  IR_IDLType_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -14228,7 +14196,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -14282,14 +14250,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::IDLType_var discriminator_type_def;
-+  IR_IDLType_var discriminator_type_def;
-   if (!(
-     (_tao_in >> discriminator_type_def.out ())
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -14360,7 +14326,7 @@
- {
-   POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
-   
--    IR::UnionMemberSeq_var _tao_retval;
-+  IR_UnionMemberSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -14387,7 +14353,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::UnionMemberSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_UnionMemberSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -14441,14 +14407,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::UnionMemberSeq members;
-+  IR_UnionMemberSeq members;
-   if (!(
-     (_tao_in >> members)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -14521,7 +14485,7 @@
-   POA_IR::UnionDef *_tao_impl = (POA_IR::UnionDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -14529,7 +14493,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -14546,7 +14510,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -14583,7 +14547,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -14613,10 +14577,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::UnionDef::_unchecked_narrow (obj.in ());
-+  return IR_UnionDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -14771,7 +14734,7 @@
- POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set::TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::UnionDef *tao_impl,
--    IR::IDLType_ptr discriminator_type_def,
-+    IR_IDLType_ptr discriminator_type_def,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -14920,7 +14883,7 @@
- POA_IR::UnionDef::TAO_ServerRequestInfo_IR_UnionDef_members_set::TAO_ServerRequestInfo_IR_UnionDef_members_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::UnionDef *tao_impl,
--    const IR::UnionMemberSeq & members,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -14992,6 +14955,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_EnumDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -14999,7 +14963,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:10 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EnumDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -15128,10 +15092,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:10 */
- static TAO_IR_EnumDef_Perfect_Hash_OpTable tao_IR_EnumDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -15157,9 +15120,9 @@
-   
- }
- 
--IR::_TAO_EnumDef_Proxy_Impl&
-+_TAO_EnumDef_Proxy_Impl&
- POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::EnumDef *object,
-+    IR_EnumDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -15191,7 +15154,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_EnumDef_ThruPOA_Proxy_Impl,
-+              _TAO_EnumDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -15201,7 +15164,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_EnumDef_Remote_Proxy_Impl,
-+              _TAO_EnumDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -15218,26 +15181,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_EnumDef_Proxy_Broker *
--IR__TAO_EnumDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_EnumDef_Proxy_Broker *
-+_TAO_EnumDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_EnumDef_Strategized_Proxy_Broker::the_TAO_EnumDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_EnumDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_EnumDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_EnumDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_EnumDef_Proxy_Broker_Factory_function;
-+  _TAO_EnumDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_EnumDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_EnumDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_EnumDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_EnumDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_EnumDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -15257,7 +15220,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::EnumMemberSeq_var _tao_retval;
-+    IR_EnumMemberSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -15282,7 +15245,7 @@
- 
- void POA_IR::_TAO_EnumDef_ThruPOA_Proxy_Impl::members (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -15327,7 +15290,7 @@
-   :   ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-     ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -15345,7 +15308,7 @@
- {
-   POA_IR::EnumDef *_tao_impl = (POA_IR::EnumDef *)_tao_object_reference;
-   
--    IR::EnumMemberSeq_var _tao_retval;
-+  IR_EnumMemberSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -15372,7 +15335,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::EnumMemberSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_EnumMemberSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -15426,14 +15389,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::EnumDef *_tao_impl = (POA_IR::EnumDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::EnumMemberSeq members;
-+  IR_EnumMemberSeq members;
-   if (!(
-     (_tao_in >> members)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -15506,7 +15467,7 @@
-   POA_IR::EnumDef *_tao_impl = (POA_IR::EnumDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -15514,7 +15475,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -15531,7 +15492,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -15565,7 +15526,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -15595,10 +15556,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::EnumDef::_unchecked_narrow (obj.in ());
-+  return IR_EnumDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_get::TAO_ServerRequestInfo_IR_EnumDef_members_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -15678,7 +15638,7 @@
- POA_IR::EnumDef::TAO_ServerRequestInfo_IR_EnumDef_members_set::TAO_ServerRequestInfo_IR_EnumDef_members_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::EnumDef *tao_impl,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -15750,6 +15710,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_AliasDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -15757,7 +15718,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:10 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_AliasDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -15886,10 +15847,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:10 */
- static TAO_IR_AliasDef_Perfect_Hash_OpTable tao_IR_AliasDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -15915,9 +15875,9 @@
-   
- }
- 
--IR::_TAO_AliasDef_Proxy_Impl&
-+_TAO_AliasDef_Proxy_Impl&
- POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::AliasDef *object,
-+    IR_AliasDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -15949,7 +15909,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl,
-+              _TAO_AliasDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -15959,7 +15919,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_AliasDef_Remote_Proxy_Impl,
-+              _TAO_AliasDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -15976,26 +15936,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_AliasDef_Proxy_Broker *
--IR__TAO_AliasDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_AliasDef_Proxy_Broker *
-+_TAO_AliasDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_AliasDef_Strategized_Proxy_Broker::the_TAO_AliasDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_AliasDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_AliasDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_AliasDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_AliasDef_Proxy_Broker_Factory_function;
-+  _TAO_AliasDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_AliasDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_AliasDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_AliasDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_AliasDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_AliasDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -16007,7 +15967,7 @@
- 
- // ThruPOA Implementation of the IDL interface methods
- 
--IR::IDLType_ptr POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
-+IR_IDLType_ptr POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -16015,7 +15975,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::IDLType_var _tao_retval;
-+    IR_IDLType_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -16040,7 +16000,7 @@
- 
- void POA_IR::_TAO_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -16085,7 +16045,7 @@
-   :   ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-     ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -16103,7 +16063,7 @@
- {
-   POA_IR::AliasDef *_tao_impl = (POA_IR::AliasDef *)_tao_object_reference;
-   
--    IR::IDLType_var _tao_retval;
-+  IR_IDLType_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -16130,7 +16090,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -16184,14 +16144,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::AliasDef *_tao_impl = (POA_IR::AliasDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::IDLType_var original_type_def;
-+  IR_IDLType_var original_type_def;
-   if (!(
-     (_tao_in >> original_type_def.out ())
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -16264,7 +16222,7 @@
-   POA_IR::AliasDef *_tao_impl = (POA_IR::AliasDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -16272,7 +16230,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -16289,7 +16247,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -16323,7 +16281,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -16353,10 +16311,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::AliasDef::_unchecked_narrow (obj.in ());
-+  return IR_AliasDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -16436,7 +16393,7 @@
- POA_IR::AliasDef::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set::TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::AliasDef *tao_impl,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -16508,6 +16465,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_NativeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -16515,7 +16473,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:10 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_NativeDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -16642,10 +16600,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:10 */
- static TAO_IR_NativeDef_Perfect_Hash_OpTable tao_IR_NativeDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -16671,9 +16628,9 @@
-   
- }
- 
--IR::_TAO_NativeDef_Proxy_Impl&
-+_TAO_NativeDef_Proxy_Impl&
- POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::NativeDef *object,
-+    IR_NativeDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -16705,7 +16662,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_NativeDef_ThruPOA_Proxy_Impl,
-+              _TAO_NativeDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -16715,7 +16672,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_NativeDef_Remote_Proxy_Impl,
-+              _TAO_NativeDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -16732,26 +16689,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_NativeDef_Proxy_Broker *
--IR__TAO_NativeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_NativeDef_Proxy_Broker *
-+_TAO_NativeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_NativeDef_Strategized_Proxy_Broker::the_TAO_NativeDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_NativeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_NativeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_NativeDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_NativeDef_Proxy_Broker_Factory_function;
-+  _TAO_NativeDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_NativeDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_NativeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_NativeDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_NativeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_NativeDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -16778,7 +16735,7 @@
-   :   ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-     ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -16798,7 +16755,7 @@
-   POA_IR::NativeDef *_tao_impl = (POA_IR::NativeDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -16806,7 +16763,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -16823,7 +16780,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -16857,7 +16814,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -16887,12 +16844,12 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::NativeDef::_unchecked_narrow (obj.in ());
-+  return IR_NativeDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_PrimitiveDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -16900,7 +16857,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:10 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PrimitiveDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -16997,10 +16954,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:10 */
- static TAO_IR_PrimitiveDef_Perfect_Hash_OpTable tao_IR_PrimitiveDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -17026,9 +16982,9 @@
-   
- }
- 
--IR::_TAO_PrimitiveDef_Proxy_Impl&
-+_TAO_PrimitiveDef_Proxy_Impl&
- POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::PrimitiveDef *object,
-+    IR_PrimitiveDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -17060,7 +17016,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl,
-+              _TAO_PrimitiveDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -17070,7 +17026,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_PrimitiveDef_Remote_Proxy_Impl,
-+              _TAO_PrimitiveDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -17087,26 +17043,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_PrimitiveDef_Proxy_Broker *
--IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_PrimitiveDef_Proxy_Broker *
-+_TAO_PrimitiveDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_PrimitiveDef_Strategized_Proxy_Broker::the_TAO_PrimitiveDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function;
-+  _TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_PrimitiveDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -17118,7 +17074,7 @@
- 
- // ThruPOA Implementation of the IDL interface methods
- 
--IR::PrimitiveKind POA_IR::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
-+IR_PrimitiveKind POA_IR::_TAO_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -17126,7 +17082,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::PrimitiveKind _tao_retval;
-+    IR_PrimitiveKind _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -17162,7 +17118,7 @@
- // copy ctor
- POA_IR::PrimitiveDef::PrimitiveDef (const PrimitiveDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -17180,7 +17136,7 @@
- {
-   POA_IR::PrimitiveDef *_tao_impl = (POA_IR::PrimitiveDef *)_tao_object_reference;
-   
--    IR::PrimitiveKind _tao_retval;
-+  IR_PrimitiveKind _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -17207,7 +17163,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::PrimitiveKind _tao_retval_info = _tao_retval;
-+      IR_PrimitiveKind _tao_retval_info = _tao_retval;
-       ri.result (_tao_retval_info);
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-@@ -17261,7 +17217,7 @@
-   POA_IR::PrimitiveDef *_tao_impl = (POA_IR::PrimitiveDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -17269,7 +17225,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -17286,7 +17242,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -17314,7 +17270,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -17344,10 +17300,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::PrimitiveDef::_unchecked_narrow (obj.in ());
-+  return IR_PrimitiveDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::PrimitiveDef::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get::TAO_ServerRequestInfo_IR_PrimitiveDef_kind_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -17425,6 +17380,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_StringDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -17432,7 +17388,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:10 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_StringDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -17549,10 +17505,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:10 */
- static TAO_IR_StringDef_Perfect_Hash_OpTable tao_IR_StringDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -17578,9 +17533,9 @@
-   
- }
- 
--IR::_TAO_StringDef_Proxy_Impl&
-+_TAO_StringDef_Proxy_Impl&
- POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::StringDef *object,
-+    IR_StringDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -17612,7 +17567,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_StringDef_ThruPOA_Proxy_Impl,
-+              _TAO_StringDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -17622,7 +17577,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_StringDef_Remote_Proxy_Impl,
-+              _TAO_StringDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -17639,26 +17594,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_StringDef_Proxy_Broker *
--IR__TAO_StringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_StringDef_Proxy_Broker *
-+_TAO_StringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_StringDef_Strategized_Proxy_Broker::the_TAO_StringDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_StringDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_StringDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_StringDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_StringDef_Proxy_Broker_Factory_function;
-+  _TAO_StringDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_StringDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_StringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_StringDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_StringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_StringDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -17746,7 +17701,7 @@
- // copy ctor
- POA_IR::StringDef::StringDef (const StringDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -17844,14 +17799,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::StringDef *_tao_impl = (POA_IR::StringDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
-     CORBA::ULong bound;
-   if (!(
-     (_tao_in >> bound)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -17924,7 +17877,7 @@
-   POA_IR::StringDef *_tao_impl = (POA_IR::StringDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -17932,7 +17885,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -17949,7 +17902,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -17977,7 +17930,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -18007,10 +17960,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::StringDef::_unchecked_narrow (obj.in ());
-+  return IR_StringDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::StringDef::TAO_ServerRequestInfo_IR_StringDef_bound_get::TAO_ServerRequestInfo_IR_StringDef_bound_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -18161,6 +18113,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_WstringDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -18168,7 +18121,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:10 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_WstringDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -18285,10 +18238,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:10 */
- static TAO_IR_WstringDef_Perfect_Hash_OpTable tao_IR_WstringDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -18314,9 +18266,9 @@
-   
- }
- 
--IR::_TAO_WstringDef_Proxy_Impl&
-+_TAO_WstringDef_Proxy_Impl&
- POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::WstringDef *object,
-+    IR_WstringDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -18348,7 +18300,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_WstringDef_ThruPOA_Proxy_Impl,
-+              _TAO_WstringDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -18358,7 +18310,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_WstringDef_Remote_Proxy_Impl,
-+              _TAO_WstringDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -18375,26 +18327,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_WstringDef_Proxy_Broker *
--IR__TAO_WstringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_WstringDef_Proxy_Broker *
-+_TAO_WstringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_WstringDef_Strategized_Proxy_Broker::the_TAO_WstringDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_WstringDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_WstringDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_WstringDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_WstringDef_Proxy_Broker_Factory_function;
-+  _TAO_WstringDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_WstringDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_WstringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_WstringDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_WstringDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_WstringDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -18482,7 +18434,7 @@
- // copy ctor
- POA_IR::WstringDef::WstringDef (const WstringDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -18580,14 +18532,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::WstringDef *_tao_impl = (POA_IR::WstringDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
-     CORBA::ULong bound;
-   if (!(
-     (_tao_in >> bound)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -18660,7 +18610,7 @@
-   POA_IR::WstringDef *_tao_impl = (POA_IR::WstringDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -18668,7 +18618,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -18685,7 +18635,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -18713,7 +18663,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -18743,10 +18693,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::WstringDef::_unchecked_narrow (obj.in ());
-+  return IR_WstringDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::WstringDef::TAO_ServerRequestInfo_IR_WstringDef_bound_get::TAO_ServerRequestInfo_IR_WstringDef_bound_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -18897,6 +18846,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_FixedDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -18904,7 +18854,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:10 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FixedDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -19023,10 +18973,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:10 */
- static TAO_IR_FixedDef_Perfect_Hash_OpTable tao_IR_FixedDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -19052,9 +19001,9 @@
-   
- }
- 
--IR::_TAO_FixedDef_Proxy_Impl&
-+_TAO_FixedDef_Proxy_Impl&
- POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::FixedDef *object,
-+    IR_FixedDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -19086,7 +19035,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_FixedDef_ThruPOA_Proxy_Impl,
-+              _TAO_FixedDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -19096,7 +19045,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_FixedDef_Remote_Proxy_Impl,
-+              _TAO_FixedDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -19113,26 +19062,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_FixedDef_Proxy_Broker *
--IR__TAO_FixedDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_FixedDef_Proxy_Broker *
-+_TAO_FixedDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_FixedDef_Strategized_Proxy_Broker::the_TAO_FixedDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_FixedDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_FixedDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_FixedDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_FixedDef_Proxy_Broker_Factory_function;
-+  _TAO_FixedDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_FixedDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_FixedDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_FixedDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_FixedDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_FixedDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -19283,7 +19232,7 @@
- // copy ctor
- POA_IR::FixedDef::FixedDef (const FixedDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -19381,14 +19330,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
-     CORBA::UShort digits;
-   if (!(
-     (_tao_in >> digits)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -19539,14 +19486,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
-     CORBA::Short scale;
-   if (!(
-     (_tao_in >> scale)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -19619,7 +19564,7 @@
-   POA_IR::FixedDef *_tao_impl = (POA_IR::FixedDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -19627,7 +19572,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -19644,7 +19589,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -19672,7 +19617,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -19702,10 +19647,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::FixedDef::_unchecked_narrow (obj.in ());
-+  return IR_FixedDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::FixedDef::TAO_ServerRequestInfo_IR_FixedDef_digits_get::TAO_ServerRequestInfo_IR_FixedDef_digits_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -20004,6 +19948,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_SequenceDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -20011,7 +19956,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:10 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_SequenceDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -20131,10 +20076,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:10 */
- static TAO_IR_SequenceDef_Perfect_Hash_OpTable tao_IR_SequenceDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -20160,9 +20104,9 @@
-   
- }
- 
--IR::_TAO_SequenceDef_Proxy_Impl&
-+_TAO_SequenceDef_Proxy_Impl&
- POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::SequenceDef *object,
-+    IR_SequenceDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -20194,7 +20138,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl,
-+              _TAO_SequenceDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -20204,7 +20148,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_SequenceDef_Remote_Proxy_Impl,
-+              _TAO_SequenceDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -20221,26 +20165,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_SequenceDef_Proxy_Broker *
--IR__TAO_SequenceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_SequenceDef_Proxy_Broker *
-+_TAO_SequenceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_SequenceDef_Strategized_Proxy_Broker::the_TAO_SequenceDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_SequenceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_SequenceDef_Proxy_Broker_Factory_function;
-+  _TAO_SequenceDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_SequenceDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_SequenceDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_SequenceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_SequenceDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -20346,7 +20290,7 @@
-       );
- }
- 
--IR::IDLType_ptr POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
-+IR_IDLType_ptr POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -20354,7 +20298,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::IDLType_var _tao_retval;
-+    IR_IDLType_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -20379,7 +20323,7 @@
- 
- void POA_IR::_TAO_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr element_type_def,
-+    IR_IDLType_ptr element_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -20422,7 +20366,7 @@
- // copy ctor
- POA_IR::SequenceDef::SequenceDef (const SequenceDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -20520,14 +20464,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
-     CORBA::ULong bound;
-   if (!(
-     (_tao_in >> bound)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -20678,7 +20620,7 @@
- {
-   POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *)_tao_object_reference;
-   
--    IR::IDLType_var _tao_retval;
-+  IR_IDLType_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -20705,7 +20647,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -20759,14 +20701,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::IDLType_var element_type_def;
-+  IR_IDLType_var element_type_def;
-   if (!(
-     (_tao_in >> element_type_def.out ())
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -20839,7 +20779,7 @@
-   POA_IR::SequenceDef *_tao_impl = (POA_IR::SequenceDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -20847,7 +20787,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -20864,7 +20804,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -20892,7 +20832,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -20922,10 +20862,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::SequenceDef::_unchecked_narrow (obj.in ());
-+  return IR_SequenceDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_bound_get::TAO_ServerRequestInfo_IR_SequenceDef_bound_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -21228,7 +21167,7 @@
- POA_IR::SequenceDef::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set::TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::SequenceDef *tao_impl,
--    IR::IDLType_ptr element_type_def,
-+    IR_IDLType_ptr element_type_def,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -21300,6 +21239,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_ArrayDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -21307,7 +21247,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:10 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ArrayDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -21427,10 +21367,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:10 */
- static TAO_IR_ArrayDef_Perfect_Hash_OpTable tao_IR_ArrayDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -21456,9 +21395,9 @@
-   
- }
- 
--IR::_TAO_ArrayDef_Proxy_Impl&
-+_TAO_ArrayDef_Proxy_Impl&
- POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::ArrayDef *object,
-+    IR_ArrayDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -21490,7 +21429,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl,
-+              _TAO_ArrayDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -21500,7 +21439,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_ArrayDef_Remote_Proxy_Impl,
-+              _TAO_ArrayDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -21517,26 +21456,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_ArrayDef_Proxy_Broker *
--IR__TAO_ArrayDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_ArrayDef_Proxy_Broker *
-+_TAO_ArrayDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_ArrayDef_Strategized_Proxy_Broker::the_TAO_ArrayDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_ArrayDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_ArrayDef_Proxy_Broker_Factory_function;
-+  _TAO_ArrayDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_ArrayDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ArrayDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_ArrayDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ArrayDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -21642,7 +21581,7 @@
-       );
- }
- 
--IR::IDLType_ptr POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
-+IR_IDLType_ptr POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -21650,7 +21589,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::IDLType_var _tao_retval;
-+    IR_IDLType_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -21675,7 +21614,7 @@
- 
- void POA_IR::_TAO_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr element_type_def,
-+    IR_IDLType_ptr element_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -21718,7 +21657,7 @@
- // copy ctor
- POA_IR::ArrayDef::ArrayDef (const ArrayDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -21816,14 +21755,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
-     CORBA::ULong length;
-   if (!(
-     (_tao_in >> length)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -21974,7 +21911,7 @@
- {
-   POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *)_tao_object_reference;
-   
--    IR::IDLType_var _tao_retval;
-+  IR_IDLType_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -22001,7 +21938,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -22055,14 +21992,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::IDLType_var element_type_def;
-+  IR_IDLType_var element_type_def;
-   if (!(
-     (_tao_in >> element_type_def.out ())
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -22135,7 +22070,7 @@
-   POA_IR::ArrayDef *_tao_impl = (POA_IR::ArrayDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -22143,7 +22078,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -22160,7 +22095,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -22188,7 +22123,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -22218,10 +22153,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::ArrayDef::_unchecked_narrow (obj.in ());
-+  return IR_ArrayDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_length_get::TAO_ServerRequestInfo_IR_ArrayDef_length_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -22524,7 +22458,7 @@
- POA_IR::ArrayDef::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set::TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ArrayDef *tao_impl,
--    IR::IDLType_ptr element_type_def,
-+    IR_IDLType_ptr element_type_def,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -22596,6 +22530,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_ExceptionDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -22603,7 +22538,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:10 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ExceptionDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -22748,10 +22683,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:10 */
- static TAO_IR_ExceptionDef_Perfect_Hash_OpTable tao_IR_ExceptionDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -22777,9 +22711,9 @@
-   
- }
- 
--IR::_TAO_ExceptionDef_Proxy_Impl&
-+_TAO_ExceptionDef_Proxy_Impl&
- POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::ExceptionDef *object,
-+    IR_ExceptionDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -22811,7 +22745,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl,
-+              _TAO_ExceptionDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -22821,7 +22755,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_ExceptionDef_Remote_Proxy_Impl,
-+              _TAO_ExceptionDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -22838,26 +22772,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_ExceptionDef_Proxy_Broker *
--IR__TAO_ExceptionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_ExceptionDef_Proxy_Broker *
-+_TAO_ExceptionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_ExceptionDef_Strategized_Proxy_Broker::the_TAO_ExceptionDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_ExceptionDef_Proxy_Broker_Factory_function;
-+  _TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_ExceptionDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ExceptionDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -22900,7 +22834,7 @@
-       );
- }
- 
--IR::StructMemberSeq * POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::members (
-+IR_StructMemberSeq * POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::members (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -22908,7 +22842,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::StructMemberSeq_var _tao_retval;
-+    IR_StructMemberSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -22933,7 +22867,7 @@
- 
- void POA_IR::_TAO_ExceptionDef_ThruPOA_Proxy_Impl::members (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -22977,7 +22911,7 @@
- POA_IR::ExceptionDef::ExceptionDef (const ExceptionDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Container) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -23075,7 +23009,7 @@
- {
-   POA_IR::ExceptionDef *_tao_impl = (POA_IR::ExceptionDef *)_tao_object_reference;
-   
--    IR::StructMemberSeq_var _tao_retval;
-+  IR_StructMemberSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -23102,7 +23036,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::StructMemberSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_StructMemberSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -23156,14 +23090,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ExceptionDef *_tao_impl = (POA_IR::ExceptionDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::StructMemberSeq members;
-+  IR_StructMemberSeq members;
-   if (!(
-     (_tao_in >> members)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -23236,7 +23168,7 @@
-   POA_IR::ExceptionDef *_tao_impl = (POA_IR::ExceptionDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -23244,7 +23176,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -23261,7 +23193,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -23292,7 +23224,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Container:1.0") == 0)
-     return ACE_static_cast (POA_IR::Container_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -23308,24 +23240,6 @@
-   return "IDL:omg.org/IR/ExceptionDef:1.0";
- }
- 
--IR::ExceptionDef*
--POA_IR::ExceptionDef::_this (CORBA_Environment &ACE_TRY_ENV)
--{
--  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
--  ACE_CHECK_RETURN (0);
--  
--  CORBA::Object_ptr tmp = CORBA::Object::_nil ();
--  
--  if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
--    ACE_NEW_RETURN (tmp, CORBA::Object (stub, 1, this), 0);
--  else
--    ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
--  
--  CORBA::Object_var obj = tmp;
--  return ::IR::ExceptionDef::_unchecked_narrow (obj.in ());
--}
--
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_type_get::TAO_ServerRequestInfo_IR_ExceptionDef_type_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -23480,7 +23394,7 @@
- POA_IR::ExceptionDef::TAO_ServerRequestInfo_IR_ExceptionDef_members_set::TAO_ServerRequestInfo_IR_ExceptionDef_members_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ExceptionDef *tao_impl,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -23552,6 +23466,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_AttributeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -23559,7 +23474,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:10 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_AttributeDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -23690,10 +23605,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:10 */
- static TAO_IR_AttributeDef_Perfect_Hash_OpTable tao_IR_AttributeDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -23719,9 +23633,9 @@
-   
- }
- 
--IR::_TAO_AttributeDef_Proxy_Impl&
-+_TAO_AttributeDef_Proxy_Impl&
- POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::AttributeDef *object,
-+    IR_AttributeDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -23753,7 +23667,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl,
-+              _TAO_AttributeDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -23763,7 +23677,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_AttributeDef_Remote_Proxy_Impl,
-+              _TAO_AttributeDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -23780,26 +23694,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_AttributeDef_Proxy_Broker *
--IR__TAO_AttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_AttributeDef_Proxy_Broker *
-+_TAO_AttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_AttributeDef_Strategized_Proxy_Broker::the_TAO_AttributeDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_AttributeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_AttributeDef_Proxy_Broker_Factory_function;
-+  _TAO_AttributeDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_AttributeDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_AttributeDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_AttributeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_AttributeDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -23842,7 +23756,7 @@
-       );
- }
- 
--IR::IDLType_ptr POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
-+IR_IDLType_ptr POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -23850,7 +23764,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::IDLType_var _tao_retval;
-+    IR_IDLType_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -23875,7 +23789,7 @@
- 
- void POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::type_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr type_def,
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -23905,7 +23819,7 @@
-   return;
- }
- 
--IR::AttributeMode POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
-+IR_AttributeMode POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -23913,7 +23827,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::AttributeMode _tao_retval;
-+    IR_AttributeMode _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -23938,7 +23852,7 @@
- 
- void POA_IR::_TAO_AttributeDef_ThruPOA_Proxy_Impl::mode (
-     CORBA_Object *_collocated_tao_target_,
--    IR::AttributeMode mode,
-+    IR_AttributeMode mode,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -23981,7 +23895,7 @@
- // copy ctor
- POA_IR::AttributeDef::AttributeDef (const AttributeDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -24079,7 +23993,7 @@
- {
-   POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
-   
--    IR::IDLType_var _tao_retval;
-+  IR_IDLType_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -24106,7 +24020,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -24160,14 +24074,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::IDLType_var type_def;
-+  IR_IDLType_var type_def;
-   if (!(
-     (_tao_in >> type_def.out ())
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -24238,7 +24150,7 @@
- {
-   POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
-   
--    IR::AttributeMode _tao_retval;
-+  IR_AttributeMode _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -24265,7 +24177,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::AttributeMode _tao_retval_info = _tao_retval;
-+      IR_AttributeMode _tao_retval_info = _tao_retval;
-       ri.result (_tao_retval_info);
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-@@ -24318,14 +24230,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::AttributeMode mode;
-+  IR_AttributeMode mode;
-   if (!(
-     (_tao_in >> mode)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -24398,7 +24308,7 @@
-   POA_IR::AttributeDef *_tao_impl = (POA_IR::AttributeDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -24406,7 +24316,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -24423,7 +24333,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -24451,7 +24361,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-     return ACE_static_cast (POA_IR::Contained_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -24481,10 +24391,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::AttributeDef::_unchecked_narrow (obj.in ());
-+  return IR_AttributeDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_get::TAO_ServerRequestInfo_IR_AttributeDef_type_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -24639,7 +24548,7 @@
- POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set::TAO_ServerRequestInfo_IR_AttributeDef_type_def_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::AttributeDef *tao_impl,
--    IR::IDLType_ptr type_def,
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -24788,7 +24697,7 @@
- POA_IR::AttributeDef::TAO_ServerRequestInfo_IR_AttributeDef_mode_set::TAO_ServerRequestInfo_IR_AttributeDef_mode_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::AttributeDef *tao_impl,
--    IR::AttributeMode & mode,
-+    IR_AttributeMode & mode,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -24860,6 +24769,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_OperationDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -24867,7 +24777,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:10 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_OperationDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -25053,10 +24963,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:10 */
- static TAO_IR_OperationDef_Perfect_Hash_OpTable tao_IR_OperationDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -25082,9 +24991,9 @@
-   
- }
- 
--IR::_TAO_OperationDef_Proxy_Impl&
-+_TAO_OperationDef_Proxy_Impl&
- POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::OperationDef *object,
-+    IR_OperationDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -25116,7 +25025,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl,
-+              _TAO_OperationDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -25126,7 +25035,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_OperationDef_Remote_Proxy_Impl,
-+              _TAO_OperationDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -25143,26 +25052,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_OperationDef_Proxy_Broker *
--IR__TAO_OperationDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_OperationDef_Proxy_Broker *
-+_TAO_OperationDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_OperationDef_Strategized_Proxy_Broker::the_TAO_OperationDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_OperationDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_OperationDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_OperationDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_OperationDef_Proxy_Broker_Factory_function;
-+  _TAO_OperationDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_OperationDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_OperationDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_OperationDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_OperationDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_OperationDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -25205,7 +25114,7 @@
-       );
- }
- 
--IR::IDLType_ptr POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
-+IR_IDLType_ptr POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -25213,7 +25122,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::IDLType_var _tao_retval;
-+    IR_IDLType_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -25238,7 +25147,7 @@
- 
- void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::result_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr result_def,
-+    IR_IDLType_ptr result_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -25268,7 +25177,7 @@
-   return;
- }
- 
--IR::ParDescriptionSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
-+IR_ParDescriptionSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -25276,7 +25185,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::ParDescriptionSeq_var _tao_retval;
-+    IR_ParDescriptionSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -25301,7 +25210,7 @@
- 
- void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::params (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::ParDescriptionSeq & params,
-+    const IR_ParDescriptionSeq & params,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -25331,7 +25240,7 @@
-   return;
- }
- 
--IR::OperationMode POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
-+IR_OperationMode POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -25339,7 +25248,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::OperationMode _tao_retval;
-+    IR_OperationMode _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -25364,7 +25273,7 @@
- 
- void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::mode (
-     CORBA_Object *_collocated_tao_target_,
--    IR::OperationMode mode,
-+    IR_OperationMode mode,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -25394,7 +25303,7 @@
-   return;
- }
- 
--IR::ContextIdSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
-+IR_ContextIdSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -25402,7 +25311,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::ContextIdSeq_var _tao_retval;
-+    IR_ContextIdSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -25427,7 +25336,7 @@
- 
- void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::contexts (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::ContextIdSeq & contexts,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -25457,7 +25366,7 @@
-   return;
- }
- 
--IR::ExceptionDefSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::exceptions (
-+IR_ExceptionDefSeq * POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::exceptions (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -25465,7 +25374,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::ExceptionDefSeq_var _tao_retval;
-+    IR_ExceptionDefSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -25490,7 +25399,7 @@
- 
- void POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl::exceptions (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -25533,7 +25442,7 @@
- // copy ctor
- POA_IR::OperationDef::OperationDef (const OperationDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -25631,7 +25540,7 @@
- {
-   POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-   
--    IR::IDLType_var _tao_retval;
-+  IR_IDLType_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -25658,7 +25567,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -25712,14 +25621,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::IDLType_var result_def;
-+  IR_IDLType_var result_def;
-   if (!(
-     (_tao_in >> result_def.out ())
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -25790,7 +25697,7 @@
- {
-   POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-   
--    IR::ParDescriptionSeq_var _tao_retval;
-+  IR_ParDescriptionSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -25817,7 +25724,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ParDescriptionSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_ParDescriptionSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -25871,14 +25778,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::ParDescriptionSeq params;
-+  IR_ParDescriptionSeq params;
-   if (!(
-     (_tao_in >> params)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -25949,7 +25854,7 @@
- {
-   POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-   
--    IR::OperationMode _tao_retval;
-+  IR_OperationMode _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -25976,7 +25881,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::OperationMode _tao_retval_info = _tao_retval;
-+      IR_OperationMode _tao_retval_info = _tao_retval;
-       ri.result (_tao_retval_info);
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-       _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
-@@ -26029,14 +25934,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::OperationMode mode;
-+  IR_OperationMode mode;
-   if (!(
-     (_tao_in >> mode)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -26107,7 +26010,7 @@
- {
-   POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-   
--    IR::ContextIdSeq_var _tao_retval;
-+  IR_ContextIdSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -26134,7 +26037,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ContextIdSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_ContextIdSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -26188,14 +26091,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::ContextIdSeq contexts;
-+  IR_ContextIdSeq contexts;
-   if (!(
-     (_tao_in >> contexts)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -26266,7 +26167,7 @@
- {
-   POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-   
--    IR::ExceptionDefSeq_var _tao_retval;
-+  IR_ExceptionDefSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -26293,7 +26194,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ExceptionDefSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_ExceptionDefSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -26347,14 +26248,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::ExceptionDefSeq exceptions;
-+  IR_ExceptionDefSeq exceptions;
-   if (!(
-     (_tao_in >> exceptions)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -26427,7 +26326,7 @@
-   POA_IR::OperationDef *_tao_impl = (POA_IR::OperationDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -26435,7 +26334,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -26452,7 +26351,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -26480,7 +26379,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-     return ACE_static_cast (POA_IR::Contained_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -26510,10 +26409,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::OperationDef::_unchecked_narrow (obj.in ());
-+  return IR_OperationDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_get::TAO_ServerRequestInfo_IR_OperationDef_result_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -26668,7 +26566,7 @@
- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_result_def_set::TAO_ServerRequestInfo_IR_OperationDef_result_def_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::OperationDef *tao_impl,
--    IR::IDLType_ptr result_def,
-+    IR_IDLType_ptr result_def,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -26817,7 +26715,7 @@
- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_params_set::TAO_ServerRequestInfo_IR_OperationDef_params_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::OperationDef *tao_impl,
--    const IR::ParDescriptionSeq & params,
-+    const IR_ParDescriptionSeq & params,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -26966,7 +26864,7 @@
- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_mode_set::TAO_ServerRequestInfo_IR_OperationDef_mode_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::OperationDef *tao_impl,
--    IR::OperationMode & mode,
-+    IR_OperationMode & mode,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -27115,7 +27013,7 @@
- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_contexts_set::TAO_ServerRequestInfo_IR_OperationDef_contexts_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::OperationDef *tao_impl,
--    const IR::ContextIdSeq & contexts,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -27264,7 +27162,7 @@
- POA_IR::OperationDef::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set::TAO_ServerRequestInfo_IR_OperationDef_exceptions_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::OperationDef *tao_impl,
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -27336,6 +27234,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_InterfaceDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -27343,7 +27242,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:10 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_InterfaceDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -27496,10 +27395,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:10 */
- static TAO_IR_InterfaceDef_Perfect_Hash_OpTable tao_IR_InterfaceDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -27525,9 +27423,9 @@
-   
- }
- 
--IR::_TAO_InterfaceDef_Proxy_Impl&
-+_TAO_InterfaceDef_Proxy_Impl&
- POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::InterfaceDef *object,
-+    IR_InterfaceDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -27559,7 +27457,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl,
-+              _TAO_InterfaceDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -27569,7 +27467,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_InterfaceDef_Remote_Proxy_Impl,
-+              _TAO_InterfaceDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -27586,26 +27484,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_InterfaceDef_Proxy_Broker *
--IR__TAO_InterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_InterfaceDef_Proxy_Broker *
-+_TAO_InterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_InterfaceDef_Strategized_Proxy_Broker::the_TAO_InterfaceDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_InterfaceDef_Proxy_Broker_Factory_function;
-+  _TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_InterfaceDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_InterfaceDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -27617,7 +27515,7 @@
- 
- // ThruPOA Implementation of the IDL interface methods
- 
--IR::InterfaceDefSeq * POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
-+IR_InterfaceDefSeq * POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -27625,7 +27523,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::InterfaceDefSeq_var _tao_retval;
-+    IR_InterfaceDefSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -27650,7 +27548,7 @@
- 
- void POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -27839,22 +27737,22 @@
-       );
- }
- 
--IR::AttributeDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
-+IR_AttributeDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_attribute (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+    IR_IDLType_ptr type,
-+    IR_AttributeMode mode,
-+    const IR_ExceptionDefSeq & get_exceptions,
-+    const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::AttributeDef_var _tao_retval;
-+    IR_AttributeDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -27884,23 +27782,23 @@
-       );
- }
- 
--IR::OperationDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
-+IR_OperationDef_ptr POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl::create_operation (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+    IR_IDLType_ptr result,
-+    IR_OperationMode mode,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::OperationDef_var _tao_retval;
-+    IR_OperationDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -27946,7 +27844,7 @@
-   :   ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-     ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -27964,7 +27862,7 @@
- {
-   POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
-   
--    IR::InterfaceDefSeq_var _tao_retval;
-+  IR_InterfaceDefSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -27991,7 +27889,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -28045,14 +27943,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::InterfaceDefSeq base_interfaces;
-+  IR_InterfaceDefSeq base_interfaces;
-   if (!(
-     (_tao_in >> base_interfaces)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -28203,14 +28099,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
-     CORBA::Boolean is_abstract;
-   if (!(
-     (_tao_in >> CORBA::Any::to_boolean (is_abstract))
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -28361,14 +28255,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
-     CORBA::Boolean is_local;
-   if (!(
-     (_tao_in >> CORBA::Any::to_boolean (is_local))
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -28447,7 +28339,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -28528,14 +28419,14 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
-   
--    IR::AttributeDef_var _tao_retval;
-+  IR_AttributeDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::IDLType_var type;
--  IR::AttributeMode mode;
--  IR::ExceptionDefSeq get_exceptions;
--  IR::ExceptionDefSeq put_exceptions;
-+  IR_IDLType_var type;
-+  IR_AttributeMode mode;
-+  IR_ExceptionDefSeq get_exceptions;
-+  IR_ExceptionDefSeq put_exceptions;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -28547,7 +28438,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -28587,7 +28477,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -28641,15 +28531,15 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *)_tao_object_reference;
-   
--    IR::OperationDef_var _tao_retval;
-+  IR_OperationDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::IDLType_var result;
--  IR::OperationMode mode;
--  IR::ParDescriptionSeq params;
--  IR::ExceptionDefSeq exceptions;
--  IR::ContextIdSeq contexts;
-+  IR_IDLType_var result;
-+  IR_OperationMode mode;
-+  IR_ParDescriptionSeq params;
-+  IR_ExceptionDefSeq exceptions;
-+  IR_ContextIdSeq contexts;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -28662,7 +28552,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -28704,7 +28593,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -28759,7 +28648,7 @@
-   POA_IR::InterfaceDef *_tao_impl = (POA_IR::InterfaceDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -28767,7 +28656,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -28784,7 +28673,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -28818,7 +28707,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -28848,10 +28737,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::InterfaceDef::_unchecked_narrow (obj.in ());
-+  return IR_InterfaceDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -28931,7 +28819,7 @@
- POA_IR::InterfaceDef::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set::TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::InterfaceDef *tao_impl,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -29388,10 +29276,10 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode & mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+    IR_IDLType_ptr type,
-+    IR_AttributeMode & mode,
-+    const IR_ExceptionDefSeq & get_exceptions,
-+    const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -29518,11 +29406,11 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode & mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+    IR_IDLType_ptr result,
-+    IR_OperationMode & mode,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -29651,6 +29539,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_ValueMemberDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -29658,7 +29547,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:10 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ValueMemberDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -29789,10 +29678,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:10 */
- static TAO_IR_ValueMemberDef_Perfect_Hash_OpTable tao_IR_ValueMemberDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -29818,9 +29706,9 @@
-   
- }
- 
--IR::_TAO_ValueMemberDef_Proxy_Impl&
-+_TAO_ValueMemberDef_Proxy_Impl&
- POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::ValueMemberDef *object,
-+    IR_ValueMemberDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -29852,7 +29740,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl,
-+              _TAO_ValueMemberDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -29862,7 +29750,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_ValueMemberDef_Remote_Proxy_Impl,
-+              _TAO_ValueMemberDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -29879,26 +29767,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_ValueMemberDef_Proxy_Broker *
--IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_ValueMemberDef_Proxy_Broker *
-+_TAO_ValueMemberDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_ValueMemberDef_Strategized_Proxy_Broker::the_TAO_ValueMemberDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function;
-+  _TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_ValueMemberDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -29941,7 +29829,7 @@
-       );
- }
- 
--IR::IDLType_ptr POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
-+IR_IDLType_ptr POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -29949,7 +29837,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::IDLType_var _tao_retval;
-+    IR_IDLType_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -29974,7 +29862,7 @@
- 
- void POA_IR::_TAO_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr type_def,
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -30080,7 +29968,7 @@
- // copy ctor
- POA_IR::ValueMemberDef::ValueMemberDef (const ValueMemberDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -30178,7 +30066,7 @@
- {
-   POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *)_tao_object_reference;
-   
--    IR::IDLType_var _tao_retval;
-+  IR_IDLType_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -30205,7 +30093,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -30259,14 +30147,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::IDLType_var type_def;
-+  IR_IDLType_var type_def;
-   if (!(
-     (_tao_in >> type_def.out ())
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -30417,14 +30303,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
-     CORBA::Visibility access;
-   if (!(
-     (_tao_in >> access)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -30497,7 +30381,7 @@
-   POA_IR::ValueMemberDef *_tao_impl = (POA_IR::ValueMemberDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -30505,7 +30389,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -30522,7 +30406,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -30550,7 +30434,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-     return ACE_static_cast (POA_IR::Contained_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -30580,10 +30464,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::ValueMemberDef::_unchecked_narrow (obj.in ());
-+  return IR_ValueMemberDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get::TAO_ServerRequestInfo_IR_ValueMemberDef_type_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -30738,7 +30621,7 @@
- POA_IR::ValueMemberDef::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ValueMemberDef *tao_impl,
--    IR::IDLType_ptr type_def,
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -30958,6 +30841,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_ValueDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -30965,7 +30849,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:11 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ValueDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -31129,10 +31013,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:11 */
- static TAO_IR_ValueDef_Perfect_Hash_OpTable tao_IR_ValueDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -31158,9 +31041,9 @@
-   
- }
- 
--IR::_TAO_ValueDef_Proxy_Impl&
-+_TAO_ValueDef_Proxy_Impl&
- POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::ValueDef *object,
-+    IR_ValueDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -31192,7 +31075,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl,
-+              _TAO_ValueDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -31202,7 +31085,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_ValueDef_Remote_Proxy_Impl,
-+              _TAO_ValueDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -31219,26 +31102,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_ValueDef_Proxy_Broker *
--IR__TAO_ValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_ValueDef_Proxy_Broker *
-+_TAO_ValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_ValueDef_Strategized_Proxy_Broker::the_TAO_ValueDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_ValueDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_ValueDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_ValueDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_ValueDef_Proxy_Broker_Factory_function;
-+  _TAO_ValueDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_ValueDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_ValueDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ValueDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_ValueDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ValueDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -31250,7 +31133,7 @@
- 
- // ThruPOA Implementation of the IDL interface methods
- 
--IR::InterfaceDefSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
-+IR_InterfaceDefSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -31258,7 +31141,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::InterfaceDefSeq_var _tao_retval;
-+    IR_InterfaceDefSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -31283,7 +31166,7 @@
- 
- void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::InterfaceDefSeq & supported_interfaces,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -31313,7 +31196,7 @@
-   return;
- }
- 
--IR::InitializerSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializers (
-+IR_InitializerSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializers (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -31321,7 +31204,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::InitializerSeq_var _tao_retval;
-+    IR_InitializerSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -31346,7 +31229,7 @@
- 
- void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::initializers (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::InitializerSeq & initializers,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -31376,7 +31259,7 @@
-   return;
- }
- 
--IR::ValueDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
-+IR_ValueDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -31384,7 +31267,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::ValueDef_var _tao_retval;
-+    IR_ValueDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -31409,7 +31292,7 @@
- 
- void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::base_value (
-     CORBA_Object *_collocated_tao_target_,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -31439,7 +31322,7 @@
-   return;
- }
- 
--IR::ValueDefSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
-+IR_ValueDefSeq * POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -31447,7 +31330,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::ValueDefSeq_var _tao_retval;
-+    IR_ValueDefSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -31472,7 +31355,7 @@
- 
- void POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::ValueDefSeq & abstract_base_values,
-+    const IR_ValueDefSeq & abstract_base_values,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -31724,12 +31607,12 @@
-       );
- }
- 
--IR::ValueMemberDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_value_member (
-+IR_ValueMemberDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_value_member (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     CORBA::Visibility access,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -31737,7 +31620,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::ValueMemberDef_var _tao_retval;
-+    IR_ValueMemberDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -31765,22 +31648,22 @@
-       );
- }
- 
--IR::AttributeDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_attribute (
-+IR_AttributeDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_attribute (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+    IR_IDLType_ptr type,
-+    IR_AttributeMode mode,
-+    const IR_ExceptionDefSeq & get_exceptions,
-+    const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::AttributeDef_var _tao_retval;
-+    IR_AttributeDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -31810,23 +31693,23 @@
-       );
- }
- 
--IR::OperationDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_operation (
-+IR_OperationDef_ptr POA_IR::_TAO_ValueDef_ThruPOA_Proxy_Impl::create_operation (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+    IR_IDLType_ptr result,
-+    IR_OperationMode mode,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::OperationDef_var _tao_retval;
-+    IR_OperationDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -31872,7 +31755,7 @@
-   :   ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-     ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -31890,7 +31773,7 @@
- {
-   POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-   
--    IR::InterfaceDefSeq_var _tao_retval;
-+  IR_InterfaceDefSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -31917,7 +31800,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -31971,14 +31854,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::InterfaceDefSeq supported_interfaces;
-+  IR_InterfaceDefSeq supported_interfaces;
-   if (!(
-     (_tao_in >> supported_interfaces)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -32049,7 +31930,7 @@
- {
-   POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-   
--    IR::InitializerSeq_var _tao_retval;
-+  IR_InitializerSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -32076,7 +31957,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::InitializerSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_InitializerSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -32130,14 +32011,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::InitializerSeq initializers;
-+  IR_InitializerSeq initializers;
-   if (!(
-     (_tao_in >> initializers)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -32208,7 +32087,7 @@
- {
-   POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-   
--    IR::ValueDef_var _tao_retval;
-+  IR_ValueDef_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -32235,7 +32114,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -32289,14 +32168,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::ValueDef_var base_value;
-+  IR_ValueDef_var base_value;
-   if (!(
-     (_tao_in >> base_value.out ())
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -32367,7 +32244,7 @@
- {
-   POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-   
--    IR::ValueDefSeq_var _tao_retval;
-+  IR_ValueDefSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -32394,7 +32271,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ValueDefSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_ValueDefSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -32448,14 +32325,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::ValueDefSeq abstract_base_values;
-+  IR_ValueDefSeq abstract_base_values;
-   if (!(
-     (_tao_in >> abstract_base_values)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -32606,14 +32481,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
-     CORBA::Boolean is_abstract;
-   if (!(
-     (_tao_in >> CORBA::Any::to_boolean (is_abstract))
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -32764,14 +32637,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
-     CORBA::Boolean is_custom;
-   if (!(
-     (_tao_in >> CORBA::Any::to_boolean (is_custom))
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -32922,14 +32793,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
-     CORBA::Boolean is_truncatable;
-   if (!(
-     (_tao_in >> CORBA::Any::to_boolean (is_truncatable))
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -33008,7 +32877,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -33089,11 +32957,11 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-   
--    IR::ValueMemberDef_var _tao_retval;
-+  IR_ValueMemberDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::IDLType_var type;
-+  IR_IDLType_var type;
-   CORBA::Visibility access;
-   if (!(
-     (_tao_in >> id.out ()) &&
-@@ -33104,7 +32972,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -33140,7 +33007,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ValueMemberDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_ValueMemberDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -33194,14 +33061,14 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-   
--    IR::AttributeDef_var _tao_retval;
-+  IR_AttributeDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::IDLType_var type;
--  IR::AttributeMode mode;
--  IR::ExceptionDefSeq get_exceptions;
--  IR::ExceptionDefSeq put_exceptions;
-+  IR_IDLType_var type;
-+  IR_AttributeMode mode;
-+  IR_ExceptionDefSeq get_exceptions;
-+  IR_ExceptionDefSeq put_exceptions;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -33213,7 +33080,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -33253,7 +33119,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_AttributeDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -33307,15 +33173,15 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *)_tao_object_reference;
-   
--    IR::OperationDef_var _tao_retval;
-+  IR_OperationDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::IDLType_var result;
--  IR::OperationMode mode;
--  IR::ParDescriptionSeq params;
--  IR::ExceptionDefSeq exceptions;
--  IR::ContextIdSeq contexts;
-+  IR_IDLType_var result;
-+  IR_OperationMode mode;
-+  IR_ParDescriptionSeq params;
-+  IR_ExceptionDefSeq exceptions;
-+  IR_ContextIdSeq contexts;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -33328,7 +33194,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -33370,7 +33235,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_OperationDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -33425,7 +33290,7 @@
-   POA_IR::ValueDef *_tao_impl = (POA_IR::ValueDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -33433,7 +33298,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -33450,7 +33315,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -33484,7 +33349,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -33514,10 +33379,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::ValueDef::_unchecked_narrow (obj.in ());
-+  return IR_ValueDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -33597,7 +33461,7 @@
- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set::TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ValueDef *tao_impl,
--    const IR::InterfaceDefSeq & supported_interfaces,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -33746,7 +33610,7 @@
- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_initializers_set::TAO_ServerRequestInfo_IR_ValueDef_initializers_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ValueDef *tao_impl,
--    const IR::InitializerSeq & initializers,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -33895,7 +33759,7 @@
- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_base_value_set::TAO_ServerRequestInfo_IR_ValueDef_base_value_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ValueDef *tao_impl,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -34044,7 +33908,7 @@
- POA_IR::ValueDef::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set::TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ValueDef *tao_impl,
--    const IR::ValueDefSeq & abstract_base_values,
-+    const IR_ValueDefSeq & abstract_base_values,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -34649,7 +34513,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Visibility & access,
-     CORBA::Environment &
-   )
-@@ -34762,10 +34626,10 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode & mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+    IR_IDLType_ptr type,
-+    IR_AttributeMode & mode,
-+    const IR_ExceptionDefSeq & get_exceptions,
-+    const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -34892,11 +34756,11 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode & mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+    IR_IDLType_ptr result,
-+    IR_OperationMode & mode,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -35025,6 +34889,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_ValueBoxDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -35032,7 +34897,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:28 */
-+/* starting time is 11:23:11 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ValueBoxDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -35161,10 +35026,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:28 */
-+/* ending time is 11:23:11 */
- static TAO_IR_ValueBoxDef_Perfect_Hash_OpTable tao_IR_ValueBoxDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -35190,9 +35054,9 @@
-   
- }
- 
--IR::_TAO_ValueBoxDef_Proxy_Impl&
-+_TAO_ValueBoxDef_Proxy_Impl&
- POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::ValueBoxDef *object,
-+    IR_ValueBoxDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -35224,7 +35088,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl,
-+              _TAO_ValueBoxDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -35234,7 +35098,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_ValueBoxDef_Remote_Proxy_Impl,
-+              _TAO_ValueBoxDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -35251,26 +35115,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_ValueBoxDef_Proxy_Broker *
--IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_ValueBoxDef_Proxy_Broker *
-+_TAO_ValueBoxDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_ValueBoxDef_Strategized_Proxy_Broker::the_TAO_ValueBoxDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function;
-+  _TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_ValueBoxDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -35282,7 +35146,7 @@
- 
- // ThruPOA Implementation of the IDL interface methods
- 
--IR::IDLType_ptr POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
-+IR_IDLType_ptr POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -35290,7 +35154,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::IDLType_var _tao_retval;
-+    IR_IDLType_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -35315,7 +35179,7 @@
- 
- void POA_IR::_TAO_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -35360,7 +35224,7 @@
-   :   ACE_NESTED_CLASS (POA_IR,TypedefDef) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-     ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -35378,7 +35242,7 @@
- {
-   POA_IR::ValueBoxDef *_tao_impl = (POA_IR::ValueBoxDef *)_tao_object_reference;
-   
--    IR::IDLType_var _tao_retval;
-+  IR_IDLType_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -35405,7 +35269,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_IDLType_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -35459,14 +35323,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ValueBoxDef *_tao_impl = (POA_IR::ValueBoxDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::IDLType_var original_type_def;
-+  IR_IDLType_var original_type_def;
-   if (!(
-     (_tao_in >> original_type_def.out ())
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -35539,7 +35401,7 @@
-   POA_IR::ValueBoxDef *_tao_impl = (POA_IR::ValueBoxDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -35547,7 +35409,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -35564,7 +35426,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -35598,7 +35460,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -35628,10 +35490,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::ValueBoxDef::_unchecked_narrow (obj.in ());
-+  return IR_ValueBoxDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -35711,7 +35572,7 @@
- POA_IR::ValueBoxDef::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set::TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ValueBoxDef *tao_impl,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -35783,6 +35644,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_ProvidesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -35790,7 +35652,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:29 */
-+/* starting time is 11:23:11 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ProvidesDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -35917,10 +35779,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:29 */
-+/* ending time is 11:23:11 */
- static TAO_IR_ProvidesDef_Perfect_Hash_OpTable tao_IR_ProvidesDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -35946,9 +35807,9 @@
-   
- }
- 
--IR::_TAO_ProvidesDef_Proxy_Impl&
-+_TAO_ProvidesDef_Proxy_Impl&
- POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::ProvidesDef *object,
-+    IR_ProvidesDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -35980,7 +35841,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl,
-+              _TAO_ProvidesDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -35990,7 +35851,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_ProvidesDef_Remote_Proxy_Impl,
-+              _TAO_ProvidesDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -36007,26 +35868,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_ProvidesDef_Proxy_Broker *
--IR__TAO_ProvidesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_ProvidesDef_Proxy_Broker *
-+_TAO_ProvidesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::the_TAO_ProvidesDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_ProvidesDef_Proxy_Broker_Factory_function;
-+  _TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_ProvidesDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ProvidesDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -36038,7 +35899,7 @@
- 
- // ThruPOA Implementation of the IDL interface methods
- 
--IR::InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_type (
-+IR_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_type (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -36046,7 +35907,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::InterfaceDef_var _tao_retval;
-+    IR_InterfaceDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -36082,7 +35943,7 @@
- // copy ctor
- POA_IR::ProvidesDef::ProvidesDef (const ProvidesDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -36100,7 +35961,7 @@
- {
-   POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *)_tao_object_reference;
-   
--    IR::InterfaceDef_var _tao_retval;
-+  IR_InterfaceDef_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -36127,7 +35988,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -36182,7 +36043,7 @@
-   POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -36190,7 +36051,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -36207,7 +36068,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -36235,7 +36096,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-     return ACE_static_cast (POA_IR::Contained_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -36265,10 +36126,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::ProvidesDef::_unchecked_narrow (obj.in ());
-+  return IR_ProvidesDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::ProvidesDef::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -36346,6 +36206,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_UsesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -36353,7 +36214,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:29 */
-+/* starting time is 11:23:11 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_UsesDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -36481,10 +36342,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:29 */
-+/* ending time is 11:23:11 */
- static TAO_IR_UsesDef_Perfect_Hash_OpTable tao_IR_UsesDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -36510,9 +36370,9 @@
-   
- }
- 
--IR::_TAO_UsesDef_Proxy_Impl&
-+_TAO_UsesDef_Proxy_Impl&
- POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::UsesDef *object,
-+    IR_UsesDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -36544,7 +36404,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl,
-+              _TAO_UsesDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -36554,7 +36414,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_UsesDef_Remote_Proxy_Impl,
-+              _TAO_UsesDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -36571,26 +36431,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_UsesDef_Proxy_Broker *
--IR__TAO_UsesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_UsesDef_Proxy_Broker *
-+_TAO_UsesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::the_TAO_UsesDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_UsesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_UsesDef_Proxy_Broker_Factory_function;
-+  _TAO_UsesDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_UsesDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_UsesDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_UsesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_UsesDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -36602,7 +36462,7 @@
- 
- // ThruPOA Implementation of the IDL interface methods
- 
--IR::InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
-+IR_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -36610,7 +36470,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::InterfaceDef_var _tao_retval;
-+    IR_InterfaceDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -36677,7 +36537,7 @@
- // copy ctor
- POA_IR::UsesDef::UsesDef (const UsesDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -36695,7 +36555,7 @@
- {
-   POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *)_tao_object_reference;
-   
--    IR::InterfaceDef_var _tao_retval;
-+  IR_InterfaceDef_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -36722,7 +36582,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_InterfaceDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -36856,7 +36716,7 @@
-   POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -36864,7 +36724,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -36881,7 +36741,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -36909,7 +36769,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-     return ACE_static_cast (POA_IR::Contained_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -36939,10 +36799,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::UsesDef::_unchecked_narrow (obj.in ());
-+  return IR_UsesDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::UsesDef::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -37095,6 +36954,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_EventDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -37102,7 +36962,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:29 */
-+/* starting time is 11:23:11 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EventDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -37230,10 +37090,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:29 */
-+/* ending time is 11:23:11 */
- static TAO_IR_EventDef_Perfect_Hash_OpTable tao_IR_EventDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -37259,9 +37118,9 @@
-   
- }
- 
--IR::_TAO_EventDef_Proxy_Impl&
-+_TAO_EventDef_Proxy_Impl&
- POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::EventDef *object,
-+    IR_EventDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -37293,7 +37152,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl,
-+              _TAO_EventDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -37303,7 +37162,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_EventDef_Remote_Proxy_Impl,
-+              _TAO_EventDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -37320,26 +37179,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_EventDef_Proxy_Broker *
--IR__TAO_EventDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_EventDef_Proxy_Broker *
-+_TAO_EventDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::the_TAO_EventDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_EventDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_EventDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_EventDef_Proxy_Broker_Factory_function;
-+  _TAO_EventDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_EventDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_EventDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_EventDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_EventDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_EventDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -37384,7 +37243,7 @@
-       );
- }
- 
--IR::ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
-+IR_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -37392,7 +37251,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::ValueDef_var _tao_retval;
-+    IR_ValueDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -37428,7 +37287,7 @@
- // copy ctor
- POA_IR::EventDef::EventDef (const EventDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -37454,7 +37313,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -37534,7 +37392,7 @@
- {
-   POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *)_tao_object_reference;
-   
--    IR::ValueDef_var _tao_retval;
-+  IR_ValueDef_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -37561,7 +37419,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -37616,7 +37474,7 @@
-   POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -37624,7 +37482,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -37641,7 +37499,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -37669,7 +37527,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-     return ACE_static_cast (POA_IR::Contained_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -37699,10 +37557,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::EventDef::_unchecked_narrow (obj.in ());
-+  return IR_EventDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::EventDef::TAO_ServerRequestInfo_IR_EventDef_is_a::TAO_ServerRequestInfo_IR_EventDef_is_a (
-     TAO_ServerRequest &_tao_server_request,
-@@ -37864,6 +37721,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_EmitsDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -37871,7 +37729,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:29 */
-+/* starting time is 11:23:11 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_EmitsDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -37999,10 +37857,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:29 */
-+/* ending time is 11:23:11 */
- static TAO_IR_EmitsDef_Perfect_Hash_OpTable tao_IR_EmitsDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -38028,9 +37885,9 @@
-   
- }
- 
--IR::_TAO_EmitsDef_Proxy_Impl&
-+_TAO_EmitsDef_Proxy_Impl&
- POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::EmitsDef *object,
-+    IR_EmitsDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -38062,7 +37919,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_EmitsDef_ThruPOA_Proxy_Impl,
-+              _TAO_EmitsDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -38072,7 +37929,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_EmitsDef_Remote_Proxy_Impl,
-+              _TAO_EmitsDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -38089,26 +37946,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_EmitsDef_Proxy_Broker *
--IR__TAO_EmitsDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_EmitsDef_Proxy_Broker *
-+_TAO_EmitsDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::the_TAO_EmitsDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_EmitsDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_EmitsDef_Proxy_Broker_Factory_function;
-+  _TAO_EmitsDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_EmitsDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_EmitsDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_EmitsDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -38134,7 +37991,7 @@
- POA_IR::EmitsDef::EmitsDef (const EmitsDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,EventDef) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -38154,7 +38011,7 @@
-   POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -38162,7 +38019,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -38179,7 +38036,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -38210,7 +38067,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-     return ACE_static_cast (POA_IR::Contained_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -38240,12 +38097,12 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::EmitsDef::_unchecked_narrow (obj.in ());
-+  return IR_EmitsDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_PublishesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -38253,7 +38110,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:29 */
-+/* starting time is 11:23:11 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PublishesDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -38381,10 +38238,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:29 */
-+/* ending time is 11:23:11 */
- static TAO_IR_PublishesDef_Perfect_Hash_OpTable tao_IR_PublishesDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -38410,9 +38266,9 @@
-   
- }
- 
--IR::_TAO_PublishesDef_Proxy_Impl&
-+_TAO_PublishesDef_Proxy_Impl&
- POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::PublishesDef *object,
-+    IR_PublishesDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -38444,7 +38300,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_PublishesDef_ThruPOA_Proxy_Impl,
-+              _TAO_PublishesDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -38454,7 +38310,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_PublishesDef_Remote_Proxy_Impl,
-+              _TAO_PublishesDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -38471,26 +38327,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_PublishesDef_Proxy_Broker *
--IR__TAO_PublishesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_PublishesDef_Proxy_Broker *
-+_TAO_PublishesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::the_TAO_PublishesDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_PublishesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_PublishesDef_Proxy_Broker_Factory_function;
-+  _TAO_PublishesDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_PublishesDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_PublishesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_PublishesDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -38516,7 +38372,7 @@
- POA_IR::PublishesDef::PublishesDef (const PublishesDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,EventDef) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -38536,7 +38392,7 @@
-   POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -38544,7 +38400,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -38561,7 +38417,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -38592,7 +38448,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-     return ACE_static_cast (POA_IR::Contained_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -38622,12 +38478,12 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::PublishesDef::_unchecked_narrow (obj.in ());
-+  return IR_PublishesDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_ConsumesDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -38635,7 +38491,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:29 */
-+/* starting time is 11:23:11 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ConsumesDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -38763,10 +38619,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:29 */
-+/* ending time is 11:23:11 */
- static TAO_IR_ConsumesDef_Perfect_Hash_OpTable tao_IR_ConsumesDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -38792,9 +38647,9 @@
-   
- }
- 
--IR::_TAO_ConsumesDef_Proxy_Impl&
-+_TAO_ConsumesDef_Proxy_Impl&
- POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::ConsumesDef *object,
-+    IR_ConsumesDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -38826,7 +38681,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_ConsumesDef_ThruPOA_Proxy_Impl,
-+              _TAO_ConsumesDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -38836,7 +38691,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_ConsumesDef_Remote_Proxy_Impl,
-+              _TAO_ConsumesDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -38853,26 +38708,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_ConsumesDef_Proxy_Broker *
--IR__TAO_ConsumesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_ConsumesDef_Proxy_Broker *
-+_TAO_ConsumesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::the_TAO_ConsumesDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_ConsumesDef_Proxy_Broker_Factory_function;
-+  _TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_ConsumesDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ConsumesDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -38898,7 +38753,7 @@
- POA_IR::ConsumesDef::ConsumesDef (const ConsumesDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,EventDef) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -38918,7 +38773,7 @@
-   POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -38926,7 +38781,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -38943,7 +38798,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -38974,7 +38829,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-     return ACE_static_cast (POA_IR::Contained_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -39004,12 +38859,12 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::ConsumesDef::_unchecked_narrow (obj.in ());
-+  return IR_ConsumesDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_ComponentDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -39017,7 +38872,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:29 */
-+/* starting time is 11:23:11 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_ComponentDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -39185,10 +39040,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:29 */
-+/* ending time is 11:23:11 */
- static TAO_IR_ComponentDef_Perfect_Hash_OpTable tao_IR_ComponentDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -39214,9 +39068,9 @@
-   
- }
- 
--IR::_TAO_ComponentDef_Proxy_Impl&
-+_TAO_ComponentDef_Proxy_Impl&
- POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::ComponentDef *object,
-+    IR_ComponentDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -39248,7 +39102,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl,
-+              _TAO_ComponentDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -39258,7 +39112,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_ComponentDef_Remote_Proxy_Impl,
-+              _TAO_ComponentDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -39275,26 +39129,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_ComponentDef_Proxy_Broker *
--IR__TAO_ComponentDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_ComponentDef_Proxy_Broker *
-+_TAO_ComponentDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::the_TAO_ComponentDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_ComponentDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_ComponentDef_Proxy_Broker_Factory_function;
-+  _TAO_ComponentDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_ComponentDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_ComponentDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_ComponentDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -39306,7 +39160,7 @@
- 
- // ThruPOA Implementation of the IDL interface methods
- 
--IR::InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
-+IR_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -39314,7 +39168,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::InterfaceDefSeq_var _tao_retval;
-+    IR_InterfaceDefSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -39339,7 +39193,7 @@
- 
- void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::InterfaceDefSeq & supported_interfaces,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -39369,7 +39223,7 @@
-   return;
- }
- 
--IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_component (
-+IR_ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_component (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -39377,7 +39231,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::ComponentDef_var _tao_retval;
-+    IR_ComponentDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -39400,7 +39254,7 @@
-       );
- }
- 
--IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_interfaces (
-+IR_ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_interfaces (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -39408,7 +39262,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::ProvidesDefSeq_var _tao_retval;
-+    IR_ProvidesDefSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -39431,7 +39285,7 @@
-       );
- }
- 
--IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
-+IR_UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -39439,7 +39293,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::UsesDefSeq_var _tao_retval;
-+    IR_UsesDefSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -39462,7 +39316,7 @@
-       );
- }
- 
--IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
-+IR_EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -39470,7 +39324,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::EmitsDefSeq_var _tao_retval;
-+    IR_EmitsDefSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -39493,7 +39347,7 @@
-       );
- }
- 
--IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_events (
-+IR_PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_events (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -39501,7 +39355,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::PublishesDefSeq_var _tao_retval;
-+    IR_PublishesDefSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -39524,7 +39378,7 @@
-       );
- }
- 
--IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_events (
-+IR_ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_events (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -39532,7 +39386,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::ConsumesDefSeq_var _tao_retval;
-+    IR_ConsumesDefSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -39586,19 +39440,19 @@
-       );
- }
- 
--IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provides (
-+IR_ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provides (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::InterfaceDef_ptr interface_type,
-+    IR_InterfaceDef_ptr interface_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::ProvidesDef_var _tao_retval;
-+    IR_ProvidesDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -39625,12 +39479,12 @@
-       );
- }
- 
--IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
-+IR_UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::InterfaceDef_ptr interface_type,
-+    IR_InterfaceDef_ptr interface_type,
-     CORBA::Boolean is_multiple,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -39638,7 +39492,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::UsesDef_var _tao_retval;
-+    IR_UsesDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -39666,19 +39520,19 @@
-       );
- }
- 
--IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
-+IR_EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::EmitsDef_var _tao_retval;
-+    IR_EmitsDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -39705,19 +39559,19 @@
-       );
- }
- 
--IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publishes (
-+IR_PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publishes (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::PublishesDef_var _tao_retval;
-+    IR_PublishesDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -39744,19 +39598,19 @@
-       );
- }
- 
--IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consumes (
-+IR_ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consumes (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::ConsumesDef_var _tao_retval;
-+    IR_ConsumesDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -39799,7 +39653,7 @@
-     ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-     ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -39817,7 +39671,7 @@
- {
-   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-   
--    IR::InterfaceDefSeq_var _tao_retval;
-+  IR_InterfaceDefSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -39844,7 +39698,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_InterfaceDefSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -39898,14 +39752,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-   
--  _tao_server_request.argument_flag (0);
--    IR::InterfaceDefSeq supported_interfaces;
-+  IR_InterfaceDefSeq supported_interfaces;
-   if (!(
-     (_tao_in >> supported_interfaces)
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -39976,7 +39828,7 @@
- {
-   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-   
--    IR::ComponentDef_var _tao_retval;
-+  IR_ComponentDef_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -40003,7 +39855,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -40056,7 +39908,7 @@
- {
-   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-   
--    IR::ProvidesDefSeq_var _tao_retval;
-+  IR_ProvidesDefSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -40083,7 +39935,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ProvidesDefSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_ProvidesDefSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -40136,7 +39988,7 @@
- {
-   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-   
--    IR::UsesDefSeq_var _tao_retval;
-+  IR_UsesDefSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -40163,7 +40015,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::UsesDefSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_UsesDefSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -40216,7 +40068,7 @@
- {
-   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-   
--    IR::EmitsDefSeq_var _tao_retval;
-+  IR_EmitsDefSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -40243,7 +40095,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::EmitsDefSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_EmitsDefSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -40296,7 +40148,7 @@
- {
-   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-   
--    IR::PublishesDefSeq_var _tao_retval;
-+  IR_PublishesDefSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -40323,7 +40175,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::PublishesDefSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_PublishesDefSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -40376,7 +40228,7 @@
- {
-   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-   
--    IR::ConsumesDefSeq_var _tao_retval;
-+  IR_ConsumesDefSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -40403,7 +40255,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ConsumesDefSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_ConsumesDefSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -40536,11 +40388,11 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-   
--    IR::ProvidesDef_var _tao_retval;
-+  IR_ProvidesDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::InterfaceDef_var interface_type;
-+  IR_InterfaceDef_var interface_type;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -40549,7 +40401,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -40583,7 +40434,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ProvidesDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_ProvidesDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -40637,11 +40488,11 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-   
--    IR::UsesDef_var _tao_retval;
-+  IR_UsesDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::InterfaceDef_var interface_type;
-+  IR_InterfaceDef_var interface_type;
-   CORBA::Boolean is_multiple;
-   if (!(
-     (_tao_in >> id.out ()) &&
-@@ -40652,7 +40503,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -40688,7 +40538,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::UsesDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_UsesDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -40742,11 +40592,11 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-   
--    IR::EmitsDef_var _tao_retval;
-+  IR_EmitsDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::ValueDef_var value;
-+  IR_ValueDef_var value;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -40755,7 +40605,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -40789,7 +40638,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::EmitsDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_EmitsDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -40843,11 +40692,11 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-   
--    IR::PublishesDef_var _tao_retval;
-+  IR_PublishesDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::ValueDef_var value;
-+  IR_ValueDef_var value;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -40856,7 +40705,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -40890,7 +40738,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::PublishesDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_PublishesDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -40944,11 +40792,11 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *)_tao_object_reference;
-   
--    IR::ConsumesDef_var _tao_retval;
-+  IR_ConsumesDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::ValueDef_var value;
-+  IR_ValueDef_var value;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -40957,7 +40805,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -40991,7 +40838,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ConsumesDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_ConsumesDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -41046,7 +40893,7 @@
-   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -41054,7 +40901,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -41071,7 +40918,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -41108,7 +40955,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -41138,10 +40985,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::ComponentDef::_unchecked_narrow (obj.in ());
-+  return IR_ComponentDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -41221,7 +41067,7 @@
- POA_IR::ComponentDef::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set (
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ComponentDef *tao_impl,
--    const IR::InterfaceDefSeq & supported_interfaces,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -41823,7 +41669,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::InterfaceDef_ptr interface_type,
-+    IR_InterfaceDef_ptr interface_type,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -41929,7 +41775,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::InterfaceDef_ptr interface_type,
-+    IR_InterfaceDef_ptr interface_type,
-     const CORBA::Boolean & is_multiple,
-     CORBA::Environment &
-   )
-@@ -42042,7 +41888,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -42148,7 +41994,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -42254,7 +42100,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -42355,6 +42201,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -42362,7 +42209,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:29 */
-+/* starting time is 11:23:11 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -42490,10 +42337,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:29 */
-+/* ending time is 11:23:11 */
- static TAO_IR_PrimaryKeyDef_Perfect_Hash_OpTable tao_IR_PrimaryKeyDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -42519,9 +42365,9 @@
-   
- }
- 
--IR::_TAO_PrimaryKeyDef_Proxy_Impl&
-+_TAO_PrimaryKeyDef_Proxy_Impl&
- POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::PrimaryKeyDef *object,
-+    IR_PrimaryKeyDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -42553,7 +42399,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl,
-+              _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -42563,7 +42409,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl,
-+              _TAO_PrimaryKeyDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -42580,26 +42426,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_PrimaryKeyDef_Proxy_Broker *
--IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_PrimaryKeyDef_Proxy_Broker *
-+_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::the_TAO_PrimaryKeyDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function;
-+  _TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_PrimaryKeyDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_PrimaryKeyDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_PrimaryKeyDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_PrimaryKeyDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -42644,7 +42490,7 @@
-       );
- }
- 
--IR::ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
-+IR_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -42652,7 +42498,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::ValueDef_var _tao_retval;
-+    IR_ValueDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -42688,7 +42534,7 @@
- // copy ctor
- POA_IR::PrimaryKeyDef::PrimaryKeyDef (const PrimaryKeyDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -42714,7 +42560,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -42794,7 +42639,7 @@
- {
-   POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *)_tao_object_reference;
-   
--    IR::ValueDef_var _tao_retval;
-+  IR_ValueDef_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -42821,7 +42666,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_ValueDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -42876,7 +42721,7 @@
-   POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -42884,7 +42729,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -42901,7 +42746,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -42929,7 +42774,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-     return ACE_static_cast (POA_IR::Contained_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -42959,10 +42804,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::PrimaryKeyDef::_unchecked_narrow (obj.in ());
-+  return IR_PrimaryKeyDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::PrimaryKeyDef::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a (
-     TAO_ServerRequest &_tao_server_request,
-@@ -43124,6 +42968,7 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_FactoryDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -43131,7 +42976,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:29 */
-+/* starting time is 11:23:11 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FactoryDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -43317,10 +43162,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:29 */
-+/* ending time is 11:23:11 */
- static TAO_IR_FactoryDef_Perfect_Hash_OpTable tao_IR_FactoryDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -43346,9 +43190,9 @@
-   
- }
- 
--IR::_TAO_FactoryDef_Proxy_Impl&
-+_TAO_FactoryDef_Proxy_Impl&
- POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::FactoryDef *object,
-+    IR_FactoryDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -43380,7 +43224,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_FactoryDef_ThruPOA_Proxy_Impl,
-+              _TAO_FactoryDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -43390,7 +43234,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_FactoryDef_Remote_Proxy_Impl,
-+              _TAO_FactoryDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -43407,26 +43251,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_FactoryDef_Proxy_Broker *
--IR__TAO_FactoryDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_FactoryDef_Proxy_Broker *
-+_TAO_FactoryDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::the_TAO_FactoryDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_FactoryDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_FactoryDef_Proxy_Broker_Factory_function;
-+  _TAO_FactoryDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_FactoryDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_FactoryDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_FactoryDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -43452,7 +43296,7 @@
- POA_IR::FactoryDef::FactoryDef (const FactoryDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,OperationDef) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -43472,7 +43316,7 @@
-   POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -43480,7 +43324,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -43497,7 +43341,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -43528,7 +43372,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-     return ACE_static_cast (POA_IR::Contained_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -43558,12 +43402,12 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::FactoryDef::_unchecked_narrow (obj.in ());
-+  return IR_FactoryDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_FinderDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -43571,7 +43415,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:29 */
-+/* starting time is 11:23:11 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_FinderDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -43757,10 +43601,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:29 */
-+/* ending time is 11:23:11 */
- static TAO_IR_FinderDef_Perfect_Hash_OpTable tao_IR_FinderDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -43786,9 +43629,9 @@
-   
- }
- 
--IR::_TAO_FinderDef_Proxy_Impl&
-+_TAO_FinderDef_Proxy_Impl&
- POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::FinderDef *object,
-+    IR_FinderDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -43820,7 +43663,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_FinderDef_ThruPOA_Proxy_Impl,
-+              _TAO_FinderDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -43830,7 +43673,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_FinderDef_Remote_Proxy_Impl,
-+              _TAO_FinderDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -43847,26 +43690,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_FinderDef_Proxy_Broker *
--IR__TAO_FinderDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_FinderDef_Proxy_Broker *
-+_TAO_FinderDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::the_TAO_FinderDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_FinderDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_FinderDef_Proxy_Broker_Factory_function;
-+  _TAO_FinderDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_FinderDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_FinderDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_FinderDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_FinderDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -43892,7 +43735,7 @@
- POA_IR::FinderDef::FinderDef (const FinderDef& rhs)
-   :   ACE_NESTED_CLASS (POA_IR,OperationDef) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -43912,7 +43755,7 @@
-   POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -43920,7 +43763,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -43937,7 +43780,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -43968,7 +43811,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/Contained:1.0") == 0)
-     return ACE_static_cast (POA_IR::Contained_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -43998,12 +43841,12 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::FinderDef::_unchecked_narrow (obj.in ());
-+  return IR_FinderDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- class TAO_IR_HomeDef_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
- {
- private:
-@@ -44011,7 +43854,7 @@
- public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
- };
--/* starting time is 18:47:29 */
-+/* starting time is 11:23:11 */
- /* C++ code produced by gperf version 2.8 (ACE version) */
- /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_IR_HomeDef_Perfect_Hash_OpTable -N lookup  */
- unsigned int
-@@ -44175,10 +44018,9 @@
-     }
-   return 0;
- }
--/* ending time is 18:47:29 */
-+/* ending time is 11:23:11 */
- static TAO_IR_HomeDef_Perfect_Hash_OpTable tao_IR_HomeDef_optable;
- 
--
- ///////////////////////////////////////////////////////////////////////
- //            Strategized Proxy Broker Implementation
- //
-@@ -44204,9 +44046,9 @@
-   
- }
- 
--IR::_TAO_HomeDef_Proxy_Impl&
-+_TAO_HomeDef_Proxy_Impl&
- POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::select_proxy (
--    ::IR::HomeDef *object,
-+    IR_HomeDef *object,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-@@ -44238,7 +44080,7 @@
-         case TAO_ORB_Core::THRU_POA_STRATEGY:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl,
-+              _TAO_HomeDef_ThruPOA_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -44248,7 +44090,7 @@
-         default:
-           ACE_NEW_THROW_EX (
-               this->proxy_cache_[strategy],
--              ::IR::_TAO_HomeDef_Remote_Proxy_Impl,
-+              _TAO_HomeDef_Remote_Proxy_Impl,
-               CORBA::NO_MEMORY ()
-           );
-           ACE_CHECK;
-@@ -44265,26 +44107,26 @@
- ///////////////////////////////////////////////////////////////////////
- 
- 
--IR::_TAO_HomeDef_Proxy_Broker *
--IR__TAO_HomeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
-+_TAO_HomeDef_Proxy_Broker *
-+_TAO_HomeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
- {
-   ACE_UNUSED_ARG (obj);
-   return ::POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::the_TAO_HomeDef_Strategized_Proxy_Broker();
- }
- 
- int
--IR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
-+_TAO_HomeDef_Proxy_Broker_Factory_Initializer (long _dummy_)
- {
-   ACE_UNUSED_ARG (_dummy_);
-   
--  IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer = 
--    IR__TAO_HomeDef_Proxy_Broker_Factory_function;
-+  _TAO_HomeDef_Proxy_Broker_Factory_function_pointer = 
-+    _TAO_HomeDef_Proxy_Broker_Factory_function;
-   
-   return 0;
- }
- 
--static int IR__TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
--  IR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, IR__TAO_HomeDef_Proxy_Broker_Factory_Initializer));
-+static int _TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow = 
-+  _TAO_HomeDef_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (long, _TAO_HomeDef_Proxy_Broker_Factory_Initializer));
- 
- 
- ///////////////////////////////////////////////////////////////////////
-@@ -44296,7 +44138,7 @@
- 
- // ThruPOA Implementation of the IDL interface methods
- 
--IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
-+IR_HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -44304,7 +44146,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::HomeDef_var _tao_retval;
-+    IR_HomeDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -44327,7 +44169,7 @@
-       );
- }
- 
--IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component (
-+IR_ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -44335,7 +44177,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::ComponentDef_var _tao_retval;
-+    IR_ComponentDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -44358,7 +44200,7 @@
-       );
- }
- 
--IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
-+IR_PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -44366,7 +44208,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::PrimaryKeyDef_var _tao_retval;
-+    IR_PrimaryKeyDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -44389,7 +44231,7 @@
-       );
- }
- 
--IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
-+IR_FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -44397,7 +44239,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::FactoryDefSeq_var _tao_retval;
-+    IR_FactoryDefSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -44420,7 +44262,7 @@
-       );
- }
- 
--IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
-+IR_FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -44428,7 +44270,7 @@
-     CORBA::SystemException
-   ))
- {
--    IR::FinderDefSeq_var _tao_retval;
-+    IR_FinderDefSeq_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -44482,19 +44324,19 @@
-       );
- }
- 
--IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_key (
-+IR_PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_key (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr primary_key,
-+    IR_ValueDef_ptr primary_key,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::PrimaryKeyDef_var _tao_retval;
-+    IR_PrimaryKeyDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -44521,20 +44363,20 @@
-       );
- }
- 
--IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
-+IR_FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::FactoryDef_var _tao_retval;
-+    IR_FactoryDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -44562,20 +44404,20 @@
-       );
- }
- 
--IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
-+IR_FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--    IR::FinderDef_var _tao_retval;
-+    IR_FinderDef_var _tao_retval;
-   ACE_UNUSED_ARG (_tao_retval);
-   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-       _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-@@ -44619,7 +44461,7 @@
-     ACE_NESTED_CLASS (POA_IR,Container) (rhs),
-     ACE_NESTED_CLASS (POA_IR,Contained) (rhs),
-     ACE_NESTED_CLASS (POA_IR,IDLType) (rhs),
--    ACE_NESTED_CLASS (POA_CORBA,IRObject) (rhs),
-+  POA_CORBA_IRObject (rhs),
-     TAO_ServantBase (rhs)
- {}
- 
-@@ -44637,7 +44479,7 @@
- {
-   POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-   
--    IR::HomeDef_var _tao_retval;
-+  IR_HomeDef_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -44664,7 +44506,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::HomeDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_HomeDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -44717,7 +44559,7 @@
- {
-   POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-   
--    IR::ComponentDef_var _tao_retval;
-+  IR_ComponentDef_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -44744,7 +44586,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_ComponentDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -44797,7 +44639,7 @@
- {
-   POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-   
--    IR::PrimaryKeyDef_var _tao_retval;
-+  IR_PrimaryKeyDef_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -44824,7 +44666,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -44877,7 +44719,7 @@
- {
-   POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-   
--    IR::FactoryDefSeq_var _tao_retval;
-+  IR_FactoryDefSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -44904,7 +44746,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::FactoryDefSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_FactoryDefSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -44957,7 +44799,7 @@
- {
-   POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-   
--    IR::FinderDefSeq_var _tao_retval;
-+  IR_FinderDefSeq_var _tao_retval;
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-@@ -44984,7 +44826,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::FinderDefSeq * _tao_retval_info = _tao_retval._retn ();
-+      IR_FinderDefSeq * _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -45117,11 +44959,11 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-   
--    IR::PrimaryKeyDef_var _tao_retval;
-+  IR_PrimaryKeyDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::ValueDef_var primary_key;
-+  IR_ValueDef_var primary_key;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -45130,7 +44972,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -45164,7 +45005,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_PrimaryKeyDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -45218,12 +45059,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-   
--    IR::FactoryDef_var _tao_retval;
-+  IR_FactoryDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::ParDescriptionSeq params;
--  IR::ExceptionDefSeq exceptions;
-+  IR_ParDescriptionSeq params;
-+  IR_ExceptionDefSeq exceptions;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -45233,7 +45074,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -45269,7 +45109,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::FactoryDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_FactoryDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -45323,12 +45163,12 @@
-   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-   POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *)_tao_object_reference;
-   
--    IR::FinderDef_var _tao_retval;
-+  IR_FinderDef_var _tao_retval;
-   CORBA::String_var id;
-   CORBA::String_var name;
-   CORBA::String_var version;
--  IR::ParDescriptionSeq params;
--  IR::ExceptionDefSeq exceptions;
-+  IR_ParDescriptionSeq params;
-+  IR_ExceptionDefSeq exceptions;
-   if (!(
-     (_tao_in >> id.out ()) &&
-     (_tao_in >> name.out ()) &&
-@@ -45338,7 +45178,6 @@
-   ))
-     ACE_THROW (CORBA::MARSHAL());
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
-   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
-       _tao_server_request.orb_core ()->server_request_interceptors (),
-@@ -45374,7 +45213,7 @@
-       TAO_INTERCEPTOR_CHECK;
-       
- #if (TAO_HAS_INTERCEPTORS == 1)
--      IR::FinderDef_ptr _tao_retval_info = _tao_retval._retn ();
-+      IR_FinderDef_ptr _tao_retval_info = _tao_retval._retn ();
-       ri.result (_tao_retval_info);
-       _tao_retval = _tao_retval_info;
-       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-@@ -45429,7 +45268,7 @@
-   POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference;
-   CORBA::Boolean _tao_retval = 0;
-   CORBA::String_var value;
--  if (!(_tao_in >> value.out ()))
-+  if (!((_tao_in >> value.out ())))
-     ACE_THROW (CORBA::MARSHAL ());
-   
-   _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
-@@ -45437,7 +45276,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -45454,7 +45293,7 @@
-   
-   _tao_server_request.init_reply ();
-   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
--  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-+  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-     ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -45491,7 +45330,7 @@
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/IDLType:1.0") == 0)
-     return ACE_static_cast (POA_IR::IDLType_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
--    return ACE_static_cast (POA_CORBA::IRObject_ptr, this);
-+    return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-     return ACE_static_cast(PortableServer::Servant, this);
-   return 0;
-@@ -45521,10 +45360,9 @@
-     ACE_NEW_RETURN (tmp, CORBA::Object (stub, 0, this), 0);
-   
-   CORBA::Object_var obj = tmp;
--  return ::IR::HomeDef::_unchecked_narrow (obj.in ());
-+  return IR_HomeDef::_unchecked_narrow (obj.in ());
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
- POA_IR::HomeDef::TAO_ServerRequestInfo_IR_HomeDef_base_home_get::TAO_ServerRequestInfo_IR_HomeDef_base_home_get (
-     TAO_ServerRequest &_tao_server_request,
-@@ -45982,7 +45820,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr primary_key,
-+    IR_ValueDef_ptr primary_key,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -46088,8 +45926,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -46202,8 +46040,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &
-   )
-   : TAO_ServerRequestInfo (_tao_server_request),
-@@ -46312,4 +46150,5 @@
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
--#endif /* ifndef */
-+#endif /* ifndef TAO_IDL_INTERFACES_CPP */
-+
diff --git a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.h.diff
deleted file mode 100644
index 745f47aeb1c..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.h.diff
+++ /dev/null
@@ -1,17688 +0,0 @@
---- orig/InterfaceS.h	Fri Mar 09 00:47:29 2001
-+++ ../../orbsvcs/IFR_Service/InterfaceS.h	Thu Mar 01 15:34:32 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,23 +19,24 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#ifndef _TAO_IDL_ORIG_INTERFACES_H_
--#define _TAO_IDL_ORIG_INTERFACES_H_
--
-+#ifndef TAO_IDL_INTERFACES_H
-+#define TAO_IDL_INTERFACES_H
- #include "ace/pre.h"
--#include "InterfaceC.h"
- 
-+#include "tao/IFR_Client/InterfaceC.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
--#include "tao/PortableServer/PortableServer.h"
--#include "tao/PortableServer/Servant_Base.h"
--#include "tao/PortableServer/Collocated_Object.h"
-+#include "tao/PortableServer/Operation_Table.h"
-+#include "tao/PortableServer/Object_Adapter.h"
- #include "tao/PortableServer/ThruPOA_Object_Proxy_Impl.h"
--#include "tao/PortableServer/Direct_Object_Proxy_Impl.h"
- #include "tao/PortableServer/ServerRequestInfo.h"
-+#include "tao/PortableInterceptor.h"
-+#include "tao/Stub.h"
-+#include "tao/ORB_Core.h"
-+#include "tao/TAO_Server_Request.h"
- 
- #if defined(_MSC_VER)
- #if (_MSC_VER >= 1200)
-@@ -48,28 +49,20 @@
- #pragma option push -w-rvl -w-rch -w-ccc -w-inl
- #endif /* __BORLANDC__ */
- 
--TAO_NAMESPACE  POA_IR
--{
--}
--TAO_NAMESPACE_CLOSE
--
--TAO_NAMESPACE  POA_CORBA
--{
--  class IRObject;
--  typedef IRObject *IRObject_ptr;
-+class POA_CORBA_IRObject;
-+typedef POA_CORBA_IRObject *POA_CORBA_IRObject_ptr;
-   // Forward Classes Declaration
-   class _TAO_IRObject_ThruPOA_Proxy_Impl;
-   class _TAO_IRObject_Strategized_Proxy_Broker;
-   
--  class TAO_IFR_Client_Export IRObject :  public virtual PortableServer::ServantBase
-+class POA_CORBA_IRObject : public virtual PortableServer::ServantBase
-   {
-   protected:
--    IRObject (void);
-+  POA_CORBA_IRObject (void);
- 
-   public:
--    IRObject (const IRObject& rhs);
--    virtual ~IRObject (void);
--
-+  POA_CORBA_IRObject (const POA_CORBA_IRObject& rhs);
-+  virtual ~POA_CORBA_IRObject (void);
- 
-     virtual CORBA::Boolean _is_a (
-         const char* logical_type_id,
-@@ -111,7 +104,7 @@
- 
-     virtual const char* _interface_repository_id (void) const;
- 
--    virtual IR::DefinitionKind def_kind (
-+  virtual IR_DefinitionKind def_kind (
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       )
-@@ -143,7 +136,6 @@
-           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
-@@ -152,10 +144,10 @@
-     class TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get : public TAO_ServerRequestInfo
-     {
-     public:
--      friend class POA_CORBA::IRObject;
-+    friend class POA_CORBA_IRObject;
-       TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
-         TAO_ServerRequest &_tao_server_request,
--        POA_CORBA::IRObject *tao_impl
-+      POA_CORBA_IRObject *tao_impl
-         ,
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-@@ -194,19 +186,19 @@
-       void operator= (const TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get &);
-       
-     private:
--      POA_CORBA::IRObject *_tao_impl;
-+    POA_CORBA_IRObject *_tao_impl;
-       void result (IR::DefinitionKind        result);
-  // update the result 
--IR::DefinitionKind  _result;
-+    IR_DefinitionKind  _result;
- };
- 
- class TAO_ServerRequestInfo_CORBA_IRObject_destroy : public TAO_ServerRequestInfo
- {
- public:
--  friend class POA_CORBA::IRObject;
-+    friend class POA_CORBA_IRObject;
-   TAO_ServerRequestInfo_CORBA_IRObject_destroy (
-     TAO_ServerRequest &_tao_server_request,
--    POA_CORBA::IRObject *tao_impl
-+      POA_CORBA_IRObject *tao_impl
-     ,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-@@ -245,27 +237,27 @@
-   void operator= (const TAO_ServerRequestInfo_CORBA_IRObject_destroy &);
-   
- private:
--  POA_CORBA::IRObject *_tao_impl;
-+    POA_CORBA_IRObject *_tao_impl;
-   };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_IRObject_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_IRObject_Proxy_Broker
-+class _TAO_IRObject_Strategized_Proxy_Broker 
-+  : public virtual _TAO_IRObject_Proxy_Broker
- {
- public: 
-   _TAO_IRObject_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_IRObject_Strategized_Proxy_Broker (void);
-   
--  virtual ::CORBA::_TAO_IRObject_Proxy_Impl &select_proxy (
--    ::CORBA::IRObject *object,
-+  virtual _TAO_IRObject_Proxy_Impl &select_proxy (
-+    CORBA_IRObject *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -283,8 +275,7 @@
-   // 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_IRObject_Proxy_Impl
--   *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-+  _TAO_IRObject_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
- // This funxtion is used to get an handle to the unique instance
-@@ -305,8 +296,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_IRObject_ThruPOA_Proxy_Impl : 
--  public virtual ::CORBA::_TAO_IRObject_Proxy_Impl,
-+class _TAO_IRObject_ThruPOA_Proxy_Impl 
-+  : public virtual _TAO_IRObject_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl
- {
- public:
-@@ -314,7 +305,7 @@
-   
-   virtual ~_TAO_IRObject_ThruPOA_Proxy_Impl (void) { }
-   
--    virtual IR::DefinitionKind def_kind (
-+    virtual IR_DefinitionKind def_kind (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -332,77 +323,10 @@
- 
- };
- 
--
- //
- //                ThruPOA  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_IFR_Client_Export IRObject_tie : public IRObject
--{
--public:
--  IRObject_tie (T &t);
--  // the T& ctor
--  IRObject_tie (T &t, PortableServer::POA_ptr poa);
--  // ctor taking a POA
--  IRObject_tie (T *tp, CORBA::Boolean release=1);
--  // ctor taking pointer and an ownership flag
--  IRObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
--  // ctor with T*, ownership flag and a POA
--  ~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 ()
--    );
--  IR::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
--  IRObject_tie (const IRObject_tie &);
--  void operator= (const IRObject_tie &);
--};
--
--#endif /* ACE_HAS_USING_KEYWORD */
--
--}
--TAO_NAMESPACE_CLOSE
--
- TAO_NAMESPACE  POA_IR
- {
-   class Contained;
-@@ -411,7 +335,7 @@
-   class _TAO_Contained_ThruPOA_Proxy_Impl;
-   class _TAO_Contained_Strategized_Proxy_Broker;
-   
--  class TAO_IFR_Client_Export Contained : public virtual POA_CORBA::IRObject
-+  class Contained : public virtual POA_CORBA_IRObject
-   {
-   protected:
-     Contained (void);
-@@ -420,7 +344,6 @@
-     Contained (const Contained& rhs);
-     virtual ~Contained (void);
- 
--
-     virtual CORBA::Boolean _is_a (
-         const char* logical_type_id,
-         CORBA::Environment &ACE_TRY_ENV = 
-@@ -454,7 +377,7 @@
-           TAO_default_environment ()
-       );
- 
--    ::IR::Contained *_this (
-+    IR_Contained *_this (
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       );
-@@ -560,7 +483,7 @@
-           TAO_default_environment ()
-       );
- 
--    virtual IR::Container_ptr defined_in (
-+    virtual IR_Container_ptr defined_in (
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       )
-@@ -592,7 +515,7 @@
-           TAO_default_environment ()
-       );
- 
--    virtual IR::Repository_ptr containing_repository (
-+    virtual IR_Repository_ptr containing_repository (
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       )
-@@ -608,7 +531,7 @@
-           TAO_default_environment ()
-       );
- 
--    virtual IR::Contained::Description * describe (
-+    virtual IR_Contained::Description *describe (
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       )
-@@ -625,7 +548,7 @@
-       );
- 
-     virtual void move (
--        IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-         const char * new_name,
-         const char * new_version,
-         CORBA::Environment &ACE_TRY_ENV = 
-@@ -647,7 +570,7 @@
-         TAO_ServerRequest &req,
-         void *obj,
-         void *context,
--        CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-           TAO_default_environment ()
-       );
- 
-@@ -655,11 +578,10 @@
-         TAO_ServerRequest &req, 
-         void *obj,
-         void *context,
--        CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -1016,7 +938,7 @@
-   POA_IR::Contained *_tao_impl;
-   void result (IR::Container_ptr    result);
-  // update the result 
--IR::Container_ptr  _result;
-+      IR_Container_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Contained_absolute_name_get : public TAO_ServerRequestInfo
-@@ -1118,7 +1040,7 @@
-   POA_IR::Contained *_tao_impl;
-   void result (IR::Repository_ptr    result);
-  // update the result 
--IR::Repository_ptr  _result;
-+      IR_Repository_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Contained_describe : public TAO_ServerRequestInfo
-@@ -1169,7 +1091,7 @@
-   POA_IR::Contained *_tao_impl;
-   void result (IR::Contained::Description *    result);
-  // update the result 
--IR::Contained::Description *  _result;
-+      IR_Contained::Description *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Contained_move : public TAO_ServerRequestInfo
-@@ -1180,7 +1102,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::Contained *tao_impl
-     ,
--    IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV = 
-@@ -1221,7 +1143,7 @@
-   
- private:
-   POA_IR::Contained *_tao_impl;
--  IR::Container_ptr new_container_;
-+      IR_Container_ptr new_container_;
- const char * new_name_;
- const char * new_version_;
- };
-@@ -1230,20 +1152,19 @@
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_Contained_Strategized_Proxy_Broker : public virtual ::IR::_TAO_Contained_Proxy_Broker
-+class _TAO_Contained_Strategized_Proxy_Broker : public virtual _TAO_Contained_Proxy_Broker
- {
- public: 
-   _TAO_Contained_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_Contained_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_Contained_Proxy_Impl &select_proxy (
--    ::IR::Contained *object,
-+  virtual _TAO_Contained_Proxy_Impl &select_proxy (
-+    IR_Contained *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -1261,7 +1182,7 @@
-   // 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.
--  ::IR::_TAO_Contained_Proxy_Impl
-+  _TAO_Contained_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -1273,7 +1194,6 @@
-   static _TAO_Contained_Strategized_Proxy_Broker *the_TAO_Contained_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -1283,10 +1203,10 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_Contained_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_Contained_Proxy_Impl,
-+class _TAO_Contained_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_Contained_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
--  public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
-+  public virtual _TAO_IRObject_ThruPOA_Proxy_Impl
-   
- {
- public:
-@@ -1345,7 +1265,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::Container_ptr defined_in (
-+  virtual IR_Container_ptr defined_in   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -1361,7 +1281,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::Repository_ptr containing_repository (
-+  virtual IR_Repository_ptr containing_repository   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -1369,7 +1289,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::Contained::Description * describe (
-+  virtual IR_Contained::Description * describe   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -1379,7 +1299,7 @@
- 
-   virtual void move (
-       CORBA_Object *_collocated_tao_target_,
--      IR::Container_ptr new_container,
-+      IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -1395,11 +1315,10 @@
- //                ThruPOA  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_IFR_Client_Export Contained_tie : public Contained
-+  class Contained_tie : public Contained
- {
- public:
-   Contained_tie (T &t);
-@@ -1427,7 +1346,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   char * id (
-@@ -1481,7 +1400,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -1497,7 +1416,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -1505,7 +1424,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -1514,7 +1433,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -1524,7 +1443,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -1558,7 +1477,7 @@
- class _TAO_Container_ThruPOA_Proxy_Impl;
- class _TAO_Container_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export Container : public virtual POA_CORBA::IRObject
-+  class Container : public virtual POA_CORBA_IRObject
- {
- protected:
-   Container (void);
-@@ -1601,14 +1520,14 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::Container *_this (
-+    IR_Container *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
- 
-   virtual const char* _interface_repository_id (void) const;
- 
--  virtual IR::Contained_ptr lookup (
-+    virtual IR_Contained_ptr lookup (
-       const char * search_name,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -1625,8 +1544,8 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ContainedSeq * contents (
--      IR::DefinitionKind limit_type,
-+    virtual IR_ContainedSeq *contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -1643,10 +1562,10 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ContainedSeq * lookup_name (
-+    virtual IR_ContainedSeq *lookup_name (
-       const char * search_name,
-       CORBA::Long levels_to_search,
--      IR::DefinitionKind limit_type,
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -1663,8 +1582,8 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::Container::DescriptionSeq * describe_contents (
--      IR::DefinitionKind limit_type,
-+    virtual IR_Container::DescriptionSeq *describe_contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Long max_returned_objs,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -1682,7 +1601,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ModuleDef_ptr create_module (
-+    virtual IR_ModuleDef_ptr create_module (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -1701,11 +1620,11 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ConstantDef_ptr create_constant (
-+    virtual IR_ConstantDef_ptr create_constant (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-       const CORBA::Any & value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -1722,11 +1641,11 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::StructDef_ptr create_struct (
-+    virtual IR_StructDef_ptr create_struct (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq &members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -1742,12 +1661,12 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::UnionDef_ptr create_union (
-+    virtual IR_UnionDef_ptr create_union (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr discriminator_type,
--      const IR::UnionMemberSeq & members,
-+        IR_IDLType_ptr discriminator_type,
-+        const IR_UnionMemberSeq &members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -1763,11 +1682,11 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::EnumDef_ptr create_enum (
-+    virtual IR_EnumDef_ptr create_enum (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq &members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -1783,11 +1702,11 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::AliasDef_ptr create_alias (
-+    virtual IR_AliasDef_ptr create_alias (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type,
-+        IR_IDLType_ptr original_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -1803,11 +1722,11 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::InterfaceDef_ptr create_interface (
-+    virtual IR_InterfaceDef_ptr create_interface (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq &base_interfaces,
-       CORBA::Boolean is_abstract,
-       CORBA::Boolean is_local,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -1825,17 +1744,17 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ValueDef_ptr create_value (
-+    virtual IR_ValueDef_ptr create_value (
-       const char * id,
-       const char * name,
-       const char * version,
-       CORBA::Boolean is_custom,
-       CORBA::Boolean is_abstract,
--      IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-       CORBA::Boolean is_truncatable,
--      const IR::ValueDefSeq & abstract_base_values,
--      const IR::InterfaceDefSeq & supported_interfaces,
--      const IR::InitializerSeq & initializers,
-+        const IR_ValueDefSeq &abstract_base_values,
-+        const IR_InterfaceDefSeq &supported_interfaces,
-+        const IR_InitializerSeq &initializers,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -1851,11 +1770,11 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ValueBoxDef_ptr create_value_box (
-+    virtual IR_ValueBoxDef_ptr create_value_box (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -1871,11 +1790,11 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ExceptionDef_ptr create_exception (
-+    virtual IR_ExceptionDef_ptr create_exception (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq &members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -1891,7 +1810,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::NativeDef_ptr create_native (
-+    virtual IR_NativeDef_ptr create_native (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -1914,7 +1833,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -1922,11 +1841,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -1982,7 +1900,7 @@
-     const char * search_name_;
- void result (IR::Contained_ptr      result);
-  // update the result 
--IR::Contained_ptr  _result;
-+      IR_Contained_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Container_contents : public TAO_ServerRequestInfo
-@@ -1993,7 +1911,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::Container *tao_impl
-     ,
--    IR::DefinitionKind & limit_type,
-+        IR_DefinitionKind & limit_type,
-     const CORBA::Boolean & exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-@@ -2033,11 +1951,11 @@
-   
- private:
-   POA_IR::Container *_tao_impl;
--  const IR::DefinitionKind & limit_type_;
-+      const IR_DefinitionKind & limit_type_;
- const CORBA::Boolean & exclude_inherited_;
- void result (IR::ContainedSeq *    result);
-  // update the result 
--IR::ContainedSeq *  _result;
-+      IR_ContainedSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Container_lookup_name : public TAO_ServerRequestInfo
-@@ -2050,7 +1968,7 @@
-     ,
-     const char * search_name,
-     const CORBA::Long & levels_to_search,
--    IR::DefinitionKind & limit_type,
-+        IR_DefinitionKind & limit_type,
-     const CORBA::Boolean & exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-@@ -2092,11 +2010,11 @@
-   POA_IR::Container *_tao_impl;
-   const char * search_name_;
- const CORBA::Long & levels_to_search_;
--const IR::DefinitionKind & limit_type_;
-+      const IR_DefinitionKind & limit_type_;
- const CORBA::Boolean & exclude_inherited_;
- void result (IR::ContainedSeq *    result);
-  // update the result 
--IR::ContainedSeq *  _result;
-+      IR_ContainedSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Container_describe_contents : public TAO_ServerRequestInfo
-@@ -2107,7 +2025,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::Container *tao_impl
-     ,
--    IR::DefinitionKind & limit_type,
-+        IR_DefinitionKind & limit_type,
-     const CORBA::Boolean & exclude_inherited,
-     const CORBA::Long & max_returned_objs,
-     CORBA::Environment &ACE_TRY_ENV = 
-@@ -2148,12 +2066,12 @@
-   
- private:
-   POA_IR::Container *_tao_impl;
--  const IR::DefinitionKind & limit_type_;
-+      const IR_DefinitionKind & limit_type_;
- const CORBA::Boolean & exclude_inherited_;
- const CORBA::Long & max_returned_objs_;
- void result (IR::Container::DescriptionSeq *    result);
-  // update the result 
--IR::Container::DescriptionSeq *  _result;
-+      IR_Container::DescriptionSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Container_create_module : public TAO_ServerRequestInfo
-@@ -2210,7 +2128,7 @@
- const char * version_;
- void result (IR::ModuleDef_ptr    result);
-  // update the result 
--IR::ModuleDef_ptr  _result;
-+      IR_ModuleDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Container_create_constant : public TAO_ServerRequestInfo
-@@ -2224,7 +2142,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-@@ -2267,11 +2185,11 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--IR::IDLType_ptr type_;
-+      IR_IDLType_ptr type_;
- const CORBA::Any & value_;
- void result (IR::ConstantDef_ptr    result);
-  // update the result 
--IR::ConstantDef_ptr  _result;
-+      IR_ConstantDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Container_create_struct : public TAO_ServerRequestInfo
-@@ -2285,7 +2203,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -2327,10 +2245,10 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--const IR::StructMemberSeq & members_;
-+      const IR_StructMemberSeq & members_;
- void result (IR::StructDef_ptr    result);
-  // update the result 
--IR::StructDef_ptr  _result;
-+      IR_StructDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Container_create_union : public TAO_ServerRequestInfo
-@@ -2344,8 +2262,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+        IR_IDLType_ptr discriminator_type,
-+        const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -2387,11 +2305,11 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--IR::IDLType_ptr discriminator_type_;
--const IR::UnionMemberSeq & members_;
-+      IR_IDLType_ptr discriminator_type_;
-+      const IR_UnionMemberSeq & members_;
- void result (IR::UnionDef_ptr    result);
-  // update the result 
--IR::UnionDef_ptr  _result;
-+      IR_UnionDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Container_create_enum : public TAO_ServerRequestInfo
-@@ -2405,7 +2323,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -2447,10 +2365,10 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--const IR::EnumMemberSeq & members_;
-+      const IR_EnumMemberSeq & members_;
- void result (IR::EnumDef_ptr    result);
-  // update the result 
--IR::EnumDef_ptr  _result;
-+      IR_EnumDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Container_create_alias : public TAO_ServerRequestInfo
-@@ -2464,7 +2382,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+        IR_IDLType_ptr original_type,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -2506,10 +2424,10 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--IR::IDLType_ptr original_type_;
-+      IR_IDLType_ptr original_type_;
- void result (IR::AliasDef_ptr    result);
-  // update the result 
--IR::AliasDef_ptr  _result;
-+      IR_AliasDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Container_create_interface : public TAO_ServerRequestInfo
-@@ -2523,7 +2441,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-     const CORBA::Boolean & is_abstract,
-     const CORBA::Boolean & is_local,
-     CORBA::Environment &ACE_TRY_ENV = 
-@@ -2567,12 +2485,12 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--const IR::InterfaceDefSeq & base_interfaces_;
-+      const IR_InterfaceDefSeq & base_interfaces_;
- const CORBA::Boolean & is_abstract_;
- const CORBA::Boolean & is_local_;
- void result (IR::InterfaceDef_ptr    result);
-  // update the result 
--IR::InterfaceDef_ptr  _result;
-+      IR_InterfaceDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Container_create_value : public TAO_ServerRequestInfo
-@@ -2588,11 +2506,11 @@
-     const char * version,
-     const CORBA::Boolean & is_custom,
-     const CORBA::Boolean & is_abstract,
--    IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-     const CORBA::Boolean & is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+        const IR_ValueDefSeq & abstract_base_values,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-+        const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -2636,14 +2554,14 @@
- const char * version_;
- const CORBA::Boolean & is_custom_;
- const CORBA::Boolean & is_abstract_;
--IR::ValueDef_ptr base_value_;
-+      IR_ValueDef_ptr base_value_;
- const CORBA::Boolean & is_truncatable_;
--const IR::ValueDefSeq & abstract_base_values_;
--const IR::InterfaceDefSeq & supported_interfaces_;
--const IR::InitializerSeq & initializers_;
-+      const IR_ValueDefSeq & abstract_base_values_;
-+      const IR_InterfaceDefSeq & supported_interfaces_;
-+      const IR_InitializerSeq & initializers_;
- void result (IR::ValueDef_ptr    result);
-  // update the result 
--IR::ValueDef_ptr  _result;
-+      IR_ValueDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Container_create_value_box : public TAO_ServerRequestInfo
-@@ -2657,7 +2575,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -2699,10 +2617,10 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--IR::IDLType_ptr original_type_def_;
-+      IR_IDLType_ptr original_type_def_;
- void result (IR::ValueBoxDef_ptr    result);
-  // update the result 
--IR::ValueBoxDef_ptr  _result;
-+      IR_ValueBoxDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Container_create_exception : public TAO_ServerRequestInfo
-@@ -2716,7 +2634,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -2758,10 +2676,10 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--const IR::StructMemberSeq & members_;
-+      const IR_StructMemberSeq & members_;
- void result (IR::ExceptionDef_ptr    result);
-  // update the result 
--IR::ExceptionDef_ptr  _result;
-+      IR_ExceptionDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Container_create_native : public TAO_ServerRequestInfo
-@@ -2818,27 +2736,26 @@
- const char * version_;
- void result (IR::NativeDef_ptr    result);
-  // update the result 
--IR::NativeDef_ptr  _result;
-+      IR_NativeDef_ptr  _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_Container_Strategized_Proxy_Broker : public virtual ::IR::_TAO_Container_Proxy_Broker
-+class _TAO_Container_Strategized_Proxy_Broker : public virtual _TAO_Container_Proxy_Broker
- {
- public: 
-   _TAO_Container_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_Container_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_Container_Proxy_Impl &select_proxy (
--    ::IR::Container *object,
-+  virtual _TAO_Container_Proxy_Impl &select_proxy (
-+    IR_Container *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -2856,7 +2773,7 @@
-   // 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.
--  ::IR::_TAO_Container_Proxy_Impl
-+  _TAO_Container_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -2868,7 +2785,6 @@
-   static _TAO_Container_Strategized_Proxy_Broker *the_TAO_Container_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -2878,10 +2794,10 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_Container_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_Container_Proxy_Impl,
-+class _TAO_Container_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_Container_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
--  public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
-+  public virtual _TAO_IRObject_ThruPOA_Proxy_Impl
-   
- {
- public:
-@@ -2889,7 +2805,7 @@
-   
-   virtual ~_TAO_Container_ThruPOA_Proxy_Impl (void) { }
-   
--    virtual IR::Contained_ptr lookup (
-+  virtual IR_Contained_ptr lookup   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * search_name,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -2898,9 +2814,9 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ContainedSeq * contents (
-+  virtual IR_ContainedSeq * contents   (
-       CORBA_Object *_collocated_tao_target_,
--      IR::DefinitionKind limit_type,
-+      IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -2908,11 +2824,11 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ContainedSeq * lookup_name (
-+  virtual IR_ContainedSeq * lookup_name   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * search_name,
-       CORBA::Long levels_to_search,
--      IR::DefinitionKind limit_type,
-+      IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -2920,9 +2836,9 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::Container::DescriptionSeq * describe_contents (
-+  virtual IR_Container::DescriptionSeq * describe_contents   (
-       CORBA_Object *_collocated_tao_target_,
--      IR::DefinitionKind limit_type,
-+      IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Long max_returned_objs,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -2931,7 +2847,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ModuleDef_ptr create_module (
-+  virtual IR_ModuleDef_ptr create_module   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-@@ -2942,12 +2858,12 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ConstantDef_ptr create_constant (
-+  virtual IR_ConstantDef_ptr create_constant   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+      IR_IDLType_ptr type,
-       const CORBA::Any & value,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -2955,61 +2871,61 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::StructDef_ptr create_struct (
-+  virtual IR_StructDef_ptr create_struct   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+      const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::UnionDef_ptr create_union (
-+  virtual IR_UnionDef_ptr create_union   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr discriminator_type,
--      const IR::UnionMemberSeq & members,
-+      IR_IDLType_ptr discriminator_type,
-+      const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::EnumDef_ptr create_enum (
-+  virtual IR_EnumDef_ptr create_enum   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::EnumMemberSeq & members,
-+      const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::AliasDef_ptr create_alias (
-+  virtual IR_AliasDef_ptr create_alias   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type,
-+      IR_IDLType_ptr original_type,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::InterfaceDef_ptr create_interface (
-+  virtual IR_InterfaceDef_ptr create_interface   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::InterfaceDefSeq & base_interfaces,
-+      const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Boolean is_abstract,
-       CORBA::Boolean is_local,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -3018,49 +2934,49 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueDef_ptr create_value (
-+  virtual IR_ValueDef_ptr create_value   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
-       CORBA::Boolean is_custom,
-       CORBA::Boolean is_abstract,
--      IR::ValueDef_ptr base_value,
-+      IR_ValueDef_ptr base_value,
-       CORBA::Boolean is_truncatable,
--      const IR::ValueDefSeq & abstract_base_values,
--      const IR::InterfaceDefSeq & supported_interfaces,
--      const IR::InitializerSeq & initializers,
-+      const IR_ValueDefSeq & abstract_base_values,
-+      const IR_InterfaceDefSeq & supported_interfaces,
-+      const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueBoxDef_ptr create_value_box (
-+  virtual IR_ValueBoxDef_ptr create_value_box   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type_def,
-+      IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ExceptionDef_ptr create_exception (
-+  virtual IR_ExceptionDef_ptr create_exception   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+      const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::NativeDef_ptr create_native (
-+  virtual IR_NativeDef_ptr create_native   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-@@ -3078,11 +2994,10 @@
- //                ThruPOA  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_IFR_Client_Export Container_tie : public Container
-+  class Container_tie : public Container
- {
- public:
-   Container_tie (T &t);
-@@ -3110,10 +3025,10 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
--  IR::Contained_ptr lookup (
-+    IR_Contained_ptr lookup (
-       const char * search_name,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -3122,8 +3037,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * contents (
--      IR::DefinitionKind limit_type,
-+    IR_ContainedSeq * contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -3132,10 +3047,10 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * lookup_name (
-+    IR_ContainedSeq * lookup_name (
-       const char * search_name,
-       CORBA::Long levels_to_search,
--      IR::DefinitionKind limit_type,
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -3144,8 +3059,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container::DescriptionSeq * describe_contents (
--      IR::DefinitionKind limit_type,
-+    IR_Container::DescriptionSeq * describe_contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Long max_returned_objs,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -3155,7 +3070,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ModuleDef_ptr create_module (
-+    IR_ModuleDef_ptr create_module (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -3166,11 +3081,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ConstantDef_ptr create_constant (
-+    IR_ConstantDef_ptr create_constant (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-       const CORBA::Any & value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -3179,11 +3094,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::StructDef_ptr create_struct (
-+    IR_StructDef_ptr create_struct (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -3191,12 +3106,12 @@
-       CORBA::SystemException
-     ));
- 
--  IR::UnionDef_ptr create_union (
-+    IR_UnionDef_ptr create_union (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr discriminator_type,
--      const IR::UnionMemberSeq & members,
-+        IR_IDLType_ptr discriminator_type,
-+        const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -3204,11 +3119,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::EnumDef_ptr create_enum (
-+    IR_EnumDef_ptr create_enum (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -3216,11 +3131,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::AliasDef_ptr create_alias (
-+    IR_AliasDef_ptr create_alias (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type,
-+        IR_IDLType_ptr original_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -3228,11 +3143,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::InterfaceDef_ptr create_interface (
-+    IR_InterfaceDef_ptr create_interface (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Boolean is_abstract,
-       CORBA::Boolean is_local,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -3242,17 +3157,17 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr create_value (
-+    IR_ValueDef_ptr create_value (
-       const char * id,
-       const char * name,
-       const char * version,
-       CORBA::Boolean is_custom,
-       CORBA::Boolean is_abstract,
--      IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-       CORBA::Boolean is_truncatable,
--      const IR::ValueDefSeq & abstract_base_values,
--      const IR::InterfaceDefSeq & supported_interfaces,
--      const IR::InitializerSeq & initializers,
-+        const IR_ValueDefSeq & abstract_base_values,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-+        const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -3260,11 +3175,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueBoxDef_ptr create_value_box (
-+    IR_ValueBoxDef_ptr create_value_box (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -3272,11 +3187,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ExceptionDef_ptr create_exception (
-+    IR_ExceptionDef_ptr create_exception (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -3284,7 +3199,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::NativeDef_ptr create_native (
-+    IR_NativeDef_ptr create_native (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -3295,7 +3210,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -3329,7 +3244,7 @@
- class _TAO_IDLType_ThruPOA_Proxy_Impl;
- class _TAO_IDLType_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export IDLType : public virtual POA_CORBA::IRObject
-+  class IDLType : public virtual POA_CORBA_IRObject
- {
- protected:
-   IDLType (void);
-@@ -3372,7 +3287,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::IDLType *_this (
-+    IR_IDLType *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -3399,7 +3314,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3407,7 +3322,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3472,20 +3387,19 @@
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_IDLType_Strategized_Proxy_Broker : public virtual ::IR::_TAO_IDLType_Proxy_Broker
-+class _TAO_IDLType_Strategized_Proxy_Broker : public virtual _TAO_IDLType_Proxy_Broker
- {
- public: 
-   _TAO_IDLType_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_IDLType_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_IDLType_Proxy_Impl &select_proxy (
--    ::IR::IDLType *object,
-+  virtual _TAO_IDLType_Proxy_Impl &select_proxy (
-+    IR_IDLType *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -3503,7 +3417,7 @@
-   // 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.
--  ::IR::_TAO_IDLType_Proxy_Impl
-+  _TAO_IDLType_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -3515,7 +3429,6 @@
-   static _TAO_IDLType_Strategized_Proxy_Broker *the_TAO_IDLType_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -3525,10 +3438,10 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_IDLType_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_IDLType_Proxy_Impl,
-+class _TAO_IDLType_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_IDLType_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
--  public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
-+  public virtual _TAO_IRObject_ThruPOA_Proxy_Impl
-   
- {
- public:
-@@ -3551,11 +3464,10 @@
- //                ThruPOA  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_IFR_Client_Export IDLType_tie : public IDLType
-+  class IDLType_tie : public IDLType
- {
- public:
-   IDLType_tie (T &t);
-@@ -3583,7 +3495,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::TypeCode_ptr type (
-@@ -3594,7 +3506,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -3628,7 +3540,7 @@
- class _TAO_Repository_ThruPOA_Proxy_Impl;
- class _TAO_Repository_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export Repository : public virtual Container
-+  class Repository : public virtual Container
- {
- protected:
-   Repository (void);
-@@ -3671,14 +3583,14 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::Repository *_this (
-+    IR_Repository *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
- 
-   virtual const char* _interface_repository_id (void) const;
- 
--  virtual IR::Contained_ptr lookup_id (
-+    virtual IR_Contained_ptr lookup_id (
-       const char * search_id,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -3712,8 +3624,8 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::PrimitiveDef_ptr get_primitive (
--      IR::PrimitiveKind kind,
-+    virtual IR_PrimitiveDef_ptr get_primitive (
-+        IR_PrimitiveKind kind,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -3729,7 +3641,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::StringDef_ptr create_string (
-+    virtual IR_StringDef_ptr create_string (
-       CORBA::ULong bound,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -3746,7 +3658,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::WstringDef_ptr create_wstring (
-+    virtual IR_WstringDef_ptr create_wstring (
-       CORBA::ULong bound,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -3763,9 +3675,9 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::SequenceDef_ptr create_sequence (
-+    virtual IR_SequenceDef_ptr create_sequence (
-       CORBA::ULong bound,
--      IR::IDLType_ptr element_type,
-+        IR_IDLType_ptr element_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -3781,9 +3693,9 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ArrayDef_ptr create_array (
-+    virtual IR_ArrayDef_ptr create_array (
-       CORBA::ULong length,
--      IR::IDLType_ptr element_type,
-+        IR_IDLType_ptr element_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -3799,7 +3711,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::FixedDef_ptr create_fixed (
-+    virtual IR_FixedDef_ptr create_fixed (
-       CORBA::UShort digits,
-       CORBA::Short scale,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -3821,7 +3733,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3829,7 +3741,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3837,7 +3749,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3845,7 +3757,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3853,7 +3765,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3861,7 +3773,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3869,7 +3781,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3877,7 +3789,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3885,7 +3797,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3893,7 +3805,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3901,7 +3813,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3909,7 +3821,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3917,7 +3829,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3925,7 +3837,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3933,7 +3845,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3941,7 +3853,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -3949,11 +3861,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -4009,7 +3920,7 @@
-     const char * search_id_;
- void result (IR::Contained_ptr      result);
-  // update the result 
--IR::Contained_ptr  _result;
-+      IR_Contained_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Repository_get_canonical_typecode : public TAO_ServerRequestInfo
-@@ -4073,7 +3984,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::Repository *tao_impl
-     ,
--    IR::PrimitiveKind & kind,
-+        IR_PrimitiveKind & kind,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -4112,10 +4023,10 @@
-   
- private:
-   POA_IR::Repository *_tao_impl;
--  const IR::PrimitiveKind & kind_;
-+      const IR_PrimitiveKind & kind_;
- void result (IR::PrimitiveDef_ptr    result);
-  // update the result 
--IR::PrimitiveDef_ptr  _result;
-+      IR_PrimitiveDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Repository_create_string : public TAO_ServerRequestInfo
-@@ -4168,7 +4079,7 @@
-   const CORBA::ULong & bound_;
- void result (IR::StringDef_ptr    result);
-  // update the result 
--IR::StringDef_ptr  _result;
-+      IR_StringDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Repository_create_wstring : public TAO_ServerRequestInfo
-@@ -4221,7 +4132,7 @@
-   const CORBA::ULong & bound_;
- void result (IR::WstringDef_ptr    result);
-  // update the result 
--IR::WstringDef_ptr  _result;
-+      IR_WstringDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Repository_create_sequence : public TAO_ServerRequestInfo
-@@ -4233,7 +4144,7 @@
-     POA_IR::Repository *tao_impl
-     ,
-     const CORBA::ULong & bound,
--    IR::IDLType_ptr element_type,
-+        IR_IDLType_ptr element_type,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -4273,10 +4184,10 @@
- private:
-   POA_IR::Repository *_tao_impl;
-   const CORBA::ULong & bound_;
--IR::IDLType_ptr element_type_;
-+      IR_IDLType_ptr element_type_;
- void result (IR::SequenceDef_ptr    result);
-  // update the result 
--IR::SequenceDef_ptr  _result;
-+      IR_SequenceDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Repository_create_array : public TAO_ServerRequestInfo
-@@ -4288,7 +4199,7 @@
-     POA_IR::Repository *tao_impl
-     ,
-     const CORBA::ULong & length,
--    IR::IDLType_ptr element_type,
-+        IR_IDLType_ptr element_type,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -4328,10 +4239,10 @@
- private:
-   POA_IR::Repository *_tao_impl;
-   const CORBA::ULong & length_;
--IR::IDLType_ptr element_type_;
-+      IR_IDLType_ptr element_type_;
- void result (IR::ArrayDef_ptr    result);
-  // update the result 
--IR::ArrayDef_ptr  _result;
-+      IR_ArrayDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_Repository_create_fixed : public TAO_ServerRequestInfo
-@@ -4386,27 +4297,26 @@
- const CORBA::Short & scale_;
- void result (IR::FixedDef_ptr    result);
-  // update the result 
--IR::FixedDef_ptr  _result;
-+      IR_FixedDef_ptr  _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_Repository_Strategized_Proxy_Broker : public virtual ::IR::_TAO_Repository_Proxy_Broker
-+class _TAO_Repository_Strategized_Proxy_Broker : public virtual _TAO_Repository_Proxy_Broker
- {
- public: 
-   _TAO_Repository_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_Repository_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_Repository_Proxy_Impl &select_proxy (
--    ::IR::Repository *object,
-+  virtual _TAO_Repository_Proxy_Impl &select_proxy (
-+    IR_Repository *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -4424,7 +4334,7 @@
-   // 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.
--  ::IR::_TAO_Repository_Proxy_Impl
-+  _TAO_Repository_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -4436,7 +4346,6 @@
-   static _TAO_Repository_Strategized_Proxy_Broker *the_TAO_Repository_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -4446,10 +4355,10 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_Repository_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_Repository_Proxy_Impl,
-+class _TAO_Repository_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_Repository_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
--  public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl
-+  public virtual _TAO_Container_ThruPOA_Proxy_Impl
-   
- {
- public:
-@@ -4457,7 +4366,7 @@
-   
-   virtual ~_TAO_Repository_ThruPOA_Proxy_Impl (void) { }
-   
--    virtual IR::Contained_ptr lookup_id (
-+    virtual IR_Contained_ptr lookup_id   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * search_id,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -4475,16 +4384,16 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::PrimitiveDef_ptr get_primitive (
-+  virtual IR_PrimitiveDef_ptr get_primitive   (
-       CORBA_Object *_collocated_tao_target_,
--      IR::PrimitiveKind kind,
-+      IR_PrimitiveKind kind,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::StringDef_ptr create_string (
-+  virtual IR_StringDef_ptr create_string   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::ULong bound,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -4493,7 +4402,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::WstringDef_ptr create_wstring (
-+  virtual IR_WstringDef_ptr create_wstring   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::ULong bound,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -4502,27 +4411,27 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::SequenceDef_ptr create_sequence (
-+  virtual IR_SequenceDef_ptr create_sequence   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::ULong bound,
--      IR::IDLType_ptr element_type,
-+      IR_IDLType_ptr element_type,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ArrayDef_ptr create_array (
-+  virtual IR_ArrayDef_ptr create_array   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::ULong length,
--      IR::IDLType_ptr element_type,
-+      IR_IDLType_ptr element_type,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::FixedDef_ptr create_fixed (
-+  virtual IR_FixedDef_ptr create_fixed   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::UShort digits,
-       CORBA::Short scale,
-@@ -4539,11 +4448,11 @@
- //                ThruPOA  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_IFR_Client_Export Repository_tie : public Repository
-+  class Repository_tie : public virtual Repository,
-+                         public virtual PortableServer::RefCountServantBase
- {
- public:
-   Repository_tie (T &t);
-@@ -4571,10 +4480,10 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
--  IR::Contained_ptr lookup_id (
-+    IR_Contained_ptr lookup_id (
-       const char * search_id,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -4592,8 +4501,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::PrimitiveDef_ptr get_primitive (
--      IR::PrimitiveKind kind,
-+    IR_PrimitiveDef_ptr get_primitive (
-+        IR_PrimitiveKind kind,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -4601,7 +4510,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::StringDef_ptr create_string (
-+    IR_StringDef_ptr create_string (
-       CORBA::ULong bound,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -4610,7 +4519,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::WstringDef_ptr create_wstring (
-+    IR_WstringDef_ptr create_wstring (
-       CORBA::ULong bound,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -4619,9 +4528,9 @@
-       CORBA::SystemException
-     ));
- 
--  IR::SequenceDef_ptr create_sequence (
-+    IR_SequenceDef_ptr create_sequence (
-       CORBA::ULong bound,
--      IR::IDLType_ptr element_type,
-+        IR_IDLType_ptr element_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -4629,9 +4538,9 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ArrayDef_ptr create_array (
-+    IR_ArrayDef_ptr create_array (
-       CORBA::ULong length,
--      IR::IDLType_ptr element_type,
-+        IR_IDLType_ptr element_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -4639,7 +4548,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::FixedDef_ptr create_fixed (
-+    IR_FixedDef_ptr create_fixed (
-       CORBA::UShort digits,
-       CORBA::Short scale,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -4649,7 +4558,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained_ptr lookup (
-+    IR_Contained_ptr lookup (
-       const char * search_name,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -4658,8 +4567,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * contents (
--      IR::DefinitionKind limit_type,
-+    IR_ContainedSeq * contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -4668,10 +4577,10 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * lookup_name (
-+    IR_ContainedSeq * lookup_name (
-       const char * search_name,
-       CORBA::Long levels_to_search,
--      IR::DefinitionKind limit_type,
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -4680,8 +4589,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container::DescriptionSeq * describe_contents (
--      IR::DefinitionKind limit_type,
-+    IR_Container::DescriptionSeq * describe_contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Long max_returned_objs,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -4691,7 +4600,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ModuleDef_ptr create_module (
-+    IR_ModuleDef_ptr create_module (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -4702,11 +4611,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ConstantDef_ptr create_constant (
-+    IR_ConstantDef_ptr create_constant (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-       const CORBA::Any & value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -4715,11 +4624,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::StructDef_ptr create_struct (
-+    IR_StructDef_ptr create_struct (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -4727,12 +4636,12 @@
-       CORBA::SystemException
-     ));
- 
--  IR::UnionDef_ptr create_union (
-+    IR_UnionDef_ptr create_union (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr discriminator_type,
--      const IR::UnionMemberSeq & members,
-+        IR_IDLType_ptr discriminator_type,
-+        const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -4740,11 +4649,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::EnumDef_ptr create_enum (
-+    IR_EnumDef_ptr create_enum (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -4752,11 +4661,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::AliasDef_ptr create_alias (
-+    IR_AliasDef_ptr create_alias (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type,
-+        IR_IDLType_ptr original_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -4764,11 +4673,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::InterfaceDef_ptr create_interface (
-+    IR_InterfaceDef_ptr create_interface (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Boolean is_abstract,
-       CORBA::Boolean is_local,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -4778,17 +4687,17 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr create_value (
-+    IR_ValueDef_ptr create_value (
-       const char * id,
-       const char * name,
-       const char * version,
-       CORBA::Boolean is_custom,
-       CORBA::Boolean is_abstract,
--      IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-       CORBA::Boolean is_truncatable,
--      const IR::ValueDefSeq & abstract_base_values,
--      const IR::InterfaceDefSeq & supported_interfaces,
--      const IR::InitializerSeq & initializers,
-+        const IR_ValueDefSeq & abstract_base_values,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-+        const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -4796,11 +4705,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueBoxDef_ptr create_value_box (
-+    IR_ValueBoxDef_ptr create_value_box (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -4808,11 +4717,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ExceptionDef_ptr create_exception (
-+    IR_ExceptionDef_ptr create_exception (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -4820,7 +4729,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::NativeDef_ptr create_native (
-+    IR_NativeDef_ptr create_native (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -4831,7 +4740,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -4865,7 +4774,7 @@
- class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
- class _TAO_ComponentRepository_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ComponentRepository : public virtual Repository
-+  class ComponentRepository : public virtual Repository
- {
- protected:
-   ComponentRepository (void);
-@@ -4908,19 +4817,19 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::ComponentRepository *_this (
-+    IR_ComponentRepository *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
- 
-   virtual const char* _interface_repository_id (void) const;
- 
--  virtual IR::ComponentDef_ptr create_component (
-+    virtual IR_ComponentDef_ptr create_component (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ComponentDef_ptr base_component,
--      const IR::InterfaceDefSeq & supports_interfaces,
-+        IR_ComponentDef_ptr base_component,
-+        const IR_InterfaceDefSeq & supports_interfaces,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -4936,13 +4845,13 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::HomeDef_ptr create_home (
-+    virtual IR_HomeDef_ptr create_home (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::HomeDef_ptr base_home,
--      IR::ComponentDef_ptr managed_component,
--      IR::ValueDef_ptr primary_key,
-+        IR_HomeDef_ptr base_home,
-+        IR_ComponentDef_ptr managed_component,
-+        IR_ValueDef_ptr primary_key,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -4962,7 +4871,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -4970,7 +4879,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -4978,7 +4887,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -4986,7 +4895,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -4994,7 +4903,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5002,7 +4911,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5010,7 +4919,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5018,7 +4927,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5026,7 +4935,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5034,7 +4943,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5042,7 +4951,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5050,7 +4959,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5058,7 +4967,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5066,7 +4975,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5074,7 +4983,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5082,7 +4991,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5090,7 +4999,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5098,7 +5007,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5106,7 +5015,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5114,7 +5023,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5122,7 +5031,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5130,7 +5039,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5138,7 +5047,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5146,7 +5055,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5154,11 +5063,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -5175,8 +5083,8 @@
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ComponentDef_ptr base_component,
--      const IR::InterfaceDefSeq & supports_interfaces,
-+        IR_ComponentDef_ptr base_component,
-+        const IR_InterfaceDefSeq & supports_interfaces,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -5218,11 +5126,11 @@
-     const char * id_;
- const char * name_;
- const char * version_;
--IR::ComponentDef_ptr base_component_;
--const IR::InterfaceDefSeq & supports_interfaces_;
-+      IR_ComponentDef_ptr base_component_;
-+      const IR_InterfaceDefSeq & supports_interfaces_;
- void result (IR::ComponentDef_ptr      result);
-  // update the result 
--IR::ComponentDef_ptr  _result;
-+      IR_ComponentDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ComponentRepository_create_home : public TAO_ServerRequestInfo
-@@ -5236,9 +5144,9 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::HomeDef_ptr base_home,
--    IR::ComponentDef_ptr managed_component,
--    IR::ValueDef_ptr primary_key,
-+        IR_HomeDef_ptr base_home,
-+        IR_ComponentDef_ptr managed_component,
-+        IR_ValueDef_ptr primary_key,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -5280,32 +5188,31 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--IR::HomeDef_ptr base_home_;
--IR::ComponentDef_ptr managed_component_;
--IR::ValueDef_ptr primary_key_;
-+      IR_HomeDef_ptr base_home_;
-+      IR_ComponentDef_ptr managed_component_;
-+      IR_ValueDef_ptr primary_key_;
- void result (IR::HomeDef_ptr    result);
-  // update the result 
--IR::HomeDef_ptr  _result;
-+      IR_HomeDef_ptr  _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_ComponentRepository_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ComponentRepository_Proxy_Broker
-+class _TAO_ComponentRepository_Strategized_Proxy_Broker : public virtual _TAO_ComponentRepository_Proxy_Broker
- {
- public: 
-   _TAO_ComponentRepository_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_ComponentRepository_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_ComponentRepository_Proxy_Impl &select_proxy (
--    ::IR::ComponentRepository *object,
-+  virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
-+    IR_ComponentRepository *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -5323,7 +5230,7 @@
-   // 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.
--  ::IR::_TAO_ComponentRepository_Proxy_Impl
-+  _TAO_ComponentRepository_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -5335,7 +5242,6 @@
-   static _TAO_ComponentRepository_Strategized_Proxy_Broker *the_TAO_ComponentRepository_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -5345,8 +5251,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_ComponentRepository_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_ComponentRepository_Proxy_Impl,
-+class _TAO_ComponentRepository_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_ComponentRepository_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_Repository_ThruPOA_Proxy_Impl
-   
-@@ -5356,33 +5262,32 @@
-   
-   virtual ~_TAO_ComponentRepository_ThruPOA_Proxy_Impl (void) { }
-   
--    virtual IR::ComponentDef_ptr create_component (
-+    virtual IR_ComponentDef_ptr create_component   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ComponentDef_ptr base_component,
--      const IR::InterfaceDefSeq & supports_interfaces,
-+      IR_ComponentDef_ptr base_component,
-+      const IR_InterfaceDefSeq & supports_interfaces,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::HomeDef_ptr create_home (
-+  virtual IR_HomeDef_ptr create_home   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::HomeDef_ptr base_home,
--      IR::ComponentDef_ptr managed_component,
--      IR::ValueDef_ptr primary_key,
-+      IR_HomeDef_ptr base_home,
-+      IR_ComponentDef_ptr managed_component,
-+      IR_ValueDef_ptr primary_key,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
--
- };
- 
- 
-@@ -5390,11 +5295,12 @@
- //                ThruPOA  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_IFR_Client_Export ComponentRepository_tie : public ComponentRepository
-+  class ComponentRepository_tie
-+    : public virtual ComponentRepository,
-+      public virtual PortableServer::RefCountServantBase
- {
- public:
-   ComponentRepository_tie (T &t);
-@@ -5422,15 +5328,15 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
--  IR::ComponentDef_ptr create_component (
-+    IR_ComponentDef_ptr create_component (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ComponentDef_ptr base_component,
--      const IR::InterfaceDefSeq & supports_interfaces,
-+        IR_ComponentDef_ptr base_component,
-+        const IR_InterfaceDefSeq & supports_interfaces,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -5438,13 +5344,13 @@
-       CORBA::SystemException
-     ));
- 
--  IR::HomeDef_ptr create_home (
-+    IR_HomeDef_ptr create_home (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::HomeDef_ptr base_home,
--      IR::ComponentDef_ptr managed_component,
--      IR::ValueDef_ptr primary_key,
-+        IR_HomeDef_ptr base_home,
-+        IR_ComponentDef_ptr managed_component,
-+        IR_ValueDef_ptr primary_key,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -5452,7 +5358,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained_ptr lookup_id (
-+    IR_Contained_ptr lookup_id (
-       const char * search_id,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -5470,8 +5376,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::PrimitiveDef_ptr get_primitive (
--      IR::PrimitiveKind kind,
-+    IR_PrimitiveDef_ptr get_primitive (
-+        IR_PrimitiveKind kind,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -5479,7 +5385,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::StringDef_ptr create_string (
-+    IR_StringDef_ptr create_string (
-       CORBA::ULong bound,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -5488,7 +5394,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::WstringDef_ptr create_wstring (
-+    IR_WstringDef_ptr create_wstring (
-       CORBA::ULong bound,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -5497,9 +5403,9 @@
-       CORBA::SystemException
-     ));
- 
--  IR::SequenceDef_ptr create_sequence (
-+    IR_SequenceDef_ptr create_sequence (
-       CORBA::ULong bound,
--      IR::IDLType_ptr element_type,
-+        IR_IDLType_ptr element_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -5507,9 +5413,9 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ArrayDef_ptr create_array (
-+    IR_ArrayDef_ptr create_array (
-       CORBA::ULong length,
--      IR::IDLType_ptr element_type,
-+        IR_IDLType_ptr element_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -5517,7 +5423,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::FixedDef_ptr create_fixed (
-+    IR_FixedDef_ptr create_fixed (
-       CORBA::UShort digits,
-       CORBA::Short scale,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -5527,7 +5433,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained_ptr lookup (
-+    IR_Contained_ptr lookup (
-       const char * search_name,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -5536,8 +5442,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * contents (
--      IR::DefinitionKind limit_type,
-+    IR_ContainedSeq * contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -5546,10 +5452,10 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * lookup_name (
-+    IR_ContainedSeq * lookup_name (
-       const char * search_name,
-       CORBA::Long levels_to_search,
--      IR::DefinitionKind limit_type,
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -5558,8 +5464,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container::DescriptionSeq * describe_contents (
--      IR::DefinitionKind limit_type,
-+    IR_Container::DescriptionSeq * describe_contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Long max_returned_objs,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -5569,7 +5475,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ModuleDef_ptr create_module (
-+    IR_ModuleDef_ptr create_module (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -5580,11 +5486,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ConstantDef_ptr create_constant (
-+    IR_ConstantDef_ptr create_constant (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-       const CORBA::Any & value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -5593,11 +5499,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::StructDef_ptr create_struct (
-+    IR_StructDef_ptr create_struct (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -5605,12 +5511,12 @@
-       CORBA::SystemException
-     ));
- 
--  IR::UnionDef_ptr create_union (
-+    IR_UnionDef_ptr create_union (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr discriminator_type,
--      const IR::UnionMemberSeq & members,
-+        IR_IDLType_ptr discriminator_type,
-+        const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -5618,11 +5524,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::EnumDef_ptr create_enum (
-+    IR_EnumDef_ptr create_enum (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -5630,11 +5536,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::AliasDef_ptr create_alias (
-+    IR_AliasDef_ptr create_alias (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type,
-+        IR_IDLType_ptr original_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -5642,11 +5548,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::InterfaceDef_ptr create_interface (
-+    IR_InterfaceDef_ptr create_interface (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Boolean is_abstract,
-       CORBA::Boolean is_local,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -5656,17 +5562,17 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr create_value (
-+    IR_ValueDef_ptr create_value (
-       const char * id,
-       const char * name,
-       const char * version,
-       CORBA::Boolean is_custom,
-       CORBA::Boolean is_abstract,
--      IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-       CORBA::Boolean is_truncatable,
--      const IR::ValueDefSeq & abstract_base_values,
--      const IR::InterfaceDefSeq & supported_interfaces,
--      const IR::InitializerSeq & initializers,
-+        const IR_ValueDefSeq & abstract_base_values,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-+        const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -5674,11 +5580,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueBoxDef_ptr create_value_box (
-+    IR_ValueBoxDef_ptr create_value_box (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -5686,11 +5592,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ExceptionDef_ptr create_exception (
-+    IR_ExceptionDef_ptr create_exception (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -5698,7 +5604,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::NativeDef_ptr create_native (
-+    IR_NativeDef_ptr create_native (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -5709,7 +5615,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -5743,7 +5649,8 @@
- class _TAO_ModuleDef_ThruPOA_Proxy_Impl;
- class _TAO_ModuleDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ModuleDef : public virtual Container, public virtual Contained
-+  class ModuleDef : public virtual Container, 
-+                    public virtual Contained
- {
- protected:
-   ModuleDef (void);
-@@ -5786,7 +5693,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::ModuleDef *_this (
-+    IR_ModuleDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -5797,7 +5704,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5805,7 +5712,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5813,7 +5720,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5821,7 +5728,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5829,7 +5736,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5837,7 +5744,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5845,7 +5752,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5853,7 +5760,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5861,7 +5768,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5869,7 +5776,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5877,7 +5784,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5885,7 +5792,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5893,7 +5800,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5901,7 +5808,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5909,7 +5816,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5917,7 +5824,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5925,7 +5832,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5933,7 +5840,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5941,7 +5848,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5949,7 +5856,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5957,7 +5864,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5965,7 +5872,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5973,7 +5880,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5981,7 +5888,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5989,7 +5896,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -5997,7 +5904,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -6005,7 +5912,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -6013,11 +5920,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -6027,20 +5933,19 @@
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_ModuleDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ModuleDef_Proxy_Broker
-+class _TAO_ModuleDef_Strategized_Proxy_Broker : public virtual _TAO_ModuleDef_Proxy_Broker
- {
- public: 
-   _TAO_ModuleDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_ModuleDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_ModuleDef_Proxy_Impl &select_proxy (
--    ::IR::ModuleDef *object,
-+  virtual _TAO_ModuleDef_Proxy_Impl &select_proxy (
-+    IR_ModuleDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -6058,7 +5963,7 @@
-   // 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.
--  ::IR::_TAO_ModuleDef_Proxy_Impl
-+  _TAO_ModuleDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -6070,7 +5975,6 @@
-   static _TAO_ModuleDef_Strategized_Proxy_Broker *the_TAO_ModuleDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -6080,8 +5984,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_ModuleDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_ModuleDef_Proxy_Impl,
-+class _TAO_ModuleDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_ModuleDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl, 
-   public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-@@ -6099,11 +6003,10 @@
- //                ThruPOA  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_IFR_Client_Export ModuleDef_tie : public ModuleDef
-+  class ModuleDef_tie : public ModuleDef
- {
- public:
-   ModuleDef_tie (T &t);
-@@ -6131,10 +6034,10 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
--  IR::Contained_ptr lookup (
-+    IR_Contained_ptr lookup (
-       const char * search_name,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -6143,8 +6046,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * contents (
--      IR::DefinitionKind limit_type,
-+    IR_ContainedSeq * contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -6153,10 +6056,10 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * lookup_name (
-+    IR_ContainedSeq * lookup_name (
-       const char * search_name,
-       CORBA::Long levels_to_search,
--      IR::DefinitionKind limit_type,
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -6165,8 +6068,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container::DescriptionSeq * describe_contents (
--      IR::DefinitionKind limit_type,
-+    IR_Container::DescriptionSeq * describe_contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Long max_returned_objs,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -6176,7 +6079,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ModuleDef_ptr create_module (
-+    IR_ModuleDef_ptr create_module (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -6187,11 +6090,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ConstantDef_ptr create_constant (
-+    IR_ConstantDef_ptr create_constant (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-       const CORBA::Any & value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -6200,11 +6103,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::StructDef_ptr create_struct (
-+    IR_StructDef_ptr create_struct (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6212,12 +6115,12 @@
-       CORBA::SystemException
-     ));
- 
--  IR::UnionDef_ptr create_union (
-+    IR_UnionDef_ptr create_union (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr discriminator_type,
--      const IR::UnionMemberSeq & members,
-+        IR_IDLType_ptr discriminator_type,
-+        const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6225,11 +6128,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::EnumDef_ptr create_enum (
-+    IR_EnumDef_ptr create_enum (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6237,11 +6140,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::AliasDef_ptr create_alias (
-+    IR_AliasDef_ptr create_alias (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type,
-+        IR_IDLType_ptr original_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6249,11 +6152,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::InterfaceDef_ptr create_interface (
-+    IR_InterfaceDef_ptr create_interface (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Boolean is_abstract,
-       CORBA::Boolean is_local,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -6263,17 +6166,17 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr create_value (
-+    IR_ValueDef_ptr create_value (
-       const char * id,
-       const char * name,
-       const char * version,
-       CORBA::Boolean is_custom,
-       CORBA::Boolean is_abstract,
--      IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-       CORBA::Boolean is_truncatable,
--      const IR::ValueDefSeq & abstract_base_values,
--      const IR::InterfaceDefSeq & supported_interfaces,
--      const IR::InitializerSeq & initializers,
-+        const IR_ValueDefSeq & abstract_base_values,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-+        const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6281,11 +6184,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueBoxDef_ptr create_value_box (
-+    IR_ValueBoxDef_ptr create_value_box (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6293,11 +6196,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ExceptionDef_ptr create_exception (
-+    IR_ExceptionDef_ptr create_exception (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6305,7 +6208,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::NativeDef_ptr create_native (
-+    IR_NativeDef_ptr create_native (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -6367,7 +6270,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6383,7 +6286,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6391,7 +6294,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6400,7 +6303,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -6410,7 +6313,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6444,7 +6347,7 @@
- class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
- class _TAO_ConstantDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ConstantDef : public virtual Contained
-+  class ConstantDef : public virtual Contained
- {
- protected:
-   ConstantDef (void);
-@@ -6487,7 +6390,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::ConstantDef *_this (
-+    IR_ConstantDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -6510,7 +6413,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::IDLType_ptr type_def (
-+    virtual IR_IDLType_ptr type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6527,7 +6430,7 @@
-     );
- 
-   virtual void type_def (
--      IR::IDLType_ptr type_def,
-+        IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6580,7 +6483,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -6588,7 +6491,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -6596,7 +6499,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -6604,7 +6507,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -6612,7 +6515,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -6620,7 +6523,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -6628,7 +6531,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -6636,7 +6539,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -6644,7 +6547,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -6652,7 +6555,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -6660,7 +6563,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -6668,7 +6571,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -6676,11 +6579,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -6785,7 +6687,7 @@
-   POA_IR::ConstantDef *_tao_impl;
-   void result (IR::IDLType_ptr    result);
-  // update the result 
--IR::IDLType_ptr  _result;
-+      IR_IDLType_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ConstantDef_type_def_set : public TAO_ServerRequestInfo
-@@ -6796,7 +6698,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ConstantDef *tao_impl
-     ,
--    IR::IDLType_ptr type_def,
-+        IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -6835,7 +6737,7 @@
-   
- private:
-   POA_IR::ConstantDef *_tao_impl;
--  IR::IDLType_ptr type_def_;
-+      IR_IDLType_ptr type_def_;
- };
- 
- class TAO_ServerRequestInfo_IR_ConstantDef_value_get : public TAO_ServerRequestInfo
-@@ -6943,20 +6845,19 @@
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_ConstantDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ConstantDef_Proxy_Broker
-+class _TAO_ConstantDef_Strategized_Proxy_Broker : public virtual _TAO_ConstantDef_Proxy_Broker
- {
- public: 
-   _TAO_ConstantDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_ConstantDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_ConstantDef_Proxy_Impl &select_proxy (
--    ::IR::ConstantDef *object,
-+  virtual _TAO_ConstantDef_Proxy_Impl &select_proxy (
-+    IR_ConstantDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -6974,7 +6875,7 @@
-   // 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.
--  ::IR::_TAO_ConstantDef_Proxy_Impl
-+  _TAO_ConstantDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -6986,7 +6887,6 @@
-   static _TAO_ConstantDef_Strategized_Proxy_Broker *the_TAO_ConstantDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -6996,8 +6896,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_ConstantDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_ConstantDef_Proxy_Impl,
-+class _TAO_ConstantDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_ConstantDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-   
-@@ -7015,7 +6915,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr type_def (
-+  virtual IR_IDLType_ptr type_def   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -7025,7 +6925,7 @@
- 
-   virtual void type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr type_def,
-+      IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -7056,11 +6956,10 @@
- //                ThruPOA  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_IFR_Client_Export ConstantDef_tie : public ConstantDef
-+  class ConstantDef_tie : public ConstantDef
- {
- public:
-   ConstantDef_tie (T &t);
-@@ -7088,7 +6987,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::TypeCode_ptr type (
-@@ -7099,7 +6998,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::IDLType_ptr type_def (
-+    IR_IDLType_ptr type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -7108,7 +7007,7 @@
-     ));
- 
-   void type_def (
--      IR::IDLType_ptr type_def,
-+        IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -7184,7 +7083,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -7200,7 +7099,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -7208,7 +7107,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -7217,7 +7116,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -7227,7 +7126,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -7261,7 +7160,7 @@
- class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
- class _TAO_TypedefDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export TypedefDef : public virtual Contained, public virtual IDLType
-+  class TypedefDef : public virtual Contained, public virtual IDLType
- {
- protected:
-   TypedefDef (void);
-@@ -7304,7 +7203,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::TypedefDef *_this (
-+    IR_TypedefDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -7315,7 +7214,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7323,7 +7222,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7331,7 +7230,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7339,7 +7238,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7347,7 +7246,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7355,7 +7254,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7363,7 +7262,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7371,7 +7270,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7379,7 +7278,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7387,7 +7286,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7395,7 +7294,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7403,7 +7302,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7411,7 +7310,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7419,11 +7318,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -7433,20 +7331,19 @@
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_TypedefDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_TypedefDef_Proxy_Broker
-+class _TAO_TypedefDef_Strategized_Proxy_Broker : public virtual _TAO_TypedefDef_Proxy_Broker
- {
- public: 
-   _TAO_TypedefDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_TypedefDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_TypedefDef_Proxy_Impl &select_proxy (
--    ::IR::TypedefDef *object,
-+  virtual _TAO_TypedefDef_Proxy_Impl &select_proxy (
-+    IR_TypedefDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -7464,7 +7361,7 @@
-   // 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.
--  ::IR::_TAO_TypedefDef_Proxy_Impl
-+  _TAO_TypedefDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -7476,7 +7373,6 @@
-   static _TAO_TypedefDef_Strategized_Proxy_Broker *the_TAO_TypedefDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -7486,8 +7382,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_TypedefDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_TypedefDef_Proxy_Impl,
-+class _TAO_TypedefDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_TypedefDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl, 
-   public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
-@@ -7505,11 +7401,10 @@
- //                ThruPOA  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_IFR_Client_Export TypedefDef_tie : public TypedefDef
-+  class TypedefDef_tie : public TypedefDef
- {
- public:
-   TypedefDef_tie (T &t);
-@@ -7537,7 +7432,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   char * id (
-@@ -7591,7 +7486,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -7607,7 +7502,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -7615,7 +7510,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -7624,7 +7519,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -7642,7 +7537,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -7676,7 +7571,7 @@
- class _TAO_StructDef_ThruPOA_Proxy_Impl;
- class _TAO_StructDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export StructDef : public virtual TypedefDef, public virtual Container
-+  class StructDef : public virtual TypedefDef, public virtual Container
- {
- protected:
-   StructDef (void);
-@@ -7719,14 +7614,14 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::StructDef *_this (
-+    IR_StructDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
- 
-   virtual const char* _interface_repository_id (void) const;
- 
--  virtual IR::StructMemberSeq * members (
-+    virtual IR_StructMemberSeq * members (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -7743,7 +7638,7 @@
-     );
- 
-   virtual void members (
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -7763,7 +7658,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7771,7 +7666,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7779,7 +7674,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7787,7 +7682,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7795,7 +7690,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7803,7 +7698,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7811,7 +7706,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7819,7 +7714,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7827,7 +7722,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7835,7 +7730,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7843,7 +7738,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7851,7 +7746,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7859,7 +7754,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7867,7 +7762,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7875,7 +7770,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7883,7 +7778,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7891,7 +7786,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7899,7 +7794,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7907,7 +7802,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7915,7 +7810,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7923,7 +7818,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7931,7 +7826,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7939,7 +7834,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7947,7 +7842,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7955,7 +7850,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7963,7 +7858,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7971,7 +7866,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7979,7 +7874,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -7987,11 +7882,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -8045,7 +7939,7 @@
-     POA_IR::StructDef *_tao_impl;
-     void result (IR::StructMemberSeq *      result);
-  // update the result 
--IR::StructMemberSeq *  _result;
-+      IR_StructMemberSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_StructDef_members_set : public TAO_ServerRequestInfo
-@@ -8056,7 +7950,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::StructDef *tao_impl
-     ,
--    const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -8095,27 +7989,26 @@
-   
- private:
-   POA_IR::StructDef *_tao_impl;
--  const IR::StructMemberSeq & members_;
-+      const IR_StructMemberSeq & members_;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_StructDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_StructDef_Proxy_Broker
-+class _TAO_StructDef_Strategized_Proxy_Broker : public virtual _TAO_StructDef_Proxy_Broker
- {
- public: 
-   _TAO_StructDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_StructDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_StructDef_Proxy_Impl &select_proxy (
--    ::IR::StructDef *object,
-+  virtual _TAO_StructDef_Proxy_Impl &select_proxy (
-+    IR_StructDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -8133,7 +8026,7 @@
-   // 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.
--  ::IR::_TAO_StructDef_Proxy_Impl
-+  _TAO_StructDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -8145,7 +8038,6 @@
-   static _TAO_StructDef_Strategized_Proxy_Broker *the_TAO_StructDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -8155,8 +8047,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_StructDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_StructDef_Proxy_Impl,
-+class _TAO_StructDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_StructDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl, 
-   public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl
-@@ -8167,7 +8059,7 @@
-   
-   virtual ~_TAO_StructDef_ThruPOA_Proxy_Impl (void) { }
-   
--    virtual IR::StructMemberSeq * members (
-+    virtual IR_StructMemberSeq * members   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -8177,7 +8069,7 @@
- 
-   virtual void members (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::StructMemberSeq & members,
-+      const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -8191,11 +8083,10 @@
- //                ThruPOA  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_IFR_Client_Export StructDef_tie : public StructDef
-+  class StructDef_tie : public StructDef
- {
- public:
-   StructDef_tie (T &t);
-@@ -8223,10 +8114,10 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
--  IR::StructMemberSeq * members (
-+    IR_StructMemberSeq * members (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8235,7 +8126,7 @@
-     ));
- 
-   void members (
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8243,7 +8134,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained_ptr lookup (
-+    IR_Contained_ptr lookup (
-       const char * search_name,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -8252,8 +8143,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * contents (
--      IR::DefinitionKind limit_type,
-+    IR_ContainedSeq * contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -8262,10 +8153,10 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * lookup_name (
-+    IR_ContainedSeq * lookup_name (
-       const char * search_name,
-       CORBA::Long levels_to_search,
--      IR::DefinitionKind limit_type,
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -8274,8 +8165,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container::DescriptionSeq * describe_contents (
--      IR::DefinitionKind limit_type,
-+    IR_Container::DescriptionSeq * describe_contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Long max_returned_objs,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -8285,7 +8176,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ModuleDef_ptr create_module (
-+    IR_ModuleDef_ptr create_module (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -8296,11 +8187,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ConstantDef_ptr create_constant (
-+    IR_ConstantDef_ptr create_constant (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-       const CORBA::Any & value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -8309,11 +8200,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::StructDef_ptr create_struct (
-+    IR_StructDef_ptr create_struct (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8321,12 +8212,12 @@
-       CORBA::SystemException
-     ));
- 
--  IR::UnionDef_ptr create_union (
-+    IR_UnionDef_ptr create_union (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr discriminator_type,
--      const IR::UnionMemberSeq & members,
-+        IR_IDLType_ptr discriminator_type,
-+        const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8334,11 +8225,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::EnumDef_ptr create_enum (
-+    IR_EnumDef_ptr create_enum (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8346,11 +8237,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::AliasDef_ptr create_alias (
-+    IR_AliasDef_ptr create_alias (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type,
-+        IR_IDLType_ptr original_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8358,11 +8249,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::InterfaceDef_ptr create_interface (
-+    IR_InterfaceDef_ptr create_interface (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Boolean is_abstract,
-       CORBA::Boolean is_local,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -8372,17 +8263,17 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr create_value (
-+    IR_ValueDef_ptr create_value (
-       const char * id,
-       const char * name,
-       const char * version,
-       CORBA::Boolean is_custom,
-       CORBA::Boolean is_abstract,
--      IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-       CORBA::Boolean is_truncatable,
--      const IR::ValueDefSeq & abstract_base_values,
--      const IR::InterfaceDefSeq & supported_interfaces,
--      const IR::InitializerSeq & initializers,
-+        const IR_ValueDefSeq & abstract_base_values,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-+        const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8390,11 +8281,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueBoxDef_ptr create_value_box (
-+    IR_ValueBoxDef_ptr create_value_box (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8402,11 +8293,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ExceptionDef_ptr create_exception (
-+    IR_ExceptionDef_ptr create_exception (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8414,7 +8305,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::NativeDef_ptr create_native (
-+    IR_NativeDef_ptr create_native (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -8476,7 +8367,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8492,7 +8383,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8500,7 +8391,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8509,7 +8400,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -8527,7 +8418,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8561,7 +8452,7 @@
- class _TAO_UnionDef_ThruPOA_Proxy_Impl;
- class _TAO_UnionDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export UnionDef : public virtual TypedefDef, public virtual Container
-+  class UnionDef : public virtual TypedefDef, public virtual Container
- {
- protected:
-   UnionDef (void);
-@@ -8604,7 +8495,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::UnionDef *_this (
-+    IR_UnionDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -8627,7 +8518,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::IDLType_ptr discriminator_type_def (
-+    virtual IR_IDLType_ptr discriminator_type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8644,7 +8535,7 @@
-     );
- 
-   virtual void discriminator_type_def (
--      IR::IDLType_ptr discriminator_type_def,
-+        IR_IDLType_ptr discriminator_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8660,7 +8551,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::UnionMemberSeq * members (
-+    virtual IR_UnionMemberSeq * members (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8677,7 +8568,7 @@
-     );
- 
-   virtual void members (
--      const IR::UnionMemberSeq & members,
-+        const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8697,7 +8588,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8705,7 +8596,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8713,7 +8604,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8721,7 +8612,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8729,7 +8620,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8737,7 +8628,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8745,7 +8636,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8753,7 +8644,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8761,7 +8652,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8769,7 +8660,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8777,7 +8668,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8785,7 +8676,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8793,7 +8684,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8801,7 +8692,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8809,7 +8700,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8817,7 +8708,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8825,7 +8716,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8833,7 +8724,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8841,7 +8732,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8849,7 +8740,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8857,7 +8748,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8865,7 +8756,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8873,7 +8764,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8881,7 +8772,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8889,7 +8780,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8897,7 +8788,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8905,7 +8796,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8913,7 +8804,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -8921,11 +8812,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -9030,7 +8920,7 @@
-   POA_IR::UnionDef *_tao_impl;
-   void result (IR::IDLType_ptr    result);
-  // update the result 
--IR::IDLType_ptr  _result;
-+      IR_IDLType_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_UnionDef_discriminator_type_def_set : public TAO_ServerRequestInfo
-@@ -9041,7 +8931,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::UnionDef *tao_impl
-     ,
--    IR::IDLType_ptr discriminator_type_def,
-+        IR_IDLType_ptr discriminator_type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -9080,7 +8970,7 @@
-   
- private:
-   POA_IR::UnionDef *_tao_impl;
--  IR::IDLType_ptr discriminator_type_def_;
-+      IR_IDLType_ptr discriminator_type_def_;
- };
- 
- class TAO_ServerRequestInfo_IR_UnionDef_members_get : public TAO_ServerRequestInfo
-@@ -9131,7 +9021,7 @@
-   POA_IR::UnionDef *_tao_impl;
-   void result (IR::UnionMemberSeq *    result);
-  // update the result 
--IR::UnionMemberSeq *  _result;
-+      IR_UnionMemberSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_UnionDef_members_set : public TAO_ServerRequestInfo
-@@ -9142,7 +9032,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::UnionDef *tao_impl
-     ,
--    const IR::UnionMemberSeq & members,
-+        const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -9181,27 +9071,26 @@
-   
- private:
-   POA_IR::UnionDef *_tao_impl;
--  const IR::UnionMemberSeq & members_;
-+      const IR_UnionMemberSeq & members_;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_UnionDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_UnionDef_Proxy_Broker
-+class _TAO_UnionDef_Strategized_Proxy_Broker : public virtual _TAO_UnionDef_Proxy_Broker
- {
- public: 
-   _TAO_UnionDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_UnionDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_UnionDef_Proxy_Impl &select_proxy (
--    ::IR::UnionDef *object,
-+  virtual _TAO_UnionDef_Proxy_Impl &select_proxy (
-+    IR_UnionDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -9219,7 +9108,7 @@
-   // 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.
--  ::IR::_TAO_UnionDef_Proxy_Impl
-+  _TAO_UnionDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -9231,7 +9120,6 @@
-   static _TAO_UnionDef_Strategized_Proxy_Broker *the_TAO_UnionDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -9241,8 +9129,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_UnionDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_UnionDef_Proxy_Impl,
-+class _TAO_UnionDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_UnionDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl, 
-   public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl
-@@ -9261,7 +9149,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr discriminator_type_def (
-+  virtual IR_IDLType_ptr discriminator_type_def   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -9271,14 +9159,14 @@
- 
-   virtual void discriminator_type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr discriminator_type_def,
-+      IR_IDLType_ptr discriminator_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::UnionMemberSeq * members (
-+  virtual IR_UnionMemberSeq * members   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -9288,7 +9176,7 @@
- 
-   virtual void members (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::UnionMemberSeq & members,
-+      const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -9302,11 +9190,10 @@
- //                ThruPOA  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_IFR_Client_Export UnionDef_tie : public UnionDef
-+  class UnionDef_tie : public UnionDef
- {
- public:
-   UnionDef_tie (T &t);
-@@ -9334,7 +9221,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::TypeCode_ptr discriminator_type (
-@@ -9345,7 +9232,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::IDLType_ptr discriminator_type_def (
-+    IR_IDLType_ptr discriminator_type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9354,7 +9241,7 @@
-     ));
- 
-   void discriminator_type_def (
--      IR::IDLType_ptr discriminator_type_def,
-+        IR_IDLType_ptr discriminator_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9362,7 +9249,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::UnionMemberSeq * members (
-+    IR_UnionMemberSeq * members (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9371,7 +9258,7 @@
-     ));
- 
-   void members (
--      const IR::UnionMemberSeq & members,
-+        const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9379,7 +9266,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained_ptr lookup (
-+    IR_Contained_ptr lookup (
-       const char * search_name,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -9388,8 +9275,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * contents (
--      IR::DefinitionKind limit_type,
-+    IR_ContainedSeq * contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -9398,10 +9285,10 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * lookup_name (
-+    IR_ContainedSeq * lookup_name (
-       const char * search_name,
-       CORBA::Long levels_to_search,
--      IR::DefinitionKind limit_type,
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -9410,8 +9297,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container::DescriptionSeq * describe_contents (
--      IR::DefinitionKind limit_type,
-+    IR_Container::DescriptionSeq * describe_contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Long max_returned_objs,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -9421,7 +9308,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ModuleDef_ptr create_module (
-+    IR_ModuleDef_ptr create_module (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -9432,11 +9319,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ConstantDef_ptr create_constant (
-+    IR_ConstantDef_ptr create_constant (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-       const CORBA::Any & value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -9445,11 +9332,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::StructDef_ptr create_struct (
-+    IR_StructDef_ptr create_struct (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9457,12 +9344,12 @@
-       CORBA::SystemException
-     ));
- 
--  IR::UnionDef_ptr create_union (
-+    IR_UnionDef_ptr create_union (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr discriminator_type,
--      const IR::UnionMemberSeq & members,
-+        IR_IDLType_ptr discriminator_type,
-+        const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9470,11 +9357,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::EnumDef_ptr create_enum (
-+    IR_EnumDef_ptr create_enum (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9482,11 +9369,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::AliasDef_ptr create_alias (
-+    IR_AliasDef_ptr create_alias (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type,
-+        IR_IDLType_ptr original_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9494,11 +9381,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::InterfaceDef_ptr create_interface (
-+    IR_InterfaceDef_ptr create_interface (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Boolean is_abstract,
-       CORBA::Boolean is_local,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -9508,17 +9395,17 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr create_value (
-+    IR_ValueDef_ptr create_value (
-       const char * id,
-       const char * name,
-       const char * version,
-       CORBA::Boolean is_custom,
-       CORBA::Boolean is_abstract,
--      IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-       CORBA::Boolean is_truncatable,
--      const IR::ValueDefSeq & abstract_base_values,
--      const IR::InterfaceDefSeq & supported_interfaces,
--      const IR::InitializerSeq & initializers,
-+        const IR_ValueDefSeq & abstract_base_values,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-+        const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9526,11 +9413,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueBoxDef_ptr create_value_box (
-+    IR_ValueBoxDef_ptr create_value_box (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9538,11 +9425,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ExceptionDef_ptr create_exception (
-+    IR_ExceptionDef_ptr create_exception (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9550,7 +9437,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::NativeDef_ptr create_native (
-+    IR_NativeDef_ptr create_native (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -9612,7 +9499,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9628,7 +9515,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9636,7 +9523,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9645,7 +9532,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -9663,7 +9550,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9697,7 +9584,7 @@
- class _TAO_EnumDef_ThruPOA_Proxy_Impl;
- class _TAO_EnumDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export EnumDef : public virtual TypedefDef
-+  class EnumDef : public virtual TypedefDef
- {
- protected:
-   EnumDef (void);
-@@ -9740,14 +9627,14 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::EnumDef *_this (
-+    IR_EnumDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
- 
-   virtual const char* _interface_repository_id (void) const;
- 
--  virtual IR::EnumMemberSeq * members (
-+    virtual IR_EnumMemberSeq * members (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9764,7 +9651,7 @@
-     );
- 
-   virtual void members (
--      const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9784,7 +9671,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -9792,7 +9679,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -9800,7 +9687,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -9808,7 +9695,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -9816,7 +9703,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -9824,7 +9711,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -9832,7 +9719,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -9840,7 +9727,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -9848,7 +9735,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -9856,7 +9743,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -9864,7 +9751,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -9872,7 +9759,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -9880,7 +9767,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -9888,11 +9775,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -9946,7 +9832,7 @@
-     POA_IR::EnumDef *_tao_impl;
-     void result (IR::EnumMemberSeq *      result);
-  // update the result 
--IR::EnumMemberSeq *  _result;
-+      IR_EnumMemberSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_EnumDef_members_set : public TAO_ServerRequestInfo
-@@ -9957,7 +9843,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::EnumDef *tao_impl
-     ,
--    const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -9996,27 +9882,26 @@
-   
- private:
-   POA_IR::EnumDef *_tao_impl;
--  const IR::EnumMemberSeq & members_;
-+      const IR_EnumMemberSeq & members_;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_EnumDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EnumDef_Proxy_Broker
-+class _TAO_EnumDef_Strategized_Proxy_Broker : public virtual _TAO_EnumDef_Proxy_Broker
- {
- public: 
-   _TAO_EnumDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_EnumDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_EnumDef_Proxy_Impl &select_proxy (
--    ::IR::EnumDef *object,
-+  virtual _TAO_EnumDef_Proxy_Impl &select_proxy (
-+    IR_EnumDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -10034,7 +9919,7 @@
-   // 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.
--  ::IR::_TAO_EnumDef_Proxy_Impl
-+  _TAO_EnumDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -10046,7 +9931,6 @@
-   static _TAO_EnumDef_Strategized_Proxy_Broker *the_TAO_EnumDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -10056,8 +9940,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_EnumDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_EnumDef_Proxy_Impl,
-+class _TAO_EnumDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_EnumDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl
-   
-@@ -10067,7 +9951,7 @@
-   
-   virtual ~_TAO_EnumDef_ThruPOA_Proxy_Impl (void) { }
-   
--    virtual IR::EnumMemberSeq * members (
-+    virtual IR_EnumMemberSeq * members   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -10077,7 +9961,7 @@
- 
-   virtual void members (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::EnumMemberSeq & members,
-+      const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -10091,11 +9975,10 @@
- //                ThruPOA  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_IFR_Client_Export EnumDef_tie : public EnumDef
-+  class EnumDef_tie : public EnumDef
- {
- public:
-   EnumDef_tie (T &t);
-@@ -10123,10 +10006,10 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
--  IR::EnumMemberSeq * members (
-+    IR_EnumMemberSeq * members (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -10135,7 +10018,7 @@
-     ));
- 
-   void members (
--      const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -10194,7 +10077,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -10210,7 +10093,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -10218,7 +10101,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -10227,7 +10110,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -10245,7 +10128,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -10279,7 +10162,7 @@
- class _TAO_AliasDef_ThruPOA_Proxy_Impl;
- class _TAO_AliasDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export AliasDef : public virtual TypedefDef
-+  class AliasDef : public virtual TypedefDef
- {
- protected:
-   AliasDef (void);
-@@ -10322,14 +10205,14 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::AliasDef *_this (
-+    IR_AliasDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
- 
-   virtual const char* _interface_repository_id (void) const;
- 
--  virtual IR::IDLType_ptr original_type_def (
-+    virtual IR_IDLType_ptr original_type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -10346,7 +10229,7 @@
-     );
- 
-   virtual void original_type_def (
--      IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -10366,7 +10249,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10374,7 +10257,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10382,7 +10265,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10390,7 +10273,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10398,7 +10281,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10406,7 +10289,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10414,7 +10297,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10422,7 +10305,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10430,7 +10313,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10438,7 +10321,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10446,7 +10329,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10454,7 +10337,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10462,7 +10345,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10470,11 +10353,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -10528,7 +10410,7 @@
-     POA_IR::AliasDef *_tao_impl;
-     void result (IR::IDLType_ptr      result);
-  // update the result 
--IR::IDLType_ptr  _result;
-+      IR_IDLType_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_AliasDef_original_type_def_set : public TAO_ServerRequestInfo
-@@ -10539,7 +10421,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::AliasDef *tao_impl
-     ,
--    IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -10578,27 +10460,26 @@
-   
- private:
-   POA_IR::AliasDef *_tao_impl;
--  IR::IDLType_ptr original_type_def_;
-+      IR_IDLType_ptr original_type_def_;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_AliasDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_AliasDef_Proxy_Broker
-+class _TAO_AliasDef_Strategized_Proxy_Broker : public virtual _TAO_AliasDef_Proxy_Broker
- {
- public: 
-   _TAO_AliasDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_AliasDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_AliasDef_Proxy_Impl &select_proxy (
--    ::IR::AliasDef *object,
-+  virtual _TAO_AliasDef_Proxy_Impl &select_proxy (
-+    IR_AliasDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -10616,7 +10497,7 @@
-   // 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.
--  ::IR::_TAO_AliasDef_Proxy_Impl
-+  _TAO_AliasDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -10628,7 +10509,6 @@
-   static _TAO_AliasDef_Strategized_Proxy_Broker *the_TAO_AliasDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -10638,8 +10518,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_AliasDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_AliasDef_Proxy_Impl,
-+class _TAO_AliasDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_AliasDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl
-   
-@@ -10649,7 +10529,7 @@
-   
-   virtual ~_TAO_AliasDef_ThruPOA_Proxy_Impl (void) { }
-   
--    virtual IR::IDLType_ptr original_type_def (
-+    virtual IR_IDLType_ptr original_type_def   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -10659,7 +10539,7 @@
- 
-   virtual void original_type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr original_type_def,
-+      IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -10673,11 +10553,10 @@
- //                ThruPOA  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_IFR_Client_Export AliasDef_tie : public AliasDef
-+  class AliasDef_tie : public AliasDef
- {
- public:
-   AliasDef_tie (T &t);
-@@ -10705,10 +10584,10 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
--  IR::IDLType_ptr original_type_def (
-+    IR_IDLType_ptr original_type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -10717,7 +10596,7 @@
-     ));
- 
-   void original_type_def (
--      IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -10776,7 +10655,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -10792,7 +10671,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -10800,7 +10679,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -10809,7 +10688,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -10827,7 +10706,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -10861,7 +10740,7 @@
- class _TAO_NativeDef_ThruPOA_Proxy_Impl;
- class _TAO_NativeDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export NativeDef : public virtual TypedefDef
-+  class NativeDef : public virtual TypedefDef
- {
- protected:
-   NativeDef (void);
-@@ -10904,7 +10783,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::NativeDef *_this (
-+    IR_NativeDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -10915,7 +10794,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10923,7 +10802,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10931,7 +10810,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10939,7 +10818,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10947,7 +10826,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10955,7 +10834,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10963,7 +10842,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10971,7 +10850,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10979,7 +10858,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10987,7 +10866,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -10995,7 +10874,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -11003,7 +10882,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -11011,7 +10890,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -11019,11 +10898,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -11033,20 +10911,19 @@
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_NativeDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_NativeDef_Proxy_Broker
-+class _TAO_NativeDef_Strategized_Proxy_Broker : public virtual _TAO_NativeDef_Proxy_Broker
- {
- public: 
-   _TAO_NativeDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_NativeDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_NativeDef_Proxy_Impl &select_proxy (
--    ::IR::NativeDef *object,
-+  virtual _TAO_NativeDef_Proxy_Impl &select_proxy (
-+    IR_NativeDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -11064,7 +10941,7 @@
-   // 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.
--  ::IR::_TAO_NativeDef_Proxy_Impl
-+  _TAO_NativeDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -11076,7 +10953,6 @@
-   static _TAO_NativeDef_Strategized_Proxy_Broker *the_TAO_NativeDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -11086,8 +10962,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_NativeDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_NativeDef_Proxy_Impl,
-+class _TAO_NativeDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_NativeDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl
-   
-@@ -11104,11 +10980,10 @@
- //                ThruPOA  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_IFR_Client_Export NativeDef_tie : public NativeDef
-+  class NativeDef_tie : public NativeDef
- {
- public:
-   NativeDef_tie (T &t);
-@@ -11136,7 +11011,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   char * id (
-@@ -11190,7 +11065,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -11206,7 +11081,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -11214,7 +11089,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -11223,7 +11098,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -11241,7 +11116,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -11275,7 +11150,7 @@
- class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
- class _TAO_PrimitiveDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export PrimitiveDef : public virtual IDLType
-+  class PrimitiveDef : public virtual IDLType
- {
- protected:
-   PrimitiveDef (void);
-@@ -11318,14 +11193,14 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::PrimitiveDef *_this (
-+    IR_PrimitiveDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
- 
-   virtual const char* _interface_repository_id (void) const;
- 
--  virtual IR::PrimitiveKind kind (
-+    virtual IR_PrimitiveKind kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -11345,7 +11220,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -11353,7 +11228,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -11361,11 +11236,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -11419,27 +11293,26 @@
-     POA_IR::PrimitiveDef *_tao_impl;
-     void result (IR::PrimitiveKind      result);
-  // update the result 
--IR::PrimitiveKind  _result;
-+      IR_PrimitiveKind  _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_PrimitiveDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PrimitiveDef_Proxy_Broker
-+class _TAO_PrimitiveDef_Strategized_Proxy_Broker : public virtual _TAO_PrimitiveDef_Proxy_Broker
- {
- public: 
-   _TAO_PrimitiveDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_PrimitiveDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_PrimitiveDef_Proxy_Impl &select_proxy (
--    ::IR::PrimitiveDef *object,
-+  virtual _TAO_PrimitiveDef_Proxy_Impl &select_proxy (
-+    IR_PrimitiveDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -11457,7 +11330,7 @@
-   // 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.
--  ::IR::_TAO_PrimitiveDef_Proxy_Impl
-+  _TAO_PrimitiveDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -11469,7 +11342,6 @@
-   static _TAO_PrimitiveDef_Strategized_Proxy_Broker *the_TAO_PrimitiveDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -11479,8 +11351,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_PrimitiveDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_PrimitiveDef_Proxy_Impl,
-+class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_PrimitiveDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
-   
-@@ -11490,7 +11362,7 @@
-   
-   virtual ~_TAO_PrimitiveDef_ThruPOA_Proxy_Impl (void) { }
-   
--    virtual IR::PrimitiveKind kind (
-+    virtual IR_PrimitiveKind kind   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -11505,11 +11377,10 @@
- //                ThruPOA  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_IFR_Client_Export PrimitiveDef_tie : public PrimitiveDef
-+  class PrimitiveDef_tie : public PrimitiveDef
- {
- public:
-   PrimitiveDef_tie (T &t);
-@@ -11537,10 +11408,10 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
--  IR::PrimitiveKind kind (
-+    IR_PrimitiveKind kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -11556,7 +11427,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -11590,7 +11461,7 @@
- class _TAO_StringDef_ThruPOA_Proxy_Impl;
- class _TAO_StringDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export StringDef : public virtual IDLType
-+  class StringDef : public virtual IDLType
- {
- protected:
-   StringDef (void);
-@@ -11633,7 +11504,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::StringDef *_this (
-+    IR_StringDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -11677,7 +11548,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -11685,7 +11556,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -11693,11 +11564,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -11808,20 +11678,19 @@
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_StringDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_StringDef_Proxy_Broker
-+class _TAO_StringDef_Strategized_Proxy_Broker : public virtual _TAO_StringDef_Proxy_Broker
- {
- public: 
-   _TAO_StringDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_StringDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_StringDef_Proxy_Impl &select_proxy (
--    ::IR::StringDef *object,
-+  virtual _TAO_StringDef_Proxy_Impl &select_proxy (
-+    IR_StringDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -11839,7 +11708,7 @@
-   // 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.
--  ::IR::_TAO_StringDef_Proxy_Impl
-+  _TAO_StringDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -11851,7 +11720,6 @@
-   static _TAO_StringDef_Strategized_Proxy_Broker *the_TAO_StringDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -11861,8 +11729,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_StringDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_StringDef_Proxy_Impl,
-+class _TAO_StringDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_StringDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
-   
-@@ -11896,11 +11764,10 @@
- //                ThruPOA  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_IFR_Client_Export StringDef_tie : public StringDef
-+  class StringDef_tie : public StringDef
- {
- public:
-   StringDef_tie (T &t);
-@@ -11928,7 +11795,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::ULong bound (
-@@ -11956,7 +11823,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -11990,7 +11857,7 @@
- class _TAO_WstringDef_ThruPOA_Proxy_Impl;
- class _TAO_WstringDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export WstringDef : public virtual IDLType
-+  class WstringDef : public virtual IDLType
- {
- protected:
-   WstringDef (void);
-@@ -12033,7 +11900,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::WstringDef *_this (
-+    IR_WstringDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -12077,7 +11944,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -12085,7 +11952,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -12093,11 +11960,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -12208,20 +12074,19 @@
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_WstringDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_WstringDef_Proxy_Broker
-+class _TAO_WstringDef_Strategized_Proxy_Broker : public virtual _TAO_WstringDef_Proxy_Broker
- {
- public: 
-   _TAO_WstringDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_WstringDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_WstringDef_Proxy_Impl &select_proxy (
--    ::IR::WstringDef *object,
-+  virtual _TAO_WstringDef_Proxy_Impl &select_proxy (
-+    IR_WstringDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -12239,7 +12104,7 @@
-   // 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.
--  ::IR::_TAO_WstringDef_Proxy_Impl
-+  _TAO_WstringDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -12251,7 +12116,6 @@
-   static _TAO_WstringDef_Strategized_Proxy_Broker *the_TAO_WstringDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -12261,8 +12125,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_WstringDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_WstringDef_Proxy_Impl,
-+class _TAO_WstringDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_WstringDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
-   
-@@ -12296,11 +12160,10 @@
- //                ThruPOA  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_IFR_Client_Export WstringDef_tie : public WstringDef
-+  class WstringDef_tie : public WstringDef
- {
- public:
-   WstringDef_tie (T &t);
-@@ -12328,7 +12191,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::ULong bound (
-@@ -12356,7 +12219,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -12390,7 +12253,7 @@
- class _TAO_FixedDef_ThruPOA_Proxy_Impl;
- class _TAO_FixedDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export FixedDef : public virtual IDLType
-+  class FixedDef : public virtual IDLType
- {
- protected:
-   FixedDef (void);
-@@ -12433,7 +12296,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::FixedDef *_this (
-+    IR_FixedDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -12510,7 +12373,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -12518,7 +12381,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -12526,11 +12389,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -12742,20 +12604,19 @@
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_FixedDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FixedDef_Proxy_Broker
-+class _TAO_FixedDef_Strategized_Proxy_Broker : public virtual _TAO_FixedDef_Proxy_Broker
- {
- public: 
-   _TAO_FixedDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_FixedDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_FixedDef_Proxy_Impl &select_proxy (
--    ::IR::FixedDef *object,
-+  virtual _TAO_FixedDef_Proxy_Impl &select_proxy (
-+    IR_FixedDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -12773,7 +12634,7 @@
-   // 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.
--  ::IR::_TAO_FixedDef_Proxy_Impl
-+  _TAO_FixedDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -12785,7 +12646,6 @@
-   static _TAO_FixedDef_Strategized_Proxy_Broker *the_TAO_FixedDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -12795,8 +12655,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_FixedDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_FixedDef_Proxy_Impl,
-+class _TAO_FixedDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_FixedDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
-   
-@@ -12847,11 +12707,10 @@
- //                ThruPOA  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_IFR_Client_Export FixedDef_tie : public FixedDef
-+  class FixedDef_tie : public FixedDef
- {
- public:
-   FixedDef_tie (T &t);
-@@ -12879,7 +12738,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::UShort digits (
-@@ -12924,7 +12783,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -12958,7 +12817,7 @@
- class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
- class _TAO_SequenceDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export SequenceDef : public virtual IDLType
-+  class SequenceDef : public virtual IDLType
- {
- protected:
-   SequenceDef (void);
-@@ -13001,7 +12860,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::SequenceDef *_this (
-+    IR_SequenceDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -13057,7 +12916,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::IDLType_ptr element_type_def (
-+    virtual IR_IDLType_ptr element_type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -13074,7 +12933,7 @@
-     );
- 
-   virtual void element_type_def (
--      IR::IDLType_ptr element_type_def,
-+        IR_IDLType_ptr element_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -13094,7 +12953,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -13102,7 +12961,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -13110,11 +12969,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -13320,7 +13178,7 @@
-   POA_IR::SequenceDef *_tao_impl;
-   void result (IR::IDLType_ptr    result);
-  // update the result 
--IR::IDLType_ptr  _result;
-+      IR_IDLType_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_SequenceDef_element_type_def_set : public TAO_ServerRequestInfo
-@@ -13331,7 +13189,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::SequenceDef *tao_impl
-     ,
--    IR::IDLType_ptr element_type_def,
-+        IR_IDLType_ptr element_type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -13370,27 +13228,26 @@
-   
- private:
-   POA_IR::SequenceDef *_tao_impl;
--  IR::IDLType_ptr element_type_def_;
-+      IR_IDLType_ptr element_type_def_;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_SequenceDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_SequenceDef_Proxy_Broker
-+class _TAO_SequenceDef_Strategized_Proxy_Broker : public virtual _TAO_SequenceDef_Proxy_Broker
- {
- public: 
-   _TAO_SequenceDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_SequenceDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_SequenceDef_Proxy_Impl &select_proxy (
--    ::IR::SequenceDef *object,
-+  virtual _TAO_SequenceDef_Proxy_Impl &select_proxy (
-+    IR_SequenceDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -13408,7 +13265,7 @@
-   // 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.
--  ::IR::_TAO_SequenceDef_Proxy_Impl
-+  _TAO_SequenceDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -13420,7 +13277,6 @@
-   static _TAO_SequenceDef_Strategized_Proxy_Broker *the_TAO_SequenceDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -13430,8 +13286,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_SequenceDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_SequenceDef_Proxy_Impl,
-+class _TAO_SequenceDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_SequenceDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
-   
-@@ -13466,7 +13322,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr element_type_def (
-+  virtual IR_IDLType_ptr element_type_def   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -13476,7 +13332,7 @@
- 
-   virtual void element_type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr element_type_def,
-+      IR_IDLType_ptr element_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -13490,11 +13346,10 @@
- //                ThruPOA  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_IFR_Client_Export SequenceDef_tie : public SequenceDef
-+  class SequenceDef_tie : public SequenceDef
- {
- public:
-   SequenceDef_tie (T &t);
-@@ -13522,7 +13377,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::ULong bound (
-@@ -13550,7 +13405,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::IDLType_ptr element_type_def (
-+    IR_IDLType_ptr element_type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -13559,7 +13414,7 @@
-     ));
- 
-   void element_type_def (
--      IR::IDLType_ptr element_type_def,
-+        IR_IDLType_ptr element_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -13575,7 +13430,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -13609,7 +13464,7 @@
- class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
- class _TAO_ArrayDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ArrayDef : public virtual IDLType
-+  class ArrayDef : public virtual IDLType
- {
- protected:
-   ArrayDef (void);
-@@ -13652,7 +13507,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::ArrayDef *_this (
-+    IR_ArrayDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -13708,7 +13563,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::IDLType_ptr element_type_def (
-+    virtual IR_IDLType_ptr element_type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -13725,7 +13580,7 @@
-     );
- 
-   virtual void element_type_def (
--      IR::IDLType_ptr element_type_def,
-+        IR_IDLType_ptr element_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -13745,7 +13600,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -13753,7 +13608,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -13761,11 +13616,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -13971,7 +13825,7 @@
-   POA_IR::ArrayDef *_tao_impl;
-   void result (IR::IDLType_ptr    result);
-  // update the result 
--IR::IDLType_ptr  _result;
-+      IR_IDLType_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ArrayDef_element_type_def_set : public TAO_ServerRequestInfo
-@@ -13982,7 +13836,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ArrayDef *tao_impl
-     ,
--    IR::IDLType_ptr element_type_def,
-+        IR_IDLType_ptr element_type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -14021,27 +13875,26 @@
-   
- private:
-   POA_IR::ArrayDef *_tao_impl;
--  IR::IDLType_ptr element_type_def_;
-+      IR_IDLType_ptr element_type_def_;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_ArrayDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ArrayDef_Proxy_Broker
-+class _TAO_ArrayDef_Strategized_Proxy_Broker : public virtual _TAO_ArrayDef_Proxy_Broker
- {
- public: 
-   _TAO_ArrayDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_ArrayDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_ArrayDef_Proxy_Impl &select_proxy (
--    ::IR::ArrayDef *object,
-+  virtual _TAO_ArrayDef_Proxy_Impl &select_proxy (
-+    IR_ArrayDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -14059,7 +13912,7 @@
-   // 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.
--  ::IR::_TAO_ArrayDef_Proxy_Impl
-+  _TAO_ArrayDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -14071,7 +13924,6 @@
-   static _TAO_ArrayDef_Strategized_Proxy_Broker *the_TAO_ArrayDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -14081,8 +13933,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_ArrayDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_ArrayDef_Proxy_Impl,
-+class _TAO_ArrayDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_ArrayDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_IDLType_ThruPOA_Proxy_Impl
-   
-@@ -14117,7 +13969,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr element_type_def (
-+  virtual IR_IDLType_ptr element_type_def   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -14127,7 +13979,7 @@
- 
-   virtual void element_type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr element_type_def,
-+      IR_IDLType_ptr element_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -14141,11 +13993,10 @@
- //                ThruPOA  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_IFR_Client_Export ArrayDef_tie : public ArrayDef
-+  class ArrayDef_tie : public ArrayDef
- {
- public:
-   ArrayDef_tie (T &t);
-@@ -14173,7 +14024,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::ULong length (
-@@ -14201,7 +14052,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::IDLType_ptr element_type_def (
-+    IR_IDLType_ptr element_type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -14210,7 +14061,7 @@
-     ));
- 
-   void element_type_def (
--      IR::IDLType_ptr element_type_def,
-+        IR_IDLType_ptr element_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -14226,7 +14077,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -14260,7 +14111,7 @@
- class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
- class _TAO_ExceptionDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ExceptionDef : public virtual Contained, public virtual Container
-+  class ExceptionDef : public virtual Contained, public virtual Container
- {
- protected:
-   ExceptionDef (void);
-@@ -14303,7 +14154,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::ExceptionDef *_this (
-+    IR_ExceptionDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -14326,7 +14177,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::StructMemberSeq * members (
-+    virtual IR_StructMemberSeq * members (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -14343,7 +14194,7 @@
-     );
- 
-   virtual void members (
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -14363,7 +14214,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14371,7 +14222,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14379,7 +14230,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14387,7 +14238,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14395,7 +14246,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14403,7 +14254,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14411,7 +14262,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14419,7 +14270,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14427,7 +14278,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14435,7 +14286,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14443,7 +14294,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14451,7 +14302,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14459,7 +14310,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14467,7 +14318,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14475,7 +14326,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14483,7 +14334,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14491,7 +14342,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14499,7 +14350,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14507,7 +14358,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14515,7 +14366,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14523,7 +14374,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14531,7 +14382,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14539,7 +14390,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14547,7 +14398,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14555,7 +14406,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14563,7 +14414,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14571,7 +14422,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -14579,11 +14430,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -14688,7 +14538,7 @@
-   POA_IR::ExceptionDef *_tao_impl;
-   void result (IR::StructMemberSeq *    result);
-  // update the result 
--IR::StructMemberSeq *  _result;
-+      IR_StructMemberSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ExceptionDef_members_set : public TAO_ServerRequestInfo
-@@ -14699,7 +14549,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ExceptionDef *tao_impl
-     ,
--    const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -14738,27 +14588,26 @@
-   
- private:
-   POA_IR::ExceptionDef *_tao_impl;
--  const IR::StructMemberSeq & members_;
-+      const IR_StructMemberSeq & members_;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_ExceptionDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ExceptionDef_Proxy_Broker
-+class _TAO_ExceptionDef_Strategized_Proxy_Broker : public virtual _TAO_ExceptionDef_Proxy_Broker
- {
- public: 
-   _TAO_ExceptionDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_ExceptionDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_ExceptionDef_Proxy_Impl &select_proxy (
--    ::IR::ExceptionDef *object,
-+  virtual _TAO_ExceptionDef_Proxy_Impl &select_proxy (
-+    IR_ExceptionDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -14776,7 +14625,7 @@
-   // 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.
--  ::IR::_TAO_ExceptionDef_Proxy_Impl
-+  _TAO_ExceptionDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -14788,7 +14637,6 @@
-   static _TAO_ExceptionDef_Strategized_Proxy_Broker *the_TAO_ExceptionDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -14798,8 +14646,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_ExceptionDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_ExceptionDef_Proxy_Impl,
-+class _TAO_ExceptionDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_ExceptionDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl, 
-   public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl
-@@ -14818,7 +14666,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::StructMemberSeq * members (
-+  virtual IR_StructMemberSeq * members   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -14828,7 +14676,7 @@
- 
-   virtual void members (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::StructMemberSeq & members,
-+      const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -14842,11 +14690,10 @@
- //                ThruPOA  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_IFR_Client_Export ExceptionDef_tie : public ExceptionDef
-+  class ExceptionDef_tie : public ExceptionDef
- {
- public:
-   ExceptionDef_tie (T &t);
-@@ -14874,7 +14721,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::TypeCode_ptr type (
-@@ -14885,7 +14732,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::StructMemberSeq * members (
-+    IR_StructMemberSeq * members (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -14894,7 +14741,7 @@
-     ));
- 
-   void members (
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -14953,7 +14800,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -14969,7 +14816,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -14977,7 +14824,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -14986,7 +14833,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -14996,7 +14843,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained_ptr lookup (
-+    IR_Contained_ptr lookup (
-       const char * search_name,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -15005,8 +14852,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * contents (
--      IR::DefinitionKind limit_type,
-+    IR_ContainedSeq * contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -15015,10 +14862,10 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * lookup_name (
-+    IR_ContainedSeq * lookup_name (
-       const char * search_name,
-       CORBA::Long levels_to_search,
--      IR::DefinitionKind limit_type,
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -15027,8 +14874,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container::DescriptionSeq * describe_contents (
--      IR::DefinitionKind limit_type,
-+    IR_Container::DescriptionSeq * describe_contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Long max_returned_objs,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -15038,7 +14885,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ModuleDef_ptr create_module (
-+    IR_ModuleDef_ptr create_module (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -15049,11 +14896,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ConstantDef_ptr create_constant (
-+    IR_ConstantDef_ptr create_constant (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-       const CORBA::Any & value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -15062,11 +14909,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::StructDef_ptr create_struct (
-+    IR_StructDef_ptr create_struct (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15074,12 +14921,12 @@
-       CORBA::SystemException
-     ));
- 
--  IR::UnionDef_ptr create_union (
-+    IR_UnionDef_ptr create_union (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr discriminator_type,
--      const IR::UnionMemberSeq & members,
-+        IR_IDLType_ptr discriminator_type,
-+        const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15087,11 +14934,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::EnumDef_ptr create_enum (
-+    IR_EnumDef_ptr create_enum (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15099,11 +14946,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::AliasDef_ptr create_alias (
-+    IR_AliasDef_ptr create_alias (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type,
-+        IR_IDLType_ptr original_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15111,11 +14958,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::InterfaceDef_ptr create_interface (
-+    IR_InterfaceDef_ptr create_interface (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Boolean is_abstract,
-       CORBA::Boolean is_local,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -15125,17 +14972,17 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr create_value (
-+    IR_ValueDef_ptr create_value (
-       const char * id,
-       const char * name,
-       const char * version,
-       CORBA::Boolean is_custom,
-       CORBA::Boolean is_abstract,
--      IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-       CORBA::Boolean is_truncatable,
--      const IR::ValueDefSeq & abstract_base_values,
--      const IR::InterfaceDefSeq & supported_interfaces,
--      const IR::InitializerSeq & initializers,
-+        const IR_ValueDefSeq & abstract_base_values,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-+        const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15143,11 +14990,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueBoxDef_ptr create_value_box (
-+    IR_ValueBoxDef_ptr create_value_box (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15155,11 +15002,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ExceptionDef_ptr create_exception (
-+    IR_ExceptionDef_ptr create_exception (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15167,7 +15014,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::NativeDef_ptr create_native (
-+    IR_NativeDef_ptr create_native (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -15178,7 +15025,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15212,7 +15059,7 @@
- class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
- class _TAO_AttributeDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export AttributeDef : public virtual Contained
-+  class AttributeDef : public virtual Contained
- {
- protected:
-   AttributeDef (void);
-@@ -15255,7 +15102,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::AttributeDef *_this (
-+    IR_AttributeDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -15278,7 +15125,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::IDLType_ptr type_def (
-+    virtual IR_IDLType_ptr type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15295,7 +15142,7 @@
-     );
- 
-   virtual void type_def (
--      IR::IDLType_ptr type_def,
-+        IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15311,7 +15158,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::AttributeMode mode (
-+    virtual IR_AttributeMode mode (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15328,7 +15175,7 @@
-     );
- 
-   virtual void mode (
--      IR::AttributeMode mode,
-+        IR_AttributeMode mode,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15348,7 +15195,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -15356,7 +15203,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -15364,7 +15211,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -15372,7 +15219,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -15380,7 +15227,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -15388,7 +15235,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -15396,7 +15243,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -15404,7 +15251,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -15412,7 +15259,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -15420,7 +15267,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -15428,7 +15275,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -15436,7 +15283,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -15444,11 +15291,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -15553,7 +15399,7 @@
-   POA_IR::AttributeDef *_tao_impl;
-   void result (IR::IDLType_ptr    result);
-  // update the result 
--IR::IDLType_ptr  _result;
-+      IR_IDLType_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_AttributeDef_type_def_set : public TAO_ServerRequestInfo
-@@ -15564,7 +15410,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::AttributeDef *tao_impl
-     ,
--    IR::IDLType_ptr type_def,
-+        IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -15603,7 +15449,7 @@
-   
- private:
-   POA_IR::AttributeDef *_tao_impl;
--  IR::IDLType_ptr type_def_;
-+      IR_IDLType_ptr type_def_;
- };
- 
- class TAO_ServerRequestInfo_IR_AttributeDef_mode_get : public TAO_ServerRequestInfo
-@@ -15654,7 +15500,7 @@
-   POA_IR::AttributeDef *_tao_impl;
-   void result (IR::AttributeMode    result);
-  // update the result 
--IR::AttributeMode  _result;
-+      IR_AttributeMode  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_AttributeDef_mode_set : public TAO_ServerRequestInfo
-@@ -15665,7 +15511,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::AttributeDef *tao_impl
-     ,
--    IR::AttributeMode & mode,
-+        IR_AttributeMode & mode,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -15704,27 +15550,26 @@
-   
- private:
-   POA_IR::AttributeDef *_tao_impl;
--  const IR::AttributeMode & mode_;
-+      const IR_AttributeMode & mode_;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_AttributeDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_AttributeDef_Proxy_Broker
-+class _TAO_AttributeDef_Strategized_Proxy_Broker : public virtual _TAO_AttributeDef_Proxy_Broker
- {
- public: 
-   _TAO_AttributeDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_AttributeDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_AttributeDef_Proxy_Impl &select_proxy (
--    ::IR::AttributeDef *object,
-+  virtual _TAO_AttributeDef_Proxy_Impl &select_proxy (
-+    IR_AttributeDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -15742,7 +15587,7 @@
-   // 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.
--  ::IR::_TAO_AttributeDef_Proxy_Impl
-+  _TAO_AttributeDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -15754,7 +15599,6 @@
-   static _TAO_AttributeDef_Strategized_Proxy_Broker *the_TAO_AttributeDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -15764,8 +15608,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_AttributeDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_AttributeDef_Proxy_Impl,
-+class _TAO_AttributeDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_AttributeDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-   
-@@ -15783,7 +15627,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr type_def (
-+  virtual IR_IDLType_ptr type_def   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -15793,14 +15637,14 @@
- 
-   virtual void type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr type_def,
-+      IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::AttributeMode mode (
-+  virtual IR_AttributeMode mode   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -15810,7 +15654,7 @@
- 
-   virtual void mode (
-       CORBA_Object *_collocated_tao_target_,
--      IR::AttributeMode mode,
-+      IR_AttributeMode mode,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -15824,11 +15668,10 @@
- //                ThruPOA  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_IFR_Client_Export AttributeDef_tie : public AttributeDef
-+  class AttributeDef_tie : public AttributeDef
- {
- public:
-   AttributeDef_tie (T &t);
-@@ -15856,7 +15699,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::TypeCode_ptr type (
-@@ -15867,7 +15710,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::IDLType_ptr type_def (
-+    IR_IDLType_ptr type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15876,7 +15719,7 @@
-     ));
- 
-   void type_def (
--      IR::IDLType_ptr type_def,
-+        IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15884,7 +15727,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::AttributeMode mode (
-+    IR_AttributeMode mode (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15893,7 +15736,7 @@
-     ));
- 
-   void mode (
--      IR::AttributeMode mode,
-+        IR_AttributeMode mode,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15952,7 +15795,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15968,7 +15811,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15976,7 +15819,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15985,7 +15828,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -15995,7 +15838,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -16029,7 +15872,7 @@
- class _TAO_OperationDef_ThruPOA_Proxy_Impl;
- class _TAO_OperationDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export OperationDef : public virtual Contained
-+  class OperationDef : public virtual Contained
- {
- protected:
-   OperationDef (void);
-@@ -16072,7 +15915,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::OperationDef *_this (
-+    IR_OperationDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -16095,7 +15938,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::IDLType_ptr result_def (
-+    virtual IR_IDLType_ptr result_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -16112,7 +15955,7 @@
-     );
- 
-   virtual void result_def (
--      IR::IDLType_ptr result_def,
-+        IR_IDLType_ptr result_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -16128,7 +15971,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ParDescriptionSeq * params (
-+    virtual IR_ParDescriptionSeq * params (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -16145,7 +15988,7 @@
-     );
- 
-   virtual void params (
--      const IR::ParDescriptionSeq & params,
-+        const IR_ParDescriptionSeq & params,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -16161,7 +16004,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::OperationMode mode (
-+    virtual IR_OperationMode mode (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -16178,7 +16021,7 @@
-     );
- 
-   virtual void mode (
--      IR::OperationMode mode,
-+        IR_OperationMode mode,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -16194,7 +16037,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ContextIdSeq * contexts (
-+    virtual IR_ContextIdSeq * contexts (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -16211,7 +16054,7 @@
-     );
- 
-   virtual void contexts (
--      const IR::ContextIdSeq & contexts,
-+        const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -16227,7 +16070,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ExceptionDefSeq * exceptions (
-+    virtual IR_ExceptionDefSeq * exceptions (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -16244,7 +16087,7 @@
-     );
- 
-   virtual void exceptions (
--      const IR::ExceptionDefSeq & exceptions,
-+        const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -16264,7 +16107,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -16272,7 +16115,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -16280,7 +16123,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -16288,7 +16131,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -16296,7 +16139,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -16304,7 +16147,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -16312,7 +16155,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -16320,7 +16163,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -16328,7 +16171,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -16336,7 +16179,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -16344,7 +16187,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -16352,7 +16195,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -16360,11 +16203,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -16469,7 +16311,7 @@
-   POA_IR::OperationDef *_tao_impl;
-   void result (IR::IDLType_ptr    result);
-  // update the result 
--IR::IDLType_ptr  _result;
-+      IR_IDLType_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_OperationDef_result_def_set : public TAO_ServerRequestInfo
-@@ -16480,7 +16322,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::OperationDef *tao_impl
-     ,
--    IR::IDLType_ptr result_def,
-+        IR_IDLType_ptr result_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -16519,7 +16361,7 @@
-   
- private:
-   POA_IR::OperationDef *_tao_impl;
--  IR::IDLType_ptr result_def_;
-+      IR_IDLType_ptr result_def_;
- };
- 
- class TAO_ServerRequestInfo_IR_OperationDef_params_get : public TAO_ServerRequestInfo
-@@ -16570,7 +16412,7 @@
-   POA_IR::OperationDef *_tao_impl;
-   void result (IR::ParDescriptionSeq *    result);
-  // update the result 
--IR::ParDescriptionSeq *  _result;
-+      IR_ParDescriptionSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_OperationDef_params_set : public TAO_ServerRequestInfo
-@@ -16581,7 +16423,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::OperationDef *tao_impl
-     ,
--    const IR::ParDescriptionSeq & params,
-+        const IR_ParDescriptionSeq & params,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -16620,7 +16462,7 @@
-   
- private:
-   POA_IR::OperationDef *_tao_impl;
--  const IR::ParDescriptionSeq & params_;
-+      const IR_ParDescriptionSeq & params_;
- };
- 
- class TAO_ServerRequestInfo_IR_OperationDef_mode_get : public TAO_ServerRequestInfo
-@@ -16671,7 +16513,7 @@
-   POA_IR::OperationDef *_tao_impl;
-   void result (IR::OperationMode    result);
-  // update the result 
--IR::OperationMode  _result;
-+      IR_OperationMode  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_OperationDef_mode_set : public TAO_ServerRequestInfo
-@@ -16682,7 +16524,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::OperationDef *tao_impl
-     ,
--    IR::OperationMode & mode,
-+        IR_OperationMode & mode,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -16721,7 +16563,7 @@
-   
- private:
-   POA_IR::OperationDef *_tao_impl;
--  const IR::OperationMode & mode_;
-+      const IR_OperationMode & mode_;
- };
- 
- class TAO_ServerRequestInfo_IR_OperationDef_contexts_get : public TAO_ServerRequestInfo
-@@ -16772,7 +16614,7 @@
-   POA_IR::OperationDef *_tao_impl;
-   void result (IR::ContextIdSeq *    result);
-  // update the result 
--IR::ContextIdSeq *  _result;
-+      IR_ContextIdSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_OperationDef_contexts_set : public TAO_ServerRequestInfo
-@@ -16783,7 +16625,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::OperationDef *tao_impl
-     ,
--    const IR::ContextIdSeq & contexts,
-+        const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -16822,7 +16664,7 @@
-   
- private:
-   POA_IR::OperationDef *_tao_impl;
--  const IR::ContextIdSeq & contexts_;
-+      const IR_ContextIdSeq & contexts_;
- };
- 
- class TAO_ServerRequestInfo_IR_OperationDef_exceptions_get : public TAO_ServerRequestInfo
-@@ -16873,7 +16715,7 @@
-   POA_IR::OperationDef *_tao_impl;
-   void result (IR::ExceptionDefSeq *    result);
-  // update the result 
--IR::ExceptionDefSeq *  _result;
-+      IR_ExceptionDefSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_OperationDef_exceptions_set : public TAO_ServerRequestInfo
-@@ -16884,7 +16726,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::OperationDef *tao_impl
-     ,
--    const IR::ExceptionDefSeq & exceptions,
-+        const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -16923,27 +16765,26 @@
-   
- private:
-   POA_IR::OperationDef *_tao_impl;
--  const IR::ExceptionDefSeq & exceptions_;
-+      const IR_ExceptionDefSeq & exceptions_;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_OperationDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_OperationDef_Proxy_Broker
-+class _TAO_OperationDef_Strategized_Proxy_Broker : public virtual _TAO_OperationDef_Proxy_Broker
- {
- public: 
-   _TAO_OperationDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_OperationDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_OperationDef_Proxy_Impl &select_proxy (
--    ::IR::OperationDef *object,
-+  virtual _TAO_OperationDef_Proxy_Impl &select_proxy (
-+    IR_OperationDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -16961,7 +16802,7 @@
-   // 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.
--  ::IR::_TAO_OperationDef_Proxy_Impl
-+  _TAO_OperationDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -16973,7 +16814,6 @@
-   static _TAO_OperationDef_Strategized_Proxy_Broker *the_TAO_OperationDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -16983,8 +16823,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_OperationDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_OperationDef_Proxy_Impl,
-+class _TAO_OperationDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_OperationDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-   
-@@ -17002,7 +16842,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr result_def (
-+  virtual IR_IDLType_ptr result_def   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -17012,14 +16852,14 @@
- 
-   virtual void result_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr result_def,
-+      IR_IDLType_ptr result_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ParDescriptionSeq * params (
-+  virtual IR_ParDescriptionSeq * params   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -17029,14 +16869,14 @@
- 
-   virtual void params (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::ParDescriptionSeq & params,
-+      const IR_ParDescriptionSeq & params,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::OperationMode mode (
-+  virtual IR_OperationMode mode   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -17046,14 +16886,14 @@
- 
-   virtual void mode (
-       CORBA_Object *_collocated_tao_target_,
--      IR::OperationMode mode,
-+      IR_OperationMode mode,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ContextIdSeq * contexts (
-+  virtual IR_ContextIdSeq * contexts   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -17063,14 +16903,14 @@
- 
-   virtual void contexts (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::ContextIdSeq & contexts,
-+      const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ExceptionDefSeq * exceptions (
-+  virtual IR_ExceptionDefSeq * exceptions   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -17080,7 +16920,7 @@
- 
-   virtual void exceptions (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::ExceptionDefSeq & exceptions,
-+      const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -17094,11 +16934,10 @@
- //                ThruPOA  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_IFR_Client_Export OperationDef_tie : public OperationDef
-+  class OperationDef_tie : public OperationDef
- {
- public:
-   OperationDef_tie (T &t);
-@@ -17126,7 +16965,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::TypeCode_ptr result (
-@@ -17137,7 +16976,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::IDLType_ptr result_def (
-+    IR_IDLType_ptr result_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17146,7 +16985,7 @@
-     ));
- 
-   void result_def (
--      IR::IDLType_ptr result_def,
-+        IR_IDLType_ptr result_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17154,7 +16993,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ParDescriptionSeq * params (
-+    IR_ParDescriptionSeq * params (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17163,7 +17002,7 @@
-     ));
- 
-   void params (
--      const IR::ParDescriptionSeq & params,
-+        const IR_ParDescriptionSeq & params,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17171,7 +17010,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::OperationMode mode (
-+    IR_OperationMode mode (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17180,7 +17019,7 @@
-     ));
- 
-   void mode (
--      IR::OperationMode mode,
-+        IR_OperationMode mode,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17188,7 +17027,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContextIdSeq * contexts (
-+    IR_ContextIdSeq * contexts (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17197,7 +17036,7 @@
-     ));
- 
-   void contexts (
--      const IR::ContextIdSeq & contexts,
-+        const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17205,7 +17044,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ExceptionDefSeq * exceptions (
-+    IR_ExceptionDefSeq * exceptions (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17214,7 +17053,7 @@
-     ));
- 
-   void exceptions (
--      const IR::ExceptionDefSeq & exceptions,
-+        const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17273,7 +17112,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17289,7 +17128,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17297,7 +17136,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17306,7 +17145,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -17316,7 +17155,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17350,7 +17189,7 @@
- class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
- class _TAO_InterfaceDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export InterfaceDef : public virtual Container, public virtual Contained, public virtual IDLType
-+  class InterfaceDef : public virtual Container, public virtual Contained, public virtual IDLType
- {
- protected:
-   InterfaceDef (void);
-@@ -17393,14 +17232,14 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::InterfaceDef *_this (
-+    IR_InterfaceDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
- 
-   virtual const char* _interface_repository_id (void) const;
- 
--  virtual IR::InterfaceDefSeq * base_interfaces (
-+    virtual IR_InterfaceDefSeq * base_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17417,7 +17256,7 @@
-     );
- 
-   virtual void base_interfaces (
--      const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17516,14 +17355,14 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::AttributeDef_ptr create_attribute (
-+    virtual IR_AttributeDef_ptr create_attribute (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
--      IR::AttributeMode mode,
--      const IR::ExceptionDefSeq & get_exceptions,
--      const IR::ExceptionDefSeq & put_exceptions,
-+        IR_IDLType_ptr type,
-+        IR_AttributeMode mode,
-+        const IR_ExceptionDefSeq & get_exceptions,
-+        const IR_ExceptionDefSeq & put_exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17539,15 +17378,15 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::OperationDef_ptr create_operation (
-+    virtual IR_OperationDef_ptr create_operation (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr result,
--      IR::OperationMode mode,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
--      const IR::ContextIdSeq & contexts,
-+        IR_IDLType_ptr result,
-+        IR_OperationMode mode,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-+        const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17567,7 +17406,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17575,7 +17414,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17583,7 +17422,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17591,7 +17430,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17599,7 +17438,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17607,7 +17446,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17615,7 +17454,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17623,7 +17462,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17631,7 +17470,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17639,7 +17478,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17647,7 +17486,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17655,7 +17494,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17663,7 +17502,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17671,7 +17510,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17679,7 +17518,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17687,7 +17526,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17695,7 +17534,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17703,7 +17542,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17711,7 +17550,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17719,7 +17558,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17727,7 +17566,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17735,7 +17574,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17743,7 +17582,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17751,7 +17590,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17759,7 +17598,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17767,7 +17606,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17775,7 +17614,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17783,7 +17622,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -17791,11 +17630,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -17849,7 +17687,7 @@
-     POA_IR::InterfaceDef *_tao_impl;
-     void result (IR::InterfaceDefSeq *      result);
-  // update the result 
--IR::InterfaceDefSeq *  _result;
-+      IR_InterfaceDefSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_InterfaceDef_base_interfaces_set : public TAO_ServerRequestInfo
-@@ -17860,7 +17698,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::InterfaceDef *tao_impl
-     ,
--    const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -17899,7 +17737,7 @@
-   
- private:
-   POA_IR::InterfaceDef *_tao_impl;
--  const IR::InterfaceDefSeq & base_interfaces_;
-+      const IR_InterfaceDefSeq & base_interfaces_;
- };
- 
- class TAO_ServerRequestInfo_IR_InterfaceDef_is_abstract_get : public TAO_ServerRequestInfo
-@@ -18168,10 +18006,10 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode & mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+        IR_IDLType_ptr type,
-+        IR_AttributeMode & mode,
-+        const IR_ExceptionDefSeq & get_exceptions,
-+        const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -18213,13 +18051,13 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--IR::IDLType_ptr type_;
--const IR::AttributeMode & mode_;
--const IR::ExceptionDefSeq & get_exceptions_;
--const IR::ExceptionDefSeq & put_exceptions_;
-+      IR_IDLType_ptr type_;
-+      const IR_AttributeMode & mode_;
-+      const IR_ExceptionDefSeq & get_exceptions_;
-+      const IR_ExceptionDefSeq & put_exceptions_;
- void result (IR::AttributeDef_ptr    result);
-  // update the result 
--IR::AttributeDef_ptr  _result;
-+      IR_AttributeDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_InterfaceDef_create_operation : public TAO_ServerRequestInfo
-@@ -18233,11 +18071,11 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode & mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+        IR_IDLType_ptr result,
-+        IR_OperationMode & mode,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-+        const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -18279,34 +18117,33 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--IR::IDLType_ptr result_;
--const IR::OperationMode & mode_;
--const IR::ParDescriptionSeq & params_;
--const IR::ExceptionDefSeq & exceptions_;
--const IR::ContextIdSeq & contexts_;
-+      IR_IDLType_ptr result_;
-+      const IR_OperationMode & mode_;
-+      const IR_ParDescriptionSeq & params_;
-+      const IR_ExceptionDefSeq & exceptions_;
-+      const IR_ContextIdSeq & contexts_;
- void result (IR::OperationDef_ptr    result);
-  // update the result 
--IR::OperationDef_ptr  _result;
-+      IR_OperationDef_ptr  _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_InterfaceDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_InterfaceDef_Proxy_Broker
-+class _TAO_InterfaceDef_Strategized_Proxy_Broker : public virtual _TAO_InterfaceDef_Proxy_Broker
- {
- public: 
-   _TAO_InterfaceDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_InterfaceDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_InterfaceDef_Proxy_Impl &select_proxy (
--    ::IR::InterfaceDef *object,
-+  virtual _TAO_InterfaceDef_Proxy_Impl &select_proxy (
-+    IR_InterfaceDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -18324,7 +18161,7 @@
-   // 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.
--  ::IR::_TAO_InterfaceDef_Proxy_Impl
-+  _TAO_InterfaceDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -18336,7 +18173,6 @@
-   static _TAO_InterfaceDef_Strategized_Proxy_Broker *the_TAO_InterfaceDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -18346,8 +18182,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_InterfaceDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_InterfaceDef_Proxy_Impl,
-+class _TAO_InterfaceDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_InterfaceDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl, 
-   public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl, 
-@@ -18359,7 +18195,7 @@
-   
-   virtual ~_TAO_InterfaceDef_ThruPOA_Proxy_Impl (void) { }
-   
--    virtual IR::InterfaceDefSeq * base_interfaces (
-+    virtual IR_InterfaceDefSeq * base_interfaces   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -18369,7 +18205,7 @@
- 
-   virtual void base_interfaces (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::InterfaceDefSeq & base_interfaces,
-+      const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -18419,31 +18255,31 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::AttributeDef_ptr create_attribute (
-+  virtual IR_AttributeDef_ptr create_attribute   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
--      IR::AttributeMode mode,
--      const IR::ExceptionDefSeq & get_exceptions,
--      const IR::ExceptionDefSeq & put_exceptions,
-+      IR_IDLType_ptr type,
-+      IR_AttributeMode mode,
-+      const IR_ExceptionDefSeq & get_exceptions,
-+      const IR_ExceptionDefSeq & put_exceptions,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::OperationDef_ptr create_operation (
-+  virtual IR_OperationDef_ptr create_operation   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr result,
--      IR::OperationMode mode,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
--      const IR::ContextIdSeq & contexts,
-+      IR_IDLType_ptr result,
-+      IR_OperationMode mode,
-+      const IR_ParDescriptionSeq & params,
-+      const IR_ExceptionDefSeq & exceptions,
-+      const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -18457,11 +18293,10 @@
- //                ThruPOA  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_IFR_Client_Export InterfaceDef_tie : public InterfaceDef
-+  class InterfaceDef_tie : public InterfaceDef
- {
- public:
-   InterfaceDef_tie (T &t);
-@@ -18489,10 +18324,10 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
--  IR::InterfaceDefSeq * base_interfaces (
-+    IR_InterfaceDefSeq * base_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18501,7 +18336,7 @@
-     ));
- 
-   void base_interfaces (
--      const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18552,14 +18387,14 @@
-       CORBA::SystemException
-     ));
- 
--  IR::AttributeDef_ptr create_attribute (
-+    IR_AttributeDef_ptr create_attribute (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
--      IR::AttributeMode mode,
--      const IR::ExceptionDefSeq & get_exceptions,
--      const IR::ExceptionDefSeq & put_exceptions,
-+        IR_IDLType_ptr type,
-+        IR_AttributeMode mode,
-+        const IR_ExceptionDefSeq & get_exceptions,
-+        const IR_ExceptionDefSeq & put_exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18567,15 +18402,15 @@
-       CORBA::SystemException
-     ));
- 
--  IR::OperationDef_ptr create_operation (
-+    IR_OperationDef_ptr create_operation (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr result,
--      IR::OperationMode mode,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
--      const IR::ContextIdSeq & contexts,
-+        IR_IDLType_ptr result,
-+        IR_OperationMode mode,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-+        const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18583,7 +18418,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained_ptr lookup (
-+    IR_Contained_ptr lookup (
-       const char * search_name,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -18592,8 +18427,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * contents (
--      IR::DefinitionKind limit_type,
-+    IR_ContainedSeq * contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -18602,10 +18437,10 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * lookup_name (
-+    IR_ContainedSeq * lookup_name (
-       const char * search_name,
-       CORBA::Long levels_to_search,
--      IR::DefinitionKind limit_type,
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -18614,8 +18449,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container::DescriptionSeq * describe_contents (
--      IR::DefinitionKind limit_type,
-+    IR_Container::DescriptionSeq * describe_contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Long max_returned_objs,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -18625,7 +18460,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ModuleDef_ptr create_module (
-+    IR_ModuleDef_ptr create_module (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -18636,11 +18471,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ConstantDef_ptr create_constant (
-+    IR_ConstantDef_ptr create_constant (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-       const CORBA::Any & value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -18649,11 +18484,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::StructDef_ptr create_struct (
-+    IR_StructDef_ptr create_struct (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18661,12 +18496,12 @@
-       CORBA::SystemException
-     ));
- 
--  IR::UnionDef_ptr create_union (
-+    IR_UnionDef_ptr create_union (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr discriminator_type,
--      const IR::UnionMemberSeq & members,
-+        IR_IDLType_ptr discriminator_type,
-+        const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18674,11 +18509,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::EnumDef_ptr create_enum (
-+    IR_EnumDef_ptr create_enum (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18686,11 +18521,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::AliasDef_ptr create_alias (
-+    IR_AliasDef_ptr create_alias (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type,
-+        IR_IDLType_ptr original_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18698,11 +18533,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::InterfaceDef_ptr create_interface (
-+    IR_InterfaceDef_ptr create_interface (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Boolean is_abstract,
-       CORBA::Boolean is_local,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -18712,17 +18547,17 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr create_value (
-+    IR_ValueDef_ptr create_value (
-       const char * id,
-       const char * name,
-       const char * version,
-       CORBA::Boolean is_custom,
-       CORBA::Boolean is_abstract,
--      IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-       CORBA::Boolean is_truncatable,
--      const IR::ValueDefSeq & abstract_base_values,
--      const IR::InterfaceDefSeq & supported_interfaces,
--      const IR::InitializerSeq & initializers,
-+        const IR_ValueDefSeq & abstract_base_values,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-+        const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18730,11 +18565,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueBoxDef_ptr create_value_box (
-+    IR_ValueBoxDef_ptr create_value_box (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18742,11 +18577,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ExceptionDef_ptr create_exception (
-+    IR_ExceptionDef_ptr create_exception (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18754,7 +18589,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::NativeDef_ptr create_native (
-+    IR_NativeDef_ptr create_native (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -18816,7 +18651,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18832,7 +18667,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18840,7 +18675,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18849,7 +18684,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -18867,7 +18702,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18901,7 +18736,7 @@
- class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
- class _TAO_ValueMemberDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ValueMemberDef : public virtual Contained
-+  class ValueMemberDef : public virtual Contained
- {
- protected:
-   ValueMemberDef (void);
-@@ -18944,7 +18779,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::ValueMemberDef *_this (
-+    IR_ValueMemberDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -18967,7 +18802,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::IDLType_ptr type_def (
-+    virtual IR_IDLType_ptr type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18984,7 +18819,7 @@
-     );
- 
-   virtual void type_def (
--      IR::IDLType_ptr type_def,
-+        IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19037,7 +18872,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -19045,7 +18880,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -19053,7 +18888,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -19061,7 +18896,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -19069,7 +18904,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -19077,7 +18912,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -19085,7 +18920,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -19093,7 +18928,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -19101,7 +18936,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -19109,7 +18944,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -19117,7 +18952,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -19125,7 +18960,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -19133,11 +18968,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -19242,7 +19076,7 @@
-   POA_IR::ValueMemberDef *_tao_impl;
-   void result (IR::IDLType_ptr    result);
-  // update the result 
--IR::IDLType_ptr  _result;
-+      IR_IDLType_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ValueMemberDef_type_def_set : public TAO_ServerRequestInfo
-@@ -19253,7 +19087,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ValueMemberDef *tao_impl
-     ,
--    IR::IDLType_ptr type_def,
-+        IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -19292,7 +19126,7 @@
-   
- private:
-   POA_IR::ValueMemberDef *_tao_impl;
--  IR::IDLType_ptr type_def_;
-+      IR_IDLType_ptr type_def_;
- };
- 
- class TAO_ServerRequestInfo_IR_ValueMemberDef_access_get : public TAO_ServerRequestInfo
-@@ -19400,20 +19234,19 @@
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_ValueMemberDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ValueMemberDef_Proxy_Broker
-+class _TAO_ValueMemberDef_Strategized_Proxy_Broker : public virtual _TAO_ValueMemberDef_Proxy_Broker
- {
- public: 
-   _TAO_ValueMemberDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_ValueMemberDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_ValueMemberDef_Proxy_Impl &select_proxy (
--    ::IR::ValueMemberDef *object,
-+  virtual _TAO_ValueMemberDef_Proxy_Impl &select_proxy (
-+    IR_ValueMemberDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -19431,7 +19264,7 @@
-   // 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.
--  ::IR::_TAO_ValueMemberDef_Proxy_Impl
-+  _TAO_ValueMemberDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -19443,7 +19276,6 @@
-   static _TAO_ValueMemberDef_Strategized_Proxy_Broker *the_TAO_ValueMemberDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -19453,8 +19285,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_ValueMemberDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_ValueMemberDef_Proxy_Impl,
-+class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_ValueMemberDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-   
-@@ -19472,7 +19304,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr type_def (
-+  virtual IR_IDLType_ptr type_def   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -19482,7 +19314,7 @@
- 
-   virtual void type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr type_def,
-+      IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -19513,11 +19345,10 @@
- //                ThruPOA  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_IFR_Client_Export ValueMemberDef_tie : public ValueMemberDef
-+  class ValueMemberDef_tie : public ValueMemberDef
- {
- public:
-   ValueMemberDef_tie (T &t);
-@@ -19545,7 +19376,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::TypeCode_ptr type (
-@@ -19556,7 +19387,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::IDLType_ptr type_def (
-+    IR_IDLType_ptr type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19565,7 +19396,7 @@
-     ));
- 
-   void type_def (
--      IR::IDLType_ptr type_def,
-+        IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19641,7 +19472,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19657,7 +19488,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19665,7 +19496,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19674,7 +19505,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -19684,7 +19515,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19718,7 +19549,7 @@
- class _TAO_ValueDef_ThruPOA_Proxy_Impl;
- class _TAO_ValueDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ValueDef : public virtual Container, public virtual Contained, public virtual IDLType
-+  class ValueDef : public virtual Container, public virtual Contained, public virtual IDLType
- {
- protected:
-   ValueDef (void);
-@@ -19761,14 +19592,14 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::ValueDef *_this (
-+    IR_ValueDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
- 
-   virtual const char* _interface_repository_id (void) const;
- 
--  virtual IR::InterfaceDefSeq * supported_interfaces (
-+    virtual IR_InterfaceDefSeq * supported_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19785,7 +19616,7 @@
-     );
- 
-   virtual void supported_interfaces (
--      const IR::InterfaceDefSeq & supported_interfaces,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19801,7 +19632,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::InitializerSeq * initializers (
-+    virtual IR_InitializerSeq * initializers (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19818,7 +19649,7 @@
-     );
- 
-   virtual void initializers (
--      const IR::InitializerSeq & initializers,
-+        const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19834,7 +19665,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ValueDef_ptr base_value (
-+    virtual IR_ValueDef_ptr base_value (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19851,7 +19682,7 @@
-     );
- 
-   virtual void base_value (
--      IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19867,7 +19698,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ValueDefSeq * abstract_base_values (
-+    virtual IR_ValueDefSeq * abstract_base_values (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19884,7 +19715,7 @@
-     );
- 
-   virtual void abstract_base_values (
--      const IR::ValueDefSeq & abstract_base_values,
-+        const IR_ValueDefSeq & abstract_base_values,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -20016,11 +19847,11 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ValueMemberDef_ptr create_value_member (
-+    virtual IR_ValueMemberDef_ptr create_value_member (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-       CORBA::Visibility access,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -20037,14 +19868,14 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::AttributeDef_ptr create_attribute (
-+    virtual IR_AttributeDef_ptr create_attribute (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
--      IR::AttributeMode mode,
--      const IR::ExceptionDefSeq & get_exceptions,
--      const IR::ExceptionDefSeq & put_exceptions,
-+        IR_IDLType_ptr type,
-+        IR_AttributeMode mode,
-+        const IR_ExceptionDefSeq & get_exceptions,
-+        const IR_ExceptionDefSeq & put_exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -20060,15 +19891,15 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::OperationDef_ptr create_operation (
-+    virtual IR_OperationDef_ptr create_operation (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr result,
--      IR::OperationMode mode,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
--      const IR::ContextIdSeq & contexts,
-+        IR_IDLType_ptr result,
-+        IR_OperationMode mode,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-+        const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -20088,7 +19919,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20096,7 +19927,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20104,7 +19935,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20112,7 +19943,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20120,7 +19951,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20128,7 +19959,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20136,7 +19967,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20144,7 +19975,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20152,7 +19983,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20160,7 +19991,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20168,7 +19999,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20176,7 +20007,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20184,7 +20015,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20192,7 +20023,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20200,7 +20031,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20208,7 +20039,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20216,7 +20047,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20224,7 +20055,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20232,7 +20063,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20240,7 +20071,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20248,7 +20079,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20256,7 +20087,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20264,7 +20095,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20272,7 +20103,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20280,7 +20111,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20288,7 +20119,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20296,7 +20127,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20304,7 +20135,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -20312,11 +20143,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -20370,7 +20200,7 @@
-     POA_IR::ValueDef *_tao_impl;
-     void result (IR::InterfaceDefSeq *      result);
-  // update the result 
--IR::InterfaceDefSeq *  _result;
-+      IR_InterfaceDefSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ValueDef_supported_interfaces_set : public TAO_ServerRequestInfo
-@@ -20381,7 +20211,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ValueDef *tao_impl
-     ,
--    const IR::InterfaceDefSeq & supported_interfaces,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -20420,7 +20250,7 @@
-   
- private:
-   POA_IR::ValueDef *_tao_impl;
--  const IR::InterfaceDefSeq & supported_interfaces_;
-+      const IR_InterfaceDefSeq & supported_interfaces_;
- };
- 
- class TAO_ServerRequestInfo_IR_ValueDef_initializers_get : public TAO_ServerRequestInfo
-@@ -20471,7 +20301,7 @@
-   POA_IR::ValueDef *_tao_impl;
-   void result (IR::InitializerSeq *    result);
-  // update the result 
--IR::InitializerSeq *  _result;
-+      IR_InitializerSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ValueDef_initializers_set : public TAO_ServerRequestInfo
-@@ -20482,7 +20312,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ValueDef *tao_impl
-     ,
--    const IR::InitializerSeq & initializers,
-+        const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -20521,7 +20351,7 @@
-   
- private:
-   POA_IR::ValueDef *_tao_impl;
--  const IR::InitializerSeq & initializers_;
-+      const IR_InitializerSeq & initializers_;
- };
- 
- class TAO_ServerRequestInfo_IR_ValueDef_base_value_get : public TAO_ServerRequestInfo
-@@ -20572,7 +20402,7 @@
-   POA_IR::ValueDef *_tao_impl;
-   void result (IR::ValueDef_ptr    result);
-  // update the result 
--IR::ValueDef_ptr  _result;
-+      IR_ValueDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ValueDef_base_value_set : public TAO_ServerRequestInfo
-@@ -20583,7 +20413,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ValueDef *tao_impl
-     ,
--    IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -20622,7 +20452,7 @@
-   
- private:
-   POA_IR::ValueDef *_tao_impl;
--  IR::ValueDef_ptr base_value_;
-+      IR_ValueDef_ptr base_value_;
- };
- 
- class TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_get : public TAO_ServerRequestInfo
-@@ -20673,7 +20503,7 @@
-   POA_IR::ValueDef *_tao_impl;
-   void result (IR::ValueDefSeq *    result);
-  // update the result 
--IR::ValueDefSeq *  _result;
-+      IR_ValueDefSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ValueDef_abstract_base_values_set : public TAO_ServerRequestInfo
-@@ -20684,7 +20514,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ValueDef *tao_impl
-     ,
--    const IR::ValueDefSeq & abstract_base_values,
-+        const IR_ValueDefSeq & abstract_base_values,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -20723,7 +20553,7 @@
-   
- private:
-   POA_IR::ValueDef *_tao_impl;
--  const IR::ValueDefSeq & abstract_base_values_;
-+      const IR_ValueDefSeq & abstract_base_values_;
- };
- 
- class TAO_ServerRequestInfo_IR_ValueDef_is_abstract_get : public TAO_ServerRequestInfo
-@@ -21093,7 +20923,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-     const CORBA::Visibility & access,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-@@ -21136,11 +20966,11 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--IR::IDLType_ptr type_;
-+      IR_IDLType_ptr type_;
- const CORBA::Visibility & access_;
- void result (IR::ValueMemberDef_ptr    result);
-  // update the result 
--IR::ValueMemberDef_ptr  _result;
-+      IR_ValueMemberDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ValueDef_create_attribute : public TAO_ServerRequestInfo
-@@ -21154,10 +20984,10 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode & mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+        IR_IDLType_ptr type,
-+        IR_AttributeMode & mode,
-+        const IR_ExceptionDefSeq & get_exceptions,
-+        const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -21199,13 +21029,13 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--IR::IDLType_ptr type_;
--const IR::AttributeMode & mode_;
--const IR::ExceptionDefSeq & get_exceptions_;
--const IR::ExceptionDefSeq & put_exceptions_;
-+      IR_IDLType_ptr type_;
-+      const IR_AttributeMode & mode_;
-+      const IR_ExceptionDefSeq & get_exceptions_;
-+      const IR_ExceptionDefSeq & put_exceptions_;
- void result (IR::AttributeDef_ptr    result);
-  // update the result 
--IR::AttributeDef_ptr  _result;
-+      IR_AttributeDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ValueDef_create_operation : public TAO_ServerRequestInfo
-@@ -21219,11 +21049,11 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode & mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+        IR_IDLType_ptr result,
-+        IR_OperationMode & mode,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-+        const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -21265,34 +21095,33 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--IR::IDLType_ptr result_;
--const IR::OperationMode & mode_;
--const IR::ParDescriptionSeq & params_;
--const IR::ExceptionDefSeq & exceptions_;
--const IR::ContextIdSeq & contexts_;
-+      IR_IDLType_ptr result_;
-+      const IR_OperationMode & mode_;
-+      const IR_ParDescriptionSeq & params_;
-+      const IR_ExceptionDefSeq & exceptions_;
-+      const IR_ContextIdSeq & contexts_;
- void result (IR::OperationDef_ptr    result);
-  // update the result 
--IR::OperationDef_ptr  _result;
-+      IR_OperationDef_ptr  _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_ValueDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ValueDef_Proxy_Broker
-+class _TAO_ValueDef_Strategized_Proxy_Broker : public virtual _TAO_ValueDef_Proxy_Broker
- {
- public: 
-   _TAO_ValueDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_ValueDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_ValueDef_Proxy_Impl &select_proxy (
--    ::IR::ValueDef *object,
-+  virtual _TAO_ValueDef_Proxy_Impl &select_proxy (
-+    IR_ValueDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -21310,7 +21139,7 @@
-   // 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.
--  ::IR::_TAO_ValueDef_Proxy_Impl
-+  _TAO_ValueDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -21322,7 +21151,6 @@
-   static _TAO_ValueDef_Strategized_Proxy_Broker *the_TAO_ValueDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -21332,8 +21160,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_ValueDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_ValueDef_Proxy_Impl,
-+class _TAO_ValueDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_ValueDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_Container_ThruPOA_Proxy_Impl, 
-   public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl, 
-@@ -21345,7 +21173,7 @@
-   
-   virtual ~_TAO_ValueDef_ThruPOA_Proxy_Impl (void) { }
-   
--    virtual IR::InterfaceDefSeq * supported_interfaces (
-+    virtual IR_InterfaceDefSeq * supported_interfaces   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -21355,14 +21183,14 @@
- 
-   virtual void supported_interfaces (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::InterfaceDefSeq & supported_interfaces,
-+      const IR_InterfaceDefSeq & supported_interfaces,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::InitializerSeq * initializers (
-+  virtual IR_InitializerSeq * initializers   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -21372,14 +21200,14 @@
- 
-   virtual void initializers (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::InitializerSeq & initializers,
-+      const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueDef_ptr base_value (
-+  virtual IR_ValueDef_ptr base_value   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -21389,14 +21217,14 @@
- 
-   virtual void base_value (
-       CORBA_Object *_collocated_tao_target_,
--      IR::ValueDef_ptr base_value,
-+      IR_ValueDef_ptr base_value,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueDefSeq * abstract_base_values (
-+  virtual IR_ValueDefSeq * abstract_base_values   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -21406,7 +21234,7 @@
- 
-   virtual void abstract_base_values (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::ValueDefSeq & abstract_base_values,
-+      const IR_ValueDefSeq & abstract_base_values,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -21473,12 +21301,12 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueMemberDef_ptr create_value_member (
-+  virtual IR_ValueMemberDef_ptr create_value_member   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+      IR_IDLType_ptr type,
-       CORBA::Visibility access,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -21486,31 +21314,31 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::AttributeDef_ptr create_attribute (
-+  virtual IR_AttributeDef_ptr create_attribute   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
--      IR::AttributeMode mode,
--      const IR::ExceptionDefSeq & get_exceptions,
--      const IR::ExceptionDefSeq & put_exceptions,
-+      IR_IDLType_ptr type,
-+      IR_AttributeMode mode,
-+      const IR_ExceptionDefSeq & get_exceptions,
-+      const IR_ExceptionDefSeq & put_exceptions,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::OperationDef_ptr create_operation (
-+  virtual IR_OperationDef_ptr create_operation   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr result,
--      IR::OperationMode mode,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
--      const IR::ContextIdSeq & contexts,
-+      IR_IDLType_ptr result,
-+      IR_OperationMode mode,
-+      const IR_ParDescriptionSeq & params,
-+      const IR_ExceptionDefSeq & exceptions,
-+      const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -21524,11 +21352,10 @@
- //                ThruPOA  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_IFR_Client_Export ValueDef_tie : public ValueDef
-+  class ValueDef_tie : public ValueDef
- {
- public:
-   ValueDef_tie (T &t);
-@@ -21556,10 +21383,10 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
--  IR::InterfaceDefSeq * supported_interfaces (
-+    IR_InterfaceDefSeq * supported_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21568,7 +21395,7 @@
-     ));
- 
-   void supported_interfaces (
--      const IR::InterfaceDefSeq & supported_interfaces,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21576,7 +21403,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::InitializerSeq * initializers (
-+    IR_InitializerSeq * initializers (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21585,7 +21412,7 @@
-     ));
- 
-   void initializers (
--      const IR::InitializerSeq & initializers,
-+        const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21593,7 +21420,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr base_value (
-+    IR_ValueDef_ptr base_value (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21602,7 +21429,7 @@
-     ));
- 
-   void base_value (
--      IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21610,7 +21437,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDefSeq * abstract_base_values (
-+    IR_ValueDefSeq * abstract_base_values (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21619,7 +21446,7 @@
-     ));
- 
-   void abstract_base_values (
--      const IR::ValueDefSeq & abstract_base_values,
-+        const IR_ValueDefSeq & abstract_base_values,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21687,11 +21514,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueMemberDef_ptr create_value_member (
-+    IR_ValueMemberDef_ptr create_value_member (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-       CORBA::Visibility access,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -21700,14 +21527,14 @@
-       CORBA::SystemException
-     ));
- 
--  IR::AttributeDef_ptr create_attribute (
-+    IR_AttributeDef_ptr create_attribute (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
--      IR::AttributeMode mode,
--      const IR::ExceptionDefSeq & get_exceptions,
--      const IR::ExceptionDefSeq & put_exceptions,
-+        IR_IDLType_ptr type,
-+        IR_AttributeMode mode,
-+        const IR_ExceptionDefSeq & get_exceptions,
-+        const IR_ExceptionDefSeq & put_exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21715,15 +21542,15 @@
-       CORBA::SystemException
-     ));
- 
--  IR::OperationDef_ptr create_operation (
-+    IR_OperationDef_ptr create_operation (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr result,
--      IR::OperationMode mode,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
--      const IR::ContextIdSeq & contexts,
-+        IR_IDLType_ptr result,
-+        IR_OperationMode mode,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-+        const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21731,7 +21558,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained_ptr lookup (
-+    IR_Contained_ptr lookup (
-       const char * search_name,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -21740,8 +21567,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * contents (
--      IR::DefinitionKind limit_type,
-+    IR_ContainedSeq * contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -21750,10 +21577,10 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * lookup_name (
-+    IR_ContainedSeq * lookup_name (
-       const char * search_name,
-       CORBA::Long levels_to_search,
--      IR::DefinitionKind limit_type,
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -21762,8 +21589,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container::DescriptionSeq * describe_contents (
--      IR::DefinitionKind limit_type,
-+    IR_Container::DescriptionSeq * describe_contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Long max_returned_objs,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -21773,7 +21600,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ModuleDef_ptr create_module (
-+    IR_ModuleDef_ptr create_module (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -21784,11 +21611,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ConstantDef_ptr create_constant (
-+    IR_ConstantDef_ptr create_constant (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-       const CORBA::Any & value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -21797,11 +21624,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::StructDef_ptr create_struct (
-+    IR_StructDef_ptr create_struct (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21809,12 +21636,12 @@
-       CORBA::SystemException
-     ));
- 
--  IR::UnionDef_ptr create_union (
-+    IR_UnionDef_ptr create_union (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr discriminator_type,
--      const IR::UnionMemberSeq & members,
-+        IR_IDLType_ptr discriminator_type,
-+        const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21822,11 +21649,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::EnumDef_ptr create_enum (
-+    IR_EnumDef_ptr create_enum (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21834,11 +21661,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::AliasDef_ptr create_alias (
-+    IR_AliasDef_ptr create_alias (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type,
-+        IR_IDLType_ptr original_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21846,11 +21673,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::InterfaceDef_ptr create_interface (
-+    IR_InterfaceDef_ptr create_interface (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Boolean is_abstract,
-       CORBA::Boolean is_local,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -21860,17 +21687,17 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr create_value (
-+    IR_ValueDef_ptr create_value (
-       const char * id,
-       const char * name,
-       const char * version,
-       CORBA::Boolean is_custom,
-       CORBA::Boolean is_abstract,
--      IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-       CORBA::Boolean is_truncatable,
--      const IR::ValueDefSeq & abstract_base_values,
--      const IR::InterfaceDefSeq & supported_interfaces,
--      const IR::InitializerSeq & initializers,
-+        const IR_ValueDefSeq & abstract_base_values,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-+        const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21878,11 +21705,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueBoxDef_ptr create_value_box (
-+    IR_ValueBoxDef_ptr create_value_box (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21890,11 +21717,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ExceptionDef_ptr create_exception (
-+    IR_ExceptionDef_ptr create_exception (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21902,7 +21729,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::NativeDef_ptr create_native (
-+    IR_NativeDef_ptr create_native (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -21964,7 +21791,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21980,7 +21807,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21988,7 +21815,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21997,7 +21824,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -22015,7 +21842,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -22049,7 +21876,7 @@
- class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
- class _TAO_ValueBoxDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ValueBoxDef : public virtual TypedefDef
-+  class ValueBoxDef : public virtual TypedefDef
- {
- protected:
-   ValueBoxDef (void);
-@@ -22092,14 +21919,14 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::ValueBoxDef *_this (
-+    IR_ValueBoxDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
- 
-   virtual const char* _interface_repository_id (void) const;
- 
--  virtual IR::IDLType_ptr original_type_def (
-+    virtual IR_IDLType_ptr original_type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -22116,7 +21943,7 @@
-     );
- 
-   virtual void original_type_def (
--      IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -22136,7 +21963,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22144,7 +21971,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22152,7 +21979,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22160,7 +21987,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22168,7 +21995,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22176,7 +22003,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22184,7 +22011,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22192,7 +22019,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22200,7 +22027,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22208,7 +22035,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22216,7 +22043,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22224,7 +22051,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22232,7 +22059,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22240,11 +22067,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -22298,7 +22124,7 @@
-     POA_IR::ValueBoxDef *_tao_impl;
-     void result (IR::IDLType_ptr      result);
-  // update the result 
--IR::IDLType_ptr  _result;
-+      IR_IDLType_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ValueBoxDef_original_type_def_set : public TAO_ServerRequestInfo
-@@ -22309,7 +22135,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ValueBoxDef *tao_impl
-     ,
--    IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -22348,27 +22174,26 @@
-   
- private:
-   POA_IR::ValueBoxDef *_tao_impl;
--  IR::IDLType_ptr original_type_def_;
-+      IR_IDLType_ptr original_type_def_;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_ValueBoxDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ValueBoxDef_Proxy_Broker
-+class _TAO_ValueBoxDef_Strategized_Proxy_Broker : public virtual _TAO_ValueBoxDef_Proxy_Broker
- {
- public: 
-   _TAO_ValueBoxDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_ValueBoxDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_ValueBoxDef_Proxy_Impl &select_proxy (
--    ::IR::ValueBoxDef *object,
-+  virtual _TAO_ValueBoxDef_Proxy_Impl &select_proxy (
-+    IR_ValueBoxDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -22386,7 +22211,7 @@
-   // 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.
--  ::IR::_TAO_ValueBoxDef_Proxy_Impl
-+  _TAO_ValueBoxDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -22398,7 +22223,6 @@
-   static _TAO_ValueBoxDef_Strategized_Proxy_Broker *the_TAO_ValueBoxDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -22408,8 +22232,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_ValueBoxDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_ValueBoxDef_Proxy_Impl,
-+class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_ValueBoxDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_TypedefDef_ThruPOA_Proxy_Impl
-   
-@@ -22419,7 +22243,7 @@
-   
-   virtual ~_TAO_ValueBoxDef_ThruPOA_Proxy_Impl (void) { }
-   
--    virtual IR::IDLType_ptr original_type_def (
-+    virtual IR_IDLType_ptr original_type_def   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -22429,7 +22253,7 @@
- 
-   virtual void original_type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr original_type_def,
-+      IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -22443,11 +22267,10 @@
- //                ThruPOA  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_IFR_Client_Export ValueBoxDef_tie : public ValueBoxDef
-+  class ValueBoxDef_tie : public ValueBoxDef
- {
- public:
-   ValueBoxDef_tie (T &t);
-@@ -22475,10 +22298,10 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
--  IR::IDLType_ptr original_type_def (
-+    IR_IDLType_ptr original_type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -22487,7 +22310,7 @@
-     ));
- 
-   void original_type_def (
--      IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -22546,7 +22369,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -22562,7 +22385,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -22570,7 +22393,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -22579,7 +22402,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -22597,7 +22420,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -22631,7 +22454,7 @@
- class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
- class _TAO_ProvidesDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ProvidesDef : public virtual Contained
-+  class ProvidesDef : public virtual Contained
- {
- protected:
-   ProvidesDef (void);
-@@ -22674,14 +22497,14 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::ProvidesDef *_this (
-+    IR_ProvidesDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
- 
-   virtual const char* _interface_repository_id (void) const;
- 
--  virtual IR::InterfaceDef_ptr interface_type (
-+    virtual IR_InterfaceDef_ptr interface_type (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -22701,7 +22524,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22709,7 +22532,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22717,7 +22540,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22725,7 +22548,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22733,7 +22556,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22741,7 +22564,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22749,7 +22572,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22757,7 +22580,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22765,7 +22588,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22773,7 +22596,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22781,7 +22604,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22789,7 +22612,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -22797,11 +22620,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -22855,27 +22677,26 @@
-     POA_IR::ProvidesDef *_tao_impl;
-     void result (IR::InterfaceDef_ptr      result);
-  // update the result 
--IR::InterfaceDef_ptr  _result;
-+      IR_InterfaceDef_ptr  _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_ProvidesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ProvidesDef_Proxy_Broker
-+class _TAO_ProvidesDef_Strategized_Proxy_Broker : public virtual _TAO_ProvidesDef_Proxy_Broker
- {
- public: 
-   _TAO_ProvidesDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_ProvidesDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_ProvidesDef_Proxy_Impl &select_proxy (
--    ::IR::ProvidesDef *object,
-+  virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
-+    IR_ProvidesDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -22893,7 +22714,7 @@
-   // 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.
--  ::IR::_TAO_ProvidesDef_Proxy_Impl
-+  _TAO_ProvidesDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -22905,7 +22726,6 @@
-   static _TAO_ProvidesDef_Strategized_Proxy_Broker *the_TAO_ProvidesDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -22915,8 +22735,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_ProvidesDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_ProvidesDef_Proxy_Impl,
-+class _TAO_ProvidesDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_ProvidesDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-   
-@@ -22926,7 +22746,7 @@
-   
-   virtual ~_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void) { }
-   
--    virtual IR::InterfaceDef_ptr interface_type (
-+    virtual IR_InterfaceDef_ptr interface_type   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -22941,11 +22761,10 @@
- //                ThruPOA  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_IFR_Client_Export ProvidesDef_tie : public ProvidesDef
-+  class ProvidesDef_tie : public ProvidesDef
- {
- public:
-   ProvidesDef_tie (T &t);
-@@ -22973,10 +22792,10 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
--  IR::InterfaceDef_ptr interface_type (
-+    IR_InterfaceDef_ptr interface_type (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -23035,7 +22854,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -23051,7 +22870,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -23059,7 +22878,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -23068,7 +22887,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -23078,7 +22897,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -23112,7 +22931,7 @@
- class _TAO_UsesDef_ThruPOA_Proxy_Impl;
- class _TAO_UsesDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export UsesDef : public virtual Contained
-+  class UsesDef : public virtual Contained
- {
- protected:
-   UsesDef (void);
-@@ -23155,14 +22974,14 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::UsesDef *_this (
-+    IR_UsesDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
- 
-   virtual const char* _interface_repository_id (void) const;
- 
--  virtual IR::InterfaceDef_ptr interface_type (
-+    virtual IR_InterfaceDef_ptr interface_type (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -23198,7 +23017,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23206,7 +23025,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23214,7 +23033,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23222,7 +23041,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23230,7 +23049,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23238,7 +23057,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23246,7 +23065,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23254,7 +23073,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23262,7 +23081,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23270,7 +23089,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23278,7 +23097,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23286,7 +23105,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23294,11 +23113,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -23352,7 +23170,7 @@
-     POA_IR::UsesDef *_tao_impl;
-     void result (IR::InterfaceDef_ptr      result);
-  // update the result 
--IR::InterfaceDef_ptr  _result;
-+      IR_InterfaceDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get : public TAO_ServerRequestInfo
-@@ -23410,20 +23228,19 @@
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_UsesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_UsesDef_Proxy_Broker
-+class _TAO_UsesDef_Strategized_Proxy_Broker : public virtual _TAO_UsesDef_Proxy_Broker
- {
- public: 
-   _TAO_UsesDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_UsesDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_UsesDef_Proxy_Impl &select_proxy (
--    ::IR::UsesDef *object,
-+  virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
-+    IR_UsesDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -23441,7 +23258,7 @@
-   // 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.
--  ::IR::_TAO_UsesDef_Proxy_Impl
-+  _TAO_UsesDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -23453,7 +23270,6 @@
-   static _TAO_UsesDef_Strategized_Proxy_Broker *the_TAO_UsesDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -23463,8 +23279,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_UsesDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_UsesDef_Proxy_Impl,
-+class _TAO_UsesDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_UsesDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-   
-@@ -23474,7 +23290,7 @@
-   
-   virtual ~_TAO_UsesDef_ThruPOA_Proxy_Impl (void) { }
-   
--    virtual IR::InterfaceDef_ptr interface_type (
-+    virtual IR_InterfaceDef_ptr interface_type   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -23497,11 +23313,10 @@
- //                ThruPOA  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_IFR_Client_Export UsesDef_tie : public UsesDef
-+  class UsesDef_tie : public UsesDef
- {
- public:
-   UsesDef_tie (T &t);
-@@ -23529,10 +23344,10 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
--  IR::InterfaceDef_ptr interface_type (
-+    IR_InterfaceDef_ptr interface_type (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -23599,7 +23414,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -23615,7 +23430,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -23623,7 +23438,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -23632,7 +23447,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -23642,7 +23457,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -23676,7 +23491,7 @@
- class _TAO_EventDef_ThruPOA_Proxy_Impl;
- class _TAO_EventDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export EventDef : public virtual Contained
-+  class EventDef : public virtual Contained
- {
- protected:
-   EventDef (void);
-@@ -23719,7 +23534,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::EventDef *_this (
-+    IR_EventDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -23743,7 +23558,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ValueDef_ptr event (
-+    virtual IR_ValueDef_ptr event (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -23763,7 +23578,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23771,7 +23586,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23779,7 +23594,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23787,7 +23602,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23795,7 +23610,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23803,7 +23618,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23811,7 +23626,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23819,7 +23634,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23827,7 +23642,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23835,7 +23650,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23843,7 +23658,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23851,7 +23666,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -23859,11 +23674,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -23970,27 +23784,26 @@
-   POA_IR::EventDef *_tao_impl;
-   void result (IR::ValueDef_ptr    result);
-  // update the result 
--IR::ValueDef_ptr  _result;
-+      IR_ValueDef_ptr  _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_EventDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EventDef_Proxy_Broker
-+class _TAO_EventDef_Strategized_Proxy_Broker : public virtual _TAO_EventDef_Proxy_Broker
- {
- public: 
-   _TAO_EventDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_EventDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_EventDef_Proxy_Impl &select_proxy (
--    ::IR::EventDef *object,
-+  virtual _TAO_EventDef_Proxy_Impl &select_proxy (
-+    IR_EventDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -24008,7 +23821,7 @@
-   // 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.
--  ::IR::_TAO_EventDef_Proxy_Impl
-+  _TAO_EventDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -24020,7 +23833,6 @@
-   static _TAO_EventDef_Strategized_Proxy_Broker *the_TAO_EventDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -24030,8 +23842,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_EventDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_EventDef_Proxy_Impl,
-+class _TAO_EventDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_EventDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-   
-@@ -24050,7 +23862,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueDef_ptr event (
-+  virtual IR_ValueDef_ptr event   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -24065,11 +23877,10 @@
- //                ThruPOA  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_IFR_Client_Export EventDef_tie : public EventDef
-+  class EventDef_tie : public EventDef
- {
- public:
-   EventDef_tie (T &t);
-@@ -24097,7 +23908,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::Boolean is_a (
-@@ -24109,7 +23920,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr event (
-+    IR_ValueDef_ptr event (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -24168,7 +23979,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -24184,7 +23995,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -24192,7 +24003,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -24201,7 +24012,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -24211,7 +24022,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -24245,7 +24056,7 @@
- class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
- class _TAO_EmitsDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export EmitsDef : public virtual EventDef
-+  class EmitsDef : public virtual EventDef
- {
- protected:
-   EmitsDef (void);
-@@ -24288,7 +24099,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::EmitsDef *_this (
-+    IR_EmitsDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -24299,7 +24110,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24307,7 +24118,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24315,7 +24126,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24323,7 +24134,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24331,7 +24142,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24339,7 +24150,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24347,7 +24158,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24355,7 +24166,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24363,7 +24174,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24371,7 +24182,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24379,7 +24190,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24387,7 +24198,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24395,7 +24206,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24403,7 +24214,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24411,11 +24222,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -24425,20 +24235,19 @@
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_EmitsDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EmitsDef_Proxy_Broker
-+class _TAO_EmitsDef_Strategized_Proxy_Broker : public virtual _TAO_EmitsDef_Proxy_Broker
- {
- public: 
-   _TAO_EmitsDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_EmitsDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_EmitsDef_Proxy_Impl &select_proxy (
--    ::IR::EmitsDef *object,
-+  virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
-+    IR_EmitsDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -24456,7 +24265,7 @@
-   // 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.
--  ::IR::_TAO_EmitsDef_Proxy_Impl
-+  _TAO_EmitsDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -24468,7 +24277,6 @@
-   static _TAO_EmitsDef_Strategized_Proxy_Broker *the_TAO_EmitsDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -24478,8 +24286,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_EmitsDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_EmitsDef_Proxy_Impl,
-+class _TAO_EmitsDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_EmitsDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
-   
-@@ -24496,11 +24304,10 @@
- //                ThruPOA  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_IFR_Client_Export EmitsDef_tie : public EmitsDef
-+  class EmitsDef_tie : public EmitsDef
- {
- public:
-   EmitsDef_tie (T &t);
-@@ -24528,7 +24335,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::Boolean is_a (
-@@ -24540,7 +24347,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr event (
-+    IR_ValueDef_ptr event (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -24599,7 +24406,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -24615,7 +24422,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -24623,7 +24430,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -24632,7 +24439,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -24642,7 +24449,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -24676,7 +24483,7 @@
- class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
- class _TAO_PublishesDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export PublishesDef : public virtual EventDef
-+  class PublishesDef : public virtual EventDef
- {
- protected:
-   PublishesDef (void);
-@@ -24719,7 +24526,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::PublishesDef *_this (
-+    IR_PublishesDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -24730,7 +24537,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24738,7 +24545,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24746,7 +24553,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24754,7 +24561,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24762,7 +24569,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24770,7 +24577,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24778,7 +24585,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24786,7 +24593,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24794,7 +24601,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24802,7 +24609,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24810,7 +24617,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24818,7 +24625,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24826,7 +24633,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24834,7 +24641,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -24842,11 +24649,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -24856,20 +24662,19 @@
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_PublishesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PublishesDef_Proxy_Broker
-+class _TAO_PublishesDef_Strategized_Proxy_Broker : public virtual _TAO_PublishesDef_Proxy_Broker
- {
- public: 
-   _TAO_PublishesDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_PublishesDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_PublishesDef_Proxy_Impl &select_proxy (
--    ::IR::PublishesDef *object,
-+  virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
-+    IR_PublishesDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -24887,7 +24692,7 @@
-   // 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.
--  ::IR::_TAO_PublishesDef_Proxy_Impl
-+  _TAO_PublishesDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -24899,7 +24704,6 @@
-   static _TAO_PublishesDef_Strategized_Proxy_Broker *the_TAO_PublishesDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -24909,8 +24713,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_PublishesDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_PublishesDef_Proxy_Impl,
-+class _TAO_PublishesDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_PublishesDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
-   
-@@ -24927,11 +24731,10 @@
- //                ThruPOA  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_IFR_Client_Export PublishesDef_tie : public PublishesDef
-+  class PublishesDef_tie : public PublishesDef
- {
- public:
-   PublishesDef_tie (T &t);
-@@ -24959,7 +24762,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::Boolean is_a (
-@@ -24971,7 +24774,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr event (
-+    IR_ValueDef_ptr event (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25030,7 +24833,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25046,7 +24849,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25054,7 +24857,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25063,7 +24866,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -25073,7 +24876,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25107,7 +24910,7 @@
- class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
- class _TAO_ConsumesDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ConsumesDef : public virtual EventDef
-+  class ConsumesDef : public virtual EventDef
- {
- protected:
-   ConsumesDef (void);
-@@ -25150,7 +24953,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::ConsumesDef *_this (
-+    IR_ConsumesDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -25161,7 +24964,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25169,7 +24972,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25177,7 +24980,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25185,7 +24988,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25193,7 +24996,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25201,7 +25004,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25209,7 +25012,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25217,7 +25020,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25225,7 +25028,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25233,7 +25036,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25241,7 +25044,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25249,7 +25052,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25257,7 +25060,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25265,7 +25068,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25273,11 +25076,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -25287,20 +25089,19 @@
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_ConsumesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ConsumesDef_Proxy_Broker
-+class _TAO_ConsumesDef_Strategized_Proxy_Broker : public virtual _TAO_ConsumesDef_Proxy_Broker
- {
- public: 
-   _TAO_ConsumesDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_ConsumesDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_ConsumesDef_Proxy_Impl &select_proxy (
--    ::IR::ConsumesDef *object,
-+  virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
-+    IR_ConsumesDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -25318,7 +25119,7 @@
-   // 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.
--  ::IR::_TAO_ConsumesDef_Proxy_Impl
-+  _TAO_ConsumesDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -25330,7 +25131,6 @@
-   static _TAO_ConsumesDef_Strategized_Proxy_Broker *the_TAO_ConsumesDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -25340,8 +25140,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_ConsumesDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_ConsumesDef_Proxy_Impl,
-+class _TAO_ConsumesDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_ConsumesDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
-   
-@@ -25358,11 +25158,10 @@
- //                ThruPOA  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_IFR_Client_Export ConsumesDef_tie : public ConsumesDef
-+  class ConsumesDef_tie : public ConsumesDef
- {
- public:
-   ConsumesDef_tie (T &t);
-@@ -25390,7 +25189,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::Boolean is_a (
-@@ -25402,7 +25201,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr event (
-+    IR_ValueDef_ptr event (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25461,7 +25260,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25477,7 +25276,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25485,7 +25284,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25494,7 +25293,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -25504,7 +25303,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25538,7 +25337,7 @@
- class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
- class _TAO_ComponentDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ComponentDef : public virtual InterfaceDef
-+  class ComponentDef : public virtual InterfaceDef
- {
- protected:
-   ComponentDef (void);
-@@ -25581,14 +25380,14 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::ComponentDef *_this (
-+    IR_ComponentDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
- 
-   virtual const char* _interface_repository_id (void) const;
- 
--  virtual IR::InterfaceDefSeq * supported_interfaces (
-+    virtual IR_InterfaceDefSeq * supported_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25605,7 +25404,7 @@
-     );
- 
-   virtual void supported_interfaces (
--      const IR::InterfaceDefSeq & supported_interfaces,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25621,7 +25420,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ComponentDef_ptr base_component (
-+    virtual IR_ComponentDef_ptr base_component (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25637,7 +25436,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ProvidesDefSeq * provides_interfaces (
-+    virtual IR_ProvidesDefSeq * provides_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25653,7 +25452,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::UsesDefSeq * uses_interfaces (
-+    virtual IR_UsesDefSeq * uses_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25669,7 +25468,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::EmitsDefSeq * emits_events (
-+    virtual IR_EmitsDefSeq * emits_events (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25685,7 +25484,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::PublishesDefSeq * publishes_events (
-+    virtual IR_PublishesDefSeq * publishes_events (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25701,7 +25500,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ConsumesDefSeq * consumes_events (
-+    virtual IR_ConsumesDefSeq * consumes_events (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25733,11 +25532,11 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ProvidesDef_ptr create_provides (
-+    virtual IR_ProvidesDef_ptr create_provides (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::InterfaceDef_ptr interface_type,
-+        IR_InterfaceDef_ptr interface_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25753,11 +25552,11 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::UsesDef_ptr create_uses (
-+    virtual IR_UsesDef_ptr create_uses (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::InterfaceDef_ptr interface_type,
-+        IR_InterfaceDef_ptr interface_type,
-       CORBA::Boolean is_multiple,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -25774,11 +25573,11 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::EmitsDef_ptr create_emits (
-+    virtual IR_EmitsDef_ptr create_emits (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+        IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25794,11 +25593,11 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::PublishesDef_ptr create_publishes (
-+    virtual IR_PublishesDef_ptr create_publishes (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+        IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25814,11 +25613,11 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ConsumesDef_ptr create_consumes (
-+    virtual IR_ConsumesDef_ptr create_consumes (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+        IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25838,7 +25637,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25846,7 +25645,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25854,7 +25653,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25862,7 +25661,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25870,7 +25669,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25878,7 +25677,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25886,7 +25685,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25894,7 +25693,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25902,7 +25701,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25910,7 +25709,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25918,7 +25717,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25926,7 +25725,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25934,7 +25733,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25942,7 +25741,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25950,7 +25749,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25958,7 +25757,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25966,7 +25765,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25974,7 +25773,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25982,7 +25781,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25990,7 +25789,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -25998,7 +25797,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26006,7 +25805,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26014,7 +25813,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26022,7 +25821,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26030,7 +25829,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26038,7 +25837,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26046,7 +25845,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26054,7 +25853,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26062,7 +25861,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26070,7 +25869,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26078,7 +25877,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26086,7 +25885,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26094,7 +25893,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26102,7 +25901,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26110,7 +25909,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26118,7 +25917,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26126,7 +25925,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -26134,11 +25933,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -26192,7 +25990,7 @@
-     POA_IR::ComponentDef *_tao_impl;
-     void result (IR::InterfaceDefSeq *      result);
-  // update the result 
--IR::InterfaceDefSeq *  _result;
-+      IR_InterfaceDefSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set : public TAO_ServerRequestInfo
-@@ -26203,7 +26001,7 @@
-     TAO_ServerRequest &_tao_server_request,
-     POA_IR::ComponentDef *tao_impl
-     ,
--    const IR::InterfaceDefSeq & supported_interfaces,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -26242,7 +26040,7 @@
-   
- private:
-   POA_IR::ComponentDef *_tao_impl;
--  const IR::InterfaceDefSeq & supported_interfaces_;
-+      const IR_InterfaceDefSeq & supported_interfaces_;
- };
- 
- class TAO_ServerRequestInfo_IR_ComponentDef_base_component_get : public TAO_ServerRequestInfo
-@@ -26293,7 +26091,7 @@
-   POA_IR::ComponentDef *_tao_impl;
-   void result (IR::ComponentDef_ptr    result);
-  // update the result 
--IR::ComponentDef_ptr  _result;
-+      IR_ComponentDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get : public TAO_ServerRequestInfo
-@@ -26344,7 +26142,7 @@
-   POA_IR::ComponentDef *_tao_impl;
-   void result (IR::ProvidesDefSeq *    result);
-  // update the result 
--IR::ProvidesDefSeq *  _result;
-+      IR_ProvidesDefSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get : public TAO_ServerRequestInfo
-@@ -26395,7 +26193,7 @@
-   POA_IR::ComponentDef *_tao_impl;
-   void result (IR::UsesDefSeq *    result);
-  // update the result 
--IR::UsesDefSeq *  _result;
-+      IR_UsesDefSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get : public TAO_ServerRequestInfo
-@@ -26446,7 +26244,7 @@
-   POA_IR::ComponentDef *_tao_impl;
-   void result (IR::EmitsDefSeq *    result);
-  // update the result 
--IR::EmitsDefSeq *  _result;
-+      IR_EmitsDefSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get : public TAO_ServerRequestInfo
-@@ -26497,7 +26295,7 @@
-   POA_IR::ComponentDef *_tao_impl;
-   void result (IR::PublishesDefSeq *    result);
-  // update the result 
--IR::PublishesDefSeq *  _result;
-+      IR_PublishesDefSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get : public TAO_ServerRequestInfo
-@@ -26548,7 +26346,7 @@
-   POA_IR::ComponentDef *_tao_impl;
-   void result (IR::ConsumesDefSeq *    result);
-  // update the result 
--IR::ConsumesDefSeq *  _result;
-+      IR_ConsumesDefSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get : public TAO_ServerRequestInfo
-@@ -26613,7 +26411,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::InterfaceDef_ptr interface_type,
-+        IR_InterfaceDef_ptr interface_type,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -26655,10 +26453,10 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--IR::InterfaceDef_ptr interface_type_;
-+      IR_InterfaceDef_ptr interface_type_;
- void result (IR::ProvidesDef_ptr    result);
-  // update the result 
--IR::ProvidesDef_ptr  _result;
-+      IR_ProvidesDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ComponentDef_create_uses : public TAO_ServerRequestInfo
-@@ -26672,7 +26470,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::InterfaceDef_ptr interface_type,
-+        IR_InterfaceDef_ptr interface_type,
-     const CORBA::Boolean & is_multiple,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-@@ -26715,11 +26513,11 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--IR::InterfaceDef_ptr interface_type_;
-+      IR_InterfaceDef_ptr interface_type_;
- const CORBA::Boolean & is_multiple_;
- void result (IR::UsesDef_ptr    result);
-  // update the result 
--IR::UsesDef_ptr  _result;
-+      IR_UsesDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ComponentDef_create_emits : public TAO_ServerRequestInfo
-@@ -26733,7 +26531,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+        IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -26775,10 +26573,10 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--IR::ValueDef_ptr value_;
-+      IR_ValueDef_ptr value_;
- void result (IR::EmitsDef_ptr    result);
-  // update the result 
--IR::EmitsDef_ptr  _result;
-+      IR_EmitsDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ComponentDef_create_publishes : public TAO_ServerRequestInfo
-@@ -26792,7 +26590,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+        IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -26834,10 +26632,10 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--IR::ValueDef_ptr value_;
-+      IR_ValueDef_ptr value_;
- void result (IR::PublishesDef_ptr    result);
-  // update the result 
--IR::PublishesDef_ptr  _result;
-+      IR_PublishesDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_ComponentDef_create_consumes : public TAO_ServerRequestInfo
-@@ -26851,7 +26649,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+        IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -26893,30 +26691,29 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--IR::ValueDef_ptr value_;
-+      IR_ValueDef_ptr value_;
- void result (IR::ConsumesDef_ptr    result);
-  // update the result 
--IR::ConsumesDef_ptr  _result;
-+      IR_ConsumesDef_ptr  _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_ComponentDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ComponentDef_Proxy_Broker
-+class _TAO_ComponentDef_Strategized_Proxy_Broker : public virtual _TAO_ComponentDef_Proxy_Broker
- {
- public: 
-   _TAO_ComponentDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_ComponentDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_ComponentDef_Proxy_Impl &select_proxy (
--    ::IR::ComponentDef *object,
-+  virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
-+    IR_ComponentDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -26934,7 +26731,7 @@
-   // 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.
--  ::IR::_TAO_ComponentDef_Proxy_Impl
-+  _TAO_ComponentDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -26946,7 +26743,6 @@
-   static _TAO_ComponentDef_Strategized_Proxy_Broker *the_TAO_ComponentDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -26956,8 +26752,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_ComponentDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_ComponentDef_Proxy_Impl,
-+class _TAO_ComponentDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_ComponentDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl
-   
-@@ -26967,7 +26763,7 @@
-   
-   virtual ~_TAO_ComponentDef_ThruPOA_Proxy_Impl (void) { }
-   
--    virtual IR::InterfaceDefSeq * supported_interfaces (
-+    virtual IR_InterfaceDefSeq * supported_interfaces   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26977,14 +26773,14 @@
- 
-   virtual void supported_interfaces (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::InterfaceDefSeq & supported_interfaces,
-+      const IR_InterfaceDefSeq & supported_interfaces,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ComponentDef_ptr base_component (
-+  virtual IR_ComponentDef_ptr base_component   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26992,7 +26788,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ProvidesDefSeq * provides_interfaces (
-+  virtual IR_ProvidesDefSeq * provides_interfaces   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -27000,7 +26796,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::UsesDefSeq * uses_interfaces (
-+  virtual IR_UsesDefSeq * uses_interfaces   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -27008,7 +26804,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::EmitsDefSeq * emits_events (
-+  virtual IR_EmitsDefSeq * emits_events   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -27016,7 +26812,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::PublishesDefSeq * publishes_events (
-+  virtual IR_PublishesDefSeq * publishes_events   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -27024,7 +26820,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ConsumesDefSeq * consumes_events (
-+  virtual IR_ConsumesDefSeq * consumes_events   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -27040,24 +26836,24 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ProvidesDef_ptr create_provides (
-+  virtual IR_ProvidesDef_ptr create_provides   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::InterfaceDef_ptr interface_type,
-+      IR_InterfaceDef_ptr interface_type,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::UsesDef_ptr create_uses (
-+  virtual IR_UsesDef_ptr create_uses   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::InterfaceDef_ptr interface_type,
-+      IR_InterfaceDef_ptr interface_type,
-       CORBA::Boolean is_multiple,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -27065,36 +26861,36 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::EmitsDef_ptr create_emits (
-+  virtual IR_EmitsDef_ptr create_emits   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+      IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::PublishesDef_ptr create_publishes (
-+  virtual IR_PublishesDef_ptr create_publishes   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+      IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ConsumesDef_ptr create_consumes (
-+  virtual IR_ConsumesDef_ptr create_consumes   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+      IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -27108,11 +26904,10 @@
- //                ThruPOA  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_IFR_Client_Export ComponentDef_tie : public ComponentDef
-+  class ComponentDef_tie : public ComponentDef
- {
- public:
-   ComponentDef_tie (T &t);
-@@ -27140,10 +26935,10 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
--  IR::InterfaceDefSeq * supported_interfaces (
-+    IR_InterfaceDefSeq * supported_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27152,7 +26947,7 @@
-     ));
- 
-   void supported_interfaces (
--      const IR::InterfaceDefSeq & supported_interfaces,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27160,7 +26955,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ComponentDef_ptr base_component (
-+    IR_ComponentDef_ptr base_component (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27168,7 +26963,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ProvidesDefSeq * provides_interfaces (
-+    IR_ProvidesDefSeq * provides_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27176,7 +26971,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::UsesDefSeq * uses_interfaces (
-+    IR_UsesDefSeq * uses_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27184,7 +26979,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::EmitsDefSeq * emits_events (
-+    IR_EmitsDefSeq * emits_events (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27192,7 +26987,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::PublishesDefSeq * publishes_events (
-+    IR_PublishesDefSeq * publishes_events (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27200,7 +26995,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ConsumesDefSeq * consumes_events (
-+    IR_ConsumesDefSeq * consumes_events (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27216,11 +27011,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ProvidesDef_ptr create_provides (
-+    IR_ProvidesDef_ptr create_provides (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::InterfaceDef_ptr interface_type,
-+        IR_InterfaceDef_ptr interface_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27228,11 +27023,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::UsesDef_ptr create_uses (
-+    IR_UsesDef_ptr create_uses (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::InterfaceDef_ptr interface_type,
-+        IR_InterfaceDef_ptr interface_type,
-       CORBA::Boolean is_multiple,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -27241,11 +27036,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::EmitsDef_ptr create_emits (
-+    IR_EmitsDef_ptr create_emits (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+        IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27253,11 +27048,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::PublishesDef_ptr create_publishes (
-+    IR_PublishesDef_ptr create_publishes (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+        IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27265,11 +27060,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ConsumesDef_ptr create_consumes (
-+    IR_ConsumesDef_ptr create_consumes (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+        IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27277,7 +27072,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::InterfaceDefSeq * base_interfaces (
-+    IR_InterfaceDefSeq * base_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27286,7 +27081,7 @@
-     ));
- 
-   void base_interfaces (
--      const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27337,14 +27132,14 @@
-       CORBA::SystemException
-     ));
- 
--  IR::AttributeDef_ptr create_attribute (
-+    IR_AttributeDef_ptr create_attribute (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
--      IR::AttributeMode mode,
--      const IR::ExceptionDefSeq & get_exceptions,
--      const IR::ExceptionDefSeq & put_exceptions,
-+        IR_IDLType_ptr type,
-+        IR_AttributeMode mode,
-+        const IR_ExceptionDefSeq & get_exceptions,
-+        const IR_ExceptionDefSeq & put_exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27352,15 +27147,15 @@
-       CORBA::SystemException
-     ));
- 
--  IR::OperationDef_ptr create_operation (
-+    IR_OperationDef_ptr create_operation (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr result,
--      IR::OperationMode mode,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
--      const IR::ContextIdSeq & contexts,
-+        IR_IDLType_ptr result,
-+        IR_OperationMode mode,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-+        const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27368,7 +27163,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained_ptr lookup (
-+    IR_Contained_ptr lookup (
-       const char * search_name,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -27377,8 +27172,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * contents (
--      IR::DefinitionKind limit_type,
-+    IR_ContainedSeq * contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -27387,10 +27182,10 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * lookup_name (
-+    IR_ContainedSeq * lookup_name (
-       const char * search_name,
-       CORBA::Long levels_to_search,
--      IR::DefinitionKind limit_type,
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -27399,8 +27194,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container::DescriptionSeq * describe_contents (
--      IR::DefinitionKind limit_type,
-+    IR_Container::DescriptionSeq * describe_contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Long max_returned_objs,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -27410,7 +27205,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ModuleDef_ptr create_module (
-+    IR_ModuleDef_ptr create_module (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -27421,11 +27216,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ConstantDef_ptr create_constant (
-+    IR_ConstantDef_ptr create_constant (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-       const CORBA::Any & value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -27434,11 +27229,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::StructDef_ptr create_struct (
-+    IR_StructDef_ptr create_struct (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27446,12 +27241,12 @@
-       CORBA::SystemException
-     ));
- 
--  IR::UnionDef_ptr create_union (
-+    IR_UnionDef_ptr create_union (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr discriminator_type,
--      const IR::UnionMemberSeq & members,
-+        IR_IDLType_ptr discriminator_type,
-+        const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27459,11 +27254,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::EnumDef_ptr create_enum (
-+    IR_EnumDef_ptr create_enum (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27471,11 +27266,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::AliasDef_ptr create_alias (
-+    IR_AliasDef_ptr create_alias (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type,
-+        IR_IDLType_ptr original_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27483,11 +27278,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::InterfaceDef_ptr create_interface (
-+    IR_InterfaceDef_ptr create_interface (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Boolean is_abstract,
-       CORBA::Boolean is_local,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -27497,17 +27292,17 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr create_value (
-+    IR_ValueDef_ptr create_value (
-       const char * id,
-       const char * name,
-       const char * version,
-       CORBA::Boolean is_custom,
-       CORBA::Boolean is_abstract,
--      IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-       CORBA::Boolean is_truncatable,
--      const IR::ValueDefSeq & abstract_base_values,
--      const IR::InterfaceDefSeq & supported_interfaces,
--      const IR::InitializerSeq & initializers,
-+        const IR_ValueDefSeq & abstract_base_values,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-+        const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27515,11 +27310,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueBoxDef_ptr create_value_box (
-+    IR_ValueBoxDef_ptr create_value_box (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27527,11 +27322,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ExceptionDef_ptr create_exception (
-+    IR_ExceptionDef_ptr create_exception (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27539,7 +27334,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::NativeDef_ptr create_native (
-+    IR_NativeDef_ptr create_native (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -27601,7 +27396,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27617,7 +27412,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27625,7 +27420,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27634,7 +27429,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -27652,7 +27447,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27686,7 +27481,7 @@
- class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
- class _TAO_PrimaryKeyDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export PrimaryKeyDef : public virtual Contained
-+  class PrimaryKeyDef : public virtual Contained
- {
- protected:
-   PrimaryKeyDef (void);
-@@ -27729,7 +27524,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::PrimaryKeyDef *_this (
-+    IR_PrimaryKeyDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -27753,7 +27548,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ValueDef_ptr primary_key (
-+    virtual IR_ValueDef_ptr primary_key (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27773,7 +27568,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -27781,7 +27576,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -27789,7 +27584,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -27797,7 +27592,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -27805,7 +27600,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -27813,7 +27608,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -27821,7 +27616,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -27829,7 +27624,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -27837,7 +27632,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -27845,7 +27640,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -27853,7 +27648,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -27861,7 +27656,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -27869,11 +27664,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -27980,27 +27774,26 @@
-   POA_IR::PrimaryKeyDef *_tao_impl;
-   void result (IR::ValueDef_ptr    result);
-  // update the result 
--IR::ValueDef_ptr  _result;
-+      IR_ValueDef_ptr  _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Broker
-+class _TAO_PrimaryKeyDef_Strategized_Proxy_Broker : public virtual _TAO_PrimaryKeyDef_Proxy_Broker
- {
- public: 
-   _TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
--    ::IR::PrimaryKeyDef *object,
-+  virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
-+    IR_PrimaryKeyDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -28018,7 +27811,7 @@
-   // 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.
--  ::IR::_TAO_PrimaryKeyDef_Proxy_Impl
-+  _TAO_PrimaryKeyDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -28030,7 +27823,6 @@
-   static _TAO_PrimaryKeyDef_Strategized_Proxy_Broker *the_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -28040,8 +27832,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Impl,
-+class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_PrimaryKeyDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_Contained_ThruPOA_Proxy_Impl
-   
-@@ -28060,7 +27852,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueDef_ptr primary_key (
-+  virtual IR_ValueDef_ptr primary_key   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -28075,11 +27867,10 @@
- //                ThruPOA  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_IFR_Client_Export PrimaryKeyDef_tie : public PrimaryKeyDef
-+  class PrimaryKeyDef_tie : public PrimaryKeyDef
- {
- public:
-   PrimaryKeyDef_tie (T &t);
-@@ -28107,7 +27898,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::Boolean is_a (
-@@ -28119,7 +27910,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr primary_key (
-+    IR_ValueDef_ptr primary_key (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28178,7 +27969,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28194,7 +27985,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28202,7 +27993,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28211,7 +28002,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -28221,7 +28012,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28255,7 +28046,7 @@
- class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
- class _TAO_FactoryDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export FactoryDef : public virtual OperationDef
-+  class FactoryDef : public virtual OperationDef
- {
- protected:
-   FactoryDef (void);
-@@ -28298,7 +28089,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::FactoryDef *_this (
-+    IR_FactoryDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -28309,7 +28100,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28317,7 +28108,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28325,7 +28116,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28333,7 +28124,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28341,7 +28132,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28349,7 +28140,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28357,7 +28148,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28365,7 +28156,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28373,7 +28164,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28381,7 +28172,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28389,7 +28180,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28397,7 +28188,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28405,7 +28196,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28413,7 +28204,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28421,7 +28212,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28429,7 +28220,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28437,7 +28228,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28445,7 +28236,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28453,7 +28244,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28461,7 +28252,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28469,7 +28260,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28477,7 +28268,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28485,7 +28276,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28493,11 +28284,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -28507,20 +28297,19 @@
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_FactoryDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FactoryDef_Proxy_Broker
-+class _TAO_FactoryDef_Strategized_Proxy_Broker : public virtual _TAO_FactoryDef_Proxy_Broker
- {
- public: 
-   _TAO_FactoryDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_FactoryDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_FactoryDef_Proxy_Impl &select_proxy (
--    ::IR::FactoryDef *object,
-+  virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
-+    IR_FactoryDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -28538,7 +28327,7 @@
-   // 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.
--  ::IR::_TAO_FactoryDef_Proxy_Impl
-+  _TAO_FactoryDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -28550,7 +28339,6 @@
-   static _TAO_FactoryDef_Strategized_Proxy_Broker *the_TAO_FactoryDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -28560,8 +28348,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_FactoryDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_FactoryDef_Proxy_Impl,
-+class _TAO_FactoryDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_FactoryDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl
-   
-@@ -28578,11 +28366,10 @@
- //                ThruPOA  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_IFR_Client_Export FactoryDef_tie : public FactoryDef
-+  class FactoryDef_tie : public FactoryDef
- {
- public:
-   FactoryDef_tie (T &t);
-@@ -28610,7 +28397,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::TypeCode_ptr result (
-@@ -28621,7 +28408,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::IDLType_ptr result_def (
-+    IR_IDLType_ptr result_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28630,7 +28417,7 @@
-     ));
- 
-   void result_def (
--      IR::IDLType_ptr result_def,
-+        IR_IDLType_ptr result_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28638,7 +28425,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ParDescriptionSeq * params (
-+    IR_ParDescriptionSeq * params (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28647,7 +28434,7 @@
-     ));
- 
-   void params (
--      const IR::ParDescriptionSeq & params,
-+        const IR_ParDescriptionSeq & params,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28655,7 +28442,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::OperationMode mode (
-+    IR_OperationMode mode (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28664,7 +28451,7 @@
-     ));
- 
-   void mode (
--      IR::OperationMode mode,
-+        IR_OperationMode mode,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28672,7 +28459,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContextIdSeq * contexts (
-+    IR_ContextIdSeq * contexts (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28681,7 +28468,7 @@
-     ));
- 
-   void contexts (
--      const IR::ContextIdSeq & contexts,
-+        const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28689,7 +28476,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ExceptionDefSeq * exceptions (
-+    IR_ExceptionDefSeq * exceptions (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28698,7 +28485,7 @@
-     ));
- 
-   void exceptions (
--      const IR::ExceptionDefSeq & exceptions,
-+        const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28757,7 +28544,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28773,7 +28560,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28781,7 +28568,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28790,7 +28577,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -28800,7 +28587,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28834,7 +28621,7 @@
- class _TAO_FinderDef_ThruPOA_Proxy_Impl;
- class _TAO_FinderDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export FinderDef : public virtual OperationDef
-+  class FinderDef : public virtual OperationDef
- {
- protected:
-   FinderDef (void);
-@@ -28877,7 +28664,7 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::FinderDef *_this (
-+    IR_FinderDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -28888,7 +28675,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28896,7 +28683,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28904,7 +28691,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28912,7 +28699,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28920,7 +28707,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28928,7 +28715,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28936,7 +28723,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28944,7 +28731,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28952,7 +28739,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28960,7 +28747,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28968,7 +28755,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28976,7 +28763,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28984,7 +28771,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -28992,7 +28779,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29000,7 +28787,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29008,7 +28795,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29016,7 +28803,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29024,7 +28811,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29032,7 +28819,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29040,7 +28827,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29048,7 +28835,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29056,7 +28843,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29064,7 +28851,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29072,11 +28859,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -29086,20 +28872,19 @@
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_FinderDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FinderDef_Proxy_Broker
-+class _TAO_FinderDef_Strategized_Proxy_Broker : public virtual _TAO_FinderDef_Proxy_Broker
- {
- public: 
-   _TAO_FinderDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_FinderDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_FinderDef_Proxy_Impl &select_proxy (
--    ::IR::FinderDef *object,
-+  virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
-+    IR_FinderDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -29117,7 +28902,7 @@
-   // 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.
--  ::IR::_TAO_FinderDef_Proxy_Impl
-+  _TAO_FinderDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -29129,7 +28914,6 @@
-   static _TAO_FinderDef_Strategized_Proxy_Broker *the_TAO_FinderDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -29139,8 +28923,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_FinderDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_FinderDef_Proxy_Impl,
-+class _TAO_FinderDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_FinderDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_OperationDef_ThruPOA_Proxy_Impl
-   
-@@ -29157,11 +28941,10 @@
- //                ThruPOA  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_IFR_Client_Export FinderDef_tie : public FinderDef
-+  class FinderDef_tie : public FinderDef
- {
- public:
-   FinderDef_tie (T &t);
-@@ -29189,7 +28972,7 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
-   CORBA::TypeCode_ptr result (
-@@ -29200,7 +28983,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::IDLType_ptr result_def (
-+    IR_IDLType_ptr result_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29209,7 +28992,7 @@
-     ));
- 
-   void result_def (
--      IR::IDLType_ptr result_def,
-+        IR_IDLType_ptr result_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29217,7 +29000,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ParDescriptionSeq * params (
-+    IR_ParDescriptionSeq * params (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29226,7 +29009,7 @@
-     ));
- 
-   void params (
--      const IR::ParDescriptionSeq & params,
-+        const IR_ParDescriptionSeq & params,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29234,7 +29017,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::OperationMode mode (
-+    IR_OperationMode mode (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29243,7 +29026,7 @@
-     ));
- 
-   void mode (
--      IR::OperationMode mode,
-+        IR_OperationMode mode,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29251,7 +29034,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContextIdSeq * contexts (
-+    IR_ContextIdSeq * contexts (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29260,7 +29043,7 @@
-     ));
- 
-   void contexts (
--      const IR::ContextIdSeq & contexts,
-+        const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29268,7 +29051,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ExceptionDefSeq * exceptions (
-+    IR_ExceptionDefSeq * exceptions (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29277,7 +29060,7 @@
-     ));
- 
-   void exceptions (
--      const IR::ExceptionDefSeq & exceptions,
-+        const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29336,7 +29119,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29352,7 +29135,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29360,7 +29143,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29369,7 +29152,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -29379,7 +29162,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29413,7 +29196,7 @@
- class _TAO_HomeDef_ThruPOA_Proxy_Impl;
- class _TAO_HomeDef_Strategized_Proxy_Broker;
- 
--class TAO_IFR_Client_Export HomeDef : public virtual InterfaceDef
-+  class HomeDef : public virtual InterfaceDef
- {
- protected:
-   HomeDef (void);
-@@ -29456,14 +29239,14 @@
-         TAO_default_environment ()
-     );
- 
--  ::IR::HomeDef *_this (
-+    IR_HomeDef *_this (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
- 
-   virtual const char* _interface_repository_id (void) const;
- 
--  virtual IR::HomeDef_ptr base_home (
-+    virtual IR_HomeDef_ptr base_home (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29479,7 +29262,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::ComponentDef_ptr managed_component (
-+    virtual IR_ComponentDef_ptr managed_component (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29495,7 +29278,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::PrimaryKeyDef_ptr primary_key (
-+    virtual IR_PrimaryKeyDef_ptr primary_key (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29511,7 +29294,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::FactoryDefSeq * factories (
-+    virtual IR_FactoryDefSeq * factories (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29527,7 +29310,7 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::FinderDefSeq * finders (
-+    virtual IR_FinderDefSeq * finders (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29559,11 +29342,11 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::PrimaryKeyDef_ptr create_primary_key (
-+    virtual IR_PrimaryKeyDef_ptr create_primary_key (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr primary_key,
-+        IR_ValueDef_ptr primary_key,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29579,12 +29362,12 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::FactoryDef_ptr create_factory (
-+    virtual IR_FactoryDef_ptr create_factory (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29600,12 +29383,12 @@
-         TAO_default_environment ()
-     );
- 
--  virtual IR::FinderDef_ptr create_finder (
-+    virtual IR_FinderDef_ptr create_finder (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -29625,7 +29408,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29633,7 +29416,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29641,7 +29424,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29649,7 +29432,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29657,7 +29440,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29665,7 +29448,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29673,7 +29456,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29681,7 +29464,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29689,7 +29472,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29697,7 +29480,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29705,7 +29488,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29713,7 +29496,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29721,7 +29504,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29729,7 +29512,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29737,7 +29520,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29745,7 +29528,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29753,7 +29536,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29761,7 +29544,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29769,7 +29552,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29777,7 +29560,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29785,7 +29568,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29793,7 +29576,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29801,7 +29584,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29809,7 +29592,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29817,7 +29600,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29825,7 +29608,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29833,7 +29616,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29841,7 +29624,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29849,7 +29632,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29857,7 +29640,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29865,7 +29648,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29873,7 +29656,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29881,7 +29664,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29889,7 +29672,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29897,7 +29680,7 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29905,7 +29688,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29913,7 +29696,7 @@
-       TAO_ServerRequest &req,
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
- 
-@@ -29921,11 +29704,10 @@
-       TAO_ServerRequest &req, 
-       void *obj,
-       void *context,
--      CORBA::Environment &ACE_TRY_ENV =
-+        CORBA::Environment &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
-@@ -29979,7 +29761,7 @@
-     POA_IR::HomeDef *_tao_impl;
-     void result (IR::HomeDef_ptr      result);
-  // update the result 
--IR::HomeDef_ptr  _result;
-+      IR_HomeDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_HomeDef_managed_component_get : public TAO_ServerRequestInfo
-@@ -30030,7 +29812,7 @@
-   POA_IR::HomeDef *_tao_impl;
-   void result (IR::ComponentDef_ptr    result);
-  // update the result 
--IR::ComponentDef_ptr  _result;
-+      IR_ComponentDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_HomeDef_primary_key_get : public TAO_ServerRequestInfo
-@@ -30081,7 +29863,7 @@
-   POA_IR::HomeDef *_tao_impl;
-   void result (IR::PrimaryKeyDef_ptr    result);
-  // update the result 
--IR::PrimaryKeyDef_ptr  _result;
-+      IR_PrimaryKeyDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_HomeDef_factories_get : public TAO_ServerRequestInfo
-@@ -30132,7 +29914,7 @@
-   POA_IR::HomeDef *_tao_impl;
-   void result (IR::FactoryDefSeq *    result);
-  // update the result 
--IR::FactoryDefSeq *  _result;
-+      IR_FactoryDefSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_HomeDef_finders_get : public TAO_ServerRequestInfo
-@@ -30183,7 +29965,7 @@
-   POA_IR::HomeDef *_tao_impl;
-   void result (IR::FinderDefSeq *    result);
-  // update the result 
--IR::FinderDefSeq *  _result;
-+      IR_FinderDefSeq *  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_HomeDef_is_basic_get : public TAO_ServerRequestInfo
-@@ -30248,7 +30030,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr primary_key,
-+        IR_ValueDef_ptr primary_key,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -30290,10 +30072,10 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--IR::ValueDef_ptr primary_key_;
-+      IR_ValueDef_ptr primary_key_;
- void result (IR::PrimaryKeyDef_ptr    result);
-  // update the result 
--IR::PrimaryKeyDef_ptr  _result;
-+      IR_PrimaryKeyDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_HomeDef_create_factory : public TAO_ServerRequestInfo
-@@ -30307,8 +30089,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -30350,11 +30132,11 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--const IR::ParDescriptionSeq & params_;
--const IR::ExceptionDefSeq & exceptions_;
-+      const IR_ParDescriptionSeq & params_;
-+      const IR_ExceptionDefSeq & exceptions_;
- void result (IR::FactoryDef_ptr    result);
-  // update the result 
--IR::FactoryDef_ptr  _result;
-+      IR_FactoryDef_ptr  _result;
- };
- 
- class TAO_ServerRequestInfo_IR_HomeDef_create_finder : public TAO_ServerRequestInfo
-@@ -30368,8 +30150,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -30411,31 +30193,30 @@
-   const char * id_;
- const char * name_;
- const char * version_;
--const IR::ParDescriptionSeq & params_;
--const IR::ExceptionDefSeq & exceptions_;
-+      const IR_ParDescriptionSeq & params_;
-+      const IR_ExceptionDefSeq & exceptions_;
- void result (IR::FinderDef_ptr    result);
-  // update the result 
--IR::FinderDef_ptr  _result;
-+      IR_FinderDef_ptr  _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- ///////////////////////////////////////////////////////////////////////
- //               Strategized Proxy Broker Declaration 
- //
- 
--class TAO_IFR_Client_Export _TAO_HomeDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_HomeDef_Proxy_Broker
-+class _TAO_HomeDef_Strategized_Proxy_Broker : public virtual _TAO_HomeDef_Proxy_Broker
- {
- public: 
-   _TAO_HomeDef_Strategized_Proxy_Broker (void);
-   
-   virtual ~_TAO_HomeDef_Strategized_Proxy_Broker (void);
-   
--  virtual ::IR::_TAO_HomeDef_Proxy_Impl &select_proxy (
--    ::IR::HomeDef *object,
-+  virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
-+    IR_HomeDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -30453,7 +30234,7 @@
-   // 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.
--  ::IR::_TAO_HomeDef_Proxy_Impl
-+  _TAO_HomeDef_Proxy_Impl
-    *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
-   
-   TAO_SYNCH_MUTEX mutex_;
-@@ -30465,7 +30246,6 @@
-   static _TAO_HomeDef_Strategized_Proxy_Broker *the_TAO_HomeDef_Strategized_Proxy_Broker (void);
- };
- 
--
- //
- //            End Strategized Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -30475,8 +30255,8 @@
- //                    ThruPOA  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_HomeDef_ThruPOA_Proxy_Impl : 
--  public virtual ::IR::_TAO_HomeDef_Proxy_Impl,
-+class _TAO_HomeDef_ThruPOA_Proxy_Impl : 
-+  public virtual _TAO_HomeDef_Proxy_Impl,
-   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-   public virtual ::POA_IR::_TAO_InterfaceDef_ThruPOA_Proxy_Impl
-   
-@@ -30486,7 +30266,7 @@
-   
-   virtual ~_TAO_HomeDef_ThruPOA_Proxy_Impl (void) { }
-   
--    virtual IR::HomeDef_ptr base_home (
-+    virtual IR_HomeDef_ptr base_home   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -30494,7 +30274,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ComponentDef_ptr managed_component (
-+  virtual IR_ComponentDef_ptr managed_component   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -30502,7 +30282,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::PrimaryKeyDef_ptr primary_key (
-+  virtual IR_PrimaryKeyDef_ptr primary_key   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -30510,7 +30290,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::FactoryDefSeq * factories (
-+  virtual IR_FactoryDefSeq * factories   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -30518,7 +30298,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::FinderDefSeq * finders (
-+  virtual IR_FinderDefSeq * finders   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -30534,38 +30314,38 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::PrimaryKeyDef_ptr create_primary_key (
-+  virtual IR_PrimaryKeyDef_ptr create_primary_key   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr primary_key,
-+      IR_ValueDef_ptr primary_key,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::FactoryDef_ptr create_factory (
-+  virtual IR_FactoryDef_ptr create_factory   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
-+      const IR_ParDescriptionSeq & params,
-+      const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::FinderDef_ptr create_finder (
-+  virtual IR_FinderDef_ptr create_finder   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
-+      const IR_ParDescriptionSeq & params,
-+      const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -30579,11 +30359,10 @@
- //                ThruPOA  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_IFR_Client_Export HomeDef_tie : public HomeDef
-+  class HomeDef_tie : public HomeDef
- {
- public:
-   HomeDef_tie (T &t);
-@@ -30611,10 +30390,10 @@
-   
-   // overridden ServantBase operations
-   PortableServer::POA_ptr _default_POA (
--      CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-         TAO_default_environment ()
-     );
--  IR::HomeDef_ptr base_home (
-+    IR_HomeDef_ptr base_home (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30622,7 +30401,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ComponentDef_ptr managed_component (
-+    IR_ComponentDef_ptr managed_component (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30630,7 +30409,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::PrimaryKeyDef_ptr primary_key (
-+    IR_PrimaryKeyDef_ptr primary_key (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30638,7 +30417,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::FactoryDefSeq * factories (
-+    IR_FactoryDefSeq * factories (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30646,7 +30425,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::FinderDefSeq * finders (
-+    IR_FinderDefSeq * finders (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30662,11 +30441,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::PrimaryKeyDef_ptr create_primary_key (
-+    IR_PrimaryKeyDef_ptr create_primary_key (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr primary_key,
-+        IR_ValueDef_ptr primary_key,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30674,12 +30453,12 @@
-       CORBA::SystemException
-     ));
- 
--  IR::FactoryDef_ptr create_factory (
-+    IR_FactoryDef_ptr create_factory (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30687,12 +30466,12 @@
-       CORBA::SystemException
-     ));
- 
--  IR::FinderDef_ptr create_finder (
-+    IR_FinderDef_ptr create_finder (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30700,7 +30479,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::InterfaceDefSeq * base_interfaces (
-+    IR_InterfaceDefSeq * base_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30709,7 +30488,7 @@
-     ));
- 
-   void base_interfaces (
--      const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30760,14 +30539,14 @@
-       CORBA::SystemException
-     ));
- 
--  IR::AttributeDef_ptr create_attribute (
-+    IR_AttributeDef_ptr create_attribute (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
--      IR::AttributeMode mode,
--      const IR::ExceptionDefSeq & get_exceptions,
--      const IR::ExceptionDefSeq & put_exceptions,
-+        IR_IDLType_ptr type,
-+        IR_AttributeMode mode,
-+        const IR_ExceptionDefSeq & get_exceptions,
-+        const IR_ExceptionDefSeq & put_exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30775,15 +30554,15 @@
-       CORBA::SystemException
-     ));
- 
--  IR::OperationDef_ptr create_operation (
-+    IR_OperationDef_ptr create_operation (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr result,
--      IR::OperationMode mode,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
--      const IR::ContextIdSeq & contexts,
-+        IR_IDLType_ptr result,
-+        IR_OperationMode mode,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-+        const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30791,7 +30570,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained_ptr lookup (
-+    IR_Contained_ptr lookup (
-       const char * search_name,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -30800,8 +30579,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * contents (
--      IR::DefinitionKind limit_type,
-+    IR_ContainedSeq * contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -30810,10 +30589,10 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ContainedSeq * lookup_name (
-+    IR_ContainedSeq * lookup_name (
-       const char * search_name,
-       CORBA::Long levels_to_search,
--      IR::DefinitionKind limit_type,
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -30822,8 +30601,8 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container::DescriptionSeq * describe_contents (
--      IR::DefinitionKind limit_type,
-+    IR_Container::DescriptionSeq * describe_contents (
-+        IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Long max_returned_objs,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -30833,7 +30612,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ModuleDef_ptr create_module (
-+    IR_ModuleDef_ptr create_module (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -30844,11 +30623,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ConstantDef_ptr create_constant (
-+    IR_ConstantDef_ptr create_constant (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-       const CORBA::Any & value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -30857,11 +30636,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::StructDef_ptr create_struct (
-+    IR_StructDef_ptr create_struct (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30869,12 +30648,12 @@
-       CORBA::SystemException
-     ));
- 
--  IR::UnionDef_ptr create_union (
-+    IR_UnionDef_ptr create_union (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr discriminator_type,
--      const IR::UnionMemberSeq & members,
-+        IR_IDLType_ptr discriminator_type,
-+        const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30882,11 +30661,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::EnumDef_ptr create_enum (
-+    IR_EnumDef_ptr create_enum (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30894,11 +30673,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::AliasDef_ptr create_alias (
-+    IR_AliasDef_ptr create_alias (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type,
-+        IR_IDLType_ptr original_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30906,11 +30685,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::InterfaceDef_ptr create_interface (
-+    IR_InterfaceDef_ptr create_interface (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Boolean is_abstract,
-       CORBA::Boolean is_local,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -30920,17 +30699,17 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueDef_ptr create_value (
-+    IR_ValueDef_ptr create_value (
-       const char * id,
-       const char * name,
-       const char * version,
-       CORBA::Boolean is_custom,
-       CORBA::Boolean is_abstract,
--      IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-       CORBA::Boolean is_truncatable,
--      const IR::ValueDefSeq & abstract_base_values,
--      const IR::InterfaceDefSeq & supported_interfaces,
--      const IR::InitializerSeq & initializers,
-+        const IR_ValueDefSeq & abstract_base_values,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-+        const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30938,11 +30717,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ValueBoxDef_ptr create_value_box (
-+    IR_ValueBoxDef_ptr create_value_box (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30950,11 +30729,11 @@
-       CORBA::SystemException
-     ));
- 
--  IR::ExceptionDef_ptr create_exception (
-+    IR_ExceptionDef_ptr create_exception (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -30962,7 +30741,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::NativeDef_ptr create_native (
-+    IR_NativeDef_ptr create_native (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -31024,7 +30803,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Container_ptr defined_in (
-+    IR_Container_ptr defined_in (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -31040,7 +30819,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Repository_ptr containing_repository (
-+    IR_Repository_ptr containing_repository (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -31048,7 +30827,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::Contained::Description * describe (
-+    IR_Contained::Description * describe (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -31057,7 +30836,7 @@
-     ));
- 
-   void move (
--      IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -31075,7 +30854,7 @@
-       CORBA::SystemException
-     ));
- 
--  IR::DefinitionKind def_kind (
-+    IR_DefinitionKind def_kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -31121,4 +30900,4 @@
- #endif /* __BORLANDC__ */
- 
- #include "ace/post.h"
--#endif /* ifndef */
-+#endif /* ifndef TAO_IDL_INTERFACES_H */
diff --git a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.i.diff b/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.i.diff
deleted file mode 100644
index 7ee8e14ce77..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS.i.diff
+++ /dev/null
@@ -1,10127 +0,0 @@
---- orig/InterfaceS.i	Fri Mar 09 00:47:29 2001
-+++ ../../orbsvcs/IFR_Service/InterfaceS.i	Tue Jan 23 17:12:52 2001
-@@ -1,20 +1,9 @@
--// -*- C++ -*-
--//
--// $Id$
-+/* -*- C++ -*- */
-+//$Id$
- 
--// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
--// TAO and the TAO IDL Compiler have been developed by:
--//       Center for Distributed Object Computing
--//       Washington University
--//       St. Louis, MO
--//       USA
--//       http://www.cs.wustl.edu/~schmidt/doc-center.html
--// and
--//       Distributed Object Computing Laboratory
--//       University of California at Irvine
--//       Irvine, CA
--//       USA
--//       http://doc.ece.uci.edu/
-+// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-+// TAO and the TAO IDL Compiler have been developed by the Center for
-+// Distributed Object Computing at Washington University, St. Louis.
- //
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
-@@ -23,97 +12,97 @@
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::Contained_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::Contained_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::Contained::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::Contained_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::Contained_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Container::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::Container_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::Container_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::Container::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::Container_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::Container_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::IDLType::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::IDLType_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::IDLType_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::IDLType::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::IDLType_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::IDLType_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Repository::lookup_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::Repository_ptr) obj;
-@@ -121,14 +110,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Repository::contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::Repository_ptr) obj;
-@@ -136,14 +125,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Repository::lookup_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::Repository_ptr) obj;
-@@ -151,14 +140,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Repository::describe_contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::Repository_ptr) obj;
-@@ -166,14 +155,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Repository::create_module_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::Repository_ptr) obj;
-@@ -181,14 +170,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Repository::create_constant_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::Repository_ptr) obj;
-@@ -196,14 +185,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Repository::create_struct_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::Repository_ptr) obj;
-@@ -211,14 +200,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Repository::create_union_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::Repository_ptr) obj;
-@@ -226,14 +215,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Repository::create_enum_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::Repository_ptr) obj;
-@@ -241,14 +230,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Repository::create_alias_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::Repository_ptr) obj;
-@@ -256,14 +245,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Repository::create_interface_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::Repository_ptr) obj;
-@@ -271,14 +260,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Repository::create_value_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::Repository_ptr) obj;
-@@ -286,14 +275,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Repository::create_value_box_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::Repository_ptr) obj;
-@@ -301,14 +290,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Repository::create_exception_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::Repository_ptr) obj;
-@@ -316,14 +305,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Repository::create_native_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::Repository_ptr) obj;
-@@ -331,44 +320,44 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::Repository::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::Repository_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::Repository_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::Repository::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::Repository_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::Repository_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::lookup_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -376,14 +365,14 @@
-       req,
-       (POA_IR::Repository_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::get_canonical_typecode_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -391,14 +380,14 @@
-       req,
-       (POA_IR::Repository_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::get_primitive_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -406,14 +395,14 @@
-       req,
-       (POA_IR::Repository_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::create_string_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -421,14 +410,14 @@
-       req,
-       (POA_IR::Repository_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::create_wstring_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -436,14 +425,14 @@
-       req,
-       (POA_IR::Repository_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::create_sequence_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -451,14 +440,14 @@
-       req,
-       (POA_IR::Repository_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::create_array_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -466,14 +455,14 @@
-       req,
-       (POA_IR::Repository_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::create_fixed_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -481,14 +470,14 @@
-       req,
-       (POA_IR::Repository_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::lookup_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -496,14 +485,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -511,14 +500,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::lookup_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -526,14 +515,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::describe_contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -541,14 +530,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::create_module_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -556,14 +545,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::create_constant_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -571,14 +560,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::create_struct_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -586,14 +575,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::create_union_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -601,14 +590,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::create_enum_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -616,14 +605,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::create_alias_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -631,14 +620,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::create_interface_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -646,14 +635,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::create_value_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -661,14 +650,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::create_value_box_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -676,14 +665,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::create_exception_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -691,14 +680,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::create_native_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-@@ -706,44 +695,44 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentRepository::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::lookup_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -751,14 +740,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -766,14 +755,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::lookup_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -781,14 +770,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::describe_contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -796,14 +785,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::create_module_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -811,14 +800,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::create_constant_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -826,14 +815,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::create_struct_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -841,14 +830,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::create_union_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -856,14 +845,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::create_enum_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -871,14 +860,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::create_alias_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -886,14 +875,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::create_interface_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -901,14 +890,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::create_value_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -916,14 +905,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::create_value_box_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -931,14 +920,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::create_exception_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -946,14 +935,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::create_native_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -961,14 +950,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -976,14 +965,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -991,14 +980,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -1006,14 +995,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -1021,14 +1010,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -1036,14 +1025,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -1051,14 +1040,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -1066,14 +1055,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -1081,14 +1070,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -1096,14 +1085,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -1111,14 +1100,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-@@ -1126,44 +1115,44 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ModuleDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ModuleDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ModuleDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ModuleDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ConstantDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConstantDef_ptr) obj;
-@@ -1171,14 +1160,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConstantDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConstantDef_ptr) obj;
-@@ -1186,14 +1175,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConstantDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConstantDef_ptr) obj;
-@@ -1201,14 +1190,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConstantDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConstantDef_ptr) obj;
-@@ -1216,14 +1205,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConstantDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConstantDef_ptr) obj;
-@@ -1231,14 +1220,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConstantDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConstantDef_ptr) obj;
-@@ -1246,14 +1235,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConstantDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConstantDef_ptr) obj;
-@@ -1261,14 +1250,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConstantDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConstantDef_ptr) obj;
-@@ -1276,14 +1265,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConstantDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConstantDef_ptr) obj;
-@@ -1291,14 +1280,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConstantDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConstantDef_ptr) obj;
-@@ -1306,14 +1295,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ConstantDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConstantDef_ptr) obj;
-@@ -1321,44 +1310,44 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ConstantDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ConstantDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ConstantDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConstantDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ConstantDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ConstantDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::TypedefDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::TypedefDef_ptr) obj;
-@@ -1366,14 +1355,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::TypedefDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::TypedefDef_ptr) obj;
-@@ -1381,14 +1370,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::TypedefDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::TypedefDef_ptr) obj;
-@@ -1396,14 +1385,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::TypedefDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::TypedefDef_ptr) obj;
-@@ -1411,14 +1400,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::TypedefDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::TypedefDef_ptr) obj;
-@@ -1426,14 +1415,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::TypedefDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::TypedefDef_ptr) obj;
-@@ -1441,14 +1430,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::TypedefDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::TypedefDef_ptr) obj;
-@@ -1456,14 +1445,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::TypedefDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::TypedefDef_ptr) obj;
-@@ -1471,14 +1460,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::TypedefDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::TypedefDef_ptr) obj;
-@@ -1486,14 +1475,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::TypedefDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::TypedefDef_ptr) obj;
-@@ -1501,14 +1490,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::TypedefDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::TypedefDef_ptr) obj;
-@@ -1516,14 +1505,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::TypedefDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::TypedefDef_ptr) obj;
-@@ -1531,44 +1520,44 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::TypedefDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::TypedefDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::TypedefDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::TypedefDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::TypedefDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::TypedefDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::lookup_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1576,14 +1565,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1591,14 +1580,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::lookup_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1606,14 +1595,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::describe_contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1621,14 +1610,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::create_module_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1636,14 +1625,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::create_constant_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1651,14 +1640,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::create_struct_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1666,14 +1655,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::create_union_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1681,14 +1670,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::create_enum_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1696,14 +1685,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::create_alias_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1711,14 +1700,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::create_interface_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1726,14 +1715,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::create_value_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1741,14 +1730,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::create_value_box_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1756,14 +1745,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::create_exception_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1771,14 +1760,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::create_native_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1786,14 +1775,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1801,14 +1790,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1816,14 +1805,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1831,14 +1820,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1846,14 +1835,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1861,14 +1850,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1876,14 +1865,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1891,14 +1880,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1906,14 +1895,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1921,14 +1910,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1936,14 +1925,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1951,14 +1940,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::StructDef_ptr) obj;
-@@ -1966,44 +1955,44 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::StructDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::StructDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::StructDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::StructDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::StructDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::lookup_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2011,14 +2000,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2026,14 +2015,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::lookup_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2041,14 +2030,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::describe_contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2056,14 +2045,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::create_module_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2071,14 +2060,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::create_constant_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2086,14 +2075,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::create_struct_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2101,14 +2090,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::create_union_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2116,14 +2105,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::create_enum_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2131,14 +2120,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::create_alias_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2146,14 +2135,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::create_interface_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2161,14 +2150,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::create_value_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2176,14 +2165,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::create_value_box_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2191,14 +2180,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::create_exception_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2206,14 +2195,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::create_native_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2221,14 +2210,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2236,14 +2225,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2251,14 +2240,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2266,14 +2255,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2281,14 +2270,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2296,14 +2285,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2311,14 +2300,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2326,14 +2315,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2341,14 +2330,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2356,14 +2345,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2371,14 +2360,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2386,14 +2375,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::UnionDef_ptr) obj;
-@@ -2401,44 +2390,44 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::UnionDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::UnionDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UnionDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::UnionDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::UnionDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::EnumDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EnumDef_ptr) obj;
-@@ -2446,14 +2435,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EnumDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EnumDef_ptr) obj;
-@@ -2461,14 +2450,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EnumDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EnumDef_ptr) obj;
-@@ -2476,14 +2465,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EnumDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EnumDef_ptr) obj;
-@@ -2491,14 +2480,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EnumDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EnumDef_ptr) obj;
-@@ -2506,14 +2495,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EnumDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EnumDef_ptr) obj;
-@@ -2521,14 +2510,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EnumDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EnumDef_ptr) obj;
-@@ -2536,14 +2525,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EnumDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EnumDef_ptr) obj;
-@@ -2551,14 +2540,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EnumDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EnumDef_ptr) obj;
-@@ -2566,14 +2555,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EnumDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EnumDef_ptr) obj;
-@@ -2581,14 +2570,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::EnumDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EnumDef_ptr) obj;
-@@ -2596,14 +2585,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::EnumDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::EnumDef_ptr) obj;
-@@ -2611,44 +2600,44 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EnumDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::EnumDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::EnumDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EnumDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::EnumDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::EnumDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::AliasDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AliasDef_ptr) obj;
-@@ -2656,14 +2645,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AliasDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AliasDef_ptr) obj;
-@@ -2671,14 +2660,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AliasDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AliasDef_ptr) obj;
-@@ -2686,14 +2675,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AliasDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AliasDef_ptr) obj;
-@@ -2701,14 +2690,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AliasDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AliasDef_ptr) obj;
-@@ -2716,14 +2705,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AliasDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AliasDef_ptr) obj;
-@@ -2731,14 +2720,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AliasDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AliasDef_ptr) obj;
-@@ -2746,14 +2735,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AliasDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AliasDef_ptr) obj;
-@@ -2761,14 +2750,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AliasDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AliasDef_ptr) obj;
-@@ -2776,14 +2765,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AliasDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AliasDef_ptr) obj;
-@@ -2791,14 +2780,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::AliasDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AliasDef_ptr) obj;
-@@ -2806,14 +2795,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::AliasDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::AliasDef_ptr) obj;
-@@ -2821,44 +2810,44 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AliasDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::AliasDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::AliasDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AliasDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::AliasDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::AliasDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::NativeDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::NativeDef_ptr) obj;
-@@ -2866,14 +2855,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::NativeDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::NativeDef_ptr) obj;
-@@ -2881,14 +2870,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::NativeDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::NativeDef_ptr) obj;
-@@ -2896,14 +2885,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::NativeDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::NativeDef_ptr) obj;
-@@ -2911,14 +2900,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::NativeDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::NativeDef_ptr) obj;
-@@ -2926,14 +2915,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::NativeDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::NativeDef_ptr) obj;
-@@ -2941,14 +2930,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::NativeDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::NativeDef_ptr) obj;
-@@ -2956,14 +2945,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::NativeDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::NativeDef_ptr) obj;
-@@ -2971,14 +2960,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::NativeDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::NativeDef_ptr) obj;
-@@ -2986,14 +2975,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::NativeDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::NativeDef_ptr) obj;
-@@ -3001,14 +2990,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::NativeDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::NativeDef_ptr) obj;
-@@ -3016,14 +3005,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::NativeDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::NativeDef_ptr) obj;
-@@ -3031,44 +3020,44 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::NativeDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::NativeDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::NativeDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::NativeDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::NativeDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::NativeDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::PrimitiveDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::PrimitiveDef_ptr) obj;
-@@ -3076,44 +3065,44 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PrimitiveDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::PrimitiveDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::PrimitiveDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PrimitiveDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::PrimitiveDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::PrimitiveDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::StringDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::StringDef_ptr) obj;
-@@ -3121,44 +3110,44 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::StringDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::StringDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::StringDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::StringDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::StringDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::StringDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::WstringDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::WstringDef_ptr) obj;
-@@ -3166,44 +3155,44 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::WstringDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::WstringDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::WstringDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::WstringDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::WstringDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::WstringDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::FixedDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::FixedDef_ptr) obj;
-@@ -3211,44 +3200,44 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FixedDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::FixedDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::FixedDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FixedDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::FixedDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::FixedDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::SequenceDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::SequenceDef_ptr) obj;
-@@ -3256,44 +3245,44 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::SequenceDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::SequenceDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::SequenceDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::SequenceDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::SequenceDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::SequenceDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ArrayDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::ArrayDef_ptr) obj;
-@@ -3301,44 +3290,44 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ArrayDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ArrayDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ArrayDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ArrayDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ArrayDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ArrayDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3346,14 +3335,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3361,14 +3350,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3376,14 +3365,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3391,14 +3380,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3406,14 +3395,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3421,14 +3410,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3436,14 +3425,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3451,14 +3440,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3466,14 +3455,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3481,14 +3470,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3496,14 +3485,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::lookup_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3511,14 +3500,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3526,14 +3515,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::lookup_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3541,14 +3530,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::describe_contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3556,14 +3545,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::create_module_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3571,14 +3560,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::create_constant_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3586,14 +3575,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::create_struct_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3601,14 +3590,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::create_union_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3616,14 +3605,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::create_enum_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3631,14 +3620,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::create_alias_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3646,14 +3635,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::create_interface_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3661,14 +3650,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::create_value_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3676,14 +3665,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::create_value_box_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3691,14 +3680,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::create_exception_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3706,14 +3695,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::create_native_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-@@ -3721,44 +3710,44 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ExceptionDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ExceptionDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::AttributeDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AttributeDef_ptr) obj;
-@@ -3766,14 +3755,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AttributeDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AttributeDef_ptr) obj;
-@@ -3781,14 +3770,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AttributeDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AttributeDef_ptr) obj;
-@@ -3796,14 +3785,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AttributeDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AttributeDef_ptr) obj;
-@@ -3811,14 +3800,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AttributeDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AttributeDef_ptr) obj;
-@@ -3826,14 +3815,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AttributeDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AttributeDef_ptr) obj;
-@@ -3841,14 +3830,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AttributeDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AttributeDef_ptr) obj;
-@@ -3856,14 +3845,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AttributeDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AttributeDef_ptr) obj;
-@@ -3871,14 +3860,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AttributeDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AttributeDef_ptr) obj;
-@@ -3886,14 +3875,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AttributeDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AttributeDef_ptr) obj;
-@@ -3901,14 +3890,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::AttributeDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::AttributeDef_ptr) obj;
-@@ -3916,44 +3905,44 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::AttributeDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::AttributeDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::AttributeDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::AttributeDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::AttributeDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::AttributeDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::OperationDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::OperationDef_ptr) obj;
-@@ -3961,14 +3950,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::OperationDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::OperationDef_ptr) obj;
-@@ -3976,14 +3965,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::OperationDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::OperationDef_ptr) obj;
-@@ -3991,14 +3980,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::OperationDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::OperationDef_ptr) obj;
-@@ -4006,14 +3995,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::OperationDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::OperationDef_ptr) obj;
-@@ -4021,14 +4010,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::OperationDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::OperationDef_ptr) obj;
-@@ -4036,14 +4025,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::OperationDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::OperationDef_ptr) obj;
-@@ -4051,14 +4040,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::OperationDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::OperationDef_ptr) obj;
-@@ -4066,14 +4055,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::OperationDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::OperationDef_ptr) obj;
-@@ -4081,14 +4070,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::OperationDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::OperationDef_ptr) obj;
-@@ -4096,14 +4085,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::OperationDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::OperationDef_ptr) obj;
-@@ -4111,44 +4100,44 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::OperationDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::OperationDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::OperationDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::OperationDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::OperationDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::OperationDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::lookup_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4156,14 +4145,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4171,14 +4160,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::lookup_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4186,14 +4175,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::describe_contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4201,14 +4190,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::create_module_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4216,14 +4205,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::create_constant_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4231,14 +4220,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::create_struct_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4246,14 +4235,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::create_union_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4261,14 +4250,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::create_enum_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4276,14 +4265,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::create_alias_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4291,14 +4280,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::create_interface_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4306,14 +4295,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::create_value_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4321,14 +4310,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::create_value_box_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4336,14 +4325,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::create_exception_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4351,14 +4340,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::create_native_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4366,14 +4355,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4381,14 +4370,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4396,14 +4385,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4411,14 +4400,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4426,14 +4415,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4441,14 +4430,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4456,14 +4445,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4471,14 +4460,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4486,14 +4475,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4501,14 +4490,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4516,14 +4505,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4531,14 +4520,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-@@ -4546,44 +4535,44 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::InterfaceDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::InterfaceDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueMemberDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueMemberDef_ptr) obj;
-@@ -4591,14 +4580,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueMemberDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueMemberDef_ptr) obj;
-@@ -4606,14 +4595,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueMemberDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueMemberDef_ptr) obj;
-@@ -4621,14 +4610,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueMemberDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueMemberDef_ptr) obj;
-@@ -4636,14 +4625,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueMemberDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueMemberDef_ptr) obj;
-@@ -4651,14 +4640,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueMemberDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueMemberDef_ptr) obj;
-@@ -4666,14 +4655,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueMemberDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueMemberDef_ptr) obj;
-@@ -4681,14 +4670,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueMemberDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueMemberDef_ptr) obj;
-@@ -4696,14 +4685,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueMemberDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueMemberDef_ptr) obj;
-@@ -4711,14 +4700,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueMemberDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueMemberDef_ptr) obj;
-@@ -4726,14 +4715,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueMemberDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueMemberDef_ptr) obj;
-@@ -4741,44 +4730,44 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueMemberDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ValueMemberDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ValueMemberDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueMemberDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ValueMemberDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ValueMemberDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::lookup_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -4786,14 +4775,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -4801,14 +4790,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::lookup_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -4816,14 +4805,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::describe_contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -4831,14 +4820,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::create_module_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -4846,14 +4835,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::create_constant_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -4861,14 +4850,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::create_struct_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -4876,14 +4865,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::create_union_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -4891,14 +4880,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::create_enum_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -4906,14 +4895,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::create_alias_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -4921,14 +4910,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::create_interface_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -4936,14 +4925,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::create_value_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -4951,14 +4940,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::create_value_box_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -4966,14 +4955,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::create_exception_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -4981,14 +4970,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::create_native_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -4996,14 +4985,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -5011,14 +5000,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -5026,14 +5015,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -5041,14 +5030,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -5056,14 +5045,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -5071,14 +5060,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -5086,14 +5075,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -5101,14 +5090,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -5116,14 +5105,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -5131,14 +5120,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -5146,14 +5135,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -5161,14 +5150,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::ValueDef_ptr) obj;
-@@ -5176,44 +5165,44 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ValueDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ValueDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ValueDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ValueDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueBoxDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueBoxDef_ptr) obj;
-@@ -5221,14 +5210,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueBoxDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueBoxDef_ptr) obj;
-@@ -5236,14 +5225,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueBoxDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueBoxDef_ptr) obj;
-@@ -5251,14 +5240,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueBoxDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueBoxDef_ptr) obj;
-@@ -5266,14 +5255,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueBoxDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueBoxDef_ptr) obj;
-@@ -5281,14 +5270,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueBoxDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueBoxDef_ptr) obj;
-@@ -5296,14 +5285,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueBoxDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueBoxDef_ptr) obj;
-@@ -5311,14 +5300,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueBoxDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueBoxDef_ptr) obj;
-@@ -5326,14 +5315,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueBoxDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueBoxDef_ptr) obj;
-@@ -5341,14 +5330,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueBoxDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueBoxDef_ptr) obj;
-@@ -5356,14 +5345,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueBoxDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ValueBoxDef_ptr) obj;
-@@ -5371,14 +5360,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ValueBoxDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::ValueBoxDef_ptr) obj;
-@@ -5386,44 +5375,44 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueBoxDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ValueBoxDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ValueBoxDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ValueBoxDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ValueBoxDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ValueBoxDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ProvidesDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-@@ -5431,14 +5420,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ProvidesDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-@@ -5446,14 +5435,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ProvidesDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-@@ -5461,14 +5450,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ProvidesDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-@@ -5476,14 +5465,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ProvidesDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-@@ -5491,14 +5480,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ProvidesDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-@@ -5506,14 +5495,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ProvidesDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-@@ -5521,14 +5510,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ProvidesDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-@@ -5536,14 +5525,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ProvidesDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-@@ -5551,14 +5540,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ProvidesDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-@@ -5566,14 +5555,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ProvidesDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-@@ -5581,44 +5570,44 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ProvidesDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ProvidesDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UsesDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-@@ -5626,14 +5615,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UsesDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-@@ -5641,14 +5630,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UsesDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-@@ -5656,14 +5645,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UsesDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-@@ -5671,14 +5660,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UsesDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-@@ -5686,14 +5675,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UsesDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-@@ -5701,14 +5690,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UsesDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-@@ -5716,14 +5705,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UsesDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-@@ -5731,14 +5720,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UsesDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-@@ -5746,14 +5735,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UsesDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-@@ -5761,14 +5750,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UsesDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
-@@ -5776,44 +5765,44 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::UsesDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::UsesDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::EventDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-@@ -5821,14 +5810,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EventDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-@@ -5836,14 +5825,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EventDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-@@ -5851,14 +5840,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EventDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-@@ -5866,14 +5855,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EventDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-@@ -5881,14 +5870,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EventDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-@@ -5896,14 +5885,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EventDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-@@ -5911,14 +5900,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EventDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-@@ -5926,14 +5915,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EventDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-@@ -5941,14 +5930,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EventDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-@@ -5956,14 +5945,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::EventDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
-@@ -5971,44 +5960,44 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::EventDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::EventDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::EventDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EventDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::EventDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::EventDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::EmitsDef::is_a_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::EventDef_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-@@ -6016,14 +6005,14 @@
-       req,
-       (POA_IR::EventDef_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::EmitsDef::_get_event_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::EventDef_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-@@ -6031,14 +6020,14 @@
-       req,
-       (POA_IR::EventDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EmitsDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-@@ -6046,14 +6035,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EmitsDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-@@ -6061,14 +6050,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EmitsDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-@@ -6076,14 +6065,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EmitsDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-@@ -6091,14 +6080,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EmitsDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-@@ -6106,14 +6095,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EmitsDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-@@ -6121,14 +6110,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EmitsDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-@@ -6136,14 +6125,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EmitsDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-@@ -6151,14 +6140,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EmitsDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-@@ -6166,14 +6155,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EmitsDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-@@ -6181,14 +6170,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::EmitsDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-@@ -6196,44 +6185,44 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::EmitsDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::EmitsDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::PublishesDef::is_a_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::EventDef_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-@@ -6241,14 +6230,14 @@
-       req,
-       (POA_IR::EventDef_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::PublishesDef::_get_event_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::EventDef_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-@@ -6256,14 +6245,14 @@
-       req,
-       (POA_IR::EventDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PublishesDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-@@ -6271,14 +6260,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PublishesDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-@@ -6286,14 +6275,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PublishesDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-@@ -6301,14 +6290,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PublishesDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-@@ -6316,14 +6305,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PublishesDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-@@ -6331,14 +6320,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PublishesDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-@@ -6346,14 +6335,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PublishesDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-@@ -6361,14 +6350,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PublishesDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-@@ -6376,14 +6365,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PublishesDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-@@ -6391,14 +6380,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PublishesDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-@@ -6406,14 +6395,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::PublishesDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-@@ -6421,44 +6410,44 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::PublishesDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PublishesDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ConsumesDef::is_a_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::EventDef_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-@@ -6466,14 +6455,14 @@
-       req,
-       (POA_IR::EventDef_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ConsumesDef::_get_event_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::EventDef_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-@@ -6481,14 +6470,14 @@
-       req,
-       (POA_IR::EventDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConsumesDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-@@ -6496,14 +6485,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConsumesDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-@@ -6511,14 +6500,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConsumesDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-@@ -6526,14 +6515,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConsumesDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-@@ -6541,14 +6530,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConsumesDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-@@ -6556,14 +6545,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConsumesDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-@@ -6571,14 +6560,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConsumesDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-@@ -6586,14 +6575,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConsumesDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-@@ -6601,14 +6590,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConsumesDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-@@ -6616,14 +6605,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConsumesDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-@@ -6631,14 +6620,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ConsumesDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-@@ -6646,44 +6635,44 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ConsumesDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ConsumesDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_get_base_interfaces_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6691,14 +6680,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_set_base_interfaces_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6706,14 +6695,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_get_is_abstract_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6721,14 +6710,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_set_is_abstract_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6736,14 +6725,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_get_is_local_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6751,14 +6740,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_set_is_local_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6766,14 +6755,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::is_a_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6781,14 +6770,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::create_attribute_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6796,14 +6785,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::create_operation_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6811,14 +6800,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::lookup_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6826,14 +6815,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6841,14 +6830,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::lookup_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6856,14 +6845,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::describe_contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6871,14 +6860,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::create_module_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6886,14 +6875,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::create_constant_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6901,14 +6890,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::create_struct_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6916,14 +6905,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::create_union_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6931,14 +6920,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::create_enum_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6946,14 +6935,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::create_alias_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6961,14 +6950,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::create_interface_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6976,14 +6965,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::create_value_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -6991,14 +6980,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::create_value_box_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -7006,14 +6995,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::create_exception_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -7021,14 +7010,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::create_native_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -7036,14 +7025,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -7051,14 +7040,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -7066,14 +7055,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -7081,14 +7070,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -7096,14 +7085,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -7111,14 +7100,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -7126,14 +7115,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -7141,14 +7130,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -7156,14 +7145,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -7171,14 +7160,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -7186,14 +7175,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -7201,14 +7190,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-@@ -7216,44 +7205,44 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::ComponentDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::PrimaryKeyDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-@@ -7261,14 +7250,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PrimaryKeyDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-@@ -7276,14 +7265,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PrimaryKeyDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-@@ -7291,14 +7280,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PrimaryKeyDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-@@ -7306,14 +7295,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PrimaryKeyDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-@@ -7321,14 +7310,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PrimaryKeyDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-@@ -7336,14 +7325,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PrimaryKeyDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-@@ -7351,14 +7340,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PrimaryKeyDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-@@ -7366,14 +7355,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PrimaryKeyDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-@@ -7381,14 +7370,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PrimaryKeyDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-@@ -7396,14 +7385,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::PrimaryKeyDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-@@ -7411,44 +7400,44 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::PrimaryKeyDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::PrimaryKeyDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_get_result_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7456,14 +7445,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_get_result_def_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7471,14 +7460,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_set_result_def_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7486,14 +7475,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_get_params_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7501,14 +7490,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_set_params_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7516,14 +7505,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_get_mode_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7531,14 +7520,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_set_mode_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7546,14 +7535,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_get_contexts_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7561,14 +7550,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_set_contexts_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7576,14 +7565,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_get_exceptions_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7591,14 +7580,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_set_exceptions_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7606,14 +7595,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7621,14 +7610,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7636,14 +7625,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7651,14 +7640,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7666,14 +7655,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7681,14 +7670,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7696,14 +7685,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7711,14 +7700,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7726,14 +7715,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7741,14 +7730,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7756,14 +7745,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-@@ -7771,44 +7760,44 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FactoryDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_get_result_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -7816,14 +7805,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_get_result_def_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -7831,14 +7820,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_set_result_def_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -7846,14 +7835,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_get_params_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -7861,14 +7850,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_set_params_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -7876,14 +7865,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_get_mode_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -7891,14 +7880,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_set_mode_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -7906,14 +7895,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_get_contexts_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -7921,14 +7910,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_set_contexts_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -7936,14 +7925,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_get_exceptions_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -7951,14 +7940,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_set_exceptions_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -7966,14 +7955,14 @@
-       req,
-       (POA_IR::OperationDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -7981,14 +7970,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -7996,14 +7985,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -8011,14 +8000,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -8026,14 +8015,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -8041,14 +8030,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -8056,14 +8045,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -8071,14 +8060,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -8086,14 +8075,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -8101,14 +8090,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -8116,14 +8105,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
-@@ -8131,44 +8120,44 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::FinderDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_get_base_interfaces_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8176,14 +8165,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_set_base_interfaces_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8191,14 +8180,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_get_is_abstract_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8206,14 +8195,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_set_is_abstract_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8221,14 +8210,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_get_is_local_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8236,14 +8225,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_set_is_local_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8251,14 +8240,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::is_a_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8266,14 +8255,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::create_attribute_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8281,14 +8270,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::create_operation_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8296,14 +8285,14 @@
-       req,
-       (POA_IR::InterfaceDef_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::lookup_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8311,14 +8300,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8326,14 +8315,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::lookup_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8341,14 +8330,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::describe_contents_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8356,14 +8345,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::create_module_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8371,14 +8360,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::create_constant_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8386,14 +8375,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::create_struct_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8401,14 +8390,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::create_union_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8416,14 +8405,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::create_enum_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8431,14 +8420,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::create_alias_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8446,14 +8435,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::create_interface_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8461,14 +8450,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::create_value_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8476,14 +8465,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::create_value_box_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8491,14 +8480,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::create_exception_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8506,14 +8495,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::create_native_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8521,14 +8510,14 @@
-       req,
-       (POA_IR::Container_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_get_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8536,14 +8525,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_set_id_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8551,14 +8540,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_get_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8566,14 +8555,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_set_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8581,14 +8570,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_get_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8596,14 +8585,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_set_version_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8611,14 +8600,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_get_defined_in_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8626,14 +8615,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_get_absolute_name_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8641,14 +8630,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_get_containing_repository_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8656,14 +8645,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::describe_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8671,14 +8660,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::move_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8686,14 +8675,14 @@
-       req,
-       (POA_IR::Contained_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_get_type_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
-   POA_IR::IDLType_ptr impl = (POA_IR::HomeDef_ptr) obj;
-@@ -8701,36 +8690,36 @@
-       req,
-       (POA_IR::IDLType_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::_get_def_kind_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj;
--  POA_CORBA::IRObject::_get_def_kind_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj;
-+  POA_CORBA_IRObject::_get_def_kind_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--      ACE_TRY_ENV
-+      env
-     );
- }
- ACE_INLINE void POA_IR::HomeDef::destroy_skel (
-     TAO_ServerRequest &req,
-     void *obj,
-     void *context,
--    CORBA::Environment &ACE_TRY_ENV
-+    CORBA::Environment &env
-   )
- {
--  POA_CORBA::IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj;
--  POA_CORBA::IRObject::destroy_skel (
-+  POA_CORBA_IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj;
-+  POA_CORBA_IRObject::destroy_skel (
-       req,
--      (POA_CORBA::IRObject_ptr) impl,
-+      (POA_CORBA_IRObject_ptr) impl,
-       context,
--       ACE_TRY_ENV
-+       env
-     );
- }
diff --git a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS_T.i.diff b/TAO/orbsvcs/IFR_Service/diffs/InterfaceS_T.i.diff
deleted file mode 100644
index 2fed81b1ab6..00000000000
--- a/TAO/orbsvcs/IFR_Service/diffs/InterfaceS_T.i.diff
+++ /dev/null
@@ -1,2846 +0,0 @@
---- orig/InterfaceS_T.i	Fri Mar 09 00:47:29 2001
-+++ ../../orbsvcs/IFR_Service/InterfaceS_T.i	Fri Dec 01 19:24:14 2000
-@@ -1,20 +1,9 @@
--// -*- C++ -*-
--//
--// $Id$
-+/* -*- C++ -*- */
-+//$Id$
- 
--// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
--// TAO and the TAO IDL Compiler have been developed by:
--//       Center for Distributed Object Computing
--//       Washington University
--//       St. Louis, MO
--//       USA
--//       http://www.cs.wustl.edu/~schmidt/doc-center.html
--// and
--//       Distributed Object Computing Laboratory
--//       University of California at Irvine
--//       Irvine, CA
--//       USA
--//       http://doc.ece.uci.edu/
-+// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-+// TAO and the TAO IDL Compiler have been developed by the Center for
-+// Distributed Object Computing at Washington University, St. Louis.
- //
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
-@@ -22,112 +11,6 @@
- 
- #if defined (ACE_HAS_USING_KEYWORD)
- template <class T> ACE_INLINE
--POA_CORBA::IRObject_tie<T>::IRObject_tie (T &t)
--	: ptr_ (&t),
--	  poa_ (PortableServer::POA::_nil ()),
--	  rel_ (0)
--{}
--
--template <class T> ACE_INLINE
--POA_CORBA::IRObject_tie<T>::IRObject_tie (T &t, PortableServer::POA_ptr poa)
--	: ptr_ (&t),
--	  poa_ (PortableServer::POA::_duplicate (poa)),
--	  rel_ (0)
--{}
--
--template <class T> ACE_INLINE
--POA_CORBA::IRObject_tie<T>::IRObject_tie (T *tp, CORBA::Boolean release)
--	: ptr_ (tp),
--	  poa_ (PortableServer::POA::_nil ()),
--	  rel_ (release)
--{}
--
--template <class T> ACE_INLINE
--POA_CORBA::IRObject_tie<T>::IRObject_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::IRObject_tie<T>::~IRObject_tie (void)
--{
--  if (this->rel_) delete this->ptr_;
--}
--
--template <class T> ACE_INLINE T *
--POA_CORBA::IRObject_tie<T>::_tied_object (void)
--{
--  return this->ptr_;
--}
--
--template <class T> ACE_INLINE void
--POA_CORBA::IRObject_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::IRObject_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::IRObject_tie<T>::_is_owner (void)
--{
--  return this->rel_;
--}
--
--template <class T> ACE_INLINE void
--POA_CORBA::IRObject_tie<T>::_is_owner (CORBA::Boolean b)
--{
--  this->rel_ = b;
--}
--
--template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_CORBA::IRObject_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->IRObject::_default_POA (ACE_TRY_ENV);
--}
--
--template <class T> ACE_INLINE
--IR::DefinitionKind POA_CORBA::IRObject_tie<T>::def_kind  (
--    CORBA::Environment &ACE_TRY_ENV
--  )
--  ACE_THROW_SPEC ((
--    CORBA::SystemException
--  ))
--{
--  return this->ptr_->def_kind (
--ACE_TRY_ENV
--  );
--}
--
--template <class T> ACE_INLINE
--void POA_CORBA::IRObject_tie<T>::destroy  (
--    CORBA::Environment &ACE_TRY_ENV
--  )
--  ACE_THROW_SPEC ((
--    CORBA::SystemException
--  ))
--{
--  this->ptr_->destroy (
--ACE_TRY_ENV
--  );
--}
--
--#endif /* ACE_HAS_USING_KEYWORD */
--
--#if defined (ACE_HAS_USING_KEYWORD)
--template <class T> ACE_INLINE
- POA_IR::Contained_tie<T>::Contained_tie (T &t)
- 	: ptr_ (&t),
- 	  poa_ (PortableServer::POA::_nil ()),
-@@ -196,12 +79,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::Contained_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::Contained_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->Contained::_default_POA (ACE_TRY_ENV);
-+  return this->Contained::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -342,7 +225,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::Contained_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -457,12 +340,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::Container_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::Container_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->Container::_default_POA (ACE_TRY_ENV);
-+  return this->Container::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -482,7 +365,7 @@
- 
- template <class T> ACE_INLINE
- IR::ContainedSeq * POA_IR::Container_tie<T>::contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -501,7 +384,7 @@
- IR::ContainedSeq * POA_IR::Container_tie<T>::lookup_name  (
-     const char * search_name,
-     CORBA::Long levels_to_search,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -520,7 +403,7 @@
- 
- template <class T> ACE_INLINE
- IR::Container::DescriptionSeq * POA_IR::Container_tie<T>::describe_contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Long max_returned_objs,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -561,7 +444,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -584,7 +467,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -605,8 +488,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+    IR_IDLType_ptr discriminator_type,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -628,7 +511,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -649,7 +532,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+    IR_IDLType_ptr original_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -670,7 +553,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Boolean is_abstract,
-     CORBA::Boolean is_local,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -697,11 +580,11 @@
-     const char * version,
-     CORBA::Boolean is_custom,
-     CORBA::Boolean is_abstract,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Boolean is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+    const IR_ValueDefSeq & abstract_base_values,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -728,7 +611,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -749,7 +632,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -882,12 +765,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::IDLType_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::IDLType_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->IDLType::_default_POA (ACE_TRY_ENV);
-+  return this->IDLType::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -1001,12 +884,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::Repository_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::Repository_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->Repository::_default_POA (ACE_TRY_ENV);
-+  return this->Repository::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -1041,7 +924,7 @@
- 
- template <class T> ACE_INLINE
- IR::PrimitiveDef_ptr POA_IR::Repository_tie<T>::get_primitive  (
--    IR::PrimitiveKind kind,
-+    IR_PrimitiveKind kind,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1087,7 +970,7 @@
- template <class T> ACE_INLINE
- IR::SequenceDef_ptr POA_IR::Repository_tie<T>::create_sequence  (
-     CORBA::ULong bound,
--    IR::IDLType_ptr element_type,
-+    IR_IDLType_ptr element_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1104,7 +987,7 @@
- template <class T> ACE_INLINE
- IR::ArrayDef_ptr POA_IR::Repository_tie<T>::create_array  (
-     CORBA::ULong length,
--    IR::IDLType_ptr element_type,
-+    IR_IDLType_ptr element_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1152,7 +1035,7 @@
- 
- template <class T> ACE_INLINE
- IR::ContainedSeq * POA_IR::Repository_tie<T>::contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -1171,7 +1054,7 @@
- IR::ContainedSeq * POA_IR::Repository_tie<T>::lookup_name  (
-     const char * search_name,
-     CORBA::Long levels_to_search,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -1190,7 +1073,7 @@
- 
- template <class T> ACE_INLINE
- IR::Container::DescriptionSeq * POA_IR::Repository_tie<T>::describe_contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Long max_returned_objs,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -1231,7 +1114,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -1254,7 +1137,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1275,8 +1158,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+    IR_IDLType_ptr discriminator_type,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1298,7 +1181,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1319,7 +1202,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+    IR_IDLType_ptr original_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1340,7 +1223,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Boolean is_abstract,
-     CORBA::Boolean is_local,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -1367,11 +1250,11 @@
-     const char * version,
-     CORBA::Boolean is_custom,
-     CORBA::Boolean is_abstract,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Boolean is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+    const IR_ValueDefSeq & abstract_base_values,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1398,7 +1281,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1419,7 +1302,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1552,12 +1435,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::ComponentRepository_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::ComponentRepository_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->ComponentRepository::_default_POA (ACE_TRY_ENV);
-+  return this->ComponentRepository::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -1565,8 +1448,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ComponentDef_ptr base_component,
--    const IR::InterfaceDefSeq & supports_interfaces,
-+    IR_ComponentDef_ptr base_component,
-+    const IR_InterfaceDefSeq & supports_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1588,9 +1471,9 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::HomeDef_ptr base_home,
--    IR::ComponentDef_ptr managed_component,
--    IR::ValueDef_ptr primary_key,
-+    IR_HomeDef_ptr base_home,
-+    IR_ComponentDef_ptr managed_component,
-+    IR_ValueDef_ptr primary_key,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1640,7 +1523,7 @@
- 
- template <class T> ACE_INLINE
- IR::PrimitiveDef_ptr POA_IR::ComponentRepository_tie<T>::get_primitive  (
--    IR::PrimitiveKind kind,
-+    IR_PrimitiveKind kind,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1686,7 +1569,7 @@
- template <class T> ACE_INLINE
- IR::SequenceDef_ptr POA_IR::ComponentRepository_tie<T>::create_sequence  (
-     CORBA::ULong bound,
--    IR::IDLType_ptr element_type,
-+    IR_IDLType_ptr element_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1703,7 +1586,7 @@
- template <class T> ACE_INLINE
- IR::ArrayDef_ptr POA_IR::ComponentRepository_tie<T>::create_array  (
-     CORBA::ULong length,
--    IR::IDLType_ptr element_type,
-+    IR_IDLType_ptr element_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1751,7 +1634,7 @@
- 
- template <class T> ACE_INLINE
- IR::ContainedSeq * POA_IR::ComponentRepository_tie<T>::contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -1770,7 +1653,7 @@
- IR::ContainedSeq * POA_IR::ComponentRepository_tie<T>::lookup_name  (
-     const char * search_name,
-     CORBA::Long levels_to_search,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -1789,7 +1672,7 @@
- 
- template <class T> ACE_INLINE
- IR::Container::DescriptionSeq * POA_IR::ComponentRepository_tie<T>::describe_contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Long max_returned_objs,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -1830,7 +1713,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -1853,7 +1736,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1874,8 +1757,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+    IR_IDLType_ptr discriminator_type,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1897,7 +1780,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1918,7 +1801,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+    IR_IDLType_ptr original_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1939,7 +1822,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Boolean is_abstract,
-     CORBA::Boolean is_local,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -1966,11 +1849,11 @@
-     const char * version,
-     CORBA::Boolean is_custom,
-     CORBA::Boolean is_abstract,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Boolean is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+    const IR_ValueDefSeq & abstract_base_values,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -1997,7 +1880,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -2018,7 +1901,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -2151,12 +2034,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::ModuleDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::ModuleDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->ModuleDef::_default_POA (ACE_TRY_ENV);
-+  return this->ModuleDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -2176,7 +2059,7 @@
- 
- template <class T> ACE_INLINE
- IR::ContainedSeq * POA_IR::ModuleDef_tie<T>::contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -2195,7 +2078,7 @@
- IR::ContainedSeq * POA_IR::ModuleDef_tie<T>::lookup_name  (
-     const char * search_name,
-     CORBA::Long levels_to_search,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -2214,7 +2097,7 @@
- 
- template <class T> ACE_INLINE
- IR::Container::DescriptionSeq * POA_IR::ModuleDef_tie<T>::describe_contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Long max_returned_objs,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -2255,7 +2138,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -2278,7 +2161,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -2299,8 +2182,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+    IR_IDLType_ptr discriminator_type,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -2322,7 +2205,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -2343,7 +2226,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+    IR_IDLType_ptr original_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -2364,7 +2247,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Boolean is_abstract,
-     CORBA::Boolean is_local,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -2391,11 +2274,11 @@
-     const char * version,
-     CORBA::Boolean is_custom,
-     CORBA::Boolean is_abstract,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Boolean is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+    const IR_ValueDefSeq & abstract_base_values,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -2422,7 +2305,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -2443,7 +2326,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -2616,7 +2499,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ModuleDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -2731,12 +2614,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::ConstantDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::ConstantDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->ConstantDef::_default_POA (ACE_TRY_ENV);
-+  return this->ConstantDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -2767,7 +2650,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ConstantDef_tie<T>::type_def  (
--    IR::IDLType_ptr type_def,
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -2946,7 +2829,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ConstantDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -3061,12 +2944,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::TypedefDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::TypedefDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->TypedefDef::_default_POA (ACE_TRY_ENV);
-+  return this->TypedefDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -3207,7 +3090,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::TypedefDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -3335,12 +3218,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::StructDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::StructDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->StructDef::_default_POA (ACE_TRY_ENV);
-+  return this->StructDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -3358,7 +3241,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::StructDef_tie<T>::members  (
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -3388,7 +3271,7 @@
- 
- template <class T> ACE_INLINE
- IR::ContainedSeq * POA_IR::StructDef_tie<T>::contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -3407,7 +3290,7 @@
- IR::ContainedSeq * POA_IR::StructDef_tie<T>::lookup_name  (
-     const char * search_name,
-     CORBA::Long levels_to_search,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -3426,7 +3309,7 @@
- 
- template <class T> ACE_INLINE
- IR::Container::DescriptionSeq * POA_IR::StructDef_tie<T>::describe_contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Long max_returned_objs,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -3467,7 +3350,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -3490,7 +3373,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -3511,8 +3394,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+    IR_IDLType_ptr discriminator_type,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -3534,7 +3417,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -3555,7 +3438,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+    IR_IDLType_ptr original_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -3576,7 +3459,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Boolean is_abstract,
-     CORBA::Boolean is_local,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -3603,11 +3486,11 @@
-     const char * version,
-     CORBA::Boolean is_custom,
-     CORBA::Boolean is_abstract,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Boolean is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+    const IR_ValueDefSeq & abstract_base_values,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -3634,7 +3517,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -3655,7 +3538,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -3828,7 +3711,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::StructDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -3956,12 +3839,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::UnionDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::UnionDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->UnionDef::_default_POA (ACE_TRY_ENV);
-+  return this->UnionDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -3992,7 +3875,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::UnionDef_tie<T>::discriminator_type_def  (
--    IR::IDLType_ptr discriminator_type_def,
-+    IR_IDLType_ptr discriminator_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -4020,7 +3903,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::UnionDef_tie<T>::members  (
--    const IR::UnionMemberSeq & members,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -4050,7 +3933,7 @@
- 
- template <class T> ACE_INLINE
- IR::ContainedSeq * POA_IR::UnionDef_tie<T>::contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -4069,7 +3952,7 @@
- IR::ContainedSeq * POA_IR::UnionDef_tie<T>::lookup_name  (
-     const char * search_name,
-     CORBA::Long levels_to_search,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -4088,7 +3971,7 @@
- 
- template <class T> ACE_INLINE
- IR::Container::DescriptionSeq * POA_IR::UnionDef_tie<T>::describe_contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Long max_returned_objs,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -4129,7 +4012,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -4152,7 +4035,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -4173,8 +4056,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+    IR_IDLType_ptr discriminator_type,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -4196,7 +4079,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -4217,7 +4100,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+    IR_IDLType_ptr original_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -4238,7 +4121,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Boolean is_abstract,
-     CORBA::Boolean is_local,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -4265,11 +4148,11 @@
-     const char * version,
-     CORBA::Boolean is_custom,
-     CORBA::Boolean is_abstract,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Boolean is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+    const IR_ValueDefSeq & abstract_base_values,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -4296,7 +4179,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -4317,7 +4200,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -4490,7 +4373,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::UnionDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -4618,12 +4501,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::EnumDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::EnumDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->EnumDef::_default_POA (ACE_TRY_ENV);
-+  return this->EnumDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -4641,7 +4524,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::EnumDef_tie<T>::members  (
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -4792,7 +4675,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::EnumDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -4920,12 +4803,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::AliasDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::AliasDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->AliasDef::_default_POA (ACE_TRY_ENV);
-+  return this->AliasDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -4943,7 +4826,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::AliasDef_tie<T>::original_type_def  (
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -5094,7 +4977,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::AliasDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -5222,12 +5105,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::NativeDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::NativeDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->NativeDef::_default_POA (ACE_TRY_ENV);
-+  return this->NativeDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -5368,7 +5251,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::NativeDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -5496,12 +5379,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::PrimitiveDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::PrimitiveDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->PrimitiveDef::_default_POA (ACE_TRY_ENV);
-+  return this->PrimitiveDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -5628,12 +5511,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::StringDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::StringDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->StringDef::_default_POA (ACE_TRY_ENV);
-+  return this->StringDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -5775,12 +5658,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::WstringDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::WstringDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->WstringDef::_default_POA (ACE_TRY_ENV);
-+  return this->WstringDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -5922,12 +5805,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::FixedDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::FixedDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->FixedDef::_default_POA (ACE_TRY_ENV);
-+  return this->FixedDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -6097,12 +5980,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::SequenceDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::SequenceDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->SequenceDef::_default_POA (ACE_TRY_ENV);
-+  return this->SequenceDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -6161,7 +6044,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::SequenceDef_tie<T>::element_type_def  (
--    IR::IDLType_ptr element_type_def,
-+    IR_IDLType_ptr element_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -6285,12 +6168,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::ArrayDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::ArrayDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->ArrayDef::_default_POA (ACE_TRY_ENV);
-+  return this->ArrayDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -6349,7 +6232,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ArrayDef_tie<T>::element_type_def  (
--    IR::IDLType_ptr element_type_def,
-+    IR_IDLType_ptr element_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -6473,12 +6356,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::ExceptionDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::ExceptionDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->ExceptionDef::_default_POA (ACE_TRY_ENV);
-+  return this->ExceptionDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -6509,7 +6392,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ExceptionDef_tie<T>::members  (
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -6660,7 +6543,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ExceptionDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -6694,7 +6577,7 @@
- 
- template <class T> ACE_INLINE
- IR::ContainedSeq * POA_IR::ExceptionDef_tie<T>::contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -6713,7 +6596,7 @@
- IR::ContainedSeq * POA_IR::ExceptionDef_tie<T>::lookup_name  (
-     const char * search_name,
-     CORBA::Long levels_to_search,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -6732,7 +6615,7 @@
- 
- template <class T> ACE_INLINE
- IR::Container::DescriptionSeq * POA_IR::ExceptionDef_tie<T>::describe_contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Long max_returned_objs,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -6773,7 +6656,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -6796,7 +6679,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -6817,8 +6700,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+    IR_IDLType_ptr discriminator_type,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -6840,7 +6723,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -6861,7 +6744,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+    IR_IDLType_ptr original_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -6882,7 +6765,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Boolean is_abstract,
-     CORBA::Boolean is_local,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -6909,11 +6792,11 @@
-     const char * version,
-     CORBA::Boolean is_custom,
-     CORBA::Boolean is_abstract,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Boolean is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+    const IR_ValueDefSeq & abstract_base_values,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -6940,7 +6823,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -6961,7 +6844,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -7094,12 +6977,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::AttributeDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::AttributeDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->AttributeDef::_default_POA (ACE_TRY_ENV);
-+  return this->AttributeDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -7130,7 +7013,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::AttributeDef_tie<T>::type_def  (
--    IR::IDLType_ptr type_def,
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -7158,7 +7041,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::AttributeDef_tie<T>::mode  (
--    IR::AttributeMode mode,
-+    IR_AttributeMode mode,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -7309,7 +7192,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::AttributeDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -7424,12 +7307,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::OperationDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::OperationDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->OperationDef::_default_POA (ACE_TRY_ENV);
-+  return this->OperationDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -7460,7 +7343,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::OperationDef_tie<T>::result_def  (
--    IR::IDLType_ptr result_def,
-+    IR_IDLType_ptr result_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -7488,7 +7371,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::OperationDef_tie<T>::params  (
--    const IR::ParDescriptionSeq & params,
-+    const IR_ParDescriptionSeq & params,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -7516,7 +7399,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::OperationDef_tie<T>::mode  (
--    IR::OperationMode mode,
-+    IR_OperationMode mode,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -7544,7 +7427,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::OperationDef_tie<T>::contexts  (
--    const IR::ContextIdSeq & contexts,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -7572,7 +7455,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::OperationDef_tie<T>::exceptions  (
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -7723,7 +7606,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::OperationDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -7838,12 +7721,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::InterfaceDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::InterfaceDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->InterfaceDef::_default_POA (ACE_TRY_ENV);
-+  return this->InterfaceDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -7861,7 +7744,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::InterfaceDef_tie<T>::base_interfaces  (
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -7950,10 +7833,10 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+    IR_IDLType_ptr type,
-+    IR_AttributeMode mode,
-+    const IR_ExceptionDefSeq & get_exceptions,
-+    const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -7977,11 +7860,11 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+    IR_IDLType_ptr result,
-+    IR_OperationMode mode,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -8018,7 +7901,7 @@
- 
- template <class T> ACE_INLINE
- IR::ContainedSeq * POA_IR::InterfaceDef_tie<T>::contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -8037,7 +7920,7 @@
- IR::ContainedSeq * POA_IR::InterfaceDef_tie<T>::lookup_name  (
-     const char * search_name,
-     CORBA::Long levels_to_search,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -8056,7 +7939,7 @@
- 
- template <class T> ACE_INLINE
- IR::Container::DescriptionSeq * POA_IR::InterfaceDef_tie<T>::describe_contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Long max_returned_objs,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -8097,7 +7980,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -8120,7 +8003,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -8141,8 +8024,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+    IR_IDLType_ptr discriminator_type,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -8164,7 +8047,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -8185,7 +8068,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+    IR_IDLType_ptr original_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -8206,7 +8089,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Boolean is_abstract,
-     CORBA::Boolean is_local,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -8233,11 +8116,11 @@
-     const char * version,
-     CORBA::Boolean is_custom,
-     CORBA::Boolean is_abstract,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Boolean is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+    const IR_ValueDefSeq & abstract_base_values,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -8264,7 +8147,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -8285,7 +8168,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -8458,7 +8341,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::InterfaceDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -8586,12 +8469,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::ValueMemberDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::ValueMemberDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->ValueMemberDef::_default_POA (ACE_TRY_ENV);
-+  return this->ValueMemberDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -8622,7 +8505,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ValueMemberDef_tie<T>::type_def  (
--    IR::IDLType_ptr type_def,
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -8801,7 +8684,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ValueMemberDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -8916,12 +8799,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::ValueDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::ValueDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->ValueDef::_default_POA (ACE_TRY_ENV);
-+  return this->ValueDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -8939,7 +8822,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ValueDef_tie<T>::supported_interfaces  (
--    const IR::InterfaceDefSeq & supported_interfaces,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -8967,7 +8850,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ValueDef_tie<T>::initializers  (
--    const IR::InitializerSeq & initializers,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -8995,7 +8878,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ValueDef_tie<T>::base_value  (
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9023,7 +8906,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ValueDef_tie<T>::abstract_base_values  (
--    const IR::ValueDefSeq & abstract_base_values,
-+    const IR_ValueDefSeq & abstract_base_values,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9140,7 +9023,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     CORBA::Visibility access,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -9163,10 +9046,10 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+    IR_IDLType_ptr type,
-+    IR_AttributeMode mode,
-+    const IR_ExceptionDefSeq & get_exceptions,
-+    const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9190,11 +9073,11 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+    IR_IDLType_ptr result,
-+    IR_OperationMode mode,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9231,7 +9114,7 @@
- 
- template <class T> ACE_INLINE
- IR::ContainedSeq * POA_IR::ValueDef_tie<T>::contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -9250,7 +9133,7 @@
- IR::ContainedSeq * POA_IR::ValueDef_tie<T>::lookup_name  (
-     const char * search_name,
-     CORBA::Long levels_to_search,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -9269,7 +9152,7 @@
- 
- template <class T> ACE_INLINE
- IR::Container::DescriptionSeq * POA_IR::ValueDef_tie<T>::describe_contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Long max_returned_objs,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -9310,7 +9193,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -9333,7 +9216,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9354,8 +9237,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+    IR_IDLType_ptr discriminator_type,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9377,7 +9260,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9398,7 +9281,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+    IR_IDLType_ptr original_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9419,7 +9302,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Boolean is_abstract,
-     CORBA::Boolean is_local,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -9446,11 +9329,11 @@
-     const char * version,
-     CORBA::Boolean is_custom,
-     CORBA::Boolean is_abstract,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Boolean is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+    const IR_ValueDefSeq & abstract_base_values,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9477,7 +9360,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9498,7 +9381,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9671,7 +9554,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ValueDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -9799,12 +9682,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::ValueBoxDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::ValueBoxDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->ValueBoxDef::_default_POA (ACE_TRY_ENV);
-+  return this->ValueBoxDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -9822,7 +9705,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ValueBoxDef_tie<T>::original_type_def  (
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9973,7 +9856,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ValueBoxDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -10101,12 +9984,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::ProvidesDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::ProvidesDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->ProvidesDef::_default_POA (ACE_TRY_ENV);
-+  return this->ProvidesDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -10260,7 +10143,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ProvidesDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -10375,12 +10258,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::UsesDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::UsesDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->UsesDef::_default_POA (ACE_TRY_ENV);
-+  return this->UsesDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -10547,7 +10430,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::UsesDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -10662,12 +10545,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::EventDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::EventDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->EventDef::_default_POA (ACE_TRY_ENV);
-+  return this->EventDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -10836,7 +10719,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::EventDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -10951,12 +10834,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::EmitsDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::EmitsDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->EmitsDef::_default_POA (ACE_TRY_ENV);
-+  return this->EmitsDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -11125,7 +11008,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::EmitsDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -11240,12 +11123,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::PublishesDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::PublishesDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->PublishesDef::_default_POA (ACE_TRY_ENV);
-+  return this->PublishesDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -11414,7 +11297,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::PublishesDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -11529,12 +11412,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::ConsumesDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::ConsumesDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->ConsumesDef::_default_POA (ACE_TRY_ENV);
-+  return this->ConsumesDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -11703,7 +11586,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ConsumesDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -11818,12 +11701,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::ComponentDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::ComponentDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->ComponentDef::_default_POA (ACE_TRY_ENV);
-+  return this->ComponentDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -11841,7 +11724,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ComponentDef_tie<T>::supported_interfaces  (
--    const IR::InterfaceDefSeq & supported_interfaces,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -11950,7 +11833,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::InterfaceDef_ptr interface_type,
-+    IR_InterfaceDef_ptr interface_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -11971,7 +11854,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::InterfaceDef_ptr interface_type,
-+    IR_InterfaceDef_ptr interface_type,
-     CORBA::Boolean is_multiple,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -11994,7 +11877,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -12015,7 +11898,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -12036,7 +11919,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -12067,7 +11950,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ComponentDef_tie<T>::base_interfaces  (
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -12156,10 +12039,10 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+    IR_IDLType_ptr type,
-+    IR_AttributeMode mode,
-+    const IR_ExceptionDefSeq & get_exceptions,
-+    const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -12183,11 +12066,11 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+    IR_IDLType_ptr result,
-+    IR_OperationMode mode,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -12224,7 +12107,7 @@
- 
- template <class T> ACE_INLINE
- IR::ContainedSeq * POA_IR::ComponentDef_tie<T>::contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -12243,7 +12126,7 @@
- IR::ContainedSeq * POA_IR::ComponentDef_tie<T>::lookup_name  (
-     const char * search_name,
-     CORBA::Long levels_to_search,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -12262,7 +12145,7 @@
- 
- template <class T> ACE_INLINE
- IR::Container::DescriptionSeq * POA_IR::ComponentDef_tie<T>::describe_contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Long max_returned_objs,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -12303,7 +12186,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -12326,7 +12209,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -12347,8 +12230,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+    IR_IDLType_ptr discriminator_type,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -12370,7 +12253,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -12391,7 +12274,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+    IR_IDLType_ptr original_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -12412,7 +12295,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Boolean is_abstract,
-     CORBA::Boolean is_local,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -12439,11 +12322,11 @@
-     const char * version,
-     CORBA::Boolean is_custom,
-     CORBA::Boolean is_abstract,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Boolean is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+    const IR_ValueDefSeq & abstract_base_values,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -12470,7 +12353,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -12491,7 +12374,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -12664,7 +12547,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::ComponentDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -12792,12 +12675,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::PrimaryKeyDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::PrimaryKeyDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->PrimaryKeyDef::_default_POA (ACE_TRY_ENV);
-+  return this->PrimaryKeyDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -12966,7 +12849,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::PrimaryKeyDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -13081,12 +12964,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::FactoryDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::FactoryDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->FactoryDef::_default_POA (ACE_TRY_ENV);
-+  return this->FactoryDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -13117,7 +13000,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::FactoryDef_tie<T>::result_def  (
--    IR::IDLType_ptr result_def,
-+    IR_IDLType_ptr result_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -13145,7 +13028,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::FactoryDef_tie<T>::params  (
--    const IR::ParDescriptionSeq & params,
-+    const IR_ParDescriptionSeq & params,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -13173,7 +13056,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::FactoryDef_tie<T>::mode  (
--    IR::OperationMode mode,
-+    IR_OperationMode mode,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -13201,7 +13084,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::FactoryDef_tie<T>::contexts  (
--    const IR::ContextIdSeq & contexts,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -13229,7 +13112,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::FactoryDef_tie<T>::exceptions  (
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -13380,7 +13263,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::FactoryDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -13495,12 +13378,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::FinderDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::FinderDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->FinderDef::_default_POA (ACE_TRY_ENV);
-+  return this->FinderDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -13531,7 +13414,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::FinderDef_tie<T>::result_def  (
--    IR::IDLType_ptr result_def,
-+    IR_IDLType_ptr result_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -13559,7 +13442,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::FinderDef_tie<T>::params  (
--    const IR::ParDescriptionSeq & params,
-+    const IR_ParDescriptionSeq & params,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -13587,7 +13470,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::FinderDef_tie<T>::mode  (
--    IR::OperationMode mode,
-+    IR_OperationMode mode,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -13615,7 +13498,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::FinderDef_tie<T>::contexts  (
--    const IR::ContextIdSeq & contexts,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -13643,7 +13526,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::FinderDef_tie<T>::exceptions  (
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -13794,7 +13677,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::FinderDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -13909,12 +13792,12 @@
- }
- 
- template <class T> ACE_INLINE PortableServer::POA_ptr
--POA_IR::HomeDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-+POA_IR::HomeDef_tie<T>::_default_POA (CORBA::Environment &env)
- {
-   if (!CORBA::is_nil (this->poa_.in ()))
-     return PortableServer::POA::_duplicate (this->poa_.in ());
- 
--  return this->HomeDef::_default_POA (ACE_TRY_ENV);
-+  return this->HomeDef::_default_POA (env);
- }
- 
- template <class T> ACE_INLINE
-@@ -14000,7 +13883,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr primary_key,
-+    IR_ValueDef_ptr primary_key,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14021,8 +13904,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14044,8 +13927,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14077,7 +13960,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::HomeDef_tie<T>::base_interfaces  (
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14166,10 +14049,10 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+    IR_IDLType_ptr type,
-+    IR_AttributeMode mode,
-+    const IR_ExceptionDefSeq & get_exceptions,
-+    const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14193,11 +14076,11 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+    IR_IDLType_ptr result,
-+    IR_OperationMode mode,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14234,7 +14117,7 @@
- 
- template <class T> ACE_INLINE
- IR::ContainedSeq * POA_IR::HomeDef_tie<T>::contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -14253,7 +14136,7 @@
- IR::ContainedSeq * POA_IR::HomeDef_tie<T>::lookup_name  (
-     const char * search_name,
-     CORBA::Long levels_to_search,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -14272,7 +14155,7 @@
- 
- template <class T> ACE_INLINE
- IR::Container::DescriptionSeq * POA_IR::HomeDef_tie<T>::describe_contents  (
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Long max_returned_objs,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -14313,7 +14196,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -14336,7 +14219,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14357,8 +14240,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+    IR_IDLType_ptr discriminator_type,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14380,7 +14263,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14401,7 +14284,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+    IR_IDLType_ptr original_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14422,7 +14305,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Boolean is_abstract,
-     CORBA::Boolean is_local,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -14449,11 +14332,11 @@
-     const char * version,
-     CORBA::Boolean is_custom,
-     CORBA::Boolean is_abstract,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Boolean is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+    const IR_ValueDefSeq & abstract_base_values,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14480,7 +14363,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14501,7 +14384,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14674,7 +14557,7 @@
- 
- template <class T> ACE_INLINE
- void POA_IR::HomeDef_tie<T>::move  (
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -14731,3 +14614,4 @@
- }
- 
- #endif /* ACE_HAS_USING_KEYWORD */
-+
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
index 050d6769eb4..d7e32b3f20d 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
@@ -22,6 +22,10 @@
 #include "BiDirGIOP.h"
 #include "tao/Typecode.h"
 
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#endif /* __BORLANDC__ */
+
 #if !defined (__ACE_INLINE__)
 #include "BiDirPolicyC.i"
 #endif /* !defined INLINE */
@@ -29,16 +33,44 @@
 static const CORBA::Long _oc_BiDirPolicy_BidirectionalPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  45, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x42694469), ACE_NTOHL (0x72506f6c), ACE_NTOHL (0x6963792f), ACE_NTOHL (0x42696469), ACE_NTOHL (0x72656374), ACE_NTOHL (0x696f6e61), ACE_NTOHL (0x6c506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:BiDirPolicy/BidirectionalPolicyValue:1.0
-  25, ACE_NTOHL (0x42696469), ACE_NTOHL (0x72656374), ACE_NTOHL (0x696f6e61), ACE_NTOHL (0x6c506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0),  // name = BidirectionalPolicyValue
+  45,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x42694469), 
+  ACE_NTOHL (0x72506f6c), 
+  ACE_NTOHL (0x6963792f), 
+  ACE_NTOHL (0x42696469), 
+  ACE_NTOHL (0x72656374), 
+  ACE_NTOHL (0x696f6e61), 
+  ACE_NTOHL (0x6c506f6c), 
+  ACE_NTOHL (0x69637956), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:BiDirPolicy/BidirectionalPolicyValue:1.0
+  25,
+  ACE_NTOHL (0x42696469), 
+  ACE_NTOHL (0x72656374), 
+  ACE_NTOHL (0x696f6e61), 
+  ACE_NTOHL (0x6c506f6c), 
+  ACE_NTOHL (0x69637956), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x0),  // name = BidirectionalPolicyValue
   CORBA::tk_ushort,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_BiDirPolicy_BidirectionalPolicyValue (CORBA::tk_alias, sizeof (_oc_BiDirPolicy_BidirectionalPolicyValue), (char *) &_oc_BiDirPolicy_BidirectionalPolicyValue, 0, sizeof (BiDirPolicy::BidirectionalPolicyValue));
+
+static CORBA::TypeCode _tc_TAO_tc_BiDirPolicy_BidirectionalPolicyValue (
+    CORBA::tk_alias,
+    sizeof (_oc_BiDirPolicy_BidirectionalPolicyValue),
+    (char *) &_oc_BiDirPolicy_BidirectionalPolicyValue,
+    0,
+    sizeof (BiDirPolicy::BidirectionalPolicyValue)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (BiDirPolicy)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_BidirectionalPolicyValue, &_tc_TAO_tc_BiDirPolicy_BidirectionalPolicyValue)
 TAO_NAMESPACE_END
+
 TAO_NAMESPACE_TYPE (const CORBA::UShort)
 TAO_NAMESPACE_BEGIN (BiDirPolicy)
 TAO_NAMESPACE_DEFINE (const CORBA::UShort, NORMAL, 0U)
@@ -51,6 +83,188 @@ TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (BiDirPolicy)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, BIDIRECTIONAL_POLICY_TYPE, 37U)
 TAO_NAMESPACE_END
+// *************************************************************
+// Operations for class BiDirPolicy::BidirectionalPolicy_var
+// *************************************************************
+
+BiDirPolicy::BidirectionalPolicy_var::BidirectionalPolicy_var (void) // default constructor
+  : ptr_ (BidirectionalPolicy::_nil ())
+{}
+
+::BiDirPolicy::BidirectionalPolicy_ptr
+BiDirPolicy::BidirectionalPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+BiDirPolicy::BidirectionalPolicy_var::BidirectionalPolicy_var (const ::BiDirPolicy::BidirectionalPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (BidirectionalPolicy::_duplicate (p.ptr ()))
+{}
+
+BiDirPolicy::BidirectionalPolicy_var::~BidirectionalPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+BiDirPolicy::BidirectionalPolicy_var &
+BiDirPolicy::BidirectionalPolicy_var::operator= (BidirectionalPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+BiDirPolicy::BidirectionalPolicy_var &
+BiDirPolicy::BidirectionalPolicy_var::operator= (const ::BiDirPolicy::BidirectionalPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+BiDirPolicy::BidirectionalPolicy_var::operator const ::BiDirPolicy::BidirectionalPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+BiDirPolicy::BidirectionalPolicy_var::operator ::BiDirPolicy::BidirectionalPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::BiDirPolicy::BidirectionalPolicy_ptr
+BiDirPolicy::BidirectionalPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::BiDirPolicy::BidirectionalPolicy_ptr
+BiDirPolicy::BidirectionalPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::BiDirPolicy::BidirectionalPolicy_ptr &
+BiDirPolicy::BidirectionalPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::BiDirPolicy::BidirectionalPolicy_ptr &
+BiDirPolicy::BidirectionalPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil ();
+  return this->ptr_;
+}
+
+::BiDirPolicy::BidirectionalPolicy_ptr
+BiDirPolicy::BidirectionalPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::BiDirPolicy::BidirectionalPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil ();
+  return val;
+}
+
+::BiDirPolicy::BidirectionalPolicy_ptr
+BiDirPolicy::BidirectionalPolicy_var::duplicate (BidirectionalPolicy_ptr p)
+{
+  return ::BiDirPolicy::BidirectionalPolicy::_duplicate (p);
+}
+
+void
+BiDirPolicy::BidirectionalPolicy_var::release (BidirectionalPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::BiDirPolicy::BidirectionalPolicy_ptr
+BiDirPolicy::BidirectionalPolicy_var::nil (void)
+{
+  return ::BiDirPolicy::BidirectionalPolicy::_nil ();
+}
+
+::BiDirPolicy::BidirectionalPolicy_ptr
+BiDirPolicy::BidirectionalPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::BiDirPolicy::BidirectionalPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+BiDirPolicy::BidirectionalPolicy_var::upcast (void *src)
+{
+  BidirectionalPolicy **tmp =
+    ACE_static_cast (BidirectionalPolicy **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class BiDirPolicy::BidirectionalPolicy_out
+// *************************************************************
+
+BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (BidirectionalPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil ();
+}
+
+BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (BidirectionalPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil ();
+}
+
+BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (const ::BiDirPolicy::BidirectionalPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (BidirectionalPolicy_out &, p).ptr_)
+{}
+
+::BiDirPolicy::BidirectionalPolicy_out &
+BiDirPolicy::BidirectionalPolicy_out::operator= (const ::BiDirPolicy::BidirectionalPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (BidirectionalPolicy_out&, p).ptr_;
+  return *this;
+}
+
+BiDirPolicy::BidirectionalPolicy_out &
+BiDirPolicy::BidirectionalPolicy_out::operator= (const ::BiDirPolicy::BidirectionalPolicy_var &p)
+{
+  this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+BiDirPolicy::BidirectionalPolicy_out &
+BiDirPolicy::BidirectionalPolicy_out::operator= (BidirectionalPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+BiDirPolicy::BidirectionalPolicy_out::operator ::BiDirPolicy::BidirectionalPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::BiDirPolicy::BidirectionalPolicy_ptr &
+BiDirPolicy::BidirectionalPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::BiDirPolicy::BidirectionalPolicy_ptr
+BiDirPolicy::BidirectionalPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 // default constructor
 BiDirPolicy::BidirectionalPolicy::BidirectionalPolicy ()
@@ -121,7 +335,7 @@ void *BiDirPolicy::BidirectionalPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -138,3 +352,4 @@ const char* BiDirPolicy::BidirectionalPolicy::_interface_repository_id (void) co
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
   #  pragma instantiate TAO_Object_Manager<BiDirPolicy::BidirectionalPolicy,BiDirPolicy::BidirectionalPolicy_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
index 15eed91020a..eb77ed7be55 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_BIDIRPOLICYC_H_
-#define _TAO_IDL_BIDIRPOLICYC_H_
+#ifndef _TAO_IDL_ORIG_BIDIRPOLICYC_H_
+#define _TAO_IDL_ORIG_BIDIRPOLICYC_H_
 
 #ifndef TAO_BIDIRGIOP_SAFE_INCLUDE
 #error "You should not include BiDirPolicyC.h directly, use BiDirGIOP.h"
@@ -54,11 +54,15 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
 TAO_NAMESPACE  BiDirPolicy
 {
   typedef CORBA::UShort BidirectionalPolicyValue;
   typedef CORBA::UShort_out BidirectionalPolicyValue_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BidirectionalPolicyValue;
+    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BidirectionalPolicyValue;
 
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort NORMAL;
 
@@ -72,7 +76,7 @@ TAO_NAMESPACE  BiDirPolicy
 
   class BidirectionalPolicy;
   typedef BidirectionalPolicy *BidirectionalPolicy_ptr;
-
+  
 #endif /* end #if !defined */
 
 
@@ -83,23 +87,31 @@ TAO_NAMESPACE  BiDirPolicy
   {
   public:
     BidirectionalPolicy_var (void); // default constructor
-    BidirectionalPolicy_var (BidirectionalPolicy_ptr p) : ptr_ (p) {}
+    BidirectionalPolicy_var (BidirectionalPolicy_ptr p) : ptr_ (p) {} 
     BidirectionalPolicy_var (const BidirectionalPolicy_var &); // copy constructor
     ~BidirectionalPolicy_var (void); // destructor
-
+    
     BidirectionalPolicy_var &operator= (BidirectionalPolicy_ptr);
     BidirectionalPolicy_var &operator= (const BidirectionalPolicy_var &);
     BidirectionalPolicy_ptr operator-> (void) const;
-
+    
     operator const BidirectionalPolicy_ptr &() const;
     operator BidirectionalPolicy_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     BidirectionalPolicy_ptr in (void) const;
     BidirectionalPolicy_ptr &inout (void);
     BidirectionalPolicy_ptr &out (void);
     BidirectionalPolicy_ptr _retn (void);
     BidirectionalPolicy_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static BidirectionalPolicy_ptr duplicate (BidirectionalPolicy_ptr);
+    static void release (BidirectionalPolicy_ptr);
+    static BidirectionalPolicy_ptr nil (void);
+    static BidirectionalPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     BidirectionalPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -126,7 +138,7 @@ TAO_NAMESPACE  BiDirPolicy
     operator BidirectionalPolicy_ptr &();
     BidirectionalPolicy_ptr &ptr (void);
     BidirectionalPolicy_ptr operator-> (void);
-
+  
   private:
     BidirectionalPolicy_ptr &ptr_;
   };
@@ -150,12 +162,12 @@ class TAO_BiDirGIOP_Export BidirectionalPolicy: public virtual CORBA::Policy
     static BidirectionalPolicy_ptr _duplicate (BidirectionalPolicy_ptr obj);
     static BidirectionalPolicy_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
     static BidirectionalPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
     static BidirectionalPolicy_ptr _nil (void)
@@ -164,7 +176,7 @@ class TAO_BiDirGIOP_Export BidirectionalPolicy: public virtual CORBA::Policy
       }
 
     virtual BiDirPolicy::BidirectionalPolicyValue value (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -172,12 +184,12 @@ class TAO_BiDirGIOP_Export BidirectionalPolicy: public virtual CORBA::Policy
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
 
   protected:
     BidirectionalPolicy ();
-
+    
     virtual ~BidirectionalPolicy (void);
   private:
     BidirectionalPolicy (const BidirectionalPolicy &);
@@ -206,5 +218,9 @@ TAO_NAMESPACE_CLOSE // module BiDirPolicy
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.i b/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
index 09ef49ce9ca..30946960ebd 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.i
@@ -20,170 +20,50 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___VAR_CI_)
-#define _BIDIRPOLICY_BIDIRECTIONALPOLICY___VAR_CI_
+#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___CI_)
+#define _BIDIRPOLICY_BIDIRECTIONALPOLICY___CI_
 
-// *************************************************************
-// Inline operations for class BiDirPolicy::BidirectionalPolicy_var
-// *************************************************************
-
-ACE_INLINE
-BiDirPolicy::BidirectionalPolicy_var::BidirectionalPolicy_var (void) // default constructor
-  : ptr_ (BidirectionalPolicy::_nil ())
-{}
-
-ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::BidirectionalPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-BiDirPolicy::BidirectionalPolicy_var::BidirectionalPolicy_var (const ::BiDirPolicy::BidirectionalPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (BidirectionalPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-BiDirPolicy::BidirectionalPolicy_var::~BidirectionalPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE BiDirPolicy::BidirectionalPolicy_var &
-BiDirPolicy::BidirectionalPolicy_var::operator= (BidirectionalPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE BiDirPolicy::BidirectionalPolicy_var &
-BiDirPolicy::BidirectionalPolicy_var::operator= (const ::BiDirPolicy::BidirectionalPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-BiDirPolicy::BidirectionalPolicy_var::operator const ::BiDirPolicy::BidirectionalPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-BiDirPolicy::BidirectionalPolicy_var::operator ::BiDirPolicy::BidirectionalPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::BidirectionalPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::BidirectionalPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_ptr &
-BiDirPolicy::BidirectionalPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_ptr &
-BiDirPolicy::BidirectionalPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::BidirectionalPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::BiDirPolicy::BidirectionalPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_BIDIRPOLICY_BIDIRECTIONALPOLICY___OUT_CI_)
-#define _BIDIRPOLICY_BIDIRECTIONALPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class BiDirPolicy::BidirectionalPolicy_out
-// *************************************************************
-
-ACE_INLINE
-BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (BidirectionalPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil ();
-}
-
-ACE_INLINE
-BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (BidirectionalPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_nil ();
-}
-
-ACE_INLINE
-BiDirPolicy::BidirectionalPolicy_out::BidirectionalPolicy_out (const ::BiDirPolicy::BidirectionalPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (BidirectionalPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_out &
-BiDirPolicy::BidirectionalPolicy_out::operator= (const ::BiDirPolicy::BidirectionalPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (BidirectionalPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE BiDirPolicy::BidirectionalPolicy_out &
-BiDirPolicy::BidirectionalPolicy_out::operator= (const ::BiDirPolicy::BidirectionalPolicy_var &p)
+ACE_INLINE BiDirPolicy::BidirectionalPolicy_ptr
+tao_BiDirPolicy_BidirectionalPolicy_duplicate (
+    BiDirPolicy::BidirectionalPolicy_ptr p
+  )
 {
-  this->ptr_ = ::BiDirPolicy::BidirectionalPolicy::_duplicate (p.ptr ());
-  return *this;
+  return BiDirPolicy::BidirectionalPolicy::_duplicate (p);
 }
 
-ACE_INLINE BiDirPolicy::BidirectionalPolicy_out &
-BiDirPolicy::BidirectionalPolicy_out::operator= (BidirectionalPolicy_ptr p)
+ACE_INLINE void
+tao_BiDirPolicy_BidirectionalPolicy_release (
+    BiDirPolicy::BidirectionalPolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-BiDirPolicy::BidirectionalPolicy_out::operator ::BiDirPolicy::BidirectionalPolicy_ptr &() // cast
+ACE_INLINE BiDirPolicy::BidirectionalPolicy_ptr
+tao_BiDirPolicy_BidirectionalPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return BiDirPolicy::BidirectionalPolicy::_nil ();
 }
 
-ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_ptr &
-BiDirPolicy::BidirectionalPolicy_out::ptr (void) // ptr
+ACE_INLINE BiDirPolicy::BidirectionalPolicy_ptr
+tao_BiDirPolicy_BidirectionalPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return BiDirPolicy::BidirectionalPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::BiDirPolicy::BidirectionalPolicy_ptr
-BiDirPolicy::BidirectionalPolicy_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_BiDirPolicy_BidirectionalPolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  BiDirPolicy::BidirectionalPolicy **tmp =
+    ACE_static_cast (BiDirPolicy::BidirectionalPolicy **, src);
+  return *tmp;
 }
 
 
diff --git a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.cpp.diff b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.cpp.diff
new file mode 100644
index 00000000000..9ec166186b6
--- /dev/null
+++ b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.cpp.diff
@@ -0,0 +1,27 @@
+--- orig/BiDirPolicyC.cpp	Thu Apr 19 00:03:17 2001
++++ BiDirPolicyC.cpp	Wed Apr 18 23:59: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:
+@@ -19,14 +19,8 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#include "BiDirPolicyC.h"
+-
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+-#include "tao/ClientRequestInfo.h"
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
++#include "BiDirGIOP.h"
++#include "tao/Typecode.h"
+ 
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus
diff --git a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.h.diff b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.h.diff
new file mode 100644
index 00000000000..47bd49e8089
--- /dev/null
+++ b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.h.diff
@@ -0,0 +1,30 @@
+--- orig/BiDirPolicyC.h	Thu Apr 19 00:03:17 2001
++++ BiDirPolicyC.h	Wed Apr 18 23:57: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:
+@@ -22,14 +22,17 @@
+ #ifndef _TAO_IDL_ORIG_BIDIRPOLICYC_H_
+ #define _TAO_IDL_ORIG_BIDIRPOLICYC_H_
+ 
++#ifndef TAO_BIDIRGIOP_SAFE_INCLUDE
++#error "You should not include BiDirPolicyC.h directly, use BiDirGIOP.h"
++#endif /* !TAO_BIDIRGIOP_SAFE_INCLUDE */
++
+ #include "ace/pre.h"
+-#include "tao/corba.h"
++#include "bidirgiop_export.h"
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
+-#include "bidirgiop_export.h"
+ #include "tao/PolicyC.h"
+ 
+ #if defined (TAO_EXPORT_MACRO)
diff --git a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.i.diff b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.i.diff
new file mode 100644
index 00000000000..7bb986145ee
--- /dev/null
+++ b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicyC.i.diff
@@ -0,0 +1,10 @@
+--- orig/BiDirPolicyC.i	Thu Apr 19 00:03:17 2001
++++ BiDirPolicyC.i	Wed Apr 18 23:58:19 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/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index bd80d7fbb07..2f74c8abcd7 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -1,19 +1,211 @@
-/* -*- C++ -*- $Id$ */
+// -*- C++ -*- $Id$ */
+//
+// $Id$
 
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "tao/CurrentC.h"
-#include "tao/Sequence.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/CurrentC.i"
 #endif /* !defined INLINE */
 
+// *************************************************************
+// Operations for class CORBA_Current_var
+// *************************************************************
+
+CORBA_Current_var::CORBA_Current_var (void) // default constructor
+  : ptr_ (CORBA_Current::_nil ())
+{}
+
+::CORBA_Current_ptr
+CORBA_Current_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_Current_var::CORBA_Current_var (const ::CORBA_Current_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_Current::_duplicate (p.ptr ()))
+{}
+
+CORBA_Current_var::~CORBA_Current_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_Current_var &
+CORBA_Current_var::operator= (CORBA_Current_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_Current_var &
+CORBA_Current_var::operator= (const ::CORBA_Current_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_Current::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_Current_var::operator const ::CORBA_Current_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_Current_var::operator ::CORBA_Current_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_Current_ptr
+CORBA_Current_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_Current_ptr
+CORBA_Current_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_Current_ptr &
+CORBA_Current_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_Current_ptr &
+CORBA_Current_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_Current::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_Current_ptr
+CORBA_Current_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_Current_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_Current::_nil ();
+  return val;
+}
+
+::CORBA_Current_ptr
+CORBA_Current_var::duplicate (CORBA_Current_ptr p)
+{
+  return ::CORBA_Current::_duplicate (p);
+}
+
+void
+CORBA_Current_var::release (CORBA_Current_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_Current_ptr
+CORBA_Current_var::nil (void)
+{
+  return ::CORBA_Current::_nil ();
+}
+
+::CORBA_Current_ptr
+CORBA_Current_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_Current::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_Current_var::upcast (void *src)
+{
+  CORBA_Current **tmp =
+    ACE_static_cast (CORBA_Current **, src);
+  return *tmp;
+}
+// *************************************************************
+// Operations for class CORBA_Current_out
+// *************************************************************
+
+CORBA_Current_out::CORBA_Current_out (CORBA_Current_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_Current::_nil ();
+}
+
+CORBA_Current_out::CORBA_Current_out (CORBA_Current_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_Current::_nil ();
+}
+
+CORBA_Current_out::CORBA_Current_out (const ::CORBA_Current_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_Current_out &, p).ptr_)
+{}
+
+::CORBA_Current_out &
+CORBA_Current_out::operator= (const ::CORBA_Current_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_Current_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_Current_out &
+CORBA_Current_out::operator= (const ::CORBA_Current_var &p)
+{
+  this->ptr_ = ::CORBA_Current::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_Current_out &
+CORBA_Current_out::operator= (CORBA_Current_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_Current_out::operator ::CORBA_Current_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_Current_ptr &
+CORBA_Current_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_Current_ptr
+CORBA_Current_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 // default constructor
 CORBA_Current::CORBA_Current (void)
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index 54320a8d600..8d8fa42d625 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -1,11 +1,23 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*- $Id$ */
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #ifndef _TAO_IDL_CURRENTC_H_
 #define _TAO_IDL_CURRENTC_H_
@@ -13,10 +25,6 @@
 #include "ace/pre.h"
 #include "tao/Object.h"
 
-#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-#include "ace/streams.h"
-#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -42,6 +50,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
 
 #if !defined (_CORBA_CURRENT___PTR_CH_)
 #define _CORBA_CURRENT___PTR_CH_
@@ -76,6 +88,14 @@ public:
   CORBA_Current_ptr _retn (void);
   CORBA_Current_ptr ptr (void) const;
 
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_Current_ptr duplicate (CORBA_Current_ptr);
+  static void release (CORBA_Current_ptr);
+  static CORBA_Current_ptr nil (void);
+  static CORBA_Current_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
 private:
   CORBA_Current_ptr ptr_;
   // Unimplemented - prevents widening assignment.
@@ -145,6 +165,7 @@ public:
 
 protected:
   CORBA_Current (void);
+
   virtual ~CORBA_Current (void);
 private:
   CORBA_Current (const CORBA_Current &);
@@ -169,5 +190,9 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/CurrentC.i b/TAO/tao/CurrentC.i
index 6c7385c65a2..c068cc3b04c 100644
--- a/TAO/tao/CurrentC.i
+++ b/TAO/tao/CurrentC.i
@@ -1,177 +1,69 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*- $Id$ */
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-#if !defined (_CORBA_CURRENT___VAR_CI_)
-#define _CORBA_CURRENT___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_Current_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_Current_var::CORBA_Current_var (void) // default constructor
-  : ptr_ (CORBA_Current::_nil ())
-{}
-
-ACE_INLINE ::CORBA_Current_ptr
-CORBA_Current_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Current_var::CORBA_Current_var (const ::CORBA_Current_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_Current::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_Current_var::~CORBA_Current_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_Current_var &
-CORBA_Current_var::operator= (CORBA_Current_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_Current_var &
-CORBA_Current_var::operator= (const ::CORBA_Current_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_Current::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_Current_var::operator const ::CORBA_Current_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_Current_var::operator ::CORBA_Current_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Current_ptr
-CORBA_Current_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Current_ptr
-CORBA_Current_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Current_ptr &
-CORBA_Current_var::inout (void)
-{
-  return this->ptr_;
-}
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-ACE_INLINE ::CORBA_Current_ptr &
-CORBA_Current_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_Current::_nil ();
-  return this->ptr_;
-}
 
-ACE_INLINE ::CORBA_Current_ptr
-CORBA_Current_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA_Current_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_Current::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CURRENT___OUT_CI_)
-#define _CORBA_CURRENT___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_Current_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_Current_out::CORBA_Current_out (CORBA_Current_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_Current::_nil ();
-}
-
-ACE_INLINE
-CORBA_Current_out::CORBA_Current_out (CORBA_Current_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_Current::_nil ();
-}
-
-ACE_INLINE
-CORBA_Current_out::CORBA_Current_out (const ::CORBA_Current_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_Current_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_Current_out &
-CORBA_Current_out::operator= (const ::CORBA_Current_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_Current_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_CORBA_CURRENT___CI_)
+#define _CORBA_CURRENT___CI_
 
-ACE_INLINE CORBA_Current_out &
-CORBA_Current_out::operator= (const ::CORBA_Current_var &p)
+ACE_INLINE CORBA_Current_ptr
+tao_CORBA_Current_duplicate (
+    CORBA_Current_ptr p
+  )
 {
-  this->ptr_ = ::CORBA_Current::_duplicate (p.ptr ());
-  return *this;
+  return CORBA_Current::_duplicate (p);
 }
 
-ACE_INLINE CORBA_Current_out &
-CORBA_Current_out::operator= (CORBA_Current_ptr p)
+ACE_INLINE void
+tao_CORBA_Current_release (
+    CORBA_Current_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-CORBA_Current_out::operator ::CORBA_Current_ptr &() // cast
+ACE_INLINE CORBA_Current_ptr
+tao_CORBA_Current_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_Current::_nil ();
 }
 
-ACE_INLINE ::CORBA_Current_ptr &
-CORBA_Current_out::ptr (void) // ptr
+ACE_INLINE CORBA_Current_ptr
+tao_CORBA_Current_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_Current::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_Current_ptr
-CORBA_Current_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_Current_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  CORBA_Current **tmp =
+    ACE_static_cast (CORBA_Current **, src);
+  return *tmp;
 }
 
 
diff --git a/TAO/tao/Domain.pidl b/TAO/tao/Domain.pidl
index 2464c68f280..75ee4222449 100644
--- a/TAO/tao/Domain.pidl
+++ b/TAO/tao/Domain.pidl
@@ -9,23 +9,60 @@
 //   Domain.pidl
 //
 // = DESCRIPTION
-//   This file was used to generate the code in Domain{C,S,S_T}.{h,i,cpp}
 //
-//   The command used to generate code from this file is:
+//   This file was used to generate the code in DomainC.{h,i,cpp}.
 //
-//     tao_idl.exe -o orig -Gp -Gd -Ge 1 -Gv \
-//          -Wb,export_macro=TAO_Export \
-//          -Wb,export_include=corbafwd.h \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          Messaging.pidl
+//   The steps to regenerate the code are as follows:
 //
-//   after the file is generated a patch must be applied.  The patch
-//   disables the code under certain configurations, and eliminates
-//   cycles in the include dependencies.  Those changes are required
-//   because the generated code is part of the TAO library, it hardly
-//   makes any sense to  change the IDL compiler to support changes
-//   that are very occasional.
+//   1. Patch this pidl file to (a) remove the CORBA module bringing
+//   the Domain interfaces to the global scope; and (b) rename the
+//   Domain interfaces to CORBA_xxxx.
+//
+//   Apply patches using the following commands:
+//
+//   patch < diffs/Domain.pidl.diff
+//   patch < diffs/Policy.pidl.diff 
+//
+//   The second patch is because Policy.pidl is included in
+//   Domain.pidl.
+//
+//   2. Run the tao_idl compiler on the patched pidl file.  The
+//   command used for this is:
+//
+//     tao_idl.exe
+//          -Ge 1
+//          -Wb,export_macro=TAO_Export
+//          -Wb,export_include="tao/corbafwd.h"
+//          -Wb,pre_include="ace/pre.h"
+//          -Wb,post_include="ace/post.h"
+//          Domain.pidl
+//
+//   3. Then patch the generated code.  This patch (a) fixes the
+//   interface repository IDs; (b) eliminates cycles in the include
+//   dependencies; (c) removes the extra CORBA module.
+//
+//   Apply patches using the following commands:
+//
+//   patch < diffs/DomainC.h.diff
+//   patch < diffs/DomainC.i.diff
+//   patch < diffs/DomainC.cpp.diff
+//
+//   patch < diffs/DomainS.cpp.diff
+//
+//   4. You'll have to move the Domain skeleton files from TAO/tao
+//   to the TAO_Domain library by hand.
+//
+//   5. Undo the patches to the pidl files.
+//
+//   Note: The diffs were generated with these commands:
+//
+//   diff -wbu Domain.pidl Domain.pidl.mod > diffs/Domain.pidl.diff
+//
+//   diff -wbu DomainC.h DomainC.h.mod > diffs/DomainC.h.diff
+//   diff -wbu DomainC.i DomainC.i.mod > diffs/DomainC.i.diff
+//   diff -wbu DomainC.cpp DomainC.cpp.mod > diffs/DomainC.cpp.diff
+//
+//   diff -wbu DomainS.cpp DomainS.cpp.mod > diffs/DomainS.cpp.diff
 //
 // ================================================================
 
@@ -36,7 +73,6 @@
 
 #include "Policy.pidl"
 
-
 module CORBA
 {
   interface InterfaceDef;
@@ -44,7 +80,8 @@ module CORBA
   interface DomainManager
   {
     Policy get_domain_policy (
-      in PolicyType policy_type);
+        in PolicyType policy_type
+      );
   };
 
   const PolicyType SecConstruction = 11;
@@ -52,8 +89,9 @@ module CORBA
   interface ConstructionPolicy : Policy
   {
     void make_domain_manager (
-      in InterfaceDef object_type,
-      in boolean constr_policy);
+        in InterfaceDef object_type,
+        in boolean constr_policy
+      );
   };
 
   typedef sequence <DomainManager> DomainManagerList;
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index a997afe8471..39aa85dbfc4 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -39,6 +39,188 @@
 #endif /* !defined INLINE */
 
 
+// *************************************************************
+// Operations for class CORBA_DomainManager_var
+// *************************************************************
+
+CORBA_DomainManager_var::CORBA_DomainManager_var (void) // default constructor
+  : ptr_ (CORBA_DomainManager::_nil ())
+{}
+
+::CORBA_DomainManager_ptr
+CORBA_DomainManager_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_DomainManager_var::CORBA_DomainManager_var (const ::CORBA_DomainManager_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_DomainManager::_duplicate (p.ptr ()))
+{}
+
+CORBA_DomainManager_var::~CORBA_DomainManager_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_DomainManager_var &
+CORBA_DomainManager_var::operator= (CORBA_DomainManager_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_DomainManager_var &
+CORBA_DomainManager_var::operator= (const ::CORBA_DomainManager_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_DomainManager::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_DomainManager_var::operator const ::CORBA_DomainManager_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_DomainManager_var::operator ::CORBA_DomainManager_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_DomainManager_ptr
+CORBA_DomainManager_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_DomainManager_ptr
+CORBA_DomainManager_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_DomainManager_ptr &
+CORBA_DomainManager_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_DomainManager_ptr &
+CORBA_DomainManager_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_DomainManager::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_DomainManager_ptr
+CORBA_DomainManager_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_DomainManager_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_DomainManager::_nil ();
+  return val;
+}
+
+::CORBA_DomainManager_ptr
+CORBA_DomainManager_var::duplicate (CORBA_DomainManager_ptr p)
+{
+  return ::CORBA_DomainManager::_duplicate (p);
+}
+
+void
+CORBA_DomainManager_var::release (CORBA_DomainManager_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_DomainManager_ptr
+CORBA_DomainManager_var::nil (void)
+{
+  return ::CORBA_DomainManager::_nil ();
+}
+
+::CORBA_DomainManager_ptr
+CORBA_DomainManager_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_DomainManager::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_DomainManager_var::upcast (void *src)
+{
+  CORBA_DomainManager **tmp =
+    ACE_static_cast (CORBA_DomainManager **, src);
+  return *tmp;
+}
+// *************************************************************
+// Operations for class CORBA_DomainManager_out
+// *************************************************************
+
+CORBA_DomainManager_out::CORBA_DomainManager_out (CORBA_DomainManager_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_DomainManager::_nil ();
+}
+
+CORBA_DomainManager_out::CORBA_DomainManager_out (CORBA_DomainManager_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_DomainManager::_nil ();
+}
+
+CORBA_DomainManager_out::CORBA_DomainManager_out (const ::CORBA_DomainManager_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_DomainManager_out &, p).ptr_)
+{}
+
+::CORBA_DomainManager_out &
+CORBA_DomainManager_out::operator= (const ::CORBA_DomainManager_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_DomainManager_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_DomainManager_out &
+CORBA_DomainManager_out::operator= (const ::CORBA_DomainManager_var &p)
+{
+  this->ptr_ = ::CORBA_DomainManager::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_DomainManager_out &
+CORBA_DomainManager_out::operator= (CORBA_DomainManager_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_DomainManager_out::operator ::CORBA_DomainManager_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_DomainManager_ptr &
+CORBA_DomainManager_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_DomainManager_ptr
+CORBA_DomainManager_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy : public TAO_ClientRequestInfo
 {
@@ -564,6 +746,187 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_DomainManager (
 CORBA::TypeCode_ptr _tc_CORBA_DomainManager =
   &_tc_TAO_tc_CORBA_DomainManager;
 
+// *************************************************************
+// Operations for class CORBA_ConstructionPolicy_var
+// *************************************************************
+
+CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (void) // default constructor
+  : ptr_ (CORBA_ConstructionPolicy::_nil ())
+{}
+
+::CORBA_ConstructionPolicy_ptr
+CORBA_ConstructionPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (const ::CORBA_ConstructionPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_ConstructionPolicy::_duplicate (p.ptr ()))
+{}
+
+CORBA_ConstructionPolicy_var::~CORBA_ConstructionPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_ConstructionPolicy_var &
+CORBA_ConstructionPolicy_var::operator= (CORBA_ConstructionPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_ConstructionPolicy_var &
+CORBA_ConstructionPolicy_var::operator= (const ::CORBA_ConstructionPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_ConstructionPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_ConstructionPolicy_var::operator const ::CORBA_ConstructionPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_ConstructionPolicy_var::operator ::CORBA_ConstructionPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_ConstructionPolicy_ptr
+CORBA_ConstructionPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_ConstructionPolicy_ptr
+CORBA_ConstructionPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_ConstructionPolicy_ptr &
+CORBA_ConstructionPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_ConstructionPolicy_ptr &
+CORBA_ConstructionPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_ConstructionPolicy::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_ConstructionPolicy_ptr
+CORBA_ConstructionPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_ConstructionPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_ConstructionPolicy::_nil ();
+  return val;
+}
+
+::CORBA_ConstructionPolicy_ptr
+CORBA_ConstructionPolicy_var::duplicate (CORBA_ConstructionPolicy_ptr p)
+{
+  return ::CORBA_ConstructionPolicy::_duplicate (p);
+}
+
+void
+CORBA_ConstructionPolicy_var::release (CORBA_ConstructionPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_ConstructionPolicy_ptr
+CORBA_ConstructionPolicy_var::nil (void)
+{
+  return ::CORBA_ConstructionPolicy::_nil ();
+}
+
+::CORBA_ConstructionPolicy_ptr
+CORBA_ConstructionPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_ConstructionPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_ConstructionPolicy_var::upcast (void *src)
+{
+  CORBA_ConstructionPolicy **tmp =
+    ACE_static_cast (CORBA_ConstructionPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Operations for class CORBA_ConstructionPolicy_out
+// *************************************************************
+
+CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_ConstructionPolicy::_nil ();
+}
+
+CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_ConstructionPolicy::_nil ();
+}
+
+CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (const ::CORBA_ConstructionPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_ConstructionPolicy_out &, p).ptr_)
+{}
+
+::CORBA_ConstructionPolicy_out &
+CORBA_ConstructionPolicy_out::operator= (const ::CORBA_ConstructionPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_ConstructionPolicy_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_ConstructionPolicy_out &
+CORBA_ConstructionPolicy_out::operator= (const ::CORBA_ConstructionPolicy_var &p)
+{
+  this->ptr_ = ::CORBA_ConstructionPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_ConstructionPolicy_out &
+CORBA_ConstructionPolicy_out::operator= (CORBA_ConstructionPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_ConstructionPolicy_out::operator ::CORBA_ConstructionPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_ConstructionPolicy_ptr &
+CORBA_ConstructionPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_ConstructionPolicy_ptr
+CORBA_ConstructionPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager : public TAO_ClientRequestInfo
@@ -1122,14 +1485,21 @@ CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy =
     {
       CORBA_DomainManager **old = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = CORBA_DomainManager::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-
+        {
+          if (!this->release_)
+            {
+              tmp[i] = CORBA_DomainManager::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
       if (this->release_)
-        delete[] old;
-
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
@@ -1140,11 +1510,13 @@ CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy =
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     CORBA_DomainManager **tmp = ACE_reinterpret_cast (CORBA_DomainManager**, this->buffer_);
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       CORBA::release (tmp[i]);
       tmp[i] = CORBA_DomainManager::_nil ();
     }
+
     _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::freebuf (tmp);
     this->buffer_ = 0;
   }
@@ -1165,6 +1537,7 @@ CORBA::TypeCode_ptr _tc_CORBA_ConstructionPolicy =
       tmp[i] = CORBA_DomainManager::_nil ();
     }
   }
+
   void
   _TAO_Unbounded_Object_Sequence_CORBA_DomainManagerList::_downcast (
       void* target,
@@ -1506,6 +1879,78 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_DomainManage
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
+    const CORBA_DomainManager_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_DomainManager_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_DomainManager::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_ConstructionPolicy_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_ConstructionPolicy_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_ConstructionPolicy::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
     const CORBA_DomainManagerList &_tao_sequence
   )
 {
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 524f957fa48..f466d2774ae 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -29,8 +29,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "TAO_Export.h"
-#include "PolicyC.h"
+#include "tao/TAO_Export.h"
+#include "tao/PolicyC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -88,6 +88,14 @@ public:
   CORBA_DomainManager_ptr _retn (void);
   CORBA_DomainManager_ptr ptr (void) const;
 
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_DomainManager_ptr duplicate (CORBA_DomainManager_ptr);
+  static void release (CORBA_DomainManager_ptr);
+  static CORBA_DomainManager_ptr nil (void);
+  static CORBA_DomainManager_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
 private:
   CORBA_DomainManager_ptr ptr_;
   // Unimplemented - prevents widening assignment.
@@ -366,6 +374,14 @@ public:
   CORBA_ConstructionPolicy_ptr _retn (void);
   CORBA_ConstructionPolicy_ptr ptr (void) const;
 
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_ConstructionPolicy_ptr duplicate (CORBA_ConstructionPolicy_ptr);
+  static void release (CORBA_ConstructionPolicy_ptr);
+  static CORBA_ConstructionPolicy_ptr nil (void);
+  static CORBA_ConstructionPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
 private:
   CORBA_ConstructionPolicy_ptr ptr_;
   // Unimplemented - prevents widening assignment.
@@ -770,11 +786,15 @@ extern TAO_Export CORBA::TypeCode_ptr  _tc_CORBA_DomainManagerList;
 
 // Proxy Broker Factory function pointer declarations.
 
-extern TAO_Export _TAO_CORBA_DomainManager_Proxy_Broker * (*_TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer) (
+extern TAO_Export
+_TAO_CORBA_DomainManager_Proxy_Broker *
+(*_TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_Export _TAO_CORBA_ConstructionPolicy_Proxy_Broker * (*_TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) (
+extern TAO_Export
+_TAO_CORBA_ConstructionPolicy_Proxy_Broker *
+(*_TAO_CORBA_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i
index 1e5dcee9451..a8f34e2f933 100644
--- a/TAO/tao/DomainC.i
+++ b/TAO/tao/DomainC.i
@@ -23,193 +23,110 @@
 #if !defined (_CORBA_DOMAINMANAGER___CI_)
 #define _CORBA_DOMAINMANAGER___CI_
 
-ACE_INLINE
-CORBA_DomainManager::CORBA_DomainManager (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE CORBA_DomainManager_ptr
+tao_CORBA_DomainManager_duplicate (
+    CORBA_DomainManager_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->CORBA_DomainManager_setup_collocation (_tao_collocated);
+  return CORBA_DomainManager::_duplicate (p);
 }
 
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_DOMAINMANAGER___VAR_CI_)
-#define _CORBA_DOMAINMANAGER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_DomainManager_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_DomainManager_var::CORBA_DomainManager_var (void) // default constructor
-  : ptr_ (CORBA_DomainManager::_nil ())
-{}
-
-ACE_INLINE ::CORBA_DomainManager_ptr
-CORBA_DomainManager_var::ptr (void) const
+ACE_INLINE void
+tao_CORBA_DomainManager_release (
+    CORBA_DomainManager_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-CORBA_DomainManager_var::CORBA_DomainManager_var (const ::CORBA_DomainManager_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_DomainManager::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_DomainManager_var::~CORBA_DomainManager_var (void) // destructor
+ACE_INLINE CORBA_DomainManager_ptr
+tao_CORBA_DomainManager_nil (
+    void
+  )
 {
-  CORBA::release (this->ptr_);
+  return CORBA_DomainManager::_nil ();
 }
 
-ACE_INLINE CORBA_DomainManager_var &
-CORBA_DomainManager_var::operator= (CORBA_DomainManager_ptr p)
+ACE_INLINE CORBA_DomainManager_ptr
+tao_CORBA_DomainManager_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
+  return CORBA_DomainManager::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE CORBA_DomainManager_var &
-CORBA_DomainManager_var::operator= (const ::CORBA_DomainManager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_DomainManager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_DomainManager_var::operator const ::CORBA_DomainManager_ptr &() const // cast
+ACE_INLINE CORBA::Object *
+tao_CORBA_DomainManager_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  CORBA_DomainManager **tmp =
+    ACE_static_cast (CORBA_DomainManager **, src);
+  return *tmp;
 }
 
 ACE_INLINE
-CORBA_DomainManager_var::operator ::CORBA_DomainManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_DomainManager_ptr
-CORBA_DomainManager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_DomainManager_ptr
-CORBA_DomainManager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_DomainManager_ptr &
-CORBA_DomainManager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_DomainManager_ptr &
-CORBA_DomainManager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_DomainManager::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_DomainManager_ptr
-CORBA_DomainManager_var::_retn (void)
+CORBA_DomainManager::CORBA_DomainManager (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  // yield ownership of managed obj reference
-  ::CORBA_DomainManager_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_DomainManager::_nil ();
-  return val;
+  this->CORBA_DomainManager_setup_collocation (_tao_collocated);
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_DOMAINMANAGER___OUT_CI_)
-#define _CORBA_DOMAINMANAGER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_DomainManager_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_DomainManager_out::CORBA_DomainManager_out (CORBA_DomainManager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_DomainManager::_nil ();
-}
-
-ACE_INLINE
-CORBA_DomainManager_out::CORBA_DomainManager_out (CORBA_DomainManager_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_DomainManager::_nil ();
-}
-
-ACE_INLINE
-CORBA_DomainManager_out::CORBA_DomainManager_out (const ::CORBA_DomainManager_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_DomainManager_out &, p).ptr_)
-{}
+#if !defined (_CORBA_CONSTRUCTIONPOLICY___CI_)
+#define _CORBA_CONSTRUCTIONPOLICY___CI_
 
-ACE_INLINE ::CORBA_DomainManager_out &
-CORBA_DomainManager_out::operator= (const ::CORBA_DomainManager_out &p)
+ACE_INLINE CORBA_ConstructionPolicy_ptr
+tao_CORBA_ConstructionPolicy_duplicate (
+    CORBA_ConstructionPolicy_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (CORBA_DomainManager_out&, p).ptr_;
-  return *this;
+  return CORBA_ConstructionPolicy::_duplicate (p);
 }
 
-ACE_INLINE CORBA_DomainManager_out &
-CORBA_DomainManager_out::operator= (const ::CORBA_DomainManager_var &p)
+ACE_INLINE void
+tao_CORBA_ConstructionPolicy_release (
+    CORBA_ConstructionPolicy_ptr p
+  )
 {
-  this->ptr_ = ::CORBA_DomainManager::_duplicate (p.ptr ());
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE CORBA_DomainManager_out &
-CORBA_DomainManager_out::operator= (CORBA_DomainManager_ptr p)
+ACE_INLINE CORBA_ConstructionPolicy_ptr
+tao_CORBA_ConstructionPolicy_nil (
+    void
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  return CORBA_ConstructionPolicy::_nil ();
 }
 
-ACE_INLINE
-CORBA_DomainManager_out::operator ::CORBA_DomainManager_ptr &() // cast
+ACE_INLINE CORBA_ConstructionPolicy_ptr
+tao_CORBA_ConstructionPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_ConstructionPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_DomainManager_ptr &
-CORBA_DomainManager_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_DomainManager_ptr
-CORBA_DomainManager_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_ConstructionPolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  CORBA_ConstructionPolicy **tmp =
+    ACE_static_cast (CORBA_ConstructionPolicy **, src);
+  return *tmp;
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___CI_)
-#define _CORBA_CONSTRUCTIONPOLICY___CI_
-
 ACE_INLINE
 CORBA_ConstructionPolicy::CORBA_ConstructionPolicy (
     TAO_Stub *objref,
@@ -221,175 +138,6 @@ CORBA_ConstructionPolicy::CORBA_ConstructionPolicy (
   this->CORBA_ConstructionPolicy_setup_collocation (_tao_collocated);
 }
 
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___VAR_CI_)
-#define _CORBA_CONSTRUCTIONPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ConstructionPolicy_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (void) // default constructor
-  : ptr_ (CORBA_ConstructionPolicy::_nil ())
-{}
-
-ACE_INLINE ::CORBA_ConstructionPolicy_ptr
-CORBA_ConstructionPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (const ::CORBA_ConstructionPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_ConstructionPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_var::~CORBA_ConstructionPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_var &
-CORBA_ConstructionPolicy_var::operator= (CORBA_ConstructionPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_var &
-CORBA_ConstructionPolicy_var::operator= (const ::CORBA_ConstructionPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_ConstructionPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_var::operator const ::CORBA_ConstructionPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_var::operator ::CORBA_ConstructionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ConstructionPolicy_ptr
-CORBA_ConstructionPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ConstructionPolicy_ptr
-CORBA_ConstructionPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ConstructionPolicy_ptr &
-CORBA_ConstructionPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ConstructionPolicy_ptr &
-CORBA_ConstructionPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_ConstructionPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ConstructionPolicy_ptr
-CORBA_ConstructionPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA_ConstructionPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_ConstructionPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONSTRUCTIONPOLICY___OUT_CI_)
-#define _CORBA_CONSTRUCTIONPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ConstructionPolicy_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_ConstructionPolicy::_nil ();
-}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_ConstructionPolicy::_nil ();
-}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (const ::CORBA_ConstructionPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ConstructionPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_ConstructionPolicy_out &
-CORBA_ConstructionPolicy_out::operator= (const ::CORBA_ConstructionPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ConstructionPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_out &
-CORBA_ConstructionPolicy_out::operator= (const ::CORBA_ConstructionPolicy_var &p)
-{
-  this->ptr_ = ::CORBA_ConstructionPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_out &
-CORBA_ConstructionPolicy_out::operator= (CORBA_ConstructionPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_out::operator ::CORBA_ConstructionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ConstructionPolicy_ptr &
-CORBA_ConstructionPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ConstructionPolicy_ptr
-CORBA_ConstructionPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
 
 #endif /* end #if !defined */
 
@@ -407,7 +155,9 @@ CORBA_ConstructionPolicy_out::operator-> (void)
     ACE_NEW_RETURN (buf, CORBA_DomainManager*[nelems], 0);
 
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = CORBA_DomainManager::_nil ();
+      {
+        buf[i] = CORBA_DomainManager::_nil ();
+      }
 
     return buf;
   }
@@ -450,7 +200,9 @@ CORBA_ConstructionPolicy_out::operator-> (void)
       CORBA_DomainManager ** const tmp2 = ACE_reinterpret_cast (CORBA_DomainManager ** ACE_CAST_CONST, rhs.buffer_);
 
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = CORBA_DomainManager::_duplicate (tmp2[i]);
+        {
+          tmp1[i] = CORBA_DomainManager::_duplicate (tmp2[i]);
+        }
 
       this->buffer_ = tmp1;
     }
@@ -490,7 +242,9 @@ CORBA_ConstructionPolicy_out::operator-> (void)
     CORBA_DomainManager ** const tmp2 = ACE_reinterpret_cast (CORBA_DomainManager ** ACE_CAST_CONST, rhs.buffer_);
 
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA_DomainManager::_duplicate (tmp2[i]);
+      {
+        tmp1[i] = CORBA_DomainManager::_duplicate (tmp2[i]);
+      }
 
     return *this;
   }
@@ -761,104 +515,26 @@ CORBA_DomainManagerList_out::operator[] (CORBA::ULong index)
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const CORBA_DomainManager_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     CORBA_DomainManager_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_DomainManager_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA_DomainManager_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA_DomainManager::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
+CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const CORBA_ConstructionPolicy_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     CORBA_ConstructionPolicy_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_ConstructionPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA_ConstructionPolicy_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA_ConstructionPolicy::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
 
 #if !defined _TAO_CDR_OP_CORBA_DomainManagerList_I_
 #define _TAO_CDR_OP_CORBA_DomainManagerList_I_
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index 1cb04611e33..babcc3a3bcd 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -1,4 +1,6 @@
-/* -*- C++ -*- $Id$ */
+// -*- C++ -*-
+//
+// $Id$
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -19,14 +21,201 @@
 
 #include "DynamicAny.h"
 
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#endif /* __BORLANDC__ */
+
 #if !defined (__ACE_INLINE__)
 #include "DynamicAnyC.i"
 #endif /* !defined INLINE */
 
+// *************************************************************
+// Operations for class DynamicAny::DynAny_var
+// *************************************************************
+
+DynamicAny::DynAny_var::DynAny_var (void) // default constructor
+  : ptr_ (DynAny::_nil ())
+{}
+
+::DynamicAny::DynAny_ptr
+DynamicAny::DynAny_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynAny_var::DynAny_var (const ::DynamicAny::DynAny_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (DynAny::_duplicate (p.ptr ()))
+{}
+
+DynamicAny::DynAny_var::~DynAny_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+DynamicAny::DynAny_var &
+DynamicAny::DynAny_var::operator= (DynAny_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynAny_var &
+DynamicAny::DynAny_var::operator= (const ::DynamicAny::DynAny_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::DynamicAny::DynAny::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+DynamicAny::DynAny_var::operator const ::DynamicAny::DynAny_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynAny_var::operator ::DynamicAny::DynAny_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynAny_ptr
+DynamicAny::DynAny_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynAny_ptr
+DynamicAny::DynAny_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynAny_ptr &
+DynamicAny::DynAny_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynAny_ptr &
+DynamicAny::DynAny_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynAny::_nil ();
+  return this->ptr_;
+}
+
+::DynamicAny::DynAny_ptr
+DynamicAny::DynAny_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::DynamicAny::DynAny_ptr val = this->ptr_;
+  this->ptr_ = ::DynamicAny::DynAny::_nil ();
+  return val;
+}
+
+::DynamicAny::DynAny_ptr
+DynamicAny::DynAny_var::duplicate (DynAny_ptr p)
+{
+  return ::DynamicAny::DynAny::_duplicate (p);
+}
+
+void
+DynamicAny::DynAny_var::release (DynAny_ptr p)
+{
+  CORBA::release (p);
+}
+
+::DynamicAny::DynAny_ptr
+DynamicAny::DynAny_var::nil (void)
+{
+  return ::DynamicAny::DynAny::_nil ();
+}
+
+::DynamicAny::DynAny_ptr
+DynamicAny::DynAny_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::DynamicAny::DynAny::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+DynamicAny::DynAny_var::upcast (void *src)
+{
+  DynAny **tmp =
+    ACE_static_cast (DynAny **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class DynamicAny::DynAny_out
+// *************************************************************
+
+DynamicAny::DynAny_out::DynAny_out (DynAny_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::DynamicAny::DynAny::_nil ();
+}
+
+DynamicAny::DynAny_out::DynAny_out (DynAny_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynAny::_nil ();
+}
+
+DynamicAny::DynAny_out::DynAny_out (const ::DynamicAny::DynAny_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (DynAny_out &, p).ptr_)
+{}
+
+::DynamicAny::DynAny_out &
+DynamicAny::DynAny_out::operator= (const ::DynamicAny::DynAny_out &p)
+{
+  this->ptr_ = ACE_const_cast (DynAny_out&, p).ptr_;
+  return *this;
+}
+
+DynamicAny::DynAny_out &
+DynamicAny::DynAny_out::operator= (const ::DynamicAny::DynAny_var &p)
+{
+  this->ptr_ = ::DynamicAny::DynAny::_duplicate (p.ptr ());
+  return *this;
+}
+
+DynamicAny::DynAny_out &
+DynamicAny::DynAny_out::operator= (DynAny_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynAny_out::operator ::DynamicAny::DynAny_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynAny_ptr &
+DynamicAny::DynAny_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynAny_ptr
+DynamicAny::DynAny_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 // default constructor
 DynamicAny::DynAny::DynAny ()
-{}
+{
+  }
 
 // destructor
 DynamicAny::DynAny::~DynAny (void)
@@ -227,10 +416,193 @@ CORBA::Exception *DynamicAny::DynAny::TypeMismatch::_alloc (void)
   return retval;
 }
 
+// *************************************************************
+// Operations for class DynamicAny::DynFixed_var
+// *************************************************************
+
+DynamicAny::DynFixed_var::DynFixed_var (void) // default constructor
+  : ptr_ (DynFixed::_nil ())
+{}
+
+::DynamicAny::DynFixed_ptr
+DynamicAny::DynFixed_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynFixed_var::DynFixed_var (const ::DynamicAny::DynFixed_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (DynFixed::_duplicate (p.ptr ()))
+{}
+
+DynamicAny::DynFixed_var::~DynFixed_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+DynamicAny::DynFixed_var &
+DynamicAny::DynFixed_var::operator= (DynFixed_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynFixed_var &
+DynamicAny::DynFixed_var::operator= (const ::DynamicAny::DynFixed_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::DynamicAny::DynFixed::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+DynamicAny::DynFixed_var::operator const ::DynamicAny::DynFixed_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynFixed_var::operator ::DynamicAny::DynFixed_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynFixed_ptr
+DynamicAny::DynFixed_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynFixed_ptr
+DynamicAny::DynFixed_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynFixed_ptr &
+DynamicAny::DynFixed_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynFixed_ptr &
+DynamicAny::DynFixed_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynFixed::_nil ();
+  return this->ptr_;
+}
+
+::DynamicAny::DynFixed_ptr
+DynamicAny::DynFixed_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::DynamicAny::DynFixed_ptr val = this->ptr_;
+  this->ptr_ = ::DynamicAny::DynFixed::_nil ();
+  return val;
+}
+
+::DynamicAny::DynFixed_ptr
+DynamicAny::DynFixed_var::duplicate (DynFixed_ptr p)
+{
+  return ::DynamicAny::DynFixed::_duplicate (p);
+}
+
+void
+DynamicAny::DynFixed_var::release (DynFixed_ptr p)
+{
+  CORBA::release (p);
+}
+
+::DynamicAny::DynFixed_ptr
+DynamicAny::DynFixed_var::nil (void)
+{
+  return ::DynamicAny::DynFixed::_nil ();
+}
+
+::DynamicAny::DynFixed_ptr
+DynamicAny::DynFixed_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::DynamicAny::DynFixed::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+DynamicAny::DynFixed_var::upcast (void *src)
+{
+  DynFixed **tmp =
+    ACE_static_cast (DynFixed **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class DynamicAny::DynFixed_out
+// *************************************************************
+
+DynamicAny::DynFixed_out::DynFixed_out (DynFixed_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::DynamicAny::DynFixed::_nil ();
+}
+
+DynamicAny::DynFixed_out::DynFixed_out (DynFixed_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynFixed::_nil ();
+}
+
+DynamicAny::DynFixed_out::DynFixed_out (const ::DynamicAny::DynFixed_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (DynFixed_out &, p).ptr_)
+{}
+
+::DynamicAny::DynFixed_out &
+DynamicAny::DynFixed_out::operator= (const ::DynamicAny::DynFixed_out &p)
+{
+  this->ptr_ = ACE_const_cast (DynFixed_out&, p).ptr_;
+  return *this;
+}
+
+DynamicAny::DynFixed_out &
+DynamicAny::DynFixed_out::operator= (const ::DynamicAny::DynFixed_var &p)
+{
+  this->ptr_ = ::DynamicAny::DynFixed::_duplicate (p.ptr ());
+  return *this;
+}
+
+DynamicAny::DynFixed_out &
+DynamicAny::DynFixed_out::operator= (DynFixed_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynFixed_out::operator ::DynamicAny::DynFixed_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynFixed_ptr &
+DynamicAny::DynFixed_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynFixed_ptr
+DynamicAny::DynFixed_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 // default constructor
 DynamicAny::DynFixed::DynFixed ()
-{}
+{
+  }
 
 // destructor
 DynamicAny::DynFixed::~DynFixed (void)
@@ -307,10 +679,193 @@ const char* DynamicAny::DynFixed::_interface_repository_id (void) const
   return "IDL:DynamicAny/DynFixed:1.0";
 }
 
+// *************************************************************
+// Operations for class DynamicAny::DynEnum_var
+// *************************************************************
+
+DynamicAny::DynEnum_var::DynEnum_var (void) // default constructor
+  : ptr_ (DynEnum::_nil ())
+{}
+
+::DynamicAny::DynEnum_ptr
+DynamicAny::DynEnum_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynEnum_var::DynEnum_var (const ::DynamicAny::DynEnum_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (DynEnum::_duplicate (p.ptr ()))
+{}
+
+DynamicAny::DynEnum_var::~DynEnum_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+DynamicAny::DynEnum_var &
+DynamicAny::DynEnum_var::operator= (DynEnum_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynEnum_var &
+DynamicAny::DynEnum_var::operator= (const ::DynamicAny::DynEnum_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::DynamicAny::DynEnum::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+DynamicAny::DynEnum_var::operator const ::DynamicAny::DynEnum_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynEnum_var::operator ::DynamicAny::DynEnum_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynEnum_ptr
+DynamicAny::DynEnum_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynEnum_ptr
+DynamicAny::DynEnum_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynEnum_ptr &
+DynamicAny::DynEnum_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynEnum_ptr &
+DynamicAny::DynEnum_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynEnum::_nil ();
+  return this->ptr_;
+}
+
+::DynamicAny::DynEnum_ptr
+DynamicAny::DynEnum_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::DynamicAny::DynEnum_ptr val = this->ptr_;
+  this->ptr_ = ::DynamicAny::DynEnum::_nil ();
+  return val;
+}
+
+::DynamicAny::DynEnum_ptr
+DynamicAny::DynEnum_var::duplicate (DynEnum_ptr p)
+{
+  return ::DynamicAny::DynEnum::_duplicate (p);
+}
+
+void
+DynamicAny::DynEnum_var::release (DynEnum_ptr p)
+{
+  CORBA::release (p);
+}
+
+::DynamicAny::DynEnum_ptr
+DynamicAny::DynEnum_var::nil (void)
+{
+  return ::DynamicAny::DynEnum::_nil ();
+}
+
+::DynamicAny::DynEnum_ptr
+DynamicAny::DynEnum_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::DynamicAny::DynEnum::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+DynamicAny::DynEnum_var::upcast (void *src)
+{
+  DynEnum **tmp =
+    ACE_static_cast (DynEnum **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class DynamicAny::DynEnum_out
+// *************************************************************
+
+DynamicAny::DynEnum_out::DynEnum_out (DynEnum_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::DynamicAny::DynEnum::_nil ();
+}
+
+DynamicAny::DynEnum_out::DynEnum_out (DynEnum_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynEnum::_nil ();
+}
+
+DynamicAny::DynEnum_out::DynEnum_out (const ::DynamicAny::DynEnum_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (DynEnum_out &, p).ptr_)
+{}
+
+::DynamicAny::DynEnum_out &
+DynamicAny::DynEnum_out::operator= (const ::DynamicAny::DynEnum_out &p)
+{
+  this->ptr_ = ACE_const_cast (DynEnum_out&, p).ptr_;
+  return *this;
+}
+
+DynamicAny::DynEnum_out &
+DynamicAny::DynEnum_out::operator= (const ::DynamicAny::DynEnum_var &p)
+{
+  this->ptr_ = ::DynamicAny::DynEnum::_duplicate (p.ptr ());
+  return *this;
+}
+
+DynamicAny::DynEnum_out &
+DynamicAny::DynEnum_out::operator= (DynEnum_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynEnum_out::operator ::DynamicAny::DynEnum_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynEnum_ptr &
+DynamicAny::DynEnum_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynEnum_ptr
+DynamicAny::DynEnum_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 // default constructor
 DynamicAny::DynEnum::DynEnum ()
-{}
+{
+  }
 
 // destructor
 DynamicAny::DynEnum::~DynEnum (void)
@@ -390,40 +945,96 @@ const char* DynamicAny::DynEnum::_interface_repository_id (void) const
 static const CORBA::Long _oc_DynamicAny_FieldName[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d696341), ACE_NTOHL (0x6e792f46), ACE_NTOHL (0x69656c64), ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:DynamicAny/FieldName:1.0
-  10, ACE_NTOHL (0x4669656c), ACE_NTOHL (0x644e616d), ACE_NTOHL (0x65000000),  // name = FieldName
+  29,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x44796e61), 
+  ACE_NTOHL (0x6d696341), 
+  ACE_NTOHL (0x6e792f46), 
+  ACE_NTOHL (0x69656c64), 
+  ACE_NTOHL (0x4e616d65), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:DynamicAny/FieldName:1.0
+  10,
+  ACE_NTOHL (0x4669656c), 
+  ACE_NTOHL (0x644e616d), 
+  ACE_NTOHL (0x65000000),  // name = FieldName
   CORBA::tk_string, 
   0U, // string length
 };
-static CORBA::TypeCode _tc_TAO_tc_DynamicAny_FieldName (CORBA::tk_alias, sizeof (_oc_DynamicAny_FieldName), (char *) &_oc_DynamicAny_FieldName, 0, sizeof (DynamicAny::FieldName));
+
+static CORBA::TypeCode _tc_TAO_tc_DynamicAny_FieldName (
+    CORBA::tk_alias,
+    sizeof (_oc_DynamicAny_FieldName),
+    (char *) &_oc_DynamicAny_FieldName,
+    0,
+    sizeof (DynamicAny::FieldName)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (DynamicAny)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FieldName, &_tc_TAO_tc_DynamicAny_FieldName)
 TAO_NAMESPACE_END
+
 static const CORBA::Long _oc_DynamicAny_NameValuePair[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d696341), ACE_NTOHL (0x6e792f4e), ACE_NTOHL (0x616d6556), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x50616972), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:DynamicAny/NameValuePair:1.0
-  14, ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65506169), ACE_NTOHL (0x72000000),  // name = NameValuePair
+  33,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x44796e61), 
+  ACE_NTOHL (0x6d696341), 
+  ACE_NTOHL (0x6e792f4e), 
+  ACE_NTOHL (0x616d6556), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x50616972), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:DynamicAny/NameValuePair:1.0
+  14,
+  ACE_NTOHL (0x4e616d65), 
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x65506169), 
+  ACE_NTOHL (0x72000000),  // name = NameValuePair
   2, // member count
-  3, ACE_NTOHL (0x69640000),  // name = id
+  3,
+  ACE_NTOHL (0x69640000),  // name = id
   CORBA::tk_alias, // typecode kind for typedefs
   64, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d696341), ACE_NTOHL (0x6e792f46), ACE_NTOHL (0x69656c64), ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:DynamicAny/FieldName:1.0
-    10, ACE_NTOHL (0x4669656c), ACE_NTOHL (0x644e616d), ACE_NTOHL (0x65000000),  // name = FieldName
+    29,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x44796e61), 
+    ACE_NTOHL (0x6d696341), 
+    ACE_NTOHL (0x6e792f46), 
+    ACE_NTOHL (0x69656c64), 
+    ACE_NTOHL (0x4e616d65), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:DynamicAny/FieldName:1.0
+    10,
+    ACE_NTOHL (0x4669656c), 
+    ACE_NTOHL (0x644e616d), 
+    ACE_NTOHL (0x65000000),  // name = FieldName
     CORBA::tk_string, 
     0U, // string length
 
-  6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000),  // name = value
+  6,
+  ACE_NTOHL (0x76616c75), 
+  ACE_NTOHL (0x65000000),  // name = value
   CORBA::tk_any,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_DynamicAny_NameValuePair (CORBA::tk_struct, sizeof (_oc_DynamicAny_NameValuePair), (char *) &_oc_DynamicAny_NameValuePair, 0, sizeof (DynamicAny::NameValuePair));
+
+static CORBA::TypeCode _tc_TAO_tc_DynamicAny_NameValuePair (
+    CORBA::tk_struct,
+    sizeof (_oc_DynamicAny_NameValuePair),
+    (char *) &_oc_DynamicAny_NameValuePair,
+    0,
+    sizeof (DynamicAny::NameValuePair)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (DynamicAny)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NameValuePair, &_tc_TAO_tc_DynamicAny_NameValuePair)
 TAO_NAMESPACE_END
+
 void DynamicAny::NameValuePair::_tao_any_destructor (void *x)
 {
   NameValuePair *tmp = ACE_static_cast (NameValuePair*,x);
@@ -529,39 +1140,89 @@ void DynamicAny::NameValuePairSeq::_tao_any_destructor (void *x)
 static const CORBA::Long _oc_DynamicAny_NameValuePairSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d696341), ACE_NTOHL (0x6e792f4e), ACE_NTOHL (0x616d6556), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x50616972), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:DynamicAny/NameValuePairSeq:1.0
-  17, ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65506169), ACE_NTOHL (0x72536571), ACE_NTOHL (0x0),  // name = NameValuePairSeq
+  36,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x44796e61), 
+  ACE_NTOHL (0x6d696341), 
+  ACE_NTOHL (0x6e792f4e), 
+  ACE_NTOHL (0x616d6556), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x50616972), 
+  ACE_NTOHL (0x5365713a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:DynamicAny/NameValuePairSeq:1.0
+  17,
+  ACE_NTOHL (0x4e616d65), 
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x65506169), 
+  ACE_NTOHL (0x72536571), 
+  ACE_NTOHL (0x0),  // name = NameValuePairSeq
   CORBA::tk_sequence, // typecode kind
   180, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     164, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d696341), ACE_NTOHL (0x6e792f4e), ACE_NTOHL (0x616d6556), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x50616972), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:DynamicAny/NameValuePair:1.0
-      14, ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65506169), ACE_NTOHL (0x72000000),  // name = NameValuePair
+      33,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x44796e61), 
+      ACE_NTOHL (0x6d696341), 
+      ACE_NTOHL (0x6e792f4e), 
+      ACE_NTOHL (0x616d6556), 
+      ACE_NTOHL (0x616c7565), 
+      ACE_NTOHL (0x50616972), 
+      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x0),  // repository ID = IDL:DynamicAny/NameValuePair:1.0
+      14,
+      ACE_NTOHL (0x4e616d65), 
+      ACE_NTOHL (0x56616c75), 
+      ACE_NTOHL (0x65506169), 
+      ACE_NTOHL (0x72000000),  // name = NameValuePair
       2, // member count
-      3, ACE_NTOHL (0x69640000),  // name = id
+      3,
+      ACE_NTOHL (0x69640000),  // name = id
       CORBA::tk_alias, // typecode kind for typedefs
       64, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d696341), ACE_NTOHL (0x6e792f46), ACE_NTOHL (0x69656c64), ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:DynamicAny/FieldName:1.0
-        10, ACE_NTOHL (0x4669656c), ACE_NTOHL (0x644e616d), ACE_NTOHL (0x65000000),  // name = FieldName
+        29,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x44796e61), 
+        ACE_NTOHL (0x6d696341), 
+        ACE_NTOHL (0x6e792f46), 
+        ACE_NTOHL (0x69656c64), 
+        ACE_NTOHL (0x4e616d65), 
+        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x0),  // repository ID = IDL:DynamicAny/FieldName:1.0
+        10,
+        ACE_NTOHL (0x4669656c), 
+        ACE_NTOHL (0x644e616d), 
+        ACE_NTOHL (0x65000000),  // name = FieldName
         CORBA::tk_string, 
         0U, // string length
 
-      6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000),  // name = value
+      6,
+      ACE_NTOHL (0x76616c75), 
+      ACE_NTOHL (0x65000000),  // name = value
       CORBA::tk_any,
 
 
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_DynamicAny_NameValuePairSeq (CORBA::tk_alias, sizeof (_oc_DynamicAny_NameValuePairSeq), (char *) &_oc_DynamicAny_NameValuePairSeq, 0, sizeof (DynamicAny::NameValuePairSeq));
+
+static CORBA::TypeCode _tc_TAO_tc_DynamicAny_NameValuePairSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_DynamicAny_NameValuePairSeq),
+    (char *) &_oc_DynamicAny_NameValuePairSeq,
+    0,
+    sizeof (DynamicAny::NameValuePairSeq)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (DynamicAny)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NameValuePairSeq, &_tc_TAO_tc_DynamicAny_NameValuePairSeq)
 TAO_NAMESPACE_END
 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_DYNAMICANY_NAMEDYNANYPAIRSEQ_CS_)
@@ -657,10 +1318,193 @@ void DynamicAny::NameDynAnyPairSeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
+// *************************************************************
+// Operations for class DynamicAny::DynStruct_var
+// *************************************************************
+
+DynamicAny::DynStruct_var::DynStruct_var (void) // default constructor
+  : ptr_ (DynStruct::_nil ())
+{}
+
+::DynamicAny::DynStruct_ptr
+DynamicAny::DynStruct_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynStruct_var::DynStruct_var (const ::DynamicAny::DynStruct_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (DynStruct::_duplicate (p.ptr ()))
+{}
+
+DynamicAny::DynStruct_var::~DynStruct_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+DynamicAny::DynStruct_var &
+DynamicAny::DynStruct_var::operator= (DynStruct_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynStruct_var &
+DynamicAny::DynStruct_var::operator= (const ::DynamicAny::DynStruct_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::DynamicAny::DynStruct::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+DynamicAny::DynStruct_var::operator const ::DynamicAny::DynStruct_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynStruct_var::operator ::DynamicAny::DynStruct_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynStruct_ptr
+DynamicAny::DynStruct_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynStruct_ptr
+DynamicAny::DynStruct_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynStruct_ptr &
+DynamicAny::DynStruct_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynStruct_ptr &
+DynamicAny::DynStruct_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynStruct::_nil ();
+  return this->ptr_;
+}
+
+::DynamicAny::DynStruct_ptr
+DynamicAny::DynStruct_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::DynamicAny::DynStruct_ptr val = this->ptr_;
+  this->ptr_ = ::DynamicAny::DynStruct::_nil ();
+  return val;
+}
+
+::DynamicAny::DynStruct_ptr
+DynamicAny::DynStruct_var::duplicate (DynStruct_ptr p)
+{
+  return ::DynamicAny::DynStruct::_duplicate (p);
+}
+
+void
+DynamicAny::DynStruct_var::release (DynStruct_ptr p)
+{
+  CORBA::release (p);
+}
+
+::DynamicAny::DynStruct_ptr
+DynamicAny::DynStruct_var::nil (void)
+{
+  return ::DynamicAny::DynStruct::_nil ();
+}
+
+::DynamicAny::DynStruct_ptr
+DynamicAny::DynStruct_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::DynamicAny::DynStruct::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+DynamicAny::DynStruct_var::upcast (void *src)
+{
+  DynStruct **tmp =
+    ACE_static_cast (DynStruct **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class DynamicAny::DynStruct_out
+// *************************************************************
+
+DynamicAny::DynStruct_out::DynStruct_out (DynStruct_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::DynamicAny::DynStruct::_nil ();
+}
+
+DynamicAny::DynStruct_out::DynStruct_out (DynStruct_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynStruct::_nil ();
+}
+
+DynamicAny::DynStruct_out::DynStruct_out (const ::DynamicAny::DynStruct_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (DynStruct_out &, p).ptr_)
+{}
+
+::DynamicAny::DynStruct_out &
+DynamicAny::DynStruct_out::operator= (const ::DynamicAny::DynStruct_out &p)
+{
+  this->ptr_ = ACE_const_cast (DynStruct_out&, p).ptr_;
+  return *this;
+}
+
+DynamicAny::DynStruct_out &
+DynamicAny::DynStruct_out::operator= (const ::DynamicAny::DynStruct_var &p)
+{
+  this->ptr_ = ::DynamicAny::DynStruct::_duplicate (p.ptr ());
+  return *this;
+}
+
+DynamicAny::DynStruct_out &
+DynamicAny::DynStruct_out::operator= (DynStruct_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynStruct_out::operator ::DynamicAny::DynStruct_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynStruct_ptr &
+DynamicAny::DynStruct_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynStruct_ptr
+DynamicAny::DynStruct_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 // default constructor
 DynamicAny::DynStruct::DynStruct ()
-{}
+{
+  }
 
 // destructor
 DynamicAny::DynStruct::~DynStruct (void)
@@ -737,10 +1581,193 @@ const char* DynamicAny::DynStruct::_interface_repository_id (void) const
   return "IDL:DynamicAny/DynStruct:1.0";
 }
 
+// *************************************************************
+// Operations for class DynamicAny::DynUnion_var
+// *************************************************************
+
+DynamicAny::DynUnion_var::DynUnion_var (void) // default constructor
+  : ptr_ (DynUnion::_nil ())
+{}
+
+::DynamicAny::DynUnion_ptr
+DynamicAny::DynUnion_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynUnion_var::DynUnion_var (const ::DynamicAny::DynUnion_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (DynUnion::_duplicate (p.ptr ()))
+{}
+
+DynamicAny::DynUnion_var::~DynUnion_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+DynamicAny::DynUnion_var &
+DynamicAny::DynUnion_var::operator= (DynUnion_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynUnion_var &
+DynamicAny::DynUnion_var::operator= (const ::DynamicAny::DynUnion_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::DynamicAny::DynUnion::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+DynamicAny::DynUnion_var::operator const ::DynamicAny::DynUnion_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynUnion_var::operator ::DynamicAny::DynUnion_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynUnion_ptr
+DynamicAny::DynUnion_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynUnion_ptr
+DynamicAny::DynUnion_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynUnion_ptr &
+DynamicAny::DynUnion_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynUnion_ptr &
+DynamicAny::DynUnion_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynUnion::_nil ();
+  return this->ptr_;
+}
+
+::DynamicAny::DynUnion_ptr
+DynamicAny::DynUnion_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::DynamicAny::DynUnion_ptr val = this->ptr_;
+  this->ptr_ = ::DynamicAny::DynUnion::_nil ();
+  return val;
+}
+
+::DynamicAny::DynUnion_ptr
+DynamicAny::DynUnion_var::duplicate (DynUnion_ptr p)
+{
+  return ::DynamicAny::DynUnion::_duplicate (p);
+}
+
+void
+DynamicAny::DynUnion_var::release (DynUnion_ptr p)
+{
+  CORBA::release (p);
+}
+
+::DynamicAny::DynUnion_ptr
+DynamicAny::DynUnion_var::nil (void)
+{
+  return ::DynamicAny::DynUnion::_nil ();
+}
+
+::DynamicAny::DynUnion_ptr
+DynamicAny::DynUnion_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::DynamicAny::DynUnion::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+DynamicAny::DynUnion_var::upcast (void *src)
+{
+  DynUnion **tmp =
+    ACE_static_cast (DynUnion **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class DynamicAny::DynUnion_out
+// *************************************************************
+
+DynamicAny::DynUnion_out::DynUnion_out (DynUnion_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::DynamicAny::DynUnion::_nil ();
+}
+
+DynamicAny::DynUnion_out::DynUnion_out (DynUnion_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynUnion::_nil ();
+}
+
+DynamicAny::DynUnion_out::DynUnion_out (const ::DynamicAny::DynUnion_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (DynUnion_out &, p).ptr_)
+{}
+
+::DynamicAny::DynUnion_out &
+DynamicAny::DynUnion_out::operator= (const ::DynamicAny::DynUnion_out &p)
+{
+  this->ptr_ = ACE_const_cast (DynUnion_out&, p).ptr_;
+  return *this;
+}
+
+DynamicAny::DynUnion_out &
+DynamicAny::DynUnion_out::operator= (const ::DynamicAny::DynUnion_var &p)
+{
+  this->ptr_ = ::DynamicAny::DynUnion::_duplicate (p.ptr ());
+  return *this;
+}
+
+DynamicAny::DynUnion_out &
+DynamicAny::DynUnion_out::operator= (DynUnion_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynUnion_out::operator ::DynamicAny::DynUnion_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynUnion_ptr &
+DynamicAny::DynUnion_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynUnion_ptr
+DynamicAny::DynUnion_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 // default constructor
 DynamicAny::DynUnion::DynUnion ()
-{}
+{
+  }
 
 // destructor
 DynamicAny::DynUnion::~DynUnion (void)
@@ -916,8 +1943,17 @@ void DynamicAny::AnySeq::_tao_any_destructor (void *x)
 static const CORBA::Long _oc_DynamicAny_AnySeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  26, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x44796e61), ACE_NTOHL (0x6d696341), ACE_NTOHL (0x6e792f41), ACE_NTOHL (0x6e795365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:DynamicAny/AnySeq:1.0
-  7, ACE_NTOHL (0x416e7953), ACE_NTOHL (0x65710000),  // name = AnySeq
+  26,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x44796e61), 
+  ACE_NTOHL (0x6d696341), 
+  ACE_NTOHL (0x6e792f41), 
+  ACE_NTOHL (0x6e795365), 
+  ACE_NTOHL (0x713a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:DynamicAny/AnySeq:1.0
+  7,
+  ACE_NTOHL (0x416e7953), 
+  ACE_NTOHL (0x65710000),  // name = AnySeq
   CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
@@ -926,12 +1962,21 @@ static const CORBA::Long _oc_DynamicAny_AnySeq[] =
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_DynamicAny_AnySeq (CORBA::tk_alias, sizeof (_oc_DynamicAny_AnySeq), (char *) &_oc_DynamicAny_AnySeq, 0, sizeof (DynamicAny::AnySeq));
+
+static CORBA::TypeCode _tc_TAO_tc_DynamicAny_AnySeq (
+    CORBA::tk_alias,
+    sizeof (_oc_DynamicAny_AnySeq),
+    (char *) &_oc_DynamicAny_AnySeq,
+    0,
+    sizeof (DynamicAny::AnySeq)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (DynamicAny)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AnySeq, &_tc_TAO_tc_DynamicAny_AnySeq)
 TAO_NAMESPACE_END
 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_DYNAMICANY_DYNANYSEQ_CS_)
@@ -948,14 +1993,21 @@ TAO_NAMESPACE_END
     {
       DynamicAny::DynAny **old = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = DynamicAny::DynAny::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
+        {
+          if (!this->release_)
+            {
+              tmp[i] = DynamicAny::DynAny::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
       
+      if (this->release_)
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
@@ -966,11 +2018,13 @@ TAO_NAMESPACE_END
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = DynamicAny::DynAny::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = DynamicAny::DynAny::_nil ();
+      }
+    
     _TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::freebuf (tmp);
     this->buffer_ = 0;
   }
@@ -986,11 +2040,12 @@ TAO_NAMESPACE_END
     DynamicAny::DynAny **tmp = ACE_reinterpret_cast (DynamicAny::DynAny**, this->buffer_);
     
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = DynamicAny::DynAny::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = DynamicAny::DynAny::_nil ();
+      }
   }
+  
   void 
   DynamicAny::_TAO_Unbounded_Object_Sequence_DynamicAny_DynAnySeq::_downcast (
       void* target,
@@ -1062,10 +2117,193 @@ void DynamicAny::DynAnySeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
+// *************************************************************
+// Operations for class DynamicAny::DynSequence_var
+// *************************************************************
+
+DynamicAny::DynSequence_var::DynSequence_var (void) // default constructor
+  : ptr_ (DynSequence::_nil ())
+{}
+
+::DynamicAny::DynSequence_ptr
+DynamicAny::DynSequence_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynSequence_var::DynSequence_var (const ::DynamicAny::DynSequence_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (DynSequence::_duplicate (p.ptr ()))
+{}
+
+DynamicAny::DynSequence_var::~DynSequence_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+DynamicAny::DynSequence_var &
+DynamicAny::DynSequence_var::operator= (DynSequence_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynSequence_var &
+DynamicAny::DynSequence_var::operator= (const ::DynamicAny::DynSequence_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::DynamicAny::DynSequence::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+DynamicAny::DynSequence_var::operator const ::DynamicAny::DynSequence_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynSequence_var::operator ::DynamicAny::DynSequence_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynSequence_ptr
+DynamicAny::DynSequence_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynSequence_ptr
+DynamicAny::DynSequence_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynSequence_ptr &
+DynamicAny::DynSequence_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynSequence_ptr &
+DynamicAny::DynSequence_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynSequence::_nil ();
+  return this->ptr_;
+}
+
+::DynamicAny::DynSequence_ptr
+DynamicAny::DynSequence_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::DynamicAny::DynSequence_ptr val = this->ptr_;
+  this->ptr_ = ::DynamicAny::DynSequence::_nil ();
+  return val;
+}
+
+::DynamicAny::DynSequence_ptr
+DynamicAny::DynSequence_var::duplicate (DynSequence_ptr p)
+{
+  return ::DynamicAny::DynSequence::_duplicate (p);
+}
+
+void
+DynamicAny::DynSequence_var::release (DynSequence_ptr p)
+{
+  CORBA::release (p);
+}
+
+::DynamicAny::DynSequence_ptr
+DynamicAny::DynSequence_var::nil (void)
+{
+  return ::DynamicAny::DynSequence::_nil ();
+}
+
+::DynamicAny::DynSequence_ptr
+DynamicAny::DynSequence_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::DynamicAny::DynSequence::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+DynamicAny::DynSequence_var::upcast (void *src)
+{
+  DynSequence **tmp =
+    ACE_static_cast (DynSequence **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class DynamicAny::DynSequence_out
+// *************************************************************
+
+DynamicAny::DynSequence_out::DynSequence_out (DynSequence_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::DynamicAny::DynSequence::_nil ();
+}
+
+DynamicAny::DynSequence_out::DynSequence_out (DynSequence_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynSequence::_nil ();
+}
+
+DynamicAny::DynSequence_out::DynSequence_out (const ::DynamicAny::DynSequence_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (DynSequence_out &, p).ptr_)
+{}
+
+::DynamicAny::DynSequence_out &
+DynamicAny::DynSequence_out::operator= (const ::DynamicAny::DynSequence_out &p)
+{
+  this->ptr_ = ACE_const_cast (DynSequence_out&, p).ptr_;
+  return *this;
+}
+
+DynamicAny::DynSequence_out &
+DynamicAny::DynSequence_out::operator= (const ::DynamicAny::DynSequence_var &p)
+{
+  this->ptr_ = ::DynamicAny::DynSequence::_duplicate (p.ptr ());
+  return *this;
+}
+
+DynamicAny::DynSequence_out &
+DynamicAny::DynSequence_out::operator= (DynSequence_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynSequence_out::operator ::DynamicAny::DynSequence_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynSequence_ptr &
+DynamicAny::DynSequence_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynSequence_ptr
+DynamicAny::DynSequence_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 // default constructor
 DynamicAny::DynSequence::DynSequence ()
-{}
+{
+  }
 
 // destructor
 DynamicAny::DynSequence::~DynSequence (void)
@@ -1142,10 +2380,193 @@ const char* DynamicAny::DynSequence::_interface_repository_id (void) const
   return "IDL:DynamicAny/DynSequence:1.0";
 }
 
+// *************************************************************
+// Operations for class DynamicAny::DynArray_var
+// *************************************************************
+
+DynamicAny::DynArray_var::DynArray_var (void) // default constructor
+  : ptr_ (DynArray::_nil ())
+{}
+
+::DynamicAny::DynArray_ptr
+DynamicAny::DynArray_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynArray_var::DynArray_var (const ::DynamicAny::DynArray_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (DynArray::_duplicate (p.ptr ()))
+{}
+
+DynamicAny::DynArray_var::~DynArray_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+DynamicAny::DynArray_var &
+DynamicAny::DynArray_var::operator= (DynArray_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynArray_var &
+DynamicAny::DynArray_var::operator= (const ::DynamicAny::DynArray_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::DynamicAny::DynArray::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+DynamicAny::DynArray_var::operator const ::DynamicAny::DynArray_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynArray_var::operator ::DynamicAny::DynArray_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynArray_ptr
+DynamicAny::DynArray_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynArray_ptr
+DynamicAny::DynArray_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynArray_ptr &
+DynamicAny::DynArray_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynArray_ptr &
+DynamicAny::DynArray_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynArray::_nil ();
+  return this->ptr_;
+}
+
+::DynamicAny::DynArray_ptr
+DynamicAny::DynArray_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::DynamicAny::DynArray_ptr val = this->ptr_;
+  this->ptr_ = ::DynamicAny::DynArray::_nil ();
+  return val;
+}
+
+::DynamicAny::DynArray_ptr
+DynamicAny::DynArray_var::duplicate (DynArray_ptr p)
+{
+  return ::DynamicAny::DynArray::_duplicate (p);
+}
+
+void
+DynamicAny::DynArray_var::release (DynArray_ptr p)
+{
+  CORBA::release (p);
+}
+
+::DynamicAny::DynArray_ptr
+DynamicAny::DynArray_var::nil (void)
+{
+  return ::DynamicAny::DynArray::_nil ();
+}
+
+::DynamicAny::DynArray_ptr
+DynamicAny::DynArray_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::DynamicAny::DynArray::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+DynamicAny::DynArray_var::upcast (void *src)
+{
+  DynArray **tmp =
+    ACE_static_cast (DynArray **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class DynamicAny::DynArray_out
+// *************************************************************
+
+DynamicAny::DynArray_out::DynArray_out (DynArray_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::DynamicAny::DynArray::_nil ();
+}
+
+DynamicAny::DynArray_out::DynArray_out (DynArray_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynArray::_nil ();
+}
+
+DynamicAny::DynArray_out::DynArray_out (const ::DynamicAny::DynArray_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (DynArray_out &, p).ptr_)
+{}
+
+::DynamicAny::DynArray_out &
+DynamicAny::DynArray_out::operator= (const ::DynamicAny::DynArray_out &p)
+{
+  this->ptr_ = ACE_const_cast (DynArray_out&, p).ptr_;
+  return *this;
+}
+
+DynamicAny::DynArray_out &
+DynamicAny::DynArray_out::operator= (const ::DynamicAny::DynArray_var &p)
+{
+  this->ptr_ = ::DynamicAny::DynArray::_duplicate (p.ptr ());
+  return *this;
+}
+
+DynamicAny::DynArray_out &
+DynamicAny::DynArray_out::operator= (DynArray_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynArray_out::operator ::DynamicAny::DynArray_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynArray_ptr &
+DynamicAny::DynArray_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynArray_ptr
+DynamicAny::DynArray_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 // default constructor
 DynamicAny::DynArray::DynArray ()
-{}
+{
+  }
 
 // destructor
 DynamicAny::DynArray::~DynArray (void)
@@ -1222,10 +2643,193 @@ const char* DynamicAny::DynArray::_interface_repository_id (void) const
   return "IDL:DynamicAny/DynArray:1.0";
 }
 
+// *************************************************************
+// Operations for class DynamicAny::DynValue_var
+// *************************************************************
+
+DynamicAny::DynValue_var::DynValue_var (void) // default constructor
+  : ptr_ (DynValue::_nil ())
+{}
+
+::DynamicAny::DynValue_ptr
+DynamicAny::DynValue_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynValue_var::DynValue_var (const ::DynamicAny::DynValue_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (DynValue::_duplicate (p.ptr ()))
+{}
+
+DynamicAny::DynValue_var::~DynValue_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+DynamicAny::DynValue_var &
+DynamicAny::DynValue_var::operator= (DynValue_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynValue_var &
+DynamicAny::DynValue_var::operator= (const ::DynamicAny::DynValue_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::DynamicAny::DynValue::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+DynamicAny::DynValue_var::operator const ::DynamicAny::DynValue_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynValue_var::operator ::DynamicAny::DynValue_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynValue_ptr
+DynamicAny::DynValue_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynValue_ptr
+DynamicAny::DynValue_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynValue_ptr &
+DynamicAny::DynValue_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynValue_ptr &
+DynamicAny::DynValue_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynValue::_nil ();
+  return this->ptr_;
+}
+
+::DynamicAny::DynValue_ptr
+DynamicAny::DynValue_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::DynamicAny::DynValue_ptr val = this->ptr_;
+  this->ptr_ = ::DynamicAny::DynValue::_nil ();
+  return val;
+}
+
+::DynamicAny::DynValue_ptr
+DynamicAny::DynValue_var::duplicate (DynValue_ptr p)
+{
+  return ::DynamicAny::DynValue::_duplicate (p);
+}
+
+void
+DynamicAny::DynValue_var::release (DynValue_ptr p)
+{
+  CORBA::release (p);
+}
+
+::DynamicAny::DynValue_ptr
+DynamicAny::DynValue_var::nil (void)
+{
+  return ::DynamicAny::DynValue::_nil ();
+}
+
+::DynamicAny::DynValue_ptr
+DynamicAny::DynValue_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::DynamicAny::DynValue::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+DynamicAny::DynValue_var::upcast (void *src)
+{
+  DynValue **tmp =
+    ACE_static_cast (DynValue **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class DynamicAny::DynValue_out
+// *************************************************************
+
+DynamicAny::DynValue_out::DynValue_out (DynValue_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::DynamicAny::DynValue::_nil ();
+}
+
+DynamicAny::DynValue_out::DynValue_out (DynValue_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynValue::_nil ();
+}
+
+DynamicAny::DynValue_out::DynValue_out (const ::DynamicAny::DynValue_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (DynValue_out &, p).ptr_)
+{}
+
+::DynamicAny::DynValue_out &
+DynamicAny::DynValue_out::operator= (const ::DynamicAny::DynValue_out &p)
+{
+  this->ptr_ = ACE_const_cast (DynValue_out&, p).ptr_;
+  return *this;
+}
+
+DynamicAny::DynValue_out &
+DynamicAny::DynValue_out::operator= (const ::DynamicAny::DynValue_var &p)
+{
+  this->ptr_ = ::DynamicAny::DynValue::_duplicate (p.ptr ());
+  return *this;
+}
+
+DynamicAny::DynValue_out &
+DynamicAny::DynValue_out::operator= (DynValue_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynValue_out::operator ::DynamicAny::DynValue_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynValue_ptr &
+DynamicAny::DynValue_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynValue_ptr
+DynamicAny::DynValue_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 // default constructor
 DynamicAny::DynValue::DynValue ()
-{}
+{
+  }
 
 // destructor
 DynamicAny::DynValue::~DynValue (void)
@@ -1302,10 +2906,193 @@ const char* DynamicAny::DynValue::_interface_repository_id (void) const
   return "IDL:DynamicAny/DynValue:1.0";
 }
 
+// *************************************************************
+// Operations for class DynamicAny::DynAnyFactory_var
+// *************************************************************
+
+DynamicAny::DynAnyFactory_var::DynAnyFactory_var (void) // default constructor
+  : ptr_ (DynAnyFactory::_nil ())
+{}
+
+::DynamicAny::DynAnyFactory_ptr
+DynamicAny::DynAnyFactory_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynAnyFactory_var::DynAnyFactory_var (const ::DynamicAny::DynAnyFactory_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (DynAnyFactory::_duplicate (p.ptr ()))
+{}
+
+DynamicAny::DynAnyFactory_var::~DynAnyFactory_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+DynamicAny::DynAnyFactory_var &
+DynamicAny::DynAnyFactory_var::operator= (DynAnyFactory_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynAnyFactory_var &
+DynamicAny::DynAnyFactory_var::operator= (const ::DynamicAny::DynAnyFactory_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::DynamicAny::DynAnyFactory::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+DynamicAny::DynAnyFactory_var::operator const ::DynamicAny::DynAnyFactory_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+DynamicAny::DynAnyFactory_var::operator ::DynamicAny::DynAnyFactory_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynAnyFactory_ptr
+DynamicAny::DynAnyFactory_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynAnyFactory_ptr
+DynamicAny::DynAnyFactory_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynAnyFactory_ptr &
+DynamicAny::DynAnyFactory_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynAnyFactory_ptr &
+DynamicAny::DynAnyFactory_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynAnyFactory::_nil ();
+  return this->ptr_;
+}
+
+::DynamicAny::DynAnyFactory_ptr
+DynamicAny::DynAnyFactory_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::DynamicAny::DynAnyFactory_ptr val = this->ptr_;
+  this->ptr_ = ::DynamicAny::DynAnyFactory::_nil ();
+  return val;
+}
+
+::DynamicAny::DynAnyFactory_ptr
+DynamicAny::DynAnyFactory_var::duplicate (DynAnyFactory_ptr p)
+{
+  return ::DynamicAny::DynAnyFactory::_duplicate (p);
+}
+
+void
+DynamicAny::DynAnyFactory_var::release (DynAnyFactory_ptr p)
+{
+  CORBA::release (p);
+}
+
+::DynamicAny::DynAnyFactory_ptr
+DynamicAny::DynAnyFactory_var::nil (void)
+{
+  return ::DynamicAny::DynAnyFactory::_nil ();
+}
+
+::DynamicAny::DynAnyFactory_ptr
+DynamicAny::DynAnyFactory_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::DynamicAny::DynAnyFactory::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+DynamicAny::DynAnyFactory_var::upcast (void *src)
+{
+  DynAnyFactory **tmp =
+    ACE_static_cast (DynAnyFactory **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class DynamicAny::DynAnyFactory_out
+// *************************************************************
+
+DynamicAny::DynAnyFactory_out::DynAnyFactory_out (DynAnyFactory_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::DynamicAny::DynAnyFactory::_nil ();
+}
+
+DynamicAny::DynAnyFactory_out::DynAnyFactory_out (DynAnyFactory_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::DynamicAny::DynAnyFactory::_nil ();
+}
+
+DynamicAny::DynAnyFactory_out::DynAnyFactory_out (const ::DynamicAny::DynAnyFactory_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (DynAnyFactory_out &, p).ptr_)
+{}
+
+::DynamicAny::DynAnyFactory_out &
+DynamicAny::DynAnyFactory_out::operator= (const ::DynamicAny::DynAnyFactory_out &p)
+{
+  this->ptr_ = ACE_const_cast (DynAnyFactory_out&, p).ptr_;
+  return *this;
+}
+
+DynamicAny::DynAnyFactory_out &
+DynamicAny::DynAnyFactory_out::operator= (const ::DynamicAny::DynAnyFactory_var &p)
+{
+  this->ptr_ = ::DynamicAny::DynAnyFactory::_duplicate (p.ptr ());
+  return *this;
+}
+
+DynamicAny::DynAnyFactory_out &
+DynamicAny::DynAnyFactory_out::operator= (DynAnyFactory_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+DynamicAny::DynAnyFactory_out::operator ::DynamicAny::DynAnyFactory_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynAnyFactory_ptr &
+DynamicAny::DynAnyFactory_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::DynamicAny::DynAnyFactory_ptr
+DynamicAny::DynAnyFactory_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 // default constructor
 DynamicAny::DynAnyFactory::DynAnyFactory ()
-{}
+{
+  }
 
 // destructor
 DynamicAny::DynAnyFactory::~DynAnyFactory (void)
@@ -1496,8 +3283,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::NameVa
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = 
-      type->equivalent (DynamicAny::_tc_NameValuePair, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePair, ACE_TRY_ENV);
     ACE_TRY_CHECK;
     
     if (!result)
@@ -1587,9 +3373,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::NameVa
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = 
-      type->equivalent (DynamicAny::_tc_NameValuePairSeq, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_NameValuePairSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
     
     if (!result)
@@ -1693,9 +3478,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const DynamicAny::AnySeq
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
-    CORBA::Boolean result = 
-      type->equivalent (DynamicAny::_tc_AnySeq, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (DynamicAny::_tc_AnySeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
     
     if (!result)
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index 3041f2e05be..cc1c8588bb9 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -1,4 +1,6 @@
-/* -*- C++ -*- $Id$ */
+// -*- C++ -*-
+//
+// $Id$
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -52,6 +54,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
 TAO_NAMESPACE  DynamicAny
 {
 
@@ -87,7 +93,15 @@ TAO_NAMESPACE  DynamicAny
     DynAny_ptr &out (void);
     DynAny_ptr _retn (void);
     DynAny_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static DynAny_ptr duplicate (DynAny_ptr);
+    static void release (DynAny_ptr);
+    static DynAny_ptr nil (void);
+    static DynAny_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     DynAny_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -114,7 +128,7 @@ TAO_NAMESPACE  DynamicAny
     operator DynAny_ptr &();
     DynAny_ptr &ptr (void);
     DynAny_ptr operator-> (void);
-    
+  
   private:
     DynAny_ptr &ptr_;
   };
@@ -806,7 +820,15 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
     DynFixed_ptr &out (void);
     DynFixed_ptr _retn (void);
     DynFixed_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static DynFixed_ptr duplicate (DynFixed_ptr);
+    static void release (DynFixed_ptr);
+    static DynFixed_ptr nil (void);
+    static DynFixed_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     DynFixed_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -833,7 +855,7 @@ class TAO_DynamicAny_Export DynAny : public virtual CORBA_Object
     operator DynFixed_ptr &();
     DynFixed_ptr &ptr (void);
     DynFixed_ptr operator-> (void);
-    
+  
   private:
     DynFixed_ptr &ptr_;
   };
@@ -938,7 +960,15 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny
     DynEnum_ptr &out (void);
     DynEnum_ptr _retn (void);
     DynEnum_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static DynEnum_ptr duplicate (DynEnum_ptr);
+    static void release (DynEnum_ptr);
+    static DynEnum_ptr nil (void);
+    static DynEnum_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     DynEnum_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -965,7 +995,7 @@ class TAO_DynamicAny_Export DynFixed: public virtual DynAny
     operator DynEnum_ptr &();
     DynEnum_ptr &ptr (void);
     DynEnum_ptr operator-> (void);
-    
+  
   private:
     DynEnum_ptr &ptr_;
   };
@@ -1520,7 +1550,15 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
     DynStruct_ptr &out (void);
     DynStruct_ptr _retn (void);
     DynStruct_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static DynStruct_ptr duplicate (DynStruct_ptr);
+    static void release (DynStruct_ptr);
+    static DynStruct_ptr nil (void);
+    static DynStruct_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     DynStruct_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1547,7 +1585,7 @@ class TAO_DynamicAny_Export DynEnum: public virtual DynAny
     operator DynStruct_ptr &();
     DynStruct_ptr &ptr (void);
     DynStruct_ptr operator-> (void);
-    
+  
   private:
     DynStruct_ptr &ptr_;
   };
@@ -1691,7 +1729,15 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
     DynUnion_ptr &out (void);
     DynUnion_ptr _retn (void);
     DynUnion_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static DynUnion_ptr duplicate (DynUnion_ptr);
+    static void release (DynUnion_ptr);
+    static DynUnion_ptr nil (void);
+    static DynUnion_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     DynUnion_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1718,7 +1764,7 @@ class TAO_DynamicAny_Export DynStruct: public virtual DynAny
     operator DynUnion_ptr &();
     DynUnion_ptr &ptr (void);
     DynUnion_ptr operator-> (void);
-    
+  
   private:
     DynUnion_ptr &ptr_;
   };
@@ -2185,7 +2231,15 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
     DynSequence_ptr &out (void);
     DynSequence_ptr _retn (void);
     DynSequence_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static DynSequence_ptr duplicate (DynSequence_ptr);
+    static void release (DynSequence_ptr);
+    static DynSequence_ptr nil (void);
+    static DynSequence_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     DynSequence_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2212,7 +2266,7 @@ class TAO_DynamicAny_Export DynUnion: public virtual DynAny
     operator DynSequence_ptr &();
     DynSequence_ptr &ptr (void);
     DynSequence_ptr operator-> (void);
-    
+  
   private:
     DynSequence_ptr &ptr_;
   };
@@ -2354,7 +2408,15 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny
     DynArray_ptr &out (void);
     DynArray_ptr _retn (void);
     DynArray_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static DynArray_ptr duplicate (DynArray_ptr);
+    static void release (DynArray_ptr);
+    static DynArray_ptr nil (void);
+    static DynArray_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     DynArray_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2381,7 +2443,7 @@ class TAO_DynamicAny_Export DynSequence: public virtual DynAny
     operator DynArray_ptr &();
     DynArray_ptr &ptr (void);
     DynArray_ptr operator-> (void);
-    
+  
   private:
     DynArray_ptr &ptr_;
   };
@@ -2505,7 +2567,15 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny
     DynValue_ptr &out (void);
     DynValue_ptr _retn (void);
     DynValue_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static DynValue_ptr duplicate (DynValue_ptr);
+    static void release (DynValue_ptr);
+    static DynValue_ptr nil (void);
+    static DynValue_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     DynValue_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2532,7 +2602,7 @@ class TAO_DynamicAny_Export DynArray: public virtual DynAny
     operator DynValue_ptr &();
     DynValue_ptr &ptr (void);
     DynValue_ptr operator-> (void);
-    
+  
   private:
     DynValue_ptr &ptr_;
   };
@@ -2676,7 +2746,15 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
     DynAnyFactory_ptr &out (void);
     DynAnyFactory_ptr _retn (void);
     DynAnyFactory_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static DynAnyFactory_ptr duplicate (DynAnyFactory_ptr);
+    static void release (DynAnyFactory_ptr);
+    static DynAnyFactory_ptr nil (void);
+    static DynAnyFactory_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     DynAnyFactory_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2703,7 +2781,7 @@ class TAO_DynamicAny_Export DynValue: public virtual DynAny
     operator DynAnyFactory_ptr &();
     DynAnyFactory_ptr &ptr (void);
     DynAnyFactory_ptr operator-> (void);
-    
+  
   private:
     DynAnyFactory_ptr &ptr_;
   };
@@ -2880,5 +2958,9 @@ TAO_DynamicAny_Export CORBA::Boolean operator>> (
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.i b/TAO/tao/DynamicAny/DynamicAnyC.i
index 320d8df0ce1..4ee4b1b5c79 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.i
+++ b/TAO/tao/DynamicAny/DynamicAnyC.i
@@ -1,4 +1,6 @@
-/* -*- C++ -*- $Id$ */
+// -*- C++ -*-
+//
+// $Id$
 
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
@@ -26,510 +28,150 @@
 // *************************************************************
 
 
-#if !defined (_DYNAMICANY_DYNANY___VAR_CI_)
-#define _DYNAMICANY_DYNANY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynAny_var
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynAny_var::DynAny_var (void) // default constructor
-  : ptr_ (DynAny::_nil ())
-{}
-
-ACE_INLINE ::DynamicAny::DynAny_ptr
-DynamicAny::DynAny_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::DynAny_var::DynAny_var (const ::DynamicAny::DynAny_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (DynAny::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-DynamicAny::DynAny_var::~DynAny_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE DynamicAny::DynAny_var &
-DynamicAny::DynAny_var::operator= (DynAny_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynAny_var &
-DynamicAny::DynAny_var::operator= (const ::DynamicAny::DynAny_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynAny::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-DynamicAny::DynAny_var::operator const ::DynamicAny::DynAny_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-DynamicAny::DynAny_var::operator ::DynamicAny::DynAny_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynAny_ptr
-DynamicAny::DynAny_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynAny_ptr
-DynamicAny::DynAny_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynAny_ptr &
-DynamicAny::DynAny_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynAny_ptr &
-DynamicAny::DynAny_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynAny::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynAny_ptr
-DynamicAny::DynAny_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynAny_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynAny::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_DYNAMICANY_DYNANY___OUT_CI_)
-#define _DYNAMICANY_DYNANY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynAny_out
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynAny_out::DynAny_out (DynAny_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynAny::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynAny_out::DynAny_out (DynAny_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynAny::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynAny_out::DynAny_out (const ::DynamicAny::DynAny_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (DynAny_out &, p).ptr_)
-{}
-
-ACE_INLINE ::DynamicAny::DynAny_out &
-DynamicAny::DynAny_out::operator= (const ::DynamicAny::DynAny_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynAny_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynAny_out &
-DynamicAny::DynAny_out::operator= (const ::DynamicAny::DynAny_var &p)
-{
-  this->ptr_ = ::DynamicAny::DynAny::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynAny_out &
-DynamicAny::DynAny_out::operator= (DynAny_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-DynamicAny::DynAny_out::operator ::DynamicAny::DynAny_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynAny_ptr &
-DynamicAny::DynAny_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynAny_ptr
-DynamicAny::DynAny_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
+#if !defined (_DYNAMICANY_DYNANY___CI_)
+#define _DYNAMICANY_DYNANY___CI_
 
-
-#if !defined (_DYNAMICANY_DYNFIXED___VAR_CI_)
-#define _DYNAMICANY_DYNFIXED___VAR_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynFixed_var
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynFixed_var::DynFixed_var (void) // default constructor
-  : ptr_ (DynFixed::_nil ())
-{}
-
-ACE_INLINE ::DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::DynFixed_var::DynFixed_var (const ::DynamicAny::DynFixed_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (DynFixed::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-DynamicAny::DynFixed_var::~DynFixed_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE DynamicAny::DynFixed_var &
-DynamicAny::DynFixed_var::operator= (DynFixed_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynFixed_var &
-DynamicAny::DynFixed_var::operator= (const ::DynamicAny::DynFixed_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynFixed::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-DynamicAny::DynFixed_var::operator const ::DynamicAny::DynFixed_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-DynamicAny::DynFixed_var::operator ::DynamicAny::DynFixed_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynFixed_ptr &
-DynamicAny::DynFixed_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynFixed_ptr &
-DynamicAny::DynFixed_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynFixed::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynFixed_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynFixed::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_DYNAMICANY_DYNFIXED___OUT_CI_)
-#define _DYNAMICANY_DYNFIXED___OUT_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynFixed_out
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynFixed_out::DynFixed_out (DynFixed_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynFixed::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynFixed_out::DynFixed_out (DynFixed_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynFixed::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynFixed_out::DynFixed_out (const ::DynamicAny::DynFixed_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (DynFixed_out &, p).ptr_)
-{}
-
-ACE_INLINE ::DynamicAny::DynFixed_out &
-DynamicAny::DynFixed_out::operator= (const ::DynamicAny::DynFixed_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynFixed_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynFixed_out &
-DynamicAny::DynFixed_out::operator= (const ::DynamicAny::DynFixed_var &p)
+ACE_INLINE DynamicAny::DynAny_ptr
+tao_DynamicAny_DynAny_duplicate (
+    DynamicAny::DynAny_ptr p
+  )
 {
-  this->ptr_ = ::DynamicAny::DynFixed::_duplicate (p.ptr ());
-  return *this;
+  return DynamicAny::DynAny::_duplicate (p);
 }
 
-ACE_INLINE DynamicAny::DynFixed_out &
-DynamicAny::DynFixed_out::operator= (DynFixed_ptr p)
+ACE_INLINE void
+tao_DynamicAny_DynAny_release (
+    DynamicAny::DynAny_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-DynamicAny::DynFixed_out::operator ::DynamicAny::DynFixed_ptr &() // cast
+ACE_INLINE DynamicAny::DynAny_ptr
+tao_DynamicAny_DynAny_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynAny::_nil ();
 }
 
-ACE_INLINE ::DynamicAny::DynFixed_ptr &
-DynamicAny::DynFixed_out::ptr (void) // ptr
+ACE_INLINE DynamicAny::DynAny_ptr
+tao_DynamicAny_DynAny_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynAny::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::DynamicAny::DynFixed_ptr
-DynamicAny::DynFixed_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_DynamicAny_DynAny_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  DynamicAny::DynAny **tmp =
+    ACE_static_cast (DynamicAny::DynAny **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_DYNAMICANY_DYNENUM___VAR_CI_)
-#define _DYNAMICANY_DYNENUM___VAR_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynEnum_var
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynEnum_var::DynEnum_var (void) // default constructor
-  : ptr_ (DynEnum::_nil ())
-{}
-
-ACE_INLINE ::DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::DynEnum_var::DynEnum_var (const ::DynamicAny::DynEnum_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (DynEnum::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-DynamicAny::DynEnum_var::~DynEnum_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE DynamicAny::DynEnum_var &
-DynamicAny::DynEnum_var::operator= (DynEnum_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynEnum_var &
-DynamicAny::DynEnum_var::operator= (const ::DynamicAny::DynEnum_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynEnum::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-DynamicAny::DynEnum_var::operator const ::DynamicAny::DynEnum_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-DynamicAny::DynEnum_var::operator ::DynamicAny::DynEnum_ptr &() // cast 
-{
-  return this->ptr_;
-}
+#if !defined (_DYNAMICANY_DYNFIXED___CI_)
+#define _DYNAMICANY_DYNFIXED___CI_
 
-ACE_INLINE ::DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum_var::operator-> (void) const
+ACE_INLINE DynamicAny::DynFixed_ptr
+tao_DynamicAny_DynFixed_duplicate (
+    DynamicAny::DynFixed_ptr p
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynFixed::_duplicate (p);
 }
 
-ACE_INLINE ::DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum_var::in (void) const
+ACE_INLINE void
+tao_DynamicAny_DynFixed_release (
+    DynamicAny::DynFixed_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::DynamicAny::DynEnum_ptr &
-DynamicAny::DynEnum_var::inout (void)
+ACE_INLINE DynamicAny::DynFixed_ptr
+tao_DynamicAny_DynFixed_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynFixed::_nil ();
 }
 
-ACE_INLINE ::DynamicAny::DynEnum_ptr &
-DynamicAny::DynEnum_var::out (void)
+ACE_INLINE DynamicAny::DynFixed_ptr
+tao_DynamicAny_DynFixed_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynEnum::_nil ();
-  return this->ptr_;
+  return DynamicAny::DynFixed::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_DynamicAny_DynFixed_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynEnum_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynEnum::_nil ();
-  return val;
+  DynamicAny::DynFixed **tmp =
+    ACE_static_cast (DynamicAny::DynFixed **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_DYNAMICANY_DYNENUM___OUT_CI_)
-#define _DYNAMICANY_DYNENUM___OUT_CI_
+#if !defined (_DYNAMICANY_DYNENUM___CI_)
+#define _DYNAMICANY_DYNENUM___CI_
 
-// *************************************************************
-// Inline operations for class DynamicAny::DynEnum_out
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynEnum_out::DynEnum_out (DynEnum_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynEnum::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynEnum_out::DynEnum_out (DynEnum_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynEnum::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynEnum_out::DynEnum_out (const ::DynamicAny::DynEnum_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (DynEnum_out &, p).ptr_)
-{}
-
-ACE_INLINE ::DynamicAny::DynEnum_out &
-DynamicAny::DynEnum_out::operator= (const ::DynamicAny::DynEnum_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynEnum_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynEnum_out &
-DynamicAny::DynEnum_out::operator= (const ::DynamicAny::DynEnum_var &p)
+ACE_INLINE DynamicAny::DynEnum_ptr
+tao_DynamicAny_DynEnum_duplicate (
+    DynamicAny::DynEnum_ptr p
+  )
 {
-  this->ptr_ = ::DynamicAny::DynEnum::_duplicate (p.ptr ());
-  return *this;
+  return DynamicAny::DynEnum::_duplicate (p);
 }
 
-ACE_INLINE DynamicAny::DynEnum_out &
-DynamicAny::DynEnum_out::operator= (DynEnum_ptr p)
+ACE_INLINE void
+tao_DynamicAny_DynEnum_release (
+    DynamicAny::DynEnum_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-DynamicAny::DynEnum_out::operator ::DynamicAny::DynEnum_ptr &() // cast
+ACE_INLINE DynamicAny::DynEnum_ptr
+tao_DynamicAny_DynEnum_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynEnum::_nil ();
 }
 
-ACE_INLINE ::DynamicAny::DynEnum_ptr &
-DynamicAny::DynEnum_out::ptr (void) // ptr
+ACE_INLINE DynamicAny::DynEnum_ptr
+tao_DynamicAny_DynEnum_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynEnum::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::DynamicAny::DynEnum_ptr
-DynamicAny::DynEnum_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_DynamicAny_DynEnum_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  DynamicAny::DynEnum **tmp =
+    ACE_static_cast (DynamicAny::DynEnum **, src);
+  return *tmp;
 }
 
 
@@ -584,12 +226,12 @@ DynamicAny::NameValuePair_var::operator= (const ::DynamicAny::NameValuePair_var
         }
       else
         {
-          DynamicAny::NameValuePair *deep_copy = 
-            new DynamicAny::NameValuePair (*p.ptr_);
+          NameValuePair *deep_copy =
+            new NameValuePair (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              DynamicAny::NameValuePair *tmp = deep_copy;
+              NameValuePair *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -945,8 +587,8 @@ DynamicAny::NameValuePairSeq_var::operator= (NameValuePairSeq *p)
   return *this;
 }
 
-ACE_INLINE DynamicAny::NameValuePairSeq_var &
-DynamicAny::NameValuePairSeq_var::operator= (const ::DynamicAny::NameValuePairSeq_var &p) // deep copy
+ACE_INLINE ::DynamicAny::NameValuePairSeq_var &
+DynamicAny::NameValuePairSeq_var::operator= (const ::DynamicAny::NameValuePairSeq_var &p)
 {
   if (this != &p)
     {
@@ -957,12 +599,12 @@ DynamicAny::NameValuePairSeq_var::operator= (const ::DynamicAny::NameValuePairSe
         }
       else
         {
-          DynamicAny::NameValuePairSeq *deep_copy = 
-            new DynamicAny::NameValuePairSeq (*p.ptr_);
+          NameValuePairSeq *deep_copy =
+            new NameValuePairSeq (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              DynamicAny::NameValuePairSeq *tmp = deep_copy;
+              NameValuePairSeq *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -1171,12 +813,12 @@ DynamicAny::NameDynAnyPair_var::operator= (const ::DynamicAny::NameDynAnyPair_va
         }
       else
         {
-          DynamicAny::NameDynAnyPair *deep_copy = 
-            new DynamicAny::NameDynAnyPair (*p.ptr_);
+          NameDynAnyPair *deep_copy =
+            new NameDynAnyPair (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              DynamicAny::NameDynAnyPair *tmp = deep_copy;
+              NameDynAnyPair *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -1532,8 +1174,8 @@ DynamicAny::NameDynAnyPairSeq_var::operator= (NameDynAnyPairSeq *p)
   return *this;
 }
 
-ACE_INLINE DynamicAny::NameDynAnyPairSeq_var &
-DynamicAny::NameDynAnyPairSeq_var::operator= (const ::DynamicAny::NameDynAnyPairSeq_var &p) // deep copy
+ACE_INLINE ::DynamicAny::NameDynAnyPairSeq_var &
+DynamicAny::NameDynAnyPairSeq_var::operator= (const ::DynamicAny::NameDynAnyPairSeq_var &p)
 {
   if (this != &p)
     {
@@ -1544,12 +1186,12 @@ DynamicAny::NameDynAnyPairSeq_var::operator= (const ::DynamicAny::NameDynAnyPair
         }
       else
         {
-          DynamicAny::NameDynAnyPairSeq *deep_copy = 
-            new DynamicAny::NameDynAnyPairSeq (*p.ptr_);
+          NameDynAnyPairSeq *deep_copy =
+            new NameDynAnyPairSeq (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              DynamicAny::NameDynAnyPairSeq *tmp = deep_copy;
+              NameDynAnyPairSeq *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -1710,340 +1352,100 @@ DynamicAny::NameDynAnyPairSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_DYNAMICANY_DYNSTRUCT___VAR_CI_)
-#define _DYNAMICANY_DYNSTRUCT___VAR_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynStruct_var
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynStruct_var::DynStruct_var (void) // default constructor
-  : ptr_ (DynStruct::_nil ())
-{}
-
-ACE_INLINE ::DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::DynStruct_var::DynStruct_var (const ::DynamicAny::DynStruct_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (DynStruct::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-DynamicAny::DynStruct_var::~DynStruct_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE DynamicAny::DynStruct_var &
-DynamicAny::DynStruct_var::operator= (DynStruct_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynStruct_var &
-DynamicAny::DynStruct_var::operator= (const ::DynamicAny::DynStruct_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynStruct::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-DynamicAny::DynStruct_var::operator const ::DynamicAny::DynStruct_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-DynamicAny::DynStruct_var::operator ::DynamicAny::DynStruct_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynStruct_ptr &
-DynamicAny::DynStruct_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynStruct_ptr &
-DynamicAny::DynStruct_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynStruct::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynStruct_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynStruct::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_DYNAMICANY_DYNSTRUCT___OUT_CI_)
-#define _DYNAMICANY_DYNSTRUCT___OUT_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynStruct_out
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynStruct_out::DynStruct_out (DynStruct_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynStruct::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynStruct_out::DynStruct_out (DynStruct_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynStruct::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynStruct_out::DynStruct_out (const ::DynamicAny::DynStruct_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (DynStruct_out &, p).ptr_)
-{}
-
-ACE_INLINE ::DynamicAny::DynStruct_out &
-DynamicAny::DynStruct_out::operator= (const ::DynamicAny::DynStruct_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynStruct_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynStruct_out &
-DynamicAny::DynStruct_out::operator= (const ::DynamicAny::DynStruct_var &p)
-{
-  this->ptr_ = ::DynamicAny::DynStruct::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynStruct_out &
-DynamicAny::DynStruct_out::operator= (DynStruct_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-DynamicAny::DynStruct_out::operator ::DynamicAny::DynStruct_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynStruct_ptr &
-DynamicAny::DynStruct_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynStruct_ptr
-DynamicAny::DynStruct_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_DYNAMICANY_DYNUNION___VAR_CI_)
-#define _DYNAMICANY_DYNUNION___VAR_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynUnion_var
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynUnion_var::DynUnion_var (void) // default constructor
-  : ptr_ (DynUnion::_nil ())
-{}
-
-ACE_INLINE ::DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::DynUnion_var::DynUnion_var (const ::DynamicAny::DynUnion_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (DynUnion::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-DynamicAny::DynUnion_var::~DynUnion_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE DynamicAny::DynUnion_var &
-DynamicAny::DynUnion_var::operator= (DynUnion_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynUnion_var &
-DynamicAny::DynUnion_var::operator= (const ::DynamicAny::DynUnion_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynUnion::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-DynamicAny::DynUnion_var::operator const ::DynamicAny::DynUnion_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-DynamicAny::DynUnion_var::operator ::DynamicAny::DynUnion_ptr &() // cast 
-{
-  return this->ptr_;
-}
+#if !defined (_DYNAMICANY_DYNSTRUCT___CI_)
+#define _DYNAMICANY_DYNSTRUCT___CI_
 
-ACE_INLINE ::DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion_var::operator-> (void) const
+ACE_INLINE DynamicAny::DynStruct_ptr
+tao_DynamicAny_DynStruct_duplicate (
+    DynamicAny::DynStruct_ptr p
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynStruct::_duplicate (p);
 }
 
-ACE_INLINE ::DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion_var::in (void) const
+ACE_INLINE void
+tao_DynamicAny_DynStruct_release (
+    DynamicAny::DynStruct_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::DynamicAny::DynUnion_ptr &
-DynamicAny::DynUnion_var::inout (void)
+ACE_INLINE DynamicAny::DynStruct_ptr
+tao_DynamicAny_DynStruct_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynStruct::_nil ();
 }
 
-ACE_INLINE ::DynamicAny::DynUnion_ptr &
-DynamicAny::DynUnion_var::out (void)
+ACE_INLINE DynamicAny::DynStruct_ptr
+tao_DynamicAny_DynStruct_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynUnion::_nil ();
-  return this->ptr_;
+  return DynamicAny::DynStruct::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_DynamicAny_DynStruct_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynUnion_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynUnion::_nil ();
-  return val;
+  DynamicAny::DynStruct **tmp =
+    ACE_static_cast (DynamicAny::DynStruct **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_DYNAMICANY_DYNUNION___OUT_CI_)
-#define _DYNAMICANY_DYNUNION___OUT_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynUnion_out
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynUnion_out::DynUnion_out (DynUnion_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynUnion::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynUnion_out::DynUnion_out (DynUnion_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynUnion::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynUnion_out::DynUnion_out (const ::DynamicAny::DynUnion_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (DynUnion_out &, p).ptr_)
-{}
+#if !defined (_DYNAMICANY_DYNUNION___CI_)
+#define _DYNAMICANY_DYNUNION___CI_
 
-ACE_INLINE ::DynamicAny::DynUnion_out &
-DynamicAny::DynUnion_out::operator= (const ::DynamicAny::DynUnion_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynUnion_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynUnion_out &
-DynamicAny::DynUnion_out::operator= (const ::DynamicAny::DynUnion_var &p)
+ACE_INLINE DynamicAny::DynUnion_ptr
+tao_DynamicAny_DynUnion_duplicate (
+    DynamicAny::DynUnion_ptr p
+  )
 {
-  this->ptr_ = ::DynamicAny::DynUnion::_duplicate (p.ptr ());
-  return *this;
+  return DynamicAny::DynUnion::_duplicate (p);
 }
 
-ACE_INLINE DynamicAny::DynUnion_out &
-DynamicAny::DynUnion_out::operator= (DynUnion_ptr p)
+ACE_INLINE void
+tao_DynamicAny_DynUnion_release (
+    DynamicAny::DynUnion_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-DynamicAny::DynUnion_out::operator ::DynamicAny::DynUnion_ptr &() // cast
+ACE_INLINE DynamicAny::DynUnion_ptr
+tao_DynamicAny_DynUnion_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynUnion::_nil ();
 }
 
-ACE_INLINE ::DynamicAny::DynUnion_ptr &
-DynamicAny::DynUnion_out::ptr (void) // ptr
+ACE_INLINE DynamicAny::DynUnion_ptr
+tao_DynamicAny_DynUnion_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynUnion::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::DynamicAny::DynUnion_ptr
-DynamicAny::DynUnion_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_DynamicAny_DynUnion_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  DynamicAny::DynUnion **tmp =
+    ACE_static_cast (DynamicAny::DynUnion **, src);
+  return *tmp;
 }
 
 
@@ -2266,8 +1668,8 @@ DynamicAny::AnySeq_var::operator= (AnySeq *p)
   return *this;
 }
 
-ACE_INLINE DynamicAny::AnySeq_var &
-DynamicAny::AnySeq_var::operator= (const ::DynamicAny::AnySeq_var &p) // deep copy
+ACE_INLINE ::DynamicAny::AnySeq_var &
+DynamicAny::AnySeq_var::operator= (const ::DynamicAny::AnySeq_var &p)
 {
   if (this != &p)
     {
@@ -2278,12 +1680,12 @@ DynamicAny::AnySeq_var::operator= (const ::DynamicAny::AnySeq_var &p) // deep co
         }
       else
         {
-          DynamicAny::AnySeq *deep_copy = 
-            new DynamicAny::AnySeq (*p.ptr_);
+          AnySeq *deep_copy =
+            new AnySeq (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              DynamicAny::AnySeq *tmp = deep_copy;
+              AnySeq *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -2457,7 +1859,9 @@ DynamicAny::AnySeq_out::operator[] (CORBA::ULong index)
     ACE_NEW_RETURN (buf, DynamicAny::DynAny*[nelems], 0);
     
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = DynamicAny::DynAny::_nil ();
+      {
+        buf[i] = DynamicAny::DynAny::_nil ();
+      }
     
     return buf;
   }
@@ -2500,7 +1904,9 @@ DynamicAny::AnySeq_out::operator[] (CORBA::ULong index)
       DynamicAny::DynAny ** const tmp2 = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = DynamicAny::DynAny::_duplicate (tmp2[i]);
+        {
+          tmp1[i] = DynamicAny::DynAny::_duplicate (tmp2[i]);
+        }
       
       this->buffer_ = tmp1;
     }
@@ -2540,7 +1946,9 @@ DynamicAny::AnySeq_out::operator[] (CORBA::ULong index)
     DynamicAny::DynAny ** const tmp2 = ACE_reinterpret_cast (DynamicAny::DynAny ** ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = DynamicAny::DynAny::_duplicate (tmp2[i]);
+      {
+        tmp1[i] = DynamicAny::DynAny::_duplicate (tmp2[i]);
+      }
     
     return *this;
   }
@@ -2640,8 +2048,8 @@ DynamicAny::DynAnySeq_var::operator= (DynAnySeq *p)
   return *this;
 }
 
-ACE_INLINE DynamicAny::DynAnySeq_var &
-DynamicAny::DynAnySeq_var::operator= (const ::DynamicAny::DynAnySeq_var &p) // deep copy
+ACE_INLINE ::DynamicAny::DynAnySeq_var &
+DynamicAny::DynAnySeq_var::operator= (const ::DynamicAny::DynAnySeq_var &p)
 {
   if (this != &p)
     {
@@ -2652,12 +2060,12 @@ DynamicAny::DynAnySeq_var::operator= (const ::DynamicAny::DynAnySeq_var &p) // d
         }
       else
         {
-          DynamicAny::DynAnySeq *deep_copy = 
-            new DynamicAny::DynAnySeq (*p.ptr_);
+          DynAnySeq *deep_copy =
+            new DynAnySeq (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              DynamicAny::DynAnySeq *tmp = deep_copy;
+              DynAnySeq *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -2812,510 +2220,150 @@ DynamicAny::DynAnySeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_DYNAMICANY_DYNSEQUENCE___VAR_CI_)
-#define _DYNAMICANY_DYNSEQUENCE___VAR_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynSequence_var
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynSequence_var::DynSequence_var (void) // default constructor
-  : ptr_ (DynSequence::_nil ())
-{}
-
-ACE_INLINE ::DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::DynSequence_var::DynSequence_var (const ::DynamicAny::DynSequence_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (DynSequence::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-DynamicAny::DynSequence_var::~DynSequence_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE DynamicAny::DynSequence_var &
-DynamicAny::DynSequence_var::operator= (DynSequence_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynSequence_var &
-DynamicAny::DynSequence_var::operator= (const ::DynamicAny::DynSequence_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynSequence::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-DynamicAny::DynSequence_var::operator const ::DynamicAny::DynSequence_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-DynamicAny::DynSequence_var::operator ::DynamicAny::DynSequence_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynSequence_ptr &
-DynamicAny::DynSequence_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynSequence_ptr &
-DynamicAny::DynSequence_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynSequence::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynSequence_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynSequence::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_DYNAMICANY_DYNSEQUENCE___OUT_CI_)
-#define _DYNAMICANY_DYNSEQUENCE___OUT_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynSequence_out
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynSequence_out::DynSequence_out (DynSequence_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynSequence::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynSequence_out::DynSequence_out (DynSequence_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynSequence::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynSequence_out::DynSequence_out (const ::DynamicAny::DynSequence_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (DynSequence_out &, p).ptr_)
-{}
-
-ACE_INLINE ::DynamicAny::DynSequence_out &
-DynamicAny::DynSequence_out::operator= (const ::DynamicAny::DynSequence_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynSequence_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynSequence_out &
-DynamicAny::DynSequence_out::operator= (const ::DynamicAny::DynSequence_var &p)
-{
-  this->ptr_ = ::DynamicAny::DynSequence::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynSequence_out &
-DynamicAny::DynSequence_out::operator= (DynSequence_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-DynamicAny::DynSequence_out::operator ::DynamicAny::DynSequence_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynSequence_ptr &
-DynamicAny::DynSequence_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynSequence_ptr
-DynamicAny::DynSequence_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_DYNAMICANY_DYNARRAY___VAR_CI_)
-#define _DYNAMICANY_DYNARRAY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynArray_var
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynArray_var::DynArray_var (void) // default constructor
-  : ptr_ (DynArray::_nil ())
-{}
-
-ACE_INLINE ::DynamicAny::DynArray_ptr
-DynamicAny::DynArray_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::DynArray_var::DynArray_var (const ::DynamicAny::DynArray_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (DynArray::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-DynamicAny::DynArray_var::~DynArray_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE DynamicAny::DynArray_var &
-DynamicAny::DynArray_var::operator= (DynArray_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynArray_var &
-DynamicAny::DynArray_var::operator= (const ::DynamicAny::DynArray_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynArray::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-DynamicAny::DynArray_var::operator const ::DynamicAny::DynArray_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-DynamicAny::DynArray_var::operator ::DynamicAny::DynArray_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynArray_ptr
-DynamicAny::DynArray_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynArray_ptr
-DynamicAny::DynArray_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynArray_ptr &
-DynamicAny::DynArray_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynArray_ptr &
-DynamicAny::DynArray_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynArray::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynArray_ptr
-DynamicAny::DynArray_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynArray_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynArray::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_DYNAMICANY_DYNARRAY___OUT_CI_)
-#define _DYNAMICANY_DYNARRAY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynArray_out
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynArray_out::DynArray_out (DynArray_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynArray::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynArray_out::DynArray_out (DynArray_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynArray::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynArray_out::DynArray_out (const ::DynamicAny::DynArray_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (DynArray_out &, p).ptr_)
-{}
+#if !defined (_DYNAMICANY_DYNSEQUENCE___CI_)
+#define _DYNAMICANY_DYNSEQUENCE___CI_
 
-ACE_INLINE ::DynamicAny::DynArray_out &
-DynamicAny::DynArray_out::operator= (const ::DynamicAny::DynArray_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynArray_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynArray_out &
-DynamicAny::DynArray_out::operator= (const ::DynamicAny::DynArray_var &p)
+ACE_INLINE DynamicAny::DynSequence_ptr
+tao_DynamicAny_DynSequence_duplicate (
+    DynamicAny::DynSequence_ptr p
+  )
 {
-  this->ptr_ = ::DynamicAny::DynArray::_duplicate (p.ptr ());
-  return *this;
+  return DynamicAny::DynSequence::_duplicate (p);
 }
 
-ACE_INLINE DynamicAny::DynArray_out &
-DynamicAny::DynArray_out::operator= (DynArray_ptr p)
+ACE_INLINE void
+tao_DynamicAny_DynSequence_release (
+    DynamicAny::DynSequence_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-DynamicAny::DynArray_out::operator ::DynamicAny::DynArray_ptr &() // cast
+ACE_INLINE DynamicAny::DynSequence_ptr
+tao_DynamicAny_DynSequence_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynSequence::_nil ();
 }
 
-ACE_INLINE ::DynamicAny::DynArray_ptr &
-DynamicAny::DynArray_out::ptr (void) // ptr
+ACE_INLINE DynamicAny::DynSequence_ptr
+tao_DynamicAny_DynSequence_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynSequence::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::DynamicAny::DynArray_ptr
-DynamicAny::DynArray_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_DynamicAny_DynSequence_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  DynamicAny::DynSequence **tmp =
+    ACE_static_cast (DynamicAny::DynSequence **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_DYNAMICANY_DYNVALUE___VAR_CI_)
-#define _DYNAMICANY_DYNVALUE___VAR_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynValue_var
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynValue_var::DynValue_var (void) // default constructor
-  : ptr_ (DynValue::_nil ())
-{}
-
-ACE_INLINE ::DynamicAny::DynValue_ptr
-DynamicAny::DynValue_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::DynValue_var::DynValue_var (const ::DynamicAny::DynValue_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (DynValue::_duplicate (p.ptr ()))
-{}
+#if !defined (_DYNAMICANY_DYNARRAY___CI_)
+#define _DYNAMICANY_DYNARRAY___CI_
 
-ACE_INLINE
-DynamicAny::DynValue_var::~DynValue_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE DynamicAny::DynValue_var &
-DynamicAny::DynValue_var::operator= (DynValue_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynValue_var &
-DynamicAny::DynValue_var::operator= (const ::DynamicAny::DynValue_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynValue::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-DynamicAny::DynValue_var::operator const ::DynamicAny::DynValue_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-DynamicAny::DynValue_var::operator ::DynamicAny::DynValue_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynValue_ptr
-DynamicAny::DynValue_var::operator-> (void) const
+ACE_INLINE DynamicAny::DynArray_ptr
+tao_DynamicAny_DynArray_duplicate (
+    DynamicAny::DynArray_ptr p
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynArray::_duplicate (p);
 }
 
-ACE_INLINE ::DynamicAny::DynValue_ptr
-DynamicAny::DynValue_var::in (void) const
+ACE_INLINE void
+tao_DynamicAny_DynArray_release (
+    DynamicAny::DynArray_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::DynamicAny::DynValue_ptr &
-DynamicAny::DynValue_var::inout (void)
+ACE_INLINE DynamicAny::DynArray_ptr
+tao_DynamicAny_DynArray_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynArray::_nil ();
 }
 
-ACE_INLINE ::DynamicAny::DynValue_ptr &
-DynamicAny::DynValue_var::out (void)
+ACE_INLINE DynamicAny::DynArray_ptr
+tao_DynamicAny_DynArray_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynValue::_nil ();
-  return this->ptr_;
+  return DynamicAny::DynArray::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::DynamicAny::DynValue_ptr
-DynamicAny::DynValue_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_DynamicAny_DynArray_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynValue_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynValue::_nil ();
-  return val;
+  DynamicAny::DynArray **tmp =
+    ACE_static_cast (DynamicAny::DynArray **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_DYNAMICANY_DYNVALUE___OUT_CI_)
-#define _DYNAMICANY_DYNVALUE___OUT_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynValue_out
-// *************************************************************
+#if !defined (_DYNAMICANY_DYNVALUE___CI_)
+#define _DYNAMICANY_DYNVALUE___CI_
 
-ACE_INLINE
-DynamicAny::DynValue_out::DynValue_out (DynValue_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynValue::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynValue_out::DynValue_out (DynValue_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynValue::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynValue_out::DynValue_out (const ::DynamicAny::DynValue_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (DynValue_out &, p).ptr_)
-{}
-
-ACE_INLINE ::DynamicAny::DynValue_out &
-DynamicAny::DynValue_out::operator= (const ::DynamicAny::DynValue_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynValue_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynValue_out &
-DynamicAny::DynValue_out::operator= (const ::DynamicAny::DynValue_var &p)
+ACE_INLINE DynamicAny::DynValue_ptr
+tao_DynamicAny_DynValue_duplicate (
+    DynamicAny::DynValue_ptr p
+  )
 {
-  this->ptr_ = ::DynamicAny::DynValue::_duplicate (p.ptr ());
-  return *this;
+  return DynamicAny::DynValue::_duplicate (p);
 }
 
-ACE_INLINE DynamicAny::DynValue_out &
-DynamicAny::DynValue_out::operator= (DynValue_ptr p)
+ACE_INLINE void
+tao_DynamicAny_DynValue_release (
+    DynamicAny::DynValue_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-DynamicAny::DynValue_out::operator ::DynamicAny::DynValue_ptr &() // cast
+ACE_INLINE DynamicAny::DynValue_ptr
+tao_DynamicAny_DynValue_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynValue::_nil ();
 }
 
-ACE_INLINE ::DynamicAny::DynValue_ptr &
-DynamicAny::DynValue_out::ptr (void) // ptr
+ACE_INLINE DynamicAny::DynValue_ptr
+tao_DynamicAny_DynValue_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynValue::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::DynamicAny::DynValue_ptr
-DynamicAny::DynValue_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_DynamicAny_DynValue_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  DynamicAny::DynValue **tmp =
+    ACE_static_cast (DynamicAny::DynValue **, src);
+  return *tmp;
 }
 
 
@@ -3326,170 +2374,50 @@ DynamicAny::DynValue_out::operator-> (void)
 // *************************************************************
 
 
-#if !defined (_DYNAMICANY_DYNANYFACTORY___VAR_CI_)
-#define _DYNAMICANY_DYNANYFACTORY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynAnyFactory_var
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynAnyFactory_var::DynAnyFactory_var (void) // default constructor
-  : ptr_ (DynAnyFactory::_nil ())
-{}
-
-ACE_INLINE ::DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-DynamicAny::DynAnyFactory_var::DynAnyFactory_var (const ::DynamicAny::DynAnyFactory_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (DynAnyFactory::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-DynamicAny::DynAnyFactory_var::~DynAnyFactory_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE DynamicAny::DynAnyFactory_var &
-DynamicAny::DynAnyFactory_var::operator= (DynAnyFactory_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynAnyFactory_var &
-DynamicAny::DynAnyFactory_var::operator= (const ::DynamicAny::DynAnyFactory_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::DynamicAny::DynAnyFactory::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-DynamicAny::DynAnyFactory_var::operator const ::DynamicAny::DynAnyFactory_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-DynamicAny::DynAnyFactory_var::operator ::DynamicAny::DynAnyFactory_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynAnyFactory_ptr &
-DynamicAny::DynAnyFactory_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynAnyFactory_ptr &
-DynamicAny::DynAnyFactory_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynAnyFactory::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::DynamicAny::DynAnyFactory_ptr val = this->ptr_;
-  this->ptr_ = ::DynamicAny::DynAnyFactory::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_DYNAMICANY_DYNANYFACTORY___OUT_CI_)
-#define _DYNAMICANY_DYNANYFACTORY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class DynamicAny::DynAnyFactory_out
-// *************************************************************
-
-ACE_INLINE
-DynamicAny::DynAnyFactory_out::DynAnyFactory_out (DynAnyFactory_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::DynamicAny::DynAnyFactory::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynAnyFactory_out::DynAnyFactory_out (DynAnyFactory_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::DynamicAny::DynAnyFactory::_nil ();
-}
-
-ACE_INLINE
-DynamicAny::DynAnyFactory_out::DynAnyFactory_out (const ::DynamicAny::DynAnyFactory_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (DynAnyFactory_out &, p).ptr_)
-{}
+#if !defined (_DYNAMICANY_DYNANYFACTORY___CI_)
+#define _DYNAMICANY_DYNANYFACTORY___CI_
 
-ACE_INLINE ::DynamicAny::DynAnyFactory_out &
-DynamicAny::DynAnyFactory_out::operator= (const ::DynamicAny::DynAnyFactory_out &p)
-{
-  this->ptr_ = ACE_const_cast (DynAnyFactory_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE DynamicAny::DynAnyFactory_out &
-DynamicAny::DynAnyFactory_out::operator= (const ::DynamicAny::DynAnyFactory_var &p)
+ACE_INLINE DynamicAny::DynAnyFactory_ptr
+tao_DynamicAny_DynAnyFactory_duplicate (
+    DynamicAny::DynAnyFactory_ptr p
+  )
 {
-  this->ptr_ = ::DynamicAny::DynAnyFactory::_duplicate (p.ptr ());
-  return *this;
+  return DynamicAny::DynAnyFactory::_duplicate (p);
 }
 
-ACE_INLINE DynamicAny::DynAnyFactory_out &
-DynamicAny::DynAnyFactory_out::operator= (DynAnyFactory_ptr p)
+ACE_INLINE void
+tao_DynamicAny_DynAnyFactory_release (
+    DynamicAny::DynAnyFactory_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-DynamicAny::DynAnyFactory_out::operator ::DynamicAny::DynAnyFactory_ptr &() // cast
+ACE_INLINE DynamicAny::DynAnyFactory_ptr
+tao_DynamicAny_DynAnyFactory_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynAnyFactory::_nil ();
 }
 
-ACE_INLINE ::DynamicAny::DynAnyFactory_ptr &
-DynamicAny::DynAnyFactory_out::ptr (void) // ptr
+ACE_INLINE DynamicAny::DynAnyFactory_ptr
+tao_DynamicAny_DynAnyFactory_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return DynamicAny::DynAnyFactory::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::DynamicAny::DynAnyFactory_ptr
-DynamicAny::DynAnyFactory_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_DynamicAny_DynAnyFactory_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  DynamicAny::DynAnyFactory **tmp =
+    ACE_static_cast (DynamicAny::DynAnyFactory **, src);
+  return *tmp;
 }
 
 
diff --git a/TAO/tao/DynamicAny/diffs/DynamicAnyC.cpp.diff b/TAO/tao/DynamicAny/diffs/DynamicAnyC.cpp.diff
index f912118ae2b..19b251c08bc 100644
--- a/TAO/tao/DynamicAny/diffs/DynamicAnyC.cpp.diff
+++ b/TAO/tao/DynamicAny/diffs/DynamicAnyC.cpp.diff
@@ -1,101 +1,26 @@
---- orig/DynamicAnyC.cpp	Thu Dec 07 17:45:21 2000
-+++ DynamicAnyC.cpp	Thu Dec 07 17:53:48 2000
-@@ -19,7 +19,7 @@
+--- orig/DynamicAnyC.cpp	Wed Apr 18 23:41:19 2001
++++ DynamicAnyC.cpp	Wed Apr 18 23:35:08 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,14 +19,7 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
 -#include "DynamicAnyC.h"
+-
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+-#include "tao/ClientRequestInfo.h"
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
 +#include "DynamicAny.h"
  
- #if !defined (__ACE_INLINE__)
- #include "DynamicAnyC.i"
-@@ -28,8 +28,7 @@
- 
- // default constructor
- DynamicAny::DynAny::DynAny ()
--{
--  }
-+{}
- 
- // destructor
- DynamicAny::DynAny::~DynAny (void)
-@@ -233,8 +232,7 @@
- 
- // default constructor
- DynamicAny::DynFixed::DynFixed ()
--{
--  }
-+{}
- 
- // destructor
- DynamicAny::DynFixed::~DynFixed (void)
-@@ -314,8 +312,7 @@
- 
- // default constructor
- DynamicAny::DynEnum::DynEnum ()
--{
--  }
-+{}
- 
- // destructor
- DynamicAny::DynEnum::~DynEnum (void)
-@@ -665,8 +662,7 @@
- 
- // default constructor
- DynamicAny::DynStruct::DynStruct ()
--{
--  }
-+{}
- 
- // destructor
- DynamicAny::DynStruct::~DynStruct (void)
-@@ -746,8 +742,7 @@
- 
- // default constructor
- DynamicAny::DynUnion::DynUnion ()
--{
--  }
-+{}
- 
- // destructor
- DynamicAny::DynUnion::~DynUnion (void)
-@@ -1071,8 +1066,7 @@
- 
- // default constructor
- DynamicAny::DynSequence::DynSequence ()
--{
--  }
-+{}
- 
- // destructor
- DynamicAny::DynSequence::~DynSequence (void)
-@@ -1152,8 +1146,7 @@
- 
- // default constructor
- DynamicAny::DynArray::DynArray ()
--{
--  }
-+{}
- 
- // destructor
- DynamicAny::DynArray::~DynArray (void)
-@@ -1233,8 +1226,7 @@
- 
- // default constructor
- DynamicAny::DynValue::DynValue ()
--{
--  }
-+{}
- 
- // destructor
- DynamicAny::DynValue::~DynValue (void)
-@@ -1314,8 +1306,7 @@
- 
- // default constructor
- DynamicAny::DynAnyFactory::DynAnyFactory ()
--{
--  }
-+{}
- 
- // destructor
- DynamicAny::DynAnyFactory::~DynAnyFactory (void)
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus
diff --git a/TAO/tao/DynamicAny/diffs/DynamicAnyC.h.diff b/TAO/tao/DynamicAny/diffs/DynamicAnyC.h.diff
index df5821d31e2..7be5c9459ef 100644
--- a/TAO/tao/DynamicAny/diffs/DynamicAnyC.h.diff
+++ b/TAO/tao/DynamicAny/diffs/DynamicAnyC.h.diff
@@ -1,13 +1,21 @@
---- orig/DynamicAnyC.h	Thu Dec 07 17:45:21 2000
-+++ DynamicAnyC.h	Thu Dec 07 17:39:55 2000
-@@ -22,6 +22,10 @@
+--- orig/DynamicAnyC.h	Wed Apr 18 23:41:19 2001
++++ DynamicAnyC.h	Wed Apr 18 23:20:11 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:
+@@ -21,6 +21,10 @@
+ 
  #ifndef _TAO_IDL_ORIG_DYNAMICANYC_H_
  #define _TAO_IDL_ORIG_DYNAMICANYC_H_
- 
++
 +#ifndef TAO_DYNAMICANY_SAFE_INCLUDE
 +#error "You should not include DynamicAnyC.h directly, use DynamicAny.h"
 +#endif /* !TAO_DYNAMICANY_SAFE_INCLUDE */
-+
+ 
  #include "ace/pre.h"
  #include "tao/corba.h"
- 
diff --git a/TAO/tao/DynamicAny/diffs/DynamicAnyC.i.diff b/TAO/tao/DynamicAny/diffs/DynamicAnyC.i.diff
index e69de29bb2d..d387669446e 100644
--- a/TAO/tao/DynamicAny/diffs/DynamicAnyC.i.diff
+++ b/TAO/tao/DynamicAny/diffs/DynamicAnyC.i.diff
@@ -0,0 +1,10 @@
+--- orig/DynamicAnyC.i	Wed Apr 18 23:41:19 2001
++++ DynamicAnyC.i	Wed Apr 18 23:28:47 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/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl
index 8077d3d7ad8..31751a84ac9 100644
--- a/TAO/tao/IFR_Client/IFR_Base.pidl
+++ b/TAO/tao/IFR_Client/IFR_Base.pidl
@@ -17,15 +17,41 @@
 //   the IFR as well as many of the non-interface data types used 
 //   by all other IFR interfaces.
 //
-//   The command used to generate code from this IDL file is:
+//   1. Patch this pidl file with
 //
-//     tao_idl -o orig -Ge 1 \
+//      patch < diffs/IFR_Base.pidl.diff
+//
+//   This will remove the CORBA module, rename most types foo
+//   declared in it as CORBA_foo, unalias the simple typedefs
+//   which don't have a CORBA_ analog in corbafwd.h.
+//
+//   2. Generate the code. The command used to generate code from this 
+//   IDL file is:
+//
+//     tao_idl -o orig -Ge 1 -I.. \
 //          -Wb,export_macro=TAO_IFR_Client_Export \
 //          -Wb,export_include=ifr_client_export.h \
 //          -Wb,pre_include="ace/pre.h" \
 //          -Wb,post_include="ace/post.h" \
 //          IFR_Base.pidl
 //
+//   3. Copy the generated files to the current directory.
+//
+//   4. Patch the generated files, using
+//      
+//      patch < diffs/IFR_BaseC.h.diff
+//      patch < diffs/IFR_BaseC.i.diff
+//      patch < diffs/IFR_BaseC.cpp.diff
+//
+//   If this fails for some reason, the files must be patched
+//   by hand, and the diff files regenerated with
+//
+//      diff -wbu orig/IFR_BaseC.h IRR_BaseC.h > diffs/IFR_BaseC.h.diff
+//      diff -wbu orig/IFR_BaseC.i IRR_BaseC.i > diffs/IFR_BaseC.i.diff
+//      diff -wbu orig/IFR_BaseC.cpp IRR_BaseC.cpp > diffs/IFR_BaseC.cpp.diff
+//
+//   5. Restore IFR_Base.pidl.
+//
 //   To regenerate the skeleton files IFR_BaseS.{h,i,cpp} and 
 //   IFR_BaseS_T.{h,i.cpp} in ACE_ROOT/TAO/orbsvcs/IFR_Service, use the 
 //   command
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index aa20fddce5b..e6629834115 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -21,6 +21,7 @@
 
 #include "IFR_BaseC.h"
 #include "tao/corbafwd.h"
+#include "tao/ClientRequestInfo.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
@@ -34,6 +35,189 @@
 #include "IFR_BaseC.i"
 #endif /* !defined INLINE */
 
+// *************************************************************
+// Operations for class CORBA_IRObject_var
+// *************************************************************
+
+CORBA_IRObject_var::CORBA_IRObject_var (void) // default constructor
+  : ptr_ (CORBA_IRObject::_nil ())
+{}
+
+::CORBA_IRObject_ptr
+CORBA_IRObject_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_IRObject_var::CORBA_IRObject_var (const ::CORBA_IRObject_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_IRObject::_duplicate (p.ptr ()))
+{}
+
+CORBA_IRObject_var::~CORBA_IRObject_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_IRObject_var &
+CORBA_IRObject_var::operator= (CORBA_IRObject_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_IRObject_var &
+CORBA_IRObject_var::operator= (const ::CORBA_IRObject_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_IRObject::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_IRObject_var::operator const ::CORBA_IRObject_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_IRObject_var::operator ::CORBA_IRObject_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_IRObject_ptr
+CORBA_IRObject_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_IRObject_ptr
+CORBA_IRObject_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_IRObject_ptr &
+CORBA_IRObject_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_IRObject_ptr &
+CORBA_IRObject_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_IRObject::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_IRObject_ptr
+CORBA_IRObject_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_IRObject_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_IRObject::_nil ();
+  return val;
+}
+
+::CORBA_IRObject_ptr
+CORBA_IRObject_var::duplicate (CORBA_IRObject_ptr p)
+{
+  return ::CORBA_IRObject::_duplicate (p);
+}
+
+void
+CORBA_IRObject_var::release (CORBA_IRObject_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_IRObject_ptr
+CORBA_IRObject_var::nil (void)
+{
+  return ::CORBA_IRObject::_nil ();
+}
+
+::CORBA_IRObject_ptr
+CORBA_IRObject_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_IRObject::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_IRObject_var::upcast (void *src)
+{
+  CORBA_IRObject **tmp =
+    ACE_static_cast (CORBA_IRObject **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_IRObject_out
+// *************************************************************
+
+CORBA_IRObject_out::CORBA_IRObject_out (CORBA_IRObject_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_IRObject::_nil ();
+}
+
+CORBA_IRObject_out::CORBA_IRObject_out (CORBA_IRObject_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_IRObject::_nil ();
+}
+
+CORBA_IRObject_out::CORBA_IRObject_out (const ::CORBA_IRObject_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_IRObject_out &, p).ptr_)
+{}
+
+::CORBA_IRObject_out &
+CORBA_IRObject_out::operator= (const ::CORBA_IRObject_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_IRObject_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_IRObject_out &
+CORBA_IRObject_out::operator= (const ::CORBA_IRObject_var &p)
+{
+  this->ptr_ = ::CORBA_IRObject::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_IRObject_out &
+CORBA_IRObject_out::operator= (CORBA_IRObject_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_IRObject_out::operator ::CORBA_IRObject_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_IRObject_ptr &
+CORBA_IRObject_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_IRObject_ptr
+CORBA_IRObject_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get : public TAO_ClientRequestInfo
 {
@@ -215,15 +399,15 @@ TAO_ClientRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TR
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_IRObject_Proxy_Impl::_TAO_IRObject_Proxy_Impl (void)
+_TAO_CORBA_IRObject_Proxy_Impl::_TAO_CORBA_IRObject_Proxy_Impl (void)
 {}
 
-_TAO_IRObject_Remote_Proxy_Impl::_TAO_IRObject_Remote_Proxy_Impl (void)
+_TAO_CORBA_IRObject_Remote_Proxy_Impl::_TAO_CORBA_IRObject_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::DefinitionKind _TAO_IRObject_Remote_Proxy_Impl::def_kind (
+CORBA::DefinitionKind _TAO_CORBA_IRObject_Remote_Proxy_Impl::def_kind (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -381,7 +565,7 @@ CORBA::DefinitionKind _TAO_IRObject_Remote_Proxy_Impl::def_kind (
   return _tao_retval;
 }
 
-void _TAO_IRObject_Remote_Proxy_Impl::destroy (
+void _TAO_CORBA_IRObject_Remote_Proxy_Impl::destroy (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -532,36 +716,36 @@ void _TAO_IRObject_Remote_Proxy_Impl::destroy (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_IRObject_Proxy_Broker::_TAO_IRObject_Proxy_Broker (void)
+_TAO_CORBA_IRObject_Proxy_Broker::_TAO_CORBA_IRObject_Proxy_Broker (void)
 {
 }
 
-_TAO_IRObject_Proxy_Broker::~_TAO_IRObject_Proxy_Broker (void)
+_TAO_CORBA_IRObject_Proxy_Broker::~_TAO_CORBA_IRObject_Proxy_Broker (void)
 {
 }
 
-_TAO_IRObject_Proxy_Broker * (*CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_IRObject_Proxy_Broker * (*_TAO_CORBA_IRObject_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_IRObject_Remote_Proxy_Broker *
-_TAO_IRObject_Remote_Proxy_Broker::the_TAO_IRObject_Remote_Proxy_Broker (void)
+_TAO_CORBA_IRObject_Remote_Proxy_Broker *
+_TAO_CORBA_IRObject_Remote_Proxy_Broker::the_TAO_CORBA_IRObject_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_IRObject_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_IRObject_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_IRObject_Remote_Proxy_Broker::_TAO_IRObject_Remote_Proxy_Broker (void)
+_TAO_CORBA_IRObject_Remote_Proxy_Broker::_TAO_CORBA_IRObject_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_IRObject_Remote_Proxy_Broker::~_TAO_IRObject_Remote_Proxy_Broker (void)
+_TAO_CORBA_IRObject_Remote_Proxy_Broker::~_TAO_CORBA_IRObject_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_IRObject_Proxy_Impl&
-_TAO_IRObject_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_IRObject_Proxy_Impl&
+_TAO_CORBA_IRObject_Remote_Proxy_Broker::select_proxy (
   ::CORBA_IRObject *,
   CORBA::Environment &
 )
@@ -586,70 +770,70 @@ CORBA_IRObject::~CORBA_IRObject (void)
 {}
 
 void
-CORBA::IRObject::CORBA_IRObject_setup_collocation (int collocated)
+CORBA_IRObject::CORBA_IRObject_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_IRObject_Proxy_Broker_ =
-      ::CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_IRObject_Proxy_Broker_ =
+      ::_TAO_CORBA_IRObject_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_IRObject_Proxy_Broker_ =
-      ::_TAO_IRObject_Remote_Proxy_Broker::the_TAO_IRObject_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_IRObject_Proxy_Broker_ =
+      ::_TAO_CORBA_IRObject_Remote_Proxy_Broker::the_TAO_CORBA_IRObject_Remote_Proxy_Broker ();
 }
 
-void CORBA::IRObject::_tao_any_destructor (void *x)
+void CORBA_IRObject::_tao_any_destructor (void *x)
 {
   CORBA_IRObject *tmp = ACE_static_cast (CORBA_IRObject*,x);
   CORBA::release (tmp);
 }
 
-CORBA::IRObject_ptr CORBA::IRObject::_narrow (
+CORBA_IRObject_ptr CORBA_IRObject::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::IRObject::_nil ();
+    return CORBA_IRObject::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IRObject:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::IRObject::_nil ());
+      ACE_CHECK_RETURN (CORBA_IRObject::_nil ());
       if (is_a == 0)
-        return CORBA::IRObject::_nil ();
+        return CORBA_IRObject::_nil ();
     }
-  return CORBA::IRObject::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_IRObject::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::IRObject_ptr CORBA::IRObject::_unchecked_narrow (
+CORBA_IRObject_ptr CORBA_IRObject::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::IRObject::_nil ();
+    return CORBA_IRObject::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::IRObject_ptr default_proxy = CORBA::IRObject::_nil ();
+      CORBA_IRObject_ptr default_proxy = CORBA_IRObject::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_IRObject_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::IRObject (
+          ::CORBA_IRObject (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::IRObject::_nil ());
+          CORBA_IRObject::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::IRObject (stub, 0, obj->_servant ()), CORBA::IRObject::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_IRObject (stub, 0, obj->_servant ()), CORBA_IRObject::_nil ());
         return default_proxy;
       }
     else 
@@ -668,15 +852,15 @@ CORBA::IRObject_ptr CORBA::IRObject::_unchecked_narrow (
           );
 }
 
-CORBA::IRObject_ptr
-CORBA::IRObject::_duplicate (CORBA::IRObject_ptr obj)
+CORBA_IRObject_ptr
+CORBA_IRObject::_duplicate (CORBA_IRObject_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::IRObject::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_IRObject::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
@@ -686,12 +870,12 @@ CORBA::Boolean CORBA::IRObject::_is_a (const CORBA::Char *value, CORBA::Environm
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::IRObject::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_IRObject::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
@@ -702,20 +886,20 @@ void *CORBA::IRObject::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::IRObject::_interface_repository_id (void) const
+const char* CORBA_IRObject::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/IRObject:1.0";
 }
 
-CORBA::DefinitionKind CORBA::IRObject::def_kind (
+CORBA::DefinitionKind CORBA_IRObject::def_kind (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_IRObject_Proxy_Impl &proxy = 
-    this->the_TAO_IRObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_IRObject_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_IRObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN ((CORBA::DefinitionKind)0);
   
   return proxy.def_kind (
@@ -724,15 +908,15 @@ CORBA::DefinitionKind CORBA::IRObject::def_kind (
     );
 }
 
-void CORBA::IRObject::destroy (
+void CORBA_IRObject::destroy (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_IRObject_Proxy_Impl &proxy = 
-    this->the_TAO_IRObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_IRObject_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_IRObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.destroy (
@@ -741,6 +925,189 @@ void CORBA::IRObject::destroy (
     );
 }
 
+// *************************************************************
+// Operations for class CORBA_Contained_var
+// *************************************************************
+
+CORBA_Contained_var::CORBA_Contained_var (void) // default constructor
+  : ptr_ (CORBA_Contained::_nil ())
+{}
+
+::CORBA_Contained_ptr
+CORBA_Contained_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_Contained_var::CORBA_Contained_var (const ::CORBA_Contained_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_Contained::_duplicate (p.ptr ()))
+{}
+
+CORBA_Contained_var::~CORBA_Contained_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_Contained_var &
+CORBA_Contained_var::operator= (CORBA_Contained_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_Contained_var &
+CORBA_Contained_var::operator= (const ::CORBA_Contained_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_Contained::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_Contained_var::operator const ::CORBA_Contained_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_Contained_var::operator ::CORBA_Contained_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_Contained_ptr
+CORBA_Contained_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_Contained_ptr
+CORBA_Contained_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_Contained_ptr &
+CORBA_Contained_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_Contained_ptr &
+CORBA_Contained_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_Contained::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_Contained_ptr
+CORBA_Contained_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_Contained_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_Contained::_nil ();
+  return val;
+}
+
+::CORBA_Contained_ptr
+CORBA_Contained_var::duplicate (CORBA_Contained_ptr p)
+{
+  return ::CORBA_Contained::_duplicate (p);
+}
+
+void
+CORBA_Contained_var::release (CORBA_Contained_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_Contained_ptr
+CORBA_Contained_var::nil (void)
+{
+  return ::CORBA_Contained::_nil ();
+}
+
+::CORBA_Contained_ptr
+CORBA_Contained_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_Contained::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_Contained_var::upcast (void *src)
+{
+  CORBA_Contained **tmp =
+    ACE_static_cast (CORBA_Contained **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_Contained_out
+// *************************************************************
+
+CORBA_Contained_out::CORBA_Contained_out (CORBA_Contained_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_Contained::_nil ();
+}
+
+CORBA_Contained_out::CORBA_Contained_out (CORBA_Contained_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_Contained::_nil ();
+}
+
+CORBA_Contained_out::CORBA_Contained_out (const ::CORBA_Contained_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_Contained_out &, p).ptr_)
+{}
+
+::CORBA_Contained_out &
+CORBA_Contained_out::operator= (const ::CORBA_Contained_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_Contained_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_Contained_out &
+CORBA_Contained_out::operator= (const ::CORBA_Contained_var &p)
+{
+  this->ptr_ = ::CORBA_Contained::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_Contained_out &
+CORBA_Contained_out::operator= (CORBA_Contained_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_Contained_out::operator ::CORBA_Contained_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_Contained_ptr &
+CORBA_Contained_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_Contained_ptr
+CORBA_Contained_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_Contained_id_get : public TAO_ClientRequestInfo
 {
@@ -1325,13 +1692,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::Container_ptr result);
+  void result (CORBA_Container_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Contained_defined_in_get (const TAO_ClientRequestInfo_CORBA_Contained_defined_in_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_Contained_defined_in_get &);
 
-  CORBA::Container_ptr _result;
+  CORBA_Container_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::TAO_ClientRequestInfo_CORBA_Contained_defined_in_get (
@@ -1384,7 +1751,7 @@ TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::result (CORBA::Environment
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::result (CORBA::Container_ptr result)
+TAO_ClientRequestInfo_CORBA_Contained_defined_in_get::result (CORBA_Container_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -1511,13 +1878,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::Repository_ptr result);
+  void result (CORBA_Repository_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get (const TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get &);
 
-  CORBA::Repository_ptr _result;
+  CORBA_Repository_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get (
@@ -1553,8 +1920,24 @@ TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::exceptions (COR
 }
 
 
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
 void 
-TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::result (CORBA::Repository_ptr result)
+TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::result (CORBA_Repository_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -1588,13 +1971,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::Contained::Description * result);
+  void result (CORBA_Contained::Description * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Contained_describe (const TAO_ClientRequestInfo_CORBA_Contained_describe &);
   void operator= (const TAO_ClientRequestInfo_CORBA_Contained_describe &);
 
-  CORBA::Contained::Description * _result;
+  CORBA_Contained::Description * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Contained_describe::TAO_ClientRequestInfo_CORBA_Contained_describe (
@@ -1647,7 +2030,7 @@ TAO_ClientRequestInfo_CORBA_Contained_describe::result (CORBA::Environment &ACE_
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_Contained_describe::result (CORBA::Contained::Description * result)
+TAO_ClientRequestInfo_CORBA_Contained_describe::result (CORBA_Contained::Description * result)
 {
   // update the result 
   this->_result = result;
@@ -1659,7 +2042,7 @@ public:
   TAO_ClientRequestInfo_CORBA_Contained_move (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -1688,7 +2071,7 @@ private:
   TAO_ClientRequestInfo_CORBA_Contained_move (const TAO_ClientRequestInfo_CORBA_Contained_move &);
   void operator= (const TAO_ClientRequestInfo_CORBA_Contained_move &);
 
-  CORBA::Container_ptr new_container_;
+  CORBA_Container_ptr new_container_;
   const char * new_name_;
   const char * new_version_;
   
@@ -1697,7 +2080,7 @@ private:
 TAO_ClientRequestInfo_CORBA_Contained_move::TAO_ClientRequestInfo_CORBA_Contained_move (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::Container_ptr new_container,
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &    
@@ -1770,15 +2153,15 @@ TAO_ClientRequestInfo_CORBA_Contained_move::result (CORBA::Environment &ACE_TRY_
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_Contained_Proxy_Impl::_TAO_Contained_Proxy_Impl (void)
+_TAO_CORBA_Contained_Proxy_Impl::_TAO_CORBA_Contained_Proxy_Impl (void)
 {}
 
-_TAO_Contained_Remote_Proxy_Impl::_TAO_Contained_Remote_Proxy_Impl (void)
+_TAO_CORBA_Contained_Remote_Proxy_Impl::_TAO_CORBA_Contained_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-char * _TAO_Contained_Remote_Proxy_Impl::id (
+char * _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1937,7 +2320,7 @@ char * _TAO_Contained_Remote_Proxy_Impl::id (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_Contained_Remote_Proxy_Impl::id (
+void _TAO_CORBA_Contained_Remote_Proxy_Impl::id (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
@@ -2089,7 +2472,7 @@ void _TAO_Contained_Remote_Proxy_Impl::id (
   
 }
 
-char * _TAO_Contained_Remote_Proxy_Impl::name (
+char * _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2248,7 +2631,7 @@ char * _TAO_Contained_Remote_Proxy_Impl::name (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_Contained_Remote_Proxy_Impl::name (
+void _TAO_CORBA_Contained_Remote_Proxy_Impl::name (
     CORBA_Object *_collocated_tao_target_,
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
@@ -2400,7 +2783,7 @@ void _TAO_Contained_Remote_Proxy_Impl::name (
   
 }
 
-char * _TAO_Contained_Remote_Proxy_Impl::version (
+char * _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2559,7 +2942,7 @@ char * _TAO_Contained_Remote_Proxy_Impl::version (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_Contained_Remote_Proxy_Impl::version (
+void _TAO_CORBA_Contained_Remote_Proxy_Impl::version (
     CORBA_Object *_collocated_tao_target_,
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
@@ -2711,7 +3094,7 @@ void _TAO_Contained_Remote_Proxy_Impl::version (
   
 }
 
-CORBA::Container_ptr _TAO_Contained_Remote_Proxy_Impl::defined_in (
+CORBA_Container_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::defined_in (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2720,8 +3103,8 @@ CORBA::Container_ptr _TAO_Contained_Remote_Proxy_Impl::defined_in (
   ))
 {
   
-  CORBA::Container_ptr _tao_retval = CORBA::Container::_nil ();
-  CORBA::Container_var _tao_safe_retval (_tao_retval);
+  CORBA_Container_ptr _tao_retval = CORBA_Container::_nil ();
+  CORBA_Container_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -2805,7 +3188,7 @@ CORBA::Container_ptr _TAO_Contained_Remote_Proxy_Impl::defined_in (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::Container_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_Container_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -2871,7 +3254,7 @@ CORBA::Container_ptr _TAO_Contained_Remote_Proxy_Impl::defined_in (
   return _tao_safe_retval._retn ();
 }
 
-char * _TAO_Contained_Remote_Proxy_Impl::absolute_name (
+char * _TAO_CORBA_Contained_Remote_Proxy_Impl::absolute_name (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3030,7 +3413,167 @@ char * _TAO_Contained_Remote_Proxy_Impl::absolute_name (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::Contained::Description * _TAO_Contained_Remote_Proxy_Impl::describe (
+CORBA_Repository_ptr _TAO_CORBA_Contained_Remote_Proxy_Impl::containing_repository (
+    CORBA_Object *_collocated_tao_target_,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  
+  CORBA_Repository_ptr _tao_retval = tao_CORBA_Repository_nil ();
+  CORBA_Repository_var _tao_safe_retval (_tao_retval);
+  
+  
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (istub == 0)
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "_get_containing_repository",
+      26,
+      0,
+      istub->orb_core ()
+    );
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors ()
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get ri (
+        &_tao_call,
+        _collocated_tao_target_,
+        ACE_TRY_ENV
+      );
+      ACE_CHECK_RETURN (0);
+      
+      ACE_TRY
+        {
+#endif /* TAO_HAS_INTERCEPTORS */
+        
+          _tao_call.start (ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+          TAO_INTERCEPTOR (ri.response_expected (1));
+          
+          TAO_INTERCEPTOR (
+            _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag),
+              ACE_TRY_ENV
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          _invoke_status =
+            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          if (!(
+                            (_tao_in >> _tao_safe_retval.inout ())
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_INTERCEPTOR (
+              CORBA_Repository_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              ri.result (_tao_retval_info);
+              _tao_safe_retval = _tao_retval_info;
+            );
+          
+          TAO_INTERCEPTOR (
+            ri.reply_status (_invoke_status);
+            if (_invoke_status == TAO_INVOKE_OK)
+              {
+                _tao_vfr.receive_reply (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            else
+              {
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+#if TAO_HAS_INTERCEPTORS == 1
+        }
+      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+        {
+          _invoke_status =
+            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          
+          ri.forward_reference (exc); 
+          _tao_vfr.receive_other (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        {
+          _tao_call.restart_flag (1);
+          continue;
+        }
+      
+      break;
+    }
+  return _tao_safe_retval._retn ();
+}
+
+CORBA_Contained::Description * _TAO_CORBA_Contained_Remote_Proxy_Impl::describe (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3039,15 +3582,15 @@ CORBA::Contained::Description * _TAO_Contained_Remote_Proxy_Impl::describe (
   ))
 {
   
-  CORBA::Contained::Description *_tao_retval = 0;
+  CORBA_Contained::Description *_tao_retval = 0;
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::Contained::Description, _tao_retval);
-  CORBA::Contained::Description_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_Contained::Description, _tao_retval);
+  CORBA_Contained::Description_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "describe",
@@ -3124,7 +3667,7 @@ CORBA::Contained::Description * _TAO_Contained_Remote_Proxy_Impl::describe (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::Contained::Description * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_Contained::Description * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -3190,9 +3733,9 @@ CORBA::Contained::Description * _TAO_Contained_Remote_Proxy_Impl::describe (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_Contained_Remote_Proxy_Impl::move (
+void _TAO_CORBA_Contained_Remote_Proxy_Impl::move (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::Container_ptr new_container,
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -3358,36 +3901,36 @@ void _TAO_Contained_Remote_Proxy_Impl::move (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_Contained_Proxy_Broker::_TAO_Contained_Proxy_Broker (void)
+_TAO_CORBA_Contained_Proxy_Broker::_TAO_CORBA_Contained_Proxy_Broker (void)
 {
 }
 
-_TAO_Contained_Proxy_Broker::~_TAO_Contained_Proxy_Broker (void)
+_TAO_CORBA_Contained_Proxy_Broker::~_TAO_CORBA_Contained_Proxy_Broker (void)
 {
 }
 
-_TAO_Contained_Proxy_Broker * (*CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_Contained_Proxy_Broker * (*_TAO_CORBA_Contained_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_Contained_Remote_Proxy_Broker *
-_TAO_Contained_Remote_Proxy_Broker::the_TAO_Contained_Remote_Proxy_Broker (void)
+_TAO_CORBA_Contained_Remote_Proxy_Broker *
+_TAO_CORBA_Contained_Remote_Proxy_Broker::the_TAO_CORBA_Contained_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_Contained_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_Contained_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_Contained_Remote_Proxy_Broker::_TAO_Contained_Remote_Proxy_Broker (void)
+_TAO_CORBA_Contained_Remote_Proxy_Broker::_TAO_CORBA_Contained_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_Contained_Remote_Proxy_Broker::~_TAO_Contained_Remote_Proxy_Broker (void)
+_TAO_CORBA_Contained_Remote_Proxy_Broker::~_TAO_CORBA_Contained_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_Contained_Proxy_Impl&
-_TAO_Contained_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_Contained_Proxy_Impl&
+_TAO_CORBA_Contained_Remote_Proxy_Broker::select_proxy (
   ::CORBA_Contained *,
   CORBA::Environment &
 )
@@ -3412,72 +3955,72 @@ CORBA_Contained::~CORBA_Contained (void)
 {}
 
 void
-CORBA::Contained::CORBA_Contained_setup_collocation (int collocated)
+CORBA_Contained::CORBA_Contained_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_Contained_Proxy_Broker_ =
-      ::CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_Contained_Proxy_Broker_ =
+      ::_TAO_CORBA_Contained_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_Contained_Proxy_Broker_ =
-      ::_TAO_Contained_Remote_Proxy_Broker::the_TAO_Contained_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_Contained_Proxy_Broker_ =
+      ::_TAO_CORBA_Contained_Remote_Proxy_Broker::the_TAO_CORBA_Contained_Remote_Proxy_Broker ();
   
   this->CORBA_IRObject_setup_collocation (collocated);
 }
 
-void CORBA::Contained::_tao_any_destructor (void *x)
+void CORBA_Contained::_tao_any_destructor (void *x)
 {
   CORBA_Contained *tmp = ACE_static_cast (CORBA_Contained*,x);
   CORBA::release (tmp);
 }
 
-CORBA::Contained_ptr CORBA::Contained::_narrow (
+CORBA_Contained_ptr CORBA_Contained::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::Contained::_nil ();
+    return CORBA_Contained::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Contained:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::Contained::_nil ());
+      ACE_CHECK_RETURN (CORBA_Contained::_nil ());
       if (is_a == 0)
-        return CORBA::Contained::_nil ();
+        return CORBA_Contained::_nil ();
     }
-  return CORBA::Contained::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_Contained::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::Contained_ptr CORBA::Contained::_unchecked_narrow (
+CORBA_Contained_ptr CORBA_Contained::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::Contained::_nil ();
+    return CORBA_Contained::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::Contained_ptr default_proxy = CORBA::Contained::_nil ();
+      CORBA_Contained_ptr default_proxy = CORBA_Contained::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_Contained_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::Contained (
+          ::CORBA_Contained (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::Contained::_nil ());
+          CORBA_Contained::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::Contained (stub, 0, obj->_servant ()), CORBA::Contained::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_Contained (stub, 0, obj->_servant ()), CORBA_Contained::_nil ());
         return default_proxy;
       }
     else 
@@ -3496,15 +4039,15 @@ CORBA::Contained_ptr CORBA::Contained::_unchecked_narrow (
           );
 }
 
-CORBA::Contained_ptr
-CORBA::Contained::_duplicate (CORBA::Contained_ptr obj)
+CORBA_Contained_ptr
+CORBA_Contained::_duplicate (CORBA_Contained_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::Contained::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_Contained::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
@@ -3515,22 +4058,22 @@ CORBA::Boolean CORBA::Contained::_is_a (const CORBA::Char *value, CORBA::Environ
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::Contained::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_Contained::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -3543,20 +4086,20 @@ void *CORBA::Contained::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::Contained::_interface_repository_id (void) const
+const char* CORBA_Contained::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/Contained:1.0";
 }
 
-char * CORBA::Contained::id (
+char * CORBA_Contained::id (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.id (
@@ -3565,7 +4108,7 @@ char * CORBA::Contained::id (
     );
 }
 
-void CORBA::Contained::id (
+void CORBA_Contained::id (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3573,8 +4116,8 @@ void CORBA::Contained::id (
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.id (
@@ -3584,15 +4127,15 @@ void CORBA::Contained::id (
     );
 }
 
-char * CORBA::Contained::name (
+char * CORBA_Contained::name (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.name (
@@ -3601,7 +4144,7 @@ char * CORBA::Contained::name (
     );
 }
 
-void CORBA::Contained::name (
+void CORBA_Contained::name (
     const char * name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3609,8 +4152,8 @@ void CORBA::Contained::name (
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.name (
@@ -3620,15 +4163,15 @@ void CORBA::Contained::name (
     );
 }
 
-char * CORBA::Contained::version (
+char * CORBA_Contained::version (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.version (
@@ -3637,7 +4180,7 @@ char * CORBA::Contained::version (
     );
 }
 
-void CORBA::Contained::version (
+void CORBA_Contained::version (
     const char * version,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3645,8 +4188,8 @@ void CORBA::Contained::version (
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.version (
@@ -3656,15 +4199,15 @@ void CORBA::Contained::version (
     );
 }
 
-CORBA::Container_ptr CORBA::Contained::defined_in (
+CORBA_Container_ptr CORBA_Contained::defined_in (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.defined_in (
@@ -3673,15 +4216,15 @@ CORBA::Container_ptr CORBA::Contained::defined_in (
     );
 }
 
-char * CORBA::Contained::absolute_name (
+char * CORBA_Contained::absolute_name (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.absolute_name (
@@ -3690,15 +4233,15 @@ char * CORBA::Contained::absolute_name (
     );
 }
 
-CORBA::Repository_ptr CORBA::Contained::containing_repository (
+CORBA_Repository_ptr CORBA_Contained::containing_repository (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.containing_repository (
@@ -3876,27 +4419,27 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Contained_Description (
     sizeof (_oc_CORBA_Contained_Description),
     (char *) &_oc_CORBA_Contained_Description,
     0,
-    sizeof (CORBA::Contained::Description)
+    sizeof (CORBA_Contained::Description)
   );
 
-CORBA::TypeCode_ptr CORBA::Contained::_tc_Description =
+CORBA::TypeCode_ptr CORBA_Contained::_tc_Description =
   &_tc_TAO_tc_CORBA_Contained_Description;
 
-void CORBA::Contained::Description::_tao_any_destructor (void *x)
+void CORBA_Contained::Description::_tao_any_destructor (void *x)
 {
   Description *tmp = ACE_static_cast (Description*,x);
   delete tmp;
 }
 
-CORBA::Contained::Description * CORBA::Contained::describe (
+CORBA_Contained::Description * CORBA_Contained::describe (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.describe (
@@ -3905,8 +4448,8 @@ CORBA::Contained::Description * CORBA::Contained::describe (
     );
 }
 
-void CORBA::Contained::move (
-    CORBA::Container_ptr new_container,
+void CORBA_Contained::move (
+    CORBA_Container_ptr new_container,
     const char * new_name,
     const char * new_version,
     CORBA::Environment &ACE_TRY_ENV
@@ -3915,8 +4458,8 @@ void CORBA::Contained::move (
     CORBA::SystemException
   ))
 {
-  _TAO_Contained_Proxy_Impl &proxy = 
-    this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Contained_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.move (
@@ -3928,7 +4471,6 @@ void CORBA::Contained::move (
     );
 }
 
-
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CS_)
@@ -3945,14 +4487,21 @@ void CORBA::Contained::move (
     {
       CORBA_Contained **old = ACE_reinterpret_cast (CORBA_Contained**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = CORBA_Contained::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
+        {
+          if (!this->release_)
+            {
+              tmp[i] = CORBA_Contained::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
       
+      if (this->release_)
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
@@ -3963,11 +4512,13 @@ void CORBA::Contained::move (
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     CORBA_Contained **tmp = ACE_reinterpret_cast (CORBA_Contained**, this->buffer_);
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA_Contained::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = CORBA_Contained::_nil ();
+      }
+    
     _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
     this->buffer_ = 0;
   }
@@ -3983,11 +4534,12 @@ void CORBA::Contained::move (
     CORBA_Contained **tmp = ACE_reinterpret_cast (CORBA_Contained**, this->buffer_);
     
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA_Contained::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = CORBA_Contained::_nil ();
+      }
   }
+  
   void 
   _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_downcast (
       void* target,
@@ -4026,16 +4578,16 @@ CORBA_ContainedSeq::CORBA_ContainedSeq (CORBA::ULong max) // uses max size
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::Contained,CORBA::Contained_var>
+  TAO_Unbounded_Object_Sequence<CORBA_Contained,CORBA_Contained_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA_ContainedSeq::CORBA_ContainedSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Contained_ptr *buffer, CORBA::Boolean release)
+CORBA_ContainedSeq::CORBA_ContainedSeq (CORBA::ULong max, CORBA::ULong length, CORBA_Contained_ptr *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::Contained,CORBA::Contained_var>
+  TAO_Unbounded_Object_Sequence<CORBA_Contained,CORBA_Contained_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
@@ -4044,7 +4596,7 @@ CORBA_ContainedSeq::CORBA_ContainedSeq (const CORBA_ContainedSeq &seq) // copy c
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::Contained,CORBA::Contained_var>
+  TAO_Unbounded_Object_Sequence<CORBA_Contained,CORBA_Contained_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
@@ -4059,12 +4611,569 @@ void CORBA_ContainedSeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
-void CORBA::StructMember::_tao_any_destructor (void *x)
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CS_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CS_
+
+  // The Base_Sequence functions, please see tao/Sequence.h
+  void
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
+  {
+    CORBA_InterfaceDef **tmp = 0;
+    tmp = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (length);
+    
+    if (this->buffer_ != 0)
+    {
+      CORBA_InterfaceDef **old = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = tao_CORBA_InterfaceDef_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete[] old;
+        }
+    }
+    this->buffer_ = tmp;
+  }
+  
+  void
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_deallocate_buffer (void)
+  {
+    if (this->buffer_ == 0 || this->release_ == 0)
+      return;
+    CORBA_InterfaceDef **tmp = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      {
+        tao_CORBA_InterfaceDef_release (tmp[i]);
+        tmp[i] = tao_CORBA_InterfaceDef_nil ();
+      }
+    
+    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (tmp);
+    this->buffer_ = 0;
+  }
+  
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void)
+  {
+    this->_deallocate_buffer ();
+  }
+  
+  void
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+  {
+    CORBA_InterfaceDef **tmp = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
+    
+    for (CORBA::ULong i = nl; i < ol; ++i)
+      {
+        tao_CORBA_InterfaceDef_release (tmp[i]);
+        tmp[i] = tao_CORBA_InterfaceDef_nil ();
+      }
+  }
+  
+  void 
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_downcast (
+      void* target,
+      CORBA_Object *src,
+      CORBA_Environment &ACE_TRY_ENV
+    )
+  {
+    CORBA_InterfaceDef **tmp = ACE_static_cast (CORBA_InterfaceDef**, target);
+    *tmp = tao_CORBA_InterfaceDef_narrow (src, ACE_TRY_ENV);
+    ACE_CHECK;
+  }
+
+  CORBA_Object*
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_upcast (void *src) const
+  {
+    return tao_CORBA_InterfaceDef_upcast (src);
+  }
+  
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_INTERFACEDEFSEQ_CS_)
+#define _CORBA_INTERFACEDEFSEQ_CS_
+
+// *************************************************************
+// CORBA_InterfaceDefSeq
+// *************************************************************
+
+CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (void)
+{}
+CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (CORBA::ULong max) // uses max size
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA_InterfaceDef_ptr *buffer, CORBA::Boolean release)
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (const CORBA_InterfaceDefSeq &seq) // copy ctor
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+CORBA_InterfaceDefSeq::~CORBA_InterfaceDefSeq (void) // dtor
+{}
+void CORBA_InterfaceDefSeq::_tao_any_destructor (void *x)
+{
+  CORBA_InterfaceDefSeq *tmp = ACE_static_cast (CORBA_InterfaceDefSeq*,x);
+  delete tmp;
+}
+
+
+#endif /* end #if !defined */
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CS_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CS_
+
+  // The Base_Sequence functions, please see tao/Sequence.h
+  void
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_allocate_buffer (CORBA::ULong length)
+  {
+    CORBA_ValueDef **tmp = 0;
+    tmp = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (length);
+    
+    if (this->buffer_ != 0)
+    {
+      CORBA_ValueDef **old = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = tao_CORBA_ValueDef_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete[] old;
+        }
+    }
+    this->buffer_ = tmp;
+  }
+  
+  void
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_deallocate_buffer (void)
+  {
+    if (this->buffer_ == 0 || this->release_ == 0)
+      return;
+    CORBA_ValueDef **tmp = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      {
+        tao_CORBA_ValueDef_release (tmp[i]);
+        tmp[i] = tao_CORBA_ValueDef_nil ();
+      }
+    
+    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (tmp);
+    this->buffer_ = 0;
+  }
+  
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void)
+  {
+    this->_deallocate_buffer ();
+  }
+  
+  void
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+  {
+    CORBA_ValueDef **tmp = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
+    
+    for (CORBA::ULong i = nl; i < ol; ++i)
+      {
+        tao_CORBA_ValueDef_release (tmp[i]);
+        tmp[i] = tao_CORBA_ValueDef_nil ();
+      }
+  }
+  
+  void 
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_downcast (
+      void* target,
+      CORBA_Object *src,
+      CORBA_Environment &ACE_TRY_ENV
+    )
+  {
+    CORBA_ValueDef **tmp = ACE_static_cast (CORBA_ValueDef**, target);
+    *tmp = tao_CORBA_ValueDef_narrow (src, ACE_TRY_ENV);
+    ACE_CHECK;
+  }
+
+  CORBA_Object*
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_upcast (void *src) const
+  {
+    return tao_CORBA_ValueDef_upcast (src);
+  }
+  
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_VALUEDEFSEQ_CS_)
+#define _CORBA_VALUEDEFSEQ_CS_
+
+// *************************************************************
+// CORBA_ValueDefSeq
+// *************************************************************
+
+CORBA_ValueDefSeq::CORBA_ValueDefSeq (void)
+{}
+CORBA_ValueDefSeq::CORBA_ValueDefSeq (CORBA::ULong max) // uses max size
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+CORBA_ValueDefSeq::CORBA_ValueDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA_ValueDef_ptr *buffer, CORBA::Boolean release)
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+CORBA_ValueDefSeq::CORBA_ValueDefSeq (const CORBA_ValueDefSeq &seq) // copy ctor
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+CORBA_ValueDefSeq::~CORBA_ValueDefSeq (void) // dtor
+{}
+void CORBA_ValueDefSeq::_tao_any_destructor (void *x)
+{
+  CORBA_ValueDefSeq *tmp = ACE_static_cast (CORBA_ValueDefSeq*,x);
+  delete tmp;
+}
+
+
+#endif /* end #if !defined */
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_
+
+  // The Base_Sequence functions, please see tao/Sequence.h
+  void
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
+  {
+    CORBA_AbstractInterfaceDef **tmp = 0;
+    tmp = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (length);
+    
+    if (this->buffer_ != 0)
+    {
+      CORBA_AbstractInterfaceDef **old = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = tao_CORBA_AbstractInterfaceDef_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete[] old;
+        }
+    }
+    this->buffer_ = tmp;
+  }
+  
+  void
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_deallocate_buffer (void)
+  {
+    if (this->buffer_ == 0 || this->release_ == 0)
+      return;
+    CORBA_AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      {
+        tao_CORBA_AbstractInterfaceDef_release (tmp[i]);
+        tmp[i] = tao_CORBA_AbstractInterfaceDef_nil ();
+      }
+    
+    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::freebuf (tmp);
+    this->buffer_ = 0;
+  }
+  
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void)
+  {
+    this->_deallocate_buffer ();
+  }
+  
+  void
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+  {
+    CORBA_AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
+    
+    for (CORBA::ULong i = nl; i < ol; ++i)
+      {
+        tao_CORBA_AbstractInterfaceDef_release (tmp[i]);
+        tmp[i] = tao_CORBA_AbstractInterfaceDef_nil ();
+      }
+  }
+  
+  void 
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_downcast (
+      void* target,
+      CORBA_Object *src,
+      CORBA_Environment &ACE_TRY_ENV
+    )
+  {
+    CORBA_AbstractInterfaceDef **tmp = ACE_static_cast (CORBA_AbstractInterfaceDef**, target);
+    *tmp = tao_CORBA_AbstractInterfaceDef_narrow (src, ACE_TRY_ENV);
+    ACE_CHECK;
+  }
+
+  CORBA_Object*
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_upcast (void *src) const
+  {
+    return tao_CORBA_AbstractInterfaceDef_upcast (src);
+  }
+  
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_)
+#define _CORBA_ABSTRACTINTERFACEDEFSEQ_CS_
+
+// *************************************************************
+// CORBA_AbstractInterfaceDefSeq
+// *************************************************************
+
+CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (void)
+{}
+CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (CORBA::ULong max) // uses max size
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA_AbstractInterfaceDef_ptr *buffer, CORBA::Boolean release)
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (const CORBA_AbstractInterfaceDefSeq &seq) // copy ctor
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+CORBA_AbstractInterfaceDefSeq::~CORBA_AbstractInterfaceDefSeq (void) // dtor
+{}
+void CORBA_AbstractInterfaceDefSeq::_tao_any_destructor (void *x)
+{
+  CORBA_AbstractInterfaceDefSeq *tmp = ACE_static_cast (CORBA_AbstractInterfaceDefSeq*,x);
+  delete tmp;
+}
+
+
+#endif /* end #if !defined */
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CS_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CS_
+
+  // The Base_Sequence functions, please see tao/Sequence.h
+  void
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
+  {
+    CORBA_LocalInterfaceDef **tmp = 0;
+    tmp = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (length);
+    
+    if (this->buffer_ != 0)
+    {
+      CORBA_LocalInterfaceDef **old = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+        {
+          if (!this->release_)
+            {
+              tmp[i] = tao_CORBA_LocalInterfaceDef_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
+      if (this->release_)
+        {
+          delete[] old;
+        }
+    }
+    this->buffer_ = tmp;
+  }
+  
+  void
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_deallocate_buffer (void)
+  {
+    if (this->buffer_ == 0 || this->release_ == 0)
+      return;
+    CORBA_LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
+    
+    for (CORBA::ULong i = 0; i < this->length_; ++i)
+      {
+        tao_CORBA_LocalInterfaceDef_release (tmp[i]);
+        tmp[i] = tao_CORBA_LocalInterfaceDef_nil ();
+      }
+    
+    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::freebuf (tmp);
+    this->buffer_ = 0;
+  }
+  
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void)
+  {
+    this->_deallocate_buffer ();
+  }
+  
+  void
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+  {
+    CORBA_LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
+    
+    for (CORBA::ULong i = nl; i < ol; ++i)
+      {
+        tao_CORBA_LocalInterfaceDef_release (tmp[i]);
+        tmp[i] = tao_CORBA_LocalInterfaceDef_nil ();
+      }
+  }
+  
+  void 
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_downcast (
+      void* target,
+      CORBA_Object *src,
+      CORBA_Environment &ACE_TRY_ENV
+    )
+  {
+    CORBA_LocalInterfaceDef **tmp = ACE_static_cast (CORBA_LocalInterfaceDef**, target);
+    *tmp = tao_CORBA_LocalInterfaceDef_narrow (src, ACE_TRY_ENV);
+    ACE_CHECK;
+  }
+
+  CORBA_Object*
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_upcast (void *src) const
+  {
+    return tao_CORBA_LocalInterfaceDef_upcast (src);
+  }
+  
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CS_)
+#define _CORBA_LOCALINTERFACEDEFSEQ_CS_
+
+// *************************************************************
+// CORBA_LocalInterfaceDefSeq
+// *************************************************************
+
+CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (void)
+{}
+CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (CORBA::ULong max) // uses max size
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max)
+{}
+CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA_LocalInterfaceDef_ptr *buffer, CORBA::Boolean release)
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (max, length, buffer, release)
+{}
+CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (const CORBA_LocalInterfaceDefSeq &seq) // copy ctor
+  : 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ (seq)
+{}
+CORBA_LocalInterfaceDefSeq::~CORBA_LocalInterfaceDefSeq (void) // dtor
+{}
+void CORBA_LocalInterfaceDefSeq::_tao_any_destructor (void *x)
+{
+  CORBA_LocalInterfaceDefSeq *tmp = ACE_static_cast (CORBA_LocalInterfaceDefSeq*,x);
+  delete tmp;
+}
+
+
+#endif /* end #if !defined */
+
+void CORBA_StructMember::_tao_any_destructor (void *x)
 {
   CORBA_StructMember *tmp = ACE_static_cast (CORBA_StructMember*,x);
   delete tmp;
 }
 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_STRUCTMEMBERSEQ_CS_)
@@ -4127,16 +5236,16 @@ CORBA_StructMemberSeq::CORBA_StructMemberSeq (CORBA::ULong max) // uses max size
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::StructMember>
+  TAO_Unbounded_Sequence<CORBA_StructMember>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA_StructMemberSeq::CORBA_StructMemberSeq (CORBA::ULong max, CORBA::ULong length, CORBA::StructMember *buffer, CORBA::Boolean release)
+CORBA_StructMemberSeq::CORBA_StructMemberSeq (CORBA::ULong max, CORBA::ULong length, CORBA_StructMember *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::StructMember>
+  TAO_Unbounded_Sequence<CORBA_StructMember>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
@@ -4145,7 +5254,7 @@ CORBA_StructMemberSeq::CORBA_StructMemberSeq (const CORBA_StructMemberSeq &seq)
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_StructMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::StructMember>
+  TAO_Unbounded_Sequence<CORBA_StructMember>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
@@ -4160,7 +5269,7 @@ void CORBA_StructMemberSeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
-void CORBA::Initializer::_tao_any_destructor (void *x)
+void CORBA_Initializer::_tao_any_destructor (void *x)
 {
   CORBA_Initializer *tmp = ACE_static_cast (CORBA_Initializer*,x);
   delete tmp;
@@ -4229,16 +5338,16 @@ CORBA_InitializerSeq::CORBA_InitializerSeq (CORBA::ULong max) // uses max size
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_InitializerSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Initializer>
+  TAO_Unbounded_Sequence<CORBA_Initializer>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA_InitializerSeq::CORBA_InitializerSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Initializer *buffer, CORBA::Boolean release)
+CORBA_InitializerSeq::CORBA_InitializerSeq (CORBA::ULong max, CORBA::ULong length, CORBA_Initializer *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_InitializerSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Initializer>
+  TAO_Unbounded_Sequence<CORBA_Initializer>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
@@ -4247,7 +5356,7 @@ CORBA_InitializerSeq::CORBA_InitializerSeq (const CORBA_InitializerSeq &seq) //
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_InitializerSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Initializer>
+  TAO_Unbounded_Sequence<CORBA_Initializer>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
@@ -4262,7 +5371,7 @@ void CORBA_InitializerSeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
-void CORBA::UnionMember::_tao_any_destructor (void *x)
+void CORBA_UnionMember::_tao_any_destructor (void *x)
 {
   CORBA_UnionMember *tmp = ACE_static_cast (CORBA_UnionMember*,x);
   delete tmp;
@@ -4331,16 +5440,16 @@ CORBA_UnionMemberSeq::CORBA_UnionMemberSeq (CORBA::ULong max) // uses max size
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::UnionMember>
+  TAO_Unbounded_Sequence<CORBA_UnionMember>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA_UnionMemberSeq::CORBA_UnionMemberSeq (CORBA::ULong max, CORBA::ULong length, CORBA::UnionMember *buffer, CORBA::Boolean release)
+CORBA_UnionMemberSeq::CORBA_UnionMemberSeq (CORBA::ULong max, CORBA::ULong length, CORBA_UnionMember *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::UnionMember>
+  TAO_Unbounded_Sequence<CORBA_UnionMember>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
@@ -4349,7 +5458,7 @@ CORBA_UnionMemberSeq::CORBA_UnionMemberSeq (const CORBA_UnionMemberSeq &seq) //
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_UnionMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::UnionMember>
+  TAO_Unbounded_Sequence<CORBA_UnionMember>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
@@ -4364,7 +5473,6 @@ void CORBA_UnionMemberSeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
-
 #if !defined (_CORBA_ENUMMEMBERSEQ_CS_)
 #define _CORBA_ENUMMEMBERSEQ_CS_
 
@@ -4412,6 +5520,189 @@ void CORBA_EnumMemberSeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
+// *************************************************************
+// Operations for class CORBA_Container_var
+// *************************************************************
+
+CORBA_Container_var::CORBA_Container_var (void) // default constructor
+  : ptr_ (CORBA_Container::_nil ())
+{}
+
+::CORBA_Container_ptr
+CORBA_Container_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_Container_var::CORBA_Container_var (const ::CORBA_Container_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_Container::_duplicate (p.ptr ()))
+{}
+
+CORBA_Container_var::~CORBA_Container_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_Container_var &
+CORBA_Container_var::operator= (CORBA_Container_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_Container_var &
+CORBA_Container_var::operator= (const ::CORBA_Container_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_Container::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_Container_var::operator const ::CORBA_Container_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_Container_var::operator ::CORBA_Container_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_Container_ptr
+CORBA_Container_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_Container_ptr
+CORBA_Container_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_Container_ptr &
+CORBA_Container_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_Container_ptr &
+CORBA_Container_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_Container::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_Container_ptr
+CORBA_Container_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_Container_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_Container::_nil ();
+  return val;
+}
+
+::CORBA_Container_ptr
+CORBA_Container_var::duplicate (CORBA_Container_ptr p)
+{
+  return ::CORBA_Container::_duplicate (p);
+}
+
+void
+CORBA_Container_var::release (CORBA_Container_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_Container_ptr
+CORBA_Container_var::nil (void)
+{
+  return ::CORBA_Container::_nil ();
+}
+
+::CORBA_Container_ptr
+CORBA_Container_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_Container::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_Container_var::upcast (void *src)
+{
+  CORBA_Container **tmp =
+    ACE_static_cast (CORBA_Container **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_Container_out
+// *************************************************************
+
+CORBA_Container_out::CORBA_Container_out (CORBA_Container_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_Container::_nil ();
+}
+
+CORBA_Container_out::CORBA_Container_out (CORBA_Container_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_Container::_nil ();
+}
+
+CORBA_Container_out::CORBA_Container_out (const ::CORBA_Container_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_Container_out &, p).ptr_)
+{}
+
+::CORBA_Container_out &
+CORBA_Container_out::operator= (const ::CORBA_Container_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_Container_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_Container_out &
+CORBA_Container_out::operator= (const ::CORBA_Container_var &p)
+{
+  this->ptr_ = ::CORBA_Container::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_Container_out &
+CORBA_Container_out::operator= (CORBA_Container_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_Container_out::operator ::CORBA_Container_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_Container_ptr &
+CORBA_Container_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_Container_ptr
+CORBA_Container_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_Container_lookup : public TAO_ClientRequestInfo
 {
@@ -4442,14 +5733,14 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::Contained_ptr result);
+  void result (CORBA_Contained_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_lookup (const TAO_ClientRequestInfo_CORBA_Container_lookup &);
   void operator= (const TAO_ClientRequestInfo_CORBA_Container_lookup &);
 
   const char * search_name_;
-  CORBA::Contained_ptr _result;
+  CORBA_Contained_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_lookup::TAO_ClientRequestInfo_CORBA_Container_lookup (
@@ -4511,7 +5802,7 @@ TAO_ClientRequestInfo_CORBA_Container_lookup::result (CORBA::Environment &ACE_TR
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_Container_lookup::result (CORBA::Contained_ptr result)
+TAO_ClientRequestInfo_CORBA_Container_lookup::result (CORBA_Contained_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -4547,7 +5838,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ContainedSeq * result);
+  void result (CORBA_ContainedSeq * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_contents (const TAO_ClientRequestInfo_CORBA_Container_contents &);
@@ -4555,7 +5846,7 @@ private:
 
   const CORBA::DefinitionKind & limit_type_;
   const CORBA::Boolean & exclude_inherited_;
-  CORBA::ContainedSeq * _result;
+  CORBA_ContainedSeq * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_contents::TAO_ClientRequestInfo_CORBA_Container_contents (
@@ -4625,7 +5916,7 @@ TAO_ClientRequestInfo_CORBA_Container_contents::result (CORBA::Environment &ACE_
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_Container_contents::result (CORBA::ContainedSeq * result)
+TAO_ClientRequestInfo_CORBA_Container_contents::result (CORBA_ContainedSeq * result)
 {
   // update the result 
   this->_result = result;
@@ -4663,7 +5954,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ContainedSeq * result);
+  void result (CORBA_ContainedSeq * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_lookup_name (const TAO_ClientRequestInfo_CORBA_Container_lookup_name &);
@@ -4673,7 +5964,7 @@ private:
   const CORBA::Long & levels_to_search_;
   const CORBA::DefinitionKind & limit_type_;
   const CORBA::Boolean & exclude_inherited_;
-  CORBA::ContainedSeq * _result;
+  CORBA_ContainedSeq * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_lookup_name::TAO_ClientRequestInfo_CORBA_Container_lookup_name (
@@ -4757,7 +6048,7 @@ TAO_ClientRequestInfo_CORBA_Container_lookup_name::result (CORBA::Environment &A
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_Container_lookup_name::result (CORBA::ContainedSeq * result)
+TAO_ClientRequestInfo_CORBA_Container_lookup_name::result (CORBA_ContainedSeq * result)
 {
   // update the result 
   this->_result = result;
@@ -4794,7 +6085,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::Container::DescriptionSeq * result);
+  void result (CORBA_Container::DescriptionSeq * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_describe_contents (const TAO_ClientRequestInfo_CORBA_Container_describe_contents &);
@@ -4803,7 +6094,7 @@ private:
   const CORBA::DefinitionKind & limit_type_;
   const CORBA::Boolean & exclude_inherited_;
   const CORBA::Long & max_returned_objs_;
-  CORBA::Container::DescriptionSeq * _result;
+  CORBA_Container::DescriptionSeq * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_describe_contents::TAO_ClientRequestInfo_CORBA_Container_describe_contents (
@@ -4880,7 +6171,7 @@ TAO_ClientRequestInfo_CORBA_Container_describe_contents::result (CORBA::Environm
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_Container_describe_contents::result (CORBA::Container::DescriptionSeq * result)
+TAO_ClientRequestInfo_CORBA_Container_describe_contents::result (CORBA_Container::DescriptionSeq * result)
 {
   // update the result 
   this->_result = result;
@@ -4917,7 +6208,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ModuleDef_ptr result);
+  void result (CORBA_ModuleDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_create_module (const TAO_ClientRequestInfo_CORBA_Container_create_module &);
@@ -4926,7 +6217,7 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::ModuleDef_ptr _result;
+  CORBA_ModuleDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_create_module::TAO_ClientRequestInfo_CORBA_Container_create_module (
@@ -4984,8 +6275,25 @@ TAO_ClientRequestInfo_CORBA_Container_create_module::exceptions (CORBA::Environm
   return exception_list;
 }
 
+
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_Container_create_module::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
 void 
-TAO_ClientRequestInfo_CORBA_Container_create_module::result (CORBA::ModuleDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Container_create_module::result (CORBA_ModuleDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -5000,7 +6308,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -5024,7 +6332,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ConstantDef_ptr result);
+  void result (CORBA_ConstantDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_create_constant (const TAO_ClientRequestInfo_CORBA_Container_create_constant &);
@@ -5033,9 +6341,9 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr type_;
+  CORBA_IDLType_ptr type_;
   const CORBA::Any & value_;
-  CORBA::ConstantDef_ptr _result;
+  CORBA_ConstantDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_create_constant::TAO_ClientRequestInfo_CORBA_Container_create_constant (
@@ -5044,7 +6352,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::TAO_ClientRequestInfo_COR
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &    
   )
@@ -5109,8 +6417,24 @@ TAO_ClientRequestInfo_CORBA_Container_create_constant::exceptions (CORBA::Enviro
 }
 
 
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_Container_create_constant::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
 void 
-TAO_ClientRequestInfo_CORBA_Container_create_constant::result (CORBA::ConstantDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Container_create_constant::result (CORBA_ConstantDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -5125,7 +6449,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -5148,7 +6472,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::StructDef_ptr result);
+  void result (CORBA_StructDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_create_struct (const TAO_ClientRequestInfo_CORBA_Container_create_struct &);
@@ -5157,8 +6481,8 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::StructMemberSeq & members_;
-  CORBA::StructDef_ptr _result;
+  const CORBA_StructMemberSeq & members_;
+  CORBA_StructDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_create_struct::TAO_ClientRequestInfo_CORBA_Container_create_struct (
@@ -5167,7 +6491,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::TAO_ClientRequestInfo_CORBA
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -5225,8 +6549,24 @@ TAO_ClientRequestInfo_CORBA_Container_create_struct::exceptions (CORBA::Environm
 }
 
 
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_Container_create_struct::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
 void 
-TAO_ClientRequestInfo_CORBA_Container_create_struct::result (CORBA::StructDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Container_create_struct::result (CORBA_StructDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -5241,8 +6581,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -5265,7 +6605,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::UnionDef_ptr result);
+  void result (CORBA_UnionDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_create_union (const TAO_ClientRequestInfo_CORBA_Container_create_union &);
@@ -5274,9 +6614,9 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr discriminator_type_;
-  const CORBA::UnionMemberSeq & members_;
-  CORBA::UnionDef_ptr _result;
+  CORBA_IDLType_ptr discriminator_type_;
+  const CORBA_UnionMemberSeq & members_;
+  CORBA_UnionDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_create_union::TAO_ClientRequestInfo_CORBA_Container_create_union (
@@ -5285,8 +6625,8 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::TAO_ClientRequestInfo_CORBA_
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -5351,8 +6691,24 @@ TAO_ClientRequestInfo_CORBA_Container_create_union::exceptions (CORBA::Environme
 }
 
 
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_Container_create_union::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
 void 
-TAO_ClientRequestInfo_CORBA_Container_create_union::result (CORBA::UnionDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Container_create_union::result (CORBA_UnionDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -5367,7 +6723,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -5390,7 +6746,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::EnumDef_ptr result);
+  void result (CORBA_EnumDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_create_enum (const TAO_ClientRequestInfo_CORBA_Container_create_enum &);
@@ -5399,8 +6755,8 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::EnumMemberSeq & members_;
-  CORBA::EnumDef_ptr _result;
+  const CORBA_EnumMemberSeq & members_;
+  CORBA_EnumDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_create_enum::TAO_ClientRequestInfo_CORBA_Container_create_enum (
@@ -5409,7 +6765,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::TAO_ClientRequestInfo_CORBA_C
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -5467,8 +6823,24 @@ TAO_ClientRequestInfo_CORBA_Container_create_enum::exceptions (CORBA::Environmen
 }
 
 
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_Container_create_enum::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
 void 
-TAO_ClientRequestInfo_CORBA_Container_create_enum::result (CORBA::EnumDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Container_create_enum::result (CORBA_EnumDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -5483,7 +6855,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -5506,7 +6878,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::AliasDef_ptr result);
+  void result (CORBA_AliasDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_create_alias (const TAO_ClientRequestInfo_CORBA_Container_create_alias &);
@@ -5515,8 +6887,8 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr original_type_;
-  CORBA::AliasDef_ptr _result;
+  CORBA_IDLType_ptr original_type_;
+  CORBA_AliasDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_create_alias::TAO_ClientRequestInfo_CORBA_Container_create_alias (
@@ -5525,7 +6897,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::TAO_ClientRequestInfo_CORBA_
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -5583,8 +6955,24 @@ TAO_ClientRequestInfo_CORBA_Container_create_alias::exceptions (CORBA::Environme
 }
 
 
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_Container_create_alias::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
 void 
-TAO_ClientRequestInfo_CORBA_Container_create_alias::result (CORBA::AliasDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Container_create_alias::result (CORBA_AliasDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -5599,7 +6987,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -5622,7 +7010,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::InterfaceDef_ptr result);
+  void result (CORBA_InterfaceDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_create_interface (const TAO_ClientRequestInfo_CORBA_Container_create_interface &);
@@ -5631,8 +7019,8 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::InterfaceDefSeq & base_interfaces_;
-  CORBA::InterfaceDef_ptr _result;
+  const CORBA_InterfaceDefSeq & base_interfaces_;
+  CORBA_InterfaceDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_create_interface::TAO_ClientRequestInfo_CORBA_Container_create_interface (
@@ -5641,7 +7029,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::TAO_ClientRequestInfo_CO
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -5651,6 +7039,41 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::TAO_ClientRequestInfo_CO
     base_interfaces_ (base_interfaces)
 {}
 
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_Container_create_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+    
+  CORBA::ULong length_id = parameter_list->length ();
+  parameter_list->length (length_id + 1);
+  (*parameter_list)[length_id].argument <<= id_;
+  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_name = parameter_list->length ();
+  parameter_list->length (length_name + 1);
+  (*parameter_list)[length_name].argument <<= name_;
+  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_version = parameter_list->length ();
+  parameter_list->length (length_version + 1);
+  (*parameter_list)[length_version].argument <<= version_;
+  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_base_interfaces = parameter_list->length ();
+  parameter_list->length (length_base_interfaces + 1);
+  (*parameter_list)[length_base_interfaces].argument <<=  this->base_interfaces_;
+  
+  (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
+  
+  return safe_parameter_list._retn ();
+}
+
 Dynamic::ExceptionList *
 TAO_ClientRequestInfo_CORBA_Container_create_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -5664,8 +7087,24 @@ TAO_ClientRequestInfo_CORBA_Container_create_interface::exceptions (CORBA::Envir
 }
 
 
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_Container_create_interface::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
 void 
-TAO_ClientRequestInfo_CORBA_Container_create_interface::result (CORBA::InterfaceDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Container_create_interface::result (CORBA_InterfaceDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -5682,11 +7121,11 @@ public:
       const char * version,
       const CORBA::Boolean & is_custom,
       const CORBA::Boolean & is_abstract,
-      CORBA::ValueDef_ptr base_value,
+      CORBA_ValueDef_ptr base_value,
       const CORBA::Boolean & is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -5709,7 +7148,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ValueDef_ptr result);
+  void result (CORBA_ValueDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_create_value (const TAO_ClientRequestInfo_CORBA_Container_create_value &);
@@ -5720,12 +7159,12 @@ private:
   const char * version_;
   const CORBA::Boolean & is_custom_;
   const CORBA::Boolean & is_abstract_;
-  CORBA::ValueDef_ptr base_value_;
+  CORBA_ValueDef_ptr base_value_;
   const CORBA::Boolean & is_truncatable_;
-  const CORBA::ValueDefSeq & abstract_base_values_;
-  const CORBA::InterfaceDefSeq & supported_interfaces_;
-  const CORBA::InitializerSeq & initializers_;
-  CORBA::ValueDef_ptr _result;
+  const CORBA_ValueDefSeq & abstract_base_values_;
+  const CORBA_InterfaceDefSeq & supported_interfaces_;
+  const CORBA_InitializerSeq & initializers_;
+  CORBA_ValueDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_create_value::TAO_ClientRequestInfo_CORBA_Container_create_value (
@@ -5736,11 +7175,11 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::TAO_ClientRequestInfo_CORBA_
     const char * version,
     const CORBA::Boolean & is_custom,
     const CORBA::Boolean & is_abstract,
-    CORBA::ValueDef_ptr base_value,
+    CORBA_ValueDef_ptr base_value,
     const CORBA::Boolean & is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -5756,6 +7195,74 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::TAO_ClientRequestInfo_CORBA_
     initializers_ (initializers)
 {}
 
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_Container_create_value::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+    
+  CORBA::ULong length_id = parameter_list->length ();
+  parameter_list->length (length_id + 1);
+  (*parameter_list)[length_id].argument <<= id_;
+  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_name = parameter_list->length ();
+  parameter_list->length (length_name + 1);
+  (*parameter_list)[length_name].argument <<= name_;
+  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_version = parameter_list->length ();
+  parameter_list->length (length_version + 1);
+  (*parameter_list)[length_version].argument <<= version_;
+  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_is_custom = parameter_list->length ();
+  parameter_list->length (length_is_custom + 1);
+  (*parameter_list)[length_is_custom].argument <<= CORBA::Any::from_boolean (this->is_custom_);
+  (*parameter_list)[length_is_custom].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_is_abstract = parameter_list->length ();
+  parameter_list->length (length_is_abstract + 1);
+  (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
+  (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_base_value = parameter_list->length ();
+  parameter_list->length (length_base_value + 1);
+  (*parameter_list)[length_base_value].argument <<=  this->base_value_;
+  
+  (*parameter_list)[length_base_value].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_is_truncatable = parameter_list->length ();
+  parameter_list->length (length_is_truncatable + 1);
+  (*parameter_list)[length_is_truncatable].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
+  (*parameter_list)[length_is_truncatable].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_abstract_base_values = parameter_list->length ();
+  parameter_list->length (length_abstract_base_values + 1);
+  (*parameter_list)[length_abstract_base_values].argument <<=  this->abstract_base_values_;
+  
+  (*parameter_list)[length_abstract_base_values].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_supported_interfaces = parameter_list->length ();
+  parameter_list->length (length_supported_interfaces + 1);
+  (*parameter_list)[length_supported_interfaces].argument <<=  this->supported_interfaces_;
+  
+  (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_initializers = parameter_list->length ();
+  parameter_list->length (length_initializers + 1);
+  (*parameter_list)[length_initializers].argument <<=  this->initializers_;
+  
+  (*parameter_list)[length_initializers].mode = Dynamic::PARAM_IN;
+  
+  return safe_parameter_list._retn ();
+}
+
 Dynamic::ExceptionList *
 TAO_ClientRequestInfo_CORBA_Container_create_value::exceptions (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -5769,8 +7276,24 @@ TAO_ClientRequestInfo_CORBA_Container_create_value::exceptions (CORBA::Environme
 }
 
 
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_Container_create_value::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
 void 
-TAO_ClientRequestInfo_CORBA_Container_create_value::result (CORBA::ValueDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Container_create_value::result (CORBA_ValueDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -5785,7 +7308,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -5808,7 +7331,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ValueBoxDef_ptr result);
+  void result (CORBA_ValueBoxDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_create_value_box (const TAO_ClientRequestInfo_CORBA_Container_create_value_box &);
@@ -5817,8 +7340,8 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr original_type_def_;
-  CORBA::ValueBoxDef_ptr _result;
+  CORBA_IDLType_ptr original_type_def_;
+  CORBA_ValueBoxDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_create_value_box::TAO_ClientRequestInfo_CORBA_Container_create_value_box (
@@ -5827,7 +7350,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::TAO_ClientRequestInfo_CO
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -5885,8 +7408,24 @@ TAO_ClientRequestInfo_CORBA_Container_create_value_box::exceptions (CORBA::Envir
 }
 
 
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_Container_create_value_box::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
 void 
-TAO_ClientRequestInfo_CORBA_Container_create_value_box::result (CORBA::ValueBoxDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Container_create_value_box::result (CORBA_ValueBoxDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -5901,7 +7440,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -5924,7 +7463,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ExceptionDef_ptr result);
+  void result (CORBA_ExceptionDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_create_exception (const TAO_ClientRequestInfo_CORBA_Container_create_exception &);
@@ -5933,8 +7472,8 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::StructMemberSeq & members_;
-  CORBA::ExceptionDef_ptr _result;
+  const CORBA_StructMemberSeq & members_;
+  CORBA_ExceptionDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_create_exception::TAO_ClientRequestInfo_CORBA_Container_create_exception (
@@ -5943,7 +7482,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::TAO_ClientRequestInfo_CO
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -6001,8 +7540,24 @@ TAO_ClientRequestInfo_CORBA_Container_create_exception::exceptions (CORBA::Envir
 }
 
 
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_Container_create_exception::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
 void 
-TAO_ClientRequestInfo_CORBA_Container_create_exception::result (CORBA::ExceptionDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Container_create_exception::result (CORBA_ExceptionDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -6039,7 +7594,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::NativeDef_ptr result);
+  void result (CORBA_NativeDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_create_native (const TAO_ClientRequestInfo_CORBA_Container_create_native &);
@@ -6048,7 +7603,7 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::NativeDef_ptr _result;
+  CORBA_NativeDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_create_native::TAO_ClientRequestInfo_CORBA_Container_create_native (
@@ -6107,8 +7662,24 @@ TAO_ClientRequestInfo_CORBA_Container_create_native::exceptions (CORBA::Environm
 }
 
 
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_Container_create_native::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
 void 
-TAO_ClientRequestInfo_CORBA_Container_create_native::result (CORBA::NativeDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Container_create_native::result (CORBA_NativeDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -6123,7 +7694,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -6146,7 +7717,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::AbstractInterfaceDef_ptr result);
+  void result (CORBA_AbstractInterfaceDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface (const TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface &);
@@ -6155,8 +7726,8 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::AbstractInterfaceDefSeq & base_interfaces_;
-  CORBA::AbstractInterfaceDef_ptr _result;
+  const CORBA_AbstractInterfaceDefSeq & base_interfaces_;
+  CORBA_AbstractInterfaceDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface (
@@ -6165,7 +7736,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::TAO_ClientReque
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -6175,6 +7746,41 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::TAO_ClientReque
     base_interfaces_ (base_interfaces)
 {}
 
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+    
+  CORBA::ULong length_id = parameter_list->length ();
+  parameter_list->length (length_id + 1);
+  (*parameter_list)[length_id].argument <<= id_;
+  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_name = parameter_list->length ();
+  parameter_list->length (length_name + 1);
+  (*parameter_list)[length_name].argument <<= name_;
+  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_version = parameter_list->length ();
+  parameter_list->length (length_version + 1);
+  (*parameter_list)[length_version].argument <<= version_;
+  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_base_interfaces = parameter_list->length ();
+  parameter_list->length (length_base_interfaces + 1);
+  (*parameter_list)[length_base_interfaces].argument <<=  this->base_interfaces_;
+  
+  (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
+  
+  return safe_parameter_list._retn ();
+}
+
 Dynamic::ExceptionList *
 TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -6188,8 +7794,24 @@ TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::exceptions (COR
 }
 
 
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
 void 
-TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::result (CORBA::AbstractInterfaceDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::result (CORBA_AbstractInterfaceDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -6204,7 +7826,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -6227,7 +7849,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::LocalInterfaceDef_ptr result);
+  void result (CORBA_LocalInterfaceDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Container_create_local_interface (const TAO_ClientRequestInfo_CORBA_Container_create_local_interface &);
@@ -6236,8 +7858,8 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::InterfaceDefSeq & base_interfaces_;
-  CORBA::LocalInterfaceDef_ptr _result;
+  const CORBA_InterfaceDefSeq & base_interfaces_;
+  CORBA_LocalInterfaceDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Container_create_local_interface::TAO_ClientRequestInfo_CORBA_Container_create_local_interface (
@@ -6246,7 +7868,7 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::TAO_ClientRequestI
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -6256,6 +7878,41 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::TAO_ClientRequestI
     base_interfaces_ (base_interfaces)
 {}
 
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_CORBA_Container_create_local_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+    
+  CORBA::ULong length_id = parameter_list->length ();
+  parameter_list->length (length_id + 1);
+  (*parameter_list)[length_id].argument <<= id_;
+  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_name = parameter_list->length ();
+  parameter_list->length (length_name + 1);
+  (*parameter_list)[length_name].argument <<= name_;
+  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_version = parameter_list->length ();
+  parameter_list->length (length_version + 1);
+  (*parameter_list)[length_version].argument <<= version_;
+  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_base_interfaces = parameter_list->length ();
+  parameter_list->length (length_base_interfaces + 1);
+  (*parameter_list)[length_base_interfaces].argument <<=  this->base_interfaces_;
+  
+  (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
+  
+  return safe_parameter_list._retn ();
+}
+
 Dynamic::ExceptionList *
 TAO_ClientRequestInfo_CORBA_Container_create_local_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -6269,8 +7926,24 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::exceptions (CORBA:
 }
 
 
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_Container_create_local_interface::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
 void 
-TAO_ClientRequestInfo_CORBA_Container_create_local_interface::result (CORBA::LocalInterfaceDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Container_create_local_interface::result (CORBA_LocalInterfaceDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -6282,15 +7955,15 @@ TAO_ClientRequestInfo_CORBA_Container_create_local_interface::result (CORBA::Loc
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_Container_Proxy_Impl::_TAO_Container_Proxy_Impl (void)
+_TAO_CORBA_Container_Proxy_Impl::_TAO_CORBA_Container_Proxy_Impl (void)
 {}
 
-_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
+_TAO_CORBA_Container_Remote_Proxy_Impl::_TAO_CORBA_Container_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::Contained_ptr _TAO_Container_Remote_Proxy_Impl::lookup (
+CORBA_Contained_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::lookup (
     CORBA_Object *_collocated_tao_target_,
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV
@@ -6300,8 +7973,8 @@ CORBA::Contained_ptr _TAO_Container_Remote_Proxy_Impl::lookup (
   ))
 {
   
-  CORBA::Contained_ptr _tao_retval = CORBA::Contained::_nil ();
-  CORBA::Contained_var _tao_safe_retval (_tao_retval);
+  CORBA_Contained_ptr _tao_retval = CORBA_Contained::_nil ();
+  CORBA_Contained_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -6396,7 +8069,7 @@ CORBA::Contained_ptr _TAO_Container_Remote_Proxy_Impl::lookup (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -6462,7 +8135,7 @@ CORBA::Contained_ptr _TAO_Container_Remote_Proxy_Impl::lookup (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::ContainedSeq * _TAO_Container_Remote_Proxy_Impl::contents (
+CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::contents (
     CORBA_Object *_collocated_tao_target_,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
@@ -6473,7 +8146,7 @@ CORBA::ContainedSeq * _TAO_Container_Remote_Proxy_Impl::contents (
   ))
 {
   
-  CORBA::ContainedSeq *_tao_retval = 0;
+  CORBA_ContainedSeq *_tao_retval = 0;
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -6481,8 +8154,8 @@ CORBA::ContainedSeq * _TAO_Container_Remote_Proxy_Impl::contents (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::ContainedSeq, _tao_retval);
-  CORBA::ContainedSeq_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_ContainedSeq, _tao_retval);
+  CORBA_ContainedSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "contents",
@@ -6572,7 +8245,7 @@ CORBA::ContainedSeq * _TAO_Container_Remote_Proxy_Impl::contents (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -6638,7 +8311,7 @@ CORBA::ContainedSeq * _TAO_Container_Remote_Proxy_Impl::contents (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::ContainedSeq * _TAO_Container_Remote_Proxy_Impl::lookup_name (
+CORBA_ContainedSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::lookup_name (
     CORBA_Object *_collocated_tao_target_,
     const char * search_name,
     CORBA::Long levels_to_search,
@@ -6651,7 +8324,7 @@ CORBA::ContainedSeq * _TAO_Container_Remote_Proxy_Impl::lookup_name (
   ))
 {
   
-  CORBA::ContainedSeq *_tao_retval = 0;
+  CORBA_ContainedSeq *_tao_retval = 0;
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -6659,8 +8332,8 @@ CORBA::ContainedSeq * _TAO_Container_Remote_Proxy_Impl::lookup_name (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::ContainedSeq, _tao_retval);
-  CORBA::ContainedSeq_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_ContainedSeq, _tao_retval);
+  CORBA_ContainedSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "lookup_name",
@@ -6754,7 +8427,7 @@ CORBA::ContainedSeq * _TAO_Container_Remote_Proxy_Impl::lookup_name (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -6820,7 +8493,7 @@ CORBA::ContainedSeq * _TAO_Container_Remote_Proxy_Impl::lookup_name (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::Container::DescriptionSeq * _TAO_Container_Remote_Proxy_Impl::describe_contents (
+CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_Remote_Proxy_Impl::describe_contents (
     CORBA_Object *_collocated_tao_target_,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
@@ -6832,7 +8505,7 @@ CORBA::Container::DescriptionSeq * _TAO_Container_Remote_Proxy_Impl::describe_co
   ))
 {
   
-  CORBA::Container::DescriptionSeq *_tao_retval = 0;
+  CORBA_Container::DescriptionSeq *_tao_retval = 0;
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -6840,8 +8513,8 @@ CORBA::Container::DescriptionSeq * _TAO_Container_Remote_Proxy_Impl::describe_co
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::Container::DescriptionSeq, _tao_retval);
-  CORBA::Container::DescriptionSeq_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_Container::DescriptionSeq, _tao_retval);
+  CORBA_Container::DescriptionSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "describe_contents",
@@ -6933,7 +8606,1277 @@ CORBA::Container::DescriptionSeq * _TAO_Container_Remote_Proxy_Impl::describe_co
             }
           
           TAO_INTERCEPTOR (
-              CORBA::Container::DescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_Container::DescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
+              ri.result (_tao_retval_info);
+              _tao_safe_retval = _tao_retval_info;
+            );
+          
+          TAO_INTERCEPTOR (
+            ri.reply_status (_invoke_status);
+            if (_invoke_status == TAO_INVOKE_OK)
+              {
+                _tao_vfr.receive_reply (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            else
+              {
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+#if TAO_HAS_INTERCEPTORS == 1
+        }
+      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+        {
+          _invoke_status =
+            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          
+          ri.forward_reference (exc); 
+          _tao_vfr.receive_other (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        {
+          _tao_call.restart_flag (1);
+          continue;
+        }
+      
+      break;
+    }
+  return _tao_safe_retval._retn ();
+}
+
+CORBA_ModuleDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_module (
+    CORBA_Object *_collocated_tao_target_,
+    const char * id,
+    const char * name,
+    const char * version,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  
+  CORBA_ModuleDef_ptr _tao_retval = tao_CORBA_ModuleDef_nil ();
+  CORBA_ModuleDef_var _tao_safe_retval (_tao_retval);
+  
+  
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (istub == 0)
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_module",
+      13,
+      1,
+      istub->orb_core ()
+    );
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors ()
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_Container_create_module ri (
+        &_tao_call,
+        _collocated_tao_target_,
+        id,
+        name,
+        version,
+        ACE_TRY_ENV
+      );
+      ACE_CHECK_RETURN (0);
+      
+      ACE_TRY
+        {
+#endif /* TAO_HAS_INTERCEPTORS */
+        
+          _tao_call.start (ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+          TAO_INTERCEPTOR (ri.response_expected (1));
+          
+          TAO_INTERCEPTOR (
+            _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag),
+              ACE_TRY_ENV
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          if (!(
+                            (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version)
+            ))
+            TAO_INTERCEPTOR_THROW_RETURN (
+              CORBA::MARSHAL (),
+              0
+            );
+            
+          _invoke_status =
+            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          if (!(
+                            (_tao_in >> _tao_safe_retval.inout ())
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_INTERCEPTOR (
+              CORBA_ModuleDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              ri.result (_tao_retval_info);
+              _tao_safe_retval = _tao_retval_info;
+            );
+          
+          TAO_INTERCEPTOR (
+            ri.reply_status (_invoke_status);
+            if (_invoke_status == TAO_INVOKE_OK)
+              {
+                _tao_vfr.receive_reply (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            else
+              {
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+#if TAO_HAS_INTERCEPTORS == 1
+        }
+      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+        {
+          _invoke_status =
+            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          
+          ri.forward_reference (exc); 
+          _tao_vfr.receive_other (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        {
+          _tao_call.restart_flag (1);
+          continue;
+        }
+      
+      break;
+    }
+  return _tao_safe_retval._retn ();
+}
+
+CORBA_ConstantDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_constant (
+    CORBA_Object *_collocated_tao_target_,
+    const char * id,
+    const char * name,
+    const char * version,
+    CORBA_IDLType_ptr type,
+    const CORBA::Any & value,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  
+  CORBA_ConstantDef_ptr _tao_retval = tao_CORBA_ConstantDef_nil ();
+  CORBA_ConstantDef_var _tao_safe_retval (_tao_retval);
+  
+  
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (istub == 0)
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_constant",
+      15,
+      1,
+      istub->orb_core ()
+    );
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors ()
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_Container_create_constant ri (
+        &_tao_call,
+        _collocated_tao_target_,
+        id,
+        name,
+        version,
+        type,
+        value,
+        ACE_TRY_ENV
+      );
+      ACE_CHECK_RETURN (0);
+      
+      ACE_TRY
+        {
+#endif /* TAO_HAS_INTERCEPTORS */
+        
+          _tao_call.start (ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+          TAO_INTERCEPTOR (ri.response_expected (1));
+          
+          TAO_INTERCEPTOR (
+            _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag),
+              ACE_TRY_ENV
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          if (!(
+                            (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << type) &&
+              (_tao_out << value)
+            ))
+            TAO_INTERCEPTOR_THROW_RETURN (
+              CORBA::MARSHAL (),
+              0
+            );
+            
+          _invoke_status =
+            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          if (!(
+                            (_tao_in >> _tao_safe_retval.inout ())
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_INTERCEPTOR (
+              CORBA_ConstantDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              ri.result (_tao_retval_info);
+              _tao_safe_retval = _tao_retval_info;
+            );
+          
+          TAO_INTERCEPTOR (
+            ri.reply_status (_invoke_status);
+            if (_invoke_status == TAO_INVOKE_OK)
+              {
+                _tao_vfr.receive_reply (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            else
+              {
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+#if TAO_HAS_INTERCEPTORS == 1
+        }
+      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+        {
+          _invoke_status =
+            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          
+          ri.forward_reference (exc); 
+          _tao_vfr.receive_other (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        {
+          _tao_call.restart_flag (1);
+          continue;
+        }
+      
+      break;
+    }
+  return _tao_safe_retval._retn ();
+}
+
+CORBA_StructDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_struct (
+    CORBA_Object *_collocated_tao_target_,
+    const char * id,
+    const char * name,
+    const char * version,
+    const CORBA_StructMemberSeq & members,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  
+  CORBA_StructDef_ptr _tao_retval = tao_CORBA_StructDef_nil ();
+  CORBA_StructDef_var _tao_safe_retval (_tao_retval);
+  
+  
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (istub == 0)
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_struct",
+      13,
+      1,
+      istub->orb_core ()
+    );
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors ()
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_Container_create_struct ri (
+        &_tao_call,
+        _collocated_tao_target_,
+        id,
+        name,
+        version,
+        members,
+        ACE_TRY_ENV
+      );
+      ACE_CHECK_RETURN (0);
+      
+      ACE_TRY
+        {
+#endif /* TAO_HAS_INTERCEPTORS */
+        
+          _tao_call.start (ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+          TAO_INTERCEPTOR (ri.response_expected (1));
+          
+          TAO_INTERCEPTOR (
+            _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag),
+              ACE_TRY_ENV
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          if (!(
+                            (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << members)
+            ))
+            TAO_INTERCEPTOR_THROW_RETURN (
+              CORBA::MARSHAL (),
+              0
+            );
+            
+          _invoke_status =
+            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          if (!(
+                            (_tao_in >> _tao_safe_retval.inout ())
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_INTERCEPTOR (
+              CORBA_StructDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              ri.result (_tao_retval_info);
+              _tao_safe_retval = _tao_retval_info;
+            );
+          
+          TAO_INTERCEPTOR (
+            ri.reply_status (_invoke_status);
+            if (_invoke_status == TAO_INVOKE_OK)
+              {
+                _tao_vfr.receive_reply (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            else
+              {
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+#if TAO_HAS_INTERCEPTORS == 1
+        }
+      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+        {
+          _invoke_status =
+            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          
+          ri.forward_reference (exc); 
+          _tao_vfr.receive_other (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        {
+          _tao_call.restart_flag (1);
+          continue;
+        }
+      
+      break;
+    }
+  return _tao_safe_retval._retn ();
+}
+
+CORBA_UnionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_union (
+    CORBA_Object *_collocated_tao_target_,
+    const char * id,
+    const char * name,
+    const char * version,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  
+  CORBA_UnionDef_ptr _tao_retval = tao_CORBA_UnionDef_nil ();
+  CORBA_UnionDef_var _tao_safe_retval (_tao_retval);
+  
+  
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (istub == 0)
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_union",
+      12,
+      1,
+      istub->orb_core ()
+    );
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors ()
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_Container_create_union ri (
+        &_tao_call,
+        _collocated_tao_target_,
+        id,
+        name,
+        version,
+        discriminator_type,
+        members,
+        ACE_TRY_ENV
+      );
+      ACE_CHECK_RETURN (0);
+      
+      ACE_TRY
+        {
+#endif /* TAO_HAS_INTERCEPTORS */
+        
+          _tao_call.start (ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+          TAO_INTERCEPTOR (ri.response_expected (1));
+          
+          TAO_INTERCEPTOR (
+            _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag),
+              ACE_TRY_ENV
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          if (!(
+                            (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << discriminator_type) &&
+              (_tao_out << members)
+            ))
+            TAO_INTERCEPTOR_THROW_RETURN (
+              CORBA::MARSHAL (),
+              0
+            );
+            
+          _invoke_status =
+            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          if (!(
+                            (_tao_in >> _tao_safe_retval.inout ())
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_INTERCEPTOR (
+              CORBA_UnionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              ri.result (_tao_retval_info);
+              _tao_safe_retval = _tao_retval_info;
+            );
+          
+          TAO_INTERCEPTOR (
+            ri.reply_status (_invoke_status);
+            if (_invoke_status == TAO_INVOKE_OK)
+              {
+                _tao_vfr.receive_reply (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            else
+              {
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+#if TAO_HAS_INTERCEPTORS == 1
+        }
+      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+        {
+          _invoke_status =
+            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          
+          ri.forward_reference (exc); 
+          _tao_vfr.receive_other (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        {
+          _tao_call.restart_flag (1);
+          continue;
+        }
+      
+      break;
+    }
+  return _tao_safe_retval._retn ();
+}
+
+CORBA_EnumDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_enum (
+    CORBA_Object *_collocated_tao_target_,
+    const char * id,
+    const char * name,
+    const char * version,
+    const CORBA_EnumMemberSeq & members,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  
+  CORBA_EnumDef_ptr _tao_retval = tao_CORBA_EnumDef_nil ();
+  CORBA_EnumDef_var _tao_safe_retval (_tao_retval);
+  
+  
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (istub == 0)
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_enum",
+      11,
+      1,
+      istub->orb_core ()
+    );
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors ()
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_Container_create_enum ri (
+        &_tao_call,
+        _collocated_tao_target_,
+        id,
+        name,
+        version,
+        members,
+        ACE_TRY_ENV
+      );
+      ACE_CHECK_RETURN (0);
+      
+      ACE_TRY
+        {
+#endif /* TAO_HAS_INTERCEPTORS */
+        
+          _tao_call.start (ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+          TAO_INTERCEPTOR (ri.response_expected (1));
+          
+          TAO_INTERCEPTOR (
+            _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag),
+              ACE_TRY_ENV
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          if (!(
+                            (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << members)
+            ))
+            TAO_INTERCEPTOR_THROW_RETURN (
+              CORBA::MARSHAL (),
+              0
+            );
+            
+          _invoke_status =
+            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          if (!(
+                            (_tao_in >> _tao_safe_retval.inout ())
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_INTERCEPTOR (
+              CORBA_EnumDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              ri.result (_tao_retval_info);
+              _tao_safe_retval = _tao_retval_info;
+            );
+          
+          TAO_INTERCEPTOR (
+            ri.reply_status (_invoke_status);
+            if (_invoke_status == TAO_INVOKE_OK)
+              {
+                _tao_vfr.receive_reply (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            else
+              {
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+#if TAO_HAS_INTERCEPTORS == 1
+        }
+      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+        {
+          _invoke_status =
+            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          
+          ri.forward_reference (exc); 
+          _tao_vfr.receive_other (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        {
+          _tao_call.restart_flag (1);
+          continue;
+        }
+      
+      break;
+    }
+  return _tao_safe_retval._retn ();
+}
+
+CORBA_AliasDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_alias (
+    CORBA_Object *_collocated_tao_target_,
+    const char * id,
+    const char * name,
+    const char * version,
+    CORBA_IDLType_ptr original_type,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  
+  CORBA_AliasDef_ptr _tao_retval = tao_CORBA_AliasDef_nil ();
+  CORBA_AliasDef_var _tao_safe_retval (_tao_retval);
+  
+  
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (istub == 0)
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_alias",
+      12,
+      1,
+      istub->orb_core ()
+    );
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors ()
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_Container_create_alias ri (
+        &_tao_call,
+        _collocated_tao_target_,
+        id,
+        name,
+        version,
+        original_type,
+        ACE_TRY_ENV
+      );
+      ACE_CHECK_RETURN (0);
+      
+      ACE_TRY
+        {
+#endif /* TAO_HAS_INTERCEPTORS */
+        
+          _tao_call.start (ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+          TAO_INTERCEPTOR (ri.response_expected (1));
+          
+          TAO_INTERCEPTOR (
+            _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag),
+              ACE_TRY_ENV
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          if (!(
+                            (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << original_type)
+            ))
+            TAO_INTERCEPTOR_THROW_RETURN (
+              CORBA::MARSHAL (),
+              0
+            );
+            
+          _invoke_status =
+            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          if (!(
+                            (_tao_in >> _tao_safe_retval.inout ())
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_INTERCEPTOR (
+              CORBA_AliasDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              ri.result (_tao_retval_info);
+              _tao_safe_retval = _tao_retval_info;
+            );
+          
+          TAO_INTERCEPTOR (
+            ri.reply_status (_invoke_status);
+            if (_invoke_status == TAO_INVOKE_OK)
+              {
+                _tao_vfr.receive_reply (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            else
+              {
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+#if TAO_HAS_INTERCEPTORS == 1
+        }
+      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+        {
+          _invoke_status =
+            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          
+          ri.forward_reference (exc); 
+          _tao_vfr.receive_other (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        {
+          _tao_call.restart_flag (1);
+          continue;
+        }
+      
+      break;
+    }
+  return _tao_safe_retval._retn ();
+}
+
+CORBA_InterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_interface (
+    CORBA_Object *_collocated_tao_target_,
+    const char * id,
+    const char * name,
+    const char * version,
+    const CORBA_InterfaceDefSeq & base_interfaces,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  
+  CORBA_InterfaceDef_ptr _tao_retval = tao_CORBA_InterfaceDef_nil ();
+  CORBA_InterfaceDef_var _tao_safe_retval (_tao_retval);
+  
+  
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (istub == 0)
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_interface",
+      16,
+      1,
+      istub->orb_core ()
+    );
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors ()
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_Container_create_interface ri (
+        &_tao_call,
+        _collocated_tao_target_,
+        id,
+        name,
+        version,
+        base_interfaces,
+        ACE_TRY_ENV
+      );
+      ACE_CHECK_RETURN (0);
+      
+      ACE_TRY
+        {
+#endif /* TAO_HAS_INTERCEPTORS */
+        
+          _tao_call.start (ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+          TAO_INTERCEPTOR (ri.response_expected (1));
+          
+          TAO_INTERCEPTOR (
+            _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag),
+              ACE_TRY_ENV
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          if (!(
+                            (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << base_interfaces)
+            ))
+            TAO_INTERCEPTOR_THROW_RETURN (
+              CORBA::MARSHAL (),
+              0
+            );
+            
+          _invoke_status =
+            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          if (!(
+                            (_tao_in >> _tao_safe_retval.inout ())
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_INTERCEPTOR (
+              CORBA_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -6999,6 +9942,1108 @@ CORBA::Container::DescriptionSeq * _TAO_Container_Remote_Proxy_Impl::describe_co
   return _tao_safe_retval._retn ();
 }
 
+CORBA_ValueDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value (
+    CORBA_Object *_collocated_tao_target_,
+    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
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  
+  CORBA_ValueDef_ptr _tao_retval = tao_CORBA_ValueDef_nil ();
+  CORBA_ValueDef_var _tao_safe_retval (_tao_retval);
+  
+  
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (istub == 0)
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_value",
+      12,
+      1,
+      istub->orb_core ()
+    );
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors ()
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_Container_create_value ri (
+        &_tao_call,
+        _collocated_tao_target_,
+        id,
+        name,
+        version,
+        is_custom,
+        is_abstract,
+        base_value,
+        is_truncatable,
+        abstract_base_values,
+        supported_interfaces,
+        initializers,
+        ACE_TRY_ENV
+      );
+      ACE_CHECK_RETURN (0);
+      
+      ACE_TRY
+        {
+#endif /* TAO_HAS_INTERCEPTORS */
+        
+          _tao_call.start (ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+          TAO_INTERCEPTOR (ri.response_expected (1));
+          
+          TAO_INTERCEPTOR (
+            _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag),
+              ACE_TRY_ENV
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          if (!(
+                            (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << CORBA::Any::from_boolean (is_custom)) &&
+              (_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
+              (_tao_out << base_value) &&
+              (_tao_out << CORBA::Any::from_boolean (is_truncatable)) &&
+              (_tao_out << abstract_base_values) &&
+              (_tao_out << supported_interfaces) &&
+              (_tao_out << initializers)
+            ))
+            TAO_INTERCEPTOR_THROW_RETURN (
+              CORBA::MARSHAL (),
+              0
+            );
+            
+          _invoke_status =
+            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          if (!(
+                            (_tao_in >> _tao_safe_retval.inout ())
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_INTERCEPTOR (
+              CORBA_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              ri.result (_tao_retval_info);
+              _tao_safe_retval = _tao_retval_info;
+            );
+          
+          TAO_INTERCEPTOR (
+            ri.reply_status (_invoke_status);
+            if (_invoke_status == TAO_INVOKE_OK)
+              {
+                _tao_vfr.receive_reply (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            else
+              {
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+#if TAO_HAS_INTERCEPTORS == 1
+        }
+      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+        {
+          _invoke_status =
+            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          
+          ri.forward_reference (exc); 
+          _tao_vfr.receive_other (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        {
+          _tao_call.restart_flag (1);
+          continue;
+        }
+      
+      break;
+    }
+  return _tao_safe_retval._retn ();
+}
+
+CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_value_box (
+    CORBA_Object *_collocated_tao_target_,
+    const char * id,
+    const char * name,
+    const char * version,
+    CORBA_IDLType_ptr original_type_def,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  
+  CORBA_ValueBoxDef_ptr _tao_retval = tao_CORBA_ValueBoxDef_nil ();
+  CORBA_ValueBoxDef_var _tao_safe_retval (_tao_retval);
+  
+  
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (istub == 0)
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_value_box",
+      16,
+      1,
+      istub->orb_core ()
+    );
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors ()
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_Container_create_value_box ri (
+        &_tao_call,
+        _collocated_tao_target_,
+        id,
+        name,
+        version,
+        original_type_def,
+        ACE_TRY_ENV
+      );
+      ACE_CHECK_RETURN (0);
+      
+      ACE_TRY
+        {
+#endif /* TAO_HAS_INTERCEPTORS */
+        
+          _tao_call.start (ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+          TAO_INTERCEPTOR (ri.response_expected (1));
+          
+          TAO_INTERCEPTOR (
+            _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag),
+              ACE_TRY_ENV
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          if (!(
+                            (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << original_type_def)
+            ))
+            TAO_INTERCEPTOR_THROW_RETURN (
+              CORBA::MARSHAL (),
+              0
+            );
+            
+          _invoke_status =
+            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          if (!(
+                            (_tao_in >> _tao_safe_retval.inout ())
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_INTERCEPTOR (
+              CORBA_ValueBoxDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              ri.result (_tao_retval_info);
+              _tao_safe_retval = _tao_retval_info;
+            );
+          
+          TAO_INTERCEPTOR (
+            ri.reply_status (_invoke_status);
+            if (_invoke_status == TAO_INVOKE_OK)
+              {
+                _tao_vfr.receive_reply (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            else
+              {
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+#if TAO_HAS_INTERCEPTORS == 1
+        }
+      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+        {
+          _invoke_status =
+            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          
+          ri.forward_reference (exc); 
+          _tao_vfr.receive_other (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        {
+          _tao_call.restart_flag (1);
+          continue;
+        }
+      
+      break;
+    }
+  return _tao_safe_retval._retn ();
+}
+
+CORBA_ExceptionDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_exception (
+    CORBA_Object *_collocated_tao_target_,
+    const char * id,
+    const char * name,
+    const char * version,
+    const CORBA_StructMemberSeq & members,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  
+  CORBA_ExceptionDef_ptr _tao_retval = tao_CORBA_ExceptionDef_nil ();
+  CORBA_ExceptionDef_var _tao_safe_retval (_tao_retval);
+  
+  
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (istub == 0)
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_exception",
+      16,
+      1,
+      istub->orb_core ()
+    );
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors ()
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_Container_create_exception ri (
+        &_tao_call,
+        _collocated_tao_target_,
+        id,
+        name,
+        version,
+        members,
+        ACE_TRY_ENV
+      );
+      ACE_CHECK_RETURN (0);
+      
+      ACE_TRY
+        {
+#endif /* TAO_HAS_INTERCEPTORS */
+        
+          _tao_call.start (ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+          TAO_INTERCEPTOR (ri.response_expected (1));
+          
+          TAO_INTERCEPTOR (
+            _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag),
+              ACE_TRY_ENV
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          if (!(
+                            (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << members)
+            ))
+            TAO_INTERCEPTOR_THROW_RETURN (
+              CORBA::MARSHAL (),
+              0
+            );
+            
+          _invoke_status =
+            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          if (!(
+                            (_tao_in >> _tao_safe_retval.inout ())
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_INTERCEPTOR (
+              CORBA_ExceptionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              ri.result (_tao_retval_info);
+              _tao_safe_retval = _tao_retval_info;
+            );
+          
+          TAO_INTERCEPTOR (
+            ri.reply_status (_invoke_status);
+            if (_invoke_status == TAO_INVOKE_OK)
+              {
+                _tao_vfr.receive_reply (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            else
+              {
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+#if TAO_HAS_INTERCEPTORS == 1
+        }
+      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+        {
+          _invoke_status =
+            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          
+          ri.forward_reference (exc); 
+          _tao_vfr.receive_other (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        {
+          _tao_call.restart_flag (1);
+          continue;
+        }
+      
+      break;
+    }
+  return _tao_safe_retval._retn ();
+}
+
+CORBA_NativeDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_native (
+    CORBA_Object *_collocated_tao_target_,
+    const char * id,
+    const char * name,
+    const char * version,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  
+  CORBA_NativeDef_ptr _tao_retval = tao_CORBA_NativeDef_nil ();
+  CORBA_NativeDef_var _tao_safe_retval (_tao_retval);
+  
+  
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (istub == 0)
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_native",
+      13,
+      1,
+      istub->orb_core ()
+    );
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors ()
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_Container_create_native ri (
+        &_tao_call,
+        _collocated_tao_target_,
+        id,
+        name,
+        version,
+        ACE_TRY_ENV
+      );
+      ACE_CHECK_RETURN (0);
+      
+      ACE_TRY
+        {
+#endif /* TAO_HAS_INTERCEPTORS */
+        
+          _tao_call.start (ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+          TAO_INTERCEPTOR (ri.response_expected (1));
+          
+          TAO_INTERCEPTOR (
+            _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag),
+              ACE_TRY_ENV
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          if (!(
+                            (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version)
+            ))
+            TAO_INTERCEPTOR_THROW_RETURN (
+              CORBA::MARSHAL (),
+              0
+            );
+            
+          _invoke_status =
+            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          if (!(
+                            (_tao_in >> _tao_safe_retval.inout ())
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_INTERCEPTOR (
+              CORBA_NativeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              ri.result (_tao_retval_info);
+              _tao_safe_retval = _tao_retval_info;
+            );
+          
+          TAO_INTERCEPTOR (
+            ri.reply_status (_invoke_status);
+            if (_invoke_status == TAO_INVOKE_OK)
+              {
+                _tao_vfr.receive_reply (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            else
+              {
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+#if TAO_HAS_INTERCEPTORS == 1
+        }
+      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+        {
+          _invoke_status =
+            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          
+          ri.forward_reference (exc); 
+          _tao_vfr.receive_other (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        {
+          _tao_call.restart_flag (1);
+          continue;
+        }
+      
+      break;
+    }
+  return _tao_safe_retval._retn ();
+}
+
+CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_abstract_interface (
+    CORBA_Object *_collocated_tao_target_,
+    const char * id,
+    const char * name,
+    const char * version,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  
+  CORBA_AbstractInterfaceDef_ptr _tao_retval = tao_CORBA_AbstractInterfaceDef_nil ();
+  CORBA_AbstractInterfaceDef_var _tao_safe_retval (_tao_retval);
+  
+  
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (istub == 0)
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_abstract_interface",
+      25,
+      1,
+      istub->orb_core ()
+    );
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors ()
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface ri (
+        &_tao_call,
+        _collocated_tao_target_,
+        id,
+        name,
+        version,
+        base_interfaces,
+        ACE_TRY_ENV
+      );
+      ACE_CHECK_RETURN (0);
+      
+      ACE_TRY
+        {
+#endif /* TAO_HAS_INTERCEPTORS */
+        
+          _tao_call.start (ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+          TAO_INTERCEPTOR (ri.response_expected (1));
+          
+          TAO_INTERCEPTOR (
+            _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag),
+              ACE_TRY_ENV
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          if (!(
+                            (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << base_interfaces)
+            ))
+            TAO_INTERCEPTOR_THROW_RETURN (
+              CORBA::MARSHAL (),
+              0
+            );
+            
+          _invoke_status =
+            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          if (!(
+                            (_tao_in >> _tao_safe_retval.inout ())
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_INTERCEPTOR (
+              CORBA_AbstractInterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              ri.result (_tao_retval_info);
+              _tao_safe_retval = _tao_retval_info;
+            );
+          
+          TAO_INTERCEPTOR (
+            ri.reply_status (_invoke_status);
+            if (_invoke_status == TAO_INVOKE_OK)
+              {
+                _tao_vfr.receive_reply (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            else
+              {
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+#if TAO_HAS_INTERCEPTORS == 1
+        }
+      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+        {
+          _invoke_status =
+            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          
+          ri.forward_reference (exc); 
+          _tao_vfr.receive_other (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        {
+          _tao_call.restart_flag (1);
+          continue;
+        }
+      
+      break;
+    }
+  return _tao_safe_retval._retn ();
+}
+
+CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_Remote_Proxy_Impl::create_local_interface (
+    CORBA_Object *_collocated_tao_target_,
+    const char * id,
+    const char * name,
+    const char * version,
+    const CORBA_InterfaceDefSeq & base_interfaces,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  
+  CORBA_LocalInterfaceDef_ptr _tao_retval = tao_CORBA_LocalInterfaceDef_nil ();
+  CORBA_LocalInterfaceDef_var _tao_safe_retval (_tao_retval);
+  
+  
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (istub == 0)
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_local_interface",
+      22,
+      1,
+      istub->orb_core ()
+    );
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors ()
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_Container_create_local_interface ri (
+        &_tao_call,
+        _collocated_tao_target_,
+        id,
+        name,
+        version,
+        base_interfaces,
+        ACE_TRY_ENV
+      );
+      ACE_CHECK_RETURN (0);
+      
+      ACE_TRY
+        {
+#endif /* TAO_HAS_INTERCEPTORS */
+        
+          _tao_call.start (ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+          TAO_INTERCEPTOR (ri.response_expected (1));
+          
+          TAO_INTERCEPTOR (
+            _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag),
+              ACE_TRY_ENV
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          if (!(
+                            (_tao_out << id) &&
+              (_tao_out << name) &&
+              (_tao_out << version) &&
+              (_tao_out << base_interfaces)
+            ))
+            TAO_INTERCEPTOR_THROW_RETURN (
+              CORBA::MARSHAL (),
+              0
+            );
+            
+          _invoke_status =
+            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          if (!(
+                            (_tao_in >> _tao_safe_retval.inout ())
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_INTERCEPTOR (
+              CORBA_LocalInterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              ri.result (_tao_retval_info);
+              _tao_safe_retval = _tao_retval_info;
+            );
+          
+          TAO_INTERCEPTOR (
+            ri.reply_status (_invoke_status);
+            if (_invoke_status == TAO_INVOKE_OK)
+              {
+                _tao_vfr.receive_reply (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            else
+              {
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+#if TAO_HAS_INTERCEPTORS == 1
+        }
+      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+        {
+          _invoke_status =
+            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          
+          ri.forward_reference (exc); 
+          _tao_vfr.receive_other (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        {
+          _tao_call.restart_flag (1);
+          continue;
+        }
+      
+      break;
+    }
+  return _tao_safe_retval._retn ();
+}
+
+
 //
 //            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
@@ -7008,36 +11053,36 @@ CORBA::Container::DescriptionSeq * _TAO_Container_Remote_Proxy_Impl::describe_co
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_Container_Proxy_Broker::_TAO_Container_Proxy_Broker (void)
+_TAO_CORBA_Container_Proxy_Broker::_TAO_CORBA_Container_Proxy_Broker (void)
 {
 }
 
-_TAO_Container_Proxy_Broker::~_TAO_Container_Proxy_Broker (void)
+_TAO_CORBA_Container_Proxy_Broker::~_TAO_CORBA_Container_Proxy_Broker (void)
 {
 }
 
-_TAO_Container_Proxy_Broker * (*CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_Container_Proxy_Broker * (*_TAO_CORBA_Container_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_Container_Remote_Proxy_Broker *
-_TAO_Container_Remote_Proxy_Broker::the_TAO_Container_Remote_Proxy_Broker (void)
+_TAO_CORBA_Container_Remote_Proxy_Broker *
+_TAO_CORBA_Container_Remote_Proxy_Broker::the_TAO_CORBA_Container_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_Container_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_Container_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_Container_Remote_Proxy_Broker::_TAO_Container_Remote_Proxy_Broker (void)
+_TAO_CORBA_Container_Remote_Proxy_Broker::_TAO_CORBA_Container_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_Container_Remote_Proxy_Broker::~_TAO_Container_Remote_Proxy_Broker (void)
+_TAO_CORBA_Container_Remote_Proxy_Broker::~_TAO_CORBA_Container_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_Container_Proxy_Impl&
-_TAO_Container_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_Container_Proxy_Impl&
+_TAO_CORBA_Container_Remote_Proxy_Broker::select_proxy (
   ::CORBA_Container *,
   CORBA::Environment &
 )
@@ -7065,69 +11110,69 @@ void
 CORBA_Container::CORBA_Container_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_Container_Proxy_Broker_ =
-      ::CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_Container_Proxy_Broker_ =
+      ::_TAO_CORBA_Container_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_Container_Proxy_Broker_ =
-      ::_TAO_Container_Remote_Proxy_Broker::the_TAO_Container_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_Container_Proxy_Broker_ =
+      ::_TAO_CORBA_Container_Remote_Proxy_Broker::the_TAO_CORBA_Container_Remote_Proxy_Broker ();
   
   this->CORBA_IRObject_setup_collocation (collocated);
 }
 
-void CORBA::Container::_tao_any_destructor (void *x)
+void CORBA_Container::_tao_any_destructor (void *x)
 {
   CORBA_Container *tmp = ACE_static_cast (CORBA_Container*,x);
   CORBA::release (tmp);
 }
 
-CORBA::Container_ptr CORBA::Container::_narrow (
+CORBA_Container_ptr CORBA_Container::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::Container::_nil ();
+    return CORBA_Container::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Container:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::Container::_nil ());
+      ACE_CHECK_RETURN (CORBA_Container::_nil ());
       if (is_a == 0)
-        return CORBA::Container::_nil ();
+        return CORBA_Container::_nil ();
     }
-  return CORBA::Container::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_Container::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::Container_ptr CORBA::Container::_unchecked_narrow (
+CORBA_Container_ptr CORBA_Container::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::Container::_nil ();
+    return CORBA_Container::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::Container_ptr default_proxy = CORBA::Container::_nil ();
+      CORBA_Container_ptr default_proxy = CORBA_Container::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_Container_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::Container (
+          ::CORBA_Container (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::Container::_nil ());
+          CORBA_Container::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::Container (stub, 0, obj->_servant ()), CORBA::Container::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_Container (stub, 0, obj->_servant ()), CORBA_Container::_nil ());
         return default_proxy;
       }
     else 
@@ -7146,15 +11191,15 @@ CORBA::Container_ptr CORBA::Container::_unchecked_narrow (
           );
 }
 
-CORBA::Container_ptr
-CORBA::Container::_duplicate (CORBA::Container_ptr obj)
+CORBA_Container_ptr
+CORBA_Container::_duplicate (CORBA_Container_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::Container::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_Container::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
@@ -7165,22 +11210,22 @@ CORBA::Boolean CORBA::Container::_is_a (const CORBA::Char *value, CORBA::Environ
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::Container::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_Container::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_Container::_narrow))
+      &CORBA_Container::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -7193,12 +11238,12 @@ void *CORBA::Container::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::Container::_interface_repository_id (void) const
+const char* CORBA_Container::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/Container:1.0";
 }
 
-CORBA::Contained_ptr CORBA::Container::lookup (
+CORBA_Contained_ptr CORBA_Container::lookup (
     const char * search_name,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7206,8 +11251,8 @@ CORBA::Contained_ptr CORBA::Container::lookup (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.lookup (
@@ -7217,7 +11262,7 @@ CORBA::Contained_ptr CORBA::Container::lookup (
     );
 }
 
-CORBA::ContainedSeq * CORBA::Container::contents (
+CORBA_ContainedSeq * CORBA_Container::contents (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Environment &ACE_TRY_ENV
@@ -7226,8 +11271,8 @@ CORBA::ContainedSeq * CORBA::Container::contents (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.contents (
@@ -7238,7 +11283,7 @@ CORBA::ContainedSeq * CORBA::Container::contents (
     );
 }
 
-CORBA::ContainedSeq * CORBA::Container::lookup_name (
+CORBA_ContainedSeq * CORBA_Container::lookup_name (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
@@ -7249,8 +11294,8 @@ CORBA::ContainedSeq * CORBA::Container::lookup_name (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.lookup_name (
@@ -7455,13 +11500,13 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_Description (
     sizeof (_oc_CORBA_Container_Description),
     (char *) &_oc_CORBA_Container_Description,
     0,
-    sizeof (CORBA::Container::Description)
+    sizeof (CORBA_Container::Description)
   );
 
-CORBA::TypeCode_ptr CORBA::Container::_tc_Description =
+CORBA::TypeCode_ptr CORBA_Container::_tc_Description =
   &_tc_TAO_tc_CORBA_Container_Description;
 
-void CORBA::Container::Description::_tao_any_destructor (void *x)
+void CORBA_Container::Description::_tao_any_destructor (void *x)
 {
   Description *tmp = ACE_static_cast (Description*,x);
   delete tmp;
@@ -7474,14 +11519,14 @@ void CORBA::Container::Description::_tao_any_destructor (void *x)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CS_
 
   void
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_allocate_buffer (CORBA::ULong length)
+  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_allocate_buffer (CORBA::ULong length)
   {
-    CORBA::Container::Description* tmp = 0;
+    CORBA_Container::Description* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (length);
     
     if (this->buffer_ != 0)
     {
-      CORBA::Container::Description *old = ACE_reinterpret_cast (CORBA::Container::Description *,this->buffer_);
+      CORBA_Container::Description *old = ACE_reinterpret_cast (CORBA_Container::Description *,this->buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
@@ -7494,18 +11539,18 @@ void CORBA::Container::Description::_tao_any_destructor (void *x)
   }
   
   void
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_deallocate_buffer (void)
+  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     
-    CORBA::Container::Description *tmp = ACE_reinterpret_cast (CORBA::Container::Description *,this->buffer_);
+    CORBA_Container::Description *tmp = ACE_reinterpret_cast (CORBA_Container::Description *,this->buffer_);
     
     _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (tmp);
     this->buffer_ = 0;
   } 
   
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void) // Dtor.
+  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
@@ -7520,41 +11565,41 @@ void CORBA::Container::Description::_tao_any_destructor (void *x)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ_CS_
 
 // *************************************************************
-// CORBA::Container::DescriptionSeq
+// CORBA_Container::DescriptionSeq
 // *************************************************************
 
-CORBA::Container::DescriptionSeq::DescriptionSeq (void)
+CORBA_Container::DescriptionSeq::DescriptionSeq (void)
 {}
-CORBA::Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max) // uses max size
+CORBA_Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max) // uses max size
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Container::Description>
+  TAO_Unbounded_Sequence<CORBA_Container::Description>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA::Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA::Container::Description *buffer, CORBA::Boolean release)
+CORBA_Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA_Container::Description *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Container::Description>
+  TAO_Unbounded_Sequence<CORBA_Container::Description>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
-CORBA::Container::DescriptionSeq::DescriptionSeq (const DescriptionSeq &seq) // copy ctor
+CORBA_Container::DescriptionSeq::DescriptionSeq (const DescriptionSeq &seq) // copy ctor
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Container::Description>
+  TAO_Unbounded_Sequence<CORBA_Container::Description>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
-CORBA::Container::DescriptionSeq::~DescriptionSeq (void) // dtor
+CORBA_Container::DescriptionSeq::~DescriptionSeq (void) // dtor
 {}
-void CORBA::Container::DescriptionSeq::_tao_any_destructor (void *x)
+void CORBA_Container::DescriptionSeq::_tao_any_destructor (void *x)
 {
   DescriptionSeq *tmp = ACE_static_cast (DescriptionSeq*,x);
   delete tmp;
@@ -7782,13 +11827,13 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Container_DescriptionSeq (
     sizeof (_oc_CORBA_Container_DescriptionSeq),
     (char *) &_oc_CORBA_Container_DescriptionSeq,
     0,
-    sizeof (CORBA::Container::DescriptionSeq)
+    sizeof (CORBA_Container::DescriptionSeq)
   );
 
-CORBA::TypeCode_ptr CORBA::Container::_tc_DescriptionSeq =
+CORBA::TypeCode_ptr CORBA_Container::_tc_DescriptionSeq =
   &_tc_TAO_tc_CORBA_Container_DescriptionSeq;
 
-CORBA::Container::DescriptionSeq * CORBA::Container::describe_contents (
+CORBA_Container::DescriptionSeq * CORBA_Container::describe_contents (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
     CORBA::Long max_returned_objs,
@@ -7798,8 +11843,8 @@ CORBA::Container::DescriptionSeq * CORBA::Container::describe_contents (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.describe_contents (
@@ -7811,7 +11856,7 @@ CORBA::Container::DescriptionSeq * CORBA::Container::describe_contents (
     );
 }
 
-CORBA::ModuleDef_ptr CORBA::Container::create_module (
+CORBA_ModuleDef_ptr CORBA_Container::create_module (
     const char * id,
     const char * name,
     const char * version,
@@ -7821,8 +11866,8 @@ CORBA::ModuleDef_ptr CORBA::Container::create_module (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_module (
@@ -7834,11 +11879,11 @@ CORBA::ModuleDef_ptr CORBA::Container::create_module (
     );
 }
 
-CORBA::ConstantDef_ptr CORBA::Container::create_constant (
+CORBA_ConstantDef_ptr CORBA_Container::create_constant (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7846,8 +11891,8 @@ CORBA::ConstantDef_ptr CORBA::Container::create_constant (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_constant (
@@ -7861,19 +11906,19 @@ CORBA::ConstantDef_ptr CORBA::Container::create_constant (
     );
 }
 
-CORBA::StructDef_ptr CORBA::Container::create_struct (
+CORBA_StructDef_ptr CORBA_Container::create_struct (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_struct (
@@ -7886,20 +11931,20 @@ CORBA::StructDef_ptr CORBA::Container::create_struct (
     );
 }
 
-CORBA::UnionDef_ptr CORBA::Container::create_union (
+CORBA_UnionDef_ptr CORBA_Container::create_union (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
+    CORBA_IDLType_ptr discriminator_type,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_union (
@@ -7913,19 +11958,19 @@ CORBA::UnionDef_ptr CORBA::Container::create_union (
     );
 }
 
-CORBA::EnumDef_ptr CORBA::Container::create_enum (
+CORBA_EnumDef_ptr CORBA_Container::create_enum (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_enum (
@@ -7938,19 +11983,19 @@ CORBA::EnumDef_ptr CORBA::Container::create_enum (
     );
 }
 
-CORBA::AliasDef_ptr CORBA::Container::create_alias (
+CORBA_AliasDef_ptr CORBA_Container::create_alias (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type,
+    CORBA_IDLType_ptr original_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_alias (
@@ -7963,19 +12008,19 @@ CORBA::AliasDef_ptr CORBA::Container::create_alias (
     );
 }
 
-CORBA::InterfaceDef_ptr CORBA::Container::create_interface (
+CORBA_InterfaceDef_ptr CORBA_Container::create_interface (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_interface (
@@ -7988,25 +12033,25 @@ CORBA::InterfaceDef_ptr CORBA::Container::create_interface (
     );
 }
 
-CORBA::ValueDef_ptr CORBA::Container::create_value (
+CORBA_ValueDef_ptr CORBA_Container::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_ValueDef_ptr base_value,
     CORBA::Boolean is_truncatable,
-    const CORBA::ValueDefSeq & abstract_base_values,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_ValueDefSeq & abstract_base_values,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_value (
@@ -8025,19 +12070,19 @@ CORBA::ValueDef_ptr CORBA::Container::create_value (
     );
 }
 
-CORBA::ValueBoxDef_ptr CORBA::Container::create_value_box (
+CORBA_ValueBoxDef_ptr CORBA_Container::create_value_box (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_value_box (
@@ -8050,19 +12095,19 @@ CORBA::ValueBoxDef_ptr CORBA::Container::create_value_box (
     );
 }
 
-CORBA::ExceptionDef_ptr CORBA::Container::create_exception (
+CORBA_ExceptionDef_ptr CORBA_Container::create_exception (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_exception (
@@ -8075,7 +12120,7 @@ CORBA::ExceptionDef_ptr CORBA::Container::create_exception (
     );
 }
 
-CORBA::NativeDef_ptr CORBA::Container::create_native (
+CORBA_NativeDef_ptr CORBA_Container::create_native (
     const char * id,
     const char * name,
     const char * version,
@@ -8085,8 +12130,8 @@ CORBA::NativeDef_ptr CORBA::Container::create_native (
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_native (
@@ -8098,19 +12143,19 @@ CORBA::NativeDef_ptr CORBA::Container::create_native (
     );
 }
 
-CORBA::AbstractInterfaceDef_ptr CORBA::Container::create_abstract_interface (
+CORBA_AbstractInterfaceDef_ptr CORBA_Container::create_abstract_interface (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_abstract_interface (
@@ -8123,19 +12168,19 @@ CORBA::AbstractInterfaceDef_ptr CORBA::Container::create_abstract_interface (
     );
 }
 
-CORBA::LocalInterfaceDef_ptr CORBA::Container::create_local_interface (
+CORBA_LocalInterfaceDef_ptr CORBA_Container::create_local_interface (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Container_Proxy_Impl &proxy = 
-    this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Container_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_local_interface (
@@ -8148,6 +12193,188 @@ CORBA::LocalInterfaceDef_ptr CORBA::Container::create_local_interface (
     );
 }
 
+// *************************************************************
+// Operations for class CORBA_IDLType_var
+// *************************************************************
+
+CORBA_IDLType_var::CORBA_IDLType_var (void) // default constructor
+  : ptr_ (CORBA_IDLType::_nil ())
+{}
+
+::CORBA_IDLType_ptr
+CORBA_IDLType_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_IDLType_var::CORBA_IDLType_var (const ::CORBA_IDLType_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_IDLType::_duplicate (p.ptr ()))
+{}
+
+CORBA_IDLType_var::~CORBA_IDLType_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_IDLType_var &
+CORBA_IDLType_var::operator= (CORBA_IDLType_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_IDLType_var &
+CORBA_IDLType_var::operator= (const ::CORBA_IDLType_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_IDLType::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_IDLType_var::operator const ::CORBA_IDLType_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_IDLType_var::operator ::CORBA_IDLType_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_IDLType_ptr
+CORBA_IDLType_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_IDLType_ptr
+CORBA_IDLType_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_IDLType_ptr &
+CORBA_IDLType_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_IDLType_ptr &
+CORBA_IDLType_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_IDLType::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_IDLType_ptr
+CORBA_IDLType_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_IDLType_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_IDLType::_nil ();
+  return val;
+}
+
+::CORBA_IDLType_ptr
+CORBA_IDLType_var::duplicate (CORBA_IDLType_ptr p)
+{
+  return ::CORBA_IDLType::_duplicate (p);
+}
+
+void
+CORBA_IDLType_var::release (CORBA_IDLType_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_IDLType_ptr
+CORBA_IDLType_var::nil (void)
+{
+  return ::CORBA_IDLType::_nil ();
+}
+
+::CORBA_IDLType_ptr
+CORBA_IDLType_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_IDLType::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_IDLType_var::upcast (void *src)
+{
+  CORBA_IDLType **tmp =
+    ACE_static_cast (CORBA_IDLType **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_IDLType_out
+// *************************************************************
+
+CORBA_IDLType_out::CORBA_IDLType_out (CORBA_IDLType_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_IDLType::_nil ();
+}
+
+CORBA_IDLType_out::CORBA_IDLType_out (CORBA_IDLType_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_IDLType::_nil ();
+}
+
+CORBA_IDLType_out::CORBA_IDLType_out (const ::CORBA_IDLType_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_IDLType_out &, p).ptr_)
+{}
+
+::CORBA_IDLType_out &
+CORBA_IDLType_out::operator= (const ::CORBA_IDLType_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_IDLType_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_IDLType_out &
+CORBA_IDLType_out::operator= (const ::CORBA_IDLType_var &p)
+{
+  this->ptr_ = ::CORBA_IDLType::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_IDLType_out &
+CORBA_IDLType_out::operator= (CORBA_IDLType_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_IDLType_out::operator ::CORBA_IDLType_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_IDLType_ptr &
+CORBA_IDLType_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_IDLType_ptr
+CORBA_IDLType_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_IDLType_type_get : public TAO_ClientRequestInfo
@@ -8249,15 +12476,15 @@ TAO_ClientRequestInfo_CORBA_IDLType_type_get::result (CORBA::TypeCode_ptr result
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_IDLType_Proxy_Impl::_TAO_IDLType_Proxy_Impl (void)
+_TAO_CORBA_IDLType_Proxy_Impl::_TAO_CORBA_IDLType_Proxy_Impl (void)
 {}
 
-_TAO_IDLType_Remote_Proxy_Impl::_TAO_IDLType_Remote_Proxy_Impl (void)
+_TAO_CORBA_IDLType_Remote_Proxy_Impl::_TAO_CORBA_IDLType_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::TypeCode_ptr _TAO_IDLType_Remote_Proxy_Impl::type (
+CORBA::TypeCode_ptr _TAO_CORBA_IDLType_Remote_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8427,36 +12654,36 @@ CORBA::TypeCode_ptr _TAO_IDLType_Remote_Proxy_Impl::type (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_IDLType_Proxy_Broker::_TAO_IDLType_Proxy_Broker (void)
+_TAO_CORBA_IDLType_Proxy_Broker::_TAO_CORBA_IDLType_Proxy_Broker (void)
 {
 }
 
-_TAO_IDLType_Proxy_Broker::~_TAO_IDLType_Proxy_Broker (void)
+_TAO_CORBA_IDLType_Proxy_Broker::~_TAO_CORBA_IDLType_Proxy_Broker (void)
 {
 }
 
-_TAO_IDLType_Proxy_Broker * (*CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_IDLType_Proxy_Broker * (*_TAO_CORBA_IDLType_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_IDLType_Remote_Proxy_Broker *
-_TAO_IDLType_Remote_Proxy_Broker::the_TAO_IDLType_Remote_Proxy_Broker (void)
+_TAO_CORBA_IDLType_Remote_Proxy_Broker *
+_TAO_CORBA_IDLType_Remote_Proxy_Broker::the_TAO_CORBA_IDLType_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_IDLType_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_IDLType_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_IDLType_Remote_Proxy_Broker::_TAO_IDLType_Remote_Proxy_Broker (void)
+_TAO_CORBA_IDLType_Remote_Proxy_Broker::_TAO_CORBA_IDLType_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_IDLType_Remote_Proxy_Broker::~_TAO_IDLType_Remote_Proxy_Broker (void)
+_TAO_CORBA_IDLType_Remote_Proxy_Broker::~_TAO_CORBA_IDLType_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_IDLType_Proxy_Impl&
-_TAO_IDLType_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_IDLType_Proxy_Impl&
+_TAO_CORBA_IDLType_Remote_Proxy_Broker::select_proxy (
   ::CORBA_IDLType *,
   CORBA::Environment &
 )
@@ -8481,72 +12708,72 @@ CORBA_IDLType::~CORBA_IDLType (void)
 {}
 
 void
-CORBA::IDLType::CORBA_IDLType_setup_collocation (int collocated)
+CORBA_IDLType::CORBA_IDLType_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_IDLType_Proxy_Broker_ =
-      ::CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_IDLType_Proxy_Broker_ =
+      ::_TAO_CORBA_IDLType_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_IDLType_Proxy_Broker_ =
-      ::_TAO_IDLType_Remote_Proxy_Broker::the_TAO_IDLType_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_IDLType_Proxy_Broker_ =
+      ::_TAO_CORBA_IDLType_Remote_Proxy_Broker::the_TAO_CORBA_IDLType_Remote_Proxy_Broker ();
   
   this->CORBA_IRObject_setup_collocation (collocated);
 }
 
-void CORBA::IDLType::_tao_any_destructor (void *x)
+void CORBA_IDLType::_tao_any_destructor (void *x)
 {
   CORBA_IDLType *tmp = ACE_static_cast (CORBA_IDLType*,x);
   CORBA::release (tmp);
 }
 
-CORBA::IDLType_ptr CORBA::IDLType::_narrow (
+CORBA_IDLType_ptr CORBA_IDLType::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::IDLType::_nil ();
+    return CORBA_IDLType::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IDLType:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
+      ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
       if (is_a == 0)
-        return CORBA::IDLType::_nil ();
+        return CORBA_IDLType::_nil ();
     }
-  return CORBA::IDLType::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_IDLType::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::IDLType_ptr CORBA::IDLType::_unchecked_narrow (
+CORBA_IDLType_ptr CORBA_IDLType::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::IDLType::_nil ();
+    return CORBA_IDLType::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::IDLType_ptr default_proxy = CORBA::IDLType::_nil ();
+      CORBA_IDLType_ptr default_proxy = CORBA_IDLType::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_IDLType_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::IDLType (
+          ::CORBA_IDLType (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::IDLType::_nil ());
+          CORBA_IDLType::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::IDLType (stub, 0, obj->_servant ()), CORBA::IDLType::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_IDLType (stub, 0, obj->_servant ()), CORBA_IDLType::_nil ());
         return default_proxy;
       }
     else 
@@ -8565,15 +12792,15 @@ CORBA::IDLType_ptr CORBA::IDLType::_unchecked_narrow (
           );
 }
 
-CORBA::IDLType_ptr
-CORBA::IDLType::_duplicate (CORBA::IDLType_ptr obj)
+CORBA_IDLType_ptr
+CORBA_IDLType::_duplicate (CORBA_IDLType_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::IDLType::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_IDLType::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
@@ -8584,22 +12811,22 @@ CORBA::Boolean CORBA::IDLType::_is_a (const CORBA::Char *value, CORBA::Environme
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::IDLType::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_IDLType::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -8612,20 +12839,20 @@ void *CORBA::IDLType::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::IDLType::_interface_repository_id (void) const
+const char* CORBA_IDLType::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/IDLType:1.0";
 }
 
-CORBA::TypeCode_ptr CORBA::IDLType::type (
+CORBA::TypeCode_ptr CORBA_IDLType::type (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_IDLType_Proxy_Impl &proxy = 
-    this->the_TAO_IDLType_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_IDLType_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_IDLType_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.type (
@@ -8634,15 +12861,200 @@ CORBA::TypeCode_ptr CORBA::IDLType::type (
     );
 }
 
+// *************************************************************
+// Operations for class CORBA_TypedefDef_var
+// *************************************************************
+
+CORBA_TypedefDef_var::CORBA_TypedefDef_var (void) // default constructor
+  : ptr_ (CORBA_TypedefDef::_nil ())
+{}
+
+::CORBA_TypedefDef_ptr
+CORBA_TypedefDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_TypedefDef_var::CORBA_TypedefDef_var (const ::CORBA_TypedefDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_TypedefDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_TypedefDef_var::~CORBA_TypedefDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_TypedefDef_var &
+CORBA_TypedefDef_var::operator= (CORBA_TypedefDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_TypedefDef_var &
+CORBA_TypedefDef_var::operator= (const ::CORBA_TypedefDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_TypedefDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_TypedefDef_var::operator const ::CORBA_TypedefDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_TypedefDef_var::operator ::CORBA_TypedefDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_TypedefDef_ptr
+CORBA_TypedefDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_TypedefDef_ptr
+CORBA_TypedefDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_TypedefDef_ptr &
+CORBA_TypedefDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_TypedefDef_ptr &
+CORBA_TypedefDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_TypedefDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_TypedefDef_ptr
+CORBA_TypedefDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_TypedefDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_TypedefDef::_nil ();
+  return val;
+}
+
+::CORBA_TypedefDef_ptr
+CORBA_TypedefDef_var::duplicate (CORBA_TypedefDef_ptr p)
+{
+  return ::CORBA_TypedefDef::_duplicate (p);
+}
+
+void
+CORBA_TypedefDef_var::release (CORBA_TypedefDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_TypedefDef_ptr
+CORBA_TypedefDef_var::nil (void)
+{
+  return ::CORBA_TypedefDef::_nil ();
+}
+
+::CORBA_TypedefDef_ptr
+CORBA_TypedefDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_TypedefDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_TypedefDef_var::upcast (void *src)
+{
+  CORBA_TypedefDef **tmp =
+    ACE_static_cast (CORBA_TypedefDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_TypedefDef_out
+// *************************************************************
+
+CORBA_TypedefDef_out::CORBA_TypedefDef_out (CORBA_TypedefDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_TypedefDef::_nil ();
+}
+
+CORBA_TypedefDef_out::CORBA_TypedefDef_out (CORBA_TypedefDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_TypedefDef::_nil ();
+}
+
+CORBA_TypedefDef_out::CORBA_TypedefDef_out (const ::CORBA_TypedefDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_TypedefDef_out &, p).ptr_)
+{}
+
+::CORBA_TypedefDef_out &
+CORBA_TypedefDef_out::operator= (const ::CORBA_TypedefDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_TypedefDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_TypedefDef_out &
+CORBA_TypedefDef_out::operator= (const ::CORBA_TypedefDef_var &p)
+{
+  this->ptr_ = ::CORBA_TypedefDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_TypedefDef_out &
+CORBA_TypedefDef_out::operator= (CORBA_TypedefDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_TypedefDef_out::operator ::CORBA_TypedefDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_TypedefDef_ptr &
+CORBA_TypedefDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_TypedefDef_ptr
+CORBA_TypedefDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+#endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_TypedefDef_Proxy_Impl::_TAO_TypedefDef_Proxy_Impl (void)
+_TAO_CORBA_TypedefDef_Proxy_Impl::_TAO_CORBA_TypedefDef_Proxy_Impl (void)
 {}
 
-_TAO_TypedefDef_Remote_Proxy_Impl::_TAO_TypedefDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_TypedefDef_Remote_Proxy_Impl::_TAO_CORBA_TypedefDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
@@ -8657,36 +13069,36 @@ _TAO_TypedefDef_Remote_Proxy_Impl::_TAO_TypedefDef_Remote_Proxy_Impl (void)
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_TypedefDef_Proxy_Broker::_TAO_TypedefDef_Proxy_Broker (void)
+_TAO_CORBA_TypedefDef_Proxy_Broker::_TAO_CORBA_TypedefDef_Proxy_Broker (void)
 {
 }
 
-_TAO_TypedefDef_Proxy_Broker::~_TAO_TypedefDef_Proxy_Broker (void)
+_TAO_CORBA_TypedefDef_Proxy_Broker::~_TAO_CORBA_TypedefDef_Proxy_Broker (void)
 {
 }
 
-_TAO_TypedefDef_Proxy_Broker * (*CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_TypedefDef_Proxy_Broker * (*_TAO_CORBA_TypedefDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_TypedefDef_Remote_Proxy_Broker *
-_TAO_TypedefDef_Remote_Proxy_Broker::the_TAO_TypedefDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_TypedefDef_Remote_Proxy_Broker *
+_TAO_CORBA_TypedefDef_Remote_Proxy_Broker::the_TAO_CORBA_TypedefDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_TypedefDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_TypedefDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_TypedefDef_Remote_Proxy_Broker::_TAO_TypedefDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_TypedefDef_Remote_Proxy_Broker::_TAO_CORBA_TypedefDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_TypedefDef_Remote_Proxy_Broker::~_TAO_TypedefDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_TypedefDef_Remote_Proxy_Broker::~_TAO_CORBA_TypedefDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_TypedefDef_Proxy_Impl&
-_TAO_TypedefDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_TypedefDef_Proxy_Impl&
+_TAO_CORBA_TypedefDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_TypedefDef *,
   CORBA::Environment &
 )
@@ -8711,74 +13123,74 @@ CORBA_TypedefDef::~CORBA_TypedefDef (void)
 {}
 
 void
-CORBA::TypedefDef::CORBA_TypedefDef_setup_collocation (int collocated)
+CORBA_TypedefDef::CORBA_TypedefDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_TypedefDef_Proxy_Broker_ =
-      ::CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_TypedefDef_Proxy_Broker_ =
+      ::_TAO_CORBA_TypedefDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_TypedefDef_Proxy_Broker_ =
-      ::_TAO_TypedefDef_Remote_Proxy_Broker::the_TAO_TypedefDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_TypedefDef_Proxy_Broker_ =
+      ::_TAO_CORBA_TypedefDef_Remote_Proxy_Broker::the_TAO_CORBA_TypedefDef_Remote_Proxy_Broker ();
   
   this->CORBA_Contained_setup_collocation (collocated);
   
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA::TypedefDef::_tao_any_destructor (void *x)
+void CORBA_TypedefDef::_tao_any_destructor (void *x)
 {
   CORBA_TypedefDef *tmp = ACE_static_cast (CORBA_TypedefDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::TypedefDef_ptr CORBA::TypedefDef::_narrow (
+CORBA_TypedefDef_ptr CORBA_TypedefDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::TypedefDef::_nil ();
+    return CORBA_TypedefDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/TypedefDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypedefDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_TypedefDef::_nil ());
       if (is_a == 0)
-        return CORBA::TypedefDef::_nil ();
+        return CORBA_TypedefDef::_nil ();
     }
-  return CORBA::TypedefDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_TypedefDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::TypedefDef_ptr CORBA::TypedefDef::_unchecked_narrow (
+CORBA_TypedefDef_ptr CORBA_TypedefDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::TypedefDef::_nil ();
+    return CORBA_TypedefDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::TypedefDef_ptr default_proxy = CORBA::TypedefDef::_nil ();
+      CORBA_TypedefDef_ptr default_proxy = CORBA_TypedefDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_TypedefDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::TypedefDef (
+          ::CORBA_TypedefDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::TypedefDef::_nil ());
+          CORBA_TypedefDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::TypedefDef (stub, 0, obj->_servant ()), CORBA::TypedefDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_TypedefDef (stub, 0, obj->_servant ()), CORBA_TypedefDef::_nil ());
         return default_proxy;
       }
     else 
@@ -8797,15 +13209,15 @@ CORBA::TypedefDef_ptr CORBA::TypedefDef::_unchecked_narrow (
           );
 }
 
-CORBA::TypedefDef_ptr
-CORBA::TypedefDef::_duplicate (CORBA::TypedefDef_ptr obj)
+CORBA_TypedefDef_ptr
+CORBA_TypedefDef::_duplicate (CORBA_TypedefDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::TypedefDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_TypedefDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
@@ -8818,46 +13230,46 @@ CORBA::Boolean CORBA::TypedefDef::_is_a (const CORBA::Char *value, CORBA::Enviro
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::TypedefDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_TypedefDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_TypedefDef::_narrow))
+      &CORBA_TypedefDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -8870,12 +13282,12 @@ void *CORBA::TypedefDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::TypedefDef::_interface_repository_id (void) const
+const char* CORBA_TypedefDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/TypedefDef:1.0";
 }
 
-void CORBA::TypeDescription::_tao_any_destructor (void *x)
+void CORBA_TypeDescription::_tao_any_destructor (void *x)
 {
   CORBA_TypeDescription *tmp = ACE_static_cast (CORBA_TypeDescription*,x);
   delete tmp;
@@ -8921,7 +13333,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::DefinitionKind &_
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::IRObject_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_IRObject_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -8931,17 +13343,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::IRObject_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::IRObject::_duplicate (_tao_elem),
-        CORBA::IRObject::_tao_any_destructor
+        CORBA_IRObject::_duplicate (_tao_elem),
+        CORBA_IRObject::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::IRObject_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_IRObject_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::IRObject::_nil ();
+    _tao_elem = CORBA_IRObject::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_IRObject, ACE_TRY_ENV);
@@ -8960,29 +13372,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::IRObject_ptr &_ta
           CORBA::_tc_IRObject,
           1,
           _tao_elem,
-          CORBA::IRObject::_tao_any_destructor
+          CORBA_IRObject::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::IRObject::_nil ();
+    _tao_elem = CORBA_IRObject::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::IRObject::_nil ();
+  _tao_elem = CORBA_IRObject::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::IRObject,CORBA::IRObject_var>;
+    template class TAO_Object_Manager<CORBA_IRObject,CORBA_IRObject_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::IRObject,CORBA::IRObject_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_IRObject,CORBA_IRObject_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::Contained_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_Contained_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -8992,17 +13404,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::Contained_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::Contained::_duplicate (_tao_elem),
-        CORBA::Contained::_tao_any_destructor
+        CORBA_Contained::_duplicate (_tao_elem),
+        CORBA_Contained::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Contained_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Contained_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::Contained::_nil ();
+    _tao_elem = CORBA_Contained::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_Contained, ACE_TRY_ENV);
@@ -9021,66 +13433,66 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Contained_ptr &_t
           CORBA::_tc_Contained,
           1,
           _tao_elem,
-          CORBA::Contained::_tao_any_destructor
+          CORBA_Contained::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::Contained::_nil ();
+    _tao_elem = CORBA_Contained::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::Contained::_nil ();
+  _tao_elem = CORBA_Contained::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var>;
+    template class TAO_Object_Manager<CORBA_Contained,CORBA_Contained_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_Contained,CORBA_Contained_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::Contained::Description &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA_Contained::Description &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
   _tao_any._tao_replace (
-      CORBA::Contained::_tc_Description,
+      CORBA_Contained::_tc_Description,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin ()
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::Contained::Description *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_Contained::Description *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
   _tao_any._tao_replace (
-      CORBA::Contained::_tc_Description,
+      CORBA_Contained::_tc_Description,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::Contained::Description::_tao_any_destructor
+      CORBA_Contained::Description::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Contained::Description *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Contained::Description *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::Contained::Description*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_Contained::Description*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Contained::Description *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_Contained::Description *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (CORBA::Contained::_tc_Description, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA_Contained::_tc_Description, ACE_TRY_ENV);
     ACE_TRY_CHECK;
     
     if (!result)
@@ -9089,15 +13501,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Contained::
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::Contained::Description*,
+          const CORBA_Contained::Description*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::Contained::Description *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::Contained::Description, 0);
+      CORBA_Contained::Description *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_Contained::Description, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -9105,10 +13517,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Contained::
       if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::Contained::_tc_Description,
+            CORBA_Contained::_tc_Description,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::Contained::Description::_tao_any_destructor
+            CORBA_Contained::Description::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -9128,7 +13540,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Contained::
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::ContainedSeq &_tao_elem
+    const CORBA_ContainedSeq &_tao_elem
   ) // copying
 {
   TAO_OutputCDR stream;
@@ -9142,7 +13554,7 @@ void operator<<= (
   }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ContainedSeq *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_ContainedSeq *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -9152,19 +13564,19 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ContainedSeq *_tao_elem) // non c
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::ContainedSeq::_tao_any_destructor
+      CORBA_ContainedSeq::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ContainedSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ContainedSeq *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA::ContainedSeq*&,
+      const CORBA_ContainedSeq*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ContainedSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ContainedSeq *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -9180,15 +13592,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ContainedSe
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::ContainedSeq*,
+          const CORBA_ContainedSeq*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::ContainedSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::ContainedSeq, 0);
+      CORBA_ContainedSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_ContainedSeq, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -9199,7 +13611,189 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ContainedSe
             CORBA::_tc_ContainedSeq,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::ContainedSeq::_tao_any_destructor
+            CORBA_ContainedSeq::_tao_any_destructor
+          );
+        _tao_elem = tmp;
+        return 1;
+      }
+      else
+      {
+        delete tmp;
+      }
+    }
+  }
+  ACE_CATCHANY
+  {
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA_InterfaceDefSeq &_tao_elem
+  ) // copying
+{
+  TAO_OutputCDR stream;
+  if (stream << _tao_elem)
+  {
+    _tao_any._tao_replace (
+        CORBA::_tc_InterfaceDefSeq,
+        TAO_ENCAP_BYTE_ORDER,
+        stream.begin ()
+      );
+  }
+}
+
+void operator<<= (CORBA::Any &_tao_any, CORBA_InterfaceDefSeq *_tao_elem) // non copying
+{
+  TAO_OutputCDR stream;
+  stream << *_tao_elem;
+  _tao_any._tao_replace (
+      CORBA::_tc_InterfaceDefSeq,
+      TAO_ENCAP_BYTE_ORDER,
+      stream.begin (),
+      1,
+      _tao_elem,
+      CORBA_InterfaceDefSeq::_tao_any_destructor
+    );
+}
+
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_InterfaceDefSeq *&_tao_elem)
+{
+  return _tao_any >>= ACE_const_cast(
+      const CORBA_InterfaceDefSeq*&,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InterfaceDefSeq *&_tao_elem)
+{
+  _tao_elem = 0;
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::TypeCode_var type = _tao_any.type ();
+    
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDefSeq, ACE_TRY_ENV);
+    ACE_TRY_CHECK;
+    
+    if (!result)
+      return 0; // not equivalent
+    
+    if (_tao_any.any_owns_data ())
+    {
+      _tao_elem = ACE_static_cast(
+          const CORBA_InterfaceDefSeq*,
+          _tao_any.value ()
+        );
+      return 1;
+    }
+    else
+    {
+      CORBA_InterfaceDefSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_InterfaceDefSeq, 0);
+      TAO_InputCDR stream (
+          _tao_any._tao_get_cdr (),
+          _tao_any._tao_byte_order ()
+        );
+      if (stream >> *tmp)
+      {
+        ((CORBA::Any *)&_tao_any)->_tao_replace (
+            CORBA::_tc_InterfaceDefSeq,
+            1,
+            ACE_static_cast (void *, tmp),
+            CORBA_InterfaceDefSeq::_tao_any_destructor
+          );
+        _tao_elem = tmp;
+        return 1;
+      }
+      else
+      {
+        delete tmp;
+      }
+    }
+  }
+  ACE_CATCHANY
+  {
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA_ValueDefSeq &_tao_elem
+  ) // copying
+{
+  TAO_OutputCDR stream;
+  if (stream << _tao_elem)
+  {
+    _tao_any._tao_replace (
+        CORBA::_tc_ValueDefSeq,
+        TAO_ENCAP_BYTE_ORDER,
+        stream.begin ()
+      );
+  }
+}
+
+void operator<<= (CORBA::Any &_tao_any, CORBA_ValueDefSeq *_tao_elem) // non copying
+{
+  TAO_OutputCDR stream;
+  stream << *_tao_elem;
+  _tao_any._tao_replace (
+      CORBA::_tc_ValueDefSeq,
+      TAO_ENCAP_BYTE_ORDER,
+      stream.begin (),
+      1,
+      _tao_elem,
+      CORBA_ValueDefSeq::_tao_any_destructor
+    );
+}
+
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueDefSeq *&_tao_elem)
+{
+  return _tao_any >>= ACE_const_cast(
+      const CORBA_ValueDefSeq*&,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueDefSeq *&_tao_elem)
+{
+  _tao_elem = 0;
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::TypeCode_var type = _tao_any.type ();
+    
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDefSeq, ACE_TRY_ENV);
+    ACE_TRY_CHECK;
+    
+    if (!result)
+      return 0; // not equivalent
+    
+    if (_tao_any.any_owns_data ())
+    {
+      _tao_elem = ACE_static_cast(
+          const CORBA_ValueDefSeq*,
+          _tao_any.value ()
+        );
+      return 1;
+    }
+    else
+    {
+      CORBA_ValueDefSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_ValueDefSeq, 0);
+      TAO_InputCDR stream (
+          _tao_any._tao_get_cdr (),
+          _tao_any._tao_byte_order ()
+        );
+      if (stream >> *tmp)
+      {
+        ((CORBA::Any *)&_tao_any)->_tao_replace (
+            CORBA::_tc_ValueDefSeq,
+            1,
+            ACE_static_cast (void *, tmp),
+            CORBA_ValueDefSeq::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -9217,7 +13811,189 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ContainedSe
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::StructMember &_tao_elem) // copying
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA_AbstractInterfaceDefSeq &_tao_elem
+  ) // copying
+{
+  TAO_OutputCDR stream;
+  if (stream << _tao_elem)
+  {
+    _tao_any._tao_replace (
+        CORBA::_tc_AbstractInterfaceDefSeq,
+        TAO_ENCAP_BYTE_ORDER,
+        stream.begin ()
+      );
+  }
+}
+
+void operator<<= (CORBA::Any &_tao_any, CORBA_AbstractInterfaceDefSeq *_tao_elem) // non copying
+{
+  TAO_OutputCDR stream;
+  stream << *_tao_elem;
+  _tao_any._tao_replace (
+      CORBA::_tc_AbstractInterfaceDefSeq,
+      TAO_ENCAP_BYTE_ORDER,
+      stream.begin (),
+      1,
+      _tao_elem,
+      CORBA_AbstractInterfaceDefSeq::_tao_any_destructor
+    );
+}
+
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AbstractInterfaceDefSeq *&_tao_elem)
+{
+  return _tao_any >>= ACE_const_cast(
+      const CORBA_AbstractInterfaceDefSeq*&,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_AbstractInterfaceDefSeq *&_tao_elem)
+{
+  _tao_elem = 0;
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::TypeCode_var type = _tao_any.type ();
+    
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDefSeq, ACE_TRY_ENV);
+    ACE_TRY_CHECK;
+    
+    if (!result)
+      return 0; // not equivalent
+    
+    if (_tao_any.any_owns_data ())
+    {
+      _tao_elem = ACE_static_cast(
+          const CORBA_AbstractInterfaceDefSeq*,
+          _tao_any.value ()
+        );
+      return 1;
+    }
+    else
+    {
+      CORBA_AbstractInterfaceDefSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_AbstractInterfaceDefSeq, 0);
+      TAO_InputCDR stream (
+          _tao_any._tao_get_cdr (),
+          _tao_any._tao_byte_order ()
+        );
+      if (stream >> *tmp)
+      {
+        ((CORBA::Any *)&_tao_any)->_tao_replace (
+            CORBA::_tc_AbstractInterfaceDefSeq,
+            1,
+            ACE_static_cast (void *, tmp),
+            CORBA_AbstractInterfaceDefSeq::_tao_any_destructor
+          );
+        _tao_elem = tmp;
+        return 1;
+      }
+      else
+      {
+        delete tmp;
+      }
+    }
+  }
+  ACE_CATCHANY
+  {
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA_LocalInterfaceDefSeq &_tao_elem
+  ) // copying
+{
+  TAO_OutputCDR stream;
+  if (stream << _tao_elem)
+  {
+    _tao_any._tao_replace (
+        CORBA::_tc_LocalInterfaceDefSeq,
+        TAO_ENCAP_BYTE_ORDER,
+        stream.begin ()
+      );
+  }
+}
+
+void operator<<= (CORBA::Any &_tao_any, CORBA_LocalInterfaceDefSeq *_tao_elem) // non copying
+{
+  TAO_OutputCDR stream;
+  stream << *_tao_elem;
+  _tao_any._tao_replace (
+      CORBA::_tc_LocalInterfaceDefSeq,
+      TAO_ENCAP_BYTE_ORDER,
+      stream.begin (),
+      1,
+      _tao_elem,
+      CORBA_LocalInterfaceDefSeq::_tao_any_destructor
+    );
+}
+
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_LocalInterfaceDefSeq *&_tao_elem)
+{
+  return _tao_any >>= ACE_const_cast(
+      const CORBA_LocalInterfaceDefSeq*&,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_LocalInterfaceDefSeq *&_tao_elem)
+{
+  _tao_elem = 0;
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::TypeCode_var type = _tao_any.type ();
+    
+    CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDefSeq, ACE_TRY_ENV);
+    ACE_TRY_CHECK;
+    
+    if (!result)
+      return 0; // not equivalent
+    
+    if (_tao_any.any_owns_data ())
+    {
+      _tao_elem = ACE_static_cast(
+          const CORBA_LocalInterfaceDefSeq*,
+          _tao_any.value ()
+        );
+      return 1;
+    }
+    else
+    {
+      CORBA_LocalInterfaceDefSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_LocalInterfaceDefSeq, 0);
+      TAO_InputCDR stream (
+          _tao_any._tao_get_cdr (),
+          _tao_any._tao_byte_order ()
+        );
+      if (stream >> *tmp)
+      {
+        ((CORBA::Any *)&_tao_any)->_tao_replace (
+            CORBA::_tc_LocalInterfaceDefSeq,
+            1,
+            ACE_static_cast (void *, tmp),
+            CORBA_LocalInterfaceDefSeq::_tao_any_destructor
+          );
+        _tao_elem = tmp;
+        return 1;
+      }
+      else
+      {
+        delete tmp;
+      }
+    }
+  }
+  ACE_CATCHANY
+  {
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+void operator<<= (CORBA::Any &_tao_any, const CORBA_StructMember &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
@@ -9228,7 +14004,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA::StructMember &_tao_elem) //
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::StructMember *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_StructMember *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -9238,16 +14014,16 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::StructMember *_tao_elem) // non c
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::StructMember::_tao_any_destructor
+      CORBA_StructMember::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::StructMember *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StructMember *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::StructMember*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_StructMember*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::StructMember *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StructMember *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -9263,15 +14039,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::StructMembe
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::StructMember*,
+          const CORBA_StructMember*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::StructMember *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::StructMember, 0);
+      CORBA_StructMember *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_StructMember, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -9282,7 +14058,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::StructMembe
             CORBA::_tc_StructMember,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::StructMember::_tao_any_destructor
+            CORBA_StructMember::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -9302,7 +14078,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::StructMembe
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::StructMemberSeq &_tao_elem
+    const CORBA_StructMemberSeq &_tao_elem
   ) // copying
 {
   TAO_OutputCDR stream;
@@ -9316,7 +14092,7 @@ void operator<<= (
   }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::StructMemberSeq *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_StructMemberSeq *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -9326,19 +14102,19 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::StructMemberSeq *_tao_elem) // no
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::StructMemberSeq::_tao_any_destructor
+      CORBA_StructMemberSeq::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::StructMemberSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StructMemberSeq *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA::StructMemberSeq*&,
+      const CORBA_StructMemberSeq*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::StructMemberSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_StructMemberSeq *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -9354,15 +14130,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::StructMembe
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::StructMemberSeq*,
+          const CORBA_StructMemberSeq*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::StructMemberSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::StructMemberSeq, 0);
+      CORBA_StructMemberSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_StructMemberSeq, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -9373,7 +14149,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::StructMembe
             CORBA::_tc_StructMemberSeq,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::StructMemberSeq::_tao_any_destructor
+            CORBA_StructMemberSeq::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -9391,7 +14167,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::StructMembe
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::Initializer &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA_Initializer &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
@@ -9402,7 +14178,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA::Initializer &_tao_elem) //
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::Initializer *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_Initializer *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -9412,16 +14188,16 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::Initializer *_tao_elem) // non co
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::Initializer::_tao_any_destructor
+      CORBA_Initializer::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Initializer *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Initializer *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::Initializer*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_Initializer*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Initializer *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_Initializer *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -9437,15 +14213,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Initializer
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::Initializer*,
+          const CORBA_Initializer*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::Initializer *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::Initializer, 0);
+      CORBA_Initializer *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_Initializer, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -9456,7 +14232,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Initializer
             CORBA::_tc_Initializer,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::Initializer::_tao_any_destructor
+            CORBA_Initializer::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -9476,7 +14252,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Initializer
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::InitializerSeq &_tao_elem
+    const CORBA_InitializerSeq &_tao_elem
   ) // copying
 {
   TAO_OutputCDR stream;
@@ -9490,7 +14266,7 @@ void operator<<= (
   }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::InitializerSeq *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_InitializerSeq *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -9500,19 +14276,19 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::InitializerSeq *_tao_elem) // non
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::InitializerSeq::_tao_any_destructor
+      CORBA_InitializerSeq::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::InitializerSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_InitializerSeq *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA::InitializerSeq*&,
+      const CORBA_InitializerSeq*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::InitializerSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InitializerSeq *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -9528,15 +14304,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Initializer
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::InitializerSeq*,
+          const CORBA_InitializerSeq*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::InitializerSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::InitializerSeq, 0);
+      CORBA_InitializerSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_InitializerSeq, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -9547,7 +14323,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Initializer
             CORBA::_tc_InitializerSeq,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::InitializerSeq::_tao_any_destructor
+            CORBA_InitializerSeq::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -9565,7 +14341,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Initializer
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::UnionMember &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA_UnionMember &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
@@ -9576,7 +14352,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA::UnionMember &_tao_elem) //
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::UnionMember *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_UnionMember *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -9586,16 +14362,16 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::UnionMember *_tao_elem) // non co
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::UnionMember::_tao_any_destructor
+      CORBA_UnionMember::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::UnionMember *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_UnionMember *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::UnionMember*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_UnionMember*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::UnionMember *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_UnionMember *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -9611,15 +14387,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::UnionMember
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::UnionMember*,
+          const CORBA_UnionMember*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::UnionMember *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::UnionMember, 0);
+      CORBA_UnionMember *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_UnionMember, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -9630,7 +14406,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::UnionMember
             CORBA::_tc_UnionMember,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::UnionMember::_tao_any_destructor
+            CORBA_UnionMember::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -9650,7 +14426,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::UnionMember
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::UnionMemberSeq &_tao_elem
+    const CORBA_UnionMemberSeq &_tao_elem
   ) // copying
 {
   TAO_OutputCDR stream;
@@ -9664,7 +14440,7 @@ void operator<<= (
   }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::UnionMemberSeq *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_UnionMemberSeq *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -9674,19 +14450,19 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::UnionMemberSeq *_tao_elem) // non
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::UnionMemberSeq::_tao_any_destructor
+      CORBA_UnionMemberSeq::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::UnionMemberSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_UnionMemberSeq *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA::UnionMemberSeq*&,
+      const CORBA_UnionMemberSeq*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::UnionMemberSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_UnionMemberSeq *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -9702,15 +14478,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::UnionMember
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::UnionMemberSeq*,
+          const CORBA_UnionMemberSeq*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::UnionMemberSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::UnionMemberSeq, 0);
+      CORBA_UnionMemberSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_UnionMemberSeq, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -9721,7 +14497,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::UnionMember
             CORBA::_tc_UnionMemberSeq,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::UnionMemberSeq::_tao_any_destructor
+            CORBA_UnionMemberSeq::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -9741,7 +14517,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::UnionMember
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::EnumMemberSeq &_tao_elem
+    const CORBA_EnumMemberSeq &_tao_elem
   ) // copying
 {
   TAO_OutputCDR stream;
@@ -9755,7 +14531,7 @@ void operator<<= (
   }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::EnumMemberSeq *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_EnumMemberSeq *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -9765,19 +14541,19 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::EnumMemberSeq *_tao_elem) // non
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::EnumMemberSeq::_tao_any_destructor
+      CORBA_EnumMemberSeq::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::EnumMemberSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_EnumMemberSeq *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA::EnumMemberSeq*&,
+      const CORBA_EnumMemberSeq*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::EnumMemberSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_EnumMemberSeq *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -9793,15 +14569,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::EnumMemberS
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::EnumMemberSeq*,
+          const CORBA_EnumMemberSeq*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::EnumMemberSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::EnumMemberSeq, 0);
+      CORBA_EnumMemberSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_EnumMemberSeq, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -9812,7 +14588,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::EnumMemberS
             CORBA::_tc_EnumMemberSeq,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::EnumMemberSeq::_tao_any_destructor
+            CORBA_EnumMemberSeq::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -9830,7 +14606,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::EnumMemberS
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::Container_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_Container_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -9840,17 +14616,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::Container_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::Container::_duplicate (_tao_elem),
-        CORBA::Container::_tao_any_destructor
+        CORBA_Container::_duplicate (_tao_elem),
+        CORBA_Container::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Container_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Container_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::Container::_nil ();
+    _tao_elem = CORBA_Container::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_Container, ACE_TRY_ENV);
@@ -9869,66 +14645,66 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Container_ptr &_t
           CORBA::_tc_Container,
           1,
           _tao_elem,
-          CORBA::Container::_tao_any_destructor
+          CORBA_Container::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::Container::_nil ();
+    _tao_elem = CORBA_Container::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::Container::_nil ();
+  _tao_elem = CORBA_Container::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::Container,CORBA::Container_var>;
+    template class TAO_Object_Manager<CORBA_Container,CORBA_Container_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::Container,CORBA::Container_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_Container,CORBA_Container_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::Container::Description &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA_Container::Description &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
   _tao_any._tao_replace (
-      CORBA::Container::_tc_Description,
+      CORBA_Container::_tc_Description,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin ()
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::Container::Description *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_Container::Description *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
   _tao_any._tao_replace (
-      CORBA::Container::_tc_Description,
+      CORBA_Container::_tc_Description,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::Container::Description::_tao_any_destructor
+      CORBA_Container::Description::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Container::Description *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Container::Description *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::Container::Description*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_Container::Description*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Container::Description *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_Container::Description *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (CORBA::Container::_tc_Description, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA_Container::_tc_Description, ACE_TRY_ENV);
     ACE_TRY_CHECK;
     
     if (!result)
@@ -9937,15 +14713,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Container::
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::Container::Description*,
+          const CORBA_Container::Description*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::Container::Description *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::Container::Description, 0);
+      CORBA_Container::Description *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_Container::Description, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -9953,10 +14729,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Container::
       if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::Container::_tc_Description,
+            CORBA_Container::_tc_Description,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::Container::Description::_tao_any_destructor
+            CORBA_Container::Description::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -9976,50 +14752,50 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Container::
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::Container::DescriptionSeq &_tao_elem
+    const CORBA_Container::DescriptionSeq &_tao_elem
   ) // copying
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        CORBA::Container::_tc_DescriptionSeq,
+        CORBA_Container::_tc_DescriptionSeq,
         TAO_ENCAP_BYTE_ORDER,
         stream.begin ()
       );
   }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::Container::DescriptionSeq *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_Container::DescriptionSeq *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
   _tao_any._tao_replace (
-      CORBA::Container::_tc_DescriptionSeq,
+      CORBA_Container::_tc_DescriptionSeq,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::Container::DescriptionSeq::_tao_any_destructor
+      CORBA_Container::DescriptionSeq::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Container::DescriptionSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Container::DescriptionSeq *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA::Container::DescriptionSeq*&,
+      const CORBA_Container::DescriptionSeq*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Container::DescriptionSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_Container::DescriptionSeq *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (CORBA::Container::_tc_DescriptionSeq, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA_Container::_tc_DescriptionSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
     
     if (!result)
@@ -10028,15 +14804,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Container::
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::Container::DescriptionSeq*,
+          const CORBA_Container::DescriptionSeq*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::Container::DescriptionSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::Container::DescriptionSeq, 0);
+      CORBA_Container::DescriptionSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_Container::DescriptionSeq, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -10044,10 +14820,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Container::
       if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::Container::_tc_DescriptionSeq,
+            CORBA_Container::_tc_DescriptionSeq,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::Container::DescriptionSeq::_tao_any_destructor
+            CORBA_Container::DescriptionSeq::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -10065,7 +14841,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::Container::
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::IDLType_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_IDLType_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -10075,17 +14851,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::IDLType_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::IDLType::_duplicate (_tao_elem),
-        CORBA::IDLType::_tao_any_destructor
+        CORBA_IDLType::_duplicate (_tao_elem),
+        CORBA_IDLType::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::IDLType_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_IDLType_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::IDLType::_nil ();
+    _tao_elem = CORBA_IDLType::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_IDLType, ACE_TRY_ENV);
@@ -10104,29 +14880,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::IDLType_ptr &_tao
           CORBA::_tc_IDLType,
           1,
           _tao_elem,
-          CORBA::IDLType::_tao_any_destructor
+          CORBA_IDLType::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::IDLType::_nil ();
+    _tao_elem = CORBA_IDLType::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::IDLType::_nil ();
+  _tao_elem = CORBA_IDLType::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::IDLType,CORBA::IDLType_var>;
+    template class TAO_Object_Manager<CORBA_IDLType,CORBA_IDLType_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::IDLType,CORBA::IDLType_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_IDLType,CORBA_IDLType_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::TypedefDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_TypedefDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -10136,17 +14912,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::TypedefDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::TypedefDef::_duplicate (_tao_elem),
-        CORBA::TypedefDef::_tao_any_destructor
+        CORBA_TypedefDef::_duplicate (_tao_elem),
+        CORBA_TypedefDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::TypedefDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_TypedefDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::TypedefDef::_nil ();
+    _tao_elem = CORBA_TypedefDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_TypedefDef, ACE_TRY_ENV);
@@ -10165,29 +14941,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::TypedefDef_ptr &_
           CORBA::_tc_TypedefDef,
           1,
           _tao_elem,
-          CORBA::TypedefDef::_tao_any_destructor
+          CORBA_TypedefDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::TypedefDef::_nil ();
+    _tao_elem = CORBA_TypedefDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::TypedefDef::_nil ();
+  _tao_elem = CORBA_TypedefDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::TypedefDef,CORBA::TypedefDef_var>;
+    template class TAO_Object_Manager<CORBA_TypedefDef,CORBA_TypedefDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::TypedefDef,CORBA::TypedefDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_TypedefDef,CORBA_TypedefDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::TypeDescription &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA_TypeDescription &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
@@ -10198,7 +14974,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA::TypeDescription &_tao_elem)
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::TypeDescription *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_TypeDescription *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -10208,16 +14984,16 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::TypeDescription *_tao_elem) // no
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::TypeDescription::_tao_any_destructor
+      CORBA_TypeDescription::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::TypeDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_TypeDescription *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::TypeDescription*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_TypeDescription*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::TypeDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_TypeDescription *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -10233,15 +15009,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::TypeDescrip
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::TypeDescription*,
+          const CORBA_TypeDescription*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::TypeDescription *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::TypeDescription, 0);
+      CORBA_TypeDescription *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_TypeDescription, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -10252,7 +15028,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::TypeDescrip
             CORBA::_tc_TypeDescription,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::TypeDescription::_tao_any_destructor
+            CORBA_TypeDescription::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -10272,7 +15048,205 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::TypeDescrip
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::ContainedSeq &_tao_sequence
+    const CORBA_IRObject_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_IRObject_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_IRObject::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_Contained_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_Contained_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_Contained::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_ContainedSeq &_tao_sequence
+  )
+{
+  if (strm << _tao_sequence.length ())
+  {
+    // encode all elements
+    CORBA::Boolean _tao_marshal_flag = 1;
+    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+    {
+      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+    }
+    return _tao_marshal_flag;
+  }
+  return 0; // error
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_ContainedSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  if (strm >> _tao_seq_len)
+  {
+    // set the length of the sequence
+    _tao_sequence.length (_tao_seq_len);
+    // If length is 0 we return true.
+    if (0 >= _tao_seq_len) 
+      return 1;
+    // retrieve all the elements
+    CORBA::Boolean _tao_marshal_flag = 1;
+    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+    {
+      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+    }
+    return _tao_marshal_flag;
+  }
+  return 0; // error
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_InterfaceDefSeq &_tao_sequence
+  )
+{
+  if (strm << _tao_sequence.length ())
+  {
+    // encode all elements
+    CORBA::Boolean _tao_marshal_flag = 1;
+    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+    {
+      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+    }
+    return _tao_marshal_flag;
+  }
+  return 0; // error
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_InterfaceDefSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  if (strm >> _tao_seq_len)
+  {
+    // set the length of the sequence
+    _tao_sequence.length (_tao_seq_len);
+    // If length is 0 we return true.
+    if (0 >= _tao_seq_len) 
+      return 1;
+    // retrieve all the elements
+    CORBA::Boolean _tao_marshal_flag = 1;
+    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+    {
+      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+    }
+    return _tao_marshal_flag;
+  }
+  return 0; // error
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_ValueDefSeq &_tao_sequence
+  )
+{
+  if (strm << _tao_sequence.length ())
+  {
+    // encode all elements
+    CORBA::Boolean _tao_marshal_flag = 1;
+    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+    {
+      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+    }
+    return _tao_marshal_flag;
+  }
+  return 0; // error
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_ValueDefSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  if (strm >> _tao_seq_len)
+  {
+    // set the length of the sequence
+    _tao_sequence.length (_tao_seq_len);
+    // If length is 0 we return true.
+    if (0 >= _tao_seq_len) 
+      return 1;
+    // retrieve all the elements
+    CORBA::Boolean _tao_marshal_flag = 1;
+    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+    {
+      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+    }
+    return _tao_marshal_flag;
+  }
+  return 0; // error
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_AbstractInterfaceDefSeq &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -10290,7 +15264,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::ContainedSeq &_tao_sequence
+    CORBA_AbstractInterfaceDefSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -10314,7 +15288,49 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::StructMemberSeq &_tao_sequence
+    const CORBA_LocalInterfaceDefSeq &_tao_sequence
+  )
+{
+  if (strm << _tao_sequence.length ())
+  {
+    // encode all elements
+    CORBA::Boolean _tao_marshal_flag = 1;
+    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+    {
+      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+    }
+    return _tao_marshal_flag;
+  }
+  return 0; // error
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_LocalInterfaceDefSeq &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  if (strm >> _tao_seq_len)
+  {
+    // set the length of the sequence
+    _tao_sequence.length (_tao_seq_len);
+    // If length is 0 we return true.
+    if (0 >= _tao_seq_len) 
+      return 1;
+    // retrieve all the elements
+    CORBA::Boolean _tao_marshal_flag = 1;
+    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+    {
+      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+    }
+    return _tao_marshal_flag;
+  }
+  return 0; // error
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_StructMemberSeq &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -10332,7 +15348,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::StructMemberSeq &_tao_sequence
+    CORBA_StructMemberSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -10356,7 +15372,7 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::InitializerSeq &_tao_sequence
+    const CORBA_InitializerSeq &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -10374,7 +15390,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::InitializerSeq &_tao_sequence
+    CORBA_InitializerSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -10398,7 +15414,7 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::UnionMemberSeq &_tao_sequence
+    const CORBA_UnionMemberSeq &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -10416,7 +15432,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::UnionMemberSeq &_tao_sequence
+    CORBA_UnionMemberSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -10440,7 +15456,7 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::EnumMemberSeq &_tao_sequence
+    const CORBA_EnumMemberSeq &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -10458,7 +15474,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::EnumMemberSeq &_tao_sequence
+    CORBA_EnumMemberSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -10482,7 +15498,7 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::Container::DescriptionSeq &_tao_sequence
+    const CORBA_Container::DescriptionSeq &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -10500,7 +15516,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::Container::DescriptionSeq &_tao_sequence
+    CORBA_Container::DescriptionSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -10522,3 +15538,111 @@ CORBA::Boolean operator>> (
   return 0; // error
 }
 
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_Container_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_Container_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_Container::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_IDLType_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_IDLType_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_IDLType::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_TypedefDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_TypedefDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_TypedefDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h
index 75d9271c620..2c3adabe7e7 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.h
+++ b/TAO/tao/IFR_Client/IFR_BaseC.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_IDL_IFR_BASEC_H
-#define TAO_IDL_IFR_BASEC_H
+#ifndef _TAO_IDL_IFR_BASEC_H_
+#define _TAO_IDL_IFR_BASEC_H_
 
 #include "ace/pre.h"
 #include "ifr_client_export.h"
@@ -32,10 +32,6 @@
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  #include "tao/ClientRequestInfo.h"
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -59,36 +55,52 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+#if !defined (_CORBA_IROBJECT___PTR_CH_)
+#define _CORBA_IROBJECT___PTR_CH_
+
+class CORBA_IRObject;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_IROBJECT___VAR_CH_)
 #define _CORBA_IROBJECT___VAR_CH_
 
-  class TAO_IFR_Client_Export CORBA_IRObject_var : public TAO_Base_var
-  {
-  public:
-    CORBA_IRObject_var (void); // default constructor
-    CORBA_IRObject_var (CORBA_IRObject_ptr p) : ptr_ (p) {} 
-    CORBA_IRObject_var (const CORBA_IRObject_var &); // copy constructor
-    ~CORBA_IRObject_var (void); // destructor
-    
-    CORBA_IRObject_var &operator= (CORBA_IRObject_ptr);
-    CORBA_IRObject_var &operator= (const CORBA_IRObject_var &);
-    CORBA_IRObject_ptr operator-> (void) const;
-    
-    operator const CORBA_IRObject_ptr &() const;
-    operator CORBA_IRObject_ptr &();
-    // in, inout, out, _retn 
-    CORBA_IRObject_ptr in (void) const;
-    CORBA_IRObject_ptr &inout (void);
-    CORBA_IRObject_ptr &out (void);
-    CORBA_IRObject_ptr _retn (void);
-    CORBA_IRObject_ptr ptr (void) const;
+class TAO_IFR_Client_Export CORBA_IRObject_var : public TAO_Base_var
+{
+public:
+  CORBA_IRObject_var (void); // default constructor
+  CORBA_IRObject_var (CORBA_IRObject_ptr p) : ptr_ (p) {} 
+  CORBA_IRObject_var (const CORBA_IRObject_var &); // copy constructor
+  ~CORBA_IRObject_var (void); // destructor
+  
+  CORBA_IRObject_var &operator= (CORBA_IRObject_ptr);
+  CORBA_IRObject_var &operator= (const CORBA_IRObject_var &);
+  CORBA_IRObject_ptr operator-> (void) const;
+  
+  operator const CORBA_IRObject_ptr &() const;
+  operator CORBA_IRObject_ptr &();
+  // in, inout, out, _retn 
+  CORBA_IRObject_ptr in (void) const;
+  CORBA_IRObject_ptr &inout (void);
+  CORBA_IRObject_ptr &out (void);
+  CORBA_IRObject_ptr _retn (void);
+  CORBA_IRObject_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_IRObject_ptr duplicate (CORBA_IRObject_ptr);
+  static void release (CORBA_IRObject_ptr);
+  static CORBA_IRObject_ptr nil (void);
+  static CORBA_IRObject_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
-  private:
-    CORBA_IRObject_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    CORBA_IRObject_var (const TAO_Base_var &rhs);
-    CORBA_IRObject_var &operator= (const TAO_Base_var &rhs);
-  };
+private:
+  CORBA_IRObject_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_IRObject_var (const TAO_Base_var &rhs);
+  CORBA_IRObject_var &operator= (const TAO_Base_var &rhs);
+};
 
 
 #endif /* end #if !defined */
@@ -97,22 +109,22 @@
 #if !defined (_CORBA_IROBJECT___OUT_CH_)
 #define _CORBA_IROBJECT___OUT_CH_
 
-  class TAO_IFR_Client_Export CORBA_IRObject_out
-  {
-  public:
-    CORBA_IRObject_out (CORBA_IRObject_ptr &);
-    CORBA_IRObject_out (CORBA_IRObject_var &);
-    CORBA_IRObject_out (const CORBA_IRObject_out &);
-    CORBA_IRObject_out &operator= (const CORBA_IRObject_out &);
-    CORBA_IRObject_out &operator= (const CORBA_IRObject_var &);
-    CORBA_IRObject_out &operator= (CORBA_IRObject_ptr);
-    operator CORBA_IRObject_ptr &();
-    CORBA_IRObject_ptr &ptr (void);
-    CORBA_IRObject_ptr operator-> (void);
-    
-  private:
-    CORBA_IRObject_ptr &ptr_;
-  };
+class TAO_IFR_Client_Export CORBA_IRObject_out
+{
+public:
+  CORBA_IRObject_out (CORBA_IRObject_ptr &);
+  CORBA_IRObject_out (CORBA_IRObject_var &);
+  CORBA_IRObject_out (const CORBA_IRObject_out &);
+  CORBA_IRObject_out &operator= (const CORBA_IRObject_out &);
+  CORBA_IRObject_out &operator= (const CORBA_IRObject_var &);
+  CORBA_IRObject_out &operator= (CORBA_IRObject_ptr);
+  operator CORBA_IRObject_ptr &();
+  CORBA_IRObject_ptr &ptr (void);
+  CORBA_IRObject_ptr operator-> (void);
+
+private:
+  CORBA_IRObject_ptr &ptr_;
+};
 
 
 #endif /* end #if !defined */
@@ -122,88 +134,88 @@
 #define _CORBA_IROBJECT_CH_
 
 // Forward Classes Declaration
-  class _TAO_IRObject_Proxy_Impl;
-  class _TAO_IRObject_Remote_Proxy_Impl;
-  class _TAO_IRObject_Proxy_Broker;
-  class _TAO_IRObject_Remote_Proxy_Broker;
-  
-  class TAO_IFR_Client_Export CORBA_IRObject : public virtual CORBA_Object
-  {
-  public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef CORBA_IRObject_ptr _ptr_type;
-    typedef CORBA_IRObject_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    // the static operations
-    static CORBA_IRObject_ptr _duplicate (CORBA_IRObject_ptr obj);
-    static CORBA_IRObject_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    static CORBA_IRObject_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    static CORBA_IRObject_ptr _nil (void)
-      {
-        return (CORBA_IRObject_ptr)0;
-      }
+class _TAO_CORBA_IRObject_Proxy_Impl;
+class _TAO_CORBA_IRObject_Remote_Proxy_Impl;
+class _TAO_CORBA_IRObject_Proxy_Broker;
+class _TAO_CORBA_IRObject_Remote_Proxy_Broker;
 
-    static void _tao_any_destructor (void*);
+class TAO_IFR_Client_Export CORBA_IRObject : public virtual CORBA_Object
+{
+public:
+#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+  typedef CORBA_IRObject_ptr _ptr_type;
+  typedef CORBA_IRObject_var _var_type;
+#endif /* ! __GNUC__ || g++ >= 2.8 */
 
-    virtual CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
+  // the static operations
+  static CORBA_IRObject_ptr _duplicate (CORBA_IRObject_ptr obj);
+  static CORBA_IRObject_ptr _narrow (
+      CORBA::Object_ptr obj,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  static CORBA_IRObject_ptr _unchecked_narrow (
+      CORBA::Object_ptr obj,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  static CORBA_IRObject_ptr _nil (void)
+    {
+      return (CORBA_IRObject_ptr)0;
+    }
 
-    virtual void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
-    virtual const char* _interface_repository_id (void) const;
+  static void _tao_any_destructor (void*);
 
-  private:
-    _TAO_IRObject_Proxy_Broker *the_TAO_IRObject_Proxy_Broker_;
-    
+  virtual CORBA::DefinitionKind def_kind (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  virtual void destroy (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  virtual CORBA::Boolean _is_a (
+      const CORBA::Char *type_id, 
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  virtual void *_tao_QueryInterface (ptr_arith_t type);
+  
+  virtual const char* _interface_repository_id (void) const;
+
+private:
+  _TAO_CORBA_IRObject_Proxy_Broker *the_TAO_CORBA_IRObject_Proxy_Broker_;
+  
+protected:
+  CORBA_IRObject (int collocated = 0);
+  
   protected:
-    CORBA_IRObject (int collocated = 0);
+    // This methods travese the inheritance tree and set the
+    // parents piece of the given class in the right mode
+    virtual void CORBA_IRObject_setup_collocation (int collocated);
     
-    protected:
-      // This methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode
-      virtual void CORBA_IRObject_setup_collocation (int collocated);
-      
-      CORBA_IRObject (
-        TAO_Stub *objref, 
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0
-        );
-      
-      friend class _TAO_IRObject_Remote_Proxy_Impl;
-      friend class _TAO_IRObject_ThruPOA_Proxy_Impl;
-      friend class _TAO_IRObject_Direct_Proxy_Impl;
+    CORBA_IRObject (
+      TAO_Stub *objref, 
+      CORBA::Boolean _tao_collocated = 0,
+      TAO_Abstract_ServantBase *servant = 0
+      );
     
-    virtual ~CORBA_IRObject (void);
-  private:
-    CORBA_IRObject (const CORBA_IRObject &);
-    void operator= (const CORBA_IRObject &);    
+    friend class _TAO_CORBA_IRObject_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_IRObject_Direct_Proxy_Impl;
+  
+  virtual ~CORBA_IRObject (void);
+private:
+  CORBA_IRObject (const CORBA_IRObject &);
+  void operator= (const CORBA_IRObject &);
 };
 
 
@@ -216,10 +228,10 @@
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_IRObject_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_IRObject_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
 {
 public:
-  virtual ~_TAO_IRObject_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_IRObject_Proxy_Impl (void) { }
   
     virtual CORBA::DefinitionKind def_kind (
       CORBA_Object *_collocated_tao_target_,
@@ -238,7 +250,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_IRObject_Proxy_Impl (void);
+  _TAO_CORBA_IRObject_Proxy_Impl (void);
 
 };
 //
@@ -250,14 +262,14 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_IRObject_Remote_Proxy_Impl : 
-  public virtual _TAO_IRObject_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_IRObject_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_IRObject_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl
 {
 public:
-  _TAO_IRObject_Remote_Proxy_Impl (void);
+  _TAO_CORBA_IRObject_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_IRObject_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_IRObject_Remote_Proxy_Impl (void) { }
   
     virtual CORBA::DefinitionKind def_kind (
       CORBA_Object *_collocated_tao_target_,
@@ -293,17 +305,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_IRObject_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_IRObject_Proxy_Broker
 {
 public:
-  virtual ~_TAO_IRObject_Proxy_Broker (void);
-  virtual _TAO_IRObject_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_IRObject_Proxy_Broker (void);
+  virtual _TAO_CORBA_IRObject_Proxy_Impl &select_proxy (
     CORBA_IRObject *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_IRObject_Proxy_Broker (void);
+  _TAO_CORBA_IRObject_Proxy_Broker (void);
   
 };
 
@@ -316,26 +328,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_IRObject_Remote_Proxy_Broker : public virtual _TAO_IRObject_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_IRObject_Remote_Proxy_Broker : public virtual _TAO_CORBA_IRObject_Proxy_Broker
 {
 public: 
-  _TAO_IRObject_Remote_Proxy_Broker (void);
+  _TAO_CORBA_IRObject_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_IRObject_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_IRObject_Remote_Proxy_Broker (void);
   
-  virtual _TAO_IRObject_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_IRObject_Proxy_Impl &select_proxy (
     CORBA_IRObject *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_IRObject_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_IRObject_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_IRObject_Remote_Proxy_Broker *the_TAO_IRObject_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_IRObject_Remote_Proxy_Broker *the_TAO_CORBA_IRObject_Remote_Proxy_Broker (void);
 };
 
 
@@ -346,87 +358,74 @@ public:
 
 #endif /* end #if !defined */
 
-typedef char * VersionSpec;
-typedef CORBA::String_var VersionSpec_var;
-typedef CORBA::String_out VersionSpec_out;
-class CORBA_Contained;
-
-#if !defined (_CORBA_CONTAINED___PTR_CH_)
-#define _CORBA_CONTAINED___PTR_CH_
-
-typedef CORBA_Contained *CORBA_Contained_ptr;
-
-#endif /* end #if !defined */
-
+class CORBA_Repository;
 
-#if !defined (_CORBA_CONTAINED___VAR_CH_)
-#define _CORBA_CONTAINED___VAR_CH_
+#if !defined (_CORBA_REPOSITORY___VAR_CH_)
+#define _CORBA_REPOSITORY___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_Contained_var : public TAO_Base_var
+class TAO_IFR_Client_Export CORBA_Repository_var : public TAO_Base_var
 {
 public:
-  CORBA_Contained_var (void); // default constructor
-  CORBA_Contained_var (CORBA_Contained_ptr p) : ptr_ (p) {} 
-  CORBA_Contained_var (const CORBA_Contained_var &); // copy constructor
-  ~CORBA_Contained_var (void); // destructor
+  CORBA_Repository_var (void); // default constructor
+  CORBA_Repository_var (CORBA_Repository_ptr p) : ptr_ (p) {} 
+  CORBA_Repository_var (const CORBA_Repository_var &); // copy constructor
+  ~CORBA_Repository_var (void); // destructor
   
-  CORBA_Contained_var &operator= (CORBA_Contained_ptr);
-  CORBA_Contained_var &operator= (const CORBA_Contained_var &);
-  CORBA_Contained_ptr operator-> (void) const;
+  CORBA_Repository_var &operator= (CORBA_Repository_ptr);
+  CORBA_Repository_var &operator= (const CORBA_Repository_var &);
+  CORBA_Repository_ptr operator-> (void) const;
   
-  operator const CORBA_Contained_ptr &() const;
-  operator CORBA_Contained_ptr &();
+  operator const CORBA_Repository_ptr &() const;
+  operator CORBA_Repository_ptr &();
   // in, inout, out, _retn 
-  CORBA_Contained_ptr in (void) const;
-  CORBA_Contained_ptr &inout (void);
-  CORBA_Contained_ptr &out (void);
-  CORBA_Contained_ptr _retn (void);
-  CORBA_Contained_ptr ptr (void) const;
+  CORBA_Repository_ptr in (void) const;
+  CORBA_Repository_ptr &inout (void);
+  CORBA_Repository_ptr &out (void);
+  CORBA_Repository_ptr _retn (void);
+  CORBA_Repository_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_Repository_ptr duplicate (CORBA_Repository_ptr);
+  static void release (CORBA_Repository_ptr);
+  static CORBA_Repository_ptr nil (void);
+  static CORBA_Repository_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
-  CORBA_Contained_ptr ptr_;
+  CORBA_Repository_ptr ptr_;
   // Unimplemented - prevents widening assignment.
-  CORBA_Contained_var (const TAO_Base_var &rhs);
-  CORBA_Contained_var &operator= (const TAO_Base_var &rhs);
+  CORBA_Repository_var (const TAO_Base_var &rhs);
+  CORBA_Repository_var &operator= (const TAO_Base_var &rhs);
 };
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_CONTAINED___OUT_CH_)
-#define _CORBA_CONTAINED___OUT_CH_
+#if !defined (_CORBA_REPOSITORY___OUT_CH_)
+#define _CORBA_REPOSITORY___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_Contained_out
+class TAO_IFR_Client_Export CORBA_Repository_out
 {
 public:
-  CORBA_Contained_out (CORBA_Contained_ptr &);
-  CORBA_Contained_out (CORBA_Contained_var &);
-  CORBA_Contained_out (const CORBA_Contained_out &);
-  CORBA_Contained_out &operator= (const CORBA_Contained_out &);
-  CORBA_Contained_out &operator= (const CORBA_Contained_var &);
-  CORBA_Contained_out &operator= (CORBA_Contained_ptr);
-  operator CORBA_Contained_ptr &();
-  CORBA_Contained_ptr &ptr (void);
-  CORBA_Contained_ptr operator-> (void);
-  
+  CORBA_Repository_out (CORBA_Repository_ptr &);
+  CORBA_Repository_out (CORBA_Repository_var &);
+  CORBA_Repository_out (const CORBA_Repository_out &);
+  CORBA_Repository_out &operator= (const CORBA_Repository_out &);
+  CORBA_Repository_out &operator= (const CORBA_Repository_var &);
+  CORBA_Repository_out &operator= (CORBA_Repository_ptr);
+  operator CORBA_Repository_ptr &();
+  CORBA_Repository_ptr &ptr (void);
+  CORBA_Repository_ptr operator-> (void);
+
 private:
-  CORBA_Contained_ptr &ptr_;
+  CORBA_Repository_ptr &ptr_;
 };
 
 
 #endif /* end #if !defined */
 
-class CORBA_Repository;
-
-#if !defined (_CORBA_REPOSITORY___PTR_CH_)
-#define _CORBA_REPOSITORY___PTR_CH_
-
-typedef CORBA_Repository *CORBA_Repository_ptr;
-
-#endif /* end #if !defined */
-
-
 class CORBA_Container;
 
 #if !defined (_CORBA_CONTAINER___PTR_CH_)
@@ -460,6 +459,14 @@ public:
   CORBA_Container_ptr &out (void);
   CORBA_Container_ptr _retn (void);
   CORBA_Container_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_Container_ptr duplicate (CORBA_Container_ptr);
+  static void release (CORBA_Container_ptr);
+  static CORBA_Container_ptr nil (void);
+  static CORBA_Container_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_Container_ptr ptr_;
@@ -487,7 +494,7 @@ public:
   operator CORBA_Container_ptr &();
   CORBA_Container_ptr &ptr (void);
   CORBA_Container_ptr operator-> (void);
-  
+
 private:
   CORBA_Container_ptr &ptr_;
 };
@@ -496,14 +503,90 @@ private:
 #endif /* end #if !defined */
 
 
+#if !defined (_CORBA_CONTAINED___PTR_CH_)
+#define _CORBA_CONTAINED___PTR_CH_
+
+class CORBA_Contained;
+typedef CORBA_Contained *CORBA_Contained_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_CONTAINED___VAR_CH_)
+#define _CORBA_CONTAINED___VAR_CH_
+
+class TAO_IFR_Client_Export CORBA_Contained_var : public TAO_Base_var
+{
+public:
+  CORBA_Contained_var (void); // default constructor
+  CORBA_Contained_var (CORBA_Contained_ptr p) : ptr_ (p) {} 
+  CORBA_Contained_var (const CORBA_Contained_var &); // copy constructor
+  ~CORBA_Contained_var (void); // destructor
+  
+  CORBA_Contained_var &operator= (CORBA_Contained_ptr);
+  CORBA_Contained_var &operator= (const CORBA_Contained_var &);
+  CORBA_Contained_ptr operator-> (void) const;
+  
+  operator const CORBA_Contained_ptr &() const;
+  operator CORBA_Contained_ptr &();
+  // in, inout, out, _retn 
+  CORBA_Contained_ptr in (void) const;
+  CORBA_Contained_ptr &inout (void);
+  CORBA_Contained_ptr &out (void);
+  CORBA_Contained_ptr _retn (void);
+  CORBA_Contained_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_Contained_ptr duplicate (CORBA_Contained_ptr);
+  static void release (CORBA_Contained_ptr);
+  static CORBA_Contained_ptr nil (void);
+  static CORBA_Contained_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
+private:
+  CORBA_Contained_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_Contained_var (const TAO_Base_var &rhs);
+  CORBA_Contained_var &operator= (const TAO_Base_var &rhs);
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_CONTAINED___OUT_CH_)
+#define _CORBA_CONTAINED___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_Contained_out
+{
+public:
+  CORBA_Contained_out (CORBA_Contained_ptr &);
+  CORBA_Contained_out (CORBA_Contained_var &);
+  CORBA_Contained_out (const CORBA_Contained_out &);
+  CORBA_Contained_out &operator= (const CORBA_Contained_out &);
+  CORBA_Contained_out &operator= (const CORBA_Contained_var &);
+  CORBA_Contained_out &operator= (CORBA_Contained_ptr);
+  operator CORBA_Contained_ptr &();
+  CORBA_Contained_ptr &ptr (void);
+  CORBA_Contained_ptr operator-> (void);
+
+private:
+  CORBA_Contained_ptr &ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_CONTAINED_CH_)
 #define _CORBA_CONTAINED_CH_
 
 // Forward Classes Declaration
-class _TAO_Contained_Proxy_Impl;
-class _TAO_Contained_Remote_Proxy_Impl;
-class _TAO_Contained_Proxy_Broker;
-class _TAO_Contained_Remote_Proxy_Broker;
+class _TAO_CORBA_Contained_Proxy_Impl;
+class _TAO_CORBA_Contained_Remote_Proxy_Impl;
+class _TAO_CORBA_Contained_Proxy_Broker;
+class _TAO_CORBA_Contained_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_Contained: public virtual CORBA_IRObject
 {
@@ -583,7 +666,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::Container_ptr defined_in (
+  virtual CORBA_Container_ptr defined_in (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -599,7 +682,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::Repository_ptr containing_repository (
+  virtual CORBA_Repository_ptr containing_repository (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -672,7 +755,7 @@ public:
 
   static CORBA::TypeCode_ptr _tc_Description;
 
-  virtual CORBA::Contained::Description * describe (
+  virtual CORBA_Contained::Description * describe (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -681,7 +764,7 @@ public:
     ));
 
   virtual void move (
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -701,7 +784,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_Contained_Proxy_Broker *the_TAO_Contained_Proxy_Broker_;
+  _TAO_CORBA_Contained_Proxy_Broker *the_TAO_CORBA_Contained_Proxy_Broker_;
   
 protected:
   CORBA_Contained (int collocated = 0);
@@ -717,14 +800,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_Contained_Remote_Proxy_Impl;
-    friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-    friend class _TAO_Contained_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_Contained_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_Contained_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_Contained_Direct_Proxy_Impl;
   
   virtual ~CORBA_Contained (void);
 private:
   CORBA_Contained (const CORBA_Contained &);
-  void operator= (const CORBA_Contained &);  
+  void operator= (const CORBA_Contained &);
 };
 
 
@@ -737,11 +820,11 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_Contained_Proxy_Impl : 
-  public virtual _TAO_IRObject_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_Contained_Proxy_Impl : 
+  public virtual _TAO_CORBA_IRObject_Proxy_Impl
 {
 public:
-  virtual ~_TAO_Contained_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_Contained_Proxy_Impl (void) { }
   
     virtual char * id (
       CORBA_Object *_collocated_tao_target_,
@@ -794,7 +877,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::Container_ptr defined_in (
+  virtual CORBA_Container_ptr defined_in (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -810,7 +893,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::Repository_ptr containing_repository (
+  virtual CORBA_Repository_ptr containing_repository (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -818,7 +901,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::Contained::Description * describe (
+  virtual CORBA_Contained::Description * describe (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -828,7 +911,7 @@ public:
 
   virtual void move (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV
@@ -838,7 +921,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_Contained_Proxy_Impl (void);
+  _TAO_CORBA_Contained_Proxy_Impl (void);
 
 };
 //
@@ -850,16 +933,16 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_Contained_Remote_Proxy_Impl : 
-  public virtual _TAO_Contained_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_Contained_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_Contained_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_IRObject_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_IRObject_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_Contained_Remote_Proxy_Impl (void);
+  _TAO_CORBA_Contained_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_Contained_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_Contained_Remote_Proxy_Impl (void) { }
   
     virtual char * id (
       CORBA_Object *_collocated_tao_target_,
@@ -912,7 +995,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::Container_ptr defined_in (
+  virtual CORBA_Container_ptr defined_in (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -928,7 +1011,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::Repository_ptr containing_repository (
+  virtual CORBA_Repository_ptr containing_repository (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -936,7 +1019,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::Contained::Description * describe (
+  virtual CORBA_Contained::Description * describe (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -946,7 +1029,7 @@ public:
 
   virtual void move (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::Container_ptr new_container,
+      CORBA_Container_ptr new_container,
       const char * new_name,
       const char * new_version,
       CORBA::Environment &ACE_TRY_ENV
@@ -973,17 +1056,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_Contained_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_Contained_Proxy_Broker
 {
 public:
-  virtual ~_TAO_Contained_Proxy_Broker (void);
-  virtual _TAO_Contained_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_Contained_Proxy_Broker (void);
+  virtual _TAO_CORBA_Contained_Proxy_Impl &select_proxy (
     CORBA_Contained *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_Contained_Proxy_Broker (void);
+  _TAO_CORBA_Contained_Proxy_Broker (void);
   
 };
 
@@ -996,26 +1079,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_Contained_Remote_Proxy_Broker : public virtual _TAO_Contained_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_Contained_Remote_Proxy_Broker : public virtual _TAO_CORBA_Contained_Proxy_Broker
 {
 public: 
-  _TAO_Contained_Remote_Proxy_Broker (void);
+  _TAO_CORBA_Contained_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_Contained_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_Contained_Remote_Proxy_Broker (void);
   
-  virtual _TAO_Contained_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_Contained_Proxy_Impl &select_proxy (
     CORBA_Contained *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_Contained_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_Contained_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_Contained_Remote_Proxy_Broker *the_TAO_Contained_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_Contained_Remote_Proxy_Broker *the_TAO_CORBA_Contained_Remote_Proxy_Broker (void);
 };
 
 
@@ -1046,7 +1129,7 @@ public:
     _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs);
     virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void);
     _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs);
-    TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var> operator[] (CORBA::ULong index) const;
+    TAO_Object_Manager<CORBA_Contained,CORBA_Contained_var> operator[] (CORBA::ULong index) const;
     static CORBA_Contained **allocbuf (CORBA::ULong nelems);
     static void freebuf (CORBA_Contained **buffer);
     // The Base_Sequence functions, please see tao/Sequence.h
@@ -1134,7 +1217,7 @@ public:
   operator CORBA_ContainedSeq &() const;
   operator CORBA_ContainedSeq *&(); // variable-size base types only
   
-  TAO_Object_Manager<CORBA::Contained, CORBA::Contained_var> operator[] (CORBA::ULong index);
+  TAO_Object_Manager<CORBA_Contained, CORBA_Contained_var> operator[] (CORBA::ULong index);
   
   // in, inout, out, _retn 
   const CORBA_ContainedSeq &in (void) const;
@@ -1165,7 +1248,7 @@ public:
   operator CORBA_ContainedSeq *&();
   CORBA_ContainedSeq *&ptr (void);
   CORBA_ContainedSeq *operator-> (void);
-  TAO_Object_Manager<CORBA::Contained, CORBA::Contained_var> operator[] (CORBA::ULong index);
+  TAO_Object_Manager<CORBA_Contained, CORBA_Contained_var> operator[] (CORBA::ULong index);
   
 private:
   CORBA_ContainedSeq *&ptr_;
@@ -1186,6 +1269,148 @@ typedef CORBA_ModuleDef *CORBA_ModuleDef_ptr;
 #endif /* end #if !defined */
 
 
+#if !defined (_CORBA_MODULEDEF___VAR_CH_)
+#define _CORBA_MODULEDEF___VAR_CH_
+
+class TAO_IFR_Client_Export CORBA_ModuleDef_var : public TAO_Base_var
+{
+public:
+  CORBA_ModuleDef_var (void); // default constructor
+  CORBA_ModuleDef_var (CORBA_ModuleDef_ptr p) : ptr_ (p) {} 
+  CORBA_ModuleDef_var (const CORBA_ModuleDef_var &); // copy constructor
+  ~CORBA_ModuleDef_var (void); // destructor
+  
+  CORBA_ModuleDef_var &operator= (CORBA_ModuleDef_ptr);
+  CORBA_ModuleDef_var &operator= (const CORBA_ModuleDef_var &);
+  CORBA_ModuleDef_ptr operator-> (void) const;
+  
+  operator const CORBA_ModuleDef_ptr &() const;
+  operator CORBA_ModuleDef_ptr &();
+  // in, inout, out, _retn 
+  CORBA_ModuleDef_ptr in (void) const;
+  CORBA_ModuleDef_ptr &inout (void);
+  CORBA_ModuleDef_ptr &out (void);
+  CORBA_ModuleDef_ptr _retn (void);
+  CORBA_ModuleDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_ModuleDef_ptr duplicate (CORBA_ModuleDef_ptr);
+  static void release (CORBA_ModuleDef_ptr);
+  static CORBA_ModuleDef_ptr nil (void);
+  static CORBA_ModuleDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
+private:
+  CORBA_ModuleDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_ModuleDef_var (const TAO_Base_var &rhs);
+  CORBA_ModuleDef_var &operator= (const TAO_Base_var &rhs);
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_MODULEDEF___OUT_CH_)
+#define _CORBA_MODULEDEF___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_ModuleDef_out
+{
+public:
+  CORBA_ModuleDef_out (CORBA_ModuleDef_ptr &);
+  CORBA_ModuleDef_out (CORBA_ModuleDef_var &);
+  CORBA_ModuleDef_out (const CORBA_ModuleDef_out &);
+  CORBA_ModuleDef_out &operator= (const CORBA_ModuleDef_out &);
+  CORBA_ModuleDef_out &operator= (const CORBA_ModuleDef_var &);
+  CORBA_ModuleDef_out &operator= (CORBA_ModuleDef_ptr);
+  operator CORBA_ModuleDef_ptr &();
+  CORBA_ModuleDef_ptr &ptr (void);
+  CORBA_ModuleDef_ptr operator-> (void);
+
+private:
+  CORBA_ModuleDef_ptr &ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+class CORBA_ConstantDef;
+
+#if !defined (_CORBA_CONSTANTDEF___PTR_CH_)
+#define _CORBA_CONSTANTDEF___PTR_CH_
+
+typedef CORBA_ConstantDef *CORBA_ConstantDef_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_CONSTANTDEF___VAR_CH_)
+#define _CORBA_CONSTANTDEF___VAR_CH_
+
+class TAO_IFR_Client_Export CORBA_ConstantDef_var : public TAO_Base_var
+{
+public:
+  CORBA_ConstantDef_var (void); // default constructor
+  CORBA_ConstantDef_var (CORBA_ConstantDef_ptr p) : ptr_ (p) {} 
+  CORBA_ConstantDef_var (const CORBA_ConstantDef_var &); // copy constructor
+  ~CORBA_ConstantDef_var (void); // destructor
+  
+  CORBA_ConstantDef_var &operator= (CORBA_ConstantDef_ptr);
+  CORBA_ConstantDef_var &operator= (const CORBA_ConstantDef_var &);
+  CORBA_ConstantDef_ptr operator-> (void) const;
+  
+  operator const CORBA_ConstantDef_ptr &() const;
+  operator CORBA_ConstantDef_ptr &();
+  // in, inout, out, _retn 
+  CORBA_ConstantDef_ptr in (void) const;
+  CORBA_ConstantDef_ptr &inout (void);
+  CORBA_ConstantDef_ptr &out (void);
+  CORBA_ConstantDef_ptr _retn (void);
+  CORBA_ConstantDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_ConstantDef_ptr duplicate (CORBA_ConstantDef_ptr);
+  static void release (CORBA_ConstantDef_ptr);
+  static CORBA_ConstantDef_ptr nil (void);
+  static CORBA_ConstantDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
+private:
+  CORBA_ConstantDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_ConstantDef_var (const TAO_Base_var &rhs);
+  CORBA_ConstantDef_var &operator= (const TAO_Base_var &rhs);
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_CONSTANTDEF___OUT_CH_)
+#define _CORBA_CONSTANTDEF___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_ConstantDef_out
+{
+public:
+  CORBA_ConstantDef_out (CORBA_ConstantDef_ptr &);
+  CORBA_ConstantDef_out (CORBA_ConstantDef_var &);
+  CORBA_ConstantDef_out (const CORBA_ConstantDef_out &);
+  CORBA_ConstantDef_out &operator= (const CORBA_ConstantDef_out &);
+  CORBA_ConstantDef_out &operator= (const CORBA_ConstantDef_var &);
+  CORBA_ConstantDef_out &operator= (CORBA_ConstantDef_ptr);
+  operator CORBA_ConstantDef_ptr &();
+  CORBA_ConstantDef_ptr &ptr (void);
+  CORBA_ConstantDef_ptr operator-> (void);
+
+private:
+  CORBA_ConstantDef_ptr &ptr_;
+};
+
+
+#endif /* end #if !defined */
+
 class CORBA_IDLType;
 
 #if !defined (_CORBA_IDLTYPE___PTR_CH_)
@@ -1219,6 +1444,14 @@ public:
   CORBA_IDLType_ptr &out (void);
   CORBA_IDLType_ptr _retn (void);
   CORBA_IDLType_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_IDLType_ptr duplicate (CORBA_IDLType_ptr);
+  static void release (CORBA_IDLType_ptr);
+  static CORBA_IDLType_ptr nil (void);
+  static CORBA_IDLType_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_IDLType_ptr ptr_;
@@ -1246,7 +1479,7 @@ public:
   operator CORBA_IDLType_ptr &();
   CORBA_IDLType_ptr &ptr (void);
   CORBA_IDLType_ptr operator-> (void);
-  
+
 private:
   CORBA_IDLType_ptr &ptr_;
 };
@@ -1254,6 +1487,1450 @@ private:
 
 #endif /* end #if !defined */
 
+class CORBA_StructDef;
+
+#if !defined (_CORBA_STRUCTDEF___PTR_CH_)
+#define _CORBA_STRUCTDEF___PTR_CH_
+
+typedef CORBA_StructDef *CORBA_StructDef_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_STRUCTDEF___VAR_CH_)
+#define _CORBA_STRUCTDEF___VAR_CH_
+
+class TAO_IFR_Client_Export CORBA_StructDef_var : public TAO_Base_var
+{
+public:
+  CORBA_StructDef_var (void); // default constructor
+  CORBA_StructDef_var (CORBA_StructDef_ptr p) : ptr_ (p) {} 
+  CORBA_StructDef_var (const CORBA_StructDef_var &); // copy constructor
+  ~CORBA_StructDef_var (void); // destructor
+  
+  CORBA_StructDef_var &operator= (CORBA_StructDef_ptr);
+  CORBA_StructDef_var &operator= (const CORBA_StructDef_var &);
+  CORBA_StructDef_ptr operator-> (void) const;
+  
+  operator const CORBA_StructDef_ptr &() const;
+  operator CORBA_StructDef_ptr &();
+  // in, inout, out, _retn 
+  CORBA_StructDef_ptr in (void) const;
+  CORBA_StructDef_ptr &inout (void);
+  CORBA_StructDef_ptr &out (void);
+  CORBA_StructDef_ptr _retn (void);
+  CORBA_StructDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_StructDef_ptr duplicate (CORBA_StructDef_ptr);
+  static void release (CORBA_StructDef_ptr);
+  static CORBA_StructDef_ptr nil (void);
+  static CORBA_StructDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
+private:
+  CORBA_StructDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_StructDef_var (const TAO_Base_var &rhs);
+  CORBA_StructDef_var &operator= (const TAO_Base_var &rhs);
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_STRUCTDEF___OUT_CH_)
+#define _CORBA_STRUCTDEF___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_StructDef_out
+{
+public:
+  CORBA_StructDef_out (CORBA_StructDef_ptr &);
+  CORBA_StructDef_out (CORBA_StructDef_var &);
+  CORBA_StructDef_out (const CORBA_StructDef_out &);
+  CORBA_StructDef_out &operator= (const CORBA_StructDef_out &);
+  CORBA_StructDef_out &operator= (const CORBA_StructDef_var &);
+  CORBA_StructDef_out &operator= (CORBA_StructDef_ptr);
+  operator CORBA_StructDef_ptr &();
+  CORBA_StructDef_ptr &ptr (void);
+  CORBA_StructDef_ptr operator-> (void);
+
+private:
+  CORBA_StructDef_ptr &ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+class CORBA_UnionDef;
+
+#if !defined (_CORBA_UNIONDEF___PTR_CH_)
+#define _CORBA_UNIONDEF___PTR_CH_
+
+typedef CORBA_UnionDef *CORBA_UnionDef_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_UNIONDEF___VAR_CH_)
+#define _CORBA_UNIONDEF___VAR_CH_
+
+class TAO_IFR_Client_Export CORBA_UnionDef_var : public TAO_Base_var
+{
+public:
+  CORBA_UnionDef_var (void); // default constructor
+  CORBA_UnionDef_var (CORBA_UnionDef_ptr p) : ptr_ (p) {} 
+  CORBA_UnionDef_var (const CORBA_UnionDef_var &); // copy constructor
+  ~CORBA_UnionDef_var (void); // destructor
+  
+  CORBA_UnionDef_var &operator= (CORBA_UnionDef_ptr);
+  CORBA_UnionDef_var &operator= (const CORBA_UnionDef_var &);
+  CORBA_UnionDef_ptr operator-> (void) const;
+  
+  operator const CORBA_UnionDef_ptr &() const;
+  operator CORBA_UnionDef_ptr &();
+  // in, inout, out, _retn 
+  CORBA_UnionDef_ptr in (void) const;
+  CORBA_UnionDef_ptr &inout (void);
+  CORBA_UnionDef_ptr &out (void);
+  CORBA_UnionDef_ptr _retn (void);
+  CORBA_UnionDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_UnionDef_ptr duplicate (CORBA_UnionDef_ptr);
+  static void release (CORBA_UnionDef_ptr);
+  static CORBA_UnionDef_ptr nil (void);
+  static CORBA_UnionDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
+private:
+  CORBA_UnionDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_UnionDef_var (const TAO_Base_var &rhs);
+  CORBA_UnionDef_var &operator= (const TAO_Base_var &rhs);
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_UNIONDEF___OUT_CH_)
+#define _CORBA_UNIONDEF___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_UnionDef_out
+{
+public:
+  CORBA_UnionDef_out (CORBA_UnionDef_ptr &);
+  CORBA_UnionDef_out (CORBA_UnionDef_var &);
+  CORBA_UnionDef_out (const CORBA_UnionDef_out &);
+  CORBA_UnionDef_out &operator= (const CORBA_UnionDef_out &);
+  CORBA_UnionDef_out &operator= (const CORBA_UnionDef_var &);
+  CORBA_UnionDef_out &operator= (CORBA_UnionDef_ptr);
+  operator CORBA_UnionDef_ptr &();
+  CORBA_UnionDef_ptr &ptr (void);
+  CORBA_UnionDef_ptr operator-> (void);
+
+private:
+  CORBA_UnionDef_ptr &ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+class CORBA_EnumDef;
+
+#if !defined (_CORBA_ENUMDEF___PTR_CH_)
+#define _CORBA_ENUMDEF___PTR_CH_
+
+typedef CORBA_EnumDef *CORBA_EnumDef_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_ENUMDEF___VAR_CH_)
+#define _CORBA_ENUMDEF___VAR_CH_
+
+class TAO_IFR_Client_Export CORBA_EnumDef_var : public TAO_Base_var
+{
+public:
+  CORBA_EnumDef_var (void); // default constructor
+  CORBA_EnumDef_var (CORBA_EnumDef_ptr p) : ptr_ (p) {} 
+  CORBA_EnumDef_var (const CORBA_EnumDef_var &); // copy constructor
+  ~CORBA_EnumDef_var (void); // destructor
+  
+  CORBA_EnumDef_var &operator= (CORBA_EnumDef_ptr);
+  CORBA_EnumDef_var &operator= (const CORBA_EnumDef_var &);
+  CORBA_EnumDef_ptr operator-> (void) const;
+  
+  operator const CORBA_EnumDef_ptr &() const;
+  operator CORBA_EnumDef_ptr &();
+  // in, inout, out, _retn 
+  CORBA_EnumDef_ptr in (void) const;
+  CORBA_EnumDef_ptr &inout (void);
+  CORBA_EnumDef_ptr &out (void);
+  CORBA_EnumDef_ptr _retn (void);
+  CORBA_EnumDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_EnumDef_ptr duplicate (CORBA_EnumDef_ptr);
+  static void release (CORBA_EnumDef_ptr);
+  static CORBA_EnumDef_ptr nil (void);
+  static CORBA_EnumDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
+private:
+  CORBA_EnumDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_EnumDef_var (const TAO_Base_var &rhs);
+  CORBA_EnumDef_var &operator= (const TAO_Base_var &rhs);
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_ENUMDEF___OUT_CH_)
+#define _CORBA_ENUMDEF___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_EnumDef_out
+{
+public:
+  CORBA_EnumDef_out (CORBA_EnumDef_ptr &);
+  CORBA_EnumDef_out (CORBA_EnumDef_var &);
+  CORBA_EnumDef_out (const CORBA_EnumDef_out &);
+  CORBA_EnumDef_out &operator= (const CORBA_EnumDef_out &);
+  CORBA_EnumDef_out &operator= (const CORBA_EnumDef_var &);
+  CORBA_EnumDef_out &operator= (CORBA_EnumDef_ptr);
+  operator CORBA_EnumDef_ptr &();
+  CORBA_EnumDef_ptr &ptr (void);
+  CORBA_EnumDef_ptr operator-> (void);
+
+private:
+  CORBA_EnumDef_ptr &ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+class CORBA_AliasDef;
+
+#if !defined (_CORBA_ALIASDEF___PTR_CH_)
+#define _CORBA_ALIASDEF___PTR_CH_
+
+typedef CORBA_AliasDef *CORBA_AliasDef_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_ALIASDEF___VAR_CH_)
+#define _CORBA_ALIASDEF___VAR_CH_
+
+class TAO_IFR_Client_Export CORBA_AliasDef_var : public TAO_Base_var
+{
+public:
+  CORBA_AliasDef_var (void); // default constructor
+  CORBA_AliasDef_var (CORBA_AliasDef_ptr p) : ptr_ (p) {} 
+  CORBA_AliasDef_var (const CORBA_AliasDef_var &); // copy constructor
+  ~CORBA_AliasDef_var (void); // destructor
+  
+  CORBA_AliasDef_var &operator= (CORBA_AliasDef_ptr);
+  CORBA_AliasDef_var &operator= (const CORBA_AliasDef_var &);
+  CORBA_AliasDef_ptr operator-> (void) const;
+  
+  operator const CORBA_AliasDef_ptr &() const;
+  operator CORBA_AliasDef_ptr &();
+  // in, inout, out, _retn 
+  CORBA_AliasDef_ptr in (void) const;
+  CORBA_AliasDef_ptr &inout (void);
+  CORBA_AliasDef_ptr &out (void);
+  CORBA_AliasDef_ptr _retn (void);
+  CORBA_AliasDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_AliasDef_ptr duplicate (CORBA_AliasDef_ptr);
+  static void release (CORBA_AliasDef_ptr);
+  static CORBA_AliasDef_ptr nil (void);
+  static CORBA_AliasDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
+private:
+  CORBA_AliasDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_AliasDef_var (const TAO_Base_var &rhs);
+  CORBA_AliasDef_var &operator= (const TAO_Base_var &rhs);
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_ALIASDEF___OUT_CH_)
+#define _CORBA_ALIASDEF___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_AliasDef_out
+{
+public:
+  CORBA_AliasDef_out (CORBA_AliasDef_ptr &);
+  CORBA_AliasDef_out (CORBA_AliasDef_var &);
+  CORBA_AliasDef_out (const CORBA_AliasDef_out &);
+  CORBA_AliasDef_out &operator= (const CORBA_AliasDef_out &);
+  CORBA_AliasDef_out &operator= (const CORBA_AliasDef_var &);
+  CORBA_AliasDef_out &operator= (CORBA_AliasDef_ptr);
+  operator CORBA_AliasDef_ptr &();
+  CORBA_AliasDef_ptr &ptr (void);
+  CORBA_AliasDef_ptr operator-> (void);
+
+private:
+  CORBA_AliasDef_ptr &ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+class CORBA_InterfaceDef;
+
+#if !defined (_CORBA_INTERFACEDEF___PTR_CH_)
+#define _CORBA_INTERFACEDEF___PTR_CH_
+
+typedef CORBA_InterfaceDef *CORBA_InterfaceDef_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_INTERFACEDEF___VAR_CH_)
+#define _CORBA_INTERFACEDEF___VAR_CH_
+
+class TAO_IFR_Client_Export CORBA_InterfaceDef_var : public TAO_Base_var
+{
+public:
+  CORBA_InterfaceDef_var (void); // default constructor
+  CORBA_InterfaceDef_var (CORBA_InterfaceDef_ptr p) : ptr_ (p) {} 
+  CORBA_InterfaceDef_var (const CORBA_InterfaceDef_var &); // copy constructor
+  ~CORBA_InterfaceDef_var (void); // destructor
+  
+  CORBA_InterfaceDef_var &operator= (CORBA_InterfaceDef_ptr);
+  CORBA_InterfaceDef_var &operator= (const CORBA_InterfaceDef_var &);
+  CORBA_InterfaceDef_ptr operator-> (void) const;
+  
+  operator const CORBA_InterfaceDef_ptr &() const;
+  operator CORBA_InterfaceDef_ptr &();
+  // in, inout, out, _retn 
+  CORBA_InterfaceDef_ptr in (void) const;
+  CORBA_InterfaceDef_ptr &inout (void);
+  CORBA_InterfaceDef_ptr &out (void);
+  CORBA_InterfaceDef_ptr _retn (void);
+  CORBA_InterfaceDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_InterfaceDef_ptr duplicate (CORBA_InterfaceDef_ptr);
+  static void release (CORBA_InterfaceDef_ptr);
+  static CORBA_InterfaceDef_ptr nil (void);
+  static CORBA_InterfaceDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
+private:
+  CORBA_InterfaceDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_InterfaceDef_var (const TAO_Base_var &rhs);
+  CORBA_InterfaceDef_var &operator= (const TAO_Base_var &rhs);
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_INTERFACEDEF___OUT_CH_)
+#define _CORBA_INTERFACEDEF___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_InterfaceDef_out
+{
+public:
+  CORBA_InterfaceDef_out (CORBA_InterfaceDef_ptr &);
+  CORBA_InterfaceDef_out (CORBA_InterfaceDef_var &);
+  CORBA_InterfaceDef_out (const CORBA_InterfaceDef_out &);
+  CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_out &);
+  CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_var &);
+  CORBA_InterfaceDef_out &operator= (CORBA_InterfaceDef_ptr);
+  operator CORBA_InterfaceDef_ptr &();
+  CORBA_InterfaceDef_ptr &ptr (void);
+  CORBA_InterfaceDef_ptr operator-> (void);
+
+private:
+  CORBA_InterfaceDef_ptr &ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CH_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CH_
+
+  class _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    // = Initialization and termination methods.
+    
+    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum,
+      CORBA::ULong length,
+      CORBA_InterfaceDef* *value,
+      CORBA::Boolean release = 0);
+    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs);
+    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs);
+    TAO_Object_Manager<CORBA_InterfaceDef,CORBA_InterfaceDef_var> operator[] (CORBA::ULong index) const;
+    static CORBA_InterfaceDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (CORBA_InterfaceDef **buffer);
+    // The Base_Sequence functions, please see tao/Sequence.h
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    CORBA_InterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const CORBA_InterfaceDef* *get_buffer (void) const;
+    virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+    virtual void _downcast (
+        void* target,
+        CORBA_Object *src,
+        CORBA_Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    virtual CORBA_Object* _upcast (void *src) const;
+    
+  };
+
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_INTERFACEDEFSEQ_CH_)
+#define _CORBA_INTERFACEDEFSEQ_CH_
+
+class CORBA_InterfaceDefSeq;
+class CORBA_InterfaceDefSeq_var;
+
+// *************************************************************
+// CORBA_InterfaceDefSeq
+// *************************************************************
+
+class TAO_IFR_Client_Export CORBA_InterfaceDefSeq : public 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+{
+public:
+  CORBA_InterfaceDefSeq (void); // default ctor
+  CORBA_InterfaceDefSeq (CORBA::ULong max); // uses max size
+  CORBA_InterfaceDefSeq (
+    CORBA::ULong max, 
+    CORBA::ULong length, 
+    CORBA_InterfaceDef_ptr *buffer, 
+    CORBA::Boolean release = 0
+  );
+  CORBA_InterfaceDefSeq (const CORBA_InterfaceDefSeq &); // copy ctor
+  ~CORBA_InterfaceDefSeq (void);
+  static void _tao_any_destructor (void*);
+
+#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+  typedef CORBA_InterfaceDefSeq_var _var_type;
+#endif /* ! __GNUC__ || g++ >= 2.8 */
+
+};
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_INTERFACEDEFSEQ___VAR_CH_)
+#define _CORBA_INTERFACEDEFSEQ___VAR_CH_
+
+// *************************************************************
+// class CORBA_InterfaceDefSeq_var
+// *************************************************************
+
+class TAO_IFR_Client_Export CORBA_InterfaceDefSeq_var
+{
+public:
+  CORBA_InterfaceDefSeq_var (void); // default constructor
+  CORBA_InterfaceDefSeq_var (CORBA_InterfaceDefSeq *);
+  CORBA_InterfaceDefSeq_var (const CORBA_InterfaceDefSeq_var &); // copy constructor
+  ~CORBA_InterfaceDefSeq_var (void); // destructor
+  
+  CORBA_InterfaceDefSeq_var &operator= (CORBA_InterfaceDefSeq *);
+  CORBA_InterfaceDefSeq_var &operator= (const CORBA_InterfaceDefSeq_var &);
+  CORBA_InterfaceDefSeq *operator-> (void);
+  const CORBA_InterfaceDefSeq *operator-> (void) const;
+  
+  operator const CORBA_InterfaceDefSeq &() const;
+  operator CORBA_InterfaceDefSeq &();
+  operator CORBA_InterfaceDefSeq &() const;
+  operator CORBA_InterfaceDefSeq *&(); // variable-size base types only
+  
+  TAO_Object_Manager<CORBA_InterfaceDef, CORBA_InterfaceDef_var> operator[] (CORBA::ULong index);
+  
+  // in, inout, out, _retn 
+  const CORBA_InterfaceDefSeq &in (void) const;
+  CORBA_InterfaceDefSeq &inout (void);
+  CORBA_InterfaceDefSeq *&out (void);
+  CORBA_InterfaceDefSeq *_retn (void);
+  CORBA_InterfaceDefSeq *ptr (void) const;
+
+private:
+  CORBA_InterfaceDefSeq *ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_INTERFACEDEFSEQ___OUT_CH_)
+#define _CORBA_INTERFACEDEFSEQ___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_InterfaceDefSeq_out
+{
+public:
+  CORBA_InterfaceDefSeq_out (CORBA_InterfaceDefSeq *&);
+  CORBA_InterfaceDefSeq_out (CORBA_InterfaceDefSeq_var &);
+  CORBA_InterfaceDefSeq_out (const CORBA_InterfaceDefSeq_out &);
+  CORBA_InterfaceDefSeq_out &operator= (const CORBA_InterfaceDefSeq_out &);
+  CORBA_InterfaceDefSeq_out &operator= (CORBA_InterfaceDefSeq *);
+  operator CORBA_InterfaceDefSeq *&();
+  CORBA_InterfaceDefSeq *&ptr (void);
+  CORBA_InterfaceDefSeq *operator-> (void);
+  TAO_Object_Manager<CORBA_InterfaceDef, CORBA_InterfaceDef_var> operator[] (CORBA::ULong index);
+  
+private:
+  CORBA_InterfaceDefSeq *&ptr_;
+  // assignment from T_var not allowed
+  void operator= (const CORBA_InterfaceDefSeq_var &);
+};
+
+
+#endif /* end #if !defined */
+
+extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_InterfaceDefSeq;
+
+class CORBA_ExceptionDef;
+
+#if !defined (_CORBA_EXCEPTIONDEF___PTR_CH_)
+#define _CORBA_EXCEPTIONDEF___PTR_CH_
+
+typedef CORBA_ExceptionDef *CORBA_ExceptionDef_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_EXCEPTIONDEF___VAR_CH_)
+#define _CORBA_EXCEPTIONDEF___VAR_CH_
+
+class TAO_IFR_Client_Export CORBA_ExceptionDef_var : public TAO_Base_var
+{
+public:
+  CORBA_ExceptionDef_var (void); // default constructor
+  CORBA_ExceptionDef_var (CORBA_ExceptionDef_ptr p) : ptr_ (p) {} 
+  CORBA_ExceptionDef_var (const CORBA_ExceptionDef_var &); // copy constructor
+  ~CORBA_ExceptionDef_var (void); // destructor
+  
+  CORBA_ExceptionDef_var &operator= (CORBA_ExceptionDef_ptr);
+  CORBA_ExceptionDef_var &operator= (const CORBA_ExceptionDef_var &);
+  CORBA_ExceptionDef_ptr operator-> (void) const;
+  
+  operator const CORBA_ExceptionDef_ptr &() const;
+  operator CORBA_ExceptionDef_ptr &();
+  // in, inout, out, _retn 
+  CORBA_ExceptionDef_ptr in (void) const;
+  CORBA_ExceptionDef_ptr &inout (void);
+  CORBA_ExceptionDef_ptr &out (void);
+  CORBA_ExceptionDef_ptr _retn (void);
+  CORBA_ExceptionDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_ExceptionDef_ptr duplicate (CORBA_ExceptionDef_ptr);
+  static void release (CORBA_ExceptionDef_ptr);
+  static CORBA_ExceptionDef_ptr nil (void);
+  static CORBA_ExceptionDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
+private:
+  CORBA_ExceptionDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_ExceptionDef_var (const TAO_Base_var &rhs);
+  CORBA_ExceptionDef_var &operator= (const TAO_Base_var &rhs);
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_EXCEPTIONDEF___OUT_CH_)
+#define _CORBA_EXCEPTIONDEF___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_ExceptionDef_out
+{
+public:
+  CORBA_ExceptionDef_out (CORBA_ExceptionDef_ptr &);
+  CORBA_ExceptionDef_out (CORBA_ExceptionDef_var &);
+  CORBA_ExceptionDef_out (const CORBA_ExceptionDef_out &);
+  CORBA_ExceptionDef_out &operator= (const CORBA_ExceptionDef_out &);
+  CORBA_ExceptionDef_out &operator= (const CORBA_ExceptionDef_var &);
+  CORBA_ExceptionDef_out &operator= (CORBA_ExceptionDef_ptr);
+  operator CORBA_ExceptionDef_ptr &();
+  CORBA_ExceptionDef_ptr &ptr (void);
+  CORBA_ExceptionDef_ptr operator-> (void);
+
+private:
+  CORBA_ExceptionDef_ptr &ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+class CORBA_NativeDef;
+
+#if !defined (_CORBA_NATIVEDEF___PTR_CH_)
+#define _CORBA_NATIVEDEF___PTR_CH_
+
+typedef CORBA_NativeDef *CORBA_NativeDef_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_NATIVEDEF___VAR_CH_)
+#define _CORBA_NATIVEDEF___VAR_CH_
+
+class TAO_IFR_Client_Export CORBA_NativeDef_var : public TAO_Base_var
+{
+public:
+  CORBA_NativeDef_var (void); // default constructor
+  CORBA_NativeDef_var (CORBA_NativeDef_ptr p) : ptr_ (p) {} 
+  CORBA_NativeDef_var (const CORBA_NativeDef_var &); // copy constructor
+  ~CORBA_NativeDef_var (void); // destructor
+  
+  CORBA_NativeDef_var &operator= (CORBA_NativeDef_ptr);
+  CORBA_NativeDef_var &operator= (const CORBA_NativeDef_var &);
+  CORBA_NativeDef_ptr operator-> (void) const;
+  
+  operator const CORBA_NativeDef_ptr &() const;
+  operator CORBA_NativeDef_ptr &();
+  // in, inout, out, _retn 
+  CORBA_NativeDef_ptr in (void) const;
+  CORBA_NativeDef_ptr &inout (void);
+  CORBA_NativeDef_ptr &out (void);
+  CORBA_NativeDef_ptr _retn (void);
+  CORBA_NativeDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_NativeDef_ptr duplicate (CORBA_NativeDef_ptr);
+  static void release (CORBA_NativeDef_ptr);
+  static CORBA_NativeDef_ptr nil (void);
+  static CORBA_NativeDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
+private:
+  CORBA_NativeDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_NativeDef_var (const TAO_Base_var &rhs);
+  CORBA_NativeDef_var &operator= (const TAO_Base_var &rhs);
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_NATIVEDEF___OUT_CH_)
+#define _CORBA_NATIVEDEF___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_NativeDef_out
+{
+public:
+  CORBA_NativeDef_out (CORBA_NativeDef_ptr &);
+  CORBA_NativeDef_out (CORBA_NativeDef_var &);
+  CORBA_NativeDef_out (const CORBA_NativeDef_out &);
+  CORBA_NativeDef_out &operator= (const CORBA_NativeDef_out &);
+  CORBA_NativeDef_out &operator= (const CORBA_NativeDef_var &);
+  CORBA_NativeDef_out &operator= (CORBA_NativeDef_ptr);
+  operator CORBA_NativeDef_ptr &();
+  CORBA_NativeDef_ptr &ptr (void);
+  CORBA_NativeDef_ptr operator-> (void);
+
+private:
+  CORBA_NativeDef_ptr &ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+class CORBA_ValueDef;
+
+#if !defined (_CORBA_VALUEDEF___PTR_CH_)
+#define _CORBA_VALUEDEF___PTR_CH_
+
+typedef CORBA_ValueDef *CORBA_ValueDef_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_VALUEDEF___VAR_CH_)
+#define _CORBA_VALUEDEF___VAR_CH_
+
+class TAO_IFR_Client_Export CORBA_ValueDef_var : public TAO_Base_var
+{
+public:
+  CORBA_ValueDef_var (void); // default constructor
+  CORBA_ValueDef_var (CORBA_ValueDef_ptr p) : ptr_ (p) {} 
+  CORBA_ValueDef_var (const CORBA_ValueDef_var &); // copy constructor
+  ~CORBA_ValueDef_var (void); // destructor
+  
+  CORBA_ValueDef_var &operator= (CORBA_ValueDef_ptr);
+  CORBA_ValueDef_var &operator= (const CORBA_ValueDef_var &);
+  CORBA_ValueDef_ptr operator-> (void) const;
+  
+  operator const CORBA_ValueDef_ptr &() const;
+  operator CORBA_ValueDef_ptr &();
+  // in, inout, out, _retn 
+  CORBA_ValueDef_ptr in (void) const;
+  CORBA_ValueDef_ptr &inout (void);
+  CORBA_ValueDef_ptr &out (void);
+  CORBA_ValueDef_ptr _retn (void);
+  CORBA_ValueDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_ValueDef_ptr duplicate (CORBA_ValueDef_ptr);
+  static void release (CORBA_ValueDef_ptr);
+  static CORBA_ValueDef_ptr nil (void);
+  static CORBA_ValueDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
+private:
+  CORBA_ValueDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_ValueDef_var (const TAO_Base_var &rhs);
+  CORBA_ValueDef_var &operator= (const TAO_Base_var &rhs);
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_VALUEDEF___OUT_CH_)
+#define _CORBA_VALUEDEF___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_ValueDef_out
+{
+public:
+  CORBA_ValueDef_out (CORBA_ValueDef_ptr &);
+  CORBA_ValueDef_out (CORBA_ValueDef_var &);
+  CORBA_ValueDef_out (const CORBA_ValueDef_out &);
+  CORBA_ValueDef_out &operator= (const CORBA_ValueDef_out &);
+  CORBA_ValueDef_out &operator= (const CORBA_ValueDef_var &);
+  CORBA_ValueDef_out &operator= (CORBA_ValueDef_ptr);
+  operator CORBA_ValueDef_ptr &();
+  CORBA_ValueDef_ptr &ptr (void);
+  CORBA_ValueDef_ptr operator-> (void);
+
+private:
+  CORBA_ValueDef_ptr &ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CH_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CH_
+
+  class _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    // = Initialization and termination methods.
+    
+    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum,
+      CORBA::ULong length,
+      CORBA_ValueDef* *value,
+      CORBA::Boolean release = 0);
+    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs);
+    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs);
+    TAO_Object_Manager<CORBA_ValueDef,CORBA_ValueDef_var> operator[] (CORBA::ULong index) const;
+    static CORBA_ValueDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (CORBA_ValueDef **buffer);
+    // The Base_Sequence functions, please see tao/Sequence.h
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    CORBA_ValueDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const CORBA_ValueDef* *get_buffer (void) const;
+    virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+    virtual void _downcast (
+        void* target,
+        CORBA_Object *src,
+        CORBA_Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    virtual CORBA_Object* _upcast (void *src) const;
+    
+  };
+
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_VALUEDEFSEQ_CH_)
+#define _CORBA_VALUEDEFSEQ_CH_
+
+class CORBA_ValueDefSeq;
+class CORBA_ValueDefSeq_var;
+
+// *************************************************************
+// CORBA_ValueDefSeq
+// *************************************************************
+
+class TAO_IFR_Client_Export CORBA_ValueDefSeq : public 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+{
+public:
+  CORBA_ValueDefSeq (void); // default ctor
+  CORBA_ValueDefSeq (CORBA::ULong max); // uses max size
+  CORBA_ValueDefSeq (
+    CORBA::ULong max, 
+    CORBA::ULong length, 
+    CORBA_ValueDef_ptr *buffer, 
+    CORBA::Boolean release = 0
+  );
+  CORBA_ValueDefSeq (const CORBA_ValueDefSeq &); // copy ctor
+  ~CORBA_ValueDefSeq (void);
+  static void _tao_any_destructor (void*);
+
+#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+  typedef CORBA_ValueDefSeq_var _var_type;
+#endif /* ! __GNUC__ || g++ >= 2.8 */
+
+};
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_VALUEDEFSEQ___VAR_CH_)
+#define _CORBA_VALUEDEFSEQ___VAR_CH_
+
+// *************************************************************
+// class CORBA_ValueDefSeq_var
+// *************************************************************
+
+class TAO_IFR_Client_Export CORBA_ValueDefSeq_var
+{
+public:
+  CORBA_ValueDefSeq_var (void); // default constructor
+  CORBA_ValueDefSeq_var (CORBA_ValueDefSeq *);
+  CORBA_ValueDefSeq_var (const CORBA_ValueDefSeq_var &); // copy constructor
+  ~CORBA_ValueDefSeq_var (void); // destructor
+  
+  CORBA_ValueDefSeq_var &operator= (CORBA_ValueDefSeq *);
+  CORBA_ValueDefSeq_var &operator= (const CORBA_ValueDefSeq_var &);
+  CORBA_ValueDefSeq *operator-> (void);
+  const CORBA_ValueDefSeq *operator-> (void) const;
+  
+  operator const CORBA_ValueDefSeq &() const;
+  operator CORBA_ValueDefSeq &();
+  operator CORBA_ValueDefSeq &() const;
+  operator CORBA_ValueDefSeq *&(); // variable-size base types only
+  
+  TAO_Object_Manager<CORBA_ValueDef, CORBA_ValueDef_var> operator[] (CORBA::ULong index);
+  
+  // in, inout, out, _retn 
+  const CORBA_ValueDefSeq &in (void) const;
+  CORBA_ValueDefSeq &inout (void);
+  CORBA_ValueDefSeq *&out (void);
+  CORBA_ValueDefSeq *_retn (void);
+  CORBA_ValueDefSeq *ptr (void) const;
+
+private:
+  CORBA_ValueDefSeq *ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_VALUEDEFSEQ___OUT_CH_)
+#define _CORBA_VALUEDEFSEQ___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_ValueDefSeq_out
+{
+public:
+  CORBA_ValueDefSeq_out (CORBA_ValueDefSeq *&);
+  CORBA_ValueDefSeq_out (CORBA_ValueDefSeq_var &);
+  CORBA_ValueDefSeq_out (const CORBA_ValueDefSeq_out &);
+  CORBA_ValueDefSeq_out &operator= (const CORBA_ValueDefSeq_out &);
+  CORBA_ValueDefSeq_out &operator= (CORBA_ValueDefSeq *);
+  operator CORBA_ValueDefSeq *&();
+  CORBA_ValueDefSeq *&ptr (void);
+  CORBA_ValueDefSeq *operator-> (void);
+  TAO_Object_Manager<CORBA_ValueDef, CORBA_ValueDef_var> operator[] (CORBA::ULong index);
+  
+private:
+  CORBA_ValueDefSeq *&ptr_;
+  // assignment from T_var not allowed
+  void operator= (const CORBA_ValueDefSeq_var &);
+};
+
+
+#endif /* end #if !defined */
+
+extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ValueDefSeq;
+
+class CORBA_ValueBoxDef;
+
+#if !defined (_CORBA_VALUEBOXDEF___PTR_CH_)
+#define _CORBA_VALUEBOXDEF___PTR_CH_
+
+typedef CORBA_ValueBoxDef *CORBA_ValueBoxDef_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_VALUEBOXDEF___VAR_CH_)
+#define _CORBA_VALUEBOXDEF___VAR_CH_
+
+class TAO_IFR_Client_Export CORBA_ValueBoxDef_var : public TAO_Base_var
+{
+public:
+  CORBA_ValueBoxDef_var (void); // default constructor
+  CORBA_ValueBoxDef_var (CORBA_ValueBoxDef_ptr p) : ptr_ (p) {} 
+  CORBA_ValueBoxDef_var (const CORBA_ValueBoxDef_var &); // copy constructor
+  ~CORBA_ValueBoxDef_var (void); // destructor
+  
+  CORBA_ValueBoxDef_var &operator= (CORBA_ValueBoxDef_ptr);
+  CORBA_ValueBoxDef_var &operator= (const CORBA_ValueBoxDef_var &);
+  CORBA_ValueBoxDef_ptr operator-> (void) const;
+  
+  operator const CORBA_ValueBoxDef_ptr &() const;
+  operator CORBA_ValueBoxDef_ptr &();
+  // in, inout, out, _retn 
+  CORBA_ValueBoxDef_ptr in (void) const;
+  CORBA_ValueBoxDef_ptr &inout (void);
+  CORBA_ValueBoxDef_ptr &out (void);
+  CORBA_ValueBoxDef_ptr _retn (void);
+  CORBA_ValueBoxDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_ValueBoxDef_ptr duplicate (CORBA_ValueBoxDef_ptr);
+  static void release (CORBA_ValueBoxDef_ptr);
+  static CORBA_ValueBoxDef_ptr nil (void);
+  static CORBA_ValueBoxDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
+private:
+  CORBA_ValueBoxDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_ValueBoxDef_var (const TAO_Base_var &rhs);
+  CORBA_ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_VALUEBOXDEF___OUT_CH_)
+#define _CORBA_VALUEBOXDEF___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_ValueBoxDef_out
+{
+public:
+  CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_ptr &);
+  CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_var &);
+  CORBA_ValueBoxDef_out (const CORBA_ValueBoxDef_out &);
+  CORBA_ValueBoxDef_out &operator= (const CORBA_ValueBoxDef_out &);
+  CORBA_ValueBoxDef_out &operator= (const CORBA_ValueBoxDef_var &);
+  CORBA_ValueBoxDef_out &operator= (CORBA_ValueBoxDef_ptr);
+  operator CORBA_ValueBoxDef_ptr &();
+  CORBA_ValueBoxDef_ptr &ptr (void);
+  CORBA_ValueBoxDef_ptr operator-> (void);
+
+private:
+  CORBA_ValueBoxDef_ptr &ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+class CORBA_AbstractInterfaceDef;
+
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF___PTR_CH_)
+#define _CORBA_ABSTRACTINTERFACEDEF___PTR_CH_
+
+typedef CORBA_AbstractInterfaceDef *CORBA_AbstractInterfaceDef_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF___VAR_CH_)
+#define _CORBA_ABSTRACTINTERFACEDEF___VAR_CH_
+
+class TAO_IFR_Client_Export CORBA_AbstractInterfaceDef_var : public TAO_Base_var
+{
+public:
+  CORBA_AbstractInterfaceDef_var (void); // default constructor
+  CORBA_AbstractInterfaceDef_var (CORBA_AbstractInterfaceDef_ptr p) : ptr_ (p) {} 
+  CORBA_AbstractInterfaceDef_var (const CORBA_AbstractInterfaceDef_var &); // copy constructor
+  ~CORBA_AbstractInterfaceDef_var (void); // destructor
+  
+  CORBA_AbstractInterfaceDef_var &operator= (CORBA_AbstractInterfaceDef_ptr);
+  CORBA_AbstractInterfaceDef_var &operator= (const CORBA_AbstractInterfaceDef_var &);
+  CORBA_AbstractInterfaceDef_ptr operator-> (void) const;
+  
+  operator const CORBA_AbstractInterfaceDef_ptr &() const;
+  operator CORBA_AbstractInterfaceDef_ptr &();
+  // in, inout, out, _retn 
+  CORBA_AbstractInterfaceDef_ptr in (void) const;
+  CORBA_AbstractInterfaceDef_ptr &inout (void);
+  CORBA_AbstractInterfaceDef_ptr &out (void);
+  CORBA_AbstractInterfaceDef_ptr _retn (void);
+  CORBA_AbstractInterfaceDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_AbstractInterfaceDef_ptr duplicate (CORBA_AbstractInterfaceDef_ptr);
+  static void release (CORBA_AbstractInterfaceDef_ptr);
+  static CORBA_AbstractInterfaceDef_ptr nil (void);
+  static CORBA_AbstractInterfaceDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
+private:
+  CORBA_AbstractInterfaceDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_AbstractInterfaceDef_var (const TAO_Base_var &rhs);
+  CORBA_AbstractInterfaceDef_var &operator= (const TAO_Base_var &rhs);
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF___OUT_CH_)
+#define _CORBA_ABSTRACTINTERFACEDEF___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_AbstractInterfaceDef_out
+{
+public:
+  CORBA_AbstractInterfaceDef_out (CORBA_AbstractInterfaceDef_ptr &);
+  CORBA_AbstractInterfaceDef_out (CORBA_AbstractInterfaceDef_var &);
+  CORBA_AbstractInterfaceDef_out (const CORBA_AbstractInterfaceDef_out &);
+  CORBA_AbstractInterfaceDef_out &operator= (const CORBA_AbstractInterfaceDef_out &);
+  CORBA_AbstractInterfaceDef_out &operator= (const CORBA_AbstractInterfaceDef_var &);
+  CORBA_AbstractInterfaceDef_out &operator= (CORBA_AbstractInterfaceDef_ptr);
+  operator CORBA_AbstractInterfaceDef_ptr &();
+  CORBA_AbstractInterfaceDef_ptr &ptr (void);
+  CORBA_AbstractInterfaceDef_ptr operator-> (void);
+
+private:
+  CORBA_AbstractInterfaceDef_ptr &ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_
+
+  class _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    // = Initialization and termination methods.
+    
+    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum,
+      CORBA::ULong length,
+      CORBA_AbstractInterfaceDef* *value,
+      CORBA::Boolean release = 0);
+    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs);
+    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs);
+    TAO_Object_Manager<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var> operator[] (CORBA::ULong index) const;
+    static CORBA_AbstractInterfaceDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (CORBA_AbstractInterfaceDef **buffer);
+    // The Base_Sequence functions, please see tao/Sequence.h
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    CORBA_AbstractInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const CORBA_AbstractInterfaceDef* *get_buffer (void) const;
+    virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+    virtual void _downcast (
+        void* target,
+        CORBA_Object *src,
+        CORBA_Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    virtual CORBA_Object* _upcast (void *src) const;
+    
+  };
+
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_)
+#define _CORBA_ABSTRACTINTERFACEDEFSEQ_CH_
+
+class CORBA_AbstractInterfaceDefSeq;
+class CORBA_AbstractInterfaceDefSeq_var;
+
+// *************************************************************
+// CORBA_AbstractInterfaceDefSeq
+// *************************************************************
+
+class TAO_IFR_Client_Export CORBA_AbstractInterfaceDefSeq : public 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+{
+public:
+  CORBA_AbstractInterfaceDefSeq (void); // default ctor
+  CORBA_AbstractInterfaceDefSeq (CORBA::ULong max); // uses max size
+  CORBA_AbstractInterfaceDefSeq (
+    CORBA::ULong max, 
+    CORBA::ULong length, 
+    CORBA_AbstractInterfaceDef_ptr *buffer, 
+    CORBA::Boolean release = 0
+  );
+  CORBA_AbstractInterfaceDefSeq (const CORBA_AbstractInterfaceDefSeq &); // copy ctor
+  ~CORBA_AbstractInterfaceDefSeq (void);
+  static void _tao_any_destructor (void*);
+
+#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+  typedef CORBA_AbstractInterfaceDefSeq_var _var_type;
+#endif /* ! __GNUC__ || g++ >= 2.8 */
+
+};
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ___VAR_CH_)
+#define _CORBA_ABSTRACTINTERFACEDEFSEQ___VAR_CH_
+
+// *************************************************************
+// class CORBA_AbstractInterfaceDefSeq_var
+// *************************************************************
+
+class TAO_IFR_Client_Export CORBA_AbstractInterfaceDefSeq_var
+{
+public:
+  CORBA_AbstractInterfaceDefSeq_var (void); // default constructor
+  CORBA_AbstractInterfaceDefSeq_var (CORBA_AbstractInterfaceDefSeq *);
+  CORBA_AbstractInterfaceDefSeq_var (const CORBA_AbstractInterfaceDefSeq_var &); // copy constructor
+  ~CORBA_AbstractInterfaceDefSeq_var (void); // destructor
+  
+  CORBA_AbstractInterfaceDefSeq_var &operator= (CORBA_AbstractInterfaceDefSeq *);
+  CORBA_AbstractInterfaceDefSeq_var &operator= (const CORBA_AbstractInterfaceDefSeq_var &);
+  CORBA_AbstractInterfaceDefSeq *operator-> (void);
+  const CORBA_AbstractInterfaceDefSeq *operator-> (void) const;
+  
+  operator const CORBA_AbstractInterfaceDefSeq &() const;
+  operator CORBA_AbstractInterfaceDefSeq &();
+  operator CORBA_AbstractInterfaceDefSeq &() const;
+  operator CORBA_AbstractInterfaceDefSeq *&(); // variable-size base types only
+  
+  TAO_Object_Manager<CORBA_AbstractInterfaceDef, CORBA_AbstractInterfaceDef_var> operator[] (CORBA::ULong index);
+  
+  // in, inout, out, _retn 
+  const CORBA_AbstractInterfaceDefSeq &in (void) const;
+  CORBA_AbstractInterfaceDefSeq &inout (void);
+  CORBA_AbstractInterfaceDefSeq *&out (void);
+  CORBA_AbstractInterfaceDefSeq *_retn (void);
+  CORBA_AbstractInterfaceDefSeq *ptr (void) const;
+
+private:
+  CORBA_AbstractInterfaceDefSeq *ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ___OUT_CH_)
+#define _CORBA_ABSTRACTINTERFACEDEFSEQ___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_AbstractInterfaceDefSeq_out
+{
+public:
+  CORBA_AbstractInterfaceDefSeq_out (CORBA_AbstractInterfaceDefSeq *&);
+  CORBA_AbstractInterfaceDefSeq_out (CORBA_AbstractInterfaceDefSeq_var &);
+  CORBA_AbstractInterfaceDefSeq_out (const CORBA_AbstractInterfaceDefSeq_out &);
+  CORBA_AbstractInterfaceDefSeq_out &operator= (const CORBA_AbstractInterfaceDefSeq_out &);
+  CORBA_AbstractInterfaceDefSeq_out &operator= (CORBA_AbstractInterfaceDefSeq *);
+  operator CORBA_AbstractInterfaceDefSeq *&();
+  CORBA_AbstractInterfaceDefSeq *&ptr (void);
+  CORBA_AbstractInterfaceDefSeq *operator-> (void);
+  TAO_Object_Manager<CORBA_AbstractInterfaceDef, CORBA_AbstractInterfaceDef_var> operator[] (CORBA::ULong index);
+  
+private:
+  CORBA_AbstractInterfaceDefSeq *&ptr_;
+  // assignment from T_var not allowed
+  void operator= (const CORBA_AbstractInterfaceDefSeq_var &);
+};
+
+
+#endif /* end #if !defined */
+
+extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_AbstractInterfaceDefSeq;
+
+class CORBA_LocalInterfaceDef;
+
+#if !defined (_CORBA_LOCALINTERFACEDEF___PTR_CH_)
+#define _CORBA_LOCALINTERFACEDEF___PTR_CH_
+
+typedef CORBA_LocalInterfaceDef *CORBA_LocalInterfaceDef_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_LOCALINTERFACEDEF___VAR_CH_)
+#define _CORBA_LOCALINTERFACEDEF___VAR_CH_
+
+class TAO_IFR_Client_Export CORBA_LocalInterfaceDef_var : public TAO_Base_var
+{
+public:
+  CORBA_LocalInterfaceDef_var (void); // default constructor
+  CORBA_LocalInterfaceDef_var (CORBA_LocalInterfaceDef_ptr p) : ptr_ (p) {} 
+  CORBA_LocalInterfaceDef_var (const CORBA_LocalInterfaceDef_var &); // copy constructor
+  ~CORBA_LocalInterfaceDef_var (void); // destructor
+  
+  CORBA_LocalInterfaceDef_var &operator= (CORBA_LocalInterfaceDef_ptr);
+  CORBA_LocalInterfaceDef_var &operator= (const CORBA_LocalInterfaceDef_var &);
+  CORBA_LocalInterfaceDef_ptr operator-> (void) const;
+  
+  operator const CORBA_LocalInterfaceDef_ptr &() const;
+  operator CORBA_LocalInterfaceDef_ptr &();
+  // in, inout, out, _retn 
+  CORBA_LocalInterfaceDef_ptr in (void) const;
+  CORBA_LocalInterfaceDef_ptr &inout (void);
+  CORBA_LocalInterfaceDef_ptr &out (void);
+  CORBA_LocalInterfaceDef_ptr _retn (void);
+  CORBA_LocalInterfaceDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_LocalInterfaceDef_ptr duplicate (CORBA_LocalInterfaceDef_ptr);
+  static void release (CORBA_LocalInterfaceDef_ptr);
+  static CORBA_LocalInterfaceDef_ptr nil (void);
+  static CORBA_LocalInterfaceDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
+private:
+  CORBA_LocalInterfaceDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_LocalInterfaceDef_var (const TAO_Base_var &rhs);
+  CORBA_LocalInterfaceDef_var &operator= (const TAO_Base_var &rhs);
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_LOCALINTERFACEDEF___OUT_CH_)
+#define _CORBA_LOCALINTERFACEDEF___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_LocalInterfaceDef_out
+{
+public:
+  CORBA_LocalInterfaceDef_out (CORBA_LocalInterfaceDef_ptr &);
+  CORBA_LocalInterfaceDef_out (CORBA_LocalInterfaceDef_var &);
+  CORBA_LocalInterfaceDef_out (const CORBA_LocalInterfaceDef_out &);
+  CORBA_LocalInterfaceDef_out &operator= (const CORBA_LocalInterfaceDef_out &);
+  CORBA_LocalInterfaceDef_out &operator= (const CORBA_LocalInterfaceDef_var &);
+  CORBA_LocalInterfaceDef_out &operator= (CORBA_LocalInterfaceDef_ptr);
+  operator CORBA_LocalInterfaceDef_ptr &();
+  CORBA_LocalInterfaceDef_ptr &ptr (void);
+  CORBA_LocalInterfaceDef_ptr operator-> (void);
+
+private:
+  CORBA_LocalInterfaceDef_ptr &ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CH_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CH_
+
+  class _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq : public TAO_Unbounded_Base_Sequence
+  {
+  public:
+    // = Initialization and termination methods.
+    
+    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum);
+    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum,
+      CORBA::ULong length,
+      CORBA_LocalInterfaceDef* *value,
+      CORBA::Boolean release = 0);
+    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs);
+    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void);
+    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs);
+    TAO_Object_Manager<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var> operator[] (CORBA::ULong index) const;
+    static CORBA_LocalInterfaceDef **allocbuf (CORBA::ULong nelems);
+    static void freebuf (CORBA_LocalInterfaceDef **buffer);
+    // The Base_Sequence functions, please see tao/Sequence.h
+    virtual void _allocate_buffer (CORBA::ULong length);
+    virtual void _deallocate_buffer (void);
+    CORBA_LocalInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
+    const CORBA_LocalInterfaceDef* *get_buffer (void) const;
+    virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+    virtual void _downcast (
+        void* target,
+        CORBA_Object *src,
+        CORBA_Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    virtual CORBA_Object* _upcast (void *src) const;
+    
+  };
+
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CH_)
+#define _CORBA_LOCALINTERFACEDEFSEQ_CH_
+
+class CORBA_LocalInterfaceDefSeq;
+class CORBA_LocalInterfaceDefSeq_var;
+
+// *************************************************************
+// CORBA_LocalInterfaceDefSeq
+// *************************************************************
+
+class TAO_IFR_Client_Export CORBA_LocalInterfaceDefSeq : public 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+  TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+{
+public:
+  CORBA_LocalInterfaceDefSeq (void); // default ctor
+  CORBA_LocalInterfaceDefSeq (CORBA::ULong max); // uses max size
+  CORBA_LocalInterfaceDefSeq (
+    CORBA::ULong max, 
+    CORBA::ULong length, 
+    CORBA_LocalInterfaceDef_ptr *buffer, 
+    CORBA::Boolean release = 0
+  );
+  CORBA_LocalInterfaceDefSeq (const CORBA_LocalInterfaceDefSeq &); // copy ctor
+  ~CORBA_LocalInterfaceDefSeq (void);
+  static void _tao_any_destructor (void*);
+
+#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+  typedef CORBA_LocalInterfaceDefSeq_var _var_type;
+#endif /* ! __GNUC__ || g++ >= 2.8 */
+
+};
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_LOCALINTERFACEDEFSEQ___VAR_CH_)
+#define _CORBA_LOCALINTERFACEDEFSEQ___VAR_CH_
+
+// *************************************************************
+// class CORBA_LocalInterfaceDefSeq_var
+// *************************************************************
+
+class TAO_IFR_Client_Export CORBA_LocalInterfaceDefSeq_var
+{
+public:
+  CORBA_LocalInterfaceDefSeq_var (void); // default constructor
+  CORBA_LocalInterfaceDefSeq_var (CORBA_LocalInterfaceDefSeq *);
+  CORBA_LocalInterfaceDefSeq_var (const CORBA_LocalInterfaceDefSeq_var &); // copy constructor
+  ~CORBA_LocalInterfaceDefSeq_var (void); // destructor
+  
+  CORBA_LocalInterfaceDefSeq_var &operator= (CORBA_LocalInterfaceDefSeq *);
+  CORBA_LocalInterfaceDefSeq_var &operator= (const CORBA_LocalInterfaceDefSeq_var &);
+  CORBA_LocalInterfaceDefSeq *operator-> (void);
+  const CORBA_LocalInterfaceDefSeq *operator-> (void) const;
+  
+  operator const CORBA_LocalInterfaceDefSeq &() const;
+  operator CORBA_LocalInterfaceDefSeq &();
+  operator CORBA_LocalInterfaceDefSeq &() const;
+  operator CORBA_LocalInterfaceDefSeq *&(); // variable-size base types only
+  
+  TAO_Object_Manager<CORBA_LocalInterfaceDef, CORBA_LocalInterfaceDef_var> operator[] (CORBA::ULong index);
+  
+  // in, inout, out, _retn 
+  const CORBA_LocalInterfaceDefSeq &in (void) const;
+  CORBA_LocalInterfaceDefSeq &inout (void);
+  CORBA_LocalInterfaceDefSeq *&out (void);
+  CORBA_LocalInterfaceDefSeq *_retn (void);
+  CORBA_LocalInterfaceDefSeq *ptr (void) const;
+
+private:
+  CORBA_LocalInterfaceDefSeq *ptr_;
+};
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_LOCALINTERFACEDEFSEQ___OUT_CH_)
+#define _CORBA_LOCALINTERFACEDEFSEQ___OUT_CH_
+
+class TAO_IFR_Client_Export CORBA_LocalInterfaceDefSeq_out
+{
+public:
+  CORBA_LocalInterfaceDefSeq_out (CORBA_LocalInterfaceDefSeq *&);
+  CORBA_LocalInterfaceDefSeq_out (CORBA_LocalInterfaceDefSeq_var &);
+  CORBA_LocalInterfaceDefSeq_out (const CORBA_LocalInterfaceDefSeq_out &);
+  CORBA_LocalInterfaceDefSeq_out &operator= (const CORBA_LocalInterfaceDefSeq_out &);
+  CORBA_LocalInterfaceDefSeq_out &operator= (CORBA_LocalInterfaceDefSeq *);
+  operator CORBA_LocalInterfaceDefSeq *&();
+  CORBA_LocalInterfaceDefSeq *&ptr (void);
+  CORBA_LocalInterfaceDefSeq *operator-> (void);
+  TAO_Object_Manager<CORBA_LocalInterfaceDef, CORBA_LocalInterfaceDef_var> operator[] (CORBA::ULong index);
+  
+private:
+  CORBA_LocalInterfaceDefSeq *&ptr_;
+  // assignment from T_var not allowed
+  void operator= (const CORBA_LocalInterfaceDefSeq_var &);
+};
+
+
+#endif /* end #if !defined */
+
+extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_LocalInterfaceDefSeq;
+
 struct CORBA_StructMember;
 class CORBA_StructMember_var;
 
@@ -1268,7 +2945,7 @@ struct TAO_IFR_Client_Export CORBA_StructMember
 
   TAO_String_Manager name;
   CORBA::TypeCode_var type;
-  CORBA::IDLType_var type_def;
+  CORBA_IDLType_var type_def;
 };
 
 class TAO_IFR_Client_Export CORBA_StructMember_var
@@ -1384,7 +3061,7 @@ public:
   CORBA_StructMemberSeq (
     CORBA::ULong max, 
     CORBA::ULong length, 
-    CORBA::StructMember *buffer, 
+    CORBA_StructMember *buffer, 
     CORBA::Boolean release = 0
   );
   CORBA_StructMemberSeq (const CORBA_StructMemberSeq &); // copy ctor
@@ -1425,8 +3102,8 @@ public:
   operator CORBA_StructMemberSeq &() const;
   operator CORBA_StructMemberSeq *&(); // variable-size base types only
   
-  CORBA::StructMember & operator[] (CORBA::ULong index);
-  const CORBA::StructMember & operator[] (CORBA::ULong index) const;
+  CORBA_StructMember & operator[] (CORBA::ULong index);
+  const CORBA_StructMember & operator[] (CORBA::ULong index) const;
   
   // in, inout, out, _retn 
   const CORBA_StructMemberSeq &in (void) const;
@@ -1457,7 +3134,7 @@ public:
   operator CORBA_StructMemberSeq *&();
   CORBA_StructMemberSeq *&ptr (void);
   CORBA_StructMemberSeq *operator-> (void);
-  CORBA::StructMember & operator[] (CORBA::ULong index);
+  CORBA_StructMember & operator[] (CORBA::ULong index);
   
 private:
   CORBA_StructMemberSeq *&ptr_;
@@ -1480,7 +3157,7 @@ struct TAO_IFR_Client_Export CORBA_Initializer
 
   static void _tao_any_destructor (void*);
 
-  CORBA::StructMemberSeq members;
+  CORBA_StructMemberSeq members;
   TAO_String_Manager name;
 };
 
@@ -1597,7 +3274,7 @@ public:
   CORBA_InitializerSeq (
     CORBA::ULong max, 
     CORBA::ULong length, 
-    CORBA::Initializer *buffer, 
+    CORBA_Initializer *buffer, 
     CORBA::Boolean release = 0
   );
   CORBA_InitializerSeq (const CORBA_InitializerSeq &); // copy ctor
@@ -1638,8 +3315,8 @@ public:
   operator CORBA_InitializerSeq &() const;
   operator CORBA_InitializerSeq *&(); // variable-size base types only
   
-  CORBA::Initializer & operator[] (CORBA::ULong index);
-  const CORBA::Initializer & operator[] (CORBA::ULong index) const;
+  CORBA_Initializer & operator[] (CORBA::ULong index);
+  const CORBA_Initializer & operator[] (CORBA::ULong index) const;
   
   // in, inout, out, _retn 
   const CORBA_InitializerSeq &in (void) const;
@@ -1670,7 +3347,7 @@ public:
   operator CORBA_InitializerSeq *&();
   CORBA_InitializerSeq *&ptr (void);
   CORBA_InitializerSeq *operator-> (void);
-  CORBA::Initializer & operator[] (CORBA::ULong index);
+  CORBA_Initializer & operator[] (CORBA::ULong index);
   
 private:
   CORBA_InitializerSeq *&ptr_;
@@ -1696,7 +3373,7 @@ struct TAO_IFR_Client_Export CORBA_UnionMember
   TAO_String_Manager name;
   CORBA::Any label;
   CORBA::TypeCode_var type;
-  CORBA::IDLType_var type_def;
+  CORBA_IDLType_var type_def;
 };
 
 class TAO_IFR_Client_Export CORBA_UnionMember_var
@@ -1812,7 +3489,7 @@ public:
   CORBA_UnionMemberSeq (
     CORBA::ULong max, 
     CORBA::ULong length, 
-    CORBA::UnionMember *buffer, 
+    CORBA_UnionMember *buffer, 
     CORBA::Boolean release = 0
   );
   CORBA_UnionMemberSeq (const CORBA_UnionMemberSeq &); // copy ctor
@@ -1853,8 +3530,8 @@ public:
   operator CORBA_UnionMemberSeq &() const;
   operator CORBA_UnionMemberSeq *&(); // variable-size base types only
   
-  CORBA::UnionMember & operator[] (CORBA::ULong index);
-  const CORBA::UnionMember & operator[] (CORBA::ULong index) const;
+  CORBA_UnionMember & operator[] (CORBA::ULong index);
+  const CORBA_UnionMember & operator[] (CORBA::ULong index) const;
   
   // in, inout, out, _retn 
   const CORBA_UnionMemberSeq &in (void) const;
@@ -1885,7 +3562,7 @@ public:
   operator CORBA_UnionMemberSeq *&();
   CORBA_UnionMemberSeq *&ptr (void);
   CORBA_UnionMemberSeq *operator-> (void);
-  CORBA::UnionMember & operator[] (CORBA::ULong index);
+  CORBA_UnionMember & operator[] (CORBA::ULong index);
   
 private:
   CORBA_UnionMemberSeq *&ptr_;
@@ -2008,10 +3685,10 @@ private:
 #define _CORBA_CONTAINER_CH_
 
 // Forward Classes Declaration
-class _TAO_Container_Proxy_Impl;
-class _TAO_Container_Remote_Proxy_Impl;
-class _TAO_Container_Proxy_Broker;
-class _TAO_Container_Remote_Proxy_Broker;
+class _TAO_CORBA_Container_Proxy_Impl;
+class _TAO_CORBA_Container_Remote_Proxy_Impl;
+class _TAO_CORBA_Container_Proxy_Broker;
+class _TAO_CORBA_Container_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_Container: public virtual CORBA_IRObject
 {
@@ -2040,7 +3717,7 @@ public:
 
   static void _tao_any_destructor (void*);
 
-  virtual CORBA::Contained_ptr lookup (
+  virtual CORBA_Contained_ptr lookup (
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -2049,7 +3726,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ContainedSeq * contents (
+  virtual CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Environment &ACE_TRY_ENV = 
@@ -2059,7 +3736,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ContainedSeq * lookup_name (
+  virtual CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
@@ -2083,7 +3760,7 @@ public:
 
     static void _tao_any_destructor (void*);
 
-    CORBA::Contained_var contained_object;
+    CORBA_Contained_var contained_object;
     CORBA::DefinitionKind kind;
     CORBA::Any value;
   };
@@ -2137,6 +3814,7 @@ public:
 
   static CORBA::TypeCode_ptr _tc_Description;
 
+
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_)
@@ -2222,7 +3900,7 @@ public:
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ___VAR_CH_
 
   // *************************************************************
-  // class DescriptionSeq_var
+  // class CORBA_Container::DescriptionSeq_var
   // *************************************************************
 
   class TAO_IFR_Client_Export DescriptionSeq_var
@@ -2283,11 +3961,12 @@ public:
     void operator= (const DescriptionSeq_var &);
   };
 
-  static CORBA::TypeCode_ptr _tc_DescriptionSeq;
 
 #endif /* end #if !defined */
 
-  virtual CORBA::Container::DescriptionSeq * describe_contents (
+  static CORBA::TypeCode_ptr _tc_DescriptionSeq;
+
+  virtual CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
       CORBA::Long max_returned_objs,
@@ -2298,7 +3977,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ModuleDef_ptr create_module (
+  virtual CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
       const char * version,
@@ -2309,11 +3988,11 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ConstantDef_ptr create_constant (
+  virtual CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -2322,11 +4001,11 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::StructDef_ptr create_struct (
+  virtual CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2334,12 +4013,12 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::UnionDef_ptr create_union (
+  virtual CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2347,11 +4026,11 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::EnumDef_ptr create_enum (
+  virtual CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2359,11 +4038,11 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::AliasDef_ptr create_alias (
+  virtual CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2371,11 +4050,11 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::InterfaceDef_ptr create_interface (
+  virtual CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2383,17 +4062,17 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDef_ptr create_value (
+  virtual 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_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2401,11 +4080,11 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueBoxDef_ptr create_value_box (
+  virtual CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2413,11 +4092,11 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ExceptionDef_ptr create_exception (
+  virtual CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2425,7 +4104,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::NativeDef_ptr create_native (
+  virtual CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
       const char * version,
@@ -2436,11 +4115,11 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2448,11 +4127,11 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::LocalInterfaceDef_ptr create_local_interface (
+  virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2470,7 +4149,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_Container_Proxy_Broker *the_TAO_Container_Proxy_Broker_;
+  _TAO_CORBA_Container_Proxy_Broker *the_TAO_CORBA_Container_Proxy_Broker_;
   
 protected:
   CORBA_Container (int collocated = 0);
@@ -2486,14 +4165,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_Container_Remote_Proxy_Impl;
-    friend class _TAO_Container_ThruPOA_Proxy_Impl;
-    friend class _TAO_Container_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_Container_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_Container_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_Container_Direct_Proxy_Impl;
   
   virtual ~CORBA_Container (void);
 private:
   CORBA_Container (const CORBA_Container &);
-  void operator= (const CORBA_Container &);  
+  void operator= (const CORBA_Container &);
 };
 
 
@@ -2506,13 +4185,13 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_Container_Proxy_Impl : 
-  public virtual _TAO_IRObject_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_Container_Proxy_Impl : 
+  public virtual _TAO_CORBA_IRObject_Proxy_Impl
 {
 public:
-  virtual ~_TAO_Container_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_Container_Proxy_Impl (void) { }
   
-    virtual CORBA::Contained_ptr lookup (
+    virtual CORBA_Contained_ptr lookup (
       CORBA_Object *_collocated_tao_target_,
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV
@@ -2521,7 +4200,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ContainedSeq * contents (
+  virtual CORBA_ContainedSeq * contents (
       CORBA_Object *_collocated_tao_target_,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
@@ -2531,7 +4210,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ContainedSeq * lookup_name (
+  virtual CORBA_ContainedSeq * lookup_name (
       CORBA_Object *_collocated_tao_target_,
       const char * search_name,
       CORBA::Long levels_to_search,
@@ -2543,7 +4222,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::Container::DescriptionSeq * describe_contents (
+  virtual CORBA_Container::DescriptionSeq * describe_contents (
       CORBA_Object *_collocated_tao_target_,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
@@ -2554,7 +4233,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ModuleDef_ptr create_module (
+  virtual CORBA_ModuleDef_ptr create_module (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
@@ -2565,12 +4244,12 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ConstantDef_ptr create_constant (
+  virtual CORBA_ConstantDef_ptr create_constant (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -2578,110 +4257,110 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::StructDef_ptr create_struct (
+  virtual CORBA_StructDef_ptr create_struct (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::UnionDef_ptr create_union (
+  virtual CORBA_UnionDef_ptr create_union (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::EnumDef_ptr create_enum (
+  virtual CORBA_EnumDef_ptr create_enum (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::AliasDef_ptr create_alias (
+  virtual CORBA_AliasDef_ptr create_alias (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::InterfaceDef_ptr create_interface (
+  virtual CORBA_InterfaceDef_ptr create_interface (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ValueDef_ptr create_value (
+  virtual CORBA_ValueDef_ptr create_value (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
       CORBA::Boolean is_custom,
       CORBA::Boolean is_abstract,
-      CORBA::ValueDef_ptr base_value,
+      CORBA_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ValueBoxDef_ptr create_value_box (
+  virtual CORBA_ValueBoxDef_ptr create_value_box (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ExceptionDef_ptr create_exception (
+  virtual CORBA_ExceptionDef_ptr create_exception (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::NativeDef_ptr create_native (
+  virtual CORBA_NativeDef_ptr create_native (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
@@ -2692,24 +4371,24 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::LocalInterfaceDef_ptr create_local_interface (
+  virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -2717,7 +4396,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_Container_Proxy_Impl (void);
+  _TAO_CORBA_Container_Proxy_Impl (void);
 
 };
 //
@@ -2729,18 +4408,18 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_Container_Remote_Proxy_Impl : 
-  public virtual _TAO_Container_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_Container_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_Container_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_IRObject_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_IRObject_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_Container_Remote_Proxy_Impl (void);
+  _TAO_CORBA_Container_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_Container_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_Container_Remote_Proxy_Impl (void) { }
   
-    virtual CORBA::Contained_ptr lookup (
+    virtual CORBA_Contained_ptr lookup (
       CORBA_Object *_collocated_tao_target_,
       const char * search_name,
       CORBA::Environment &ACE_TRY_ENV
@@ -2749,7 +4428,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ContainedSeq * contents (
+  virtual CORBA_ContainedSeq * contents (
       CORBA_Object *_collocated_tao_target_,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
@@ -2759,7 +4438,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ContainedSeq * lookup_name (
+  virtual CORBA_ContainedSeq * lookup_name (
       CORBA_Object *_collocated_tao_target_,
       const char * search_name,
       CORBA::Long levels_to_search,
@@ -2771,7 +4450,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::Container::DescriptionSeq * describe_contents (
+  virtual CORBA_Container::DescriptionSeq * describe_contents (
       CORBA_Object *_collocated_tao_target_,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
@@ -2782,7 +4461,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ModuleDef_ptr create_module (
+  virtual CORBA_ModuleDef_ptr create_module (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
@@ -2793,12 +4472,12 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ConstantDef_ptr create_constant (
+  virtual CORBA_ConstantDef_ptr create_constant (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Any & value,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -2806,110 +4485,110 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::StructDef_ptr create_struct (
+  virtual CORBA_StructDef_ptr create_struct (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::UnionDef_ptr create_union (
+  virtual CORBA_UnionDef_ptr create_union (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr discriminator_type,
-      const CORBA::UnionMemberSeq & members,
+      CORBA_IDLType_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::EnumDef_ptr create_enum (
+  virtual CORBA_EnumDef_ptr create_enum (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::AliasDef_ptr create_alias (
+  virtual CORBA_AliasDef_ptr create_alias (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type,
+      CORBA_IDLType_ptr original_type,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::InterfaceDef_ptr create_interface (
+  virtual CORBA_InterfaceDef_ptr create_interface (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDef_ptr create_value (
+  virtual CORBA_ValueDef_ptr create_value (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
       CORBA::Boolean is_custom,
       CORBA::Boolean is_abstract,
-      CORBA::ValueDef_ptr base_value,
+      CORBA_ValueDef_ptr base_value,
       CORBA::Boolean is_truncatable,
-      const CORBA::ValueDefSeq & abstract_base_values,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_ValueDefSeq & abstract_base_values,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueBoxDef_ptr create_value_box (
+  virtual CORBA_ValueBoxDef_ptr create_value_box (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::ExceptionDef_ptr create_exception (
+  virtual CORBA_ExceptionDef_ptr create_exception (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::NativeDef_ptr create_native (
+  virtual CORBA_NativeDef_ptr create_native (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
@@ -2920,24 +4599,24 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
+  virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::LocalInterfaceDef_ptr create_local_interface (
+  virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -2962,17 +4641,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_Container_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_Container_Proxy_Broker
 {
 public:
-  virtual ~_TAO_Container_Proxy_Broker (void);
-  virtual _TAO_Container_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_Container_Proxy_Broker (void);
+  virtual _TAO_CORBA_Container_Proxy_Impl &select_proxy (
     CORBA_Container *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_Container_Proxy_Broker (void);
+  _TAO_CORBA_Container_Proxy_Broker (void);
   
 };
 
@@ -2985,26 +4664,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_Container_Remote_Proxy_Broker : public virtual _TAO_Container_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_Container_Remote_Proxy_Broker : public virtual _TAO_CORBA_Container_Proxy_Broker
 {
 public: 
-  _TAO_Container_Remote_Proxy_Broker (void);
+  _TAO_CORBA_Container_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_Container_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_Container_Remote_Proxy_Broker (void);
   
-  virtual _TAO_Container_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_Container_Proxy_Impl &select_proxy (
     CORBA_Container *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_Container_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_Container_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_Container_Remote_Proxy_Broker *the_TAO_Container_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_Container_Remote_Proxy_Broker *the_TAO_CORBA_Container_Remote_Proxy_Broker (void);
 };
 
 
@@ -3015,14 +4694,15 @@ public:
 
 #endif /* end #if !defined */
 
+
 #if !defined (_CORBA_IDLTYPE_CH_)
 #define _CORBA_IDLTYPE_CH_
 
 // Forward Classes Declaration
-class _TAO_IDLType_Proxy_Impl;
-class _TAO_IDLType_Remote_Proxy_Impl;
-class _TAO_IDLType_Proxy_Broker;
-class _TAO_IDLType_Remote_Proxy_Broker;
+class _TAO_CORBA_IDLType_Proxy_Impl;
+class _TAO_CORBA_IDLType_Remote_Proxy_Impl;
+class _TAO_CORBA_IDLType_Proxy_Broker;
+class _TAO_CORBA_IDLType_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_IDLType: public virtual CORBA_IRObject
 {
@@ -3069,7 +4749,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_IDLType_Proxy_Broker *the_TAO_IDLType_Proxy_Broker_;
+  _TAO_CORBA_IDLType_Proxy_Broker *the_TAO_CORBA_IDLType_Proxy_Broker_;
   
 protected:
   CORBA_IDLType (int collocated = 0);
@@ -3085,14 +4765,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_IDLType_Remote_Proxy_Impl;
-    friend class _TAO_IDLType_ThruPOA_Proxy_Impl;
-    friend class _TAO_IDLType_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_IDLType_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_IDLType_Direct_Proxy_Impl;
   
   virtual ~CORBA_IDLType (void);
 private:
   CORBA_IDLType (const CORBA_IDLType &);
-  void operator= (const CORBA_IDLType &);  
+  void operator= (const CORBA_IDLType &);
 };
 
 
@@ -3105,11 +4785,11 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_IDLType_Proxy_Impl : 
-  public virtual _TAO_IRObject_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_IDLType_Proxy_Impl : 
+  public virtual _TAO_CORBA_IRObject_Proxy_Impl
 {
 public:
-  virtual ~_TAO_IDLType_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_IDLType_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
@@ -3120,7 +4800,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_IDLType_Proxy_Impl (void);
+  _TAO_CORBA_IDLType_Proxy_Impl (void);
 
 };
 //
@@ -3132,16 +4812,16 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_IDLType_Remote_Proxy_Impl : 
-  public virtual _TAO_IDLType_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_IDLType_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_IDLType_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_IRObject_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_IRObject_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_IDLType_Remote_Proxy_Impl (void);
+  _TAO_CORBA_IDLType_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_IDLType_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_IDLType_Remote_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
@@ -3169,17 +4849,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_IDLType_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_IDLType_Proxy_Broker
 {
 public:
-  virtual ~_TAO_IDLType_Proxy_Broker (void);
-  virtual _TAO_IDLType_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_IDLType_Proxy_Broker (void);
+  virtual _TAO_CORBA_IDLType_Proxy_Impl &select_proxy (
     CORBA_IDLType *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_IDLType_Proxy_Broker (void);
+  _TAO_CORBA_IDLType_Proxy_Broker (void);
   
 };
 
@@ -3192,26 +4872,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_IDLType_Remote_Proxy_Broker : public virtual _TAO_IDLType_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_IDLType_Remote_Proxy_Broker : public virtual _TAO_CORBA_IDLType_Proxy_Broker
 {
 public: 
-  _TAO_IDLType_Remote_Proxy_Broker (void);
+  _TAO_CORBA_IDLType_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_IDLType_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_IDLType_Remote_Proxy_Broker (void);
   
-  virtual _TAO_IDLType_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_IDLType_Proxy_Impl &select_proxy (
     CORBA_IDLType *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_IDLType_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_IDLType_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_IDLType_Remote_Proxy_Broker *the_TAO_IDLType_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_IDLType_Remote_Proxy_Broker *the_TAO_CORBA_IDLType_Remote_Proxy_Broker (void);
 };
 
 
@@ -3223,6 +4903,15 @@ public:
 #endif /* end #if !defined */
 
 
+#if !defined (_CORBA_TYPEDEFDEF___PTR_CH_)
+#define _CORBA_TYPEDEFDEF___PTR_CH_
+
+class CORBA_TypedefDef;
+typedef CORBA_TypedefDef *CORBA_TypedefDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_TYPEDEFDEF___VAR_CH_)
 #define _CORBA_TYPEDEFDEF___VAR_CH_
 
@@ -3246,6 +4935,14 @@ public:
   CORBA_TypedefDef_ptr &out (void);
   CORBA_TypedefDef_ptr _retn (void);
   CORBA_TypedefDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_TypedefDef_ptr duplicate (CORBA_TypedefDef_ptr);
+  static void release (CORBA_TypedefDef_ptr);
+  static CORBA_TypedefDef_ptr nil (void);
+  static CORBA_TypedefDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_TypedefDef_ptr ptr_;
@@ -3273,7 +4970,7 @@ public:
   operator CORBA_TypedefDef_ptr &();
   CORBA_TypedefDef_ptr &ptr (void);
   CORBA_TypedefDef_ptr operator-> (void);
-  
+
 private:
   CORBA_TypedefDef_ptr &ptr_;
 };
@@ -3286,10 +4983,10 @@ private:
 #define _CORBA_TYPEDEFDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_TypedefDef_Proxy_Impl;
-class _TAO_TypedefDef_Remote_Proxy_Impl;
-class _TAO_TypedefDef_Proxy_Broker;
-class _TAO_TypedefDef_Remote_Proxy_Broker;
+class _TAO_CORBA_TypedefDef_Proxy_Impl;
+class _TAO_CORBA_TypedefDef_Remote_Proxy_Impl;
+class _TAO_CORBA_TypedefDef_Proxy_Broker;
+class _TAO_CORBA_TypedefDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_TypedefDef: public virtual CORBA_Contained, public virtual CORBA_IDLType
 {
@@ -3328,30 +5025,30 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_TypedefDef_Proxy_Broker *the_TAO_TypedefDef_Proxy_Broker_;
+  _TAO_CORBA_TypedefDef_Proxy_Broker *the_TAO_CORBA_TypedefDef_Proxy_Broker_;
   
 protected:
   CORBA_TypedefDef (int collocated = 0);
   
-protected:
-  // This methods travese the inheritance tree and set the
-  // parents piece of the given class in the right mode
-  virtual void CORBA_TypedefDef_setup_collocation (int collocated);
-  
-  CORBA_TypedefDef (
-    TAO_Stub *objref, 
-    CORBA::Boolean _tao_collocated = 0,
-    TAO_Abstract_ServantBase *servant = 0
-    );
+  protected:
+    // This methods travese the inheritance tree and set the
+    // parents piece of the given class in the right mode
+    virtual void CORBA_TypedefDef_setup_collocation (int collocated);
+    
+    CORBA_TypedefDef (
+      TAO_Stub *objref, 
+      CORBA::Boolean _tao_collocated = 0,
+      TAO_Abstract_ServantBase *servant = 0
+      );
+    
+    friend class _TAO_CORBA_TypedefDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_TypedefDef_Direct_Proxy_Impl;
   
-  friend class _TAO_TypedefDef_Remote_Proxy_Impl;
-  friend class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
-  friend class _TAO_TypedefDef_Direct_Proxy_Impl;
-
   virtual ~CORBA_TypedefDef (void);
 private:
   CORBA_TypedefDef (const CORBA_TypedefDef &);
-  void operator= (const CORBA_TypedefDef &);  
+  void operator= (const CORBA_TypedefDef &);
 };
 
 
@@ -3364,15 +5061,15 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Impl : 
-  public virtual _TAO_Contained_Proxy_Impl, 
-  public virtual _TAO_IDLType_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_TypedefDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_Contained_Proxy_Impl, 
+  public virtual _TAO_CORBA_IDLType_Proxy_Impl
 {
 public:
-  virtual ~_TAO_TypedefDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_TypedefDef_Proxy_Impl (void) { }
   
   protected:
-  _TAO_TypedefDef_Proxy_Impl (void);
+  _TAO_CORBA_TypedefDef_Proxy_Impl (void);
 
 };
 //
@@ -3384,17 +5081,17 @@ public:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_TypedefDef_Remote_Proxy_Impl : 
-  public virtual _TAO_TypedefDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_TypedefDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_TypedefDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_Contained_Remote_Proxy_Impl, 
-  public virtual _TAO_IDLType_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl, 
+  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_TypedefDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_TypedefDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_TypedefDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_TypedefDef_Remote_Proxy_Impl (void) { }
   
   };
 
@@ -3414,17 +5111,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_TypedefDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_TypedefDef_Proxy_Broker (void);
-  virtual _TAO_TypedefDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_TypedefDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy (
     CORBA_TypedefDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_TypedefDef_Proxy_Broker (void);
+  _TAO_CORBA_TypedefDef_Proxy_Broker (void);
   
 };
 
@@ -3437,26 +5134,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_TypedefDef_Remote_Proxy_Broker : public virtual _TAO_TypedefDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_TypedefDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_TypedefDef_Proxy_Broker
 {
 public: 
-  _TAO_TypedefDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_TypedefDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_TypedefDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_TypedefDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_TypedefDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy (
     CORBA_TypedefDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_TypedefDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_TypedefDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_TypedefDef_Remote_Proxy_Broker *the_TAO_TypedefDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_TypedefDef_Remote_Proxy_Broker *the_TAO_CORBA_TypedefDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -3535,165 +5232,726 @@ private:
 
 // Proxy Broker Factory function pointer declarations.
 
-extern TAO_IFR_Client_Export _TAO_IRObject_Proxy_Broker * (*CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_IRObject_Proxy_Broker *
+(*_TAO_CORBA_IRObject_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_Contained_Proxy_Broker * (*CORBA__TAO_Contained_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_Contained_Proxy_Broker *
+(*_TAO_CORBA_Contained_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_Container_Proxy_Broker * (*CORBA__TAO_Container_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_Container_Proxy_Broker *
+(*_TAO_CORBA_Container_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_IDLType_Proxy_Broker * (*CORBA__TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_IDLType_Proxy_Broker *
+(*_TAO_CORBA_IDLType_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Broker * (*CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_TypedefDef_Proxy_Broker *
+(*_TAO_CORBA_TypedefDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
+// External declarations for undefined interface
+// CORBA_Repository
+extern TAO_IFR_Client_Export
+CORBA_Repository_ptr
+tao_CORBA_Repository_duplicate (
+    CORBA_Repository_ptr
+  );
+extern TAO_IFR_Client_Export
+void
+tao_CORBA_Repository_release (
+    CORBA_Repository_ptr
+  );
+extern TAO_IFR_Client_Export
+CORBA_Repository_ptr
+tao_CORBA_Repository_nil (
+    void
+  );
+extern TAO_IFR_Client_Export
+CORBA_Repository_ptr
+tao_CORBA_Repository_narrow (
+    CORBA::Object *,
+    CORBA::Environment &
+  );
+extern TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_Repository_upcast (
+    void *
+  );
+
+// External declarations for undefined interface
+// CORBA_ModuleDef
+extern TAO_IFR_Client_Export
+CORBA_ModuleDef_ptr
+tao_CORBA_ModuleDef_duplicate (
+    CORBA_ModuleDef_ptr
+  );
+extern TAO_IFR_Client_Export
+void
+tao_CORBA_ModuleDef_release (
+    CORBA_ModuleDef_ptr
+  );
+extern TAO_IFR_Client_Export
+CORBA_ModuleDef_ptr
+tao_CORBA_ModuleDef_nil (
+    void
+  );
+extern TAO_IFR_Client_Export
+CORBA_ModuleDef_ptr
+tao_CORBA_ModuleDef_narrow (
+    CORBA::Object *,
+    CORBA::Environment &
+  );
+extern TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_ModuleDef_upcast (
+    void *
+  );
+
+// External declarations for undefined interface
+// CORBA_ConstantDef
+extern TAO_IFR_Client_Export
+CORBA_ConstantDef_ptr
+tao_CORBA_ConstantDef_duplicate (
+    CORBA_ConstantDef_ptr
+  );
+extern TAO_IFR_Client_Export
+void
+tao_CORBA_ConstantDef_release (
+    CORBA_ConstantDef_ptr
+  );
+extern TAO_IFR_Client_Export
+CORBA_ConstantDef_ptr
+tao_CORBA_ConstantDef_nil (
+    void
+  );
+extern TAO_IFR_Client_Export
+CORBA_ConstantDef_ptr
+tao_CORBA_ConstantDef_narrow (
+    CORBA::Object *,
+    CORBA::Environment &
+  );
+extern TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_ConstantDef_upcast (
+    void *
+  );
+
+// External declarations for undefined interface
+// CORBA_StructDef
+extern TAO_IFR_Client_Export
+CORBA_StructDef_ptr
+tao_CORBA_StructDef_duplicate (
+    CORBA_StructDef_ptr
+  );
+extern TAO_IFR_Client_Export
+void
+tao_CORBA_StructDef_release (
+    CORBA_StructDef_ptr
+  );
+extern TAO_IFR_Client_Export
+CORBA_StructDef_ptr
+tao_CORBA_StructDef_nil (
+    void
+  );
+extern TAO_IFR_Client_Export
+CORBA_StructDef_ptr
+tao_CORBA_StructDef_narrow (
+    CORBA::Object *,
+    CORBA::Environment &
+  );
+extern TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_StructDef_upcast (
+    void *
+  );
+
+// External declarations for undefined interface
+// CORBA_UnionDef
+extern TAO_IFR_Client_Export
+CORBA_UnionDef_ptr
+tao_CORBA_UnionDef_duplicate (
+    CORBA_UnionDef_ptr
+  );
+extern TAO_IFR_Client_Export
+void
+tao_CORBA_UnionDef_release (
+    CORBA_UnionDef_ptr
+  );
+extern TAO_IFR_Client_Export
+CORBA_UnionDef_ptr
+tao_CORBA_UnionDef_nil (
+    void
+  );
+extern TAO_IFR_Client_Export
+CORBA_UnionDef_ptr
+tao_CORBA_UnionDef_narrow (
+    CORBA::Object *,
+    CORBA::Environment &
+  );
+extern TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_UnionDef_upcast (
+    void *
+  );
+
+// External declarations for undefined interface
+// CORBA_EnumDef
+extern TAO_IFR_Client_Export
+CORBA_EnumDef_ptr
+tao_CORBA_EnumDef_duplicate (
+    CORBA_EnumDef_ptr
+  );
+extern TAO_IFR_Client_Export
+void
+tao_CORBA_EnumDef_release (
+    CORBA_EnumDef_ptr
+  );
+extern TAO_IFR_Client_Export
+CORBA_EnumDef_ptr
+tao_CORBA_EnumDef_nil (
+    void
+  );
+extern TAO_IFR_Client_Export
+CORBA_EnumDef_ptr
+tao_CORBA_EnumDef_narrow (
+    CORBA::Object *,
+    CORBA::Environment &
+  );
+extern TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_EnumDef_upcast (
+    void *
+  );
+
+// External declarations for undefined interface
+// CORBA_AliasDef
+extern TAO_IFR_Client_Export
+CORBA_AliasDef_ptr
+tao_CORBA_AliasDef_duplicate (
+    CORBA_AliasDef_ptr
+  );
+extern TAO_IFR_Client_Export
+void
+tao_CORBA_AliasDef_release (
+    CORBA_AliasDef_ptr
+  );
+extern TAO_IFR_Client_Export
+CORBA_AliasDef_ptr
+tao_CORBA_AliasDef_nil (
+    void
+  );
+extern TAO_IFR_Client_Export
+CORBA_AliasDef_ptr
+tao_CORBA_AliasDef_narrow (
+    CORBA::Object *,
+    CORBA::Environment &
+  );
+extern TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_AliasDef_upcast (
+    void *
+  );
+
+// External declarations for undefined interface
+// CORBA_InterfaceDef
+extern TAO_IFR_Client_Export
+CORBA_InterfaceDef_ptr
+tao_CORBA_InterfaceDef_duplicate (
+    CORBA_InterfaceDef_ptr
+  );
+extern TAO_IFR_Client_Export
+void
+tao_CORBA_InterfaceDef_release (
+    CORBA_InterfaceDef_ptr
+  );
+extern TAO_IFR_Client_Export
+CORBA_InterfaceDef_ptr
+tao_CORBA_InterfaceDef_nil (
+    void
+  );
+extern TAO_IFR_Client_Export
+CORBA_InterfaceDef_ptr
+tao_CORBA_InterfaceDef_narrow (
+    CORBA::Object *,
+    CORBA::Environment &
+  );
+extern TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_InterfaceDef_upcast (
+    void *
+  );
+
+// External declarations for undefined interface
+// CORBA_ExceptionDef
+extern TAO_IFR_Client_Export
+CORBA_ExceptionDef_ptr
+tao_CORBA_ExceptionDef_duplicate (
+    CORBA_ExceptionDef_ptr
+  );
+extern TAO_IFR_Client_Export
+void
+tao_CORBA_ExceptionDef_release (
+    CORBA_ExceptionDef_ptr
+  );
+extern TAO_IFR_Client_Export
+CORBA_ExceptionDef_ptr
+tao_CORBA_ExceptionDef_nil (
+    void
+  );
+extern TAO_IFR_Client_Export
+CORBA_ExceptionDef_ptr
+tao_CORBA_ExceptionDef_narrow (
+    CORBA::Object *,
+    CORBA::Environment &
+  );
+extern TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_ExceptionDef_upcast (
+    void *
+  );
+
+// External declarations for undefined interface
+// CORBA_NativeDef
+extern TAO_IFR_Client_Export
+CORBA_NativeDef_ptr
+tao_CORBA_NativeDef_duplicate (
+    CORBA_NativeDef_ptr
+  );
+extern TAO_IFR_Client_Export
+void
+tao_CORBA_NativeDef_release (
+    CORBA_NativeDef_ptr
+  );
+extern TAO_IFR_Client_Export
+CORBA_NativeDef_ptr
+tao_CORBA_NativeDef_nil (
+    void
+  );
+extern TAO_IFR_Client_Export
+CORBA_NativeDef_ptr
+tao_CORBA_NativeDef_narrow (
+    CORBA::Object *,
+    CORBA::Environment &
+  );
+extern TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_NativeDef_upcast (
+    void *
+  );
+
+// External declarations for undefined interface
+// CORBA_ValueDef
+extern TAO_IFR_Client_Export
+CORBA_ValueDef_ptr
+tao_CORBA_ValueDef_duplicate (
+    CORBA_ValueDef_ptr
+  );
+extern TAO_IFR_Client_Export
+void
+tao_CORBA_ValueDef_release (
+    CORBA_ValueDef_ptr
+  );
+extern TAO_IFR_Client_Export
+CORBA_ValueDef_ptr
+tao_CORBA_ValueDef_nil (
+    void
+  );
+extern TAO_IFR_Client_Export
+CORBA_ValueDef_ptr
+tao_CORBA_ValueDef_narrow (
+    CORBA::Object *,
+    CORBA::Environment &
+  );
+extern TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_ValueDef_upcast (
+    void *
+  );
+
+// External declarations for undefined interface
+// CORBA_ValueBoxDef
+extern TAO_IFR_Client_Export
+CORBA_ValueBoxDef_ptr
+tao_CORBA_ValueBoxDef_duplicate (
+    CORBA_ValueBoxDef_ptr
+  );
+extern TAO_IFR_Client_Export
+void
+tao_CORBA_ValueBoxDef_release (
+    CORBA_ValueBoxDef_ptr
+  );
+extern TAO_IFR_Client_Export
+CORBA_ValueBoxDef_ptr
+tao_CORBA_ValueBoxDef_nil (
+    void
+  );
+extern TAO_IFR_Client_Export
+CORBA_ValueBoxDef_ptr
+tao_CORBA_ValueBoxDef_narrow (
+    CORBA::Object *,
+    CORBA::Environment &
+  );
+extern TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_ValueBoxDef_upcast (
+    void *
+  );
+
+// External declarations for undefined interface
+// CORBA_AbstractInterfaceDef
+extern TAO_IFR_Client_Export
+CORBA_AbstractInterfaceDef_ptr
+tao_CORBA_AbstractInterfaceDef_duplicate (
+    CORBA_AbstractInterfaceDef_ptr
+  );
+extern TAO_IFR_Client_Export
+void
+tao_CORBA_AbstractInterfaceDef_release (
+    CORBA_AbstractInterfaceDef_ptr
+  );
+extern TAO_IFR_Client_Export
+CORBA_AbstractInterfaceDef_ptr
+tao_CORBA_AbstractInterfaceDef_nil (
+    void
+  );
+extern TAO_IFR_Client_Export
+CORBA_AbstractInterfaceDef_ptr
+tao_CORBA_AbstractInterfaceDef_narrow (
+    CORBA::Object *,
+    CORBA::Environment &
+  );
+extern TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_AbstractInterfaceDef_upcast (
+    void *
+  );
+
+// External declarations for undefined interface
+// CORBA_LocalInterfaceDef
+extern TAO_IFR_Client_Export
+CORBA_LocalInterfaceDef_ptr
+tao_CORBA_LocalInterfaceDef_duplicate (
+    CORBA_LocalInterfaceDef_ptr
+  );
+extern TAO_IFR_Client_Export
+void
+tao_CORBA_LocalInterfaceDef_release (
+    CORBA_LocalInterfaceDef_ptr
+  );
+extern TAO_IFR_Client_Export
+CORBA_LocalInterfaceDef_ptr
+tao_CORBA_LocalInterfaceDef_nil (
+    void
+  );
+extern TAO_IFR_Client_Export
+CORBA_LocalInterfaceDef_ptr
+tao_CORBA_LocalInterfaceDef_narrow (
+    CORBA::Object *,
+    CORBA::Environment &
+  );
+extern TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_LocalInterfaceDef_upcast (
+    void *
+  );
+
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::DefinitionKind);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DefinitionKind &);
-// Any operators for interface CORBA::IRObject
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IRObject_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::IRObject *&);
-// Any operators for interface CORBA::Contained
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Contained_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Contained *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::Contained::Description &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Contained::Description*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Contained::Description *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Contained::Description *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ContainedSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ContainedSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ContainedSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ContainedSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::StructMember &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructMember*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StructMember *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StructMember *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::StructMemberSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructMemberSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StructMemberSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StructMemberSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::Initializer &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Initializer*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Initializer *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Initializer *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InitializerSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InitializerSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InitializerSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InitializerSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::UnionMember &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionMember*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UnionMember *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::UnionMember *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::UnionMemberSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionMemberSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UnionMemberSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::UnionMemberSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::EnumMemberSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumMemberSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::EnumMemberSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::EnumMemberSeq *&);
-// Any operators for interface CORBA::Container
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Container_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Container *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::Container::Description &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Container::Description*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Container::Description *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Container::Description *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::Container::DescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Container::DescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Container::DescriptionSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Container::DescriptionSeq *&);
-// Any operators for interface CORBA::IDLType
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IDLType_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::IDLType *&);
-// Any operators for interface CORBA::TypedefDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::TypedefDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::TypedefDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::TypeDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::TypeDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::TypeDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::TypeDescription *&);
+// Any operators for interface CORBA_IRObject
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_IRObject_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_IRObject *&);
+// Any operators for interface CORBA_Repository
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Repository_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Repository *&);
+// Any operators for interface CORBA_Contained
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Contained_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Contained *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_Contained::Description &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Contained::Description*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Contained::Description *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_Contained::Description *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ContainedSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ContainedSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ContainedSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ContainedSeq *&);
+// Any operators for interface CORBA_ModuleDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ModuleDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ModuleDef *&);
+// Any operators for interface CORBA_ConstantDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ConstantDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ConstantDef *&);
+// Any operators for interface CORBA_StructDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_StructDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StructDef *&);
+// Any operators for interface CORBA_UnionDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_UnionDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_UnionDef *&);
+// Any operators for interface CORBA_EnumDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_EnumDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_EnumDef *&);
+// Any operators for interface CORBA_AliasDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AliasDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AliasDef *&);
+// Any operators for interface CORBA_InterfaceDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDef *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_InterfaceDefSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDefSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDefSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_InterfaceDefSeq *&);
+// Any operators for interface CORBA_ExceptionDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ExceptionDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ExceptionDef *&);
+// Any operators for interface CORBA_NativeDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_NativeDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_NativeDef *&);
+// Any operators for interface CORBA_ValueDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueDef *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ValueDefSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueDefSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueDefSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ValueDefSeq *&);
+// Any operators for interface CORBA_ValueBoxDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueBoxDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueBoxDef *&);
+// Any operators for interface CORBA_AbstractInterfaceDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AbstractInterfaceDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AbstractInterfaceDef *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_AbstractInterfaceDefSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AbstractInterfaceDefSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AbstractInterfaceDefSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_AbstractInterfaceDefSeq *&);
+// Any operators for interface CORBA_LocalInterfaceDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_LocalInterfaceDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_LocalInterfaceDef *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_LocalInterfaceDefSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_LocalInterfaceDefSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_LocalInterfaceDefSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_LocalInterfaceDefSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_StructMember &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_StructMember*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StructMember *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_StructMember *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_StructMemberSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_StructMemberSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StructMemberSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_StructMemberSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_Initializer &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Initializer*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Initializer *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_Initializer *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_InitializerSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InitializerSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InitializerSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_InitializerSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_UnionMember &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_UnionMember*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_UnionMember *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_UnionMember *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_UnionMemberSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_UnionMemberSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_UnionMemberSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_UnionMemberSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_EnumMemberSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_EnumMemberSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_EnumMemberSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_EnumMemberSeq *&);
+// Any operators for interface CORBA_Container
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Container_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Container *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_Container::Description &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Container::Description*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Container::Description *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_Container::Description *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_Container::DescriptionSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Container::DescriptionSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Container::DescriptionSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_Container::DescriptionSeq *&);
+// Any operators for interface CORBA_IDLType
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_IDLType_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_IDLType *&);
+// Any operators for interface CORBA_TypedefDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_TypedefDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_TypedefDef *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_TypeDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_TypeDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_TypeDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_TypeDescription *&);
 
 #ifndef __ACE_INLINE__
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::DefinitionKind &); // 
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::DefinitionKind &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::IRObject_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::IRObject_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Contained_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Contained_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Contained::Description &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Contained::Description &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_IRObject_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_IRObject_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Repository_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Repository_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Contained_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Contained_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Contained::Description &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Contained::Description &);
 
 #if !defined _TAO_CDR_OP_CORBA_ContainedSeq_H_
 #define _TAO_CDR_OP_CORBA_ContainedSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::ContainedSeq &
+    const CORBA_ContainedSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::ContainedSeq &
+    CORBA_ContainedSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_ContainedSeq_H_ */
 
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ModuleDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ModuleDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ConstantDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ConstantDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_StructDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_StructDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_UnionDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_UnionDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_EnumDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_EnumDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AliasDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AliasDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_InterfaceDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_InterfaceDef_ptr &);
+
+#if !defined _TAO_CDR_OP_CORBA_InterfaceDefSeq_H_
+#define _TAO_CDR_OP_CORBA_InterfaceDefSeq_H_
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_InterfaceDefSeq &
+  );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_InterfaceDefSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_InterfaceDefSeq_H_ */
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ExceptionDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ExceptionDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_NativeDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_NativeDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueDef_ptr &);
+
+#if !defined _TAO_CDR_OP_CORBA_ValueDefSeq_H_
+#define _TAO_CDR_OP_CORBA_ValueDefSeq_H_
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_ValueDefSeq &
+  );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_ValueDefSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ValueDefSeq_H_ */
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueBoxDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueBoxDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AbstractInterfaceDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AbstractInterfaceDef_ptr &);
+
+#if !defined _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_H_
+#define _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_H_
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_AbstractInterfaceDefSeq &
+  );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_AbstractInterfaceDefSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_H_ */
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_LocalInterfaceDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_LocalInterfaceDef_ptr &);
+
+#if !defined _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_H_
+#define _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_H_
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_LocalInterfaceDefSeq &
+  );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_LocalInterfaceDefSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::StructMember &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::StructMember &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_StructMember &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_StructMember &);
 
 #if !defined _TAO_CDR_OP_CORBA_StructMemberSeq_H_
 #define _TAO_CDR_OP_CORBA_StructMemberSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::StructMemberSeq &
+    const CORBA_StructMemberSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::StructMemberSeq &
+    CORBA_StructMemberSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_StructMemberSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Initializer &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Initializer &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Initializer &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Initializer &);
 
 #if !defined _TAO_CDR_OP_CORBA_InitializerSeq_H_
 #define _TAO_CDR_OP_CORBA_InitializerSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::InitializerSeq &
+    const CORBA_InitializerSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::InitializerSeq &
+    CORBA_InitializerSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_InitializerSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::UnionMember &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::UnionMember &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_UnionMember &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_UnionMember &);
 
 #if !defined _TAO_CDR_OP_CORBA_UnionMemberSeq_H_
 #define _TAO_CDR_OP_CORBA_UnionMemberSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::UnionMemberSeq &
+    const CORBA_UnionMemberSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::UnionMemberSeq &
+    CORBA_UnionMemberSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_UnionMemberSeq_H_ */
@@ -3704,40 +5962,40 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::EnumMemberSeq &
+    const CORBA_EnumMemberSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::EnumMemberSeq &
+    CORBA_EnumMemberSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_EnumMemberSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Container_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Container_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Container::Description &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Container::Description &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Container_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Container_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Container::Description &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Container::Description &);
 
 #if !defined _TAO_CDR_OP_CORBA_Container_DescriptionSeq_H_
 #define _TAO_CDR_OP_CORBA_Container_DescriptionSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::Container::DescriptionSeq &
+    const CORBA_Container::DescriptionSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::Container::DescriptionSeq &
+    CORBA_Container::DescriptionSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_Container_DescriptionSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::IDLType_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::IDLType_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::TypedefDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypedefDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::TypeDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_IDLType_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_IDLType_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_TypedefDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_TypedefDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_TypeDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_TypeDescription &);
 
 #endif /* __ACE_INLINE__ */
 
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.i b/TAO/tao/IFR_Client/IFR_BaseC.i
index f2bf85a268b..85b1fed5f0c 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.i
+++ b/TAO/tao/IFR_Client/IFR_BaseC.i
@@ -23,6 +23,49 @@
 #if !defined (_CORBA_IROBJECT___CI_)
 #define _CORBA_IROBJECT___CI_
 
+ACE_INLINE CORBA_IRObject_ptr
+tao_CORBA_IRObject_duplicate (
+    CORBA_IRObject_ptr p
+  )
+{
+  return CORBA_IRObject::_duplicate (p);
+}
+
+ACE_INLINE void
+tao_CORBA_IRObject_release (
+    CORBA_IRObject_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_INLINE CORBA_IRObject_ptr
+tao_CORBA_IRObject_nil (
+    void
+  )
+{
+  return CORBA_IRObject::_nil ();
+}
+
+ACE_INLINE CORBA_IRObject_ptr
+tao_CORBA_IRObject_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_IRObject::_narrow (p, ACE_TRY_ENV);
+}
+
+ACE_INLINE CORBA::Object *
+tao_CORBA_IRObject_upcast (
+    void *src
+  )
+{
+  CORBA_IRObject **tmp =
+    ACE_static_cast (CORBA_IRObject **, src);
+  return *tmp;
+}
+
 ACE_INLINE
 CORBA_IRObject::CORBA_IRObject (
     TAO_Stub *objref,
@@ -34,182 +77,249 @@ CORBA_IRObject::CORBA_IRObject (
   this->CORBA_IRObject_setup_collocation (_tao_collocated);
 }
 
-#endif /* end #if !defined */
-
 
-#if !defined (_CORBA_IROBJECT___VAR_CI_)
-#define _CORBA_IROBJECT___VAR_CI_
+#endif /* end #if !defined */
 
 // *************************************************************
-// Inline operations for class CORBA_IRObject_var
+// Inline operations for class CORBA_Contained::Description_var
 // *************************************************************
 
 ACE_INLINE
-CORBA_IRObject_var::CORBA_IRObject_var (void) // default constructor
-  : ptr_ (CORBA_IRObject::_nil ())
+CORBA_Contained::Description_var::Description_var (void) // default constructor
+  : ptr_ (0)
 {}
 
-ACE_INLINE ::CORBA_IRObject_ptr
-CORBA_IRObject_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
 ACE_INLINE
-CORBA_IRObject_var::CORBA_IRObject_var (const ::CORBA_IRObject_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_IRObject::_duplicate (p.ptr ()))
+CORBA_Contained::Description_var::Description_var (Description *p)
+  : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA_IRObject_var::~CORBA_IRObject_var (void) // destructor
+CORBA_Contained::Description_var::Description_var (const ::CORBA_Contained::Description_var &p) // copy constructor
 {
-  CORBA::release (this->ptr_);
+  if (p.ptr_)
+    ACE_NEW (this->ptr_, ::CORBA_Contained::Description (*p.ptr_));
+  else
+    this->ptr_ = 0;
 }
 
-ACE_INLINE CORBA_IRObject_var &
-CORBA_IRObject_var::operator= (CORBA_IRObject_ptr p)
+ACE_INLINE
+CORBA_Contained::Description_var::~Description_var (void) // destructor
 {
-  CORBA::release (this->ptr_);
+  delete this->ptr_;
+}
+
+ACE_INLINE CORBA_Contained::Description_var &
+CORBA_Contained::Description_var::operator= (Description *p)
+{
+  delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE CORBA_IRObject_var &
-CORBA_IRObject_var::operator= (const ::CORBA_IRObject_var &p)
+ACE_INLINE ::CORBA_Contained::Description_var &
+CORBA_Contained::Description_var::operator= (const ::CORBA_Contained::Description_var &p)
 {
   if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_IRObject::_duplicate (p.ptr ());
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          Description *deep_copy =
+            new Description (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              Description *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
-ACE_INLINE 
-CORBA_IRObject_var::operator const ::CORBA_IRObject_ptr &() const // cast
+ACE_INLINE const ::CORBA_Contained::Description *
+CORBA_Contained::Description_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_IRObject_var::operator ::CORBA_IRObject_ptr &() // cast 
+ACE_INLINE ::CORBA_Contained::Description *
+CORBA_Contained::Description_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_IRObject_ptr
-CORBA_IRObject_var::operator-> (void) const
+ACE_INLINE
+CORBA_Contained::Description_var::operator const ::CORBA_Contained::Description &() const // cast
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA_IRObject_ptr
-CORBA_IRObject_var::in (void) const
+ACE_INLINE
+CORBA_Contained::Description_var::operator ::CORBA_Contained::Description &() // cast 
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA_IRObject_ptr &
-CORBA_IRObject_var::inout (void)
+ACE_INLINE
+CORBA_Contained::Description_var::operator ::CORBA_Contained::Description &() const // cast 
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA_IRObject_ptr &
-CORBA_IRObject_var::out (void)
+// variable-size types only
+ACE_INLINE
+CORBA_Contained::Description_var::operator ::CORBA_Contained::Description *&() // cast 
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_IRObject::_nil ();
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_IRObject_ptr
-CORBA_IRObject_var::_retn (void)
+ACE_INLINE const ::CORBA_Contained::Description &
+CORBA_Contained::Description_var::in (void) const
 {
-  // yield ownership of managed obj reference
-  ::CORBA_IRObject_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_IRObject::_nil ();
-  return val;
+  return *this->ptr_;
 }
 
+ACE_INLINE ::CORBA_Contained::Description &
+CORBA_Contained::Description_var::inout (void)
+{
+  return *this->ptr_;
+}
 
-#endif /* end #if !defined */
+// mapping for variable size 
+ACE_INLINE ::CORBA_Contained::Description *&
+CORBA_Contained::Description_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
 
+ACE_INLINE ::CORBA_Contained::Description *
+CORBA_Contained::Description_var::_retn (void)
+{
+  ::CORBA_Contained::Description *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
 
-#if !defined (_CORBA_IROBJECT___OUT_CI_)
-#define _CORBA_IROBJECT___OUT_CI_
+ACE_INLINE ::CORBA_Contained::Description *
+CORBA_Contained::Description_var::ptr (void) const
+{
+  return this->ptr_;
+}
 
 // *************************************************************
-// Inline operations for class CORBA_IRObject_out
+// Inline operations for class CORBA_Contained::Description_out
 // *************************************************************
 
 ACE_INLINE
-CORBA_IRObject_out::CORBA_IRObject_out (CORBA_IRObject_ptr &p)
+CORBA_Contained::Description_out::Description_out (::CORBA_Contained::Description *&p)
   : ptr_ (p)
 {
-  this->ptr_ = ::CORBA_IRObject::_nil ();
+  this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_IRObject_out::CORBA_IRObject_out (CORBA_IRObject_var &p) // constructor from _var
+CORBA_Contained::Description_out::Description_out (Description_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_IRObject::_nil ();
+  delete this->ptr_;
+  this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_IRObject_out::CORBA_IRObject_out (const ::CORBA_IRObject_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_IRObject_out &, p).ptr_)
+CORBA_Contained::Description_out::Description_out (const ::CORBA_Contained::Description_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (Description_out&, p).ptr_)
 {}
 
-ACE_INLINE ::CORBA_IRObject_out &
-CORBA_IRObject_out::operator= (const ::CORBA_IRObject_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_IRObject_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_IRObject_out &
-CORBA_IRObject_out::operator= (const ::CORBA_IRObject_var &p)
+ACE_INLINE CORBA_Contained::Description_out &
+CORBA_Contained::Description_out::operator= (const ::CORBA_Contained::Description_out &p)
 {
-  this->ptr_ = ::CORBA_IRObject::_duplicate (p.ptr ());
+  this->ptr_ = ACE_const_cast (Description_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE CORBA_IRObject_out &
-CORBA_IRObject_out::operator= (CORBA_IRObject_ptr p)
+ACE_INLINE CORBA_Contained::Description_out &
+CORBA_Contained::Description_out::operator= (Description *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE 
-CORBA_IRObject_out::operator ::CORBA_IRObject_ptr &() // cast
+CORBA_Contained::Description_out::operator ::CORBA_Contained::Description *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_IRObject_ptr &
-CORBA_IRObject_out::ptr (void) // ptr
+ACE_INLINE ::CORBA_Contained::Description *&
+CORBA_Contained::Description_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA_IRObject_ptr
-CORBA_IRObject_out::operator-> (void)
+ACE_INLINE ::CORBA_Contained::Description *
+CORBA_Contained::Description_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 
-#endif /* end #if !defined */
-
-
 #if !defined (_CORBA_CONTAINED___CI_)
 #define _CORBA_CONTAINED___CI_
 
+ACE_INLINE CORBA_Contained_ptr
+tao_CORBA_Contained_duplicate (
+    CORBA_Contained_ptr p
+  )
+{
+  return CORBA_Contained::_duplicate (p);
+}
+
+ACE_INLINE void
+tao_CORBA_Contained_release (
+    CORBA_Contained_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_INLINE CORBA_Contained_ptr
+tao_CORBA_Contained_nil (
+    void
+  )
+{
+  return CORBA_Contained::_nil ();
+}
+
+ACE_INLINE CORBA_Contained_ptr
+tao_CORBA_Contained_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_Contained::_narrow (p, ACE_TRY_ENV);
+}
+
+ACE_INLINE CORBA::Object *
+tao_CORBA_Contained_upcast (
+    void *src
+  )
+{
+  CORBA_Contained **tmp =
+    ACE_static_cast (CORBA_Contained **, src);
+  return *tmp;
+}
+
 ACE_INLINE
 CORBA_Contained::CORBA_Contained (
     TAO_Stub *objref,
@@ -225,402 +335,958 @@ CORBA_Contained::CORBA_Contained (
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_CONTAINED___VAR_CI_)
-#define _CORBA_CONTAINED___VAR_CI_
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CI_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CI_
+
+  ACE_INLINE CORBA_Contained **
+  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (CORBA::ULong nelems)
+  {
+    CORBA_Contained **buf = 0;
+    
+    ACE_NEW_RETURN (buf, CORBA_Contained*[nelems], 0);
+    
+    for (CORBA::ULong i = 0; i < nelems; i++)
+      {
+        buf[i] = CORBA_Contained::_nil ();
+      }
+    
+    return buf;
+  }
+  
+  ACE_INLINE void 
+  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (CORBA_Contained **buffer)
+  {
+    if (buffer == 0)
+      return;
+    delete[] buffer;
+  }
+  
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void)
+  {
+  }
+  
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum)
+    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (maximum))
+  {
+  }
+  
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA_Contained* *value,
+    CORBA::Boolean release)
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  {
+  }
+  
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs)
+    : TAO_Unbounded_Base_Sequence (rhs)
+  {
+    if (rhs.buffer_ != 0)
+    {
+      CORBA_Contained **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (this->maximum_);
+      CORBA_Contained ** const tmp2 = ACE_reinterpret_cast (CORBA_Contained ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = CORBA_Contained::_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
+    else
+    {
+      this->buffer_ = 0;
+    }
+  }
+  
+  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &
+  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs)
+  {
+    if (this == &rhs)
+      return *this;
+    
+    if (this->release_)
+    {
+      CORBA_Contained **tmp = ACE_reinterpret_cast (CORBA_Contained **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = CORBA_Contained::_nil ();
+      }
+      if (this->maximum_ < rhs.maximum_)
+      {
+        _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
+        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (rhs.maximum_);
+      }
+    }
+    else
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (rhs.maximum_);
+    
+    TAO_Unbounded_Base_Sequence::operator= (rhs);
+    
+    CORBA_Contained **tmp1 = ACE_reinterpret_cast (CORBA_Contained **, this->buffer_);
+    CORBA_Contained ** const tmp2 = ACE_reinterpret_cast (CORBA_Contained ** ACE_CAST_CONST, rhs.buffer_);
+    
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+      {
+        tmp1[i] = CORBA_Contained::_duplicate (tmp2[i]);
+      }
+    
+    return *this;
+  }
+  
+  ACE_INLINE TAO_Object_Manager<CORBA_Contained,CORBA_Contained_var>
+  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::operator[] (CORBA::ULong index) const
+  // read-write accessor
+  {
+    ACE_ASSERT (index < this->maximum_);
+    CORBA_Contained ** const tmp = ACE_reinterpret_cast (CORBA_Contained ** ACE_CAST_CONST, this->buffer_);
+    return TAO_Object_Manager<CORBA_Contained,CORBA_Contained_var> (tmp + index, this->release_);
+  }
+  
+  ACE_INLINE CORBA_Contained* *
+  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::get_buffer (CORBA::Boolean orphan)
+  {
+    CORBA_Contained **result = 0;
+    if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+      {
+        result = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (this->maximum_);
+        this->buffer_ = result;
+        this->release_ = 1;
+      }
+      else
+      {
+        result = ACE_reinterpret_cast (CORBA_Contained**, this->buffer_);
+      }
+    }
+    else // if (orphan == 1)
+    {
+      if (this->release_ != 0)
+      {
+        // We set the state back to default and relinquish
+        // ownership.
+        result = ACE_reinterpret_cast(CORBA_Contained**,this->buffer_);
+        this->maximum_ = 0;
+        this->length_ = 0;
+        this->buffer_ = 0;
+        this->release_ = 0;
+      }
+    }
+    return result;
+  }
+  
+  ACE_INLINE const CORBA_Contained* *
+  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::get_buffer (void) const
+  {
+    return ACE_reinterpret_cast(const CORBA_Contained ** ACE_CAST_CONST, this->buffer_);
+  }
+  
+  
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_CONTAINEDSEQ_CI_)
+#define _CORBA_CONTAINEDSEQ_CI_
 
 // *************************************************************
-// Inline operations for class CORBA_Contained_var
+// Inline operations for class CORBA_ContainedSeq_var
 // *************************************************************
 
 ACE_INLINE
-CORBA_Contained_var::CORBA_Contained_var (void) // default constructor
-  : ptr_ (CORBA_Contained::_nil ())
+CORBA_ContainedSeq_var::CORBA_ContainedSeq_var (void) // default constructor
+  : ptr_ (0)
 {}
 
-ACE_INLINE CORBA_Contained_ptr 
-CORBA_Contained_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
 ACE_INLINE
-CORBA_Contained_var::CORBA_Contained_var (const CORBA_Contained_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_Contained::_duplicate (p.ptr ()))
+CORBA_ContainedSeq_var::CORBA_ContainedSeq_var (CORBA_ContainedSeq *p)
+  : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA_Contained_var::~CORBA_Contained_var (void) // destructor
+CORBA_ContainedSeq_var::CORBA_ContainedSeq_var (const ::CORBA_ContainedSeq_var &p) // copy constructor
 {
-  CORBA::release (this->ptr_);
+  if (p.ptr_)
+    ACE_NEW (this->ptr_, ::CORBA_ContainedSeq (*p.ptr_));
+  else
+    this->ptr_ = 0;
 }
 
-ACE_INLINE CORBA_Contained_var &
-CORBA_Contained_var::operator= (CORBA_Contained_ptr p)
+ACE_INLINE
+CORBA_ContainedSeq_var::~CORBA_ContainedSeq_var (void) // destructor
 {
-  CORBA::release (this->ptr_);
+  delete this->ptr_;
+}
+
+ACE_INLINE CORBA_ContainedSeq_var &
+CORBA_ContainedSeq_var::operator= (CORBA_ContainedSeq *p)
+{
+  delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE CORBA_Contained_var &
-CORBA_Contained_var::operator= (const CORBA_Contained_var &p)
+ACE_INLINE ::CORBA_ContainedSeq_var &
+CORBA_ContainedSeq_var::operator= (const ::CORBA_ContainedSeq_var &p)
 {
   if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_Contained::_duplicate (p.ptr ());
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          CORBA_ContainedSeq *deep_copy =
+            new CORBA_ContainedSeq (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              CORBA_ContainedSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
-ACE_INLINE 
-CORBA_Contained_var::operator const CORBA_Contained_ptr &() const // cast
+ACE_INLINE const ::CORBA_ContainedSeq *
+CORBA_ContainedSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_Contained_var::operator CORBA_Contained_ptr &() // cast 
+ACE_INLINE ::CORBA_ContainedSeq *
+CORBA_ContainedSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_Contained_ptr 
-CORBA_Contained_var::operator-> (void) const
+ACE_INLINE 
+CORBA_ContainedSeq_var::operator const ::CORBA_ContainedSeq &() const // cast
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
-ACE_INLINE CORBA_Contained_ptr
-CORBA_Contained_var::in (void) const
+ACE_INLINE 
+CORBA_ContainedSeq_var::operator ::CORBA_ContainedSeq &() // cast 
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
-ACE_INLINE CORBA_Contained_ptr &
-CORBA_Contained_var::inout (void)
+ACE_INLINE 
+CORBA_ContainedSeq_var::operator ::CORBA_ContainedSeq &() const // cast 
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
-ACE_INLINE CORBA_Contained_ptr &
-CORBA_Contained_var::out (void)
+// variable-size types only
+ACE_INLINE
+CORBA_ContainedSeq_var::operator ::CORBA_ContainedSeq *&() // cast 
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Contained::_nil ();
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_Contained_ptr 
-CORBA_Contained_var::_retn (void)
+ACE_INLINE TAO_Object_Manager<CORBA_Contained, CORBA_Contained_var>
+CORBA_ContainedSeq_var::operator[] (CORBA::ULong index)
 {
-  // yield ownership of managed obj reference
-  CORBA_Contained_ptr val = this->ptr_;
-  this->ptr_ = CORBA_Contained::_nil ();
-  return val;
+  return this->ptr_->operator[] (index);
 }
 
+ACE_INLINE const ::CORBA_ContainedSeq &
+CORBA_ContainedSeq_var::in (void) const
+{
+  return *this->ptr_;
+}
 
-#endif /* end #if !defined */
+ACE_INLINE ::CORBA_ContainedSeq &
+CORBA_ContainedSeq_var::inout (void)
+{
+  return *this->ptr_;
+}
 
+// mapping for variable size 
+ACE_INLINE ::CORBA_ContainedSeq *&
+CORBA_ContainedSeq_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
 
-#if !defined (_CORBA_CONTAINED___OUT_CI_)
-#define _CORBA_CONTAINED___OUT_CI_
+ACE_INLINE ::CORBA_ContainedSeq *
+CORBA_ContainedSeq_var::_retn (void)
+{
+  ::CORBA_ContainedSeq *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE ::CORBA_ContainedSeq *
+CORBA_ContainedSeq_var::ptr (void) const
+{
+  return this->ptr_;
+}
 
 // *************************************************************
-// Inline operations for class CORBA_Contained_out
+// Inline operations for class CORBA_ContainedSeq_out
 // *************************************************************
 
 ACE_INLINE
-CORBA_Contained_out::CORBA_Contained_out (CORBA_Contained_ptr &p)
+CORBA_ContainedSeq_out::CORBA_ContainedSeq_out (CORBA_ContainedSeq *&p)
   : ptr_ (p)
 {
-  this->ptr_ = CORBA_Contained::_nil ();
+  this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_Contained_out::CORBA_Contained_out (CORBA_Contained_var &p) // constructor from _var
+CORBA_ContainedSeq_out::CORBA_ContainedSeq_out (CORBA_ContainedSeq_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Contained::_nil ();
+  delete this->ptr_;
+  this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_Contained_out::CORBA_Contained_out (const CORBA_Contained_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_Contained_out&,p).ptr_)
+CORBA_ContainedSeq_out::CORBA_ContainedSeq_out (const ::CORBA_ContainedSeq_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_ContainedSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE CORBA_Contained_out &
-CORBA_Contained_out::operator= (const CORBA_Contained_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_Contained_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Contained_out &
-CORBA_Contained_out::operator= (const CORBA_Contained_var &p)
+ACE_INLINE ::CORBA_ContainedSeq_out &
+CORBA_ContainedSeq_out::operator= (const ::CORBA_ContainedSeq_out &p)
 {
-  this->ptr_ = CORBA_Contained::_duplicate (p.ptr ());
+  this->ptr_ = ACE_const_cast (CORBA_ContainedSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE CORBA_Contained_out &
-CORBA_Contained_out::operator= (CORBA_Contained_ptr p)
+ACE_INLINE ::CORBA_ContainedSeq_out &
+CORBA_ContainedSeq_out::operator= (CORBA_ContainedSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE 
-CORBA_Contained_out::operator CORBA_Contained_ptr &() // cast
+CORBA_ContainedSeq_out::operator ::CORBA_ContainedSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_Contained_ptr &
-CORBA_Contained_out::ptr (void) // ptr
+ACE_INLINE ::CORBA_ContainedSeq *&
+CORBA_ContainedSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_Contained_ptr 
-CORBA_Contained_out::operator-> (void)
+ACE_INLINE ::CORBA_ContainedSeq *
+CORBA_ContainedSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
+ACE_INLINE TAO_Object_Manager<CORBA_Contained, CORBA_Contained_var>
+CORBA_ContainedSeq_out::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_CONTAINER___CI_)
-#define _CORBA_CONTAINER___CI_
-
-ACE_INLINE
-CORBA_Container::CORBA_Container (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->CORBA_Container_setup_collocation (_tao_collocated);
-}
-
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CI_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CI_
 
+  ACE_INLINE CORBA_InterfaceDef **
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (CORBA::ULong nelems)
+  {
+    CORBA_InterfaceDef **buf = 0;
+    
+    ACE_NEW_RETURN (buf, CORBA_InterfaceDef*[nelems], 0);
+    
+    for (CORBA::ULong i = 0; i < nelems; i++)
+      {
+        buf[i] = tao_CORBA_InterfaceDef_nil ();
+      }
+    
+    return buf;
+  }
+  
+  ACE_INLINE void 
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (CORBA_InterfaceDef **buffer)
+  {
+    if (buffer == 0)
+      return;
+    delete[] buffer;
+  }
+  
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void)
+  {
+  }
+  
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum)
+    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (maximum))
+  {
+  }
+  
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA_InterfaceDef* *value,
+    CORBA::Boolean release)
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  {
+  }
+  
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs)
+    : TAO_Unbounded_Base_Sequence (rhs)
+  {
+    if (rhs.buffer_ != 0)
+    {
+      CORBA_InterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (this->maximum_);
+      CORBA_InterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = tao_CORBA_InterfaceDef_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
+    else
+    {
+      this->buffer_ = 0;
+    }
+  }
+  
+  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs)
+  {
+    if (this == &rhs)
+      return *this;
+    
+    if (this->release_)
+    {
+      CORBA_InterfaceDef **tmp = ACE_reinterpret_cast (CORBA_InterfaceDef **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+      {
+        tao_CORBA_InterfaceDef_release (tmp[i]);
+        tmp[i] = tao_CORBA_InterfaceDef_nil ();
+      }
+      if (this->maximum_ < rhs.maximum_)
+      {
+        _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (tmp);
+        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (rhs.maximum_);
+      }
+    }
+    else
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (rhs.maximum_);
+    
+    TAO_Unbounded_Base_Sequence::operator= (rhs);
+    
+    CORBA_InterfaceDef **tmp1 = ACE_reinterpret_cast (CORBA_InterfaceDef **, this->buffer_);
+    CORBA_InterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
+    
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+      {
+        tmp1[i] = tao_CORBA_InterfaceDef_duplicate (tmp2[i]);
+      }
+    
+    return *this;
+  }
+  
+  ACE_INLINE TAO_Object_Manager<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::operator[] (CORBA::ULong index) const
+  // read-write accessor
+  {
+    ACE_ASSERT (index < this->maximum_);
+    CORBA_InterfaceDef ** const tmp = ACE_reinterpret_cast (CORBA_InterfaceDef ** ACE_CAST_CONST, this->buffer_);
+    return TAO_Object_Manager<CORBA_InterfaceDef,CORBA_InterfaceDef_var> (tmp + index, this->release_);
+  }
+  
+  ACE_INLINE CORBA_InterfaceDef* *
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
+  {
+    CORBA_InterfaceDef **result = 0;
+    if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+      {
+        result = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (this->maximum_);
+        this->buffer_ = result;
+        this->release_ = 1;
+      }
+      else
+      {
+        result = ACE_reinterpret_cast (CORBA_InterfaceDef**, this->buffer_);
+      }
+    }
+    else // if (orphan == 1)
+    {
+      if (this->release_ != 0)
+      {
+        // We set the state back to default and relinquish
+        // ownership.
+        result = ACE_reinterpret_cast(CORBA_InterfaceDef**,this->buffer_);
+        this->maximum_ = 0;
+        this->length_ = 0;
+        this->buffer_ = 0;
+        this->release_ = 0;
+      }
+    }
+    return result;
+  }
+  
+  ACE_INLINE const CORBA_InterfaceDef* *
+  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::get_buffer (void) const
+  {
+    return ACE_reinterpret_cast(const CORBA_InterfaceDef ** ACE_CAST_CONST, this->buffer_);
+  }
+  
+  
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_CONTAINER___VAR_CI_)
-#define _CORBA_CONTAINER___VAR_CI_
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_INTERFACEDEFSEQ_CI_)
+#define _CORBA_INTERFACEDEFSEQ_CI_
 
 // *************************************************************
-// Inline operations for class CORBA_Container_var
+// Inline operations for class CORBA_InterfaceDefSeq_var
 // *************************************************************
 
 ACE_INLINE
-CORBA_Container_var::CORBA_Container_var (void) // default constructor
-  : ptr_ (CORBA_Container::_nil ())
+CORBA_InterfaceDefSeq_var::CORBA_InterfaceDefSeq_var (void) // default constructor
+  : ptr_ (0)
 {}
 
-ACE_INLINE CORBA_Container_ptr 
-CORBA_Container_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
 ACE_INLINE
-CORBA_Container_var::CORBA_Container_var (const CORBA_Container_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_Container::_duplicate (p.ptr ()))
+CORBA_InterfaceDefSeq_var::CORBA_InterfaceDefSeq_var (CORBA_InterfaceDefSeq *p)
+  : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA_Container_var::~CORBA_Container_var (void) // destructor
+CORBA_InterfaceDefSeq_var::CORBA_InterfaceDefSeq_var (const ::CORBA_InterfaceDefSeq_var &p) // copy constructor
 {
-  CORBA::release (this->ptr_);
+  if (p.ptr_)
+    ACE_NEW (this->ptr_, ::CORBA_InterfaceDefSeq (*p.ptr_));
+  else
+    this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA_InterfaceDefSeq_var::~CORBA_InterfaceDefSeq_var (void) // destructor
+{
+  delete this->ptr_;
 }
 
-ACE_INLINE CORBA_Container_var &
-CORBA_Container_var::operator= (CORBA_Container_ptr p)
+ACE_INLINE CORBA_InterfaceDefSeq_var &
+CORBA_InterfaceDefSeq_var::operator= (CORBA_InterfaceDefSeq *p)
 {
-  CORBA::release (this->ptr_);
+  delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE CORBA_Container_var &
-CORBA_Container_var::operator= (const CORBA_Container_var &p)
+ACE_INLINE ::CORBA_InterfaceDefSeq_var &
+CORBA_InterfaceDefSeq_var::operator= (const ::CORBA_InterfaceDefSeq_var &p)
 {
   if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_Container::_duplicate (p.ptr ());
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          CORBA_InterfaceDefSeq *deep_copy =
+            new CORBA_InterfaceDefSeq (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              CORBA_InterfaceDefSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
-ACE_INLINE 
-CORBA_Container_var::operator const CORBA_Container_ptr &() const // cast
+ACE_INLINE const ::CORBA_InterfaceDefSeq *
+CORBA_InterfaceDefSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_Container_var::operator CORBA_Container_ptr &() // cast 
+ACE_INLINE ::CORBA_InterfaceDefSeq *
+CORBA_InterfaceDefSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_Container_ptr 
-CORBA_Container_var::operator-> (void) const
+ACE_INLINE 
+CORBA_InterfaceDefSeq_var::operator const ::CORBA_InterfaceDefSeq &() const // cast
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
-ACE_INLINE CORBA_Container_ptr
-CORBA_Container_var::in (void) const
+ACE_INLINE 
+CORBA_InterfaceDefSeq_var::operator ::CORBA_InterfaceDefSeq &() // cast 
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
-ACE_INLINE CORBA_Container_ptr &
-CORBA_Container_var::inout (void)
+ACE_INLINE 
+CORBA_InterfaceDefSeq_var::operator ::CORBA_InterfaceDefSeq &() const // cast 
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
-ACE_INLINE CORBA_Container_ptr &
-CORBA_Container_var::out (void)
+// variable-size types only
+ACE_INLINE
+CORBA_InterfaceDefSeq_var::operator ::CORBA_InterfaceDefSeq *&() // cast 
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Container::_nil ();
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_Container_ptr 
-CORBA_Container_var::_retn (void)
+ACE_INLINE TAO_Object_Manager<CORBA_InterfaceDef, CORBA_InterfaceDef_var>
+CORBA_InterfaceDefSeq_var::operator[] (CORBA::ULong index)
 {
-  // yield ownership of managed obj reference
-  CORBA_Container_ptr val = this->ptr_;
-  this->ptr_ = CORBA_Container::_nil ();
-  return val;
+  return this->ptr_->operator[] (index);
 }
 
+ACE_INLINE const ::CORBA_InterfaceDefSeq &
+CORBA_InterfaceDefSeq_var::in (void) const
+{
+  return *this->ptr_;
+}
 
-#endif /* end #if !defined */
+ACE_INLINE ::CORBA_InterfaceDefSeq &
+CORBA_InterfaceDefSeq_var::inout (void)
+{
+  return *this->ptr_;
+}
 
+// mapping for variable size 
+ACE_INLINE ::CORBA_InterfaceDefSeq *&
+CORBA_InterfaceDefSeq_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
 
-#if !defined (_CORBA_CONTAINER___OUT_CI_)
-#define _CORBA_CONTAINER___OUT_CI_
+ACE_INLINE ::CORBA_InterfaceDefSeq *
+CORBA_InterfaceDefSeq_var::_retn (void)
+{
+  ::CORBA_InterfaceDefSeq *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
+
+ACE_INLINE ::CORBA_InterfaceDefSeq *
+CORBA_InterfaceDefSeq_var::ptr (void) const
+{
+  return this->ptr_;
+}
 
 // *************************************************************
-// Inline operations for class CORBA_Container_out
+// Inline operations for class CORBA_InterfaceDefSeq_out
 // *************************************************************
 
 ACE_INLINE
-CORBA_Container_out::CORBA_Container_out (CORBA_Container_ptr &p)
+CORBA_InterfaceDefSeq_out::CORBA_InterfaceDefSeq_out (CORBA_InterfaceDefSeq *&p)
   : ptr_ (p)
 {
-  this->ptr_ = CORBA_Container::_nil ();
+  this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_Container_out::CORBA_Container_out (CORBA_Container_var &p) // constructor from _var
+CORBA_InterfaceDefSeq_out::CORBA_InterfaceDefSeq_out (CORBA_InterfaceDefSeq_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Container::_nil ();
+  delete this->ptr_;
+  this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_Container_out::CORBA_Container_out (const CORBA_Container_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_Container_out&,p).ptr_)
+CORBA_InterfaceDefSeq_out::CORBA_InterfaceDefSeq_out (const ::CORBA_InterfaceDefSeq_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_InterfaceDefSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE CORBA_Container_out &
-CORBA_Container_out::operator= (const CORBA_Container_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_Container_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Container_out &
-CORBA_Container_out::operator= (const CORBA_Container_var &p)
+ACE_INLINE ::CORBA_InterfaceDefSeq_out &
+CORBA_InterfaceDefSeq_out::operator= (const ::CORBA_InterfaceDefSeq_out &p)
 {
-  this->ptr_ = CORBA_Container::_duplicate (p.ptr ());
+  this->ptr_ = ACE_const_cast (CORBA_InterfaceDefSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE CORBA_Container_out &
-CORBA_Container_out::operator= (CORBA_Container_ptr p)
+ACE_INLINE ::CORBA_InterfaceDefSeq_out &
+CORBA_InterfaceDefSeq_out::operator= (CORBA_InterfaceDefSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE 
-CORBA_Container_out::operator CORBA_Container_ptr &() // cast
+CORBA_InterfaceDefSeq_out::operator ::CORBA_InterfaceDefSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_Container_ptr &
-CORBA_Container_out::ptr (void) // ptr
+ACE_INLINE ::CORBA_InterfaceDefSeq *&
+CORBA_InterfaceDefSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_Container_ptr 
-CORBA_Container_out::operator-> (void)
+ACE_INLINE ::CORBA_InterfaceDefSeq *
+CORBA_InterfaceDefSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
+ACE_INLINE TAO_Object_Manager<CORBA_InterfaceDef, CORBA_InterfaceDef_var>
+CORBA_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
 
 #endif /* end #if !defined */
 
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CI_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CI_
+
+  ACE_INLINE CORBA_ValueDef **
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (CORBA::ULong nelems)
+  {
+    CORBA_ValueDef **buf = 0;
+    
+    ACE_NEW_RETURN (buf, CORBA_ValueDef*[nelems], 0);
+    
+    for (CORBA::ULong i = 0; i < nelems; i++)
+      {
+        buf[i] = tao_CORBA_ValueDef_nil ();
+      }
+    
+    return buf;
+  }
+  
+  ACE_INLINE void 
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (CORBA_ValueDef **buffer)
+  {
+    if (buffer == 0)
+      return;
+    delete[] buffer;
+  }
+  
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void)
+  {
+  }
+  
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum)
+    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (maximum))
+  {
+  }
+  
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA_ValueDef* *value,
+    CORBA::Boolean release)
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  {
+  }
+  
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs)
+    : TAO_Unbounded_Base_Sequence (rhs)
+  {
+    if (rhs.buffer_ != 0)
+    {
+      CORBA_ValueDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (this->maximum_);
+      CORBA_ValueDef ** const tmp2 = ACE_reinterpret_cast (CORBA_ValueDef ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = tao_CORBA_ValueDef_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
+    else
+    {
+      this->buffer_ = 0;
+    }
+  }
+  
+  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs)
+  {
+    if (this == &rhs)
+      return *this;
+    
+    if (this->release_)
+    {
+      CORBA_ValueDef **tmp = ACE_reinterpret_cast (CORBA_ValueDef **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+      {
+        tao_CORBA_ValueDef_release (tmp[i]);
+        tmp[i] = tao_CORBA_ValueDef_nil ();
+      }
+      if (this->maximum_ < rhs.maximum_)
+      {
+        _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (tmp);
+        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (rhs.maximum_);
+      }
+    }
+    else
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (rhs.maximum_);
+    
+    TAO_Unbounded_Base_Sequence::operator= (rhs);
+    
+    CORBA_ValueDef **tmp1 = ACE_reinterpret_cast (CORBA_ValueDef **, this->buffer_);
+    CORBA_ValueDef ** const tmp2 = ACE_reinterpret_cast (CORBA_ValueDef ** ACE_CAST_CONST, rhs.buffer_);
+    
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+      {
+        tmp1[i] = tao_CORBA_ValueDef_duplicate (tmp2[i]);
+      }
+    
+    return *this;
+  }
+  
+  ACE_INLINE TAO_Object_Manager<CORBA_ValueDef,CORBA_ValueDef_var>
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::operator[] (CORBA::ULong index) const
+  // read-write accessor
+  {
+    ACE_ASSERT (index < this->maximum_);
+    CORBA_ValueDef ** const tmp = ACE_reinterpret_cast (CORBA_ValueDef ** ACE_CAST_CONST, this->buffer_);
+    return TAO_Object_Manager<CORBA_ValueDef,CORBA_ValueDef_var> (tmp + index, this->release_);
+  }
+  
+  ACE_INLINE CORBA_ValueDef* *
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::get_buffer (CORBA::Boolean orphan)
+  {
+    CORBA_ValueDef **result = 0;
+    if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+      {
+        result = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (this->maximum_);
+        this->buffer_ = result;
+        this->release_ = 1;
+      }
+      else
+      {
+        result = ACE_reinterpret_cast (CORBA_ValueDef**, this->buffer_);
+      }
+    }
+    else // if (orphan == 1)
+    {
+      if (this->release_ != 0)
+      {
+        // We set the state back to default and relinquish
+        // ownership.
+        result = ACE_reinterpret_cast(CORBA_ValueDef**,this->buffer_);
+        this->maximum_ = 0;
+        this->length_ = 0;
+        this->buffer_ = 0;
+        this->release_ = 0;
+      }
+    }
+    return result;
+  }
+  
+  ACE_INLINE const CORBA_ValueDef* *
+  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::get_buffer (void) const
+  {
+    return ACE_reinterpret_cast(const CORBA_ValueDef ** ACE_CAST_CONST, this->buffer_);
+  }
+  
+  
+#endif /* end #if !defined */
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_VALUEDEFSEQ_CI_)
+#define _CORBA_VALUEDEFSEQ_CI_
+
 // *************************************************************
-// Inline operations for class CORBA::Contained::Description_var
+// Inline operations for class CORBA_ValueDefSeq_var
 // *************************************************************
 
 ACE_INLINE
-CORBA::Contained::Description_var::Description_var (void) // default constructor
+CORBA_ValueDefSeq_var::CORBA_ValueDefSeq_var (void) // default constructor
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA::Contained::Description_var::Description_var (Description *p)
+CORBA_ValueDefSeq_var::CORBA_ValueDefSeq_var (CORBA_ValueDefSeq *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA::Contained::Description_var::Description_var (const ::CORBA::Contained::Description_var &p) // copy constructor
+CORBA_ValueDefSeq_var::CORBA_ValueDefSeq_var (const ::CORBA_ValueDefSeq_var &p) // copy constructor
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::Contained::Description (*p.ptr_));
+    ACE_NEW (this->ptr_, ::CORBA_ValueDefSeq (*p.ptr_));
   else
     this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA::Contained::Description_var::~Description_var (void) // destructor
+CORBA_ValueDefSeq_var::~CORBA_ValueDefSeq_var (void) // destructor
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA::Contained::Description_var &
-CORBA::Contained::Description_var::operator= (Description *p)
+ACE_INLINE CORBA_ValueDefSeq_var &
+CORBA_ValueDefSeq_var::operator= (CORBA_ValueDefSeq *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE ::CORBA::Contained::Description_var &
-CORBA::Contained::Description_var::operator= (const ::CORBA::Contained::Description_var &p)
+ACE_INLINE ::CORBA_ValueDefSeq_var &
+CORBA_ValueDefSeq_var::operator= (const ::CORBA_ValueDefSeq_var &p)
 {
   if (this != &p)
     {
@@ -631,12 +1297,12 @@ CORBA::Contained::Description_var::operator= (const ::CORBA::Contained::Descript
         }
       else
         {
-          Description *deep_copy =
-            new Description (*p.ptr_);
+          CORBA_ValueDefSeq *deep_copy =
+            new CORBA_ValueDefSeq (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              Description *tmp = deep_copy;
+              CORBA_ValueDefSeq *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -647,91 +1313,97 @@ CORBA::Contained::Description_var::operator= (const ::CORBA::Contained::Descript
   return *this;
 }
 
-ACE_INLINE const ::CORBA::Contained::Description *
-CORBA::Contained::Description_var::operator-> (void) const
+ACE_INLINE const ::CORBA_ValueDefSeq *
+CORBA_ValueDefSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::Contained::Description *
-CORBA::Contained::Description_var::operator-> (void)
+ACE_INLINE ::CORBA_ValueDefSeq *
+CORBA_ValueDefSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE
-CORBA::Contained::Description_var::operator const ::CORBA::Contained::Description &() const // cast
+ACE_INLINE 
+CORBA_ValueDefSeq_var::operator const ::CORBA_ValueDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-CORBA::Contained::Description_var::operator ::CORBA::Contained::Description &() // cast 
+ACE_INLINE 
+CORBA_ValueDefSeq_var::operator ::CORBA_ValueDefSeq &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-CORBA::Contained::Description_var::operator ::CORBA::Contained::Description &() const // cast 
+ACE_INLINE 
+CORBA_ValueDefSeq_var::operator ::CORBA_ValueDefSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-CORBA::Contained::Description_var::operator ::CORBA::Contained::Description *&() // cast 
+CORBA_ValueDefSeq_var::operator ::CORBA_ValueDefSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE const ::CORBA::Contained::Description &
-CORBA::Contained::Description_var::in (void) const
+ACE_INLINE TAO_Object_Manager<CORBA_ValueDef, CORBA_ValueDef_var>
+CORBA_ValueDefSeq_var::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+ACE_INLINE const ::CORBA_ValueDefSeq &
+CORBA_ValueDefSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::Contained::Description &
-CORBA::Contained::Description_var::inout (void)
+ACE_INLINE ::CORBA_ValueDefSeq &
+CORBA_ValueDefSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // mapping for variable size 
-ACE_INLINE ::CORBA::Contained::Description *&
-CORBA::Contained::Description_var::out (void)
+ACE_INLINE ::CORBA_ValueDefSeq *&
+CORBA_ValueDefSeq_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::Contained::Description *
-CORBA::Contained::Description_var::_retn (void)
+ACE_INLINE ::CORBA_ValueDefSeq *
+CORBA_ValueDefSeq_var::_retn (void)
 {
-  ::CORBA::Contained::Description *tmp = this->ptr_;
+  ::CORBA_ValueDefSeq *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::CORBA::Contained::Description *
-CORBA::Contained::Description_var::ptr (void) const
+ACE_INLINE ::CORBA_ValueDefSeq *
+CORBA_ValueDefSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // *************************************************************
-// Inline operations for class CORBA::Contained::Description_out
+// Inline operations for class CORBA_ValueDefSeq_out
 // *************************************************************
 
 ACE_INLINE
-CORBA::Contained::Description_out::Description_out (::CORBA::Contained::Description *&p)
+CORBA_ValueDefSeq_out::CORBA_ValueDefSeq_out (CORBA_ValueDefSeq *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA::Contained::Description_out::Description_out (Description_var &p) // constructor from _var
+CORBA_ValueDefSeq_out::CORBA_ValueDefSeq_out (CORBA_ValueDefSeq_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -739,63 +1411,74 @@ CORBA::Contained::Description_out::Description_out (Description_var &p) // const
 }
 
 ACE_INLINE
-CORBA::Contained::Description_out::Description_out (const ::CORBA::Contained::Description_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Description_out&, p).ptr_)
+CORBA_ValueDefSeq_out::CORBA_ValueDefSeq_out (const ::CORBA_ValueDefSeq_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_ValueDefSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE CORBA::Contained::Description_out &
-CORBA::Contained::Description_out::operator= (const ::CORBA::Contained::Description_out &p)
+ACE_INLINE ::CORBA_ValueDefSeq_out &
+CORBA_ValueDefSeq_out::operator= (const ::CORBA_ValueDefSeq_out &p)
 {
-  this->ptr_ = ACE_const_cast (Description_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (CORBA_ValueDefSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE CORBA::Contained::Description_out &
-CORBA::Contained::Description_out::operator= (Description *p)
+ACE_INLINE ::CORBA_ValueDefSeq_out &
+CORBA_ValueDefSeq_out::operator= (CORBA_ValueDefSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE 
-CORBA::Contained::Description_out::operator ::CORBA::Contained::Description *&() // cast
+CORBA_ValueDefSeq_out::operator ::CORBA_ValueDefSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::Contained::Description *&
-CORBA::Contained::Description_out::ptr (void) // ptr
+ACE_INLINE ::CORBA_ValueDefSeq *&
+CORBA_ValueDefSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::Contained::Description *
-CORBA::Contained::Description_out::operator-> (void)
+ACE_INLINE ::CORBA_ValueDefSeq *
+CORBA_ValueDefSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
+ACE_INLINE TAO_Object_Manager<CORBA_ValueDef, CORBA_ValueDef_var>
+CORBA_ValueDefSeq_out::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+
+#endif /* end #if !defined */
+
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CI_
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CI_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CI_
 
-  ACE_INLINE CORBA_Contained **
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (CORBA::ULong nelems)
+  ACE_INLINE CORBA_AbstractInterfaceDef **
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (CORBA::ULong nelems)
   {
-    CORBA_Contained **buf = 0;
+    CORBA_AbstractInterfaceDef **buf = 0;
     
-    ACE_NEW_RETURN (buf, CORBA_Contained*[nelems], 0);
+    ACE_NEW_RETURN (buf, CORBA_AbstractInterfaceDef*[nelems], 0);
     
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = CORBA_Contained::_nil ();
+      {
+        buf[i] = tao_CORBA_AbstractInterfaceDef_nil ();
+      }
     
     return buf;
   }
   
   ACE_INLINE void 
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (CORBA_Contained **buffer)
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::freebuf (CORBA_AbstractInterfaceDef **buffer)
   {
     if (buffer == 0)
       return;
@@ -803,36 +1486,38 @@ CORBA::Contained::Description_out::operator-> (void)
   }
   
   ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (void)
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void)
   {
   }
   
   ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (maximum))
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum)
+    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (maximum))
   {
   }
   
   ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq (CORBA::ULong maximum,
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum,
     CORBA::ULong length,
-    CORBA_Contained* *value,
+    CORBA_AbstractInterfaceDef* *value,
     CORBA::Boolean release)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
   
   ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::_TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs)
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
   {
     if (rhs.buffer_ != 0)
     {
-      CORBA_Contained **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (this->maximum_);
-      CORBA_Contained ** const tmp2 = ACE_reinterpret_cast (CORBA_Contained ** ACE_CAST_CONST, rhs.buffer_);
+      CORBA_AbstractInterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (this->maximum_);
+      CORBA_AbstractInterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = CORBA_Contained::_duplicate (tmp2[i]);
+        {
+          tmp1[i] = tao_CORBA_AbstractInterfaceDef_duplicate (tmp2[i]);
+        }
       
       this->buffer_ = tmp1;
     }
@@ -842,66 +1527,68 @@ CORBA::Contained::Description_out::operator-> (void)
     }
   }
   
-  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq &rhs)
+  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs)
   {
     if (this == &rhs)
       return *this;
     
     if (this->release_)
     {
-      CORBA_Contained **tmp = ACE_reinterpret_cast (CORBA_Contained **, this->buffer_);
+      CORBA_AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef **, this->buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA_Contained::_nil ();
+        tao_CORBA_AbstractInterfaceDef_release (tmp[i]);
+        tmp[i] = tao_CORBA_AbstractInterfaceDef_nil ();
       }
       if (this->maximum_ < rhs.maximum_)
       {
-        _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (rhs.maximum_);
+        _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::freebuf (tmp);
+        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (rhs.maximum_);
       }
     }
     else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (rhs.maximum_);
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (rhs.maximum_);
     
     TAO_Unbounded_Base_Sequence::operator= (rhs);
     
-    CORBA_Contained **tmp1 = ACE_reinterpret_cast (CORBA_Contained **, this->buffer_);
-    CORBA_Contained ** const tmp2 = ACE_reinterpret_cast (CORBA_Contained ** ACE_CAST_CONST, rhs.buffer_);
+    CORBA_AbstractInterfaceDef **tmp1 = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef **, this->buffer_);
+    CORBA_AbstractInterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA_Contained::_duplicate (tmp2[i]);
+      {
+        tmp1[i] = tao_CORBA_AbstractInterfaceDef_duplicate (tmp2[i]);
+      }
     
     return *this;
   }
   
-  ACE_INLINE TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var>
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::operator[] (CORBA::ULong index) const
+  ACE_INLINE TAO_Object_Manager<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::operator[] (CORBA::ULong index) const
   // read-write accessor
   {
     ACE_ASSERT (index < this->maximum_);
-    CORBA_Contained ** const tmp = ACE_reinterpret_cast (CORBA_Contained ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<CORBA::Contained,CORBA::Contained_var> (tmp + index, this->release_);
+    CORBA_AbstractInterfaceDef ** const tmp = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef ** ACE_CAST_CONST, this->buffer_);
+    return TAO_Object_Manager<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var> (tmp + index, this->release_);
   }
   
-  ACE_INLINE CORBA_Contained* *
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::get_buffer (CORBA::Boolean orphan)
+  ACE_INLINE CORBA_AbstractInterfaceDef* *
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
   {
-    CORBA_Contained **result = 0;
+    CORBA_AbstractInterfaceDef **result = 0;
     if (orphan == 0)
     {
       // We retain ownership.
       if (this->buffer_ == 0)
       {
-        result = _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::allocbuf (this->maximum_);
+        result = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (this->maximum_);
         this->buffer_ = result;
         this->release_ = 1;
       }
       else
       {
-        result = ACE_reinterpret_cast (CORBA_Contained**, this->buffer_);
+        result = ACE_reinterpret_cast (CORBA_AbstractInterfaceDef**, this->buffer_);
       }
     }
     else // if (orphan == 1)
@@ -910,7 +1597,7 @@ CORBA::Contained::Description_out::operator-> (void)
       {
         // We set the state back to default and relinquish
         // ownership.
-        result = ACE_reinterpret_cast(CORBA_Contained**,this->buffer_);
+        result = ACE_reinterpret_cast(CORBA_AbstractInterfaceDef**,this->buffer_);
         this->maximum_ = 0;
         this->length_ = 0;
         this->buffer_ = 0;
@@ -920,10 +1607,10 @@ CORBA::Contained::Description_out::operator-> (void)
     return result;
   }
   
-  ACE_INLINE const CORBA_Contained* *
-  _TAO_Unbounded_Object_Sequence_CORBA_ContainedSeq::get_buffer (void) const
+  ACE_INLINE const CORBA_AbstractInterfaceDef* *
+  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::get_buffer (void) const
   {
-    return ACE_reinterpret_cast(const CORBA_Contained ** ACE_CAST_CONST, this->buffer_);
+    return ACE_reinterpret_cast(const CORBA_AbstractInterfaceDef ** ACE_CAST_CONST, this->buffer_);
   }
   
   
@@ -932,48 +1619,48 @@ CORBA::Contained::Description_out::operator-> (void)
 
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
-#if !defined (_CORBA_CONTAINEDSEQ_CI_)
-#define _CORBA_CONTAINEDSEQ_CI_
+#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CI_)
+#define _CORBA_ABSTRACTINTERFACEDEFSEQ_CI_
 
 // *************************************************************
-// Inline operations for class CORBA_ContainedSeq_var
+// Inline operations for class CORBA_AbstractInterfaceDefSeq_var
 // *************************************************************
 
 ACE_INLINE
-CORBA_ContainedSeq_var::CORBA_ContainedSeq_var (void) // default constructor
+CORBA_AbstractInterfaceDefSeq_var::CORBA_AbstractInterfaceDefSeq_var (void) // default constructor
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA_ContainedSeq_var::CORBA_ContainedSeq_var (CORBA_ContainedSeq *p)
+CORBA_AbstractInterfaceDefSeq_var::CORBA_AbstractInterfaceDefSeq_var (CORBA_AbstractInterfaceDefSeq *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA_ContainedSeq_var::CORBA_ContainedSeq_var (const ::CORBA_ContainedSeq_var &p) // copy constructor
+CORBA_AbstractInterfaceDefSeq_var::CORBA_AbstractInterfaceDefSeq_var (const ::CORBA_AbstractInterfaceDefSeq_var &p) // copy constructor
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::ContainedSeq (*p.ptr_));
+    ACE_NEW (this->ptr_, ::CORBA_AbstractInterfaceDefSeq (*p.ptr_));
   else
     this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_ContainedSeq_var::~CORBA_ContainedSeq_var (void) // destructor
+CORBA_AbstractInterfaceDefSeq_var::~CORBA_AbstractInterfaceDefSeq_var (void) // destructor
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA_ContainedSeq_var &
-CORBA_ContainedSeq_var::operator= (CORBA_ContainedSeq *p)
+ACE_INLINE CORBA_AbstractInterfaceDefSeq_var &
+CORBA_AbstractInterfaceDefSeq_var::operator= (CORBA_AbstractInterfaceDefSeq *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE ::CORBA_ContainedSeq_var &
-CORBA_ContainedSeq_var::operator= (const ::CORBA_ContainedSeq_var &p)
+ACE_INLINE ::CORBA_AbstractInterfaceDefSeq_var &
+CORBA_AbstractInterfaceDefSeq_var::operator= (const ::CORBA_AbstractInterfaceDefSeq_var &p)
 {
   if (this != &p)
     {
@@ -984,12 +1671,12 @@ CORBA_ContainedSeq_var::operator= (const ::CORBA_ContainedSeq_var &p)
         }
       else
         {
-          CORBA_ContainedSeq *deep_copy =
-            new CORBA_ContainedSeq (*p.ptr_);
+          CORBA_AbstractInterfaceDefSeq *deep_copy =
+            new CORBA_AbstractInterfaceDefSeq (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              CORBA_ContainedSeq *tmp = deep_copy;
+              CORBA_AbstractInterfaceDefSeq *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -1000,97 +1687,97 @@ CORBA_ContainedSeq_var::operator= (const ::CORBA_ContainedSeq_var &p)
   return *this;
 }
 
-ACE_INLINE const ::CORBA::ContainedSeq *
-CORBA_ContainedSeq_var::operator-> (void) const
+ACE_INLINE const ::CORBA_AbstractInterfaceDefSeq *
+CORBA_AbstractInterfaceDefSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::ContainedSeq *
-CORBA_ContainedSeq_var::operator-> (void)
+ACE_INLINE ::CORBA_AbstractInterfaceDefSeq *
+CORBA_AbstractInterfaceDefSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_ContainedSeq_var::operator const ::CORBA::ContainedSeq &() const // cast
+CORBA_AbstractInterfaceDefSeq_var::operator const ::CORBA_AbstractInterfaceDefSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_ContainedSeq_var::operator ::CORBA::ContainedSeq &() // cast 
+CORBA_AbstractInterfaceDefSeq_var::operator ::CORBA_AbstractInterfaceDefSeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_ContainedSeq_var::operator ::CORBA::ContainedSeq &() const // cast 
+CORBA_AbstractInterfaceDefSeq_var::operator ::CORBA_AbstractInterfaceDefSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-CORBA_ContainedSeq_var::operator ::CORBA::ContainedSeq *&() // cast 
+CORBA_AbstractInterfaceDefSeq_var::operator ::CORBA_AbstractInterfaceDefSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::Contained, CORBA::Contained_var>
-CORBA_ContainedSeq_var::operator[] (CORBA::ULong index)
+ACE_INLINE TAO_Object_Manager<CORBA_AbstractInterfaceDef, CORBA_AbstractInterfaceDef_var>
+CORBA_AbstractInterfaceDefSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::CORBA::ContainedSeq &
-CORBA_ContainedSeq_var::in (void) const
+ACE_INLINE const ::CORBA_AbstractInterfaceDefSeq &
+CORBA_AbstractInterfaceDefSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::ContainedSeq &
-CORBA_ContainedSeq_var::inout (void)
+ACE_INLINE ::CORBA_AbstractInterfaceDefSeq &
+CORBA_AbstractInterfaceDefSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // mapping for variable size 
-ACE_INLINE ::CORBA::ContainedSeq *&
-CORBA_ContainedSeq_var::out (void)
+ACE_INLINE ::CORBA_AbstractInterfaceDefSeq *&
+CORBA_AbstractInterfaceDefSeq_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::ContainedSeq *
-CORBA_ContainedSeq_var::_retn (void)
+ACE_INLINE ::CORBA_AbstractInterfaceDefSeq *
+CORBA_AbstractInterfaceDefSeq_var::_retn (void)
 {
-  ::CORBA::ContainedSeq *tmp = this->ptr_;
+  ::CORBA_AbstractInterfaceDefSeq *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::CORBA::ContainedSeq *
-CORBA_ContainedSeq_var::ptr (void) const
+ACE_INLINE ::CORBA_AbstractInterfaceDefSeq *
+CORBA_AbstractInterfaceDefSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // *************************************************************
-// Inline operations for class CORBA_ContainedSeq_out
+// Inline operations for class CORBA_AbstractInterfaceDefSeq_out
 // *************************************************************
 
 ACE_INLINE
-CORBA_ContainedSeq_out::CORBA_ContainedSeq_out (CORBA_ContainedSeq *&p)
+CORBA_AbstractInterfaceDefSeq_out::CORBA_AbstractInterfaceDefSeq_out (CORBA_AbstractInterfaceDefSeq *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_ContainedSeq_out::CORBA_ContainedSeq_out (CORBA_ContainedSeq_var &p) // constructor from _var
+CORBA_AbstractInterfaceDefSeq_out::CORBA_AbstractInterfaceDefSeq_out (CORBA_AbstractInterfaceDefSeq_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1098,44 +1785,44 @@ CORBA_ContainedSeq_out::CORBA_ContainedSeq_out (CORBA_ContainedSeq_var &p) // co
 }
 
 ACE_INLINE
-CORBA_ContainedSeq_out::CORBA_ContainedSeq_out (const ::CORBA_ContainedSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ContainedSeq_out&, p).ptr_)
+CORBA_AbstractInterfaceDefSeq_out::CORBA_AbstractInterfaceDefSeq_out (const ::CORBA_AbstractInterfaceDefSeq_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_AbstractInterfaceDefSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::CORBA_ContainedSeq_out &
-CORBA_ContainedSeq_out::operator= (const ::CORBA_ContainedSeq_out &p)
+ACE_INLINE ::CORBA_AbstractInterfaceDefSeq_out &
+CORBA_AbstractInterfaceDefSeq_out::operator= (const ::CORBA_AbstractInterfaceDefSeq_out &p)
 {
-  this->ptr_ = ACE_const_cast (CORBA_ContainedSeq_out&, p).ptr_;
+  this->ptr_ = ACE_const_cast (CORBA_AbstractInterfaceDefSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::CORBA_ContainedSeq_out &
-CORBA_ContainedSeq_out::operator= (CORBA_ContainedSeq *p)
+ACE_INLINE ::CORBA_AbstractInterfaceDefSeq_out &
+CORBA_AbstractInterfaceDefSeq_out::operator= (CORBA_AbstractInterfaceDefSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE 
-CORBA_ContainedSeq_out::operator ::CORBA::ContainedSeq *&() // cast
+CORBA_AbstractInterfaceDefSeq_out::operator ::CORBA_AbstractInterfaceDefSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::ContainedSeq *&
-CORBA_ContainedSeq_out::ptr (void) // ptr
+ACE_INLINE ::CORBA_AbstractInterfaceDefSeq *&
+CORBA_AbstractInterfaceDefSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::ContainedSeq *
-CORBA_ContainedSeq_out::operator-> (void)
+ACE_INLINE ::CORBA_AbstractInterfaceDefSeq *
+CORBA_AbstractInterfaceDefSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::Contained, CORBA::Contained_var>
-CORBA_ContainedSeq_out::operator[] (CORBA::ULong index)
+ACE_INLINE TAO_Object_Manager<CORBA_AbstractInterfaceDef, CORBA_AbstractInterfaceDef_var>
+CORBA_AbstractInterfaceDefSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
@@ -1144,193 +1831,378 @@ CORBA_ContainedSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_IDLTYPE___CI_)
-#define _CORBA_IDLTYPE___CI_
-
-ACE_INLINE
-CORBA_IDLType::CORBA_IDLType (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->CORBA_IDLType_setup_collocation (_tao_collocated);
-}
-
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
+#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CI_)
+#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CI_
 
+  ACE_INLINE CORBA_LocalInterfaceDef **
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (CORBA::ULong nelems)
+  {
+    CORBA_LocalInterfaceDef **buf = 0;
+    
+    ACE_NEW_RETURN (buf, CORBA_LocalInterfaceDef*[nelems], 0);
+    
+    for (CORBA::ULong i = 0; i < nelems; i++)
+      {
+        buf[i] = tao_CORBA_LocalInterfaceDef_nil ();
+      }
+    
+    return buf;
+  }
+  
+  ACE_INLINE void 
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::freebuf (CORBA_LocalInterfaceDef **buffer)
+  {
+    if (buffer == 0)
+      return;
+    delete[] buffer;
+  }
+  
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void)
+  {
+  }
+  
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum)
+    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (maximum))
+  {
+  }
+  
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum,
+    CORBA::ULong length,
+    CORBA_LocalInterfaceDef* *value,
+    CORBA::Boolean release)
+  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+  {
+  }
+  
+  ACE_INLINE
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs)
+    : TAO_Unbounded_Base_Sequence (rhs)
+  {
+    if (rhs.buffer_ != 0)
+    {
+      CORBA_LocalInterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (this->maximum_);
+      CORBA_LocalInterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_LocalInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
+      
+      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+        {
+          tmp1[i] = tao_CORBA_LocalInterfaceDef_duplicate (tmp2[i]);
+        }
+      
+      this->buffer_ = tmp1;
+    }
+    else
+    {
+      this->buffer_ = 0;
+    }
+  }
+  
+  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs)
+  {
+    if (this == &rhs)
+      return *this;
+    
+    if (this->release_)
+    {
+      CORBA_LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA_LocalInterfaceDef **, this->buffer_);
+      
+      for (CORBA::ULong i = 0; i < this->length_; ++i)
+      {
+        tao_CORBA_LocalInterfaceDef_release (tmp[i]);
+        tmp[i] = tao_CORBA_LocalInterfaceDef_nil ();
+      }
+      if (this->maximum_ < rhs.maximum_)
+      {
+        _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::freebuf (tmp);
+        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (rhs.maximum_);
+      }
+    }
+    else
+      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (rhs.maximum_);
+    
+    TAO_Unbounded_Base_Sequence::operator= (rhs);
+    
+    CORBA_LocalInterfaceDef **tmp1 = ACE_reinterpret_cast (CORBA_LocalInterfaceDef **, this->buffer_);
+    CORBA_LocalInterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA_LocalInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
+    
+    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+      {
+        tmp1[i] = tao_CORBA_LocalInterfaceDef_duplicate (tmp2[i]);
+      }
+    
+    return *this;
+  }
+  
+  ACE_INLINE TAO_Object_Manager<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::operator[] (CORBA::ULong index) const
+  // read-write accessor
+  {
+    ACE_ASSERT (index < this->maximum_);
+    CORBA_LocalInterfaceDef ** const tmp = ACE_reinterpret_cast (CORBA_LocalInterfaceDef ** ACE_CAST_CONST, this->buffer_);
+    return TAO_Object_Manager<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var> (tmp + index, this->release_);
+  }
+  
+  ACE_INLINE CORBA_LocalInterfaceDef* *
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
+  {
+    CORBA_LocalInterfaceDef **result = 0;
+    if (orphan == 0)
+    {
+      // We retain ownership.
+      if (this->buffer_ == 0)
+      {
+        result = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (this->maximum_);
+        this->buffer_ = result;
+        this->release_ = 1;
+      }
+      else
+      {
+        result = ACE_reinterpret_cast (CORBA_LocalInterfaceDef**, this->buffer_);
+      }
+    }
+    else // if (orphan == 1)
+    {
+      if (this->release_ != 0)
+      {
+        // We set the state back to default and relinquish
+        // ownership.
+        result = ACE_reinterpret_cast(CORBA_LocalInterfaceDef**,this->buffer_);
+        this->maximum_ = 0;
+        this->length_ = 0;
+        this->buffer_ = 0;
+        this->release_ = 0;
+      }
+    }
+    return result;
+  }
+  
+  ACE_INLINE const CORBA_LocalInterfaceDef* *
+  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::get_buffer (void) const
+  {
+    return ACE_reinterpret_cast(const CORBA_LocalInterfaceDef ** ACE_CAST_CONST, this->buffer_);
+  }
+  
+  
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_IDLTYPE___VAR_CI_)
-#define _CORBA_IDLTYPE___VAR_CI_
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+
+#if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CI_)
+#define _CORBA_LOCALINTERFACEDEFSEQ_CI_
 
 // *************************************************************
-// Inline operations for class CORBA_IDLType_var
+// Inline operations for class CORBA_LocalInterfaceDefSeq_var
 // *************************************************************
 
 ACE_INLINE
-CORBA_IDLType_var::CORBA_IDLType_var (void) // default constructor
-  : ptr_ (CORBA_IDLType::_nil ())
+CORBA_LocalInterfaceDefSeq_var::CORBA_LocalInterfaceDefSeq_var (void) // default constructor
+  : ptr_ (0)
 {}
 
-ACE_INLINE CORBA_IDLType_ptr 
-CORBA_IDLType_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
 ACE_INLINE
-CORBA_IDLType_var::CORBA_IDLType_var (const CORBA_IDLType_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_IDLType::_duplicate (p.ptr ()))
+CORBA_LocalInterfaceDefSeq_var::CORBA_LocalInterfaceDefSeq_var (CORBA_LocalInterfaceDefSeq *p)
+  : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA_IDLType_var::~CORBA_IDLType_var (void) // destructor
+CORBA_LocalInterfaceDefSeq_var::CORBA_LocalInterfaceDefSeq_var (const ::CORBA_LocalInterfaceDefSeq_var &p) // copy constructor
 {
-  CORBA::release (this->ptr_);
+  if (p.ptr_)
+    ACE_NEW (this->ptr_, ::CORBA_LocalInterfaceDefSeq (*p.ptr_));
+  else
+    this->ptr_ = 0;
+}
+
+ACE_INLINE
+CORBA_LocalInterfaceDefSeq_var::~CORBA_LocalInterfaceDefSeq_var (void) // destructor
+{
+  delete this->ptr_;
 }
 
-ACE_INLINE CORBA_IDLType_var &
-CORBA_IDLType_var::operator= (CORBA_IDLType_ptr p)
+ACE_INLINE CORBA_LocalInterfaceDefSeq_var &
+CORBA_LocalInterfaceDefSeq_var::operator= (CORBA_LocalInterfaceDefSeq *p)
 {
-  CORBA::release (this->ptr_);
+  delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE CORBA_IDLType_var &
-CORBA_IDLType_var::operator= (const CORBA_IDLType_var &p)
+ACE_INLINE ::CORBA_LocalInterfaceDefSeq_var &
+CORBA_LocalInterfaceDefSeq_var::operator= (const ::CORBA_LocalInterfaceDefSeq_var &p)
 {
   if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_IDLType::_duplicate (p.ptr ());
-  }
+    {
+      if (p.ptr_ == 0)
+        {
+          delete this->ptr_;
+          this->ptr_ = 0;
+        }
+      else
+        {
+          CORBA_LocalInterfaceDefSeq *deep_copy =
+            new CORBA_LocalInterfaceDefSeq (*p.ptr_);
+          
+          if (deep_copy != 0)
+            {
+              CORBA_LocalInterfaceDefSeq *tmp = deep_copy;
+              deep_copy = this->ptr_;
+              this->ptr_ = tmp;
+              delete deep_copy;
+            }
+        }
+    }
+  
   return *this;
 }
 
-ACE_INLINE 
-CORBA_IDLType_var::operator const CORBA_IDLType_ptr &() const // cast
+ACE_INLINE const ::CORBA_LocalInterfaceDefSeq *
+CORBA_LocalInterfaceDefSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE 
-CORBA_IDLType_var::operator CORBA_IDLType_ptr &() // cast 
+ACE_INLINE ::CORBA_LocalInterfaceDefSeq *
+CORBA_LocalInterfaceDefSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_IDLType_ptr 
-CORBA_IDLType_var::operator-> (void) const
+ACE_INLINE 
+CORBA_LocalInterfaceDefSeq_var::operator const ::CORBA_LocalInterfaceDefSeq &() const // cast
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
-ACE_INLINE CORBA_IDLType_ptr
-CORBA_IDLType_var::in (void) const
+ACE_INLINE 
+CORBA_LocalInterfaceDefSeq_var::operator ::CORBA_LocalInterfaceDefSeq &() // cast 
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
-ACE_INLINE CORBA_IDLType_ptr &
-CORBA_IDLType_var::inout (void)
+ACE_INLINE 
+CORBA_LocalInterfaceDefSeq_var::operator ::CORBA_LocalInterfaceDefSeq &() const // cast 
 {
-  return this->ptr_;
+  return *this->ptr_;
 }
 
-ACE_INLINE CORBA_IDLType_ptr &
-CORBA_IDLType_var::out (void)
+// variable-size types only
+ACE_INLINE
+CORBA_LocalInterfaceDefSeq_var::operator ::CORBA_LocalInterfaceDefSeq *&() // cast 
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_IDLType::_nil ();
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_IDLType_ptr 
-CORBA_IDLType_var::_retn (void)
+ACE_INLINE TAO_Object_Manager<CORBA_LocalInterfaceDef, CORBA_LocalInterfaceDef_var>
+CORBA_LocalInterfaceDefSeq_var::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
+
+ACE_INLINE const ::CORBA_LocalInterfaceDefSeq &
+CORBA_LocalInterfaceDefSeq_var::in (void) const
 {
-  // yield ownership of managed obj reference
-  CORBA_IDLType_ptr val = this->ptr_;
-  this->ptr_ = CORBA_IDLType::_nil ();
-  return val;
+  return *this->ptr_;
 }
 
+ACE_INLINE ::CORBA_LocalInterfaceDefSeq &
+CORBA_LocalInterfaceDefSeq_var::inout (void)
+{
+  return *this->ptr_;
+}
 
-#endif /* end #if !defined */
+// mapping for variable size 
+ACE_INLINE ::CORBA_LocalInterfaceDefSeq *&
+CORBA_LocalInterfaceDefSeq_var::out (void)
+{
+  delete this->ptr_;
+  this->ptr_ = 0;
+  return this->ptr_;
+}
 
+ACE_INLINE ::CORBA_LocalInterfaceDefSeq *
+CORBA_LocalInterfaceDefSeq_var::_retn (void)
+{
+  ::CORBA_LocalInterfaceDefSeq *tmp = this->ptr_;
+  this->ptr_ = 0;
+  return tmp;
+}
 
-#if !defined (_CORBA_IDLTYPE___OUT_CI_)
-#define _CORBA_IDLTYPE___OUT_CI_
+ACE_INLINE ::CORBA_LocalInterfaceDefSeq *
+CORBA_LocalInterfaceDefSeq_var::ptr (void) const
+{
+  return this->ptr_;
+}
 
 // *************************************************************
-// Inline operations for class CORBA_IDLType_out
+// Inline operations for class CORBA_LocalInterfaceDefSeq_out
 // *************************************************************
 
 ACE_INLINE
-CORBA_IDLType_out::CORBA_IDLType_out (CORBA_IDLType_ptr &p)
+CORBA_LocalInterfaceDefSeq_out::CORBA_LocalInterfaceDefSeq_out (CORBA_LocalInterfaceDefSeq *&p)
   : ptr_ (p)
 {
-  this->ptr_ = CORBA_IDLType::_nil ();
+  this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_IDLType_out::CORBA_IDLType_out (CORBA_IDLType_var &p) // constructor from _var
+CORBA_LocalInterfaceDefSeq_out::CORBA_LocalInterfaceDefSeq_out (CORBA_LocalInterfaceDefSeq_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_IDLType::_nil ();
+  delete this->ptr_;
+  this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_IDLType_out::CORBA_IDLType_out (const CORBA_IDLType_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_IDLType_out&,p).ptr_)
+CORBA_LocalInterfaceDefSeq_out::CORBA_LocalInterfaceDefSeq_out (const ::CORBA_LocalInterfaceDefSeq_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_LocalInterfaceDefSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE CORBA_IDLType_out &
-CORBA_IDLType_out::operator= (const CORBA_IDLType_out &p)
+ACE_INLINE ::CORBA_LocalInterfaceDefSeq_out &
+CORBA_LocalInterfaceDefSeq_out::operator= (const ::CORBA_LocalInterfaceDefSeq_out &p)
 {
-  this->ptr_ = ACE_const_cast (CORBA_IDLType_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (CORBA_LocalInterfaceDefSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE CORBA_IDLType_out &
-CORBA_IDLType_out::operator= (const CORBA_IDLType_var &p)
-{
-  this->ptr_ = CORBA_IDLType::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_IDLType_out &
-CORBA_IDLType_out::operator= (CORBA_IDLType_ptr p)
+ACE_INLINE ::CORBA_LocalInterfaceDefSeq_out &
+CORBA_LocalInterfaceDefSeq_out::operator= (CORBA_LocalInterfaceDefSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE 
-CORBA_IDLType_out::operator CORBA_IDLType_ptr &() // cast
+CORBA_LocalInterfaceDefSeq_out::operator ::CORBA_LocalInterfaceDefSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_IDLType_ptr &
-CORBA_IDLType_out::ptr (void) // ptr
+ACE_INLINE ::CORBA_LocalInterfaceDefSeq *&
+CORBA_LocalInterfaceDefSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_IDLType_ptr 
-CORBA_IDLType_out::operator-> (void)
+ACE_INLINE ::CORBA_LocalInterfaceDefSeq *
+CORBA_LocalInterfaceDefSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
+ACE_INLINE TAO_Object_Manager<CORBA_LocalInterfaceDef, CORBA_LocalInterfaceDef_var>
+CORBA_LocalInterfaceDefSeq_out::operator[] (CORBA::ULong index)
+{
+  return this->ptr_->operator[] (index);
+}
 
-#endif /* end #if !defined */
 
+#endif /* end #if !defined */
 
 // *************************************************************
 // Inline operations for class CORBA_StructMember_var
@@ -1723,7 +2595,7 @@ ACE_INLINE
 CORBA_StructMemberSeq_var::CORBA_StructMemberSeq_var (const ::CORBA_StructMemberSeq_var &p) // copy constructor
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::StructMemberSeq (*p.ptr_));
+    ACE_NEW (this->ptr_, ::CORBA_StructMemberSeq (*p.ptr_));
   else
     this->ptr_ = 0;
 }
@@ -1770,69 +2642,69 @@ CORBA_StructMemberSeq_var::operator= (const ::CORBA_StructMemberSeq_var &p)
   return *this;
 }
 
-ACE_INLINE const ::CORBA::StructMemberSeq *
+ACE_INLINE const ::CORBA_StructMemberSeq *
 CORBA_StructMemberSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::StructMemberSeq *
+ACE_INLINE ::CORBA_StructMemberSeq *
 CORBA_StructMemberSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_StructMemberSeq_var::operator const ::CORBA::StructMemberSeq &() const // cast
+CORBA_StructMemberSeq_var::operator const ::CORBA_StructMemberSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_StructMemberSeq_var::operator ::CORBA::StructMemberSeq &() // cast 
+CORBA_StructMemberSeq_var::operator ::CORBA_StructMemberSeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_StructMemberSeq_var::operator ::CORBA::StructMemberSeq &() const // cast 
+CORBA_StructMemberSeq_var::operator ::CORBA_StructMemberSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-CORBA_StructMemberSeq_var::operator ::CORBA::StructMemberSeq *&() // cast 
+CORBA_StructMemberSeq_var::operator ::CORBA_StructMemberSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::StructMember &
+ACE_INLINE CORBA_StructMember &
 CORBA_StructMemberSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::StructMember &
+ACE_INLINE const CORBA_StructMember &
 CORBA_StructMemberSeq_var::operator[] (CORBA::ULong index) const
 {
-  return ACE_const_cast (const CORBA::StructMember &, this->ptr_->operator[] (index));
+  return ACE_const_cast (const CORBA_StructMember &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::CORBA::StructMemberSeq &
+ACE_INLINE const ::CORBA_StructMemberSeq &
 CORBA_StructMemberSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::StructMemberSeq &
+ACE_INLINE ::CORBA_StructMemberSeq &
 CORBA_StructMemberSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // mapping for variable size 
-ACE_INLINE ::CORBA::StructMemberSeq *&
+ACE_INLINE ::CORBA_StructMemberSeq *&
 CORBA_StructMemberSeq_var::out (void)
 {
   delete this->ptr_;
@@ -1840,15 +2712,15 @@ CORBA_StructMemberSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::StructMemberSeq *
+ACE_INLINE ::CORBA_StructMemberSeq *
 CORBA_StructMemberSeq_var::_retn (void)
 {
-  ::CORBA::StructMemberSeq *tmp = this->ptr_;
+  ::CORBA_StructMemberSeq *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::CORBA::StructMemberSeq *
+ACE_INLINE ::CORBA_StructMemberSeq *
 CORBA_StructMemberSeq_var::ptr (void) const
 {
   return this->ptr_;
@@ -1893,24 +2765,24 @@ CORBA_StructMemberSeq_out::operator= (CORBA_StructMemberSeq *p)
 }
 
 ACE_INLINE 
-CORBA_StructMemberSeq_out::operator ::CORBA::StructMemberSeq *&() // cast
+CORBA_StructMemberSeq_out::operator ::CORBA_StructMemberSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::StructMemberSeq *&
+ACE_INLINE ::CORBA_StructMemberSeq *&
 CORBA_StructMemberSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::StructMemberSeq *
+ACE_INLINE ::CORBA_StructMemberSeq *
 CORBA_StructMemberSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::StructMember &
+ACE_INLINE CORBA_StructMember &
 CORBA_StructMemberSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -2310,7 +3182,7 @@ ACE_INLINE
 CORBA_InitializerSeq_var::CORBA_InitializerSeq_var (const ::CORBA_InitializerSeq_var &p) // copy constructor
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::InitializerSeq (*p.ptr_));
+    ACE_NEW (this->ptr_, ::CORBA_InitializerSeq (*p.ptr_));
   else
     this->ptr_ = 0;
 }
@@ -2357,69 +3229,69 @@ CORBA_InitializerSeq_var::operator= (const ::CORBA_InitializerSeq_var &p)
   return *this;
 }
 
-ACE_INLINE const ::CORBA::InitializerSeq *
+ACE_INLINE const ::CORBA_InitializerSeq *
 CORBA_InitializerSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::InitializerSeq *
+ACE_INLINE ::CORBA_InitializerSeq *
 CORBA_InitializerSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_InitializerSeq_var::operator const ::CORBA::InitializerSeq &() const // cast
+CORBA_InitializerSeq_var::operator const ::CORBA_InitializerSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_InitializerSeq_var::operator ::CORBA::InitializerSeq &() // cast 
+CORBA_InitializerSeq_var::operator ::CORBA_InitializerSeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_InitializerSeq_var::operator ::CORBA::InitializerSeq &() const // cast 
+CORBA_InitializerSeq_var::operator ::CORBA_InitializerSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-CORBA_InitializerSeq_var::operator ::CORBA::InitializerSeq *&() // cast 
+CORBA_InitializerSeq_var::operator ::CORBA_InitializerSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Initializer &
+ACE_INLINE CORBA_Initializer &
 CORBA_InitializerSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::Initializer &
+ACE_INLINE const CORBA_Initializer &
 CORBA_InitializerSeq_var::operator[] (CORBA::ULong index) const
 {
-  return ACE_const_cast (const CORBA::Initializer &, this->ptr_->operator[] (index));
+  return ACE_const_cast (const CORBA_Initializer &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::CORBA::InitializerSeq &
+ACE_INLINE const ::CORBA_InitializerSeq &
 CORBA_InitializerSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::InitializerSeq &
+ACE_INLINE ::CORBA_InitializerSeq &
 CORBA_InitializerSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // mapping for variable size 
-ACE_INLINE ::CORBA::InitializerSeq *&
+ACE_INLINE ::CORBA_InitializerSeq *&
 CORBA_InitializerSeq_var::out (void)
 {
   delete this->ptr_;
@@ -2427,15 +3299,15 @@ CORBA_InitializerSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::InitializerSeq *
+ACE_INLINE ::CORBA_InitializerSeq *
 CORBA_InitializerSeq_var::_retn (void)
 {
-  ::CORBA::InitializerSeq *tmp = this->ptr_;
+  ::CORBA_InitializerSeq *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::CORBA::InitializerSeq *
+ACE_INLINE ::CORBA_InitializerSeq *
 CORBA_InitializerSeq_var::ptr (void) const
 {
   return this->ptr_;
@@ -2480,24 +3352,24 @@ CORBA_InitializerSeq_out::operator= (CORBA_InitializerSeq *p)
 }
 
 ACE_INLINE 
-CORBA_InitializerSeq_out::operator ::CORBA::InitializerSeq *&() // cast
+CORBA_InitializerSeq_out::operator ::CORBA_InitializerSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::InitializerSeq *&
+ACE_INLINE ::CORBA_InitializerSeq *&
 CORBA_InitializerSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::InitializerSeq *
+ACE_INLINE ::CORBA_InitializerSeq *
 CORBA_InitializerSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Initializer &
+ACE_INLINE CORBA_Initializer &
 CORBA_InitializerSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -2897,7 +3769,7 @@ ACE_INLINE
 CORBA_UnionMemberSeq_var::CORBA_UnionMemberSeq_var (const ::CORBA_UnionMemberSeq_var &p) // copy constructor
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::UnionMemberSeq (*p.ptr_));
+    ACE_NEW (this->ptr_, ::CORBA_UnionMemberSeq (*p.ptr_));
   else
     this->ptr_ = 0;
 }
@@ -2944,69 +3816,69 @@ CORBA_UnionMemberSeq_var::operator= (const ::CORBA_UnionMemberSeq_var &p)
   return *this;
 }
 
-ACE_INLINE const ::CORBA::UnionMemberSeq *
+ACE_INLINE const ::CORBA_UnionMemberSeq *
 CORBA_UnionMemberSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::UnionMemberSeq *
+ACE_INLINE ::CORBA_UnionMemberSeq *
 CORBA_UnionMemberSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_UnionMemberSeq_var::operator const ::CORBA::UnionMemberSeq &() const // cast
+CORBA_UnionMemberSeq_var::operator const ::CORBA_UnionMemberSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_UnionMemberSeq_var::operator ::CORBA::UnionMemberSeq &() // cast 
+CORBA_UnionMemberSeq_var::operator ::CORBA_UnionMemberSeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_UnionMemberSeq_var::operator ::CORBA::UnionMemberSeq &() const // cast 
+CORBA_UnionMemberSeq_var::operator ::CORBA_UnionMemberSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-CORBA_UnionMemberSeq_var::operator ::CORBA::UnionMemberSeq *&() // cast 
+CORBA_UnionMemberSeq_var::operator ::CORBA_UnionMemberSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::UnionMember &
+ACE_INLINE CORBA_UnionMember &
 CORBA_UnionMemberSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::UnionMember &
+ACE_INLINE const CORBA_UnionMember &
 CORBA_UnionMemberSeq_var::operator[] (CORBA::ULong index) const
 {
-  return ACE_const_cast (const CORBA::UnionMember &, this->ptr_->operator[] (index));
+  return ACE_const_cast (const CORBA_UnionMember &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::CORBA::UnionMemberSeq &
+ACE_INLINE const ::CORBA_UnionMemberSeq &
 CORBA_UnionMemberSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::UnionMemberSeq &
+ACE_INLINE ::CORBA_UnionMemberSeq &
 CORBA_UnionMemberSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // mapping for variable size 
-ACE_INLINE ::CORBA::UnionMemberSeq *&
+ACE_INLINE ::CORBA_UnionMemberSeq *&
 CORBA_UnionMemberSeq_var::out (void)
 {
   delete this->ptr_;
@@ -3014,15 +3886,15 @@ CORBA_UnionMemberSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::UnionMemberSeq *
+ACE_INLINE ::CORBA_UnionMemberSeq *
 CORBA_UnionMemberSeq_var::_retn (void)
 {
-  ::CORBA::UnionMemberSeq *tmp = this->ptr_;
+  ::CORBA_UnionMemberSeq *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::CORBA::UnionMemberSeq *
+ACE_INLINE ::CORBA_UnionMemberSeq *
 CORBA_UnionMemberSeq_var::ptr (void) const
 {
   return this->ptr_;
@@ -3067,24 +3939,24 @@ CORBA_UnionMemberSeq_out::operator= (CORBA_UnionMemberSeq *p)
 }
 
 ACE_INLINE 
-CORBA_UnionMemberSeq_out::operator ::CORBA::UnionMemberSeq *&() // cast
+CORBA_UnionMemberSeq_out::operator ::CORBA_UnionMemberSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::UnionMemberSeq *&
+ACE_INLINE ::CORBA_UnionMemberSeq *&
 CORBA_UnionMemberSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::UnionMemberSeq *
+ACE_INLINE ::CORBA_UnionMemberSeq *
 CORBA_UnionMemberSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::UnionMember &
+ACE_INLINE CORBA_UnionMember &
 CORBA_UnionMemberSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -3115,7 +3987,7 @@ ACE_INLINE
 CORBA_EnumMemberSeq_var::CORBA_EnumMemberSeq_var (const ::CORBA_EnumMemberSeq_var &p) // copy constructor
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::EnumMemberSeq (*p.ptr_));
+    ACE_NEW (this->ptr_, ::CORBA_EnumMemberSeq (*p.ptr_));
   else
     this->ptr_ = 0;
 }
@@ -3162,39 +4034,39 @@ CORBA_EnumMemberSeq_var::operator= (const ::CORBA_EnumMemberSeq_var &p)
   return *this;
 }
 
-ACE_INLINE const ::CORBA::EnumMemberSeq *
+ACE_INLINE const ::CORBA_EnumMemberSeq *
 CORBA_EnumMemberSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::EnumMemberSeq *
+ACE_INLINE ::CORBA_EnumMemberSeq *
 CORBA_EnumMemberSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_EnumMemberSeq_var::operator const ::CORBA::EnumMemberSeq &() const // cast
+CORBA_EnumMemberSeq_var::operator const ::CORBA_EnumMemberSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_EnumMemberSeq_var::operator ::CORBA::EnumMemberSeq &() // cast 
+CORBA_EnumMemberSeq_var::operator ::CORBA_EnumMemberSeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_EnumMemberSeq_var::operator ::CORBA::EnumMemberSeq &() const // cast 
+CORBA_EnumMemberSeq_var::operator ::CORBA_EnumMemberSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-CORBA_EnumMemberSeq_var::operator ::CORBA::EnumMemberSeq *&() // cast 
+CORBA_EnumMemberSeq_var::operator ::CORBA_EnumMemberSeq *&() // cast 
 {
   return this->ptr_;
 }
@@ -3205,20 +4077,20 @@ CORBA_EnumMemberSeq_var::operator[] (CORBA::ULong index)
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const ::CORBA::EnumMemberSeq &
+ACE_INLINE const ::CORBA_EnumMemberSeq &
 CORBA_EnumMemberSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::EnumMemberSeq &
+ACE_INLINE ::CORBA_EnumMemberSeq &
 CORBA_EnumMemberSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // mapping for variable size 
-ACE_INLINE ::CORBA::EnumMemberSeq *&
+ACE_INLINE ::CORBA_EnumMemberSeq *&
 CORBA_EnumMemberSeq_var::out (void)
 {
   delete this->ptr_;
@@ -3226,15 +4098,15 @@ CORBA_EnumMemberSeq_var::out (void)
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::EnumMemberSeq *
+ACE_INLINE ::CORBA_EnumMemberSeq *
 CORBA_EnumMemberSeq_var::_retn (void)
 {
-  ::CORBA::EnumMemberSeq *tmp = this->ptr_;
+  ::CORBA_EnumMemberSeq *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::CORBA::EnumMemberSeq *
+ACE_INLINE ::CORBA_EnumMemberSeq *
 CORBA_EnumMemberSeq_var::ptr (void) const
 {
   return this->ptr_;
@@ -3279,18 +4151,18 @@ CORBA_EnumMemberSeq_out::operator= (CORBA_EnumMemberSeq *p)
 }
 
 ACE_INLINE 
-CORBA_EnumMemberSeq_out::operator ::CORBA::EnumMemberSeq *&() // cast
+CORBA_EnumMemberSeq_out::operator ::CORBA_EnumMemberSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::EnumMemberSeq *&
+ACE_INLINE ::CORBA_EnumMemberSeq *&
 CORBA_EnumMemberSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::EnumMemberSeq *
+ACE_INLINE ::CORBA_EnumMemberSeq *
 CORBA_EnumMemberSeq_out::operator-> (void)
 {
   return this->ptr_;
@@ -3306,44 +4178,44 @@ CORBA_EnumMemberSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 // *************************************************************
-// Inline operations for class CORBA::Container::Description_var
+// Inline operations for class CORBA_Container::Description_var
 // *************************************************************
 
 ACE_INLINE
-CORBA::Container::Description_var::Description_var (void) // default constructor
+CORBA_Container::Description_var::Description_var (void) // default constructor
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA::Container::Description_var::Description_var (Description *p)
+CORBA_Container::Description_var::Description_var (Description *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA::Container::Description_var::Description_var (const ::CORBA::Container::Description_var &p) // copy constructor
+CORBA_Container::Description_var::Description_var (const ::CORBA_Container::Description_var &p) // copy constructor
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::Container::Description (*p.ptr_));
+    ACE_NEW (this->ptr_, ::CORBA_Container::Description (*p.ptr_));
   else
     this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA::Container::Description_var::~Description_var (void) // destructor
+CORBA_Container::Description_var::~Description_var (void) // destructor
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA::Container::Description_var &
-CORBA::Container::Description_var::operator= (Description *p)
+ACE_INLINE CORBA_Container::Description_var &
+CORBA_Container::Description_var::operator= (Description *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE ::CORBA::Container::Description_var &
-CORBA::Container::Description_var::operator= (const ::CORBA::Container::Description_var &p)
+ACE_INLINE ::CORBA_Container::Description_var &
+CORBA_Container::Description_var::operator= (const ::CORBA_Container::Description_var &p)
 {
   if (this != &p)
     {
@@ -3370,91 +4242,91 @@ CORBA::Container::Description_var::operator= (const ::CORBA::Container::Descript
   return *this;
 }
 
-ACE_INLINE const ::CORBA::Container::Description *
-CORBA::Container::Description_var::operator-> (void) const
+ACE_INLINE const ::CORBA_Container::Description *
+CORBA_Container::Description_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::Container::Description *
-CORBA::Container::Description_var::operator-> (void)
+ACE_INLINE ::CORBA_Container::Description *
+CORBA_Container::Description_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CORBA::Container::Description_var::operator const ::CORBA::Container::Description &() const // cast
+CORBA_Container::Description_var::operator const ::CORBA_Container::Description &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::Container::Description_var::operator ::CORBA::Container::Description &() // cast 
+CORBA_Container::Description_var::operator ::CORBA_Container::Description &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::Container::Description_var::operator ::CORBA::Container::Description &() const // cast 
+CORBA_Container::Description_var::operator ::CORBA_Container::Description &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-CORBA::Container::Description_var::operator ::CORBA::Container::Description *&() // cast 
+CORBA_Container::Description_var::operator ::CORBA_Container::Description *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE const ::CORBA::Container::Description &
-CORBA::Container::Description_var::in (void) const
+ACE_INLINE const ::CORBA_Container::Description &
+CORBA_Container::Description_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::Container::Description &
-CORBA::Container::Description_var::inout (void)
+ACE_INLINE ::CORBA_Container::Description &
+CORBA_Container::Description_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // mapping for variable size 
-ACE_INLINE ::CORBA::Container::Description *&
-CORBA::Container::Description_var::out (void)
+ACE_INLINE ::CORBA_Container::Description *&
+CORBA_Container::Description_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::Container::Description *
-CORBA::Container::Description_var::_retn (void)
+ACE_INLINE ::CORBA_Container::Description *
+CORBA_Container::Description_var::_retn (void)
 {
-  ::CORBA::Container::Description *tmp = this->ptr_;
+  ::CORBA_Container::Description *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::CORBA::Container::Description *
-CORBA::Container::Description_var::ptr (void) const
+ACE_INLINE ::CORBA_Container::Description *
+CORBA_Container::Description_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // *************************************************************
-// Inline operations for class CORBA::Container::Description_out
+// Inline operations for class CORBA_Container::Description_out
 // *************************************************************
 
 ACE_INLINE
-CORBA::Container::Description_out::Description_out (::CORBA::Container::Description *&p)
+CORBA_Container::Description_out::Description_out (::CORBA_Container::Description *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA::Container::Description_out::Description_out (Description_var &p) // constructor from _var
+CORBA_Container::Description_out::Description_out (Description_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -3462,38 +4334,38 @@ CORBA::Container::Description_out::Description_out (Description_var &p) // const
 }
 
 ACE_INLINE
-CORBA::Container::Description_out::Description_out (const ::CORBA::Container::Description_out &p) // copy constructor
+CORBA_Container::Description_out::Description_out (const ::CORBA_Container::Description_out &p) // copy constructor
   : ptr_ (ACE_const_cast (Description_out&, p).ptr_)
 {}
 
-ACE_INLINE CORBA::Container::Description_out &
-CORBA::Container::Description_out::operator= (const ::CORBA::Container::Description_out &p)
+ACE_INLINE CORBA_Container::Description_out &
+CORBA_Container::Description_out::operator= (const ::CORBA_Container::Description_out &p)
 {
   this->ptr_ = ACE_const_cast (Description_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE CORBA::Container::Description_out &
-CORBA::Container::Description_out::operator= (Description *p)
+ACE_INLINE CORBA_Container::Description_out &
+CORBA_Container::Description_out::operator= (Description *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE 
-CORBA::Container::Description_out::operator ::CORBA::Container::Description *&() // cast
+CORBA_Container::Description_out::operator ::CORBA_Container::Description *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::Container::Description *&
-CORBA::Container::Description_out::ptr (void) // ptr
+ACE_INLINE ::CORBA_Container::Description *&
+CORBA_Container::Description_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::Container::Description *
-CORBA::Container::Description_out::operator-> (void)
+ACE_INLINE ::CORBA_Container::Description *
+CORBA_Container::Description_out::operator-> (void)
 {
   return this->ptr_;
 }
@@ -3505,50 +4377,50 @@ CORBA::Container::Description_out::operator-> (void)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_CONTAINER_DESCRIPTIONSEQ_CI_
 
   // = Static operations.
-  ACE_INLINE CORBA::Container::Description *
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (CORBA::ULong size)
+  ACE_INLINE CORBA_Container::Description *
+  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (CORBA::ULong size)
   // Allocate storage for the sequence.
   {
-    Description *retval = 0;
-    ACE_NEW_RETURN (retval, Description[size], 0);
+    CORBA_Container::Description *retval = 0;
+    ACE_NEW_RETURN (retval, CORBA_Container::Description[size], 0);
     return retval;
   }
   
-  ACE_INLINE void CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (Description *buffer)
+  ACE_INLINE void CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (CORBA_Container::Description *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
   
   ACE_INLINE
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void) // Default constructor.
+  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (void) // Default constructor.
   {
   }
   
   ACE_INLINE
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (maximum))
   {
   }
   
   ACE_INLINE
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum,
+  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (CORBA::ULong maximum,
     CORBA::ULong length,
-    Description *data,
+    CORBA_Container::Description *data,
     CORBA::Boolean release)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
   
   ACE_INLINE
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs)
+  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq (const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs)
   // Copy constructor.
     : TAO_Unbounded_Base_Sequence (rhs)
   {
     if (rhs.buffer_ != 0)
     {
-      Description *tmp1 = _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (this->maximum_);
-      Description * const tmp2 = ACE_reinterpret_cast (Description * ACE_CAST_CONST, rhs.buffer_);
+      CORBA_Container::Description *tmp1 = _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (this->maximum_);
+      CORBA_Container::Description * const tmp2 = ACE_reinterpret_cast (CORBA_Container::Description * ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
@@ -3561,8 +4433,8 @@ CORBA::Container::Description_out::operator-> (void)
     }
   }
   
-  ACE_INLINE CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs)
+  ACE_INLINE CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &
+  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator= (const _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
@@ -3573,7 +4445,7 @@ CORBA::Container::Description_out::operator-> (void)
       if (this->maximum_ < rhs.maximum_)
       {
         // free the old buffer
-        Description *tmp = ACE_reinterpret_cast (Description *, this->buffer_);
+        CORBA_Container::Description *tmp = ACE_reinterpret_cast (CORBA_Container::Description *, this->buffer_);
         _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (tmp);
         this->buffer_ = _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::allocbuf (rhs.maximum_);
       }
@@ -3583,8 +4455,8 @@ CORBA::Container::Description_out::operator-> (void)
     
     TAO_Unbounded_Base_Sequence::operator= (rhs);
     
-    Description *tmp1 = ACE_reinterpret_cast (Description *, this->buffer_);
-    Description * const tmp2 = ACE_reinterpret_cast (Description * ACE_CAST_CONST, rhs.buffer_);
+    CORBA_Container::Description *tmp1 = ACE_reinterpret_cast (CORBA_Container::Description *, this->buffer_);
+    CORBA_Container::Description * const tmp2 = ACE_reinterpret_cast (CORBA_Container::Description * ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
@@ -3593,30 +4465,30 @@ CORBA::Container::Description_out::operator-> (void)
   }
   
   // = Accessors.
-  ACE_INLINE CORBA::Container::Description &
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator[] (CORBA::ULong i)
+  ACE_INLINE CORBA_Container::Description &
+  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator[] (CORBA::ULong i)
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    CORBA::Container::Description* tmp = ACE_reinterpret_cast(CORBA::Container::Description*,this->buffer_);
+    CORBA_Container::Description* tmp = ACE_reinterpret_cast(CORBA_Container::Description*,this->buffer_);
     return tmp[i];
   }
   
-  ACE_INLINE const CORBA::Container::Description &
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator[] (CORBA::ULong i) const
+  ACE_INLINE const CORBA_Container::Description &
+  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::operator[] (CORBA::ULong i) const
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    CORBA::Container::Description * const tmp = ACE_reinterpret_cast (CORBA::Container::Description* ACE_CAST_CONST, this->buffer_);
+    CORBA_Container::Description * const tmp = ACE_reinterpret_cast (CORBA_Container::Description* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
   
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
   
-  ACE_INLINE CORBA::Container::Description *
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::get_buffer (CORBA::Boolean orphan)
+  ACE_INLINE CORBA_Container::Description *
+  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::get_buffer (CORBA::Boolean orphan)
   {
-    CORBA::Container::Description *result = 0;
+    CORBA_Container::Description *result = 0;
     if (orphan == 0)
     {
       // We retain ownership.
@@ -3628,7 +4500,7 @@ CORBA::Container::Description_out::operator-> (void)
       }
       else
       {
-        result = ACE_reinterpret_cast (CORBA::Container::Description*, this->buffer_);
+        result = ACE_reinterpret_cast (CORBA_Container::Description*, this->buffer_);
       }
     }
     else // if (orphan == 1)
@@ -3637,7 +4509,7 @@ CORBA::Container::Description_out::operator-> (void)
       {
         // We set the state back to default and relinquish
         // ownership.
-        result = ACE_reinterpret_cast(CORBA::Container::Description*,this->buffer_);
+        result = ACE_reinterpret_cast(CORBA_Container::Description*,this->buffer_);
         this->maximum_ = 0;
         this->length_ = 0;
         this->buffer_ = 0;
@@ -3647,23 +4519,23 @@ CORBA::Container::Description_out::operator-> (void)
     return result;
   }
   
-  ACE_INLINE const CORBA::Container::Description *
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::get_buffer (void) const
+  ACE_INLINE const CORBA_Container::Description *
+  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::get_buffer (void) const
   {
-    return ACE_reinterpret_cast(const CORBA::Container::Description * ACE_CAST_CONST, this->buffer_);
+    return ACE_reinterpret_cast(const CORBA_Container::Description * ACE_CAST_CONST, this->buffer_);
   }
   
   ACE_INLINE void
-  CORBA::Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::replace (CORBA::ULong max,
+  CORBA_Container::_TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
-  CORBA::Container::Description *data,
+  CORBA_Container::Description *data,
   CORBA::Boolean release)
   {
     this->maximum_ = max;
     this->length_ = length;
     if (this->buffer_ && this->release_ == 1)
     {
-      CORBA::Container::Description *tmp = ACE_reinterpret_cast(CORBA::Container::Description*,this->buffer_);
+      CORBA_Container::Description *tmp = ACE_reinterpret_cast(CORBA_Container::Description*,this->buffer_);
       _TAO_Unbounded_Sequence_CORBA_Container_DescriptionSeq::freebuf (tmp);
     }
     this->buffer_ = data;
@@ -3679,44 +4551,44 @@ CORBA::Container::Description_out::operator-> (void)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ_CI_
 
 // *************************************************************
-// Inline operations for class CORBA::Container::DescriptionSeq_var
+// Inline operations for class CORBA_Container::DescriptionSeq_var
 // *************************************************************
 
 ACE_INLINE
-CORBA::Container::DescriptionSeq_var::DescriptionSeq_var (void) // default constructor
+CORBA_Container::DescriptionSeq_var::DescriptionSeq_var (void) // default constructor
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA::Container::DescriptionSeq_var::DescriptionSeq_var (DescriptionSeq *p)
+CORBA_Container::DescriptionSeq_var::DescriptionSeq_var (DescriptionSeq *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA::Container::DescriptionSeq_var::DescriptionSeq_var (const ::CORBA::Container::DescriptionSeq_var &p) // copy constructor
+CORBA_Container::DescriptionSeq_var::DescriptionSeq_var (const ::CORBA_Container::DescriptionSeq_var &p) // copy constructor
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::Container::DescriptionSeq (*p.ptr_));
+    ACE_NEW (this->ptr_, ::CORBA_Container::DescriptionSeq (*p.ptr_));
   else
     this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA::Container::DescriptionSeq_var::~DescriptionSeq_var (void) // destructor
+CORBA_Container::DescriptionSeq_var::~DescriptionSeq_var (void) // destructor
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA::Container::DescriptionSeq_var &
-CORBA::Container::DescriptionSeq_var::operator= (DescriptionSeq *p)
+ACE_INLINE CORBA_Container::DescriptionSeq_var &
+CORBA_Container::DescriptionSeq_var::operator= (DescriptionSeq *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE ::CORBA::Container::DescriptionSeq_var &
-CORBA::Container::DescriptionSeq_var::operator= (const ::CORBA::Container::DescriptionSeq_var &p)
+ACE_INLINE ::CORBA_Container::DescriptionSeq_var &
+CORBA_Container::DescriptionSeq_var::operator= (const ::CORBA_Container::DescriptionSeq_var &p)
 {
   if (this != &p)
     {
@@ -3743,103 +4615,103 @@ CORBA::Container::DescriptionSeq_var::operator= (const ::CORBA::Container::Descr
   return *this;
 }
 
-ACE_INLINE const ::CORBA::Container::DescriptionSeq *
-CORBA::Container::DescriptionSeq_var::operator-> (void) const
+ACE_INLINE const ::CORBA_Container::DescriptionSeq *
+CORBA_Container::DescriptionSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::Container::DescriptionSeq *
-CORBA::Container::DescriptionSeq_var::operator-> (void)
+ACE_INLINE ::CORBA_Container::DescriptionSeq *
+CORBA_Container::DescriptionSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE 
-CORBA::Container::DescriptionSeq_var::operator const ::CORBA::Container::DescriptionSeq &() const // cast
+CORBA_Container::DescriptionSeq_var::operator const ::CORBA_Container::DescriptionSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA::Container::DescriptionSeq_var::operator ::CORBA::Container::DescriptionSeq &() // cast 
+CORBA_Container::DescriptionSeq_var::operator ::CORBA_Container::DescriptionSeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA::Container::DescriptionSeq_var::operator ::CORBA::Container::DescriptionSeq &() const // cast 
+CORBA_Container::DescriptionSeq_var::operator ::CORBA_Container::DescriptionSeq &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-CORBA::Container::DescriptionSeq_var::operator ::CORBA::Container::DescriptionSeq *&() // cast 
+CORBA_Container::DescriptionSeq_var::operator ::CORBA_Container::DescriptionSeq *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Container::Description &
-CORBA::Container::DescriptionSeq_var::operator[] (CORBA::ULong index)
+ACE_INLINE CORBA_Container::Description &
+CORBA_Container::DescriptionSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::Container::Description &
-CORBA::Container::DescriptionSeq_var::operator[] (CORBA::ULong index) const
+ACE_INLINE const CORBA_Container::Description &
+CORBA_Container::DescriptionSeq_var::operator[] (CORBA::ULong index) const
 {
-  return ACE_const_cast (const CORBA::Container::Description &, this->ptr_->operator[] (index));
+  return ACE_const_cast (const CORBA_Container::Description &, this->ptr_->operator[] (index));
 }
 
-ACE_INLINE const ::CORBA::Container::DescriptionSeq &
-CORBA::Container::DescriptionSeq_var::in (void) const
+ACE_INLINE const ::CORBA_Container::DescriptionSeq &
+CORBA_Container::DescriptionSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::Container::DescriptionSeq &
-CORBA::Container::DescriptionSeq_var::inout (void)
+ACE_INLINE ::CORBA_Container::DescriptionSeq &
+CORBA_Container::DescriptionSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // mapping for variable size 
-ACE_INLINE ::CORBA::Container::DescriptionSeq *&
-CORBA::Container::DescriptionSeq_var::out (void)
+ACE_INLINE ::CORBA_Container::DescriptionSeq *&
+CORBA_Container::DescriptionSeq_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::Container::DescriptionSeq *
-CORBA::Container::DescriptionSeq_var::_retn (void)
+ACE_INLINE ::CORBA_Container::DescriptionSeq *
+CORBA_Container::DescriptionSeq_var::_retn (void)
 {
-  ::CORBA::Container::DescriptionSeq *tmp = this->ptr_;
+  ::CORBA_Container::DescriptionSeq *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::CORBA::Container::DescriptionSeq *
-CORBA::Container::DescriptionSeq_var::ptr (void) const
+ACE_INLINE ::CORBA_Container::DescriptionSeq *
+CORBA_Container::DescriptionSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // *************************************************************
-// Inline operations for class CORBA::Container::DescriptionSeq_out
+// Inline operations for class CORBA_Container::DescriptionSeq_out
 // *************************************************************
 
 ACE_INLINE
-CORBA::Container::DescriptionSeq_out::DescriptionSeq_out (DescriptionSeq *&p)
+CORBA_Container::DescriptionSeq_out::DescriptionSeq_out (DescriptionSeq *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA::Container::DescriptionSeq_out::DescriptionSeq_out (DescriptionSeq_var &p) // constructor from _var
+CORBA_Container::DescriptionSeq_out::DescriptionSeq_out (DescriptionSeq_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -3847,44 +4719,44 @@ CORBA::Container::DescriptionSeq_out::DescriptionSeq_out (DescriptionSeq_var &p)
 }
 
 ACE_INLINE
-CORBA::Container::DescriptionSeq_out::DescriptionSeq_out (const ::CORBA::Container::DescriptionSeq_out &p) // copy constructor
+CORBA_Container::DescriptionSeq_out::DescriptionSeq_out (const ::CORBA_Container::DescriptionSeq_out &p) // copy constructor
   : ptr_ (ACE_const_cast (DescriptionSeq_out&, p).ptr_)
 {}
 
-ACE_INLINE ::CORBA::Container::DescriptionSeq_out &
-CORBA::Container::DescriptionSeq_out::operator= (const ::CORBA::Container::DescriptionSeq_out &p)
+ACE_INLINE ::CORBA_Container::DescriptionSeq_out &
+CORBA_Container::DescriptionSeq_out::operator= (const ::CORBA_Container::DescriptionSeq_out &p)
 {
   this->ptr_ = ACE_const_cast (DescriptionSeq_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE ::CORBA::Container::DescriptionSeq_out &
-CORBA::Container::DescriptionSeq_out::operator= (DescriptionSeq *p)
+ACE_INLINE ::CORBA_Container::DescriptionSeq_out &
+CORBA_Container::DescriptionSeq_out::operator= (DescriptionSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE 
-CORBA::Container::DescriptionSeq_out::operator ::CORBA::Container::DescriptionSeq *&() // cast
+CORBA_Container::DescriptionSeq_out::operator ::CORBA_Container::DescriptionSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::Container::DescriptionSeq *&
-CORBA::Container::DescriptionSeq_out::ptr (void) // ptr
+ACE_INLINE ::CORBA_Container::DescriptionSeq *&
+CORBA_Container::DescriptionSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::Container::DescriptionSeq *
-CORBA::Container::DescriptionSeq_out::operator-> (void)
+ACE_INLINE ::CORBA_Container::DescriptionSeq *
+CORBA_Container::DescriptionSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Container::Description &
-CORBA::Container::DescriptionSeq_out::operator[] (CORBA::ULong index)
+ACE_INLINE CORBA_Container::Description &
+CORBA_Container::DescriptionSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
@@ -3893,187 +4765,183 @@ CORBA::Container::DescriptionSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_TYPEDEFDEF___CI_)
-#define _CORBA_TYPEDEFDEF___CI_
+#if !defined (_CORBA_CONTAINER___CI_)
+#define _CORBA_CONTAINER___CI_
 
-ACE_INLINE
-CORBA_TypedefDef::CORBA_TypedefDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE CORBA_Container_ptr
+tao_CORBA_Container_duplicate (
+    CORBA_Container_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->CORBA_TypedefDef_setup_collocation (_tao_collocated);
+  return CORBA_Container::_duplicate (p);
 }
 
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_TYPEDEFDEF___VAR_CI_)
-#define _CORBA_TYPEDEFDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_TypedefDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_TypedefDef_var::CORBA_TypedefDef_var (void) // default constructor
-  : ptr_ (CORBA_TypedefDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_TypedefDef_ptr
-CORBA_TypedefDef_var::ptr (void) const
+ACE_INLINE void
+tao_CORBA_Container_release (
+    CORBA_Container_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-CORBA_TypedefDef_var::CORBA_TypedefDef_var (const ::CORBA_TypedefDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_TypedefDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_TypedefDef_var::~CORBA_TypedefDef_var (void) // destructor
+ACE_INLINE CORBA_Container_ptr
+tao_CORBA_Container_nil (
+    void
+  )
 {
-  CORBA::release (this->ptr_);
+  return CORBA_Container::_nil ();
 }
 
-ACE_INLINE CORBA_TypedefDef_var &
-CORBA_TypedefDef_var::operator= (CORBA_TypedefDef_ptr p)
+ACE_INLINE CORBA_Container_ptr
+tao_CORBA_Container_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
+  return CORBA_Container::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE CORBA_TypedefDef_var &
-CORBA_TypedefDef_var::operator= (const ::CORBA_TypedefDef_var &p)
+ACE_INLINE CORBA::Object *
+tao_CORBA_Container_upcast (
+    void *src
+  )
 {
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_TypedefDef::_duplicate (p.ptr ());
-  }
-  return *this;
+  CORBA_Container **tmp =
+    ACE_static_cast (CORBA_Container **, src);
+  return *tmp;
 }
 
-ACE_INLINE 
-CORBA_TypedefDef_var::operator const ::CORBA_TypedefDef_ptr &() const // cast
+ACE_INLINE
+CORBA_Container::CORBA_Container (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->CORBA_Container_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE 
-CORBA_TypedefDef_var::operator ::CORBA_TypedefDef_ptr &() // cast 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_IDLTYPE___CI_)
+#define _CORBA_IDLTYPE___CI_
+
+ACE_INLINE CORBA_IDLType_ptr
+tao_CORBA_IDLType_duplicate (
+    CORBA_IDLType_ptr p
+  )
 {
-  return this->ptr_;
+  return CORBA_IDLType::_duplicate (p);
 }
 
-ACE_INLINE ::CORBA_TypedefDef_ptr
-CORBA_TypedefDef_var::operator-> (void) const
+ACE_INLINE void
+tao_CORBA_IDLType_release (
+    CORBA_IDLType_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_TypedefDef_ptr
-CORBA_TypedefDef_var::in (void) const
+ACE_INLINE CORBA_IDLType_ptr
+tao_CORBA_IDLType_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_IDLType::_nil ();
 }
 
-ACE_INLINE ::CORBA_TypedefDef_ptr &
-CORBA_TypedefDef_var::inout (void)
+ACE_INLINE CORBA_IDLType_ptr
+tao_CORBA_IDLType_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_IDLType::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_TypedefDef_ptr &
-CORBA_TypedefDef_var::out (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_IDLType_upcast (
+    void *src
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_TypedefDef::_nil ();
-  return this->ptr_;
+  CORBA_IDLType **tmp =
+    ACE_static_cast (CORBA_IDLType **, src);
+  return *tmp;
 }
 
-ACE_INLINE ::CORBA_TypedefDef_ptr
-CORBA_TypedefDef_var::_retn (void)
+ACE_INLINE
+CORBA_IDLType::CORBA_IDLType (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  // yield ownership of managed obj reference
-  ::CORBA_TypedefDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_TypedefDef::_nil ();
-  return val;
+  this->CORBA_IDLType_setup_collocation (_tao_collocated);
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_TYPEDEFDEF___OUT_CI_)
-#define _CORBA_TYPEDEFDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_TypedefDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_TypedefDef_out::CORBA_TypedefDef_out (CORBA_TypedefDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_TypedefDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_TypedefDef_out::CORBA_TypedefDef_out (CORBA_TypedefDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_TypedefDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_TypedefDef_out::CORBA_TypedefDef_out (const ::CORBA_TypedefDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_TypedefDef_out &, p).ptr_)
-{}
+#if !defined (_CORBA_TYPEDEFDEF___CI_)
+#define _CORBA_TYPEDEFDEF___CI_
 
-ACE_INLINE ::CORBA_TypedefDef_out &
-CORBA_TypedefDef_out::operator= (const ::CORBA_TypedefDef_out &p)
+ACE_INLINE CORBA_TypedefDef_ptr
+tao_CORBA_TypedefDef_duplicate (
+    CORBA_TypedefDef_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (CORBA_TypedefDef_out&, p).ptr_;
-  return *this;
+  return CORBA_TypedefDef::_duplicate (p);
 }
 
-ACE_INLINE CORBA_TypedefDef_out &
-CORBA_TypedefDef_out::operator= (const ::CORBA_TypedefDef_var &p)
+ACE_INLINE void
+tao_CORBA_TypedefDef_release (
+    CORBA_TypedefDef_ptr p
+  )
 {
-  this->ptr_ = ::CORBA_TypedefDef::_duplicate (p.ptr ());
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE CORBA_TypedefDef_out &
-CORBA_TypedefDef_out::operator= (CORBA_TypedefDef_ptr p)
+ACE_INLINE CORBA_TypedefDef_ptr
+tao_CORBA_TypedefDef_nil (
+    void
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  return CORBA_TypedefDef::_nil ();
 }
 
-ACE_INLINE 
-CORBA_TypedefDef_out::operator ::CORBA_TypedefDef_ptr &() // cast
+ACE_INLINE CORBA_TypedefDef_ptr
+tao_CORBA_TypedefDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_TypedefDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_TypedefDef_ptr &
-CORBA_TypedefDef_out::ptr (void) // ptr
+ACE_INLINE CORBA::Object *
+tao_CORBA_TypedefDef_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  CORBA_TypedefDef **tmp =
+    ACE_static_cast (CORBA_TypedefDef **, src);
+  return *tmp;
 }
 
-ACE_INLINE ::CORBA_TypedefDef_ptr
-CORBA_TypedefDef_out::operator-> (void)
+ACE_INLINE
+CORBA_TypedefDef::CORBA_TypedefDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->CORBA_TypedefDef_setup_collocation (_tao_collocated);
 }
 
 
@@ -4291,87 +5159,47 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::DefinitionKind
   return _tao_result;
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::IRObject_ptr
+    const CORBA_IRObject_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::IRObject_ptr &
+    CORBA_IRObject_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::IRObject_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::IRObject_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::IRObject::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::Contained_ptr
+    const CORBA_Repository_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::Contained_ptr &
+    CORBA_Repository_ptr &
   );
-ACE_INLINE CORBA::Boolean
-operator<< (
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::Container_ptr
+    const CORBA_Container_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::Container_ptr &
+    CORBA_Container_ptr &
   );
-ACE_INLINE CORBA::Boolean
-operator<< (
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::Contained_ptr
+    const CORBA_Contained_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::Contained_ptr &
+    CORBA_Contained_ptr &
   );
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Contained::Description &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_Contained::Description &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.kind) &&
@@ -4383,7 +5211,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Containe
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::Contained::Description &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_Contained::Description &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.kind) &&
@@ -4395,70 +5223,222 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::Contained::Desc
   
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Contained_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::Contained_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::Contained::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
 
 #if !defined _TAO_CDR_OP_CORBA_ContainedSeq_I_
 #define _TAO_CDR_OP_CORBA_ContainedSeq_I_
 
 CORBA::Boolean TAO_IFR_Client_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA::ContainedSeq &
+    const CORBA_ContainedSeq &
   );
 CORBA::Boolean TAO_IFR_Client_Export operator>> (
     TAO_InputCDR &,
-    CORBA::ContainedSeq &
+    CORBA_ContainedSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_ContainedSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_ModuleDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_ModuleDef_ptr &
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_ConstantDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_ConstantDef_ptr &
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_IDLType_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_IDLType_ptr &
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_StructDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_StructDef_ptr &
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_UnionDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_UnionDef_ptr &
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_EnumDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_EnumDef_ptr &
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_AliasDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_AliasDef_ptr &
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_InterfaceDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_InterfaceDef_ptr &
+  );
+
+
+#if !defined _TAO_CDR_OP_CORBA_InterfaceDefSeq_I_
+#define _TAO_CDR_OP_CORBA_InterfaceDefSeq_I_
+
+CORBA::Boolean TAO_IFR_Client_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA_InterfaceDefSeq &
+  );
+CORBA::Boolean TAO_IFR_Client_Export operator>> (
+    TAO_InputCDR &,
+    CORBA_InterfaceDefSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_InterfaceDefSeq_I_ */
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::IDLType_ptr
+    const CORBA_ExceptionDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::IDLType_ptr &
+    CORBA_ExceptionDef_ptr &
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_NativeDef_ptr
   );
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::StructMember &_tao_aggregate)
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_NativeDef_ptr &
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_ValueDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_ValueDef_ptr &
+  );
+
+
+#if !defined _TAO_CDR_OP_CORBA_ValueDefSeq_I_
+#define _TAO_CDR_OP_CORBA_ValueDefSeq_I_
+
+CORBA::Boolean TAO_IFR_Client_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA_ValueDefSeq &
+  );
+CORBA::Boolean TAO_IFR_Client_Export operator>> (
+    TAO_InputCDR &,
+    CORBA_ValueDefSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_ValueDefSeq_I_ */
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_ValueBoxDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_ValueBoxDef_ptr &
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_AbstractInterfaceDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_AbstractInterfaceDef_ptr &
+  );
+
+
+#if !defined _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_I_
+#define _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_I_
+
+CORBA::Boolean TAO_IFR_Client_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA_AbstractInterfaceDefSeq &
+  );
+CORBA::Boolean TAO_IFR_Client_Export operator>> (
+    TAO_InputCDR &,
+    CORBA_AbstractInterfaceDefSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_I_ */
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const CORBA_LocalInterfaceDef_ptr
+  );
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    CORBA_LocalInterfaceDef_ptr &
+  );
+
+
+#if !defined _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_I_
+#define _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_I_
+
+CORBA::Boolean TAO_IFR_Client_Export operator<< (
+    TAO_OutputCDR &,
+    const CORBA_LocalInterfaceDefSeq &
+  );
+CORBA::Boolean TAO_IFR_Client_Export operator>> (
+    TAO_InputCDR &,
+    CORBA_LocalInterfaceDefSeq &
+  );
+
+#endif /* _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_I_ */
+
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_StructMember &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.name.in ()) &&
@@ -4471,7 +5451,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::StructMe
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::StructMember &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_StructMember &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.name.out ()) &&
@@ -4490,16 +5470,16 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::StructMember &_
 
 CORBA::Boolean TAO_IFR_Client_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA::StructMemberSeq &
+    const CORBA_StructMemberSeq &
   );
 CORBA::Boolean TAO_IFR_Client_Export operator>> (
     TAO_InputCDR &,
-    CORBA::StructMemberSeq &
+    CORBA_StructMemberSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_StructMemberSeq_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Initializer &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_Initializer &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.members) &&
@@ -4511,7 +5491,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Initiali
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::Initializer &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_Initializer &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.members) &&
@@ -4529,16 +5509,16 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::Initializer &_t
 
 CORBA::Boolean TAO_IFR_Client_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA::InitializerSeq &
+    const CORBA_InitializerSeq &
   );
 CORBA::Boolean TAO_IFR_Client_Export operator>> (
     TAO_InputCDR &,
-    CORBA::InitializerSeq &
+    CORBA_InitializerSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_InitializerSeq_I_ */
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::UnionMember &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_UnionMember &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.name.in ()) &&
@@ -4552,7 +5532,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::UnionMem
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::UnionMember &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_UnionMember &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.name.out ()) &&
@@ -4572,11 +5552,11 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::UnionMember &_t
 
 CORBA::Boolean TAO_IFR_Client_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA::UnionMemberSeq &
+    const CORBA_UnionMemberSeq &
   );
 CORBA::Boolean TAO_IFR_Client_Export operator>> (
     TAO_InputCDR &,
-    CORBA::UnionMemberSeq &
+    CORBA_UnionMemberSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_UnionMemberSeq_I_ */
@@ -4587,27 +5567,16 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 
 CORBA::Boolean TAO_IFR_Client_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA::EnumMemberSeq &
+    const CORBA_EnumMemberSeq &
   );
 CORBA::Boolean TAO_IFR_Client_Export operator>> (
     TAO_InputCDR &,
-    CORBA::EnumMemberSeq &
+    CORBA_EnumMemberSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_EnumMemberSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::Container_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::Container_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Container::Description &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_Container::Description &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.contained_object.in ()) &&
@@ -4620,7 +5589,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Containe
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::Container::Description &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_Container::Description &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.contained_object.out ()) &&
@@ -4639,152 +5608,26 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::Container::Desc
 
 CORBA::Boolean TAO_IFR_Client_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA::Container::DescriptionSeq &
+    const CORBA_Container::DescriptionSeq &
   );
 CORBA::Boolean TAO_IFR_Client_Export operator>> (
     TAO_InputCDR &,
-    CORBA::Container::DescriptionSeq &
+    CORBA_Container::DescriptionSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_Container_DescriptionSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Container_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::Container_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::Container::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::IDLType_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::IDLType_ptr &
+    const CORBA_TypedefDef_ptr
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::IDLType_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::IDLType_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::IDLType::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::TypedefDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::TypedefDef_ptr &
+    CORBA_TypedefDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::TypedefDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::TypedefDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::TypedefDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::TypeDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_TypeDescription &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.name.in ()) &&
@@ -4799,7 +5642,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::TypeDesc
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::TypeDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_TypeDescription &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.name.out ()) &&
diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl
index 2a2c926e533..f6004b62cea 100644
--- a/TAO/tao/IFR_Client/IFR_Basic.pidl
+++ b/TAO/tao/IFR_Client/IFR_Basic.pidl
@@ -16,15 +16,41 @@
 //   time. This IDL file contains the concrete base interfaces of
 //   the IFR, except for fixed types, valuetypes and CORBA components.
 //
-//   The command used to generate code from this IDL file is:
+//   1. Patch this pidl file with
 //
-//     tao_idl -o orig -Ge 1 \
+//      patch < diffs/IFR_Basic.pidl.diff
+//
+//   This will remove the CORBA module, rename most types foo
+//   declared in it as CORBA_foo, unalias the simple typedefs
+//   which don't have a CORBA_ analog in corbafwd.h.
+//
+//   2. Generate the code. The command used to generate code from this 
+//   IDL file is:
+//
+//     tao_idl -o orig -Ge 1 -I.. \
 //          -Wb,export_macro=TAO_IFR_Client_Export \
 //          -Wb,export_include=ifr_client_export.h \
 //          -Wb,pre_include="ace/pre.h" \
 //          -Wb,post_include="ace/post.h" \
 //          IFR_Basic.pidl
 //
+//   3. Copy the generated files to the current directory.
+//
+//   4. Patch the generated files, using
+//      
+//      patch < diffs/IFR_BasicC.h.diff
+//      patch < diffs/IFR_BasicC.i.diff
+//      patch < diffs/IFR_BasicC.cpp.diff
+//
+//   If this fails for some reason, the files must be patched
+//   by hand, and the diff files regenerated with
+//
+//      diff -wbu orig/IFR_BasicC.h IFR_BasicC.h > diffs/IFR_BasicC.h.diff
+//      diff -wbu orig/IFR_BasicC.i IFR_BasicC.i > diffs/IFR_BasicC.i.diff
+//      diff -wbu orig/IFR_BasicC.cpp IFR_BasicC.cpp > diffs/IFR_BasicC.cpp.diff
+//
+//   5. Restore IFR_Base.pidl.
+//
 //   To regenerate the skeleton files IFR_BasicS.{h,i,cpp} and 
 //   IFR_BasicS_T.{h,i.cpp} in ACE_ROOT/TAO/orbsvcs/IFR_Service, use the 
 //   command
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
index d33b1668a9d..35e0b2c56d6 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp
@@ -21,6 +21,9 @@
 
 #include "IFR_BasicC.h"
 
+#include "tao/Stub.h"
+#include "tao/Invocation.h"
+#include "tao/ClientRequestInfo.h"
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
@@ -34,3387 +37,188 @@
 #endif /* !defined INLINE */
 
 // *************************************************************
-// Functions moved from IFR_BaseC.cpp
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-class TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get : public TAO_ClientRequestInfo
-{
-public:
-  TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      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));
-
-  void result (CORBA::Repository_ptr result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get (const TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get &);
+// Operations for class CORBA_Repository_var
+// *************************************************************
 
-  CORBA::Repository_ptr _result;
-};
+CORBA_Repository_var::CORBA_Repository_var (void) // default constructor
+  : ptr_ (CORBA_Repository::_nil ())
+{}
 
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+::CORBA_Repository_ptr
+CORBA_Repository_var::ptr (void) const
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  return this->ptr_;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
+CORBA_Repository_var::CORBA_Repository_var (const ::CORBA_Repository_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_Repository::_duplicate (p.ptr ()))
+{}
 
-CORBA::Repository_ptr _TAO_Contained_Remote_Proxy_Impl::containing_repository (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+CORBA_Repository_var::~CORBA_Repository_var (void) // destructor
 {
-  
-  CORBA::Repository_ptr _tao_retval = CORBA::Repository::_nil ();
-  CORBA::Repository_var _tao_safe_retval (_tao_retval);
-  
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_containing_repository",
-      26,
-      0,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_CORBA_Contained_containing_repository_get ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::Repository_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+  CORBA::release (this->ptr_);
 }
-          
-#if TAO_HAS_INTERCEPTORS == 1
-class TAO_ClientRequestInfo_CORBA_Container_create_module : public TAO_ClientRequestInfo
-{
-public:
-  TAO_ClientRequestInfo_CORBA_Container_create_module (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * id,
-      const char * name,
-      const char * version,
-      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));
-
-  void result (CORBA::ModuleDef_ptr result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_Container_create_module (const TAO_ClientRequestInfo_CORBA_Container_create_module &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_module &);
-
-  const char * id_;
-  const char * name_;
-  const char * version_;
-  CORBA::ModuleDef_ptr _result;
-};
 
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Container_create_module::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+CORBA_Repository_var &
+CORBA_Repository_var::operator= (CORBA_Repository_ptr p)
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
 }
 
-class TAO_ClientRequestInfo_CORBA_Container_create_constant : public TAO_ClientRequestInfo
+CORBA_Repository_var &
+CORBA_Repository_var::operator= (const ::CORBA_Repository_var &p)
 {
-public:
-  TAO_ClientRequestInfo_CORBA_Container_create_constant (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      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 ()
-    );
-
-  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));
-
-  void result (CORBA::ConstantDef_ptr result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_Container_create_constant (const TAO_ClientRequestInfo_CORBA_Container_create_constant &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_constant &);
-
-  const char * id_;
-  const char * name_;
-  const char * version_;
-  CORBA::IDLType_ptr type_;
-  const CORBA::Any & value_;
-  CORBA::ConstantDef_ptr _result;
-};
-
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Container_create_constant::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_Repository::_duplicate (p.ptr ());
+  }
+  return *this;
 }
 
-class TAO_ClientRequestInfo_CORBA_Container_create_struct : public TAO_ClientRequestInfo
-{
-public:
-  TAO_ClientRequestInfo_CORBA_Container_create_struct (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::StructMemberSeq & members,
-      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));
-
-  void result (CORBA::StructDef_ptr result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_Container_create_struct (const TAO_ClientRequestInfo_CORBA_Container_create_struct &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_struct &);
-
-  const char * id_;
-  const char * name_;
-  const char * version_;
-  const CORBA::StructMemberSeq & members_;
-  CORBA::StructDef_ptr _result;
-};
-
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Container_create_struct::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+CORBA_Repository_var::operator const ::CORBA_Repository_ptr &() const // cast
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  return this->ptr_;
 }
 
-class TAO_ClientRequestInfo_CORBA_Container_create_union : public TAO_ClientRequestInfo
-{
-public:
-  TAO_ClientRequestInfo_CORBA_Container_create_union (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      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 ()
-    );
-
-  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));
-
-  void result (CORBA::UnionDef_ptr result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_Container_create_union (const TAO_ClientRequestInfo_CORBA_Container_create_union &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_union &);
-
-  const char * id_;
-  const char * name_;
-  const char * version_;
-  CORBA::IDLType_ptr discriminator_type_;
-  const CORBA::UnionMemberSeq & members_;
-  CORBA::UnionDef_ptr _result;
-};
-
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Container_create_union::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+CORBA_Repository_var::operator ::CORBA_Repository_ptr &() // cast 
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  return this->ptr_;
 }
 
-class TAO_ClientRequestInfo_CORBA_Container_create_enum : public TAO_ClientRequestInfo
+::CORBA_Repository_ptr
+CORBA_Repository_var::operator-> (void) const
 {
-public:
-  TAO_ClientRequestInfo_CORBA_Container_create_enum (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::EnumMemberSeq & members,
-      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));
-
-  void result (CORBA::EnumDef_ptr result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_Container_create_enum (const TAO_ClientRequestInfo_CORBA_Container_create_enum &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_enum &);
-
-  const char * id_;
-  const char * name_;
-  const char * version_;
-  const CORBA::EnumMemberSeq & members_;
-  CORBA::EnumDef_ptr _result;
-};
-
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Container_create_enum::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  return this->ptr_;
 }
 
-class TAO_ClientRequestInfo_CORBA_Container_create_alias : public TAO_ClientRequestInfo
+::CORBA_Repository_ptr
+CORBA_Repository_var::in (void) const
 {
-public:
-  TAO_ClientRequestInfo_CORBA_Container_create_alias (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::IDLType_ptr original_type,
-      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));
-
-  void result (CORBA::AliasDef_ptr result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_Container_create_alias (const TAO_ClientRequestInfo_CORBA_Container_create_alias &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_alias &);
-
-  const char * id_;
-  const char * name_;
-  const char * version_;
-  CORBA::IDLType_ptr original_type_;
-  CORBA::AliasDef_ptr _result;
-};
-
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Container_create_alias::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  return this->ptr_;
 }
 
-class TAO_ClientRequestInfo_CORBA_Container_create_interface : public TAO_ClientRequestInfo
-{
-public:
-  TAO_ClientRequestInfo_CORBA_Container_create_interface (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
-      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));
-
-  void result (CORBA::InterfaceDef_ptr result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_Container_create_interface (const TAO_ClientRequestInfo_CORBA_Container_create_interface &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_interface &);
-
-  const char * id_;
-  const char * name_;
-  const char * version_;
-  const CORBA::InterfaceDefSeq & base_interfaces_;
-  CORBA::InterfaceDef_ptr _result;
-};
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+::CORBA_Repository_ptr &
+CORBA_Repository_var::inout (void)
 {
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_interfaces = parameter_list->length ();
-  parameter_list->length (length_base_interfaces + 1);
-  (*parameter_list)[length_base_interfaces].argument <<=  this->base_interfaces_;
-  
-  (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
+  return this->ptr_;
 }
 
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Container_create_interface::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+::CORBA_Repository_ptr &
+CORBA_Repository_var::out (void)
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_Repository::_nil ();
+  return this->ptr_;
 }
 
-class TAO_ClientRequestInfo_CORBA_Container_create_exception : public TAO_ClientRequestInfo
+::CORBA_Repository_ptr
+CORBA_Repository_var::_retn (void)
 {
-public:
-  TAO_ClientRequestInfo_CORBA_Container_create_exception (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::StructMemberSeq & members,
-      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));
-
-  void result (CORBA::ExceptionDef_ptr result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_Container_create_exception (const TAO_ClientRequestInfo_CORBA_Container_create_exception &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_exception &);
-
-  const char * id_;
-  const char * name_;
-  const char * version_;
-  const CORBA::StructMemberSeq & members_;
-  CORBA::ExceptionDef_ptr _result;
-};
-
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Container_create_exception::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  // yield ownership of managed obj reference
+  ::CORBA_Repository_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_Repository::_nil ();
+  return val;
 }
 
-class TAO_ClientRequestInfo_CORBA_Container_create_native : public TAO_ClientRequestInfo
+::CORBA_Repository_ptr
+CORBA_Repository_var::duplicate (CORBA_Repository_ptr p)
 {
-public:
-  TAO_ClientRequestInfo_CORBA_Container_create_native (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * id,
-      const char * name,
-      const char * version,
-      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));
-
-  void result (CORBA::NativeDef_ptr result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_Container_create_native (const TAO_ClientRequestInfo_CORBA_Container_create_native &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_native &);
-
-  const char * id_;
-  const char * name_;
-  const char * version_;
-  CORBA::NativeDef_ptr _result;
-};
-
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Container_create_native::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  return ::CORBA_Repository::_duplicate (p);
 }
 
-class TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface : public TAO_ClientRequestInfo
-{
-public:
-  TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::AbstractInterfaceDefSeq & base_interfaces,
-      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));
-
-  void result (CORBA::AbstractInterfaceDef_ptr result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface (const TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface &);
-
-  const char * id_;
-  const char * name_;
-  const char * version_;
-  const CORBA::AbstractInterfaceDefSeq & base_interfaces_;
-  CORBA::AbstractInterfaceDef_ptr _result;
-};
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_interfaces = parameter_list->length ();
-  parameter_list->length (length_base_interfaces + 1);
-  (*parameter_list)[length_base_interfaces].argument <<=  this->base_interfaces_;
-  
-  (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
-}
-
-class TAO_ClientRequestInfo_CORBA_Container_create_local_interface : public TAO_ClientRequestInfo
-{
-public:
-  TAO_ClientRequestInfo_CORBA_Container_create_local_interface (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::InterfaceDefSeq & base_interfaces,
-      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));
-
-  void result (CORBA::LocalInterfaceDef_ptr result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_Container_create_local_interface (const TAO_ClientRequestInfo_CORBA_Container_create_local_interface &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_local_interface &);
-
-  const char * id_;
-  const char * name_;
-  const char * version_;
-  const CORBA::InterfaceDefSeq & base_interfaces_;
-  CORBA::LocalInterfaceDef_ptr _result;
-};
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_local_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+void
+CORBA_Repository_var::release (CORBA_Repository_ptr p)
 {
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_interfaces = parameter_list->length ();
-  parameter_list->length (length_base_interfaces + 1);
-  (*parameter_list)[length_base_interfaces].argument <<=  this->base_interfaces_;
-  
-  (*parameter_list)[length_base_interfaces].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
+  CORBA::release (p);
 }
 
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Container_create_local_interface::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+::CORBA_Repository_ptr
+CORBA_Repository_var::nil (void)
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  return ::CORBA_Repository::_nil ();
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
-CORBA::ModuleDef_ptr _TAO_Container_Remote_Proxy_Impl::create_module (
-    CORBA_Object *_collocated_tao_target_,
-    const char * id,
-    const char * name,
-    const char * version,
+::CORBA_Repository_ptr
+CORBA_Repository_var::narrow (
+    CORBA::Object *p,
     CORBA::Environment &ACE_TRY_ENV
   )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
 {
-  
-  CORBA::ModuleDef_ptr _tao_retval = CORBA::ModuleDef::_nil ();
-  CORBA::ModuleDef_var _tao_safe_retval (_tao_retval);
-  
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_module",
-      13,
-      1,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_CORBA_Container_create_module ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::ModuleDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+  return ::CORBA_Repository::_narrow (p, ACE_TRY_ENV);
 }
 
-CORBA::ConstantDef_ptr _TAO_Container_Remote_Proxy_Impl::create_constant (
-    CORBA_Object *_collocated_tao_target_,
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+CORBA::Object *
+CORBA_Repository_var::upcast (void *src)
 {
-  
-  CORBA::ConstantDef_ptr _tao_retval = CORBA::ConstantDef::_nil ();
-  CORBA::ConstantDef_var _tao_safe_retval (_tao_retval);
-  
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_constant",
-      15,
-      1,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_CORBA_Container_create_constant ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        type,
-        value,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << type) &&
-              (_tao_out << value)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::ConstantDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+  CORBA_Repository **tmp =
+    ACE_static_cast (CORBA_Repository **, src);
+  return *tmp;
 }
 
-CORBA::StructDef_ptr _TAO_Container_Remote_Proxy_Impl::create_struct (
-    CORBA_Object *_collocated_tao_target_,
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::StructDef_ptr _tao_retval = CORBA::StructDef::_nil ();
-  CORBA::StructDef_var _tao_safe_retval (_tao_retval);
-  
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_struct",
-      13,
-      1,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_CORBA_Container_create_struct ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        members,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << members)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::StructDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
-}
+// *************************************************************
+// Inline operations for class CORBA_Repository_out
+// *************************************************************
 
-CORBA::UnionDef_ptr _TAO_Container_Remote_Proxy_Impl::create_union (
-    CORBA_Object *_collocated_tao_target_,
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr discriminator_type,
-    const CORBA::UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+CORBA_Repository_out::CORBA_Repository_out (CORBA_Repository_ptr &p)
+  : ptr_ (p)
 {
-  
-  CORBA::UnionDef_ptr _tao_retval = CORBA::UnionDef::_nil ();
-  CORBA::UnionDef_var _tao_safe_retval (_tao_retval);
-  
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_union",
-      12,
-      1,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_CORBA_Container_create_union ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        discriminator_type,
-        members,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << discriminator_type) &&
-              (_tao_out << members)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::UnionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+  this->ptr_ = ::CORBA_Repository::_nil ();
 }
 
-CORBA::EnumDef_ptr _TAO_Container_Remote_Proxy_Impl::create_enum (
-    CORBA_Object *_collocated_tao_target_,
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+CORBA_Repository_out::CORBA_Repository_out (CORBA_Repository_var &p) // constructor from _var
+  : ptr_ (p.out ())
 {
-  
-  CORBA::EnumDef_ptr _tao_retval = CORBA::EnumDef::_nil ();
-  CORBA::EnumDef_var _tao_safe_retval (_tao_retval);
-  
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_enum",
-      11,
-      1,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_CORBA_Container_create_enum ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        members,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << members)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::EnumDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_Repository::_nil ();
 }
 
-CORBA::AliasDef_ptr _TAO_Container_Remote_Proxy_Impl::create_alias (
-    CORBA_Object *_collocated_tao_target_,
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  
-  CORBA::AliasDef_ptr _tao_retval = CORBA::AliasDef::_nil ();
-  CORBA::AliasDef_var _tao_safe_retval (_tao_retval);
-  
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_alias",
-      12,
-      1,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_CORBA_Container_create_alias ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        original_type,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << original_type)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::AliasDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
-}
+CORBA_Repository_out::CORBA_Repository_out (const ::CORBA_Repository_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_Repository_out &, p).ptr_)
+{}
 
-CORBA::InterfaceDef_ptr _TAO_Container_Remote_Proxy_Impl::create_interface (
-    CORBA_Object *_collocated_tao_target_,
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+::CORBA_Repository_out &
+CORBA_Repository_out::operator= (const ::CORBA_Repository_out &p)
 {
-  
-  CORBA::InterfaceDef_ptr _tao_retval = CORBA::InterfaceDef::_nil ();
-  CORBA::InterfaceDef_var _tao_safe_retval (_tao_retval);
-  
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_interface",
-      16,
-      1,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_CORBA_Container_create_interface ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        base_interfaces,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << base_interfaces)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+  this->ptr_ = ACE_const_cast (CORBA_Repository_out&, p).ptr_;
+  return *this;
 }
 
-CORBA::ExceptionDef_ptr _TAO_Container_Remote_Proxy_Impl::create_exception (
-    CORBA_Object *_collocated_tao_target_,
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+CORBA_Repository_out &
+CORBA_Repository_out::operator= (const ::CORBA_Repository_var &p)
 {
-  
-  CORBA::ExceptionDef_ptr _tao_retval = CORBA::ExceptionDef::_nil ();
-  CORBA::ExceptionDef_var _tao_safe_retval (_tao_retval);
-  
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_exception",
-      16,
-      1,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_CORBA_Container_create_exception ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        members,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << members)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::ExceptionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+  this->ptr_ = ::CORBA_Repository::_duplicate (p.ptr ());
+  return *this;
 }
 
-CORBA::NativeDef_ptr _TAO_Container_Remote_Proxy_Impl::create_native (
-    CORBA_Object *_collocated_tao_target_,
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+CORBA_Repository_out &
+CORBA_Repository_out::operator= (CORBA_Repository_ptr p)
 {
-  
-  CORBA::NativeDef_ptr _tao_retval = CORBA::NativeDef::_nil ();
-  CORBA::NativeDef_var _tao_safe_retval (_tao_retval);
-  
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_native",
-      13,
-      1,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_CORBA_Container_create_native ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::NativeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+  this->ptr_ = p;
+  return *this;
 }
 
-CORBA::AbstractInterfaceDef_ptr _TAO_Container_Remote_Proxy_Impl::create_abstract_interface (
-    CORBA_Object *_collocated_tao_target_,
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+CORBA_Repository_out::operator ::CORBA_Repository_ptr &() // cast
 {
-  
-  CORBA::AbstractInterfaceDef_ptr _tao_retval = CORBA::AbstractInterfaceDef::_nil ();
-  CORBA::AbstractInterfaceDef_var _tao_safe_retval (_tao_retval);
-  
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_abstract_interface",
-      25,
-      1,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_CORBA_Container_create_abstract_interface ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        base_interfaces,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << base_interfaces)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::AbstractInterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+  return this->ptr_;
 }
 
-CORBA::LocalInterfaceDef_ptr _TAO_Container_Remote_Proxy_Impl::create_local_interface (
-    CORBA_Object *_collocated_tao_target_,
-    const char * id,
-    const char * name,
-    const char * version,
-    const CORBA::InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+::CORBA_Repository_ptr &
+CORBA_Repository_out::ptr (void) // ptr
 {
-  
-  CORBA::LocalInterfaceDef_ptr _tao_retval = CORBA::LocalInterfaceDef::_nil ();
-  CORBA::LocalInterfaceDef_var _tao_safe_retval (_tao_retval);
-  
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_local_interface",
-      22,
-      1,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_CORBA_Container_create_local_interface ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        base_interfaces,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << base_interfaces)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::LocalInterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+  return this->ptr_;
 }
-          
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CS_
 
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::InterfaceDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::InterfaceDef **old = ACE_reinterpret_cast (CORBA::InterfaceDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = CORBA::InterfaceDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    CORBA::InterfaceDef **tmp = ACE_reinterpret_cast (CORBA::InterfaceDef**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::InterfaceDef::_nil ();
-    }
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
- _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    CORBA::InterfaceDef **tmp = ACE_reinterpret_cast (CORBA::InterfaceDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::InterfaceDef::_nil ();
-    }
-  }
-  void 
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    CORBA::InterfaceDef **tmp = ACE_static_cast (CORBA::InterfaceDef**, target);
-    *tmp = CORBA::InterfaceDef::_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
-
-  CORBA_Object*
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_upcast (void *src) const
-  {
-    CORBA::InterfaceDef **tmp = ACE_static_cast (CORBA::InterfaceDef**, src);
-    return *tmp;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_INTERFACEDEFSEQ_CS_)
-#define _CORBA_INTERFACEDEFSEQ_CS_
-
-// *************************************************************
-// CORBA_InterfaceDefSeq
-// *************************************************************
-
-CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (void)
-{}
-CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA::InterfaceDef_ptr *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA_InterfaceDefSeq::CORBA_InterfaceDefSeq (const CORBA_InterfaceDefSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA_InterfaceDefSeq::~CORBA_InterfaceDefSeq (void) // dtor
-{}
-void CORBA_InterfaceDefSeq::_tao_any_destructor (void *x)
-{
-  CORBA_InterfaceDefSeq *tmp = ACE_static_cast (CORBA_InterfaceDefSeq*,x);
-  delete tmp;
-}
-
-
-#endif /* end #if !defined */
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_
-
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::AbstractInterfaceDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::AbstractInterfaceDef **old = ACE_reinterpret_cast (CORBA::AbstractInterfaceDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = CORBA::AbstractInterfaceDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    CORBA::AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::AbstractInterfaceDef**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::AbstractInterfaceDef::_nil ();
-    }
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    CORBA::AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::AbstractInterfaceDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::AbstractInterfaceDef::_nil ();
-    }
-  }
-  void 
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    CORBA::AbstractInterfaceDef **tmp = ACE_static_cast (CORBA::AbstractInterfaceDef**, target);
-    *tmp = CORBA::AbstractInterfaceDef::_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
-
-  CORBA_Object*
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_upcast (void *src) const
-  {
-    CORBA::AbstractInterfaceDef **tmp = ACE_static_cast (CORBA::AbstractInterfaceDef**, src);
-    return *tmp;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ_CS_
-
-// *************************************************************
-// CORBA_AbstractInterfaceDefSeq
-// *************************************************************
-
-CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (void)
-{}
-CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA::AbstractInterfaceDef_ptr *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA_AbstractInterfaceDefSeq::CORBA_AbstractInterfaceDefSeq (const CORBA_AbstractInterfaceDefSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA_AbstractInterfaceDefSeq::~CORBA_AbstractInterfaceDefSeq (void) // dtor
-{}
-void CORBA_AbstractInterfaceDefSeq::_tao_any_destructor (void *x)
-{
-  CORBA_AbstractInterfaceDefSeq *tmp = ACE_static_cast (CORBA_AbstractInterfaceDefSeq*,x);
-  delete tmp;
-}
-
-
-#endif /* end #if !defined */
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CS_
-
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::LocalInterfaceDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::LocalInterfaceDef **old = ACE_reinterpret_cast (CORBA::LocalInterfaceDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = CORBA::LocalInterfaceDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    CORBA::LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::LocalInterfaceDef**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::LocalInterfaceDef::_nil ();
-    }
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    CORBA::LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::LocalInterfaceDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::LocalInterfaceDef::_nil ();
-    }
-  }
-  void 
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    CORBA::LocalInterfaceDef **tmp = ACE_static_cast (CORBA::LocalInterfaceDef**, target);
-    *tmp = CORBA::LocalInterfaceDef::_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
-
-  CORBA_Object*
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_upcast (void *src) const
-  {
-    CORBA::LocalInterfaceDef **tmp = ACE_static_cast (CORBA::LocalInterfaceDef**, src);
-    return *tmp;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CS_)
-#define _CORBA_LOCALINTERFACEDEFSEQ_CS_
-
-// *************************************************************
-// CORBA_LocalInterfaceDefSeq
-// *************************************************************
-
-CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (void)
-{}
-CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA::LocalInterfaceDef_ptr *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA_LocalInterfaceDefSeq::CORBA_LocalInterfaceDefSeq (const CORBA_LocalInterfaceDefSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA_LocalInterfaceDefSeq::~CORBA_LocalInterfaceDefSeq (void) // dtor
-{}
-void CORBA_LocalInterfaceDefSeq::_tao_any_destructor (void *x)
+::CORBA_Repository_ptr
+CORBA_Repository_out::operator-> (void)
 {
-  CORBA_LocalInterfaceDefSeq *tmp = ACE_static_cast (CORBA_LocalInterfaceDefSeq*,x);
-  delete tmp;
+  return this->ptr_;
 }
 
 
-#endif /* end #if !defined */
-
-// *********************************************************************
-
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_Repository_lookup_id : public TAO_ClientRequestInfo
 {
@@ -3445,14 +249,14 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::Contained_ptr result);
+  void result (CORBA_Contained_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Repository_lookup_id (const TAO_ClientRequestInfo_CORBA_Repository_lookup_id &);
   void operator= (const TAO_ClientRequestInfo_CORBA_Repository_lookup_id &);
 
   const char * search_id_;
-  CORBA::Contained_ptr _result;
+  CORBA_Contained_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Repository_lookup_id::TAO_ClientRequestInfo_CORBA_Repository_lookup_id (
@@ -3514,7 +318,7 @@ TAO_ClientRequestInfo_CORBA_Repository_lookup_id::result (CORBA::Environment &AC
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_Repository_lookup_id::result (CORBA::Contained_ptr result)
+TAO_ClientRequestInfo_CORBA_Repository_lookup_id::result (CORBA_Contained_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -3758,14 +562,14 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::StringDef_ptr result);
+  void result (CORBA_StringDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Repository_create_string (const TAO_ClientRequestInfo_CORBA_Repository_create_string &);
   void operator= (const TAO_ClientRequestInfo_CORBA_Repository_create_string &);
 
   const CORBA::ULong & bound_;
-  CORBA::StringDef_ptr _result;
+  CORBA_StringDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Repository_create_string::TAO_ClientRequestInfo_CORBA_Repository_create_string (
@@ -3827,7 +631,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_string::result (CORBA::Environment
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_Repository_create_string::result (CORBA::StringDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Repository_create_string::result (CORBA_StringDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -3862,14 +666,14 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::WstringDef_ptr result);
+  void result (CORBA_WstringDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Repository_create_wstring (const TAO_ClientRequestInfo_CORBA_Repository_create_wstring &);
   void operator= (const TAO_ClientRequestInfo_CORBA_Repository_create_wstring &);
 
   const CORBA::ULong & bound_;
-  CORBA::WstringDef_ptr _result;
+  CORBA_WstringDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Repository_create_wstring::TAO_ClientRequestInfo_CORBA_Repository_create_wstring (
@@ -3931,7 +735,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_wstring::result (CORBA::Environmen
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_Repository_create_wstring::result (CORBA::WstringDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Repository_create_wstring::result (CORBA_WstringDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -3944,7 +748,7 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & bound,
-      CORBA::IDLType_ptr element_type,
+      CORBA_IDLType_ptr element_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -3967,22 +771,22 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::SequenceDef_ptr result);
+  void result (CORBA_SequenceDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Repository_create_sequence (const TAO_ClientRequestInfo_CORBA_Repository_create_sequence &);
   void operator= (const TAO_ClientRequestInfo_CORBA_Repository_create_sequence &);
 
   const CORBA::ULong & bound_;
-  CORBA::IDLType_ptr element_type_;
-  CORBA::SequenceDef_ptr _result;
+  CORBA_IDLType_ptr element_type_;
+  CORBA_SequenceDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Repository_create_sequence::TAO_ClientRequestInfo_CORBA_Repository_create_sequence (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & bound,
-    CORBA::IDLType_ptr element_type,
+    CORBA_IDLType_ptr element_type,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -4045,7 +849,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_sequence::result (CORBA::Environme
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_Repository_create_sequence::result (CORBA::SequenceDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Repository_create_sequence::result (CORBA_SequenceDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -4058,7 +862,7 @@ public:
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
       const CORBA::ULong & length,
-      CORBA::IDLType_ptr element_type,
+      CORBA_IDLType_ptr element_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -4081,22 +885,22 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ArrayDef_ptr result);
+  void result (CORBA_ArrayDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Repository_create_array (const TAO_ClientRequestInfo_CORBA_Repository_create_array &);
   void operator= (const TAO_ClientRequestInfo_CORBA_Repository_create_array &);
 
   const CORBA::ULong & length_;
-  CORBA::IDLType_ptr element_type_;
-  CORBA::ArrayDef_ptr _result;
+  CORBA_IDLType_ptr element_type_;
+  CORBA_ArrayDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Repository_create_array::TAO_ClientRequestInfo_CORBA_Repository_create_array (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
     const CORBA::ULong & length,
-    CORBA::IDLType_ptr element_type,
+    CORBA_IDLType_ptr element_type,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -4159,7 +963,7 @@ TAO_ClientRequestInfo_CORBA_Repository_create_array::result (CORBA::Environment
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_Repository_create_array::result (CORBA::ArrayDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Repository_create_array::result (CORBA_ArrayDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -4195,7 +999,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::FixedDef_ptr result);
+  void result (CORBA_FixedDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Repository_create_fixed (const TAO_ClientRequestInfo_CORBA_Repository_create_fixed &);
@@ -4203,7 +1007,7 @@ private:
 
   const CORBA::UShort & digits_;
   const CORBA::Short & scale_;
-  CORBA::FixedDef_ptr _result;
+  CORBA_FixedDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Repository_create_fixed::TAO_ClientRequestInfo_CORBA_Repository_create_fixed (
@@ -4255,8 +1059,24 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::exceptions (CORBA::Environm
 }
 
 
+CORBA::Any * 
+TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
 void 
-TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (CORBA::FixedDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (CORBA_FixedDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -4268,15 +1088,15 @@ TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (CORBA::FixedDef_ptr
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_Repository_Proxy_Impl::_TAO_Repository_Proxy_Impl (void)
+_TAO_CORBA_Repository_Proxy_Impl::_TAO_CORBA_Repository_Proxy_Impl (void)
 {}
 
-_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (void)
+_TAO_CORBA_Repository_Remote_Proxy_Impl::_TAO_CORBA_Repository_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::Contained_ptr _TAO_Repository_Remote_Proxy_Impl::lookup_id (
+CORBA_Contained_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::lookup_id (
     CORBA_Object *_collocated_tao_target_,
     const char * search_id,
     CORBA::Environment &ACE_TRY_ENV
@@ -4286,8 +1106,8 @@ CORBA::Contained_ptr _TAO_Repository_Remote_Proxy_Impl::lookup_id (
   ))
 {
   
-  CORBA::Contained_ptr _tao_retval = CORBA::Contained::_nil ();
-  CORBA::Contained_var _tao_safe_retval (_tao_retval);
+  CORBA_Contained_ptr _tao_retval = CORBA_Contained::_nil ();
+  CORBA_Contained_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -4382,7 +1202,7 @@ CORBA::Contained_ptr _TAO_Repository_Remote_Proxy_Impl::lookup_id (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -4448,7 +1268,7 @@ CORBA::Contained_ptr _TAO_Repository_Remote_Proxy_Impl::lookup_id (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::TypeCode_ptr _TAO_Repository_Remote_Proxy_Impl::get_canonical_typecode (
+CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typecode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::TypeCode_ptr tc,
     CORBA::Environment &ACE_TRY_ENV
@@ -4620,7 +1440,7 @@ CORBA::TypeCode_ptr _TAO_Repository_Remote_Proxy_Impl::get_canonical_typecode (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::PrimitiveDef_ptr _TAO_Repository_Remote_Proxy_Impl::get_primitive (
+CORBA::PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
     CORBA_Object *_collocated_tao_target_,
     CORBA::PrimitiveKind kind,
     CORBA::Environment &ACE_TRY_ENV
@@ -4630,8 +1450,8 @@ CORBA::PrimitiveDef_ptr _TAO_Repository_Remote_Proxy_Impl::get_primitive (
   ))
 {
   
-  CORBA::PrimitiveDef_ptr _tao_retval = CORBA::PrimitiveDef::_nil ();
-  CORBA::PrimitiveDef_var _tao_safe_retval (_tao_retval);
+  CORBA::PrimitiveDef_ptr _tao_retval = CORBA_PrimitiveDef::_nil ();
+  CORBA_PrimitiveDef_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -4792,7 +1612,7 @@ CORBA::PrimitiveDef_ptr _TAO_Repository_Remote_Proxy_Impl::get_primitive (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::StringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_string (
+CORBA_StringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_string (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
@@ -4802,8 +1622,8 @@ CORBA::StringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_string (
   ))
 {
   
-  CORBA::StringDef_ptr _tao_retval = CORBA::StringDef::_nil ();
-  CORBA::StringDef_var _tao_safe_retval (_tao_retval);
+  CORBA_StringDef_ptr _tao_retval = CORBA_StringDef::_nil ();
+  CORBA_StringDef_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -4898,7 +1718,7 @@ CORBA::StringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_string (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::StringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_StringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -4964,7 +1784,7 @@ CORBA::StringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_string (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::WstringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_wstring (
+CORBA_WstringDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_wstring (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
@@ -4974,8 +1794,8 @@ CORBA::WstringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_wstring (
   ))
 {
   
-  CORBA::WstringDef_ptr _tao_retval = CORBA::WstringDef::_nil ();
-  CORBA::WstringDef_var _tao_safe_retval (_tao_retval);
+  CORBA_WstringDef_ptr _tao_retval = CORBA_WstringDef::_nil ();
+  CORBA_WstringDef_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -5070,7 +1890,7 @@ CORBA::WstringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_wstring (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::WstringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_WstringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -5136,10 +1956,10 @@ CORBA::WstringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_wstring (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::SequenceDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_sequence (
+CORBA_SequenceDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_sequence (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
-    CORBA::IDLType_ptr element_type,
+    CORBA_IDLType_ptr element_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5147,8 +1967,8 @@ CORBA::SequenceDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_sequence (
   ))
 {
   
-  CORBA::SequenceDef_ptr _tao_retval = CORBA::SequenceDef::_nil ();
-  CORBA::SequenceDef_var _tao_safe_retval (_tao_retval);
+  CORBA_SequenceDef_ptr _tao_retval = CORBA_SequenceDef::_nil ();
+  CORBA_SequenceDef_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -5245,7 +2065,7 @@ CORBA::SequenceDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_sequence (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::SequenceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_SequenceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -5311,10 +2131,10 @@ CORBA::SequenceDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_sequence (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::ArrayDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_array (
+CORBA_ArrayDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_array (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong length,
-    CORBA::IDLType_ptr element_type,
+    CORBA_IDLType_ptr element_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -5322,8 +2142,8 @@ CORBA::ArrayDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_array (
   ))
 {
   
-  CORBA::ArrayDef_ptr _tao_retval = CORBA::ArrayDef::_nil ();
-  CORBA::ArrayDef_var _tao_safe_retval (_tao_retval);
+  CORBA_ArrayDef_ptr _tao_retval = CORBA_ArrayDef::_nil ();
+  CORBA_ArrayDef_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -5420,7 +2240,182 @@ CORBA::ArrayDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_array (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::ArrayDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_ArrayDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              ri.result (_tao_retval_info);
+              _tao_safe_retval = _tao_retval_info;
+            );
+          
+          TAO_INTERCEPTOR (
+            ri.reply_status (_invoke_status);
+            if (_invoke_status == TAO_INVOKE_OK)
+              {
+                _tao_vfr.receive_reply (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            else
+              {
+                _tao_vfr.receive_other (
+                  &ri,
+                  ACE_TRY_ENV
+                );
+              }
+            
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+#if TAO_HAS_INTERCEPTORS == 1
+        }
+      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
+        {
+          _invoke_status =
+            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
+          ACE_TRY_CHECK;
+          
+          ri.forward_reference (exc); 
+          _tao_vfr.receive_other (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ri.exception (&ACE_ANY_EXCEPTION);
+          _tao_vfr.receive_exception (
+            &ri,
+            ACE_TRY_ENV
+          );
+          ACE_TRY_CHECK;
+          ACE_RE_THROW;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+      
+#endif /* TAO_HAS_INTERCEPTORS */
+
+      if (_invoke_status == TAO_INVOKE_RESTART)
+        {
+          _tao_call.restart_flag (1);
+          continue;
+        }
+      
+      break;
+    }
+  return _tao_safe_retval._retn ();
+}
+
+CORBA_FixedDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::create_fixed (
+    CORBA_Object *_collocated_tao_target_,
+    CORBA::UShort digits,
+    CORBA::Short scale,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  
+  CORBA_FixedDef_ptr _tao_retval = tao_CORBA_FixedDef_nil ();
+  CORBA_FixedDef_var _tao_safe_retval (_tao_retval);
+  
+  
+  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (istub == 0)
+    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+  
+  TAO_GIOP_Twoway_Invocation _tao_call (
+      istub,
+      "create_fixed",
+      12,
+      1,
+      istub->orb_core ()
+    );
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+      istub->orb_core ()->client_request_interceptors ()
+    );
+  
+#endif  /* TAO_HAS_INTERCEPTORS */
+  
+  for (;;)
+    {
+      int _invoke_status = TAO_INVOKE_EXCEPTION;
+      
+#if TAO_HAS_INTERCEPTORS == 1
+      TAO_ClientRequestInfo_CORBA_Repository_create_fixed ri (
+        &_tao_call,
+        _collocated_tao_target_,
+        digits,
+        scale,
+        ACE_TRY_ENV
+      );
+      ACE_CHECK_RETURN (0);
+      
+      ACE_TRY
+        {
+#endif /* TAO_HAS_INTERCEPTORS */
+        
+          _tao_call.start (ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+          TAO_INTERCEPTOR (ri.response_expected (1));
+          
+          TAO_INTERCEPTOR (
+            _tao_vfr.send_request (
+              &ri,
+              ACE_TRY_ENV
+            )
+          );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          _tao_call.prepare_header (
+              ACE_static_cast (CORBA::Octet, _tao_response_flag),
+              ACE_TRY_ENV
+            );
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+          if (!(
+                            (_tao_out << digits) &&
+              (_tao_out << scale)
+            ))
+            TAO_INTERCEPTOR_THROW_RETURN (
+              CORBA::MARSHAL (),
+              0
+            );
+            
+          _invoke_status =
+            _tao_call.invoke (0, 0, ACE_TRY_ENV);
+          TAO_INTERCEPTOR_CHECK_RETURN (0);
+          
+          if (_invoke_status == TAO_INVOKE_EXCEPTION)
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+          if (!(
+                            (_tao_in >> _tao_safe_retval.inout ())
+              ))
+            {
+              TAO_INTERCEPTOR_THROW_RETURN (
+                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+                0
+              );
+              
+            }
+          
+          TAO_INTERCEPTOR (
+              CORBA_FixedDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -5496,36 +2491,36 @@ CORBA::ArrayDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_array (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_Repository_Proxy_Broker::_TAO_Repository_Proxy_Broker (void)
+_TAO_CORBA_Repository_Proxy_Broker::_TAO_CORBA_Repository_Proxy_Broker (void)
 {
 }
 
-_TAO_Repository_Proxy_Broker::~_TAO_Repository_Proxy_Broker (void)
+_TAO_CORBA_Repository_Proxy_Broker::~_TAO_CORBA_Repository_Proxy_Broker (void)
 {
 }
 
-_TAO_Repository_Proxy_Broker * (*CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_Repository_Proxy_Broker * (*_TAO_CORBA_Repository_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_Repository_Remote_Proxy_Broker *
-_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker (void)
+_TAO_CORBA_Repository_Remote_Proxy_Broker *
+_TAO_CORBA_Repository_Remote_Proxy_Broker::the_TAO_CORBA_Repository_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_Repository_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_Repository_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_Repository_Remote_Proxy_Broker::_TAO_Repository_Remote_Proxy_Broker (void)
+_TAO_CORBA_Repository_Remote_Proxy_Broker::_TAO_CORBA_Repository_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_Repository_Remote_Proxy_Broker::~_TAO_Repository_Remote_Proxy_Broker (void)
+_TAO_CORBA_Repository_Remote_Proxy_Broker::~_TAO_CORBA_Repository_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_Repository_Proxy_Impl&
-_TAO_Repository_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_Repository_Proxy_Impl&
+_TAO_CORBA_Repository_Remote_Proxy_Broker::select_proxy (
   ::CORBA_Repository *,
   CORBA::Environment &
 )
@@ -5550,72 +2545,72 @@ CORBA_Repository::~CORBA_Repository (void)
 {}
 
 void
-CORBA::Repository::CORBA_Repository_setup_collocation (int collocated)
+CORBA_Repository::CORBA_Repository_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_Repository_Proxy_Broker_ =
-      ::CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_Repository_Proxy_Broker_ =
+      ::_TAO_CORBA_Repository_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_Repository_Proxy_Broker_ =
-      ::_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_Repository_Proxy_Broker_ =
+      ::_TAO_CORBA_Repository_Remote_Proxy_Broker::the_TAO_CORBA_Repository_Remote_Proxy_Broker ();
   
   this->CORBA_Container_setup_collocation (collocated);
 }
 
-void CORBA::Repository::_tao_any_destructor (void *x)
+void CORBA_Repository::_tao_any_destructor (void *x)
 {
   CORBA_Repository *tmp = ACE_static_cast (CORBA_Repository*,x);
   CORBA::release (tmp);
 }
 
-CORBA::Repository_ptr CORBA::Repository::_narrow (
+CORBA_Repository_ptr CORBA_Repository::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::Repository::_nil ();
+    return CORBA_Repository::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Repository:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::Repository::_nil ());
+      ACE_CHECK_RETURN (CORBA_Repository::_nil ());
       if (is_a == 0)
-        return CORBA::Repository::_nil ();
+        return CORBA_Repository::_nil ();
     }
-  return CORBA::Repository::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_Repository::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::Repository_ptr CORBA::Repository::_unchecked_narrow (
+CORBA_Repository_ptr CORBA_Repository::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::Repository::_nil ();
+    return CORBA_Repository::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::Repository_ptr default_proxy = CORBA::Repository::_nil ();
+      CORBA_Repository_ptr default_proxy = CORBA_Repository::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_Repository_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::Repository (
+          ::CORBA_Repository (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::Repository::_nil ());
+          CORBA_Repository::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::Repository (stub, 0, obj->_servant ()), CORBA::Repository::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_Repository (stub, 0, obj->_servant ()), CORBA_Repository::_nil ());
         return default_proxy;
       }
     else 
@@ -5634,15 +2629,15 @@ CORBA::Repository_ptr CORBA::Repository::_unchecked_narrow (
           );
 }
 
-CORBA::Repository_ptr
-CORBA::Repository::_duplicate (CORBA::Repository_ptr obj)
+CORBA_Repository_ptr
+CORBA_Repository::_duplicate (CORBA_Repository_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::Repository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_Repository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) ||
@@ -5654,34 +2649,34 @@ CORBA::Boolean CORBA::Repository::_is_a (const CORBA::Char *value, CORBA::Enviro
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::Repository::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_Repository::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_Repository::_narrow))
+      &CORBA_Repository::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Container::_narrow))
+      &CORBA_Container::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Container_ptr,
+            CORBA_Container_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -5694,12 +2689,12 @@ void *CORBA::Repository::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::Repository::_interface_repository_id (void) const
+const char* CORBA_Repository::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/Repository:1.0";
 }
 
-CORBA::Contained_ptr CORBA::Repository::lookup_id (
+CORBA_Contained_ptr CORBA_Repository::lookup_id (
     const char * search_id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5707,8 +2702,8 @@ CORBA::Contained_ptr CORBA::Repository::lookup_id (
     CORBA::SystemException
   ))
 {
-  _TAO_Repository_Proxy_Impl &proxy = 
-    this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Repository_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.lookup_id (
@@ -5718,7 +2713,7 @@ CORBA::Contained_ptr CORBA::Repository::lookup_id (
     );
 }
 
-CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
+CORBA::TypeCode_ptr CORBA_Repository::get_canonical_typecode (
     CORBA::TypeCode_ptr tc,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5726,8 +2721,8 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     CORBA::SystemException
   ))
 {
-  _TAO_Repository_Proxy_Impl &proxy = 
-    this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Repository_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.get_canonical_typecode (
@@ -5737,7 +2732,7 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     );
 }
 
-CORBA::PrimitiveDef_ptr CORBA::Repository::get_primitive (
+CORBA::PrimitiveDef_ptr CORBA_Repository::get_primitive (
     CORBA::PrimitiveKind kind,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5745,8 +2740,8 @@ CORBA::PrimitiveDef_ptr CORBA::Repository::get_primitive (
     CORBA::SystemException
   ))
 {
-  _TAO_Repository_Proxy_Impl &proxy = 
-    this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Repository_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.get_primitive (
@@ -5756,7 +2751,7 @@ CORBA::PrimitiveDef_ptr CORBA::Repository::get_primitive (
     );
 }
 
-CORBA::StringDef_ptr CORBA::Repository::create_string (
+CORBA_StringDef_ptr CORBA_Repository::create_string (
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5764,8 +2759,8 @@ CORBA::StringDef_ptr CORBA::Repository::create_string (
     CORBA::SystemException
   ))
 {
-  _TAO_Repository_Proxy_Impl &proxy = 
-    this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Repository_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_string (
@@ -5775,7 +2770,7 @@ CORBA::StringDef_ptr CORBA::Repository::create_string (
     );
 }
 
-CORBA::WstringDef_ptr CORBA::Repository::create_wstring (
+CORBA_WstringDef_ptr CORBA_Repository::create_wstring (
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5783,8 +2778,8 @@ CORBA::WstringDef_ptr CORBA::Repository::create_wstring (
     CORBA::SystemException
   ))
 {
-  _TAO_Repository_Proxy_Impl &proxy = 
-    this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Repository_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_wstring (
@@ -5794,17 +2789,17 @@ CORBA::WstringDef_ptr CORBA::Repository::create_wstring (
     );
 }
 
-CORBA::SequenceDef_ptr CORBA::Repository::create_sequence (
+CORBA_SequenceDef_ptr CORBA_Repository::create_sequence (
     CORBA::ULong bound,
-    CORBA::IDLType_ptr element_type,
+    CORBA_IDLType_ptr element_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Repository_Proxy_Impl &proxy = 
-    this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Repository_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_sequence (
@@ -5815,17 +2810,17 @@ CORBA::SequenceDef_ptr CORBA::Repository::create_sequence (
     );
 }
 
-CORBA::ArrayDef_ptr CORBA::Repository::create_array (
+CORBA_ArrayDef_ptr CORBA_Repository::create_array (
     CORBA::ULong length,
-    CORBA::IDLType_ptr element_type,
+    CORBA_IDLType_ptr element_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_Repository_Proxy_Impl &proxy = 
-    this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Repository_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_array (
@@ -5836,7 +2831,7 @@ CORBA::ArrayDef_ptr CORBA::Repository::create_array (
     );
 }
 
-CORBA::FixedDef_ptr CORBA::Repository::create_fixed (
+CORBA_FixedDef_ptr CORBA_Repository::create_fixed (
     CORBA::UShort digits,
     CORBA::Short scale,
     CORBA::Environment &ACE_TRY_ENV
@@ -5845,8 +2840,8 @@ CORBA::FixedDef_ptr CORBA::Repository::create_fixed (
     CORBA::SystemException
   ))
 {
-  _TAO_Repository_Proxy_Impl &proxy = 
-    this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_Repository_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_fixed (
@@ -5857,6 +2852,188 @@ CORBA::FixedDef_ptr CORBA::Repository::create_fixed (
     );
 }
 
+// *************************************************************
+// Operations for class CORBA_ModuleDef_var
+// *************************************************************
+
+CORBA_ModuleDef_var::CORBA_ModuleDef_var (void) // default constructor
+  : ptr_ (CORBA_ModuleDef::_nil ())
+{}
+
+::CORBA_ModuleDef_ptr
+CORBA_ModuleDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_ModuleDef_var::CORBA_ModuleDef_var (const ::CORBA_ModuleDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_ModuleDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_ModuleDef_var::~CORBA_ModuleDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_ModuleDef_var &
+CORBA_ModuleDef_var::operator= (CORBA_ModuleDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_ModuleDef_var &
+CORBA_ModuleDef_var::operator= (const ::CORBA_ModuleDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_ModuleDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_ModuleDef_var::operator const ::CORBA_ModuleDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_ModuleDef_var::operator ::CORBA_ModuleDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_ModuleDef_ptr
+CORBA_ModuleDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_ModuleDef_ptr
+CORBA_ModuleDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_ModuleDef_ptr &
+CORBA_ModuleDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_ModuleDef_ptr &
+CORBA_ModuleDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_ModuleDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_ModuleDef_ptr
+CORBA_ModuleDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_ModuleDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_ModuleDef::_nil ();
+  return val;
+}
+
+::CORBA_ModuleDef_ptr
+CORBA_ModuleDef_var::duplicate (CORBA_ModuleDef_ptr p)
+{
+  return ::CORBA_ModuleDef::_duplicate (p);
+}
+
+void
+CORBA_ModuleDef_var::release (CORBA_ModuleDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_ModuleDef_ptr
+CORBA_ModuleDef_var::nil (void)
+{
+  return ::CORBA_ModuleDef::_nil ();
+}
+
+::CORBA_ModuleDef_ptr
+CORBA_ModuleDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_ModuleDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_ModuleDef_var::upcast (void *src)
+{
+  CORBA_ModuleDef **tmp =
+    ACE_static_cast (CORBA_ModuleDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_ModuleDef_out
+// *************************************************************
+
+CORBA_ModuleDef_out::CORBA_ModuleDef_out (CORBA_ModuleDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_ModuleDef::_nil ();
+}
+
+CORBA_ModuleDef_out::CORBA_ModuleDef_out (CORBA_ModuleDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_ModuleDef::_nil ();
+}
+
+CORBA_ModuleDef_out::CORBA_ModuleDef_out (const ::CORBA_ModuleDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_ModuleDef_out &, p).ptr_)
+{}
+
+::CORBA_ModuleDef_out &
+CORBA_ModuleDef_out::operator= (const ::CORBA_ModuleDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_ModuleDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_ModuleDef_out &
+CORBA_ModuleDef_out::operator= (const ::CORBA_ModuleDef_var &p)
+{
+  this->ptr_ = ::CORBA_ModuleDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_ModuleDef_out &
+CORBA_ModuleDef_out::operator= (CORBA_ModuleDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_ModuleDef_out::operator ::CORBA_ModuleDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_ModuleDef_ptr &
+CORBA_ModuleDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_ModuleDef_ptr
+CORBA_ModuleDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -5865,10 +3042,10 @@ CORBA::FixedDef_ptr CORBA::Repository::create_fixed (
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_ModuleDef_Proxy_Impl::_TAO_ModuleDef_Proxy_Impl (void)
+_TAO_CORBA_ModuleDef_Proxy_Impl::_TAO_CORBA_ModuleDef_Proxy_Impl (void)
 {}
 
-_TAO_ModuleDef_Remote_Proxy_Impl::_TAO_ModuleDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_ModuleDef_Remote_Proxy_Impl::_TAO_CORBA_ModuleDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
@@ -5883,36 +3060,36 @@ _TAO_ModuleDef_Remote_Proxy_Impl::_TAO_ModuleDef_Remote_Proxy_Impl (void)
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_ModuleDef_Proxy_Broker::_TAO_ModuleDef_Proxy_Broker (void)
+_TAO_CORBA_ModuleDef_Proxy_Broker::_TAO_CORBA_ModuleDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ModuleDef_Proxy_Broker::~_TAO_ModuleDef_Proxy_Broker (void)
+_TAO_CORBA_ModuleDef_Proxy_Broker::~_TAO_CORBA_ModuleDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ModuleDef_Proxy_Broker * (*CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_ModuleDef_Proxy_Broker * (*_TAO_CORBA_ModuleDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_ModuleDef_Remote_Proxy_Broker *
-_TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ModuleDef_Remote_Proxy_Broker *
+_TAO_CORBA_ModuleDef_Remote_Proxy_Broker::the_TAO_CORBA_ModuleDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_ModuleDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_ModuleDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_ModuleDef_Remote_Proxy_Broker::_TAO_ModuleDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ModuleDef_Remote_Proxy_Broker::_TAO_CORBA_ModuleDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_ModuleDef_Remote_Proxy_Broker::~_TAO_ModuleDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ModuleDef_Remote_Proxy_Broker::~_TAO_CORBA_ModuleDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_ModuleDef_Proxy_Impl&
-_TAO_ModuleDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_ModuleDef_Proxy_Impl&
+_TAO_CORBA_ModuleDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_ModuleDef *,
   CORBA::Environment &
 )
@@ -5937,74 +3114,74 @@ CORBA_ModuleDef::~CORBA_ModuleDef (void)
 {}
 
 void
-CORBA::ModuleDef::CORBA_ModuleDef_setup_collocation (int collocated)
+CORBA_ModuleDef::CORBA_ModuleDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_ModuleDef_Proxy_Broker_ =
-      ::CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_ModuleDef_Proxy_Broker_ =
+      ::_TAO_CORBA_ModuleDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_ModuleDef_Proxy_Broker_ =
-      ::_TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_ModuleDef_Proxy_Broker_ =
+      ::_TAO_CORBA_ModuleDef_Remote_Proxy_Broker::the_TAO_CORBA_ModuleDef_Remote_Proxy_Broker ();
   
   this->CORBA_Container_setup_collocation (collocated);
   
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-void CORBA::ModuleDef::_tao_any_destructor (void *x)
+void CORBA_ModuleDef::_tao_any_destructor (void *x)
 {
   CORBA_ModuleDef *tmp = ACE_static_cast (CORBA_ModuleDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::ModuleDef_ptr CORBA::ModuleDef::_narrow (
+CORBA_ModuleDef_ptr CORBA_ModuleDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::ModuleDef::_nil ();
+    return CORBA_ModuleDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ModuleDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::ModuleDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ());
       if (is_a == 0)
-        return CORBA::ModuleDef::_nil ();
+        return CORBA_ModuleDef::_nil ();
     }
-  return CORBA::ModuleDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_ModuleDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::ModuleDef_ptr CORBA::ModuleDef::_unchecked_narrow (
+CORBA_ModuleDef_ptr CORBA_ModuleDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::ModuleDef::_nil ();
+    return CORBA_ModuleDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::ModuleDef_ptr default_proxy = CORBA::ModuleDef::_nil ();
+      CORBA_ModuleDef_ptr default_proxy = CORBA_ModuleDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_ModuleDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::ModuleDef (
+          ::CORBA_ModuleDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::ModuleDef::_nil ());
+          CORBA_ModuleDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::ModuleDef (stub, 0, obj->_servant ()), CORBA::ModuleDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_ModuleDef (stub, 0, obj->_servant ()), CORBA_ModuleDef::_nil ());
         return default_proxy;
       }
     else 
@@ -6023,15 +3200,15 @@ CORBA::ModuleDef_ptr CORBA::ModuleDef::_unchecked_narrow (
           );
 }
 
-CORBA::ModuleDef_ptr
-CORBA::ModuleDef::_duplicate (CORBA::ModuleDef_ptr obj)
+CORBA_ModuleDef_ptr
+CORBA_ModuleDef::_duplicate (CORBA_ModuleDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::ModuleDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_ModuleDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ModuleDef:1.0")) ||
@@ -6044,46 +3221,46 @@ CORBA::Boolean CORBA::ModuleDef::_is_a (const CORBA::Char *value, CORBA::Environ
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::ModuleDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_ModuleDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_ModuleDef::_narrow))
+      &CORBA_ModuleDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Container::_narrow))
+      &CORBA_Container::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Container_ptr,
+            CORBA_Container_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -6096,18 +3273,199 @@ void *CORBA::ModuleDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::ModuleDef::_interface_repository_id (void) const
+const char* CORBA_ModuleDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/ModuleDef:1.0";
 }
 
-
-void CORBA::ModuleDescription::_tao_any_destructor (void *x)
+void CORBA_ModuleDescription::_tao_any_destructor (void *x)
 {
   CORBA_ModuleDescription *tmp = ACE_static_cast (CORBA_ModuleDescription*,x);
   delete tmp;
 }
 
+// *************************************************************
+// Operations for class CORBA_ConstantDef_var
+// *************************************************************
+
+CORBA_ConstantDef_var::CORBA_ConstantDef_var (void) // default constructor
+  : ptr_ (CORBA_ConstantDef::_nil ())
+{}
+
+::CORBA_ConstantDef_ptr
+CORBA_ConstantDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_ConstantDef_var::CORBA_ConstantDef_var (const ::CORBA_ConstantDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_ConstantDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_ConstantDef_var::~CORBA_ConstantDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_ConstantDef_var &
+CORBA_ConstantDef_var::operator= (CORBA_ConstantDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_ConstantDef_var &
+CORBA_ConstantDef_var::operator= (const ::CORBA_ConstantDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_ConstantDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_ConstantDef_var::operator const ::CORBA_ConstantDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_ConstantDef_var::operator ::CORBA_ConstantDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_ConstantDef_ptr
+CORBA_ConstantDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_ConstantDef_ptr
+CORBA_ConstantDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_ConstantDef_ptr &
+CORBA_ConstantDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_ConstantDef_ptr &
+CORBA_ConstantDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_ConstantDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_ConstantDef_ptr
+CORBA_ConstantDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_ConstantDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_ConstantDef::_nil ();
+  return val;
+}
+
+::CORBA_ConstantDef_ptr
+CORBA_ConstantDef_var::duplicate (CORBA_ConstantDef_ptr p)
+{
+  return ::CORBA_ConstantDef::_duplicate (p);
+}
+
+void
+CORBA_ConstantDef_var::release (CORBA_ConstantDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_ConstantDef_ptr
+CORBA_ConstantDef_var::nil (void)
+{
+  return ::CORBA_ConstantDef::_nil ();
+}
+
+::CORBA_ConstantDef_ptr
+CORBA_ConstantDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_ConstantDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_ConstantDef_var::upcast (void *src)
+{
+  CORBA_ConstantDef **tmp =
+    ACE_static_cast (CORBA_ConstantDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_ConstantDef_out
+// *************************************************************
+
+CORBA_ConstantDef_out::CORBA_ConstantDef_out (CORBA_ConstantDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_ConstantDef::_nil ();
+}
+
+CORBA_ConstantDef_out::CORBA_ConstantDef_out (CORBA_ConstantDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_ConstantDef::_nil ();
+}
+
+CORBA_ConstantDef_out::CORBA_ConstantDef_out (const ::CORBA_ConstantDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_ConstantDef_out &, p).ptr_)
+{}
+
+::CORBA_ConstantDef_out &
+CORBA_ConstantDef_out::operator= (const ::CORBA_ConstantDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_ConstantDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_ConstantDef_out &
+CORBA_ConstantDef_out::operator= (const ::CORBA_ConstantDef_var &p)
+{
+  this->ptr_ = ::CORBA_ConstantDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_ConstantDef_out &
+CORBA_ConstantDef_out::operator= (CORBA_ConstantDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_ConstantDef_out::operator ::CORBA_ConstantDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_ConstantDef_ptr &
+CORBA_ConstantDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_ConstantDef_ptr
+CORBA_ConstantDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_ConstantDef_type_get : public TAO_ClientRequestInfo
@@ -6231,13 +3589,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get (const TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get &);
 
-  CORBA::IDLType_ptr _result;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get (
@@ -6290,7 +3648,7 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::result (CORBA::Environment
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::result (CORBA::IDLType_ptr result)
+TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_get::result (CORBA_IDLType_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -6302,7 +3660,7 @@ public:
   TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -6329,14 +3687,14 @@ private:
   TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set (const TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set &);
 
-  CORBA::IDLType_ptr type_def_;
+  CORBA_IDLType_ptr type_def_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ClientRequestInfo_CORBA_ConstantDef_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::IDLType_ptr type_def,
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -6580,15 +3938,15 @@ TAO_ClientRequestInfo_CORBA_ConstantDef_value_set::result (CORBA::Environment &A
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_ConstantDef_Proxy_Impl::_TAO_ConstantDef_Proxy_Impl (void)
+_TAO_CORBA_ConstantDef_Proxy_Impl::_TAO_CORBA_ConstantDef_Proxy_Impl (void)
 {}
 
-_TAO_ConstantDef_Remote_Proxy_Impl::_TAO_ConstantDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_ConstantDef_Remote_Proxy_Impl::_TAO_CORBA_ConstantDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::TypeCode_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type (
+CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6748,7 +4106,7 @@ CORBA::TypeCode_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::IDLType_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
+CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6757,8 +4115,8 @@ CORBA::IDLType_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
   ))
 {
   
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  CORBA::IDLType_var _tao_safe_retval (_tao_retval);
+  CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
+  CORBA_IDLType_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -6842,7 +4200,7 @@ CORBA::IDLType_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -6908,9 +4266,9 @@ CORBA::IDLType_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
+void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr type_def,
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7060,7 +4418,7 @@ void _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
   
 }
 
-CORBA::Any * _TAO_ConstantDef_Remote_Proxy_Impl::value (
+CORBA::Any * _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7221,7 +4579,7 @@ CORBA::Any * _TAO_ConstantDef_Remote_Proxy_Impl::value (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_ConstantDef_Remote_Proxy_Impl::value (
+void _TAO_CORBA_ConstantDef_Remote_Proxy_Impl::value (
     CORBA_Object *_collocated_tao_target_,
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
@@ -7383,36 +4741,36 @@ void _TAO_ConstantDef_Remote_Proxy_Impl::value (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_ConstantDef_Proxy_Broker::_TAO_ConstantDef_Proxy_Broker (void)
+_TAO_CORBA_ConstantDef_Proxy_Broker::_TAO_CORBA_ConstantDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ConstantDef_Proxy_Broker::~_TAO_ConstantDef_Proxy_Broker (void)
+_TAO_CORBA_ConstantDef_Proxy_Broker::~_TAO_CORBA_ConstantDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ConstantDef_Proxy_Broker * (*CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_ConstantDef_Proxy_Broker * (*_TAO_CORBA_ConstantDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_ConstantDef_Remote_Proxy_Broker *
-_TAO_ConstantDef_Remote_Proxy_Broker::the_TAO_ConstantDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ConstantDef_Remote_Proxy_Broker *
+_TAO_CORBA_ConstantDef_Remote_Proxy_Broker::the_TAO_CORBA_ConstantDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_ConstantDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_ConstantDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_ConstantDef_Remote_Proxy_Broker::_TAO_ConstantDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ConstantDef_Remote_Proxy_Broker::_TAO_CORBA_ConstantDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_ConstantDef_Remote_Proxy_Broker::~_TAO_ConstantDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ConstantDef_Remote_Proxy_Broker::~_TAO_CORBA_ConstantDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_ConstantDef_Proxy_Impl&
-_TAO_ConstantDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_ConstantDef_Proxy_Impl&
+_TAO_CORBA_ConstantDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_ConstantDef *,
   CORBA::Environment &
 )
@@ -7437,72 +4795,72 @@ CORBA_ConstantDef::~CORBA_ConstantDef (void)
 {}
 
 void
-CORBA::ConstantDef::CORBA_ConstantDef_setup_collocation (int collocated)
+CORBA_ConstantDef::CORBA_ConstantDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_ConstantDef_Proxy_Broker_ =
-      ::CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_ =
+      ::_TAO_CORBA_ConstantDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_ConstantDef_Proxy_Broker_ =
-      ::_TAO_ConstantDef_Remote_Proxy_Broker::the_TAO_ConstantDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_ =
+      ::_TAO_CORBA_ConstantDef_Remote_Proxy_Broker::the_TAO_CORBA_ConstantDef_Remote_Proxy_Broker ();
   
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-void CORBA::ConstantDef::_tao_any_destructor (void *x)
+void CORBA_ConstantDef::_tao_any_destructor (void *x)
 {
   CORBA_ConstantDef *tmp = ACE_static_cast (CORBA_ConstantDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::ConstantDef_ptr CORBA::ConstantDef::_narrow (
+CORBA_ConstantDef_ptr CORBA_ConstantDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::ConstantDef::_nil ();
+    return CORBA_ConstantDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstantDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::ConstantDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
       if (is_a == 0)
-        return CORBA::ConstantDef::_nil ();
+        return CORBA_ConstantDef::_nil ();
     }
-  return CORBA::ConstantDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_ConstantDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::ConstantDef_ptr CORBA::ConstantDef::_unchecked_narrow (
+CORBA_ConstantDef_ptr CORBA_ConstantDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::ConstantDef::_nil ();
+    return CORBA_ConstantDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::ConstantDef_ptr default_proxy = CORBA::ConstantDef::_nil ();
+      CORBA_ConstantDef_ptr default_proxy = CORBA_ConstantDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_ConstantDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::ConstantDef (
+          ::CORBA_ConstantDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::ConstantDef::_nil ());
+          CORBA_ConstantDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::ConstantDef (stub, 0, obj->_servant ()), CORBA::ConstantDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_ConstantDef (stub, 0, obj->_servant ()), CORBA_ConstantDef::_nil ());
         return default_proxy;
       }
     else 
@@ -7521,15 +4879,15 @@ CORBA::ConstantDef_ptr CORBA::ConstantDef::_unchecked_narrow (
           );
 }
 
-CORBA::ConstantDef_ptr
-CORBA::ConstantDef::_duplicate (CORBA::ConstantDef_ptr obj)
+CORBA_ConstantDef_ptr
+CORBA_ConstantDef::_duplicate (CORBA_ConstantDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::ConstantDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_ConstantDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstantDef:1.0")) ||
@@ -7541,34 +4899,34 @@ CORBA::Boolean CORBA::ConstantDef::_is_a (const CORBA::Char *value, CORBA::Envir
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::ConstantDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_ConstantDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_ConstantDef::_narrow))
+      &CORBA_ConstantDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -7581,20 +4939,20 @@ void *CORBA::ConstantDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::ConstantDef::_interface_repository_id (void) const
+const char* CORBA_ConstantDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/ConstantDef:1.0";
 }
 
-CORBA::TypeCode_ptr CORBA::ConstantDef::type (
+CORBA::TypeCode_ptr CORBA_ConstantDef::type (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ConstantDef_Proxy_Impl &proxy = 
-    this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ConstantDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.type (
@@ -7603,15 +4961,15 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
     );
 }
 
-CORBA::IDLType_ptr CORBA::ConstantDef::type_def (
+CORBA_IDLType_ptr CORBA_ConstantDef::type_def (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ConstantDef_Proxy_Impl &proxy = 
-    this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ConstantDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.type_def (
@@ -7620,16 +4978,16 @@ CORBA::IDLType_ptr CORBA::ConstantDef::type_def (
     );
 }
 
-void CORBA::ConstantDef::type_def (
-    CORBA::IDLType_ptr type_def,
+void CORBA_ConstantDef::type_def (
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ConstantDef_Proxy_Impl &proxy = 
-    this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ConstantDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.type_def (
@@ -7639,15 +4997,15 @@ void CORBA::ConstantDef::type_def (
     );
 }
 
-CORBA::Any * CORBA::ConstantDef::value (
+CORBA::Any * CORBA_ConstantDef::value (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ConstantDef_Proxy_Impl &proxy = 
-    this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ConstantDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.value (
@@ -7656,7 +5014,7 @@ CORBA::Any * CORBA::ConstantDef::value (
     );
 }
 
-void CORBA::ConstantDef::value (
+void CORBA_ConstantDef::value (
     const CORBA::Any & value,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7664,8 +5022,8 @@ void CORBA::ConstantDef::value (
     CORBA::SystemException
   ))
 {
-  _TAO_ConstantDef_Proxy_Impl &proxy = 
-    this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ConstantDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.value (
@@ -7675,13 +5033,194 @@ void CORBA::ConstantDef::value (
     );
 }
 
-
-void CORBA::ConstantDescription::_tao_any_destructor (void *x)
+void CORBA_ConstantDescription::_tao_any_destructor (void *x)
 {
   CORBA_ConstantDescription *tmp = ACE_static_cast (CORBA_ConstantDescription*,x);
   delete tmp;
 }
 
+// *************************************************************
+// Operations for class CORBA_StructDef_var
+// *************************************************************
+
+CORBA_StructDef_var::CORBA_StructDef_var (void) // default constructor
+  : ptr_ (CORBA_StructDef::_nil ())
+{}
+
+::CORBA_StructDef_ptr
+CORBA_StructDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_StructDef_var::CORBA_StructDef_var (const ::CORBA_StructDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_StructDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_StructDef_var::~CORBA_StructDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_StructDef_var &
+CORBA_StructDef_var::operator= (CORBA_StructDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_StructDef_var &
+CORBA_StructDef_var::operator= (const ::CORBA_StructDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_StructDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_StructDef_var::operator const ::CORBA_StructDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_StructDef_var::operator ::CORBA_StructDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_StructDef_ptr
+CORBA_StructDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_StructDef_ptr
+CORBA_StructDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_StructDef_ptr &
+CORBA_StructDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_StructDef_ptr &
+CORBA_StructDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_StructDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_StructDef_ptr
+CORBA_StructDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_StructDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_StructDef::_nil ();
+  return val;
+}
+
+::CORBA_StructDef_ptr
+CORBA_StructDef_var::duplicate (CORBA_StructDef_ptr p)
+{
+  return ::CORBA_StructDef::_duplicate (p);
+}
+
+void
+CORBA_StructDef_var::release (CORBA_StructDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_StructDef_ptr
+CORBA_StructDef_var::nil (void)
+{
+  return ::CORBA_StructDef::_nil ();
+}
+
+::CORBA_StructDef_ptr
+CORBA_StructDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_StructDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_StructDef_var::upcast (void *src)
+{
+  CORBA_StructDef **tmp =
+    ACE_static_cast (CORBA_StructDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_StructDef_out
+// *************************************************************
+
+CORBA_StructDef_out::CORBA_StructDef_out (CORBA_StructDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_StructDef::_nil ();
+}
+
+CORBA_StructDef_out::CORBA_StructDef_out (CORBA_StructDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_StructDef::_nil ();
+}
+
+CORBA_StructDef_out::CORBA_StructDef_out (const ::CORBA_StructDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_StructDef_out &, p).ptr_)
+{}
+
+::CORBA_StructDef_out &
+CORBA_StructDef_out::operator= (const ::CORBA_StructDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_StructDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_StructDef_out &
+CORBA_StructDef_out::operator= (const ::CORBA_StructDef_var &p)
+{
+  this->ptr_ = ::CORBA_StructDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_StructDef_out &
+CORBA_StructDef_out::operator= (CORBA_StructDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_StructDef_out::operator ::CORBA_StructDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_StructDef_ptr &
+CORBA_StructDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_StructDef_ptr
+CORBA_StructDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_StructDef_members_get : public TAO_ClientRequestInfo
@@ -7712,13 +5251,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::StructMemberSeq * result);
+  void result (CORBA_StructMemberSeq * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_StructDef_members_get (const TAO_ClientRequestInfo_CORBA_StructDef_members_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_StructDef_members_get &);
 
-  CORBA::StructMemberSeq * _result;
+  CORBA_StructMemberSeq * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_StructDef_members_get::TAO_ClientRequestInfo_CORBA_StructDef_members_get (
@@ -7771,7 +5310,7 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_get::result (CORBA::Environment &A
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_StructDef_members_get::result (CORBA::StructMemberSeq * result)
+TAO_ClientRequestInfo_CORBA_StructDef_members_get::result (CORBA_StructMemberSeq * result)
 {
   // update the result 
   this->_result = result;
@@ -7783,7 +5322,7 @@ public:
   TAO_ClientRequestInfo_CORBA_StructDef_members_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -7810,14 +5349,14 @@ private:
   TAO_ClientRequestInfo_CORBA_StructDef_members_set (const TAO_ClientRequestInfo_CORBA_StructDef_members_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_StructDef_members_set &);
 
-  const CORBA::StructMemberSeq & members_;
+  const CORBA_StructMemberSeq & members_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_StructDef_members_set::TAO_ClientRequestInfo_CORBA_StructDef_members_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -7876,15 +5415,15 @@ TAO_ClientRequestInfo_CORBA_StructDef_members_set::result (CORBA::Environment &A
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_StructDef_Proxy_Impl::_TAO_StructDef_Proxy_Impl (void)
+_TAO_CORBA_StructDef_Proxy_Impl::_TAO_CORBA_StructDef_Proxy_Impl (void)
 {}
 
-_TAO_StructDef_Remote_Proxy_Impl::_TAO_StructDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_StructDef_Remote_Proxy_Impl::_TAO_CORBA_StructDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::StructMemberSeq * _TAO_StructDef_Remote_Proxy_Impl::members (
+CORBA_StructMemberSeq * _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7893,7 +5432,7 @@ CORBA::StructMemberSeq * _TAO_StructDef_Remote_Proxy_Impl::members (
   ))
 {
   
-  CORBA::StructMemberSeq *_tao_retval = 0;
+  CORBA_StructMemberSeq *_tao_retval = 0;
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -7901,8 +5440,8 @@ CORBA::StructMemberSeq * _TAO_StructDef_Remote_Proxy_Impl::members (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::StructMemberSeq, _tao_retval);
-  CORBA::StructMemberSeq_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_StructMemberSeq, _tao_retval);
+  CORBA_StructMemberSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_members",
@@ -7979,7 +5518,7 @@ CORBA::StructMemberSeq * _TAO_StructDef_Remote_Proxy_Impl::members (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -8045,9 +5584,9 @@ CORBA::StructMemberSeq * _TAO_StructDef_Remote_Proxy_Impl::members (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_StructDef_Remote_Proxy_Impl::members (
+void _TAO_CORBA_StructDef_Remote_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -8207,36 +5746,36 @@ void _TAO_StructDef_Remote_Proxy_Impl::members (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_StructDef_Proxy_Broker::_TAO_StructDef_Proxy_Broker (void)
+_TAO_CORBA_StructDef_Proxy_Broker::_TAO_CORBA_StructDef_Proxy_Broker (void)
 {
 }
 
-_TAO_StructDef_Proxy_Broker::~_TAO_StructDef_Proxy_Broker (void)
+_TAO_CORBA_StructDef_Proxy_Broker::~_TAO_CORBA_StructDef_Proxy_Broker (void)
 {
 }
 
-_TAO_StructDef_Proxy_Broker * (*CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_StructDef_Proxy_Broker * (*_TAO_CORBA_StructDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_StructDef_Remote_Proxy_Broker *
-_TAO_StructDef_Remote_Proxy_Broker::the_TAO_StructDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_StructDef_Remote_Proxy_Broker *
+_TAO_CORBA_StructDef_Remote_Proxy_Broker::the_TAO_CORBA_StructDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_StructDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_StructDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_StructDef_Remote_Proxy_Broker::_TAO_StructDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_StructDef_Remote_Proxy_Broker::_TAO_CORBA_StructDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_StructDef_Remote_Proxy_Broker::~_TAO_StructDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_StructDef_Remote_Proxy_Broker::~_TAO_CORBA_StructDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_StructDef_Proxy_Impl&
-_TAO_StructDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_StructDef_Proxy_Impl&
+_TAO_CORBA_StructDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_StructDef *,
   CORBA::Environment &
 )
@@ -8261,74 +5800,74 @@ CORBA_StructDef::~CORBA_StructDef (void)
 {}
 
 void
-CORBA::StructDef::CORBA_StructDef_setup_collocation (int collocated)
+CORBA_StructDef::CORBA_StructDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_StructDef_Proxy_Broker_ =
-      ::CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_StructDef_Proxy_Broker_ =
+      ::_TAO_CORBA_StructDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_StructDef_Proxy_Broker_ =
-      ::_TAO_StructDef_Remote_Proxy_Broker::the_TAO_StructDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_StructDef_Proxy_Broker_ =
+      ::_TAO_CORBA_StructDef_Remote_Proxy_Broker::the_TAO_CORBA_StructDef_Remote_Proxy_Broker ();
   
   this->CORBA_TypedefDef_setup_collocation (collocated);
   
   this->CORBA_Container_setup_collocation (collocated);
 }
 
-void CORBA::StructDef::_tao_any_destructor (void *x)
+void CORBA_StructDef::_tao_any_destructor (void *x)
 {
   CORBA_StructDef *tmp = ACE_static_cast (CORBA_StructDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::StructDef_ptr CORBA::StructDef::_narrow (
+CORBA_StructDef_ptr CORBA_StructDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::StructDef::_nil ();
+    return CORBA_StructDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StructDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::StructDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
       if (is_a == 0)
-        return CORBA::StructDef::_nil ();
+        return CORBA_StructDef::_nil ();
     }
-  return CORBA::StructDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_StructDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::StructDef_ptr CORBA::StructDef::_unchecked_narrow (
+CORBA_StructDef_ptr CORBA_StructDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::StructDef::_nil ();
+    return CORBA_StructDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::StructDef_ptr default_proxy = CORBA::StructDef::_nil ();
+      CORBA_StructDef_ptr default_proxy = CORBA_StructDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_StructDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::StructDef (
+          ::CORBA_StructDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::StructDef::_nil ());
+          CORBA_StructDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::StructDef (stub, 0, obj->_servant ()), CORBA::StructDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_StructDef (stub, 0, obj->_servant ()), CORBA_StructDef::_nil ());
         return default_proxy;
       }
     else 
@@ -8347,15 +5886,15 @@ CORBA::StructDef_ptr CORBA::StructDef::_unchecked_narrow (
           );
 }
 
-CORBA::StructDef_ptr
-CORBA::StructDef::_duplicate (CORBA::StructDef_ptr obj)
+CORBA_StructDef_ptr
+CORBA_StructDef::_duplicate (CORBA_StructDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::StructDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_StructDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StructDef:1.0")) ||
@@ -8370,70 +5909,70 @@ CORBA::Boolean CORBA::StructDef::_is_a (const CORBA::Char *value, CORBA::Environ
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::StructDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_StructDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_StructDef::_narrow))
+      &CORBA_StructDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::TypedefDef::_narrow))
+      &CORBA_TypedefDef::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::TypedefDef_ptr,
+            CORBA_TypedefDef_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Container::_narrow))
+      &CORBA_Container::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Container_ptr,
+            CORBA_Container_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -8446,20 +5985,20 @@ void *CORBA::StructDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::StructDef::_interface_repository_id (void) const
+const char* CORBA_StructDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/StructDef:1.0";
 }
 
-CORBA::StructMemberSeq * CORBA::StructDef::members (
+CORBA_StructMemberSeq * CORBA_StructDef::members (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_StructDef_Proxy_Impl &proxy = 
-    this->the_TAO_StructDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_StructDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_StructDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.members (
@@ -8468,16 +6007,16 @@ CORBA::StructMemberSeq * CORBA::StructDef::members (
     );
 }
 
-void CORBA::StructDef::members (
-    const CORBA::StructMemberSeq & members,
+void CORBA_StructDef::members (
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_StructDef_Proxy_Impl &proxy = 
-    this->the_TAO_StructDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_StructDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_StructDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.members (
@@ -8487,6 +6026,188 @@ void CORBA::StructDef::members (
     );
 }
 
+// *************************************************************
+// Operations for class CORBA_UnionDef_var
+// *************************************************************
+
+CORBA_UnionDef_var::CORBA_UnionDef_var (void) // default constructor
+  : ptr_ (CORBA_UnionDef::_nil ())
+{}
+
+::CORBA_UnionDef_ptr
+CORBA_UnionDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_UnionDef_var::CORBA_UnionDef_var (const ::CORBA_UnionDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_UnionDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_UnionDef_var::~CORBA_UnionDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_UnionDef_var &
+CORBA_UnionDef_var::operator= (CORBA_UnionDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_UnionDef_var &
+CORBA_UnionDef_var::operator= (const ::CORBA_UnionDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_UnionDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_UnionDef_var::operator const ::CORBA_UnionDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_UnionDef_var::operator ::CORBA_UnionDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_UnionDef_ptr
+CORBA_UnionDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_UnionDef_ptr
+CORBA_UnionDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_UnionDef_ptr &
+CORBA_UnionDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_UnionDef_ptr &
+CORBA_UnionDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_UnionDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_UnionDef_ptr
+CORBA_UnionDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_UnionDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_UnionDef::_nil ();
+  return val;
+}
+
+::CORBA_UnionDef_ptr
+CORBA_UnionDef_var::duplicate (CORBA_UnionDef_ptr p)
+{
+  return ::CORBA_UnionDef::_duplicate (p);
+}
+
+void
+CORBA_UnionDef_var::release (CORBA_UnionDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_UnionDef_ptr
+CORBA_UnionDef_var::nil (void)
+{
+  return ::CORBA_UnionDef::_nil ();
+}
+
+::CORBA_UnionDef_ptr
+CORBA_UnionDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_UnionDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_UnionDef_var::upcast (void *src)
+{
+  CORBA_UnionDef **tmp =
+    ACE_static_cast (CORBA_UnionDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_UnionDef_out
+// *************************************************************
+
+CORBA_UnionDef_out::CORBA_UnionDef_out (CORBA_UnionDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_UnionDef::_nil ();
+}
+
+CORBA_UnionDef_out::CORBA_UnionDef_out (CORBA_UnionDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_UnionDef::_nil ();
+}
+
+CORBA_UnionDef_out::CORBA_UnionDef_out (const ::CORBA_UnionDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_UnionDef_out &, p).ptr_)
+{}
+
+::CORBA_UnionDef_out &
+CORBA_UnionDef_out::operator= (const ::CORBA_UnionDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_UnionDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_UnionDef_out &
+CORBA_UnionDef_out::operator= (const ::CORBA_UnionDef_var &p)
+{
+  this->ptr_ = ::CORBA_UnionDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_UnionDef_out &
+CORBA_UnionDef_out::operator= (CORBA_UnionDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_UnionDef_out::operator ::CORBA_UnionDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_UnionDef_ptr &
+CORBA_UnionDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_UnionDef_ptr
+CORBA_UnionDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_get : public TAO_ClientRequestInfo
@@ -8610,13 +6331,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get (const TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get &);
 
-  CORBA::IDLType_ptr _result;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
@@ -8669,7 +6390,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (CORBA::
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (CORBA::IDLType_ptr result)
+TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (CORBA_IDLType_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -8681,7 +6402,7 @@ public:
   TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::IDLType_ptr discriminator_type_def,
+      CORBA_IDLType_ptr discriminator_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -8708,14 +6429,14 @@ private:
   TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set (const TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set &);
 
-  CORBA::IDLType_ptr discriminator_type_def_;
+  CORBA_IDLType_ptr discriminator_type_def_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ClientRequestInfo_CORBA_UnionDef_discriminator_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::IDLType_ptr discriminator_type_def,
+    CORBA_IDLType_ptr discriminator_type_def,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -8796,13 +6517,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::UnionMemberSeq * result);
+  void result (CORBA_UnionMemberSeq * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_UnionDef_members_get (const TAO_ClientRequestInfo_CORBA_UnionDef_members_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_UnionDef_members_get &);
 
-  CORBA::UnionMemberSeq * _result;
+  CORBA_UnionMemberSeq * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_UnionDef_members_get::TAO_ClientRequestInfo_CORBA_UnionDef_members_get (
@@ -8855,7 +6576,7 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_get::result (CORBA::Environment &AC
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_UnionDef_members_get::result (CORBA::UnionMemberSeq * result)
+TAO_ClientRequestInfo_CORBA_UnionDef_members_get::result (CORBA_UnionMemberSeq * result)
 {
   // update the result 
   this->_result = result;
@@ -8867,7 +6588,7 @@ public:
   TAO_ClientRequestInfo_CORBA_UnionDef_members_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::UnionMemberSeq & members,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -8894,14 +6615,14 @@ private:
   TAO_ClientRequestInfo_CORBA_UnionDef_members_set (const TAO_ClientRequestInfo_CORBA_UnionDef_members_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_UnionDef_members_set &);
 
-  const CORBA::UnionMemberSeq & members_;
+  const CORBA_UnionMemberSeq & members_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_UnionDef_members_set::TAO_ClientRequestInfo_CORBA_UnionDef_members_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::UnionMemberSeq & members,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -8960,15 +6681,15 @@ TAO_ClientRequestInfo_CORBA_UnionDef_members_set::result (CORBA::Environment &AC
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_UnionDef_Proxy_Impl::_TAO_UnionDef_Proxy_Impl (void)
+_TAO_CORBA_UnionDef_Proxy_Impl::_TAO_CORBA_UnionDef_Proxy_Impl (void)
 {}
 
-_TAO_UnionDef_Remote_Proxy_Impl::_TAO_UnionDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_UnionDef_Remote_Proxy_Impl::_TAO_CORBA_UnionDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::TypeCode_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
+CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -9128,7 +6849,7 @@ CORBA::TypeCode_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::IDLType_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
+CORBA_IDLType_ptr _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -9137,8 +6858,8 @@ CORBA::IDLType_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
   ))
 {
   
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  CORBA::IDLType_var _tao_safe_retval (_tao_retval);
+  CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
+  CORBA_IDLType_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -9222,7 +6943,7 @@ CORBA::IDLType_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -9288,9 +7009,9 @@ CORBA::IDLType_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
+void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr discriminator_type_def,
+    CORBA_IDLType_ptr discriminator_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -9440,7 +7161,7 @@ void _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
   
 }
 
-CORBA::UnionMemberSeq * _TAO_UnionDef_Remote_Proxy_Impl::members (
+CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -9449,7 +7170,7 @@ CORBA::UnionMemberSeq * _TAO_UnionDef_Remote_Proxy_Impl::members (
   ))
 {
   
-  CORBA::UnionMemberSeq *_tao_retval = 0;
+  CORBA_UnionMemberSeq *_tao_retval = 0;
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -9457,8 +7178,8 @@ CORBA::UnionMemberSeq * _TAO_UnionDef_Remote_Proxy_Impl::members (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::UnionMemberSeq, _tao_retval);
-  CORBA::UnionMemberSeq_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_UnionMemberSeq, _tao_retval);
+  CORBA_UnionMemberSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_members",
@@ -9535,7 +7256,7 @@ CORBA::UnionMemberSeq * _TAO_UnionDef_Remote_Proxy_Impl::members (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::UnionMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_UnionMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -9601,9 +7322,9 @@ CORBA::UnionMemberSeq * _TAO_UnionDef_Remote_Proxy_Impl::members (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_UnionDef_Remote_Proxy_Impl::members (
+void _TAO_CORBA_UnionDef_Remote_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::UnionMemberSeq & members,
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -9763,36 +7484,36 @@ void _TAO_UnionDef_Remote_Proxy_Impl::members (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_UnionDef_Proxy_Broker::_TAO_UnionDef_Proxy_Broker (void)
+_TAO_CORBA_UnionDef_Proxy_Broker::_TAO_CORBA_UnionDef_Proxy_Broker (void)
 {
 }
 
-_TAO_UnionDef_Proxy_Broker::~_TAO_UnionDef_Proxy_Broker (void)
+_TAO_CORBA_UnionDef_Proxy_Broker::~_TAO_CORBA_UnionDef_Proxy_Broker (void)
 {
 }
 
-_TAO_UnionDef_Proxy_Broker * (*CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_UnionDef_Proxy_Broker * (*_TAO_CORBA_UnionDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_UnionDef_Remote_Proxy_Broker *
-_TAO_UnionDef_Remote_Proxy_Broker::the_TAO_UnionDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_UnionDef_Remote_Proxy_Broker *
+_TAO_CORBA_UnionDef_Remote_Proxy_Broker::the_TAO_CORBA_UnionDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_UnionDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_UnionDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_UnionDef_Remote_Proxy_Broker::_TAO_UnionDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_UnionDef_Remote_Proxy_Broker::_TAO_CORBA_UnionDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_UnionDef_Remote_Proxy_Broker::~_TAO_UnionDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_UnionDef_Remote_Proxy_Broker::~_TAO_CORBA_UnionDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_UnionDef_Proxy_Impl&
-_TAO_UnionDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_UnionDef_Proxy_Impl&
+_TAO_CORBA_UnionDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_UnionDef *,
   CORBA::Environment &
 )
@@ -9817,74 +7538,74 @@ CORBA_UnionDef::~CORBA_UnionDef (void)
 {}
 
 void
-CORBA::UnionDef::CORBA_UnionDef_setup_collocation (int collocated)
+CORBA_UnionDef::CORBA_UnionDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_UnionDef_Proxy_Broker_ =
-      ::CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_ =
+      ::_TAO_CORBA_UnionDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_UnionDef_Proxy_Broker_ =
-      ::_TAO_UnionDef_Remote_Proxy_Broker::the_TAO_UnionDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_ =
+      ::_TAO_CORBA_UnionDef_Remote_Proxy_Broker::the_TAO_CORBA_UnionDef_Remote_Proxy_Broker ();
   
   this->CORBA_TypedefDef_setup_collocation (collocated);
   
   this->CORBA_Container_setup_collocation (collocated);
 }
 
-void CORBA::UnionDef::_tao_any_destructor (void *x)
+void CORBA_UnionDef::_tao_any_destructor (void *x)
 {
   CORBA_UnionDef *tmp = ACE_static_cast (CORBA_UnionDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::UnionDef_ptr CORBA::UnionDef::_narrow (
+CORBA_UnionDef_ptr CORBA_UnionDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::UnionDef::_nil ();
+    return CORBA_UnionDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/UnionDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::UnionDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
       if (is_a == 0)
-        return CORBA::UnionDef::_nil ();
+        return CORBA_UnionDef::_nil ();
     }
-  return CORBA::UnionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_UnionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::UnionDef_ptr CORBA::UnionDef::_unchecked_narrow (
+CORBA_UnionDef_ptr CORBA_UnionDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::UnionDef::_nil ();
+    return CORBA_UnionDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::UnionDef_ptr default_proxy = CORBA::UnionDef::_nil ();
+      CORBA_UnionDef_ptr default_proxy = CORBA_UnionDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_UnionDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::UnionDef (
+          ::CORBA_UnionDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::UnionDef::_nil ());
+          CORBA_UnionDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::UnionDef (stub, 0, obj->_servant ()), CORBA::UnionDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_UnionDef (stub, 0, obj->_servant ()), CORBA_UnionDef::_nil ());
         return default_proxy;
       }
     else 
@@ -9903,15 +7624,15 @@ CORBA::UnionDef_ptr CORBA::UnionDef::_unchecked_narrow (
           );
 }
 
-CORBA::UnionDef_ptr
-CORBA::UnionDef::_duplicate (CORBA::UnionDef_ptr obj)
+CORBA_UnionDef_ptr
+CORBA_UnionDef::_duplicate (CORBA_UnionDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::UnionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_UnionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/UnionDef:1.0")) ||
@@ -9926,70 +7647,70 @@ CORBA::Boolean CORBA::UnionDef::_is_a (const CORBA::Char *value, CORBA::Environm
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::UnionDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_UnionDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_UnionDef::_narrow))
+      &CORBA_UnionDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::TypedefDef::_narrow))
+      &CORBA_TypedefDef::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::TypedefDef_ptr,
+            CORBA_TypedefDef_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Container::_narrow))
+      &CORBA_Container::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Container_ptr,
+            CORBA_Container_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -10002,20 +7723,20 @@ void *CORBA::UnionDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::UnionDef::_interface_repository_id (void) const
+const char* CORBA_UnionDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/UnionDef:1.0";
 }
 
-CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
+CORBA::TypeCode_ptr CORBA_UnionDef::discriminator_type (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_UnionDef_Proxy_Impl &proxy = 
-    this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_UnionDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.discriminator_type (
@@ -10024,15 +7745,15 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
     );
 }
 
-CORBA::IDLType_ptr CORBA::UnionDef::discriminator_type_def (
+CORBA_IDLType_ptr CORBA_UnionDef::discriminator_type_def (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_UnionDef_Proxy_Impl &proxy = 
-    this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_UnionDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.discriminator_type_def (
@@ -10041,16 +7762,16 @@ CORBA::IDLType_ptr CORBA::UnionDef::discriminator_type_def (
     );
 }
 
-void CORBA::UnionDef::discriminator_type_def (
-    CORBA::IDLType_ptr discriminator_type_def,
+void CORBA_UnionDef::discriminator_type_def (
+    CORBA_IDLType_ptr discriminator_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_UnionDef_Proxy_Impl &proxy = 
-    this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_UnionDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.discriminator_type_def (
@@ -10060,15 +7781,15 @@ void CORBA::UnionDef::discriminator_type_def (
     );
 }
 
-CORBA::UnionMemberSeq * CORBA::UnionDef::members (
+CORBA_UnionMemberSeq * CORBA_UnionDef::members (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_UnionDef_Proxy_Impl &proxy = 
-    this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_UnionDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.members (
@@ -10077,16 +7798,16 @@ CORBA::UnionMemberSeq * CORBA::UnionDef::members (
     );
 }
 
-void CORBA::UnionDef::members (
-    const CORBA::UnionMemberSeq & members,
+void CORBA_UnionDef::members (
+    const CORBA_UnionMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_UnionDef_Proxy_Impl &proxy = 
-    this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_UnionDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.members (
@@ -10096,6 +7817,188 @@ void CORBA::UnionDef::members (
     );
 }
 
+// *************************************************************
+// Operations for class CORBA_EnumDef_var
+// *************************************************************
+
+CORBA_EnumDef_var::CORBA_EnumDef_var (void) // default constructor
+  : ptr_ (CORBA_EnumDef::_nil ())
+{}
+
+::CORBA_EnumDef_ptr
+CORBA_EnumDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_EnumDef_var::CORBA_EnumDef_var (const ::CORBA_EnumDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_EnumDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_EnumDef_var::~CORBA_EnumDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_EnumDef_var &
+CORBA_EnumDef_var::operator= (CORBA_EnumDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_EnumDef_var &
+CORBA_EnumDef_var::operator= (const ::CORBA_EnumDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_EnumDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_EnumDef_var::operator const ::CORBA_EnumDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_EnumDef_var::operator ::CORBA_EnumDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_EnumDef_ptr
+CORBA_EnumDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_EnumDef_ptr
+CORBA_EnumDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_EnumDef_ptr &
+CORBA_EnumDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_EnumDef_ptr &
+CORBA_EnumDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_EnumDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_EnumDef_ptr
+CORBA_EnumDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_EnumDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_EnumDef::_nil ();
+  return val;
+}
+
+::CORBA_EnumDef_ptr
+CORBA_EnumDef_var::duplicate (CORBA_EnumDef_ptr p)
+{
+  return ::CORBA_EnumDef::_duplicate (p);
+}
+
+void
+CORBA_EnumDef_var::release (CORBA_EnumDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_EnumDef_ptr
+CORBA_EnumDef_var::nil (void)
+{
+  return ::CORBA_EnumDef::_nil ();
+}
+
+::CORBA_EnumDef_ptr
+CORBA_EnumDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_EnumDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_EnumDef_var::upcast (void *src)
+{
+  CORBA_EnumDef **tmp =
+    ACE_static_cast (CORBA_EnumDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_EnumDef_out
+// *************************************************************
+
+CORBA_EnumDef_out::CORBA_EnumDef_out (CORBA_EnumDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_EnumDef::_nil ();
+}
+
+CORBA_EnumDef_out::CORBA_EnumDef_out (CORBA_EnumDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_EnumDef::_nil ();
+}
+
+CORBA_EnumDef_out::CORBA_EnumDef_out (const ::CORBA_EnumDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_EnumDef_out &, p).ptr_)
+{}
+
+::CORBA_EnumDef_out &
+CORBA_EnumDef_out::operator= (const ::CORBA_EnumDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_EnumDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_EnumDef_out &
+CORBA_EnumDef_out::operator= (const ::CORBA_EnumDef_var &p)
+{
+  this->ptr_ = ::CORBA_EnumDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_EnumDef_out &
+CORBA_EnumDef_out::operator= (CORBA_EnumDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_EnumDef_out::operator ::CORBA_EnumDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_EnumDef_ptr &
+CORBA_EnumDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_EnumDef_ptr
+CORBA_EnumDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_EnumDef_members_get : public TAO_ClientRequestInfo
@@ -10126,13 +8029,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::EnumMemberSeq * result);
+  void result (CORBA_EnumMemberSeq * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_EnumDef_members_get (const TAO_ClientRequestInfo_CORBA_EnumDef_members_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_EnumDef_members_get &);
 
-  CORBA::EnumMemberSeq * _result;
+  CORBA_EnumMemberSeq * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_EnumDef_members_get::TAO_ClientRequestInfo_CORBA_EnumDef_members_get (
@@ -10185,7 +8088,7 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_get::result (CORBA::Environment &ACE
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_EnumDef_members_get::result (CORBA::EnumMemberSeq * result)
+TAO_ClientRequestInfo_CORBA_EnumDef_members_get::result (CORBA_EnumMemberSeq * result)
 {
   // update the result 
   this->_result = result;
@@ -10197,7 +8100,7 @@ public:
   TAO_ClientRequestInfo_CORBA_EnumDef_members_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -10224,14 +8127,14 @@ private:
   TAO_ClientRequestInfo_CORBA_EnumDef_members_set (const TAO_ClientRequestInfo_CORBA_EnumDef_members_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_EnumDef_members_set &);
 
-  const CORBA::EnumMemberSeq & members_;
+  const CORBA_EnumMemberSeq & members_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_EnumDef_members_set::TAO_ClientRequestInfo_CORBA_EnumDef_members_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -10290,15 +8193,15 @@ TAO_ClientRequestInfo_CORBA_EnumDef_members_set::result (CORBA::Environment &ACE
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_EnumDef_Proxy_Impl::_TAO_EnumDef_Proxy_Impl (void)
+_TAO_CORBA_EnumDef_Proxy_Impl::_TAO_CORBA_EnumDef_Proxy_Impl (void)
 {}
 
-_TAO_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_EnumDef_Remote_Proxy_Impl::_TAO_CORBA_EnumDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::EnumMemberSeq * _TAO_EnumDef_Remote_Proxy_Impl::members (
+CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -10307,7 +8210,7 @@ CORBA::EnumMemberSeq * _TAO_EnumDef_Remote_Proxy_Impl::members (
   ))
 {
   
-  CORBA::EnumMemberSeq *_tao_retval = 0;
+  CORBA_EnumMemberSeq *_tao_retval = 0;
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -10315,8 +8218,8 @@ CORBA::EnumMemberSeq * _TAO_EnumDef_Remote_Proxy_Impl::members (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::EnumMemberSeq, _tao_retval);
-  CORBA::EnumMemberSeq_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_EnumMemberSeq, _tao_retval);
+  CORBA_EnumMemberSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_members",
@@ -10393,7 +8296,7 @@ CORBA::EnumMemberSeq * _TAO_EnumDef_Remote_Proxy_Impl::members (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::EnumMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_EnumMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -10459,9 +8362,9 @@ CORBA::EnumMemberSeq * _TAO_EnumDef_Remote_Proxy_Impl::members (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_EnumDef_Remote_Proxy_Impl::members (
+void _TAO_CORBA_EnumDef_Remote_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::EnumMemberSeq & members,
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -10621,36 +8524,36 @@ void _TAO_EnumDef_Remote_Proxy_Impl::members (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_EnumDef_Proxy_Broker::_TAO_EnumDef_Proxy_Broker (void)
+_TAO_CORBA_EnumDef_Proxy_Broker::_TAO_CORBA_EnumDef_Proxy_Broker (void)
 {
 }
 
-_TAO_EnumDef_Proxy_Broker::~_TAO_EnumDef_Proxy_Broker (void)
+_TAO_CORBA_EnumDef_Proxy_Broker::~_TAO_CORBA_EnumDef_Proxy_Broker (void)
 {
 }
 
-_TAO_EnumDef_Proxy_Broker * (*CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_EnumDef_Proxy_Broker * (*_TAO_CORBA_EnumDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_EnumDef_Remote_Proxy_Broker *
-_TAO_EnumDef_Remote_Proxy_Broker::the_TAO_EnumDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_EnumDef_Remote_Proxy_Broker *
+_TAO_CORBA_EnumDef_Remote_Proxy_Broker::the_TAO_CORBA_EnumDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_EnumDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_EnumDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_EnumDef_Remote_Proxy_Broker::_TAO_EnumDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_EnumDef_Remote_Proxy_Broker::_TAO_CORBA_EnumDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_EnumDef_Remote_Proxy_Broker::~_TAO_EnumDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_EnumDef_Remote_Proxy_Broker::~_TAO_CORBA_EnumDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_EnumDef_Proxy_Impl&
-_TAO_EnumDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_EnumDef_Proxy_Impl&
+_TAO_CORBA_EnumDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_EnumDef *,
   CORBA::Environment &
 )
@@ -10675,72 +8578,72 @@ CORBA_EnumDef::~CORBA_EnumDef (void)
 {}
 
 void
-CORBA::EnumDef::CORBA_EnumDef_setup_collocation (int collocated)
+CORBA_EnumDef::CORBA_EnumDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_EnumDef_Proxy_Broker_ =
-      ::CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_EnumDef_Proxy_Broker_ =
+      ::_TAO_CORBA_EnumDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_EnumDef_Proxy_Broker_ =
-      ::_TAO_EnumDef_Remote_Proxy_Broker::the_TAO_EnumDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_EnumDef_Proxy_Broker_ =
+      ::_TAO_CORBA_EnumDef_Remote_Proxy_Broker::the_TAO_CORBA_EnumDef_Remote_Proxy_Broker ();
   
   this->CORBA_TypedefDef_setup_collocation (collocated);
 }
 
-void CORBA::EnumDef::_tao_any_destructor (void *x)
+void CORBA_EnumDef::_tao_any_destructor (void *x)
 {
   CORBA_EnumDef *tmp = ACE_static_cast (CORBA_EnumDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::EnumDef_ptr CORBA::EnumDef::_narrow (
+CORBA_EnumDef_ptr CORBA_EnumDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::EnumDef::_nil ();
+    return CORBA_EnumDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/EnumDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::EnumDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_EnumDef::_nil ());
       if (is_a == 0)
-        return CORBA::EnumDef::_nil ();
+        return CORBA_EnumDef::_nil ();
     }
-  return CORBA::EnumDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_EnumDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::EnumDef_ptr CORBA::EnumDef::_unchecked_narrow (
+CORBA_EnumDef_ptr CORBA_EnumDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::EnumDef::_nil ();
+    return CORBA_EnumDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::EnumDef_ptr default_proxy = CORBA::EnumDef::_nil ();
+      CORBA_EnumDef_ptr default_proxy = CORBA_EnumDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_EnumDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::EnumDef (
+          ::CORBA_EnumDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::EnumDef::_nil ());
+          CORBA_EnumDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::EnumDef (stub, 0, obj->_servant ()), CORBA::EnumDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_EnumDef (stub, 0, obj->_servant ()), CORBA_EnumDef::_nil ());
         return default_proxy;
       }
     else 
@@ -10759,15 +8662,15 @@ CORBA::EnumDef_ptr CORBA::EnumDef::_unchecked_narrow (
           );
 }
 
-CORBA::EnumDef_ptr
-CORBA::EnumDef::_duplicate (CORBA::EnumDef_ptr obj)
+CORBA_EnumDef_ptr
+CORBA_EnumDef::_duplicate (CORBA_EnumDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::EnumDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_EnumDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/EnumDef:1.0")) ||
@@ -10781,58 +8684,58 @@ CORBA::Boolean CORBA::EnumDef::_is_a (const CORBA::Char *value, CORBA::Environme
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::EnumDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_EnumDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_EnumDef::_narrow))
+      &CORBA_EnumDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::TypedefDef::_narrow))
+      &CORBA_TypedefDef::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::TypedefDef_ptr,
+            CORBA_TypedefDef_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -10845,20 +8748,20 @@ void *CORBA::EnumDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::EnumDef::_interface_repository_id (void) const
+const char* CORBA_EnumDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/EnumDef:1.0";
 }
 
-CORBA::EnumMemberSeq * CORBA::EnumDef::members (
+CORBA_EnumMemberSeq * CORBA_EnumDef::members (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_EnumDef_Proxy_Impl &proxy = 
-    this->the_TAO_EnumDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_EnumDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_EnumDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.members (
@@ -10867,16 +8770,16 @@ CORBA::EnumMemberSeq * CORBA::EnumDef::members (
     );
 }
 
-void CORBA::EnumDef::members (
-    const CORBA::EnumMemberSeq & members,
+void CORBA_EnumDef::members (
+    const CORBA_EnumMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_EnumDef_Proxy_Impl &proxy = 
-    this->the_TAO_EnumDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_EnumDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_EnumDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.members (
@@ -10886,6 +8789,188 @@ void CORBA::EnumDef::members (
     );
 }
 
+// *************************************************************
+// Operations for class CORBA_AliasDef_var
+// *************************************************************
+
+CORBA_AliasDef_var::CORBA_AliasDef_var (void) // default constructor
+  : ptr_ (CORBA_AliasDef::_nil ())
+{}
+
+::CORBA_AliasDef_ptr
+CORBA_AliasDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_AliasDef_var::CORBA_AliasDef_var (const ::CORBA_AliasDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_AliasDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_AliasDef_var::~CORBA_AliasDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_AliasDef_var &
+CORBA_AliasDef_var::operator= (CORBA_AliasDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_AliasDef_var &
+CORBA_AliasDef_var::operator= (const ::CORBA_AliasDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_AliasDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_AliasDef_var::operator const ::CORBA_AliasDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_AliasDef_var::operator ::CORBA_AliasDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_AliasDef_ptr
+CORBA_AliasDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_AliasDef_ptr
+CORBA_AliasDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_AliasDef_ptr &
+CORBA_AliasDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_AliasDef_ptr &
+CORBA_AliasDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_AliasDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_AliasDef_ptr
+CORBA_AliasDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_AliasDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_AliasDef::_nil ();
+  return val;
+}
+
+::CORBA_AliasDef_ptr
+CORBA_AliasDef_var::duplicate (CORBA_AliasDef_ptr p)
+{
+  return ::CORBA_AliasDef::_duplicate (p);
+}
+
+void
+CORBA_AliasDef_var::release (CORBA_AliasDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_AliasDef_ptr
+CORBA_AliasDef_var::nil (void)
+{
+  return ::CORBA_AliasDef::_nil ();
+}
+
+::CORBA_AliasDef_ptr
+CORBA_AliasDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_AliasDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_AliasDef_var::upcast (void *src)
+{
+  CORBA_AliasDef **tmp =
+    ACE_static_cast (CORBA_AliasDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_AliasDef_out
+// *************************************************************
+
+CORBA_AliasDef_out::CORBA_AliasDef_out (CORBA_AliasDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_AliasDef::_nil ();
+}
+
+CORBA_AliasDef_out::CORBA_AliasDef_out (CORBA_AliasDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_AliasDef::_nil ();
+}
+
+CORBA_AliasDef_out::CORBA_AliasDef_out (const ::CORBA_AliasDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_AliasDef_out &, p).ptr_)
+{}
+
+::CORBA_AliasDef_out &
+CORBA_AliasDef_out::operator= (const ::CORBA_AliasDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_AliasDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_AliasDef_out &
+CORBA_AliasDef_out::operator= (const ::CORBA_AliasDef_var &p)
+{
+  this->ptr_ = ::CORBA_AliasDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_AliasDef_out &
+CORBA_AliasDef_out::operator= (CORBA_AliasDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_AliasDef_out::operator ::CORBA_AliasDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_AliasDef_ptr &
+CORBA_AliasDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_AliasDef_ptr
+CORBA_AliasDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get : public TAO_ClientRequestInfo
@@ -10916,13 +9001,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get (const TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get &);
 
-  CORBA::IDLType_ptr _result;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get (
@@ -10975,7 +9060,7 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::result (CORBA::Envir
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::result (CORBA::IDLType_ptr result)
+TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_get::result (CORBA_IDLType_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -10987,7 +9072,7 @@ public:
   TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -11014,14 +9099,14 @@ private:
   TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set (const TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set &);
 
-  CORBA::IDLType_ptr original_type_def_;
+  CORBA_IDLType_ptr original_type_def_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -11080,15 +9165,15 @@ TAO_ClientRequestInfo_CORBA_AliasDef_original_type_def_set::result (CORBA::Envir
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_AliasDef_Proxy_Impl::_TAO_AliasDef_Proxy_Impl (void)
+_TAO_CORBA_AliasDef_Proxy_Impl::_TAO_CORBA_AliasDef_Proxy_Impl (void)
 {}
 
-_TAO_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_AliasDef_Remote_Proxy_Impl::_TAO_CORBA_AliasDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::IDLType_ptr _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
+CORBA_IDLType_ptr _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -11097,8 +9182,8 @@ CORBA::IDLType_ptr _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
   ))
 {
   
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  CORBA::IDLType_var _tao_safe_retval (_tao_retval);
+  CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
+  CORBA_IDLType_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -11182,7 +9267,7 @@ CORBA::IDLType_ptr _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -11248,9 +9333,9 @@ CORBA::IDLType_ptr _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
+void _TAO_CORBA_AliasDef_Remote_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -11410,36 +9495,36 @@ void _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_AliasDef_Proxy_Broker::_TAO_AliasDef_Proxy_Broker (void)
+_TAO_CORBA_AliasDef_Proxy_Broker::_TAO_CORBA_AliasDef_Proxy_Broker (void)
 {
 }
 
-_TAO_AliasDef_Proxy_Broker::~_TAO_AliasDef_Proxy_Broker (void)
+_TAO_CORBA_AliasDef_Proxy_Broker::~_TAO_CORBA_AliasDef_Proxy_Broker (void)
 {
 }
 
-_TAO_AliasDef_Proxy_Broker * (*CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_AliasDef_Proxy_Broker * (*_TAO_CORBA_AliasDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_AliasDef_Remote_Proxy_Broker *
-_TAO_AliasDef_Remote_Proxy_Broker::the_TAO_AliasDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_AliasDef_Remote_Proxy_Broker *
+_TAO_CORBA_AliasDef_Remote_Proxy_Broker::the_TAO_CORBA_AliasDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_AliasDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_AliasDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_AliasDef_Remote_Proxy_Broker::_TAO_AliasDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_AliasDef_Remote_Proxy_Broker::_TAO_CORBA_AliasDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_AliasDef_Remote_Proxy_Broker::~_TAO_AliasDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_AliasDef_Remote_Proxy_Broker::~_TAO_CORBA_AliasDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_AliasDef_Proxy_Impl&
-_TAO_AliasDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_AliasDef_Proxy_Impl&
+_TAO_CORBA_AliasDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_AliasDef *,
   CORBA::Environment &
 )
@@ -11464,72 +9549,72 @@ CORBA_AliasDef::~CORBA_AliasDef (void)
 {}
 
 void
-CORBA::AliasDef::CORBA_AliasDef_setup_collocation (int collocated)
+CORBA_AliasDef::CORBA_AliasDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_AliasDef_Proxy_Broker_ =
-      ::CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_AliasDef_Proxy_Broker_ =
+      ::_TAO_CORBA_AliasDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_AliasDef_Proxy_Broker_ =
-      ::_TAO_AliasDef_Remote_Proxy_Broker::the_TAO_AliasDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_AliasDef_Proxy_Broker_ =
+      ::_TAO_CORBA_AliasDef_Remote_Proxy_Broker::the_TAO_CORBA_AliasDef_Remote_Proxy_Broker ();
   
   this->CORBA_TypedefDef_setup_collocation (collocated);
 }
 
-void CORBA::AliasDef::_tao_any_destructor (void *x)
+void CORBA_AliasDef::_tao_any_destructor (void *x)
 {
   CORBA_AliasDef *tmp = ACE_static_cast (CORBA_AliasDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::AliasDef_ptr CORBA::AliasDef::_narrow (
+CORBA_AliasDef_ptr CORBA_AliasDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::AliasDef::_nil ();
+    return CORBA_AliasDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AliasDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::AliasDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_AliasDef::_nil ());
       if (is_a == 0)
-        return CORBA::AliasDef::_nil ();
+        return CORBA_AliasDef::_nil ();
     }
-  return CORBA::AliasDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_AliasDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::AliasDef_ptr CORBA::AliasDef::_unchecked_narrow (
+CORBA_AliasDef_ptr CORBA_AliasDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::AliasDef::_nil ();
+    return CORBA_AliasDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::AliasDef_ptr default_proxy = CORBA::AliasDef::_nil ();
+      CORBA_AliasDef_ptr default_proxy = CORBA_AliasDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_AliasDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::AliasDef (
+          ::CORBA_AliasDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::AliasDef::_nil ());
+          CORBA_AliasDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::AliasDef (stub, 0, obj->_servant ()), CORBA::AliasDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_AliasDef (stub, 0, obj->_servant ()), CORBA_AliasDef::_nil ());
         return default_proxy;
       }
     else 
@@ -11548,15 +9633,15 @@ CORBA::AliasDef_ptr CORBA::AliasDef::_unchecked_narrow (
           );
 }
 
-CORBA::AliasDef_ptr
-CORBA::AliasDef::_duplicate (CORBA::AliasDef_ptr obj)
+CORBA_AliasDef_ptr
+CORBA_AliasDef::_duplicate (CORBA_AliasDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::AliasDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_AliasDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AliasDef:1.0")) ||
@@ -11570,58 +9655,58 @@ CORBA::Boolean CORBA::AliasDef::_is_a (const CORBA::Char *value, CORBA::Environm
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::AliasDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_AliasDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_AliasDef::_narrow))
+      &CORBA_AliasDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::TypedefDef::_narrow))
+      &CORBA_TypedefDef::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::TypedefDef_ptr,
+            CORBA_TypedefDef_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -11634,20 +9719,20 @@ void *CORBA::AliasDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::AliasDef::_interface_repository_id (void) const
+const char* CORBA_AliasDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/AliasDef:1.0";
 }
 
-CORBA::IDLType_ptr CORBA::AliasDef::original_type_def (
+CORBA_IDLType_ptr CORBA_AliasDef::original_type_def (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_AliasDef_Proxy_Impl &proxy = 
-    this->the_TAO_AliasDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_AliasDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_AliasDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.original_type_def (
@@ -11656,16 +9741,16 @@ CORBA::IDLType_ptr CORBA::AliasDef::original_type_def (
     );
 }
 
-void CORBA::AliasDef::original_type_def (
-    CORBA::IDLType_ptr original_type_def,
+void CORBA_AliasDef::original_type_def (
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_AliasDef_Proxy_Impl &proxy = 
-    this->the_TAO_AliasDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_AliasDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_AliasDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.original_type_def (
@@ -11675,6 +9760,188 @@ void CORBA::AliasDef::original_type_def (
     );
 }
 
+// *************************************************************
+// Operations for class CORBA_NativeDef_var
+// *************************************************************
+
+CORBA_NativeDef_var::CORBA_NativeDef_var (void) // default constructor
+  : ptr_ (CORBA_NativeDef::_nil ())
+{}
+
+::CORBA_NativeDef_ptr
+CORBA_NativeDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_NativeDef_var::CORBA_NativeDef_var (const ::CORBA_NativeDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_NativeDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_NativeDef_var::~CORBA_NativeDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_NativeDef_var &
+CORBA_NativeDef_var::operator= (CORBA_NativeDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_NativeDef_var &
+CORBA_NativeDef_var::operator= (const ::CORBA_NativeDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_NativeDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_NativeDef_var::operator const ::CORBA_NativeDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_NativeDef_var::operator ::CORBA_NativeDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_NativeDef_ptr
+CORBA_NativeDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_NativeDef_ptr
+CORBA_NativeDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_NativeDef_ptr &
+CORBA_NativeDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_NativeDef_ptr &
+CORBA_NativeDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_NativeDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_NativeDef_ptr
+CORBA_NativeDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_NativeDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_NativeDef::_nil ();
+  return val;
+}
+
+::CORBA_NativeDef_ptr
+CORBA_NativeDef_var::duplicate (CORBA_NativeDef_ptr p)
+{
+  return ::CORBA_NativeDef::_duplicate (p);
+}
+
+void
+CORBA_NativeDef_var::release (CORBA_NativeDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_NativeDef_ptr
+CORBA_NativeDef_var::nil (void)
+{
+  return ::CORBA_NativeDef::_nil ();
+}
+
+::CORBA_NativeDef_ptr
+CORBA_NativeDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_NativeDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_NativeDef_var::upcast (void *src)
+{
+  CORBA_NativeDef **tmp =
+    ACE_static_cast (CORBA_NativeDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_NativeDef_out
+// *************************************************************
+
+CORBA_NativeDef_out::CORBA_NativeDef_out (CORBA_NativeDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_NativeDef::_nil ();
+}
+
+CORBA_NativeDef_out::CORBA_NativeDef_out (CORBA_NativeDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_NativeDef::_nil ();
+}
+
+CORBA_NativeDef_out::CORBA_NativeDef_out (const ::CORBA_NativeDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_NativeDef_out &, p).ptr_)
+{}
+
+::CORBA_NativeDef_out &
+CORBA_NativeDef_out::operator= (const ::CORBA_NativeDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_NativeDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_NativeDef_out &
+CORBA_NativeDef_out::operator= (const ::CORBA_NativeDef_var &p)
+{
+  this->ptr_ = ::CORBA_NativeDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_NativeDef_out &
+CORBA_NativeDef_out::operator= (CORBA_NativeDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_NativeDef_out::operator ::CORBA_NativeDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_NativeDef_ptr &
+CORBA_NativeDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_NativeDef_ptr
+CORBA_NativeDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -11683,10 +9950,10 @@ void CORBA::AliasDef::original_type_def (
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_NativeDef_Proxy_Impl::_TAO_NativeDef_Proxy_Impl (void)
+_TAO_CORBA_NativeDef_Proxy_Impl::_TAO_CORBA_NativeDef_Proxy_Impl (void)
 {}
 
-_TAO_NativeDef_Remote_Proxy_Impl::_TAO_NativeDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_NativeDef_Remote_Proxy_Impl::_TAO_CORBA_NativeDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
@@ -11701,36 +9968,36 @@ _TAO_NativeDef_Remote_Proxy_Impl::_TAO_NativeDef_Remote_Proxy_Impl (void)
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_NativeDef_Proxy_Broker::_TAO_NativeDef_Proxy_Broker (void)
+_TAO_CORBA_NativeDef_Proxy_Broker::_TAO_CORBA_NativeDef_Proxy_Broker (void)
 {
 }
 
-_TAO_NativeDef_Proxy_Broker::~_TAO_NativeDef_Proxy_Broker (void)
+_TAO_CORBA_NativeDef_Proxy_Broker::~_TAO_CORBA_NativeDef_Proxy_Broker (void)
 {
 }
 
-_TAO_NativeDef_Proxy_Broker * (*CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_NativeDef_Proxy_Broker * (*_TAO_CORBA_NativeDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_NativeDef_Remote_Proxy_Broker *
-_TAO_NativeDef_Remote_Proxy_Broker::the_TAO_NativeDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_NativeDef_Remote_Proxy_Broker *
+_TAO_CORBA_NativeDef_Remote_Proxy_Broker::the_TAO_CORBA_NativeDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_NativeDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_NativeDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_NativeDef_Remote_Proxy_Broker::_TAO_NativeDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_NativeDef_Remote_Proxy_Broker::_TAO_CORBA_NativeDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_NativeDef_Remote_Proxy_Broker::~_TAO_NativeDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_NativeDef_Remote_Proxy_Broker::~_TAO_CORBA_NativeDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_NativeDef_Proxy_Impl&
-_TAO_NativeDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_NativeDef_Proxy_Impl&
+_TAO_CORBA_NativeDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_NativeDef *,
   CORBA::Environment &
 )
@@ -11755,72 +10022,72 @@ CORBA_NativeDef::~CORBA_NativeDef (void)
 {}
 
 void
-CORBA::NativeDef::CORBA_NativeDef_setup_collocation (int collocated)
+CORBA_NativeDef::CORBA_NativeDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_NativeDef_Proxy_Broker_ =
-      ::CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_NativeDef_Proxy_Broker_ =
+      ::_TAO_CORBA_NativeDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_NativeDef_Proxy_Broker_ =
-      ::_TAO_NativeDef_Remote_Proxy_Broker::the_TAO_NativeDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_NativeDef_Proxy_Broker_ =
+      ::_TAO_CORBA_NativeDef_Remote_Proxy_Broker::the_TAO_CORBA_NativeDef_Remote_Proxy_Broker ();
   
   this->CORBA_TypedefDef_setup_collocation (collocated);
 }
 
-void CORBA::NativeDef::_tao_any_destructor (void *x)
+void CORBA_NativeDef::_tao_any_destructor (void *x)
 {
   CORBA_NativeDef *tmp = ACE_static_cast (CORBA_NativeDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::NativeDef_ptr CORBA::NativeDef::_narrow (
+CORBA_NativeDef_ptr CORBA_NativeDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::NativeDef::_nil ();
+    return CORBA_NativeDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/NativeDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::NativeDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_NativeDef::_nil ());
       if (is_a == 0)
-        return CORBA::NativeDef::_nil ();
+        return CORBA_NativeDef::_nil ();
     }
-  return CORBA::NativeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_NativeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::NativeDef_ptr CORBA::NativeDef::_unchecked_narrow (
+CORBA_NativeDef_ptr CORBA_NativeDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::NativeDef::_nil ();
+    return CORBA_NativeDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::NativeDef_ptr default_proxy = CORBA::NativeDef::_nil ();
+      CORBA_NativeDef_ptr default_proxy = CORBA_NativeDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_NativeDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::NativeDef (
+          ::CORBA_NativeDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::NativeDef::_nil ());
+          CORBA_NativeDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::NativeDef (stub, 0, obj->_servant ()), CORBA::NativeDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_NativeDef (stub, 0, obj->_servant ()), CORBA_NativeDef::_nil ());
         return default_proxy;
       }
     else 
@@ -11839,15 +10106,15 @@ CORBA::NativeDef_ptr CORBA::NativeDef::_unchecked_narrow (
           );
 }
 
-CORBA::NativeDef_ptr
-CORBA::NativeDef::_duplicate (CORBA::NativeDef_ptr obj)
+CORBA_NativeDef_ptr
+CORBA_NativeDef::_duplicate (CORBA_NativeDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::NativeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_NativeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/NativeDef:1.0")) ||
@@ -11861,58 +10128,58 @@ CORBA::Boolean CORBA::NativeDef::_is_a (const CORBA::Char *value, CORBA::Environ
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::NativeDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_NativeDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_NativeDef::_narrow))
+      &CORBA_NativeDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::TypedefDef::_narrow))
+      &CORBA_TypedefDef::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::TypedefDef_ptr,
+            CORBA_TypedefDef_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -11925,11 +10192,193 @@ void *CORBA::NativeDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::NativeDef::_interface_repository_id (void) const
+const char* CORBA_NativeDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/NativeDef:1.0";
 }
 
+// *************************************************************
+// Operations for class CORBA_PrimitiveDef_var
+// *************************************************************
+
+CORBA_PrimitiveDef_var::CORBA_PrimitiveDef_var (void) // default constructor
+  : ptr_ (CORBA_PrimitiveDef::_nil ())
+{}
+
+::CORBA::PrimitiveDef_ptr
+CORBA_PrimitiveDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_PrimitiveDef_var::CORBA_PrimitiveDef_var (const ::CORBA_PrimitiveDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_PrimitiveDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_PrimitiveDef_var::~CORBA_PrimitiveDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_PrimitiveDef_var &
+CORBA_PrimitiveDef_var::operator= (CORBA::PrimitiveDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_PrimitiveDef_var &
+CORBA_PrimitiveDef_var::operator= (const ::CORBA_PrimitiveDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_PrimitiveDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_PrimitiveDef_var::operator const ::CORBA::PrimitiveDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_PrimitiveDef_var::operator ::CORBA::PrimitiveDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA::PrimitiveDef_ptr
+CORBA_PrimitiveDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::PrimitiveDef_ptr
+CORBA_PrimitiveDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA::PrimitiveDef_ptr &
+CORBA_PrimitiveDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA::PrimitiveDef_ptr &
+CORBA_PrimitiveDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_PrimitiveDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA::PrimitiveDef_ptr
+CORBA_PrimitiveDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA::PrimitiveDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_PrimitiveDef::_nil ();
+  return val;
+}
+
+::CORBA::PrimitiveDef_ptr
+CORBA_PrimitiveDef_var::duplicate (CORBA::PrimitiveDef_ptr p)
+{
+  return ::CORBA_PrimitiveDef::_duplicate (p);
+}
+
+void
+CORBA_PrimitiveDef_var::release (CORBA::PrimitiveDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA::PrimitiveDef_ptr
+CORBA_PrimitiveDef_var::nil (void)
+{
+  return ::CORBA_PrimitiveDef::_nil ();
+}
+
+::CORBA::PrimitiveDef_ptr
+CORBA_PrimitiveDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_PrimitiveDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_PrimitiveDef_var::upcast (void *src)
+{
+  CORBA_PrimitiveDef **tmp =
+    ACE_static_cast (CORBA_PrimitiveDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_PrimitiveDef_out
+// *************************************************************
+
+CORBA_PrimitiveDef_out::CORBA_PrimitiveDef_out (CORBA::PrimitiveDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_PrimitiveDef::_nil ();
+}
+
+CORBA_PrimitiveDef_out::CORBA_PrimitiveDef_out (CORBA_PrimitiveDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_PrimitiveDef::_nil ();
+}
+
+CORBA_PrimitiveDef_out::CORBA_PrimitiveDef_out (const ::CORBA_PrimitiveDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_PrimitiveDef_out &, p).ptr_)
+{}
+
+::CORBA_PrimitiveDef_out &
+CORBA_PrimitiveDef_out::operator= (const ::CORBA_PrimitiveDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_PrimitiveDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_PrimitiveDef_out &
+CORBA_PrimitiveDef_out::operator= (const ::CORBA_PrimitiveDef_var &p)
+{
+  this->ptr_ = ::CORBA_PrimitiveDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_PrimitiveDef_out &
+CORBA_PrimitiveDef_out::operator= (CORBA::PrimitiveDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_PrimitiveDef_out::operator ::CORBA::PrimitiveDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA::PrimitiveDef_ptr &
+CORBA_PrimitiveDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA::PrimitiveDef_ptr
+CORBA_PrimitiveDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get : public TAO_ClientRequestInfo
@@ -12031,15 +10480,15 @@ TAO_ClientRequestInfo_CORBA_PrimitiveDef_kind_get::result (CORBA::PrimitiveKind
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_PrimitiveDef_Proxy_Impl::_TAO_PrimitiveDef_Proxy_Impl (void)
+_TAO_CORBA_PrimitiveDef_Proxy_Impl::_TAO_CORBA_PrimitiveDef_Proxy_Impl (void)
 {}
 
-_TAO_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::_TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::PrimitiveKind _TAO_PrimitiveDef_Remote_Proxy_Impl::kind (
+CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl::kind (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -12207,36 +10656,36 @@ CORBA::PrimitiveKind _TAO_PrimitiveDef_Remote_Proxy_Impl::kind (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_PrimitiveDef_Proxy_Broker::_TAO_PrimitiveDef_Proxy_Broker (void)
+_TAO_CORBA_PrimitiveDef_Proxy_Broker::_TAO_CORBA_PrimitiveDef_Proxy_Broker (void)
 {
 }
 
-_TAO_PrimitiveDef_Proxy_Broker::~_TAO_PrimitiveDef_Proxy_Broker (void)
+_TAO_CORBA_PrimitiveDef_Proxy_Broker::~_TAO_CORBA_PrimitiveDef_Proxy_Broker (void)
 {
 }
 
-_TAO_PrimitiveDef_Proxy_Broker * (*CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_PrimitiveDef_Proxy_Broker * (*_TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_PrimitiveDef_Remote_Proxy_Broker *
-_TAO_PrimitiveDef_Remote_Proxy_Broker::the_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker *
+_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker::the_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_PrimitiveDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_PrimitiveDef_Remote_Proxy_Broker::_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker::_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_PrimitiveDef_Remote_Proxy_Broker::~_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker::~_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_PrimitiveDef_Proxy_Impl&
-_TAO_PrimitiveDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_PrimitiveDef_Proxy_Impl&
+_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_PrimitiveDef *,
   CORBA::Environment &
 )
@@ -12261,79 +10710,79 @@ CORBA_PrimitiveDef::~CORBA_PrimitiveDef (void)
 {}
 
 void
-CORBA::PrimitiveDef::CORBA_PrimitiveDef_setup_collocation (int collocated)
+CORBA_PrimitiveDef::CORBA_PrimitiveDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_PrimitiveDef_Proxy_Broker_ =
-      ::CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_PrimitiveDef_Proxy_Broker_ =
+      ::_TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_PrimitiveDef_Proxy_Broker_ =
-      ::_TAO_PrimitiveDef_Remote_Proxy_Broker::the_TAO_PrimitiveDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_PrimitiveDef_Proxy_Broker_ =
+      ::_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker::the_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker ();
   
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA::PrimitiveDef::_tao_any_destructor (void *x)
+void CORBA_PrimitiveDef::_tao_any_destructor (void *x)
 {
   CORBA_PrimitiveDef *tmp = ACE_static_cast (CORBA_PrimitiveDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::PrimitiveDef_ptr CORBA::PrimitiveDef::_narrow (
+CORBA::PrimitiveDef_ptr CORBA_PrimitiveDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::PrimitiveDef::_nil ();
+    return CORBA_PrimitiveDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PrimitiveDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::PrimitiveDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_PrimitiveDef::_nil ());
       if (is_a == 0)
-        return CORBA::PrimitiveDef::_nil ();
+        return CORBA_PrimitiveDef::_nil ();
     }
-  return CORBA::PrimitiveDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_PrimitiveDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::PrimitiveDef_ptr CORBA::PrimitiveDef::_unchecked_narrow (
+CORBA::PrimitiveDef_ptr CORBA_PrimitiveDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::PrimitiveDef::_nil ();
+    return CORBA_PrimitiveDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::PrimitiveDef_ptr default_proxy = CORBA::PrimitiveDef::_nil ();
+      CORBA::PrimitiveDef_ptr default_proxy = CORBA_PrimitiveDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::PrimitiveDef (
+          ::CORBA_PrimitiveDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::PrimitiveDef::_nil ());
+          CORBA_PrimitiveDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::PrimitiveDef (stub, 0, obj->_servant ()), CORBA::PrimitiveDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_PrimitiveDef (stub, 0, obj->_servant ()), CORBA_PrimitiveDef::_nil ());
         return default_proxy;
       }
     else 
       return
         ACE_reinterpret_cast
           (
-            CORBA_PrimitiveDef_ptr,
+            CORBA::PrimitiveDef_ptr,
               obj->_tao_QueryInterface
                 (
                   ACE_reinterpret_cast
@@ -12346,14 +10795,14 @@ CORBA::PrimitiveDef_ptr CORBA::PrimitiveDef::_unchecked_narrow (
 }
 
 CORBA::PrimitiveDef_ptr
-CORBA::PrimitiveDef::_duplicate (CORBA::PrimitiveDef_ptr obj)
+CORBA_PrimitiveDef::_duplicate (CORBA::PrimitiveDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::PrimitiveDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_PrimitiveDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PrimitiveDef:1.0")) ||
@@ -12365,34 +10814,34 @@ CORBA::Boolean CORBA::PrimitiveDef::_is_a (const CORBA::Char *value, CORBA::Envi
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::PrimitiveDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_PrimitiveDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_PrimitiveDef::_narrow))
+      &CORBA_PrimitiveDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -12405,20 +10854,20 @@ void *CORBA::PrimitiveDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::PrimitiveDef::_interface_repository_id (void) const
+const char* CORBA_PrimitiveDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/PrimitiveDef:1.0";
 }
 
-CORBA::PrimitiveKind CORBA::PrimitiveDef::kind (
+CORBA::PrimitiveKind CORBA_PrimitiveDef::kind (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_PrimitiveDef_Proxy_Impl &proxy = 
-    this->the_TAO_PrimitiveDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_PrimitiveDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_PrimitiveDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN ((CORBA::PrimitiveKind)0);
   
   return proxy.kind (
@@ -12427,6 +10876,188 @@ CORBA::PrimitiveKind CORBA::PrimitiveDef::kind (
     );
 }
 
+// *************************************************************
+// Operations for class CORBA_StringDef_var
+// *************************************************************
+
+CORBA_StringDef_var::CORBA_StringDef_var (void) // default constructor
+  : ptr_ (CORBA_StringDef::_nil ())
+{}
+
+::CORBA_StringDef_ptr
+CORBA_StringDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_StringDef_var::CORBA_StringDef_var (const ::CORBA_StringDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_StringDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_StringDef_var::~CORBA_StringDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_StringDef_var &
+CORBA_StringDef_var::operator= (CORBA_StringDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_StringDef_var &
+CORBA_StringDef_var::operator= (const ::CORBA_StringDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_StringDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_StringDef_var::operator const ::CORBA_StringDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_StringDef_var::operator ::CORBA_StringDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_StringDef_ptr
+CORBA_StringDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_StringDef_ptr
+CORBA_StringDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_StringDef_ptr &
+CORBA_StringDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_StringDef_ptr &
+CORBA_StringDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_StringDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_StringDef_ptr
+CORBA_StringDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_StringDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_StringDef::_nil ();
+  return val;
+}
+
+::CORBA_StringDef_ptr
+CORBA_StringDef_var::duplicate (CORBA_StringDef_ptr p)
+{
+  return ::CORBA_StringDef::_duplicate (p);
+}
+
+void
+CORBA_StringDef_var::release (CORBA_StringDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_StringDef_ptr
+CORBA_StringDef_var::nil (void)
+{
+  return ::CORBA_StringDef::_nil ();
+}
+
+::CORBA_StringDef_ptr
+CORBA_StringDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_StringDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_StringDef_var::upcast (void *src)
+{
+  CORBA_StringDef **tmp =
+    ACE_static_cast (CORBA_StringDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_StringDef_out
+// *************************************************************
+
+CORBA_StringDef_out::CORBA_StringDef_out (CORBA_StringDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_StringDef::_nil ();
+}
+
+CORBA_StringDef_out::CORBA_StringDef_out (CORBA_StringDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_StringDef::_nil ();
+}
+
+CORBA_StringDef_out::CORBA_StringDef_out (const ::CORBA_StringDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_StringDef_out &, p).ptr_)
+{}
+
+::CORBA_StringDef_out &
+CORBA_StringDef_out::operator= (const ::CORBA_StringDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_StringDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_StringDef_out &
+CORBA_StringDef_out::operator= (const ::CORBA_StringDef_var &p)
+{
+  this->ptr_ = ::CORBA_StringDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_StringDef_out &
+CORBA_StringDef_out::operator= (CORBA_StringDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_StringDef_out::operator ::CORBA_StringDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_StringDef_ptr &
+CORBA_StringDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_StringDef_ptr
+CORBA_StringDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_StringDef_bound_get : public TAO_ClientRequestInfo
@@ -12620,15 +11251,15 @@ TAO_ClientRequestInfo_CORBA_StringDef_bound_set::result (CORBA::Environment &ACE
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_StringDef_Proxy_Impl::_TAO_StringDef_Proxy_Impl (void)
+_TAO_CORBA_StringDef_Proxy_Impl::_TAO_CORBA_StringDef_Proxy_Impl (void)
 {}
 
-_TAO_StringDef_Remote_Proxy_Impl::_TAO_StringDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_StringDef_Remote_Proxy_Impl::_TAO_CORBA_StringDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::ULong _TAO_StringDef_Remote_Proxy_Impl::bound (
+CORBA::ULong _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -12786,7 +11417,7 @@ CORBA::ULong _TAO_StringDef_Remote_Proxy_Impl::bound (
   return _tao_retval;
 }
 
-void _TAO_StringDef_Remote_Proxy_Impl::bound (
+void _TAO_CORBA_StringDef_Remote_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
@@ -12948,36 +11579,36 @@ void _TAO_StringDef_Remote_Proxy_Impl::bound (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_StringDef_Proxy_Broker::_TAO_StringDef_Proxy_Broker (void)
+_TAO_CORBA_StringDef_Proxy_Broker::_TAO_CORBA_StringDef_Proxy_Broker (void)
 {
 }
 
-_TAO_StringDef_Proxy_Broker::~_TAO_StringDef_Proxy_Broker (void)
+_TAO_CORBA_StringDef_Proxy_Broker::~_TAO_CORBA_StringDef_Proxy_Broker (void)
 {
 }
 
-_TAO_StringDef_Proxy_Broker * (*CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_StringDef_Proxy_Broker * (*_TAO_CORBA_StringDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_StringDef_Remote_Proxy_Broker *
-_TAO_StringDef_Remote_Proxy_Broker::the_TAO_StringDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_StringDef_Remote_Proxy_Broker *
+_TAO_CORBA_StringDef_Remote_Proxy_Broker::the_TAO_CORBA_StringDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_StringDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_StringDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_StringDef_Remote_Proxy_Broker::_TAO_StringDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_StringDef_Remote_Proxy_Broker::_TAO_CORBA_StringDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_StringDef_Remote_Proxy_Broker::~_TAO_StringDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_StringDef_Remote_Proxy_Broker::~_TAO_CORBA_StringDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_StringDef_Proxy_Impl&
-_TAO_StringDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_StringDef_Proxy_Impl&
+_TAO_CORBA_StringDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_StringDef *,
   CORBA::Environment &
 )
@@ -13002,72 +11633,72 @@ CORBA_StringDef::~CORBA_StringDef (void)
 {}
 
 void
-CORBA::StringDef::CORBA_StringDef_setup_collocation (int collocated)
+CORBA_StringDef::CORBA_StringDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_StringDef_Proxy_Broker_ =
-      ::CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_StringDef_Proxy_Broker_ =
+      ::_TAO_CORBA_StringDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_StringDef_Proxy_Broker_ =
-      ::_TAO_StringDef_Remote_Proxy_Broker::the_TAO_StringDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_StringDef_Proxy_Broker_ =
+      ::_TAO_CORBA_StringDef_Remote_Proxy_Broker::the_TAO_CORBA_StringDef_Remote_Proxy_Broker ();
   
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA::StringDef::_tao_any_destructor (void *x)
+void CORBA_StringDef::_tao_any_destructor (void *x)
 {
   CORBA_StringDef *tmp = ACE_static_cast (CORBA_StringDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::StringDef_ptr CORBA::StringDef::_narrow (
+CORBA_StringDef_ptr CORBA_StringDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::StringDef::_nil ();
+    return CORBA_StringDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StringDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::StringDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_StringDef::_nil ());
       if (is_a == 0)
-        return CORBA::StringDef::_nil ();
+        return CORBA_StringDef::_nil ();
     }
-  return CORBA::StringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_StringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::StringDef_ptr CORBA::StringDef::_unchecked_narrow (
+CORBA_StringDef_ptr CORBA_StringDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::StringDef::_nil ();
+    return CORBA_StringDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::StringDef_ptr default_proxy = CORBA::StringDef::_nil ();
+      CORBA_StringDef_ptr default_proxy = CORBA_StringDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_StringDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::StringDef (
+          ::CORBA_StringDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::StringDef::_nil ());
+          CORBA_StringDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::StringDef (stub, 0, obj->_servant ()), CORBA::StringDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_StringDef (stub, 0, obj->_servant ()), CORBA_StringDef::_nil ());
         return default_proxy;
       }
     else 
@@ -13086,15 +11717,15 @@ CORBA::StringDef_ptr CORBA::StringDef::_unchecked_narrow (
           );
 }
 
-CORBA::StringDef_ptr
-CORBA::StringDef::_duplicate (CORBA::StringDef_ptr obj)
+CORBA_StringDef_ptr
+CORBA_StringDef::_duplicate (CORBA_StringDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::StringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_StringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StringDef:1.0")) ||
@@ -13106,34 +11737,34 @@ CORBA::Boolean CORBA::StringDef::_is_a (const CORBA::Char *value, CORBA::Environ
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::StringDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_StringDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_StringDef::_narrow))
+      &CORBA_StringDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -13146,20 +11777,20 @@ void *CORBA::StringDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::StringDef::_interface_repository_id (void) const
+const char* CORBA_StringDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/StringDef:1.0";
 }
 
-CORBA::ULong CORBA::StringDef::bound (
+CORBA::ULong CORBA_StringDef::bound (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_StringDef_Proxy_Impl &proxy = 
-    this->the_TAO_StringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_StringDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_StringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.bound (
@@ -13168,7 +11799,7 @@ CORBA::ULong CORBA::StringDef::bound (
     );
 }
 
-void CORBA::StringDef::bound (
+void CORBA_StringDef::bound (
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -13176,8 +11807,8 @@ void CORBA::StringDef::bound (
     CORBA::SystemException
   ))
 {
-  _TAO_StringDef_Proxy_Impl &proxy = 
-    this->the_TAO_StringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_StringDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_StringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.bound (
@@ -13187,6 +11818,188 @@ void CORBA::StringDef::bound (
     );
 }
 
+// *************************************************************
+// Operations for class CORBA_WstringDef_var
+// *************************************************************
+
+CORBA_WstringDef_var::CORBA_WstringDef_var (void) // default constructor
+  : ptr_ (CORBA_WstringDef::_nil ())
+{}
+
+::CORBA_WstringDef_ptr
+CORBA_WstringDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_WstringDef_var::CORBA_WstringDef_var (const ::CORBA_WstringDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_WstringDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_WstringDef_var::~CORBA_WstringDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_WstringDef_var &
+CORBA_WstringDef_var::operator= (CORBA_WstringDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_WstringDef_var &
+CORBA_WstringDef_var::operator= (const ::CORBA_WstringDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_WstringDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_WstringDef_var::operator const ::CORBA_WstringDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_WstringDef_var::operator ::CORBA_WstringDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_WstringDef_ptr
+CORBA_WstringDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_WstringDef_ptr
+CORBA_WstringDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_WstringDef_ptr &
+CORBA_WstringDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_WstringDef_ptr &
+CORBA_WstringDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_WstringDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_WstringDef_ptr
+CORBA_WstringDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_WstringDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_WstringDef::_nil ();
+  return val;
+}
+
+::CORBA_WstringDef_ptr
+CORBA_WstringDef_var::duplicate (CORBA_WstringDef_ptr p)
+{
+  return ::CORBA_WstringDef::_duplicate (p);
+}
+
+void
+CORBA_WstringDef_var::release (CORBA_WstringDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_WstringDef_ptr
+CORBA_WstringDef_var::nil (void)
+{
+  return ::CORBA_WstringDef::_nil ();
+}
+
+::CORBA_WstringDef_ptr
+CORBA_WstringDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_WstringDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_WstringDef_var::upcast (void *src)
+{
+  CORBA_WstringDef **tmp =
+    ACE_static_cast (CORBA_WstringDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_WstringDef_out
+// *************************************************************
+
+CORBA_WstringDef_out::CORBA_WstringDef_out (CORBA_WstringDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_WstringDef::_nil ();
+}
+
+CORBA_WstringDef_out::CORBA_WstringDef_out (CORBA_WstringDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_WstringDef::_nil ();
+}
+
+CORBA_WstringDef_out::CORBA_WstringDef_out (const ::CORBA_WstringDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_WstringDef_out &, p).ptr_)
+{}
+
+::CORBA_WstringDef_out &
+CORBA_WstringDef_out::operator= (const ::CORBA_WstringDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_WstringDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_WstringDef_out &
+CORBA_WstringDef_out::operator= (const ::CORBA_WstringDef_var &p)
+{
+  this->ptr_ = ::CORBA_WstringDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_WstringDef_out &
+CORBA_WstringDef_out::operator= (CORBA_WstringDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_WstringDef_out::operator ::CORBA_WstringDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_WstringDef_ptr &
+CORBA_WstringDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_WstringDef_ptr
+CORBA_WstringDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_WstringDef_bound_get : public TAO_ClientRequestInfo
@@ -13380,15 +12193,15 @@ TAO_ClientRequestInfo_CORBA_WstringDef_bound_set::result (CORBA::Environment &AC
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_WstringDef_Proxy_Impl::_TAO_WstringDef_Proxy_Impl (void)
+_TAO_CORBA_WstringDef_Proxy_Impl::_TAO_CORBA_WstringDef_Proxy_Impl (void)
 {}
 
-_TAO_WstringDef_Remote_Proxy_Impl::_TAO_WstringDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_WstringDef_Remote_Proxy_Impl::_TAO_CORBA_WstringDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::ULong _TAO_WstringDef_Remote_Proxy_Impl::bound (
+CORBA::ULong _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -13546,7 +12359,7 @@ CORBA::ULong _TAO_WstringDef_Remote_Proxy_Impl::bound (
   return _tao_retval;
 }
 
-void _TAO_WstringDef_Remote_Proxy_Impl::bound (
+void _TAO_CORBA_WstringDef_Remote_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
@@ -13708,36 +12521,36 @@ void _TAO_WstringDef_Remote_Proxy_Impl::bound (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_WstringDef_Proxy_Broker::_TAO_WstringDef_Proxy_Broker (void)
+_TAO_CORBA_WstringDef_Proxy_Broker::_TAO_CORBA_WstringDef_Proxy_Broker (void)
 {
 }
 
-_TAO_WstringDef_Proxy_Broker::~_TAO_WstringDef_Proxy_Broker (void)
+_TAO_CORBA_WstringDef_Proxy_Broker::~_TAO_CORBA_WstringDef_Proxy_Broker (void)
 {
 }
 
-_TAO_WstringDef_Proxy_Broker * (*CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_WstringDef_Proxy_Broker * (*_TAO_CORBA_WstringDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_WstringDef_Remote_Proxy_Broker *
-_TAO_WstringDef_Remote_Proxy_Broker::the_TAO_WstringDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_WstringDef_Remote_Proxy_Broker *
+_TAO_CORBA_WstringDef_Remote_Proxy_Broker::the_TAO_CORBA_WstringDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_WstringDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_WstringDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_WstringDef_Remote_Proxy_Broker::_TAO_WstringDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_WstringDef_Remote_Proxy_Broker::_TAO_CORBA_WstringDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_WstringDef_Remote_Proxy_Broker::~_TAO_WstringDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_WstringDef_Remote_Proxy_Broker::~_TAO_CORBA_WstringDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_WstringDef_Proxy_Impl&
-_TAO_WstringDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_WstringDef_Proxy_Impl&
+_TAO_CORBA_WstringDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_WstringDef *,
   CORBA::Environment &
 )
@@ -13762,72 +12575,72 @@ CORBA_WstringDef::~CORBA_WstringDef (void)
 {}
 
 void
-CORBA::WstringDef::CORBA_WstringDef_setup_collocation (int collocated)
+CORBA_WstringDef::CORBA_WstringDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_WstringDef_Proxy_Broker_ =
-      ::CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_WstringDef_Proxy_Broker_ =
+      ::_TAO_CORBA_WstringDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_WstringDef_Proxy_Broker_ =
-      ::_TAO_WstringDef_Remote_Proxy_Broker::the_TAO_WstringDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_WstringDef_Proxy_Broker_ =
+      ::_TAO_CORBA_WstringDef_Remote_Proxy_Broker::the_TAO_CORBA_WstringDef_Remote_Proxy_Broker ();
   
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA::WstringDef::_tao_any_destructor (void *x)
+void CORBA_WstringDef::_tao_any_destructor (void *x)
 {
   CORBA_WstringDef *tmp = ACE_static_cast (CORBA_WstringDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::WstringDef_ptr CORBA::WstringDef::_narrow (
+CORBA_WstringDef_ptr CORBA_WstringDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::WstringDef::_nil ();
+    return CORBA_WstringDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/WstringDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::WstringDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_WstringDef::_nil ());
       if (is_a == 0)
-        return CORBA::WstringDef::_nil ();
+        return CORBA_WstringDef::_nil ();
     }
-  return CORBA::WstringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_WstringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::WstringDef_ptr CORBA::WstringDef::_unchecked_narrow (
+CORBA_WstringDef_ptr CORBA_WstringDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::WstringDef::_nil ();
+    return CORBA_WstringDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::WstringDef_ptr default_proxy = CORBA::WstringDef::_nil ();
+      CORBA_WstringDef_ptr default_proxy = CORBA_WstringDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_WstringDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::WstringDef (
+          ::CORBA_WstringDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::WstringDef::_nil ());
+          CORBA_WstringDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::WstringDef (stub, 0, obj->_servant ()), CORBA::WstringDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_WstringDef (stub, 0, obj->_servant ()), CORBA_WstringDef::_nil ());
         return default_proxy;
       }
     else 
@@ -13846,15 +12659,15 @@ CORBA::WstringDef_ptr CORBA::WstringDef::_unchecked_narrow (
           );
 }
 
-CORBA::WstringDef_ptr
-CORBA::WstringDef::_duplicate (CORBA::WstringDef_ptr obj)
+CORBA_WstringDef_ptr
+CORBA_WstringDef::_duplicate (CORBA_WstringDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::WstringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_WstringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/WstringDef:1.0")) ||
@@ -13866,34 +12679,34 @@ CORBA::Boolean CORBA::WstringDef::_is_a (const CORBA::Char *value, CORBA::Enviro
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::WstringDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_WstringDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_WstringDef::_narrow))
+      &CORBA_WstringDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -13906,20 +12719,20 @@ void *CORBA::WstringDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::WstringDef::_interface_repository_id (void) const
+const char* CORBA_WstringDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/WstringDef:1.0";
 }
 
-CORBA::ULong CORBA::WstringDef::bound (
+CORBA::ULong CORBA_WstringDef::bound (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_WstringDef_Proxy_Impl &proxy = 
-    this->the_TAO_WstringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_WstringDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_WstringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.bound (
@@ -13928,7 +12741,7 @@ CORBA::ULong CORBA::WstringDef::bound (
     );
 }
 
-void CORBA::WstringDef::bound (
+void CORBA_WstringDef::bound (
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -13936,8 +12749,8 @@ void CORBA::WstringDef::bound (
     CORBA::SystemException
   ))
 {
-  _TAO_WstringDef_Proxy_Impl &proxy = 
-    this->the_TAO_WstringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_WstringDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_WstringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.bound (
@@ -13947,6 +12760,188 @@ void CORBA::WstringDef::bound (
     );
 }
 
+// *************************************************************
+// Operations for class CORBA_SequenceDef_var
+// *************************************************************
+
+CORBA_SequenceDef_var::CORBA_SequenceDef_var (void) // default constructor
+  : ptr_ (CORBA_SequenceDef::_nil ())
+{}
+
+::CORBA_SequenceDef_ptr
+CORBA_SequenceDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_SequenceDef_var::CORBA_SequenceDef_var (const ::CORBA_SequenceDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_SequenceDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_SequenceDef_var::~CORBA_SequenceDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_SequenceDef_var &
+CORBA_SequenceDef_var::operator= (CORBA_SequenceDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_SequenceDef_var &
+CORBA_SequenceDef_var::operator= (const ::CORBA_SequenceDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_SequenceDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_SequenceDef_var::operator const ::CORBA_SequenceDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_SequenceDef_var::operator ::CORBA_SequenceDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_SequenceDef_ptr
+CORBA_SequenceDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_SequenceDef_ptr
+CORBA_SequenceDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_SequenceDef_ptr &
+CORBA_SequenceDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_SequenceDef_ptr &
+CORBA_SequenceDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_SequenceDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_SequenceDef_ptr
+CORBA_SequenceDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_SequenceDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_SequenceDef::_nil ();
+  return val;
+}
+
+::CORBA_SequenceDef_ptr
+CORBA_SequenceDef_var::duplicate (CORBA_SequenceDef_ptr p)
+{
+  return ::CORBA_SequenceDef::_duplicate (p);
+}
+
+void
+CORBA_SequenceDef_var::release (CORBA_SequenceDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_SequenceDef_ptr
+CORBA_SequenceDef_var::nil (void)
+{
+  return ::CORBA_SequenceDef::_nil ();
+}
+
+::CORBA_SequenceDef_ptr
+CORBA_SequenceDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_SequenceDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_SequenceDef_var::upcast (void *src)
+{
+  CORBA_SequenceDef **tmp =
+    ACE_static_cast (CORBA_SequenceDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_SequenceDef_out
+// *************************************************************
+
+CORBA_SequenceDef_out::CORBA_SequenceDef_out (CORBA_SequenceDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_SequenceDef::_nil ();
+}
+
+CORBA_SequenceDef_out::CORBA_SequenceDef_out (CORBA_SequenceDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_SequenceDef::_nil ();
+}
+
+CORBA_SequenceDef_out::CORBA_SequenceDef_out (const ::CORBA_SequenceDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_SequenceDef_out &, p).ptr_)
+{}
+
+::CORBA_SequenceDef_out &
+CORBA_SequenceDef_out::operator= (const ::CORBA_SequenceDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_SequenceDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_SequenceDef_out &
+CORBA_SequenceDef_out::operator= (const ::CORBA_SequenceDef_var &p)
+{
+  this->ptr_ = ::CORBA_SequenceDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_SequenceDef_out &
+CORBA_SequenceDef_out::operator= (CORBA_SequenceDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_SequenceDef_out::operator ::CORBA_SequenceDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_SequenceDef_ptr &
+CORBA_SequenceDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_SequenceDef_ptr
+CORBA_SequenceDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_SequenceDef_bound_get : public TAO_ClientRequestInfo
@@ -14255,13 +13250,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get (const TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get &);
 
-  CORBA::IDLType_ptr _result;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get (
@@ -14314,7 +13309,7 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::result (CORBA::Env
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::result (CORBA::IDLType_ptr result)
+TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_get::result (CORBA_IDLType_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -14326,7 +13321,7 @@ public:
   TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::IDLType_ptr element_type_def,
+      CORBA_IDLType_ptr element_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -14353,14 +13348,14 @@ private:
   TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set (const TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set &);
 
-  CORBA::IDLType_ptr element_type_def_;
+  CORBA_IDLType_ptr element_type_def_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::IDLType_ptr element_type_def,
+    CORBA_IDLType_ptr element_type_def,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -14419,15 +13414,15 @@ TAO_ClientRequestInfo_CORBA_SequenceDef_element_type_def_set::result (CORBA::Env
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_SequenceDef_Proxy_Impl::_TAO_SequenceDef_Proxy_Impl (void)
+_TAO_CORBA_SequenceDef_Proxy_Impl::_TAO_CORBA_SequenceDef_Proxy_Impl (void)
 {}
 
-_TAO_SequenceDef_Remote_Proxy_Impl::_TAO_SequenceDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_SequenceDef_Remote_Proxy_Impl::_TAO_CORBA_SequenceDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::ULong _TAO_SequenceDef_Remote_Proxy_Impl::bound (
+CORBA::ULong _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -14585,7 +13580,7 @@ CORBA::ULong _TAO_SequenceDef_Remote_Proxy_Impl::bound (
   return _tao_retval;
 }
 
-void _TAO_SequenceDef_Remote_Proxy_Impl::bound (
+void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
@@ -14737,7 +13732,7 @@ void _TAO_SequenceDef_Remote_Proxy_Impl::bound (
   
 }
 
-CORBA::TypeCode_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type (
+CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -14897,7 +13892,7 @@ CORBA::TypeCode_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::IDLType_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
+CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -14906,8 +13901,8 @@ CORBA::IDLType_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
   ))
 {
   
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  CORBA::IDLType_var _tao_safe_retval (_tao_retval);
+  CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
+  CORBA_IDLType_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -14991,7 +13986,7 @@ CORBA::IDLType_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -15057,9 +14052,9 @@ CORBA::IDLType_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
+void _TAO_CORBA_SequenceDef_Remote_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr element_type_def,
+    CORBA_IDLType_ptr element_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -15219,36 +14214,36 @@ void _TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_SequenceDef_Proxy_Broker::_TAO_SequenceDef_Proxy_Broker (void)
+_TAO_CORBA_SequenceDef_Proxy_Broker::_TAO_CORBA_SequenceDef_Proxy_Broker (void)
 {
 }
 
-_TAO_SequenceDef_Proxy_Broker::~_TAO_SequenceDef_Proxy_Broker (void)
+_TAO_CORBA_SequenceDef_Proxy_Broker::~_TAO_CORBA_SequenceDef_Proxy_Broker (void)
 {
 }
 
-_TAO_SequenceDef_Proxy_Broker * (*CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_SequenceDef_Proxy_Broker * (*_TAO_CORBA_SequenceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_SequenceDef_Remote_Proxy_Broker *
-_TAO_SequenceDef_Remote_Proxy_Broker::the_TAO_SequenceDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_SequenceDef_Remote_Proxy_Broker *
+_TAO_CORBA_SequenceDef_Remote_Proxy_Broker::the_TAO_CORBA_SequenceDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_SequenceDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_SequenceDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_SequenceDef_Remote_Proxy_Broker::_TAO_SequenceDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_SequenceDef_Remote_Proxy_Broker::_TAO_CORBA_SequenceDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_SequenceDef_Remote_Proxy_Broker::~_TAO_SequenceDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_SequenceDef_Remote_Proxy_Broker::~_TAO_CORBA_SequenceDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_SequenceDef_Proxy_Impl&
-_TAO_SequenceDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_SequenceDef_Proxy_Impl&
+_TAO_CORBA_SequenceDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_SequenceDef *,
   CORBA::Environment &
 )
@@ -15273,72 +14268,72 @@ CORBA_SequenceDef::~CORBA_SequenceDef (void)
 {}
 
 void
-CORBA::SequenceDef::CORBA_SequenceDef_setup_collocation (int collocated)
+CORBA_SequenceDef::CORBA_SequenceDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_SequenceDef_Proxy_Broker_ =
-      ::CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_ =
+      ::_TAO_CORBA_SequenceDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_SequenceDef_Proxy_Broker_ =
-      ::_TAO_SequenceDef_Remote_Proxy_Broker::the_TAO_SequenceDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_ =
+      ::_TAO_CORBA_SequenceDef_Remote_Proxy_Broker::the_TAO_CORBA_SequenceDef_Remote_Proxy_Broker ();
   
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA::SequenceDef::_tao_any_destructor (void *x)
+void CORBA_SequenceDef::_tao_any_destructor (void *x)
 {
   CORBA_SequenceDef *tmp = ACE_static_cast (CORBA_SequenceDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::SequenceDef_ptr CORBA::SequenceDef::_narrow (
+CORBA_SequenceDef_ptr CORBA_SequenceDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::SequenceDef::_nil ();
+    return CORBA_SequenceDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/SequenceDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::SequenceDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ());
       if (is_a == 0)
-        return CORBA::SequenceDef::_nil ();
+        return CORBA_SequenceDef::_nil ();
     }
-  return CORBA::SequenceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_SequenceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::SequenceDef_ptr CORBA::SequenceDef::_unchecked_narrow (
+CORBA_SequenceDef_ptr CORBA_SequenceDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::SequenceDef::_nil ();
+    return CORBA_SequenceDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::SequenceDef_ptr default_proxy = CORBA::SequenceDef::_nil ();
+      CORBA_SequenceDef_ptr default_proxy = CORBA_SequenceDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_SequenceDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::SequenceDef (
+          ::CORBA_SequenceDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::SequenceDef::_nil ());
+          CORBA_SequenceDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::SequenceDef (stub, 0, obj->_servant ()), CORBA::SequenceDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_SequenceDef (stub, 0, obj->_servant ()), CORBA_SequenceDef::_nil ());
         return default_proxy;
       }
     else 
@@ -15357,54 +14352,54 @@ CORBA::SequenceDef_ptr CORBA::SequenceDef::_unchecked_narrow (
           );
 }
 
-CORBA::SequenceDef_ptr
-CORBA::SequenceDef::_duplicate (CORBA::SequenceDef_ptr obj)
+CORBA_SequenceDef_ptr
+CORBA_SequenceDef::_duplicate (CORBA_SequenceDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::SequenceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_SequenceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/SequenceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_SequenceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::SequenceDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_SequenceDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_SequenceDef::_narrow))
+      &CORBA_SequenceDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -15417,20 +14412,20 @@ void *CORBA::SequenceDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::SequenceDef::_interface_repository_id (void) const
+const char* CORBA_SequenceDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/SequenceDef:1.0";
 }
 
-CORBA::ULong CORBA::SequenceDef::bound (
+CORBA::ULong CORBA_SequenceDef::bound (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_SequenceDef_Proxy_Impl &proxy = 
-    this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_SequenceDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.bound (
@@ -15439,7 +14434,7 @@ CORBA::ULong CORBA::SequenceDef::bound (
     );
 }
 
-void CORBA::SequenceDef::bound (
+void CORBA_SequenceDef::bound (
     CORBA::ULong bound,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -15447,8 +14442,8 @@ void CORBA::SequenceDef::bound (
     CORBA::SystemException
   ))
 {
-  _TAO_SequenceDef_Proxy_Impl &proxy = 
-    this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_SequenceDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.bound (
@@ -15458,15 +14453,15 @@ void CORBA::SequenceDef::bound (
     );
 }
 
-CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
+CORBA::TypeCode_ptr CORBA_SequenceDef::element_type (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_SequenceDef_Proxy_Impl &proxy = 
-    this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_SequenceDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.element_type (
@@ -15475,15 +14470,15 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
     );
 }
 
-CORBA::IDLType_ptr CORBA::SequenceDef::element_type_def (
+CORBA_IDLType_ptr CORBA_SequenceDef::element_type_def (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_SequenceDef_Proxy_Impl &proxy = 
-    this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_SequenceDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.element_type_def (
@@ -15492,16 +14487,16 @@ CORBA::IDLType_ptr CORBA::SequenceDef::element_type_def (
     );
 }
 
-void CORBA::SequenceDef::element_type_def (
-    CORBA::IDLType_ptr element_type_def,
+void CORBA_SequenceDef::element_type_def (
+    CORBA_IDLType_ptr element_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_SequenceDef_Proxy_Impl &proxy = 
-    this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_SequenceDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.element_type_def (
@@ -15511,6 +14506,188 @@ void CORBA::SequenceDef::element_type_def (
     );
 }
 
+// *************************************************************
+// Operations for class CORBA_ArrayDef_var
+// *************************************************************
+
+CORBA_ArrayDef_var::CORBA_ArrayDef_var (void) // default constructor
+  : ptr_ (CORBA_ArrayDef::_nil ())
+{}
+
+::CORBA_ArrayDef_ptr
+CORBA_ArrayDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_ArrayDef_var::CORBA_ArrayDef_var (const ::CORBA_ArrayDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_ArrayDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_ArrayDef_var::~CORBA_ArrayDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_ArrayDef_var &
+CORBA_ArrayDef_var::operator= (CORBA_ArrayDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_ArrayDef_var &
+CORBA_ArrayDef_var::operator= (const ::CORBA_ArrayDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_ArrayDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_ArrayDef_var::operator const ::CORBA_ArrayDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_ArrayDef_var::operator ::CORBA_ArrayDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_ArrayDef_ptr
+CORBA_ArrayDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_ArrayDef_ptr
+CORBA_ArrayDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_ArrayDef_ptr &
+CORBA_ArrayDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_ArrayDef_ptr &
+CORBA_ArrayDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_ArrayDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_ArrayDef_ptr
+CORBA_ArrayDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_ArrayDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_ArrayDef::_nil ();
+  return val;
+}
+
+::CORBA_ArrayDef_ptr
+CORBA_ArrayDef_var::duplicate (CORBA_ArrayDef_ptr p)
+{
+  return ::CORBA_ArrayDef::_duplicate (p);
+}
+
+void
+CORBA_ArrayDef_var::release (CORBA_ArrayDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_ArrayDef_ptr
+CORBA_ArrayDef_var::nil (void)
+{
+  return ::CORBA_ArrayDef::_nil ();
+}
+
+::CORBA_ArrayDef_ptr
+CORBA_ArrayDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_ArrayDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_ArrayDef_var::upcast (void *src)
+{
+  CORBA_ArrayDef **tmp =
+    ACE_static_cast (CORBA_ArrayDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_ArrayDef_out
+// *************************************************************
+
+CORBA_ArrayDef_out::CORBA_ArrayDef_out (CORBA_ArrayDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_ArrayDef::_nil ();
+}
+
+CORBA_ArrayDef_out::CORBA_ArrayDef_out (CORBA_ArrayDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_ArrayDef::_nil ();
+}
+
+CORBA_ArrayDef_out::CORBA_ArrayDef_out (const ::CORBA_ArrayDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_ArrayDef_out &, p).ptr_)
+{}
+
+::CORBA_ArrayDef_out &
+CORBA_ArrayDef_out::operator= (const ::CORBA_ArrayDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_ArrayDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_ArrayDef_out &
+CORBA_ArrayDef_out::operator= (const ::CORBA_ArrayDef_var &p)
+{
+  this->ptr_ = ::CORBA_ArrayDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_ArrayDef_out &
+CORBA_ArrayDef_out::operator= (CORBA_ArrayDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_ArrayDef_out::operator ::CORBA_ArrayDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_ArrayDef_ptr &
+CORBA_ArrayDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_ArrayDef_ptr
+CORBA_ArrayDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_ArrayDef_length_get : public TAO_ClientRequestInfo
@@ -15819,13 +14996,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get (const TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get &);
 
-  CORBA::IDLType_ptr _result;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get (
@@ -15878,7 +15055,7 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::result (CORBA::Enviro
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::result (CORBA::IDLType_ptr result)
+TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_get::result (CORBA_IDLType_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -15890,7 +15067,7 @@ public:
   TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::IDLType_ptr element_type_def,
+      CORBA_IDLType_ptr element_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -15917,14 +15094,14 @@ private:
   TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set (const TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set &);
 
-  CORBA::IDLType_ptr element_type_def_;
+  CORBA_IDLType_ptr element_type_def_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::IDLType_ptr element_type_def,
+    CORBA_IDLType_ptr element_type_def,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -15983,15 +15160,15 @@ TAO_ClientRequestInfo_CORBA_ArrayDef_element_type_def_set::result (CORBA::Enviro
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_ArrayDef_Proxy_Impl::_TAO_ArrayDef_Proxy_Impl (void)
+_TAO_CORBA_ArrayDef_Proxy_Impl::_TAO_CORBA_ArrayDef_Proxy_Impl (void)
 {}
 
-_TAO_ArrayDef_Remote_Proxy_Impl::_TAO_ArrayDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_ArrayDef_Remote_Proxy_Impl::_TAO_CORBA_ArrayDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::ULong _TAO_ArrayDef_Remote_Proxy_Impl::length (
+CORBA::ULong _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -16149,7 +15326,7 @@ CORBA::ULong _TAO_ArrayDef_Remote_Proxy_Impl::length (
   return _tao_retval;
 }
 
-void _TAO_ArrayDef_Remote_Proxy_Impl::length (
+void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::length (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong length,
     CORBA::Environment &ACE_TRY_ENV
@@ -16301,7 +15478,7 @@ void _TAO_ArrayDef_Remote_Proxy_Impl::length (
   
 }
 
-CORBA::TypeCode_ptr _TAO_ArrayDef_Remote_Proxy_Impl::element_type (
+CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -16461,7 +15638,7 @@ CORBA::TypeCode_ptr _TAO_ArrayDef_Remote_Proxy_Impl::element_type (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::IDLType_ptr _TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
+CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -16470,8 +15647,8 @@ CORBA::IDLType_ptr _TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
   ))
 {
   
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  CORBA::IDLType_var _tao_safe_retval (_tao_retval);
+  CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
+  CORBA_IDLType_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -16555,7 +15732,7 @@ CORBA::IDLType_ptr _TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -16621,9 +15798,9 @@ CORBA::IDLType_ptr _TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
+void _TAO_CORBA_ArrayDef_Remote_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr element_type_def,
+    CORBA_IDLType_ptr element_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -16783,36 +15960,36 @@ void _TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_ArrayDef_Proxy_Broker::_TAO_ArrayDef_Proxy_Broker (void)
+_TAO_CORBA_ArrayDef_Proxy_Broker::_TAO_CORBA_ArrayDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ArrayDef_Proxy_Broker::~_TAO_ArrayDef_Proxy_Broker (void)
+_TAO_CORBA_ArrayDef_Proxy_Broker::~_TAO_CORBA_ArrayDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ArrayDef_Proxy_Broker * (*CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_ArrayDef_Proxy_Broker * (*_TAO_CORBA_ArrayDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_ArrayDef_Remote_Proxy_Broker *
-_TAO_ArrayDef_Remote_Proxy_Broker::the_TAO_ArrayDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ArrayDef_Remote_Proxy_Broker *
+_TAO_CORBA_ArrayDef_Remote_Proxy_Broker::the_TAO_CORBA_ArrayDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_ArrayDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_ArrayDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_ArrayDef_Remote_Proxy_Broker::_TAO_ArrayDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ArrayDef_Remote_Proxy_Broker::_TAO_CORBA_ArrayDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_ArrayDef_Remote_Proxy_Broker::~_TAO_ArrayDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ArrayDef_Remote_Proxy_Broker::~_TAO_CORBA_ArrayDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_ArrayDef_Proxy_Impl&
-_TAO_ArrayDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_ArrayDef_Proxy_Impl&
+_TAO_CORBA_ArrayDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_ArrayDef *,
   CORBA::Environment &
 )
@@ -16837,72 +16014,72 @@ CORBA_ArrayDef::~CORBA_ArrayDef (void)
 {}
 
 void
-CORBA::ArrayDef::CORBA_ArrayDef_setup_collocation (int collocated)
+CORBA_ArrayDef::CORBA_ArrayDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_ArrayDef_Proxy_Broker_ =
-      ::CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_ =
+      ::_TAO_CORBA_ArrayDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_ArrayDef_Proxy_Broker_ =
-      ::_TAO_ArrayDef_Remote_Proxy_Broker::the_TAO_ArrayDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_ =
+      ::_TAO_CORBA_ArrayDef_Remote_Proxy_Broker::the_TAO_CORBA_ArrayDef_Remote_Proxy_Broker ();
   
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA::ArrayDef::_tao_any_destructor (void *x)
+void CORBA_ArrayDef::_tao_any_destructor (void *x)
 {
   CORBA_ArrayDef *tmp = ACE_static_cast (CORBA_ArrayDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::ArrayDef_ptr CORBA::ArrayDef::_narrow (
+CORBA_ArrayDef_ptr CORBA_ArrayDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::ArrayDef::_nil ();
+    return CORBA_ArrayDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ArrayDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::ArrayDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ());
       if (is_a == 0)
-        return CORBA::ArrayDef::_nil ();
+        return CORBA_ArrayDef::_nil ();
     }
-  return CORBA::ArrayDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_ArrayDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::ArrayDef_ptr CORBA::ArrayDef::_unchecked_narrow (
+CORBA_ArrayDef_ptr CORBA_ArrayDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::ArrayDef::_nil ();
+    return CORBA_ArrayDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::ArrayDef_ptr default_proxy = CORBA::ArrayDef::_nil ();
+      CORBA_ArrayDef_ptr default_proxy = CORBA_ArrayDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_ArrayDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::ArrayDef (
+          ::CORBA_ArrayDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::ArrayDef::_nil ());
+          CORBA_ArrayDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::ArrayDef (stub, 0, obj->_servant ()), CORBA::ArrayDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_ArrayDef (stub, 0, obj->_servant ()), CORBA_ArrayDef::_nil ());
         return default_proxy;
       }
     else 
@@ -16921,15 +16098,15 @@ CORBA::ArrayDef_ptr CORBA::ArrayDef::_unchecked_narrow (
           );
 }
 
-CORBA::ArrayDef_ptr
-CORBA::ArrayDef::_duplicate (CORBA::ArrayDef_ptr obj)
+CORBA_ArrayDef_ptr
+CORBA_ArrayDef::_duplicate (CORBA_ArrayDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::ArrayDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_ArrayDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ArrayDef:1.0")) ||
@@ -16941,34 +16118,34 @@ CORBA::Boolean CORBA::ArrayDef::_is_a (const CORBA::Char *value, CORBA::Environm
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::ArrayDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_ArrayDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_ArrayDef::_narrow))
+      &CORBA_ArrayDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -16981,20 +16158,20 @@ void *CORBA::ArrayDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::ArrayDef::_interface_repository_id (void) const
+const char* CORBA_ArrayDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/ArrayDef:1.0";
 }
 
-CORBA::ULong CORBA::ArrayDef::length (
+CORBA::ULong CORBA_ArrayDef::length (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ArrayDef_Proxy_Impl &proxy = 
-    this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ArrayDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.length (
@@ -17003,7 +16180,7 @@ CORBA::ULong CORBA::ArrayDef::length (
     );
 }
 
-void CORBA::ArrayDef::length (
+void CORBA_ArrayDef::length (
     CORBA::ULong length,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -17011,8 +16188,8 @@ void CORBA::ArrayDef::length (
     CORBA::SystemException
   ))
 {
-  _TAO_ArrayDef_Proxy_Impl &proxy = 
-    this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ArrayDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.length (
@@ -17022,15 +16199,15 @@ void CORBA::ArrayDef::length (
     );
 }
 
-CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
+CORBA::TypeCode_ptr CORBA_ArrayDef::element_type (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ArrayDef_Proxy_Impl &proxy = 
-    this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ArrayDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.element_type (
@@ -17039,15 +16216,15 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
     );
 }
 
-CORBA::IDLType_ptr CORBA::ArrayDef::element_type_def (
+CORBA_IDLType_ptr CORBA_ArrayDef::element_type_def (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ArrayDef_Proxy_Impl &proxy = 
-    this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ArrayDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.element_type_def (
@@ -17056,16 +16233,16 @@ CORBA::IDLType_ptr CORBA::ArrayDef::element_type_def (
     );
 }
 
-void CORBA::ArrayDef::element_type_def (
-    CORBA::IDLType_ptr element_type_def,
+void CORBA_ArrayDef::element_type_def (
+    CORBA_IDLType_ptr element_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ArrayDef_Proxy_Impl &proxy = 
-    this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ArrayDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.element_type_def (
@@ -17075,6 +16252,188 @@ void CORBA::ArrayDef::element_type_def (
     );
 }
 
+// *************************************************************
+// Operations for class CORBA_ExceptionDef_var
+// *************************************************************
+
+CORBA_ExceptionDef_var::CORBA_ExceptionDef_var (void) // default constructor
+  : ptr_ (CORBA_ExceptionDef::_nil ())
+{}
+
+::CORBA_ExceptionDef_ptr
+CORBA_ExceptionDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_ExceptionDef_var::CORBA_ExceptionDef_var (const ::CORBA_ExceptionDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_ExceptionDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_ExceptionDef_var::~CORBA_ExceptionDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_ExceptionDef_var &
+CORBA_ExceptionDef_var::operator= (CORBA_ExceptionDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_ExceptionDef_var &
+CORBA_ExceptionDef_var::operator= (const ::CORBA_ExceptionDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_ExceptionDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_ExceptionDef_var::operator const ::CORBA_ExceptionDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_ExceptionDef_var::operator ::CORBA_ExceptionDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_ExceptionDef_ptr
+CORBA_ExceptionDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_ExceptionDef_ptr
+CORBA_ExceptionDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_ExceptionDef_ptr &
+CORBA_ExceptionDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_ExceptionDef_ptr &
+CORBA_ExceptionDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_ExceptionDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_ExceptionDef_ptr
+CORBA_ExceptionDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_ExceptionDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_ExceptionDef::_nil ();
+  return val;
+}
+
+::CORBA_ExceptionDef_ptr
+CORBA_ExceptionDef_var::duplicate (CORBA_ExceptionDef_ptr p)
+{
+  return ::CORBA_ExceptionDef::_duplicate (p);
+}
+
+void
+CORBA_ExceptionDef_var::release (CORBA_ExceptionDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_ExceptionDef_ptr
+CORBA_ExceptionDef_var::nil (void)
+{
+  return ::CORBA_ExceptionDef::_nil ();
+}
+
+::CORBA_ExceptionDef_ptr
+CORBA_ExceptionDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_ExceptionDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_ExceptionDef_var::upcast (void *src)
+{
+  CORBA_ExceptionDef **tmp =
+    ACE_static_cast (CORBA_ExceptionDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_ExceptionDef_out
+// *************************************************************
+
+CORBA_ExceptionDef_out::CORBA_ExceptionDef_out (CORBA_ExceptionDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_ExceptionDef::_nil ();
+}
+
+CORBA_ExceptionDef_out::CORBA_ExceptionDef_out (CORBA_ExceptionDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_ExceptionDef::_nil ();
+}
+
+CORBA_ExceptionDef_out::CORBA_ExceptionDef_out (const ::CORBA_ExceptionDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_ExceptionDef_out &, p).ptr_)
+{}
+
+::CORBA_ExceptionDef_out &
+CORBA_ExceptionDef_out::operator= (const ::CORBA_ExceptionDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_ExceptionDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_ExceptionDef_out &
+CORBA_ExceptionDef_out::operator= (const ::CORBA_ExceptionDef_var &p)
+{
+  this->ptr_ = ::CORBA_ExceptionDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_ExceptionDef_out &
+CORBA_ExceptionDef_out::operator= (CORBA_ExceptionDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_ExceptionDef_out::operator ::CORBA_ExceptionDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_ExceptionDef_ptr &
+CORBA_ExceptionDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_ExceptionDef_ptr
+CORBA_ExceptionDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_ExceptionDef_type_get : public TAO_ClientRequestInfo
@@ -17198,13 +16557,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::StructMemberSeq * result);
+  void result (CORBA_StructMemberSeq * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get (const TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get &);
 
-  CORBA::StructMemberSeq * _result;
+  CORBA_StructMemberSeq * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get (
@@ -17257,7 +16616,7 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::result (CORBA::Environment
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::result (CORBA::StructMemberSeq * result)
+TAO_ClientRequestInfo_CORBA_ExceptionDef_members_get::result (CORBA_StructMemberSeq * result)
 {
   // update the result 
   this->_result = result;
@@ -17269,7 +16628,7 @@ public:
   TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -17296,14 +16655,14 @@ private:
   TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set (const TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set &);
 
-  const CORBA::StructMemberSeq & members_;
+  const CORBA_StructMemberSeq & members_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -17362,15 +16721,15 @@ TAO_ClientRequestInfo_CORBA_ExceptionDef_members_set::result (CORBA::Environment
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_ExceptionDef_Proxy_Impl::_TAO_ExceptionDef_Proxy_Impl (void)
+_TAO_CORBA_ExceptionDef_Proxy_Impl::_TAO_CORBA_ExceptionDef_Proxy_Impl (void)
 {}
 
-_TAO_ExceptionDef_Remote_Proxy_Impl::_TAO_ExceptionDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::_TAO_CORBA_ExceptionDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::TypeCode_ptr _TAO_ExceptionDef_Remote_Proxy_Impl::type (
+CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -17530,7 +16889,7 @@ CORBA::TypeCode_ptr _TAO_ExceptionDef_Remote_Proxy_Impl::type (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::StructMemberSeq * _TAO_ExceptionDef_Remote_Proxy_Impl::members (
+CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -17539,7 +16898,7 @@ CORBA::StructMemberSeq * _TAO_ExceptionDef_Remote_Proxy_Impl::members (
   ))
 {
   
-  CORBA::StructMemberSeq *_tao_retval = 0;
+  CORBA_StructMemberSeq *_tao_retval = 0;
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -17547,8 +16906,8 @@ CORBA::StructMemberSeq * _TAO_ExceptionDef_Remote_Proxy_Impl::members (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::StructMemberSeq, _tao_retval);
-  CORBA::StructMemberSeq_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_StructMemberSeq, _tao_retval);
+  CORBA_StructMemberSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_members",
@@ -17625,7 +16984,7 @@ CORBA::StructMemberSeq * _TAO_ExceptionDef_Remote_Proxy_Impl::members (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -17691,9 +17050,9 @@ CORBA::StructMemberSeq * _TAO_ExceptionDef_Remote_Proxy_Impl::members (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_ExceptionDef_Remote_Proxy_Impl::members (
+void _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::StructMemberSeq & members,
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -17853,36 +17212,36 @@ void _TAO_ExceptionDef_Remote_Proxy_Impl::members (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_ExceptionDef_Proxy_Broker::_TAO_ExceptionDef_Proxy_Broker (void)
+_TAO_CORBA_ExceptionDef_Proxy_Broker::_TAO_CORBA_ExceptionDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ExceptionDef_Proxy_Broker::~_TAO_ExceptionDef_Proxy_Broker (void)
+_TAO_CORBA_ExceptionDef_Proxy_Broker::~_TAO_CORBA_ExceptionDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ExceptionDef_Proxy_Broker * (*CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_ExceptionDef_Proxy_Broker * (*_TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_ExceptionDef_Remote_Proxy_Broker *
-_TAO_ExceptionDef_Remote_Proxy_Broker::the_TAO_ExceptionDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker *
+_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker::the_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_ExceptionDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_ExceptionDef_Remote_Proxy_Broker::_TAO_ExceptionDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker::_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_ExceptionDef_Remote_Proxy_Broker::~_TAO_ExceptionDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker::~_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_ExceptionDef_Proxy_Impl&
-_TAO_ExceptionDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_ExceptionDef_Proxy_Impl&
+_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_ExceptionDef *,
   CORBA::Environment &
 )
@@ -17907,74 +17266,74 @@ CORBA_ExceptionDef::~CORBA_ExceptionDef (void)
 {}
 
 void
-CORBA::ExceptionDef::CORBA_ExceptionDef_setup_collocation (int collocated)
+CORBA_ExceptionDef::CORBA_ExceptionDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_ExceptionDef_Proxy_Broker_ =
-      ::CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_ =
+      ::_TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_ExceptionDef_Proxy_Broker_ =
-      ::_TAO_ExceptionDef_Remote_Proxy_Broker::the_TAO_ExceptionDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_ =
+      ::_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker::the_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker ();
   
   this->CORBA_Contained_setup_collocation (collocated);
   
   this->CORBA_Container_setup_collocation (collocated);
 }
 
-void CORBA::ExceptionDef::_tao_any_destructor (void *x)
+void CORBA_ExceptionDef::_tao_any_destructor (void *x)
 {
   CORBA_ExceptionDef *tmp = ACE_static_cast (CORBA_ExceptionDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::ExceptionDef_ptr CORBA::ExceptionDef::_narrow (
+CORBA_ExceptionDef_ptr CORBA_ExceptionDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::ExceptionDef::_nil ();
+    return CORBA_ExceptionDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ExceptionDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::ExceptionDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ());
       if (is_a == 0)
-        return CORBA::ExceptionDef::_nil ();
+        return CORBA_ExceptionDef::_nil ();
     }
-  return CORBA::ExceptionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_ExceptionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::ExceptionDef_ptr CORBA::ExceptionDef::_unchecked_narrow (
+CORBA_ExceptionDef_ptr CORBA_ExceptionDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::ExceptionDef::_nil ();
+    return CORBA_ExceptionDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::ExceptionDef_ptr default_proxy = CORBA::ExceptionDef::_nil ();
+      CORBA_ExceptionDef_ptr default_proxy = CORBA_ExceptionDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::ExceptionDef (
+          ::CORBA_ExceptionDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::ExceptionDef::_nil ());
+          CORBA_ExceptionDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::ExceptionDef (stub, 0, obj->_servant ()), CORBA::ExceptionDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_ExceptionDef (stub, 0, obj->_servant ()), CORBA_ExceptionDef::_nil ());
         return default_proxy;
       }
     else 
@@ -17993,15 +17352,15 @@ CORBA::ExceptionDef_ptr CORBA::ExceptionDef::_unchecked_narrow (
           );
 }
 
-CORBA::ExceptionDef_ptr
-CORBA::ExceptionDef::_duplicate (CORBA::ExceptionDef_ptr obj)
+CORBA_ExceptionDef_ptr
+CORBA_ExceptionDef::_duplicate (CORBA_ExceptionDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::ExceptionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_ExceptionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ExceptionDef:1.0")) ||
@@ -18014,46 +17373,46 @@ CORBA::Boolean CORBA::ExceptionDef::_is_a (const CORBA::Char *value, CORBA::Envi
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::ExceptionDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_ExceptionDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_ExceptionDef::_narrow))
+      &CORBA_ExceptionDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Container::_narrow))
+      &CORBA_Container::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Container_ptr,
+            CORBA_Container_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -18066,20 +17425,20 @@ void *CORBA::ExceptionDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::ExceptionDef::_interface_repository_id (void) const
+const char* CORBA_ExceptionDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/ExceptionDef:1.0";
 }
 
-CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
+CORBA::TypeCode_ptr CORBA_ExceptionDef::type (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ExceptionDef_Proxy_Impl &proxy = 
-    this->the_TAO_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.type (
@@ -18088,15 +17447,15 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
     );
 }
 
-CORBA::StructMemberSeq * CORBA::ExceptionDef::members (
+CORBA_StructMemberSeq * CORBA_ExceptionDef::members (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ExceptionDef_Proxy_Impl &proxy = 
-    this->the_TAO_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.members (
@@ -18105,16 +17464,16 @@ CORBA::StructMemberSeq * CORBA::ExceptionDef::members (
     );
 }
 
-void CORBA::ExceptionDef::members (
-    const CORBA::StructMemberSeq & members,
+void CORBA_ExceptionDef::members (
+    const CORBA_StructMemberSeq & members,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ExceptionDef_Proxy_Impl &proxy = 
-    this->the_TAO_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ExceptionDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.members (
@@ -18124,8 +17483,7 @@ void CORBA::ExceptionDef::members (
     );
 }
 
-
-void CORBA::ExceptionDescription::_tao_any_destructor (void *x)
+void CORBA_ExceptionDescription::_tao_any_destructor (void *x)
 {
   CORBA_ExceptionDescription *tmp = ACE_static_cast (CORBA_ExceptionDescription*,x);
   delete tmp;
@@ -18141,21 +17499,28 @@ void CORBA::ExceptionDescription::_tao_any_destructor (void *x)
   void
   _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_allocate_buffer (CORBA::ULong length)
   {
-    CORBA::ExceptionDef **tmp = 0;
+    CORBA_ExceptionDef **tmp = 0;
     tmp = _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (length);
     
     if (this->buffer_ != 0)
     {
-      CORBA::ExceptionDef **old = ACE_reinterpret_cast (CORBA::ExceptionDef**, this->buffer_);
+      CORBA_ExceptionDef **old = ACE_reinterpret_cast (CORBA_ExceptionDef**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = CORBA::ExceptionDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
+        {
+          if (!this->release_)
+            {
+              tmp[i] = CORBA_ExceptionDef::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
       
+      if (this->release_)
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
@@ -18165,12 +17530,14 @@ void CORBA::ExceptionDescription::_tao_any_destructor (void *x)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    CORBA::ExceptionDef **tmp = ACE_reinterpret_cast (CORBA::ExceptionDef**, this->buffer_);
+    CORBA_ExceptionDef **tmp = ACE_reinterpret_cast (CORBA_ExceptionDef**, this->buffer_);
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::ExceptionDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = CORBA_ExceptionDef::_nil ();
+      }
+    
     _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::freebuf (tmp);
     this->buffer_ = 0;
   }
@@ -18181,32 +17548,33 @@ void CORBA::ExceptionDescription::_tao_any_destructor (void *x)
   }
   
   void
- _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
   {
-    CORBA::ExceptionDef **tmp = ACE_reinterpret_cast (CORBA::ExceptionDef**, this->buffer_);
+    CORBA_ExceptionDef **tmp = ACE_reinterpret_cast (CORBA_ExceptionDef**, this->buffer_);
     
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::ExceptionDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = CORBA_ExceptionDef::_nil ();
+      }
   }
+  
   void 
- _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_downcast (
+  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_downcast (
       void* target,
       CORBA_Object *src,
       CORBA_Environment &ACE_TRY_ENV
     )
   {
-    CORBA::ExceptionDef **tmp = ACE_static_cast (CORBA::ExceptionDef**, target);
-    *tmp = CORBA::ExceptionDef::_narrow (src, ACE_TRY_ENV);
+    CORBA_ExceptionDef **tmp = ACE_static_cast (CORBA_ExceptionDef**, target);
+    *tmp = CORBA_ExceptionDef::_narrow (src, ACE_TRY_ENV);
     ACE_CHECK;
   }
 
   CORBA_Object*
   _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_upcast (void *src) const
   {
-    CORBA::ExceptionDef **tmp = ACE_static_cast (CORBA::ExceptionDef**, src);
+    CORBA_ExceptionDef **tmp = ACE_static_cast (CORBA_ExceptionDef**, src);
     return *tmp;
   }
   
@@ -18229,16 +17597,16 @@ CORBA_ExceptionDefSeq::CORBA_ExceptionDefSeq (CORBA::ULong max) // uses max size
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::ExceptionDef,CORBA::ExceptionDef_var>
+  TAO_Unbounded_Object_Sequence<CORBA_ExceptionDef,CORBA_ExceptionDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA_ExceptionDefSeq::CORBA_ExceptionDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ExceptionDef_ptr *buffer, CORBA::Boolean release)
+CORBA_ExceptionDefSeq::CORBA_ExceptionDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA_ExceptionDef_ptr *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::ExceptionDef,CORBA::ExceptionDef_var>
+  TAO_Unbounded_Object_Sequence<CORBA_ExceptionDef,CORBA_ExceptionDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
@@ -18247,7 +17615,7 @@ CORBA_ExceptionDefSeq::CORBA_ExceptionDefSeq (const CORBA_ExceptionDefSeq &seq)
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::ExceptionDef,CORBA::ExceptionDef_var>
+  TAO_Unbounded_Object_Sequence<CORBA_ExceptionDef,CORBA_ExceptionDef_var>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
@@ -18270,12 +17638,12 @@ void CORBA_ExceptionDefSeq::_tao_any_destructor (void *x)
   void
   _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_allocate_buffer (CORBA::ULong length)
   {
-    CORBA::ExceptionDescription* tmp = 0;
+    CORBA_ExceptionDescription* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (length);
     
     if (this->buffer_ != 0)
     {
-      CORBA::ExceptionDescription *old = ACE_reinterpret_cast (CORBA::ExceptionDescription *,this->buffer_);
+      CORBA_ExceptionDescription *old = ACE_reinterpret_cast (CORBA_ExceptionDescription *,this->buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
@@ -18293,7 +17661,7 @@ void CORBA_ExceptionDefSeq::_tao_any_destructor (void *x)
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     
-    CORBA::ExceptionDescription *tmp = ACE_reinterpret_cast (CORBA::ExceptionDescription *,this->buffer_);
+    CORBA_ExceptionDescription *tmp = ACE_reinterpret_cast (CORBA_ExceptionDescription *,this->buffer_);
     
     _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
     this->buffer_ = 0;
@@ -18324,16 +17692,16 @@ CORBA_ExcDescriptionSeq::CORBA_ExcDescriptionSeq (CORBA::ULong max) // uses max
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ExceptionDescription>
+  TAO_Unbounded_Sequence<CORBA_ExceptionDescription>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA_ExcDescriptionSeq::CORBA_ExcDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ExceptionDescription *buffer, CORBA::Boolean release)
+CORBA_ExcDescriptionSeq::CORBA_ExcDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA_ExceptionDescription *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ExceptionDescription>
+  TAO_Unbounded_Sequence<CORBA_ExceptionDescription>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
@@ -18342,7 +17710,7 @@ CORBA_ExcDescriptionSeq::CORBA_ExcDescriptionSeq (const CORBA_ExcDescriptionSeq
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ExceptionDescription>
+  TAO_Unbounded_Sequence<CORBA_ExceptionDescription>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
@@ -18357,6 +17725,189 @@ void CORBA_ExcDescriptionSeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
+// *************************************************************
+// Operations for class CORBA_AttributeDef_var
+// *************************************************************
+
+CORBA_AttributeDef_var::CORBA_AttributeDef_var (void) // default constructor
+  : ptr_ (CORBA_AttributeDef::_nil ())
+{}
+
+::CORBA_AttributeDef_ptr
+CORBA_AttributeDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_AttributeDef_var::CORBA_AttributeDef_var (const ::CORBA_AttributeDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_AttributeDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_AttributeDef_var::~CORBA_AttributeDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_AttributeDef_var &
+CORBA_AttributeDef_var::operator= (CORBA_AttributeDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_AttributeDef_var &
+CORBA_AttributeDef_var::operator= (const ::CORBA_AttributeDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_AttributeDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_AttributeDef_var::operator const ::CORBA_AttributeDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_AttributeDef_var::operator ::CORBA_AttributeDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_AttributeDef_ptr
+CORBA_AttributeDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_AttributeDef_ptr
+CORBA_AttributeDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_AttributeDef_ptr &
+CORBA_AttributeDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_AttributeDef_ptr &
+CORBA_AttributeDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_AttributeDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_AttributeDef_ptr
+CORBA_AttributeDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_AttributeDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_AttributeDef::_nil ();
+  return val;
+}
+
+::CORBA_AttributeDef_ptr
+CORBA_AttributeDef_var::duplicate (CORBA_AttributeDef_ptr p)
+{
+  return ::CORBA_AttributeDef::_duplicate (p);
+}
+
+void
+CORBA_AttributeDef_var::release (CORBA_AttributeDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_AttributeDef_ptr
+CORBA_AttributeDef_var::nil (void)
+{
+  return ::CORBA_AttributeDef::_nil ();
+}
+
+::CORBA_AttributeDef_ptr
+CORBA_AttributeDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_AttributeDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_AttributeDef_var::upcast (void *src)
+{
+  CORBA_AttributeDef **tmp =
+    ACE_static_cast (CORBA_AttributeDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_AttributeDef_out
+// *************************************************************
+
+CORBA_AttributeDef_out::CORBA_AttributeDef_out (CORBA_AttributeDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_AttributeDef::_nil ();
+}
+
+CORBA_AttributeDef_out::CORBA_AttributeDef_out (CORBA_AttributeDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_AttributeDef::_nil ();
+}
+
+CORBA_AttributeDef_out::CORBA_AttributeDef_out (const ::CORBA_AttributeDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_AttributeDef_out &, p).ptr_)
+{}
+
+::CORBA_AttributeDef_out &
+CORBA_AttributeDef_out::operator= (const ::CORBA_AttributeDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_AttributeDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_AttributeDef_out &
+CORBA_AttributeDef_out::operator= (const ::CORBA_AttributeDef_var &p)
+{
+  this->ptr_ = ::CORBA_AttributeDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_AttributeDef_out &
+CORBA_AttributeDef_out::operator= (CORBA_AttributeDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_AttributeDef_out::operator ::CORBA_AttributeDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_AttributeDef_ptr &
+CORBA_AttributeDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_AttributeDef_ptr
+CORBA_AttributeDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_AttributeDef_type_get : public TAO_ClientRequestInfo
 {
@@ -18479,13 +18030,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get (const TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get &);
 
-  CORBA::IDLType_ptr _result;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get (
@@ -18538,7 +18089,7 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::result (CORBA::Environmen
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::result (CORBA::IDLType_ptr result)
+TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_get::result (CORBA_IDLType_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -18550,7 +18101,7 @@ public:
   TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -18577,14 +18128,14 @@ private:
   TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set (const TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set &);
 
-  CORBA::IDLType_ptr type_def_;
+  CORBA_IDLType_ptr type_def_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ClientRequestInfo_CORBA_AttributeDef_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::IDLType_ptr type_def,
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -18829,15 +18380,15 @@ TAO_ClientRequestInfo_CORBA_AttributeDef_mode_set::result (CORBA::Environment &A
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_AttributeDef_Proxy_Impl::_TAO_AttributeDef_Proxy_Impl (void)
+_TAO_CORBA_AttributeDef_Proxy_Impl::_TAO_CORBA_AttributeDef_Proxy_Impl (void)
 {}
 
-_TAO_AttributeDef_Remote_Proxy_Impl::_TAO_AttributeDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_AttributeDef_Remote_Proxy_Impl::_TAO_CORBA_AttributeDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::TypeCode_ptr _TAO_AttributeDef_Remote_Proxy_Impl::type (
+CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -18997,7 +18548,7 @@ CORBA::TypeCode_ptr _TAO_AttributeDef_Remote_Proxy_Impl::type (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::IDLType_ptr _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
+CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -19006,8 +18557,8 @@ CORBA::IDLType_ptr _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
   ))
 {
   
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  CORBA::IDLType_var _tao_safe_retval (_tao_retval);
+  CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
+  CORBA_IDLType_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -19091,7 +18642,7 @@ CORBA::IDLType_ptr _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -19157,9 +18708,9 @@ CORBA::IDLType_ptr _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
+void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr type_def,
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -19309,7 +18860,7 @@ void _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
   
 }
 
-CORBA::AttributeMode _TAO_AttributeDef_Remote_Proxy_Impl::mode (
+CORBA::AttributeMode _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -19467,7 +19018,7 @@ CORBA::AttributeMode _TAO_AttributeDef_Remote_Proxy_Impl::mode (
   return _tao_retval;
 }
 
-void _TAO_AttributeDef_Remote_Proxy_Impl::mode (
+void _TAO_CORBA_AttributeDef_Remote_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::AttributeMode mode,
     CORBA::Environment &ACE_TRY_ENV
@@ -19629,36 +19180,36 @@ void _TAO_AttributeDef_Remote_Proxy_Impl::mode (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_AttributeDef_Proxy_Broker::_TAO_AttributeDef_Proxy_Broker (void)
+_TAO_CORBA_AttributeDef_Proxy_Broker::_TAO_CORBA_AttributeDef_Proxy_Broker (void)
 {
 }
 
-_TAO_AttributeDef_Proxy_Broker::~_TAO_AttributeDef_Proxy_Broker (void)
+_TAO_CORBA_AttributeDef_Proxy_Broker::~_TAO_CORBA_AttributeDef_Proxy_Broker (void)
 {
 }
 
-_TAO_AttributeDef_Proxy_Broker * (*CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_AttributeDef_Proxy_Broker * (*_TAO_CORBA_AttributeDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_AttributeDef_Remote_Proxy_Broker *
-_TAO_AttributeDef_Remote_Proxy_Broker::the_TAO_AttributeDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_AttributeDef_Remote_Proxy_Broker *
+_TAO_CORBA_AttributeDef_Remote_Proxy_Broker::the_TAO_CORBA_AttributeDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_AttributeDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_AttributeDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_AttributeDef_Remote_Proxy_Broker::_TAO_AttributeDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_AttributeDef_Remote_Proxy_Broker::_TAO_CORBA_AttributeDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_AttributeDef_Remote_Proxy_Broker::~_TAO_AttributeDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_AttributeDef_Remote_Proxy_Broker::~_TAO_CORBA_AttributeDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_AttributeDef_Proxy_Impl&
-_TAO_AttributeDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_AttributeDef_Proxy_Impl&
+_TAO_CORBA_AttributeDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_AttributeDef *,
   CORBA::Environment &
 )
@@ -19683,72 +19234,72 @@ CORBA_AttributeDef::~CORBA_AttributeDef (void)
 {}
 
 void
-CORBA::AttributeDef::CORBA_AttributeDef_setup_collocation (int collocated)
+CORBA_AttributeDef::CORBA_AttributeDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_AttributeDef_Proxy_Broker_ =
-      ::CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_ =
+      ::_TAO_CORBA_AttributeDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_AttributeDef_Proxy_Broker_ =
-      ::_TAO_AttributeDef_Remote_Proxy_Broker::the_TAO_AttributeDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_ =
+      ::_TAO_CORBA_AttributeDef_Remote_Proxy_Broker::the_TAO_CORBA_AttributeDef_Remote_Proxy_Broker ();
   
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-void CORBA::AttributeDef::_tao_any_destructor (void *x)
+void CORBA_AttributeDef::_tao_any_destructor (void *x)
 {
   CORBA_AttributeDef *tmp = ACE_static_cast (CORBA_AttributeDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::AttributeDef_ptr CORBA::AttributeDef::_narrow (
+CORBA_AttributeDef_ptr CORBA_AttributeDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::AttributeDef::_nil ();
+    return CORBA_AttributeDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AttributeDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
       if (is_a == 0)
-        return CORBA::AttributeDef::_nil ();
+        return CORBA_AttributeDef::_nil ();
     }
-  return CORBA::AttributeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_AttributeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::AttributeDef_ptr CORBA::AttributeDef::_unchecked_narrow (
+CORBA_AttributeDef_ptr CORBA_AttributeDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::AttributeDef::_nil ();
+    return CORBA_AttributeDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::AttributeDef_ptr default_proxy = CORBA::AttributeDef::_nil ();
+      CORBA_AttributeDef_ptr default_proxy = CORBA_AttributeDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_AttributeDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::AttributeDef (
+          ::CORBA_AttributeDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::AttributeDef::_nil ());
+          CORBA_AttributeDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::AttributeDef (stub, 0, obj->_servant ()), CORBA::AttributeDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_AttributeDef (stub, 0, obj->_servant ()), CORBA_AttributeDef::_nil ());
         return default_proxy;
       }
     else 
@@ -19767,15 +19318,15 @@ CORBA::AttributeDef_ptr CORBA::AttributeDef::_unchecked_narrow (
           );
 }
 
-CORBA::AttributeDef_ptr
-CORBA::AttributeDef::_duplicate (CORBA::AttributeDef_ptr obj)
+CORBA_AttributeDef_ptr
+CORBA_AttributeDef::_duplicate (CORBA_AttributeDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::AttributeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_AttributeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AttributeDef:1.0")) ||
@@ -19787,34 +19338,34 @@ CORBA::Boolean CORBA::AttributeDef::_is_a (const CORBA::Char *value, CORBA::Envi
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::AttributeDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_AttributeDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_AttributeDef::_narrow))
+      &CORBA_AttributeDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -19827,20 +19378,20 @@ void *CORBA::AttributeDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::AttributeDef::_interface_repository_id (void) const
+const char* CORBA_AttributeDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/AttributeDef:1.0";
 }
 
-CORBA::TypeCode_ptr CORBA::AttributeDef::type (
+CORBA::TypeCode_ptr CORBA_AttributeDef::type (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_AttributeDef_Proxy_Impl &proxy = 
-    this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_AttributeDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.type (
@@ -19849,15 +19400,15 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
     );
 }
 
-CORBA::IDLType_ptr CORBA::AttributeDef::type_def (
+CORBA_IDLType_ptr CORBA_AttributeDef::type_def (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_AttributeDef_Proxy_Impl &proxy = 
-    this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_AttributeDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.type_def (
@@ -19866,16 +19417,16 @@ CORBA::IDLType_ptr CORBA::AttributeDef::type_def (
     );
 }
 
-void CORBA::AttributeDef::type_def (
-    CORBA::IDLType_ptr type_def,
+void CORBA_AttributeDef::type_def (
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_AttributeDef_Proxy_Impl &proxy = 
-    this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_AttributeDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.type_def (
@@ -19885,15 +19436,15 @@ void CORBA::AttributeDef::type_def (
     );
 }
 
-CORBA::AttributeMode CORBA::AttributeDef::mode (
+CORBA::AttributeMode CORBA_AttributeDef::mode (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_AttributeDef_Proxy_Impl &proxy = 
-    this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_AttributeDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN ((CORBA::AttributeMode)0);
   
   return proxy.mode (
@@ -19902,7 +19453,7 @@ CORBA::AttributeMode CORBA::AttributeDef::mode (
     );
 }
 
-void CORBA::AttributeDef::mode (
+void CORBA_AttributeDef::mode (
     CORBA::AttributeMode mode,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -19910,8 +19461,8 @@ void CORBA::AttributeDef::mode (
     CORBA::SystemException
   ))
 {
-  _TAO_AttributeDef_Proxy_Impl &proxy = 
-    this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_AttributeDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.mode (
@@ -19921,14 +19472,13 @@ void CORBA::AttributeDef::mode (
     );
 }
 
-
-void CORBA::AttributeDescription::_tao_any_destructor (void *x)
+void CORBA_AttributeDescription::_tao_any_destructor (void *x)
 {
   CORBA_AttributeDescription *tmp = ACE_static_cast (CORBA_AttributeDescription*,x);
   delete tmp;
 }
 
-void CORBA::ParameterDescription::_tao_any_destructor (void *x)
+void CORBA_ParameterDescription::_tao_any_destructor (void *x)
 {
   CORBA_ParameterDescription *tmp = ACE_static_cast (CORBA_ParameterDescription*,x);
   delete tmp;
@@ -19943,12 +19493,12 @@ void CORBA::ParameterDescription::_tao_any_destructor (void *x)
   void
   _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_allocate_buffer (CORBA::ULong length)
   {
-    CORBA::ParameterDescription* tmp = 0;
+    CORBA_ParameterDescription* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (length);
     
     if (this->buffer_ != 0)
     {
-      CORBA::ParameterDescription *old = ACE_reinterpret_cast (CORBA::ParameterDescription *,this->buffer_);
+      CORBA_ParameterDescription *old = ACE_reinterpret_cast (CORBA_ParameterDescription *,this->buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
@@ -19961,12 +19511,12 @@ void CORBA::ParameterDescription::_tao_any_destructor (void *x)
   }
   
   void
- _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_deallocate_buffer (void)
+  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     
-    CORBA::ParameterDescription *tmp = ACE_reinterpret_cast (CORBA::ParameterDescription *,this->buffer_);
+    CORBA_ParameterDescription *tmp = ACE_reinterpret_cast (CORBA_ParameterDescription *,this->buffer_);
     
     _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (tmp);
     this->buffer_ = 0;
@@ -19997,16 +19547,16 @@ CORBA_ParDescriptionSeq::CORBA_ParDescriptionSeq (CORBA::ULong max) // uses max
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ParameterDescription>
+  TAO_Unbounded_Sequence<CORBA_ParameterDescription>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA_ParDescriptionSeq::CORBA_ParDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ParameterDescription *buffer, CORBA::Boolean release)
+CORBA_ParDescriptionSeq::CORBA_ParDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA_ParameterDescription *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ParameterDescription>
+  TAO_Unbounded_Sequence<CORBA_ParameterDescription>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
@@ -20015,7 +19565,7 @@ CORBA_ParDescriptionSeq::CORBA_ParDescriptionSeq (const CORBA_ParDescriptionSeq
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ParameterDescription>
+  TAO_Unbounded_Sequence<CORBA_ParameterDescription>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
@@ -20077,6 +19627,189 @@ void CORBA_ContextIdSeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
+// *************************************************************
+// Operations for class CORBA_OperationDef_var
+// *************************************************************
+
+CORBA_OperationDef_var::CORBA_OperationDef_var (void) // default constructor
+  : ptr_ (CORBA_OperationDef::_nil ())
+{}
+
+::CORBA_OperationDef_ptr
+CORBA_OperationDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_OperationDef_var::CORBA_OperationDef_var (const ::CORBA_OperationDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_OperationDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_OperationDef_var::~CORBA_OperationDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_OperationDef_var &
+CORBA_OperationDef_var::operator= (CORBA_OperationDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_OperationDef_var &
+CORBA_OperationDef_var::operator= (const ::CORBA_OperationDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_OperationDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_OperationDef_var::operator const ::CORBA_OperationDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_OperationDef_var::operator ::CORBA_OperationDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_OperationDef_ptr
+CORBA_OperationDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_OperationDef_ptr
+CORBA_OperationDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_OperationDef_ptr &
+CORBA_OperationDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_OperationDef_ptr &
+CORBA_OperationDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_OperationDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_OperationDef_ptr
+CORBA_OperationDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_OperationDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_OperationDef::_nil ();
+  return val;
+}
+
+::CORBA_OperationDef_ptr
+CORBA_OperationDef_var::duplicate (CORBA_OperationDef_ptr p)
+{
+  return ::CORBA_OperationDef::_duplicate (p);
+}
+
+void
+CORBA_OperationDef_var::release (CORBA_OperationDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_OperationDef_ptr
+CORBA_OperationDef_var::nil (void)
+{
+  return ::CORBA_OperationDef::_nil ();
+}
+
+::CORBA_OperationDef_ptr
+CORBA_OperationDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_OperationDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_OperationDef_var::upcast (void *src)
+{
+  CORBA_OperationDef **tmp =
+    ACE_static_cast (CORBA_OperationDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_OperationDef_out
+// *************************************************************
+
+CORBA_OperationDef_out::CORBA_OperationDef_out (CORBA_OperationDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_OperationDef::_nil ();
+}
+
+CORBA_OperationDef_out::CORBA_OperationDef_out (CORBA_OperationDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_OperationDef::_nil ();
+}
+
+CORBA_OperationDef_out::CORBA_OperationDef_out (const ::CORBA_OperationDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_OperationDef_out &, p).ptr_)
+{}
+
+::CORBA_OperationDef_out &
+CORBA_OperationDef_out::operator= (const ::CORBA_OperationDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_OperationDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_OperationDef_out &
+CORBA_OperationDef_out::operator= (const ::CORBA_OperationDef_var &p)
+{
+  this->ptr_ = ::CORBA_OperationDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_OperationDef_out &
+CORBA_OperationDef_out::operator= (CORBA_OperationDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_OperationDef_out::operator ::CORBA_OperationDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_OperationDef_ptr &
+CORBA_OperationDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_OperationDef_ptr
+CORBA_OperationDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_OperationDef_result_get : public TAO_ClientRequestInfo
 {
@@ -20199,13 +19932,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get (const TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get &);
 
-  CORBA::IDLType_ptr _result;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get (
@@ -20258,7 +19991,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::result (CORBA::Environm
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::result (CORBA::IDLType_ptr result)
+TAO_ClientRequestInfo_CORBA_OperationDef_result_def_get::result (CORBA_IDLType_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -20270,7 +20003,7 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::IDLType_ptr result_def,
+      CORBA_IDLType_ptr result_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -20297,14 +20030,14 @@ private:
   TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set (const TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set &);
 
-  CORBA::IDLType_ptr result_def_;
+  CORBA_IDLType_ptr result_def_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set::TAO_ClientRequestInfo_CORBA_OperationDef_result_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::IDLType_ptr result_def,
+    CORBA_IDLType_ptr result_def,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -20385,13 +20118,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ParDescriptionSeq * result);
+  void result (CORBA_ParDescriptionSeq * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_OperationDef_params_get (const TAO_ClientRequestInfo_CORBA_OperationDef_params_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_params_get &);
 
-  CORBA::ParDescriptionSeq * _result;
+  CORBA_ParDescriptionSeq * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_OperationDef_params_get::TAO_ClientRequestInfo_CORBA_OperationDef_params_get (
@@ -20444,7 +20177,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_params_get::result (CORBA::Environment
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_OperationDef_params_get::result (CORBA::ParDescriptionSeq * result)
+TAO_ClientRequestInfo_CORBA_OperationDef_params_get::result (CORBA_ParDescriptionSeq * result)
 {
   // update the result 
   this->_result = result;
@@ -20456,7 +20189,7 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_params_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::ParDescriptionSeq & params,
+      const CORBA_ParDescriptionSeq & params,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -20483,14 +20216,14 @@ private:
   TAO_ClientRequestInfo_CORBA_OperationDef_params_set (const TAO_ClientRequestInfo_CORBA_OperationDef_params_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_params_set &);
 
-  const CORBA::ParDescriptionSeq & params_;
+  const CORBA_ParDescriptionSeq & params_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_OperationDef_params_set::TAO_ClientRequestInfo_CORBA_OperationDef_params_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::ParDescriptionSeq & params,
+    const CORBA_ParDescriptionSeq & params,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -20757,13 +20490,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ContextIdSeq * result);
+  void result (CORBA_ContextIdSeq * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get (const TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get &);
 
-  CORBA::ContextIdSeq * _result;
+  CORBA_ContextIdSeq * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get (
@@ -20816,7 +20549,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::result (CORBA::Environmen
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::result (CORBA::ContextIdSeq * result)
+TAO_ClientRequestInfo_CORBA_OperationDef_contexts_get::result (CORBA_ContextIdSeq * result)
 {
   // update the result 
   this->_result = result;
@@ -20828,7 +20561,7 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -20855,14 +20588,14 @@ private:
   TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set (const TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set &);
 
-  const CORBA::ContextIdSeq & contexts_;
+  const CORBA_ContextIdSeq & contexts_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set::TAO_ClientRequestInfo_CORBA_OperationDef_contexts_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -20943,13 +20676,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ExceptionDefSeq * result);
+  void result (CORBA_ExceptionDefSeq * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get (const TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get &);
 
-  CORBA::ExceptionDefSeq * _result;
+  CORBA_ExceptionDefSeq * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get (
@@ -21002,7 +20735,7 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::result (CORBA::Environm
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::result (CORBA::ExceptionDefSeq * result)
+TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_get::result (CORBA_ExceptionDefSeq * result)
 {
   // update the result 
   this->_result = result;
@@ -21014,7 +20747,7 @@ public:
   TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -21041,14 +20774,14 @@ private:
   TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set (const TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set &);
 
-  const CORBA::ExceptionDefSeq & exceptions_;
+  const CORBA_ExceptionDefSeq & exceptions_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -21107,15 +20840,15 @@ TAO_ClientRequestInfo_CORBA_OperationDef_exceptions_set::result (CORBA::Environm
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_OperationDef_Proxy_Impl::_TAO_OperationDef_Proxy_Impl (void)
+_TAO_CORBA_OperationDef_Proxy_Impl::_TAO_CORBA_OperationDef_Proxy_Impl (void)
 {}
 
-_TAO_OperationDef_Remote_Proxy_Impl::_TAO_OperationDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_OperationDef_Remote_Proxy_Impl::_TAO_CORBA_OperationDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::TypeCode_ptr _TAO_OperationDef_Remote_Proxy_Impl::result (
+CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -21275,7 +21008,7 @@ CORBA::TypeCode_ptr _TAO_OperationDef_Remote_Proxy_Impl::result (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::IDLType_ptr _TAO_OperationDef_Remote_Proxy_Impl::result_def (
+CORBA_IDLType_ptr _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -21284,8 +21017,8 @@ CORBA::IDLType_ptr _TAO_OperationDef_Remote_Proxy_Impl::result_def (
   ))
 {
   
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  CORBA::IDLType_var _tao_safe_retval (_tao_retval);
+  CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
+  CORBA_IDLType_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -21369,7 +21102,7 @@ CORBA::IDLType_ptr _TAO_OperationDef_Remote_Proxy_Impl::result_def (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -21435,9 +21168,9 @@ CORBA::IDLType_ptr _TAO_OperationDef_Remote_Proxy_Impl::result_def (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_OperationDef_Remote_Proxy_Impl::result_def (
+void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::result_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr result_def,
+    CORBA_IDLType_ptr result_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -21587,7 +21320,7 @@ void _TAO_OperationDef_Remote_Proxy_Impl::result_def (
   
 }
 
-CORBA::ParDescriptionSeq * _TAO_OperationDef_Remote_Proxy_Impl::params (
+CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -21596,7 +21329,7 @@ CORBA::ParDescriptionSeq * _TAO_OperationDef_Remote_Proxy_Impl::params (
   ))
 {
   
-  CORBA::ParDescriptionSeq *_tao_retval = 0;
+  CORBA_ParDescriptionSeq *_tao_retval = 0;
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -21604,8 +21337,8 @@ CORBA::ParDescriptionSeq * _TAO_OperationDef_Remote_Proxy_Impl::params (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::ParDescriptionSeq, _tao_retval);
-  CORBA::ParDescriptionSeq_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_ParDescriptionSeq, _tao_retval);
+  CORBA_ParDescriptionSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_params",
@@ -21682,7 +21415,7 @@ CORBA::ParDescriptionSeq * _TAO_OperationDef_Remote_Proxy_Impl::params (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::ParDescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_ParDescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -21748,9 +21481,9 @@ CORBA::ParDescriptionSeq * _TAO_OperationDef_Remote_Proxy_Impl::params (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_OperationDef_Remote_Proxy_Impl::params (
+void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::params (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::ParDescriptionSeq & params,
+    const CORBA_ParDescriptionSeq & params,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -21900,7 +21633,7 @@ void _TAO_OperationDef_Remote_Proxy_Impl::params (
   
 }
 
-CORBA::OperationMode _TAO_OperationDef_Remote_Proxy_Impl::mode (
+CORBA::OperationMode _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -22058,7 +21791,7 @@ CORBA::OperationMode _TAO_OperationDef_Remote_Proxy_Impl::mode (
   return _tao_retval;
 }
 
-void _TAO_OperationDef_Remote_Proxy_Impl::mode (
+void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
     CORBA::OperationMode mode,
     CORBA::Environment &ACE_TRY_ENV
@@ -22210,7 +21943,7 @@ void _TAO_OperationDef_Remote_Proxy_Impl::mode (
   
 }
 
-CORBA::ContextIdSeq * _TAO_OperationDef_Remote_Proxy_Impl::contexts (
+CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -22219,7 +21952,7 @@ CORBA::ContextIdSeq * _TAO_OperationDef_Remote_Proxy_Impl::contexts (
   ))
 {
   
-  CORBA::ContextIdSeq *_tao_retval = 0;
+  CORBA_ContextIdSeq *_tao_retval = 0;
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -22227,8 +21960,8 @@ CORBA::ContextIdSeq * _TAO_OperationDef_Remote_Proxy_Impl::contexts (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::ContextIdSeq, _tao_retval);
-  CORBA::ContextIdSeq_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_ContextIdSeq, _tao_retval);
+  CORBA_ContextIdSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_contexts",
@@ -22305,7 +22038,7 @@ CORBA::ContextIdSeq * _TAO_OperationDef_Remote_Proxy_Impl::contexts (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::ContextIdSeq * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_ContextIdSeq * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -22371,9 +22104,9 @@ CORBA::ContextIdSeq * _TAO_OperationDef_Remote_Proxy_Impl::contexts (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_OperationDef_Remote_Proxy_Impl::contexts (
+void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::contexts (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -22523,7 +22256,7 @@ void _TAO_OperationDef_Remote_Proxy_Impl::contexts (
   
 }
 
-CORBA::ExceptionDefSeq * _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
+CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -22532,7 +22265,7 @@ CORBA::ExceptionDefSeq * _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
   ))
 {
   
-  CORBA::ExceptionDefSeq *_tao_retval = 0;
+  CORBA_ExceptionDefSeq *_tao_retval = 0;
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -22540,8 +22273,8 @@ CORBA::ExceptionDefSeq * _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::ExceptionDefSeq, _tao_retval);
-  CORBA::ExceptionDefSeq_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_ExceptionDefSeq, _tao_retval);
+  CORBA_ExceptionDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_exceptions",
@@ -22618,7 +22351,7 @@ CORBA::ExceptionDefSeq * _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::ExceptionDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_ExceptionDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -22684,9 +22417,9 @@ CORBA::ExceptionDefSeq * _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
+void _TAO_CORBA_OperationDef_Remote_Proxy_Impl::exceptions (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -22846,36 +22579,36 @@ void _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_OperationDef_Proxy_Broker::_TAO_OperationDef_Proxy_Broker (void)
+_TAO_CORBA_OperationDef_Proxy_Broker::_TAO_CORBA_OperationDef_Proxy_Broker (void)
 {
 }
 
-_TAO_OperationDef_Proxy_Broker::~_TAO_OperationDef_Proxy_Broker (void)
+_TAO_CORBA_OperationDef_Proxy_Broker::~_TAO_CORBA_OperationDef_Proxy_Broker (void)
 {
 }
 
-_TAO_OperationDef_Proxy_Broker * (*CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_OperationDef_Proxy_Broker * (*_TAO_CORBA_OperationDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_OperationDef_Remote_Proxy_Broker *
-_TAO_OperationDef_Remote_Proxy_Broker::the_TAO_OperationDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_OperationDef_Remote_Proxy_Broker *
+_TAO_CORBA_OperationDef_Remote_Proxy_Broker::the_TAO_CORBA_OperationDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_OperationDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_OperationDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_OperationDef_Remote_Proxy_Broker::_TAO_OperationDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_OperationDef_Remote_Proxy_Broker::_TAO_CORBA_OperationDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_OperationDef_Remote_Proxy_Broker::~_TAO_OperationDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_OperationDef_Remote_Proxy_Broker::~_TAO_CORBA_OperationDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_OperationDef_Proxy_Impl&
-_TAO_OperationDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_OperationDef_Proxy_Impl&
+_TAO_CORBA_OperationDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_OperationDef *,
   CORBA::Environment &
 )
@@ -22900,72 +22633,72 @@ CORBA_OperationDef::~CORBA_OperationDef (void)
 {}
 
 void
-CORBA::OperationDef::CORBA_OperationDef_setup_collocation (int collocated)
+CORBA_OperationDef::CORBA_OperationDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_OperationDef_Proxy_Broker_ =
-      ::CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_ =
+      ::_TAO_CORBA_OperationDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_OperationDef_Proxy_Broker_ =
-      ::_TAO_OperationDef_Remote_Proxy_Broker::the_TAO_OperationDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_ =
+      ::_TAO_CORBA_OperationDef_Remote_Proxy_Broker::the_TAO_CORBA_OperationDef_Remote_Proxy_Broker ();
   
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-void CORBA::OperationDef::_tao_any_destructor (void *x)
+void CORBA_OperationDef::_tao_any_destructor (void *x)
 {
   CORBA_OperationDef *tmp = ACE_static_cast (CORBA_OperationDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::OperationDef_ptr CORBA::OperationDef::_narrow (
+CORBA_OperationDef_ptr CORBA_OperationDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::OperationDef::_nil ();
+    return CORBA_OperationDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/OperationDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::OperationDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
       if (is_a == 0)
-        return CORBA::OperationDef::_nil ();
+        return CORBA_OperationDef::_nil ();
     }
-  return CORBA::OperationDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_OperationDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::OperationDef_ptr CORBA::OperationDef::_unchecked_narrow (
+CORBA_OperationDef_ptr CORBA_OperationDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::OperationDef::_nil ();
+    return CORBA_OperationDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::OperationDef_ptr default_proxy = CORBA::OperationDef::_nil ();
+      CORBA_OperationDef_ptr default_proxy = CORBA_OperationDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_OperationDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::OperationDef (
+          ::CORBA_OperationDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::OperationDef::_nil ());
+          CORBA_OperationDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::OperationDef (stub, 0, obj->_servant ()), CORBA::OperationDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_OperationDef (stub, 0, obj->_servant ()), CORBA_OperationDef::_nil ());
         return default_proxy;
       }
     else 
@@ -22984,15 +22717,15 @@ CORBA::OperationDef_ptr CORBA::OperationDef::_unchecked_narrow (
           );
 }
 
-CORBA::OperationDef_ptr
-CORBA::OperationDef::_duplicate (CORBA::OperationDef_ptr obj)
+CORBA_OperationDef_ptr
+CORBA_OperationDef::_duplicate (CORBA_OperationDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::OperationDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_OperationDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
@@ -23004,34 +22737,34 @@ CORBA::Boolean CORBA::OperationDef::_is_a (const CORBA::Char *value, CORBA::Envi
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::OperationDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_OperationDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_OperationDef::_narrow))
+      &CORBA_OperationDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -23044,20 +22777,20 @@ void *CORBA::OperationDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::OperationDef::_interface_repository_id (void) const
+const char* CORBA_OperationDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/OperationDef:1.0";
 }
 
-CORBA::TypeCode_ptr CORBA::OperationDef::result (
+CORBA::TypeCode_ptr CORBA_OperationDef::result (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
-    this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.result (
@@ -23066,15 +22799,15 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result (
     );
 }
 
-CORBA::IDLType_ptr CORBA::OperationDef::result_def (
+CORBA_IDLType_ptr CORBA_OperationDef::result_def (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
-    this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.result_def (
@@ -23083,16 +22816,16 @@ CORBA::IDLType_ptr CORBA::OperationDef::result_def (
     );
 }
 
-void CORBA::OperationDef::result_def (
-    CORBA::IDLType_ptr result_def,
+void CORBA_OperationDef::result_def (
+    CORBA_IDLType_ptr result_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
-    this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.result_def (
@@ -23102,15 +22835,15 @@ void CORBA::OperationDef::result_def (
     );
 }
 
-CORBA::ParDescriptionSeq * CORBA::OperationDef::params (
+CORBA_ParDescriptionSeq * CORBA_OperationDef::params (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
-    this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.params (
@@ -23119,16 +22852,16 @@ CORBA::ParDescriptionSeq * CORBA::OperationDef::params (
     );
 }
 
-void CORBA::OperationDef::params (
-    const CORBA::ParDescriptionSeq & params,
+void CORBA_OperationDef::params (
+    const CORBA_ParDescriptionSeq & params,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
-    this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.params (
@@ -23138,15 +22871,15 @@ void CORBA::OperationDef::params (
     );
 }
 
-CORBA::OperationMode CORBA::OperationDef::mode (
+CORBA::OperationMode CORBA_OperationDef::mode (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
-    this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN ((CORBA::OperationMode)0);
   
   return proxy.mode (
@@ -23155,7 +22888,7 @@ CORBA::OperationMode CORBA::OperationDef::mode (
     );
 }
 
-void CORBA::OperationDef::mode (
+void CORBA_OperationDef::mode (
     CORBA::OperationMode mode,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -23163,8 +22896,8 @@ void CORBA::OperationDef::mode (
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
-    this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.mode (
@@ -23174,15 +22907,15 @@ void CORBA::OperationDef::mode (
     );
 }
 
-CORBA::ContextIdSeq * CORBA::OperationDef::contexts (
+CORBA_ContextIdSeq * CORBA_OperationDef::contexts (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
-    this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.contexts (
@@ -23191,16 +22924,16 @@ CORBA::ContextIdSeq * CORBA::OperationDef::contexts (
     );
 }
 
-void CORBA::OperationDef::contexts (
-    const CORBA::ContextIdSeq & contexts,
+void CORBA_OperationDef::contexts (
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
-    this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.contexts (
@@ -23210,15 +22943,15 @@ void CORBA::OperationDef::contexts (
     );
 }
 
-CORBA::ExceptionDefSeq * CORBA::OperationDef::exceptions (
+CORBA_ExceptionDefSeq * CORBA_OperationDef::exceptions (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
-    this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.exceptions (
@@ -23227,16 +22960,16 @@ CORBA::ExceptionDefSeq * CORBA::OperationDef::exceptions (
     );
 }
 
-void CORBA::OperationDef::exceptions (
-    const CORBA::ExceptionDefSeq & exceptions,
+void CORBA_OperationDef::exceptions (
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_OperationDef_Proxy_Impl &proxy = 
-    this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_OperationDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.exceptions (
@@ -23246,8 +22979,7 @@ void CORBA::OperationDef::exceptions (
     );
 }
 
-
-void CORBA::OperationDescription::_tao_any_destructor (void *x)
+void CORBA_OperationDescription::_tao_any_destructor (void *x)
 {
   CORBA_OperationDescription *tmp = ACE_static_cast (CORBA_OperationDescription*,x);
   delete tmp;
@@ -23309,12 +23041,12 @@ void CORBA_RepositoryIdSeq::_tao_any_destructor (void *x)
   void
   _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_allocate_buffer (CORBA::ULong length)
   {
-    CORBA::OperationDescription* tmp = 0;
+    CORBA_OperationDescription* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (length);
     
     if (this->buffer_ != 0)
     {
-      CORBA::OperationDescription *old = ACE_reinterpret_cast (CORBA::OperationDescription *,this->buffer_);
+      CORBA_OperationDescription *old = ACE_reinterpret_cast (CORBA_OperationDescription *,this->buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
@@ -23332,7 +23064,7 @@ void CORBA_RepositoryIdSeq::_tao_any_destructor (void *x)
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     
-    CORBA::OperationDescription *tmp = ACE_reinterpret_cast (CORBA::OperationDescription *,this->buffer_);
+    CORBA_OperationDescription *tmp = ACE_reinterpret_cast (CORBA_OperationDescription *,this->buffer_);
     
     _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (tmp);
     this->buffer_ = 0;
@@ -23363,16 +23095,16 @@ CORBA_OpDescriptionSeq::CORBA_OpDescriptionSeq (CORBA::ULong max) // uses max si
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::OperationDescription>
+  TAO_Unbounded_Sequence<CORBA_OperationDescription>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA_OpDescriptionSeq::CORBA_OpDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA::OperationDescription *buffer, CORBA::Boolean release)
+CORBA_OpDescriptionSeq::CORBA_OpDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA_OperationDescription *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::OperationDescription>
+  TAO_Unbounded_Sequence<CORBA_OperationDescription>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
@@ -23381,7 +23113,7 @@ CORBA_OpDescriptionSeq::CORBA_OpDescriptionSeq (const CORBA_OpDescriptionSeq &se
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::OperationDescription>
+  TAO_Unbounded_Sequence<CORBA_OperationDescription>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
@@ -23404,12 +23136,12 @@ void CORBA_OpDescriptionSeq::_tao_any_destructor (void *x)
   void
   _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
   {
-    CORBA::AttributeDescription* tmp = 0;
+    CORBA_AttributeDescription* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (length);
     
     if (this->buffer_ != 0)
     {
-      CORBA::AttributeDescription *old = ACE_reinterpret_cast (CORBA::AttributeDescription *,this->buffer_);
+      CORBA_AttributeDescription *old = ACE_reinterpret_cast (CORBA_AttributeDescription *,this->buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
@@ -23427,7 +23159,7 @@ void CORBA_OpDescriptionSeq::_tao_any_destructor (void *x)
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     
-    CORBA::AttributeDescription *tmp = ACE_reinterpret_cast (CORBA::AttributeDescription *,this->buffer_);
+    CORBA_AttributeDescription *tmp = ACE_reinterpret_cast (CORBA_AttributeDescription *,this->buffer_);
     
     _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
     this->buffer_ = 0;
@@ -23458,16 +23190,16 @@ CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (CORBA::ULong max) // uses ma
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::AttributeDescription>
+  TAO_Unbounded_Sequence<CORBA_AttributeDescription>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA::AttributeDescription *buffer, CORBA::Boolean release)
+CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA_AttributeDescription *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::AttributeDescription>
+  TAO_Unbounded_Sequence<CORBA_AttributeDescription>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
@@ -23476,7 +23208,7 @@ CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (const CORBA_AttrDescriptionS
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::AttributeDescription>
+  TAO_Unbounded_Sequence<CORBA_AttributeDescription>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
@@ -23491,6 +23223,189 @@ void CORBA_AttrDescriptionSeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
+// *************************************************************
+// Operations for class CORBA_InterfaceDef_var
+// *************************************************************
+
+CORBA_InterfaceDef_var::CORBA_InterfaceDef_var (void) // default constructor
+  : ptr_ (CORBA_InterfaceDef::_nil ())
+{}
+
+::CORBA_InterfaceDef_ptr
+CORBA_InterfaceDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_InterfaceDef_var::CORBA_InterfaceDef_var (const ::CORBA_InterfaceDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_InterfaceDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_InterfaceDef_var::~CORBA_InterfaceDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_InterfaceDef_var &
+CORBA_InterfaceDef_var::operator= (CORBA_InterfaceDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_InterfaceDef_var &
+CORBA_InterfaceDef_var::operator= (const ::CORBA_InterfaceDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_InterfaceDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_InterfaceDef_var::operator const ::CORBA_InterfaceDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_InterfaceDef_var::operator ::CORBA_InterfaceDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_InterfaceDef_ptr
+CORBA_InterfaceDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_InterfaceDef_ptr
+CORBA_InterfaceDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_InterfaceDef_ptr &
+CORBA_InterfaceDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_InterfaceDef_ptr &
+CORBA_InterfaceDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_InterfaceDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_InterfaceDef_ptr
+CORBA_InterfaceDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_InterfaceDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_InterfaceDef::_nil ();
+  return val;
+}
+
+::CORBA_InterfaceDef_ptr
+CORBA_InterfaceDef_var::duplicate (CORBA_InterfaceDef_ptr p)
+{
+  return ::CORBA_InterfaceDef::_duplicate (p);
+}
+
+void
+CORBA_InterfaceDef_var::release (CORBA_InterfaceDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_InterfaceDef_ptr
+CORBA_InterfaceDef_var::nil (void)
+{
+  return ::CORBA_InterfaceDef::_nil ();
+}
+
+::CORBA_InterfaceDef_ptr
+CORBA_InterfaceDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_InterfaceDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_InterfaceDef_var::upcast (void *src)
+{
+  CORBA_InterfaceDef **tmp =
+    ACE_static_cast (CORBA_InterfaceDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_InterfaceDef_out
+// *************************************************************
+
+CORBA_InterfaceDef_out::CORBA_InterfaceDef_out (CORBA_InterfaceDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_InterfaceDef::_nil ();
+}
+
+CORBA_InterfaceDef_out::CORBA_InterfaceDef_out (CORBA_InterfaceDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_InterfaceDef::_nil ();
+}
+
+CORBA_InterfaceDef_out::CORBA_InterfaceDef_out (const ::CORBA_InterfaceDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_InterfaceDef_out &, p).ptr_)
+{}
+
+::CORBA_InterfaceDef_out &
+CORBA_InterfaceDef_out::operator= (const ::CORBA_InterfaceDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_InterfaceDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_InterfaceDef_out &
+CORBA_InterfaceDef_out::operator= (const ::CORBA_InterfaceDef_var &p)
+{
+  this->ptr_ = ::CORBA_InterfaceDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_InterfaceDef_out &
+CORBA_InterfaceDef_out::operator= (CORBA_InterfaceDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_InterfaceDef_out::operator ::CORBA_InterfaceDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_InterfaceDef_ptr &
+CORBA_InterfaceDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_InterfaceDef_ptr
+CORBA_InterfaceDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get : public TAO_ClientRequestInfo
 {
@@ -23520,13 +23435,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::InterfaceDefSeq * result);
+  void result (CORBA_InterfaceDefSeq * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get (const TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get &);
 
-  CORBA::InterfaceDefSeq * _result;
+  CORBA_InterfaceDefSeq * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
@@ -23579,7 +23494,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (CORBA::Env
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (CORBA::InterfaceDefSeq * result)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (CORBA_InterfaceDefSeq * result)
 {
   // update the result 
   this->_result = result;
@@ -23591,7 +23506,7 @@ public:
   TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -23618,14 +23533,14 @@ private:
   TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set (const TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set &);
 
-  const CORBA::InterfaceDefSeq & base_interfaces_;
+  const CORBA_InterfaceDefSeq & base_interfaces_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ClientRequestInfo_CORBA_InterfaceDef_base_interfaces_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -23810,13 +23725,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::InterfaceDef::FullInterfaceDescription * result);
+  void result (CORBA_InterfaceDef::FullInterfaceDescription * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface (const TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface &);
   void operator= (const TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface &);
 
-  CORBA::InterfaceDef::FullInterfaceDescription * _result;
+  CORBA_InterfaceDef::FullInterfaceDescription * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface (
@@ -23869,7 +23784,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::result (CORBA::Envi
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::result (CORBA::InterfaceDef::FullInterfaceDescription * result)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_describe_interface::result (CORBA_InterfaceDef::FullInterfaceDescription * result)
 {
   // update the result 
   this->_result = result;
@@ -23884,7 +23799,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode & mode,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -23908,7 +23823,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::AttributeDef_ptr result);
+  void result (CORBA_AttributeDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute (const TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute &);
@@ -23917,9 +23832,9 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr type_;
+  CORBA_IDLType_ptr type_;
   const CORBA::AttributeMode & mode_;
-  CORBA::AttributeDef_ptr _result;
+  CORBA_AttributeDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute (
@@ -23928,7 +23843,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ClientRequestInfo
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode & mode,
     CORBA::Environment &    
   )
@@ -24011,7 +23926,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::result (CORBA::Enviro
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::result (CORBA::AttributeDef_ptr result)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_create_attribute::result (CORBA_AttributeDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -24026,11 +23941,11 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode & mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -24053,7 +23968,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::OperationDef_ptr result);
+  void result (CORBA_OperationDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation (const TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation &);
@@ -24062,12 +23977,12 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr result_;
+  CORBA_IDLType_ptr result_;
   const CORBA::OperationMode & mode_;
-  const CORBA::ParDescriptionSeq & params_;
-  const CORBA::ExceptionDefSeq & exceptions_;
-  const CORBA::ContextIdSeq & contexts_;
-  CORBA::OperationDef_ptr _result;
+  const CORBA_ParDescriptionSeq & params_;
+  const CORBA_ExceptionDefSeq & exceptions_;
+  const CORBA_ContextIdSeq & contexts_;
+  CORBA_OperationDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation (
@@ -24076,11 +23991,11 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ClientRequestInfo
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode & mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -24183,7 +24098,7 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA::Enviro
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA::OperationDef_ptr result)
+TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA_OperationDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -24195,15 +24110,15 @@ TAO_ClientRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA::Operat
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_InterfaceDef_Proxy_Impl::_TAO_InterfaceDef_Proxy_Impl (void)
+_TAO_CORBA_InterfaceDef_Proxy_Impl::_TAO_CORBA_InterfaceDef_Proxy_Impl (void)
 {}
 
-_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::_TAO_CORBA_InterfaceDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::InterfaceDefSeq * _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
+CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -24212,7 +24127,7 @@ CORBA::InterfaceDefSeq * _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
   ))
 {
   
-  CORBA::InterfaceDefSeq *_tao_retval = 0;
+  CORBA_InterfaceDefSeq *_tao_retval = 0;
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -24220,8 +24135,8 @@ CORBA::InterfaceDefSeq * _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::InterfaceDefSeq, _tao_retval);
-  CORBA::InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_InterfaceDefSeq, _tao_retval);
+  CORBA_InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_base_interfaces",
@@ -24298,7 +24213,7 @@ CORBA::InterfaceDefSeq * _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -24364,9 +24279,9 @@ CORBA::InterfaceDefSeq * _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
+void _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::InterfaceDefSeq & base_interfaces,
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -24516,7 +24431,7 @@ void _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
   
 }
 
-CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
+CORBA::Boolean _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
     const char * interface_id,
     CORBA::Environment &ACE_TRY_ENV
@@ -24686,7 +24601,7 @@ CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
   return _tao_retval;
 }
 
-CORBA::InterfaceDef::FullInterfaceDescription * _TAO_InterfaceDef_Remote_Proxy_Impl::describe_interface (
+CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::describe_interface (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -24695,15 +24610,15 @@ CORBA::InterfaceDef::FullInterfaceDescription * _TAO_InterfaceDef_Remote_Proxy_I
   ))
 {
   
-  CORBA::InterfaceDef::FullInterfaceDescription *_tao_retval = 0;
+  CORBA_InterfaceDef::FullInterfaceDescription *_tao_retval = 0;
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::InterfaceDef::FullInterfaceDescription, _tao_retval);
-  CORBA::InterfaceDef::FullInterfaceDescription_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_InterfaceDef::FullInterfaceDescription, _tao_retval);
+  CORBA_InterfaceDef::FullInterfaceDescription_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "describe_interface",
@@ -24780,7 +24695,7 @@ CORBA::InterfaceDef::FullInterfaceDescription * _TAO_InterfaceDef_Remote_Proxy_I
             }
           
           TAO_INTERCEPTOR (
-              CORBA::InterfaceDef::FullInterfaceDescription * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_InterfaceDef::FullInterfaceDescription * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -24846,12 +24761,12 @@ CORBA::InterfaceDef::FullInterfaceDescription * _TAO_InterfaceDef_Remote_Proxy_I
   return _tao_safe_retval._retn ();
 }
 
-CORBA::AttributeDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_attribute (
+CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_attribute (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -24860,8 +24775,8 @@ CORBA::AttributeDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_attribute (
   ))
 {
   
-  CORBA::AttributeDef_ptr _tao_retval = CORBA::AttributeDef::_nil ();
-  CORBA::AttributeDef_var _tao_safe_retval (_tao_retval);
+  CORBA_AttributeDef_ptr _tao_retval = CORBA_AttributeDef::_nil ();
+  CORBA_AttributeDef_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -24964,7 +24879,7 @@ CORBA::AttributeDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_attribute (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -25030,16 +24945,16 @@ CORBA::AttributeDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_attribute (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::OperationDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_operation (
+CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl::create_operation (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -25047,8 +24962,8 @@ CORBA::OperationDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_operation (
   ))
 {
   
-  CORBA::OperationDef_ptr _tao_retval = CORBA::OperationDef::_nil ();
-  CORBA::OperationDef_var _tao_safe_retval (_tao_retval);
+  CORBA_OperationDef_ptr _tao_retval = CORBA_OperationDef::_nil ();
+  CORBA_OperationDef_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -25157,7 +25072,7 @@ CORBA::OperationDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_operation (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -25233,36 +25148,36 @@ CORBA::OperationDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_operation (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_InterfaceDef_Proxy_Broker::_TAO_InterfaceDef_Proxy_Broker (void)
+_TAO_CORBA_InterfaceDef_Proxy_Broker::_TAO_CORBA_InterfaceDef_Proxy_Broker (void)
 {
 }
 
-_TAO_InterfaceDef_Proxy_Broker::~_TAO_InterfaceDef_Proxy_Broker (void)
+_TAO_CORBA_InterfaceDef_Proxy_Broker::~_TAO_CORBA_InterfaceDef_Proxy_Broker (void)
 {
 }
 
-_TAO_InterfaceDef_Proxy_Broker * (*CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_InterfaceDef_Proxy_Broker * (*_TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_InterfaceDef_Remote_Proxy_Broker *
-_TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker *
+_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker::the_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_InterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_InterfaceDef_Remote_Proxy_Broker::_TAO_InterfaceDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker::_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_InterfaceDef_Remote_Proxy_Broker::~_TAO_InterfaceDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker::~_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_InterfaceDef_Proxy_Impl&
-_TAO_InterfaceDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_InterfaceDef_Proxy_Impl&
+_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_InterfaceDef *,
   CORBA::Environment &
 )
@@ -25287,14 +25202,14 @@ CORBA_InterfaceDef::~CORBA_InterfaceDef (void)
 {}
 
 void
-CORBA::InterfaceDef::CORBA_InterfaceDef_setup_collocation (int collocated)
+CORBA_InterfaceDef::CORBA_InterfaceDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_InterfaceDef_Proxy_Broker_ =
-      ::CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_ =
+      ::_TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_InterfaceDef_Proxy_Broker_ =
-      ::_TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_ =
+      ::_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker::the_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker ();
   
   this->CORBA_Container_setup_collocation (collocated);
   
@@ -25303,60 +25218,60 @@ CORBA::InterfaceDef::CORBA_InterfaceDef_setup_collocation (int collocated)
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA::InterfaceDef::_tao_any_destructor (void *x)
+void CORBA_InterfaceDef::_tao_any_destructor (void *x)
 {
   CORBA_InterfaceDef *tmp = ACE_static_cast (CORBA_InterfaceDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::InterfaceDef_ptr CORBA::InterfaceDef::_narrow (
+CORBA_InterfaceDef_ptr CORBA_InterfaceDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::InterfaceDef::_nil ();
+    return CORBA_InterfaceDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/InterfaceDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::InterfaceDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
       if (is_a == 0)
-        return CORBA::InterfaceDef::_nil ();
+        return CORBA_InterfaceDef::_nil ();
     }
-  return CORBA::InterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_InterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::InterfaceDef_ptr CORBA::InterfaceDef::_unchecked_narrow (
+CORBA_InterfaceDef_ptr CORBA_InterfaceDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::InterfaceDef::_nil ();
+    return CORBA_InterfaceDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::InterfaceDef_ptr default_proxy = CORBA::InterfaceDef::_nil ();
+      CORBA_InterfaceDef_ptr default_proxy = CORBA_InterfaceDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::InterfaceDef (
+          ::CORBA_InterfaceDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::InterfaceDef::_nil ());
+          CORBA_InterfaceDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::InterfaceDef (stub, 0, obj->_servant ()), CORBA::InterfaceDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_InterfaceDef (stub, 0, obj->_servant ()), CORBA_InterfaceDef::_nil ());
         return default_proxy;
       }
     else 
@@ -25375,15 +25290,15 @@ CORBA::InterfaceDef_ptr CORBA::InterfaceDef::_unchecked_narrow (
           );
 }
 
-CORBA::InterfaceDef_ptr
-CORBA::InterfaceDef::_duplicate (CORBA::InterfaceDef_ptr obj)
+CORBA_InterfaceDef_ptr
+CORBA_InterfaceDef::_duplicate (CORBA_InterfaceDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::InterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_InterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
@@ -25397,58 +25312,58 @@ CORBA::Boolean CORBA::InterfaceDef::_is_a (const CORBA::Char *value, CORBA::Envi
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::InterfaceDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_InterfaceDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_InterfaceDef::_narrow))
+      &CORBA_InterfaceDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Container::_narrow))
+      &CORBA_Container::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Container_ptr,
+            CORBA_Container_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -25461,20 +25376,20 @@ void *CORBA::InterfaceDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::InterfaceDef::_interface_repository_id (void) const
+const char* CORBA_InterfaceDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/InterfaceDef:1.0";
 }
 
-CORBA::InterfaceDefSeq * CORBA::InterfaceDef::base_interfaces (
+CORBA_InterfaceDefSeq * CORBA_InterfaceDef::base_interfaces (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_InterfaceDef_Proxy_Impl &proxy = 
-    this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.base_interfaces (
@@ -25483,16 +25398,16 @@ CORBA::InterfaceDefSeq * CORBA::InterfaceDef::base_interfaces (
     );
 }
 
-void CORBA::InterfaceDef::base_interfaces (
-    const CORBA::InterfaceDefSeq & base_interfaces,
+void CORBA_InterfaceDef::base_interfaces (
+    const CORBA_InterfaceDefSeq & base_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_InterfaceDef_Proxy_Impl &proxy = 
-    this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.base_interfaces (
@@ -25502,7 +25417,7 @@ void CORBA::InterfaceDef::base_interfaces (
     );
 }
 
-CORBA::Boolean CORBA::InterfaceDef::is_a (
+CORBA::Boolean CORBA_InterfaceDef::is_a (
     const char * interface_id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -25510,8 +25425,8 @@ CORBA::Boolean CORBA::InterfaceDef::is_a (
     CORBA::SystemException
   ))
 {
-  _TAO_InterfaceDef_Proxy_Impl &proxy = 
-    this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.is_a (
@@ -26435,27 +26350,27 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDef_FullInterfaceDescription (
     sizeof (_oc_CORBA_InterfaceDef_FullInterfaceDescription),
     (char *) &_oc_CORBA_InterfaceDef_FullInterfaceDescription,
     0,
-    sizeof (CORBA::InterfaceDef::FullInterfaceDescription)
+    sizeof (CORBA_InterfaceDef::FullInterfaceDescription)
   );
 
-CORBA::TypeCode_ptr CORBA::InterfaceDef::_tc_FullInterfaceDescription =
+CORBA::TypeCode_ptr CORBA_InterfaceDef::_tc_FullInterfaceDescription =
   &_tc_TAO_tc_CORBA_InterfaceDef_FullInterfaceDescription;
 
-void CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *x)
+void CORBA_InterfaceDef::FullInterfaceDescription::_tao_any_destructor (void *x)
 {
   FullInterfaceDescription *tmp = ACE_static_cast (FullInterfaceDescription*,x);
   delete tmp;
 }
 
-CORBA::InterfaceDef::FullInterfaceDescription * CORBA::InterfaceDef::describe_interface (
+CORBA_InterfaceDef::FullInterfaceDescription * CORBA_InterfaceDef::describe_interface (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_InterfaceDef_Proxy_Impl &proxy = 
-    this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.describe_interface (
@@ -26464,11 +26379,11 @@ CORBA::InterfaceDef::FullInterfaceDescription * CORBA::InterfaceDef::describe_in
     );
 }
 
-CORBA::AttributeDef_ptr CORBA::InterfaceDef::create_attribute (
+CORBA_AttributeDef_ptr CORBA_InterfaceDef::create_attribute (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -26476,8 +26391,8 @@ CORBA::AttributeDef_ptr CORBA::InterfaceDef::create_attribute (
     CORBA::SystemException
   ))
 {
-  _TAO_InterfaceDef_Proxy_Impl &proxy = 
-    this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_attribute (
@@ -26491,23 +26406,23 @@ CORBA::AttributeDef_ptr CORBA::InterfaceDef::create_attribute (
     );
 }
 
-CORBA::OperationDef_ptr CORBA::InterfaceDef::create_operation (
+CORBA_OperationDef_ptr CORBA_InterfaceDef::create_operation (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_InterfaceDef_Proxy_Impl &proxy = 
-    this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_operation (
@@ -26524,13 +26439,194 @@ CORBA::OperationDef_ptr CORBA::InterfaceDef::create_operation (
     );
 }
 
-
-void CORBA::InterfaceDescription::_tao_any_destructor (void *x)
+void CORBA_InterfaceDescription::_tao_any_destructor (void *x)
 {
   CORBA_InterfaceDescription *tmp = ACE_static_cast (CORBA_InterfaceDescription*,x);
   delete tmp;
 }
 
+// *************************************************************
+// Operations for class CORBA_AbstractInterfaceDef_var
+// *************************************************************
+
+CORBA_AbstractInterfaceDef_var::CORBA_AbstractInterfaceDef_var (void) // default constructor
+  : ptr_ (CORBA_AbstractInterfaceDef::_nil ())
+{}
+
+::CORBA_AbstractInterfaceDef_ptr
+CORBA_AbstractInterfaceDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_AbstractInterfaceDef_var::CORBA_AbstractInterfaceDef_var (const ::CORBA_AbstractInterfaceDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_AbstractInterfaceDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_AbstractInterfaceDef_var::~CORBA_AbstractInterfaceDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_AbstractInterfaceDef_var &
+CORBA_AbstractInterfaceDef_var::operator= (CORBA_AbstractInterfaceDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_AbstractInterfaceDef_var &
+CORBA_AbstractInterfaceDef_var::operator= (const ::CORBA_AbstractInterfaceDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_AbstractInterfaceDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_AbstractInterfaceDef_var::operator const ::CORBA_AbstractInterfaceDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_AbstractInterfaceDef_var::operator ::CORBA_AbstractInterfaceDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_AbstractInterfaceDef_ptr
+CORBA_AbstractInterfaceDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_AbstractInterfaceDef_ptr
+CORBA_AbstractInterfaceDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_AbstractInterfaceDef_ptr &
+CORBA_AbstractInterfaceDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_AbstractInterfaceDef_ptr &
+CORBA_AbstractInterfaceDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_AbstractInterfaceDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_AbstractInterfaceDef_ptr
+CORBA_AbstractInterfaceDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_AbstractInterfaceDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_AbstractInterfaceDef::_nil ();
+  return val;
+}
+
+::CORBA_AbstractInterfaceDef_ptr
+CORBA_AbstractInterfaceDef_var::duplicate (CORBA_AbstractInterfaceDef_ptr p)
+{
+  return ::CORBA_AbstractInterfaceDef::_duplicate (p);
+}
+
+void
+CORBA_AbstractInterfaceDef_var::release (CORBA_AbstractInterfaceDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_AbstractInterfaceDef_ptr
+CORBA_AbstractInterfaceDef_var::nil (void)
+{
+  return ::CORBA_AbstractInterfaceDef::_nil ();
+}
+
+::CORBA_AbstractInterfaceDef_ptr
+CORBA_AbstractInterfaceDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_AbstractInterfaceDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_AbstractInterfaceDef_var::upcast (void *src)
+{
+  CORBA_AbstractInterfaceDef **tmp =
+    ACE_static_cast (CORBA_AbstractInterfaceDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_AbstractInterfaceDef_out
+// *************************************************************
+
+CORBA_AbstractInterfaceDef_out::CORBA_AbstractInterfaceDef_out (CORBA_AbstractInterfaceDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_AbstractInterfaceDef::_nil ();
+}
+
+CORBA_AbstractInterfaceDef_out::CORBA_AbstractInterfaceDef_out (CORBA_AbstractInterfaceDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_AbstractInterfaceDef::_nil ();
+}
+
+CORBA_AbstractInterfaceDef_out::CORBA_AbstractInterfaceDef_out (const ::CORBA_AbstractInterfaceDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_AbstractInterfaceDef_out &, p).ptr_)
+{}
+
+::CORBA_AbstractInterfaceDef_out &
+CORBA_AbstractInterfaceDef_out::operator= (const ::CORBA_AbstractInterfaceDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_AbstractInterfaceDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_AbstractInterfaceDef_out &
+CORBA_AbstractInterfaceDef_out::operator= (const ::CORBA_AbstractInterfaceDef_var &p)
+{
+  this->ptr_ = ::CORBA_AbstractInterfaceDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_AbstractInterfaceDef_out &
+CORBA_AbstractInterfaceDef_out::operator= (CORBA_AbstractInterfaceDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_AbstractInterfaceDef_out::operator ::CORBA_AbstractInterfaceDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_AbstractInterfaceDef_ptr &
+CORBA_AbstractInterfaceDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_AbstractInterfaceDef_ptr
+CORBA_AbstractInterfaceDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -26539,10 +26635,10 @@ void CORBA::InterfaceDescription::_tao_any_destructor (void *x)
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_AbstractInterfaceDef_Proxy_Impl::_TAO_AbstractInterfaceDef_Proxy_Impl (void)
+_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl (void)
 {}
 
-_TAO_AbstractInterfaceDef_Remote_Proxy_Impl::_TAO_AbstractInterfaceDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl::_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
@@ -26557,36 +26653,36 @@ _TAO_AbstractInterfaceDef_Remote_Proxy_Impl::_TAO_AbstractInterfaceDef_Remote_Pr
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_AbstractInterfaceDef_Proxy_Broker::_TAO_AbstractInterfaceDef_Proxy_Broker (void)
+_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker::_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker (void)
 {
 }
 
-_TAO_AbstractInterfaceDef_Proxy_Broker::~_TAO_AbstractInterfaceDef_Proxy_Broker (void)
+_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker::~_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker (void)
 {
 }
 
-_TAO_AbstractInterfaceDef_Proxy_Broker * (*CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker * (*_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_AbstractInterfaceDef_Remote_Proxy_Broker *
-_TAO_AbstractInterfaceDef_Remote_Proxy_Broker::the_TAO_AbstractInterfaceDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker *
+_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker::the_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_AbstractInterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_AbstractInterfaceDef_Remote_Proxy_Broker::_TAO_AbstractInterfaceDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker::_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_AbstractInterfaceDef_Remote_Proxy_Broker::~_TAO_AbstractInterfaceDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker::~_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_AbstractInterfaceDef_Proxy_Impl&
-_TAO_AbstractInterfaceDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl&
+_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_AbstractInterfaceDef *,
   CORBA::Environment &
 )
@@ -26611,72 +26707,72 @@ CORBA_AbstractInterfaceDef::~CORBA_AbstractInterfaceDef (void)
 {}
 
 void
-CORBA::AbstractInterfaceDef::CORBA_AbstractInterfaceDef_setup_collocation (int collocated)
+CORBA_AbstractInterfaceDef::CORBA_AbstractInterfaceDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_AbstractInterfaceDef_Proxy_Broker_ =
-      ::CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_ =
+      ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_AbstractInterfaceDef_Proxy_Broker_ =
-      ::_TAO_AbstractInterfaceDef_Remote_Proxy_Broker::the_TAO_AbstractInterfaceDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_ =
+      ::_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker::the_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker ();
   
   this->CORBA_InterfaceDef_setup_collocation (collocated);
 }
 
-void CORBA::AbstractInterfaceDef::_tao_any_destructor (void *x)
+void CORBA_AbstractInterfaceDef::_tao_any_destructor (void *x)
 {
   CORBA_AbstractInterfaceDef *tmp = ACE_static_cast (CORBA_AbstractInterfaceDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::AbstractInterfaceDef_ptr CORBA::AbstractInterfaceDef::_narrow (
+CORBA_AbstractInterfaceDef_ptr CORBA_AbstractInterfaceDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::AbstractInterfaceDef::_nil ();
+    return CORBA_AbstractInterfaceDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AbstractInterfaceDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::AbstractInterfaceDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ());
       if (is_a == 0)
-        return CORBA::AbstractInterfaceDef::_nil ();
+        return CORBA_AbstractInterfaceDef::_nil ();
     }
-  return CORBA::AbstractInterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_AbstractInterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::AbstractInterfaceDef_ptr CORBA::AbstractInterfaceDef::_unchecked_narrow (
+CORBA_AbstractInterfaceDef_ptr CORBA_AbstractInterfaceDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::AbstractInterfaceDef::_nil ();
+    return CORBA_AbstractInterfaceDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::AbstractInterfaceDef_ptr default_proxy = CORBA::AbstractInterfaceDef::_nil ();
+      CORBA_AbstractInterfaceDef_ptr default_proxy = CORBA_AbstractInterfaceDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::AbstractInterfaceDef (
+          ::CORBA_AbstractInterfaceDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::AbstractInterfaceDef::_nil ());
+          CORBA_AbstractInterfaceDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::AbstractInterfaceDef (stub, 0, obj->_servant ()), CORBA::AbstractInterfaceDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_AbstractInterfaceDef (stub, 0, obj->_servant ()), CORBA_AbstractInterfaceDef::_nil ());
         return default_proxy;
       }
     else 
@@ -26695,15 +26791,15 @@ CORBA::AbstractInterfaceDef_ptr CORBA::AbstractInterfaceDef::_unchecked_narrow (
           );
 }
 
-CORBA::AbstractInterfaceDef_ptr
-CORBA::AbstractInterfaceDef::_duplicate (CORBA::AbstractInterfaceDef_ptr obj)
+CORBA_AbstractInterfaceDef_ptr
+CORBA_AbstractInterfaceDef::_duplicate (CORBA_AbstractInterfaceDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::AbstractInterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_AbstractInterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0")) ||
@@ -26718,70 +26814,70 @@ CORBA::Boolean CORBA::AbstractInterfaceDef::_is_a (const CORBA::Char *value, COR
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::AbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_AbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_AbstractInterfaceDef::_narrow))
+      &CORBA_AbstractInterfaceDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_InterfaceDef::_narrow))
+      &CORBA_InterfaceDef::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::InterfaceDef_ptr,
+            CORBA_InterfaceDef_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Container::_narrow))
+      &CORBA_Container::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Container_ptr,
+            CORBA_Container_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -26794,11 +26890,193 @@ void *CORBA::AbstractInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::AbstractInterfaceDef::_interface_repository_id (void) const
+const char* CORBA_AbstractInterfaceDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0";
 }
 
+// *************************************************************
+// Operations for class CORBA_LocalInterfaceDef_var
+// *************************************************************
+
+CORBA_LocalInterfaceDef_var::CORBA_LocalInterfaceDef_var (void) // default constructor
+  : ptr_ (CORBA_LocalInterfaceDef::_nil ())
+{}
+
+::CORBA_LocalInterfaceDef_ptr
+CORBA_LocalInterfaceDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_LocalInterfaceDef_var::CORBA_LocalInterfaceDef_var (const ::CORBA_LocalInterfaceDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_LocalInterfaceDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_LocalInterfaceDef_var::~CORBA_LocalInterfaceDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_LocalInterfaceDef_var &
+CORBA_LocalInterfaceDef_var::operator= (CORBA_LocalInterfaceDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_LocalInterfaceDef_var &
+CORBA_LocalInterfaceDef_var::operator= (const ::CORBA_LocalInterfaceDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_LocalInterfaceDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_LocalInterfaceDef_var::operator const ::CORBA_LocalInterfaceDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_LocalInterfaceDef_var::operator ::CORBA_LocalInterfaceDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_LocalInterfaceDef_ptr
+CORBA_LocalInterfaceDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_LocalInterfaceDef_ptr
+CORBA_LocalInterfaceDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_LocalInterfaceDef_ptr &
+CORBA_LocalInterfaceDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_LocalInterfaceDef_ptr &
+CORBA_LocalInterfaceDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_LocalInterfaceDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_LocalInterfaceDef_ptr
+CORBA_LocalInterfaceDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_LocalInterfaceDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_LocalInterfaceDef::_nil ();
+  return val;
+}
+
+::CORBA_LocalInterfaceDef_ptr
+CORBA_LocalInterfaceDef_var::duplicate (CORBA_LocalInterfaceDef_ptr p)
+{
+  return ::CORBA_LocalInterfaceDef::_duplicate (p);
+}
+
+void
+CORBA_LocalInterfaceDef_var::release (CORBA_LocalInterfaceDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_LocalInterfaceDef_ptr
+CORBA_LocalInterfaceDef_var::nil (void)
+{
+  return ::CORBA_LocalInterfaceDef::_nil ();
+}
+
+::CORBA_LocalInterfaceDef_ptr
+CORBA_LocalInterfaceDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_LocalInterfaceDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_LocalInterfaceDef_var::upcast (void *src)
+{
+  CORBA_LocalInterfaceDef **tmp =
+    ACE_static_cast (CORBA_LocalInterfaceDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_LocalInterfaceDef_out
+// *************************************************************
+
+CORBA_LocalInterfaceDef_out::CORBA_LocalInterfaceDef_out (CORBA_LocalInterfaceDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_LocalInterfaceDef::_nil ();
+}
+
+CORBA_LocalInterfaceDef_out::CORBA_LocalInterfaceDef_out (CORBA_LocalInterfaceDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_LocalInterfaceDef::_nil ();
+}
+
+CORBA_LocalInterfaceDef_out::CORBA_LocalInterfaceDef_out (const ::CORBA_LocalInterfaceDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_LocalInterfaceDef_out &, p).ptr_)
+{}
+
+::CORBA_LocalInterfaceDef_out &
+CORBA_LocalInterfaceDef_out::operator= (const ::CORBA_LocalInterfaceDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_LocalInterfaceDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_LocalInterfaceDef_out &
+CORBA_LocalInterfaceDef_out::operator= (const ::CORBA_LocalInterfaceDef_var &p)
+{
+  this->ptr_ = ::CORBA_LocalInterfaceDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_LocalInterfaceDef_out &
+CORBA_LocalInterfaceDef_out::operator= (CORBA_LocalInterfaceDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_LocalInterfaceDef_out::operator ::CORBA_LocalInterfaceDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_LocalInterfaceDef_ptr &
+CORBA_LocalInterfaceDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_LocalInterfaceDef_ptr
+CORBA_LocalInterfaceDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -26807,10 +27085,10 @@ const char* CORBA::AbstractInterfaceDef::_interface_repository_id (void) const
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_LocalInterfaceDef_Proxy_Impl::_TAO_LocalInterfaceDef_Proxy_Impl (void)
+_TAO_CORBA_LocalInterfaceDef_Proxy_Impl::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl (void)
 {}
 
-_TAO_LocalInterfaceDef_Remote_Proxy_Impl::_TAO_LocalInterfaceDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl::_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
@@ -26825,36 +27103,36 @@ _TAO_LocalInterfaceDef_Remote_Proxy_Impl::_TAO_LocalInterfaceDef_Remote_Proxy_Im
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_LocalInterfaceDef_Proxy_Broker::_TAO_LocalInterfaceDef_Proxy_Broker (void)
+_TAO_CORBA_LocalInterfaceDef_Proxy_Broker::_TAO_CORBA_LocalInterfaceDef_Proxy_Broker (void)
 {
 }
 
-_TAO_LocalInterfaceDef_Proxy_Broker::~_TAO_LocalInterfaceDef_Proxy_Broker (void)
+_TAO_CORBA_LocalInterfaceDef_Proxy_Broker::~_TAO_CORBA_LocalInterfaceDef_Proxy_Broker (void)
 {
 }
 
-_TAO_LocalInterfaceDef_Proxy_Broker * (*CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_LocalInterfaceDef_Proxy_Broker * (*_TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_LocalInterfaceDef_Remote_Proxy_Broker *
-_TAO_LocalInterfaceDef_Remote_Proxy_Broker::the_TAO_LocalInterfaceDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker *
+_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker::the_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_LocalInterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_LocalInterfaceDef_Remote_Proxy_Broker::_TAO_LocalInterfaceDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker::_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_LocalInterfaceDef_Remote_Proxy_Broker::~_TAO_LocalInterfaceDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker::~_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_LocalInterfaceDef_Proxy_Impl&
-_TAO_LocalInterfaceDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_LocalInterfaceDef_Proxy_Impl&
+_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_LocalInterfaceDef *,
   CORBA::Environment &
 )
@@ -26879,72 +27157,72 @@ CORBA_LocalInterfaceDef::~CORBA_LocalInterfaceDef (void)
 {}
 
 void
-CORBA::LocalInterfaceDef::CORBA_LocalInterfaceDef_setup_collocation (int collocated)
+CORBA_LocalInterfaceDef::CORBA_LocalInterfaceDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_LocalInterfaceDef_Proxy_Broker_ =
-      ::CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_LocalInterfaceDef_Proxy_Broker_ =
+      ::_TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_LocalInterfaceDef_Proxy_Broker_ =
-      ::_TAO_LocalInterfaceDef_Remote_Proxy_Broker::the_TAO_LocalInterfaceDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_LocalInterfaceDef_Proxy_Broker_ =
+      ::_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker::the_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker ();
   
   this->CORBA_InterfaceDef_setup_collocation (collocated);
 }
 
-void CORBA::LocalInterfaceDef::_tao_any_destructor (void *x)
+void CORBA_LocalInterfaceDef::_tao_any_destructor (void *x)
 {
   CORBA_LocalInterfaceDef *tmp = ACE_static_cast (CORBA_LocalInterfaceDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::LocalInterfaceDef_ptr CORBA::LocalInterfaceDef::_narrow (
+CORBA_LocalInterfaceDef_ptr CORBA_LocalInterfaceDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::LocalInterfaceDef::_nil ();
+    return CORBA_LocalInterfaceDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/LocalInterfaceDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::LocalInterfaceDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ());
       if (is_a == 0)
-        return CORBA::LocalInterfaceDef::_nil ();
+        return CORBA_LocalInterfaceDef::_nil ();
     }
-  return CORBA::LocalInterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_LocalInterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::LocalInterfaceDef_ptr CORBA::LocalInterfaceDef::_unchecked_narrow (
+CORBA_LocalInterfaceDef_ptr CORBA_LocalInterfaceDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::LocalInterfaceDef::_nil ();
+    return CORBA_LocalInterfaceDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::LocalInterfaceDef_ptr default_proxy = CORBA::LocalInterfaceDef::_nil ();
+      CORBA_LocalInterfaceDef_ptr default_proxy = CORBA_LocalInterfaceDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::LocalInterfaceDef (
+          ::CORBA_LocalInterfaceDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::LocalInterfaceDef::_nil ());
+          CORBA_LocalInterfaceDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::LocalInterfaceDef (stub, 0, obj->_servant ()), CORBA::LocalInterfaceDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_LocalInterfaceDef (stub, 0, obj->_servant ()), CORBA_LocalInterfaceDef::_nil ());
         return default_proxy;
       }
     else 
@@ -26963,15 +27241,15 @@ CORBA::LocalInterfaceDef_ptr CORBA::LocalInterfaceDef::_unchecked_narrow (
           );
 }
 
-CORBA::LocalInterfaceDef_ptr
-CORBA::LocalInterfaceDef::_duplicate (CORBA::LocalInterfaceDef_ptr obj)
+CORBA_LocalInterfaceDef_ptr
+CORBA_LocalInterfaceDef::_duplicate (CORBA_LocalInterfaceDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::LocalInterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_LocalInterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0")) ||
@@ -26986,70 +27264,70 @@ CORBA::Boolean CORBA::LocalInterfaceDef::_is_a (const CORBA::Char *value, CORBA:
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::LocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_LocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_LocalInterfaceDef::_narrow))
+      &CORBA_LocalInterfaceDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_InterfaceDef::_narrow))
+      &CORBA_InterfaceDef::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::InterfaceDef_ptr,
+            CORBA_InterfaceDef_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Container::_narrow))
+      &CORBA_Container::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Container_ptr,
+            CORBA_Container_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -27062,289 +27340,11 @@ void *CORBA::LocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::LocalInterfaceDef::_interface_repository_id (void) const
+const char* CORBA_LocalInterfaceDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/LocalInterfaceDef:1.0";
 }
 
-// ************************************************************
-// Any operators for classes moved from IFR_BaseC.cpp
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InterfaceDefSeq &_tao_elem
-  ) // copying
-{
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        CORBA::_tc_InterfaceDefSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::InterfaceDefSeq *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_InterfaceDefSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::InterfaceDefSeq::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::InterfaceDefSeq *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::InterfaceDefSeq*&,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::InterfaceDefSeq *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDefSeq, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      return 0; // not equivalent
-    
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const CORBA::InterfaceDefSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      CORBA::InterfaceDefSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::InterfaceDefSeq, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_InterfaceDefSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            CORBA::InterfaceDefSeq::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::AbstractInterfaceDefSeq &_tao_elem
-  ) // copying
-{
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        CORBA::_tc_AbstractInterfaceDefSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::AbstractInterfaceDefSeq *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_AbstractInterfaceDefSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::AbstractInterfaceDefSeq::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AbstractInterfaceDefSeq *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::AbstractInterfaceDefSeq*&,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::AbstractInterfaceDefSeq *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDefSeq, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      return 0; // not equivalent
-    
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const CORBA::AbstractInterfaceDefSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      CORBA::AbstractInterfaceDefSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::AbstractInterfaceDefSeq, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_AbstractInterfaceDefSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            CORBA::AbstractInterfaceDefSeq::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::LocalInterfaceDefSeq &_tao_elem
-  ) // copying
-{
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        CORBA::_tc_LocalInterfaceDefSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::LocalInterfaceDefSeq *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_LocalInterfaceDefSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::LocalInterfaceDefSeq::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::LocalInterfaceDefSeq *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::LocalInterfaceDefSeq*&,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::LocalInterfaceDefSeq *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDefSeq, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      return 0; // not equivalent
-    
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const CORBA::LocalInterfaceDefSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      CORBA::LocalInterfaceDefSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::LocalInterfaceDefSeq, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_LocalInterfaceDefSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            CORBA::LocalInterfaceDefSeq::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ******************************************************************
-
 void operator<<= (CORBA::Any &_tao_any, CORBA::PrimitiveKind _tao_elem)
 {
   TAO_OutputCDR stream;
@@ -27385,7 +27385,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PrimitiveKind &_t
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::Repository_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_Repository_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -27395,17 +27395,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::Repository_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::Repository::_duplicate (_tao_elem),
-        CORBA::Repository::_tao_any_destructor
+        CORBA_Repository::_duplicate (_tao_elem),
+        CORBA_Repository::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Repository_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Repository_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::Repository::_nil ();
+    _tao_elem = CORBA_Repository::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_Repository, ACE_TRY_ENV);
@@ -27424,29 +27424,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Repository_ptr &_
           CORBA::_tc_Repository,
           1,
           _tao_elem,
-          CORBA::Repository::_tao_any_destructor
+          CORBA_Repository::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::Repository::_nil ();
+    _tao_elem = CORBA_Repository::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::Repository::_nil ();
+  _tao_elem = CORBA_Repository::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::Repository,CORBA::Repository_var>;
+    template class TAO_Object_Manager<CORBA_Repository,CORBA_Repository_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::Repository,CORBA::Repository_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_Repository,CORBA_Repository_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ModuleDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_ModuleDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -27456,17 +27456,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ModuleDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::ModuleDef::_duplicate (_tao_elem),
-        CORBA::ModuleDef::_tao_any_destructor
+        CORBA_ModuleDef::_duplicate (_tao_elem),
+        CORBA_ModuleDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ModuleDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ModuleDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::ModuleDef::_nil ();
+    _tao_elem = CORBA_ModuleDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDef, ACE_TRY_ENV);
@@ -27485,29 +27485,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ModuleDef_ptr &_t
           CORBA::_tc_ModuleDef,
           1,
           _tao_elem,
-          CORBA::ModuleDef::_tao_any_destructor
+          CORBA_ModuleDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::ModuleDef::_nil ();
+    _tao_elem = CORBA_ModuleDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::ModuleDef::_nil ();
+  _tao_elem = CORBA_ModuleDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::ModuleDef,CORBA::ModuleDef_var>;
+    template class TAO_Object_Manager<CORBA_ModuleDef,CORBA_ModuleDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::ModuleDef,CORBA::ModuleDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_ModuleDef,CORBA_ModuleDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ModuleDescription &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA_ModuleDescription &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
@@ -27518,7 +27518,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA::ModuleDescription &_tao_ele
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ModuleDescription *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_ModuleDescription *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -27528,16 +27528,16 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ModuleDescription *_tao_elem) //
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::ModuleDescription::_tao_any_destructor
+      CORBA_ModuleDescription::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ModuleDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ModuleDescription *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::ModuleDescription*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_ModuleDescription*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ModuleDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ModuleDescription *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -27553,15 +27553,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ModuleDescr
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::ModuleDescription*,
+          const CORBA_ModuleDescription*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::ModuleDescription *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::ModuleDescription, 0);
+      CORBA_ModuleDescription *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_ModuleDescription, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -27572,7 +27572,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ModuleDescr
             CORBA::_tc_ModuleDescription,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::ModuleDescription::_tao_any_destructor
+            CORBA_ModuleDescription::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -27590,7 +27590,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ModuleDescr
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ConstantDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_ConstantDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -27600,17 +27600,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ConstantDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::ConstantDef::_duplicate (_tao_elem),
-        CORBA::ConstantDef::_tao_any_destructor
+        CORBA_ConstantDef::_duplicate (_tao_elem),
+        CORBA_ConstantDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ConstantDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstantDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::ConstantDef::_nil ();
+    _tao_elem = CORBA_ConstantDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDef, ACE_TRY_ENV);
@@ -27629,29 +27629,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ConstantDef_ptr &
           CORBA::_tc_ConstantDef,
           1,
           _tao_elem,
-          CORBA::ConstantDef::_tao_any_destructor
+          CORBA_ConstantDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::ConstantDef::_nil ();
+    _tao_elem = CORBA_ConstantDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::ConstantDef::_nil ();
+  _tao_elem = CORBA_ConstantDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::ConstantDef,CORBA::ConstantDef_var>;
+    template class TAO_Object_Manager<CORBA_ConstantDef,CORBA_ConstantDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::ConstantDef,CORBA::ConstantDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_ConstantDef,CORBA_ConstantDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ConstantDescription &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA_ConstantDescription &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
@@ -27662,7 +27662,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA::ConstantDescription &_tao_e
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ConstantDescription *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_ConstantDescription *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -27672,16 +27672,16 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ConstantDescription *_tao_elem) /
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::ConstantDescription::_tao_any_destructor
+      CORBA_ConstantDescription::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ConstantDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstantDescription *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::ConstantDescription*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_ConstantDescription*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ConstantDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ConstantDescription *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -27697,15 +27697,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ConstantDes
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::ConstantDescription*,
+          const CORBA_ConstantDescription*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::ConstantDescription *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::ConstantDescription, 0);
+      CORBA_ConstantDescription *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_ConstantDescription, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -27716,7 +27716,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ConstantDes
             CORBA::_tc_ConstantDescription,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::ConstantDescription::_tao_any_destructor
+            CORBA_ConstantDescription::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -27734,7 +27734,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ConstantDes
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::StructDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_StructDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -27744,17 +27744,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::StructDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::StructDef::_duplicate (_tao_elem),
-        CORBA::StructDef::_tao_any_destructor
+        CORBA_StructDef::_duplicate (_tao_elem),
+        CORBA_StructDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::StructDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StructDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::StructDef::_nil ();
+    _tao_elem = CORBA_StructDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_StructDef, ACE_TRY_ENV);
@@ -27773,29 +27773,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::StructDef_ptr &_t
           CORBA::_tc_StructDef,
           1,
           _tao_elem,
-          CORBA::StructDef::_tao_any_destructor
+          CORBA_StructDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::StructDef::_nil ();
+    _tao_elem = CORBA_StructDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::StructDef::_nil ();
+  _tao_elem = CORBA_StructDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::StructDef,CORBA::StructDef_var>;
+    template class TAO_Object_Manager<CORBA_StructDef,CORBA_StructDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::StructDef,CORBA::StructDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_StructDef,CORBA_StructDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::UnionDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_UnionDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -27805,17 +27805,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::UnionDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::UnionDef::_duplicate (_tao_elem),
-        CORBA::UnionDef::_tao_any_destructor
+        CORBA_UnionDef::_duplicate (_tao_elem),
+        CORBA_UnionDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::UnionDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_UnionDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::UnionDef::_nil ();
+    _tao_elem = CORBA_UnionDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionDef, ACE_TRY_ENV);
@@ -27834,29 +27834,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::UnionDef_ptr &_ta
           CORBA::_tc_UnionDef,
           1,
           _tao_elem,
-          CORBA::UnionDef::_tao_any_destructor
+          CORBA_UnionDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::UnionDef::_nil ();
+    _tao_elem = CORBA_UnionDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::UnionDef::_nil ();
+  _tao_elem = CORBA_UnionDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::UnionDef,CORBA::UnionDef_var>;
+    template class TAO_Object_Manager<CORBA_UnionDef,CORBA_UnionDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::UnionDef,CORBA::UnionDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_UnionDef,CORBA_UnionDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::EnumDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_EnumDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -27866,17 +27866,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::EnumDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::EnumDef::_duplicate (_tao_elem),
-        CORBA::EnumDef::_tao_any_destructor
+        CORBA_EnumDef::_duplicate (_tao_elem),
+        CORBA_EnumDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::EnumDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_EnumDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::EnumDef::_nil ();
+    _tao_elem = CORBA_EnumDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumDef, ACE_TRY_ENV);
@@ -27895,29 +27895,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::EnumDef_ptr &_tao
           CORBA::_tc_EnumDef,
           1,
           _tao_elem,
-          CORBA::EnumDef::_tao_any_destructor
+          CORBA_EnumDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::EnumDef::_nil ();
+    _tao_elem = CORBA_EnumDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::EnumDef::_nil ();
+  _tao_elem = CORBA_EnumDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::EnumDef,CORBA::EnumDef_var>;
+    template class TAO_Object_Manager<CORBA_EnumDef,CORBA_EnumDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::EnumDef,CORBA::EnumDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_EnumDef,CORBA_EnumDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::AliasDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_AliasDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -27927,17 +27927,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::AliasDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::AliasDef::_duplicate (_tao_elem),
-        CORBA::AliasDef::_tao_any_destructor
+        CORBA_AliasDef::_duplicate (_tao_elem),
+        CORBA_AliasDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AliasDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AliasDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::AliasDef::_nil ();
+    _tao_elem = CORBA_AliasDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_AliasDef, ACE_TRY_ENV);
@@ -27956,29 +27956,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AliasDef_ptr &_ta
           CORBA::_tc_AliasDef,
           1,
           _tao_elem,
-          CORBA::AliasDef::_tao_any_destructor
+          CORBA_AliasDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::AliasDef::_nil ();
+    _tao_elem = CORBA_AliasDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::AliasDef::_nil ();
+  _tao_elem = CORBA_AliasDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::AliasDef,CORBA::AliasDef_var>;
+    template class TAO_Object_Manager<CORBA_AliasDef,CORBA_AliasDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::AliasDef,CORBA::AliasDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_AliasDef,CORBA_AliasDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::NativeDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_NativeDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -27988,17 +27988,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::NativeDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::NativeDef::_duplicate (_tao_elem),
-        CORBA::NativeDef::_tao_any_destructor
+        CORBA_NativeDef::_duplicate (_tao_elem),
+        CORBA_NativeDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::NativeDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_NativeDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::NativeDef::_nil ();
+    _tao_elem = CORBA_NativeDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_NativeDef, ACE_TRY_ENV);
@@ -28017,26 +28017,26 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::NativeDef_ptr &_t
           CORBA::_tc_NativeDef,
           1,
           _tao_elem,
-          CORBA::NativeDef::_tao_any_destructor
+          CORBA_NativeDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::NativeDef::_nil ();
+    _tao_elem = CORBA_NativeDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::NativeDef::_nil ();
+  _tao_elem = CORBA_NativeDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::NativeDef,CORBA::NativeDef_var>;
+    template class TAO_Object_Manager<CORBA_NativeDef,CORBA_NativeDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::NativeDef,CORBA::NativeDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_NativeDef,CORBA_NativeDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 void operator<<= (CORBA::Any &_tao_any, CORBA::PrimitiveDef_ptr _tao_elem)
@@ -28049,8 +28049,8 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::PrimitiveDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::PrimitiveDef::_duplicate (_tao_elem),
-        CORBA::PrimitiveDef::_tao_any_destructor
+        CORBA_PrimitiveDef::_duplicate (_tao_elem),
+        CORBA_PrimitiveDef::_tao_any_destructor
       );
   }
 }
@@ -28059,7 +28059,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PrimitiveDef_ptr
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::PrimitiveDef::_nil ();
+    _tao_elem = CORBA_PrimitiveDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveDef, ACE_TRY_ENV);
@@ -28078,29 +28078,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PrimitiveDef_ptr
           CORBA::_tc_PrimitiveDef,
           1,
           _tao_elem,
-          CORBA::PrimitiveDef::_tao_any_destructor
+          CORBA_PrimitiveDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::PrimitiveDef::_nil ();
+    _tao_elem = CORBA_PrimitiveDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::PrimitiveDef::_nil ();
+  _tao_elem = CORBA_PrimitiveDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::PrimitiveDef,CORBA::PrimitiveDef_var>;
+    template class TAO_Object_Manager<CORBA_PrimitiveDef,CORBA_PrimitiveDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::PrimitiveDef,CORBA::PrimitiveDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_PrimitiveDef,CORBA_PrimitiveDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::StringDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_StringDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -28110,17 +28110,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::StringDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::StringDef::_duplicate (_tao_elem),
-        CORBA::StringDef::_tao_any_destructor
+        CORBA_StringDef::_duplicate (_tao_elem),
+        CORBA_StringDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::StringDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_StringDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::StringDef::_nil ();
+    _tao_elem = CORBA_StringDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_StringDef, ACE_TRY_ENV);
@@ -28139,29 +28139,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::StringDef_ptr &_t
           CORBA::_tc_StringDef,
           1,
           _tao_elem,
-          CORBA::StringDef::_tao_any_destructor
+          CORBA_StringDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::StringDef::_nil ();
+    _tao_elem = CORBA_StringDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::StringDef::_nil ();
+  _tao_elem = CORBA_StringDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::StringDef,CORBA::StringDef_var>;
+    template class TAO_Object_Manager<CORBA_StringDef,CORBA_StringDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::StringDef,CORBA::StringDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_StringDef,CORBA_StringDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::WstringDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_WstringDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -28171,17 +28171,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::WstringDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::WstringDef::_duplicate (_tao_elem),
-        CORBA::WstringDef::_tao_any_destructor
+        CORBA_WstringDef::_duplicate (_tao_elem),
+        CORBA_WstringDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::WstringDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_WstringDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::WstringDef::_nil ();
+    _tao_elem = CORBA_WstringDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_WstringDef, ACE_TRY_ENV);
@@ -28200,29 +28200,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::WstringDef_ptr &_
           CORBA::_tc_WstringDef,
           1,
           _tao_elem,
-          CORBA::WstringDef::_tao_any_destructor
+          CORBA_WstringDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::WstringDef::_nil ();
+    _tao_elem = CORBA_WstringDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::WstringDef::_nil ();
+  _tao_elem = CORBA_WstringDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::WstringDef,CORBA::WstringDef_var>;
+    template class TAO_Object_Manager<CORBA_WstringDef,CORBA_WstringDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::WstringDef,CORBA::WstringDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_WstringDef,CORBA_WstringDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::SequenceDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_SequenceDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -28232,17 +28232,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::SequenceDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::SequenceDef::_duplicate (_tao_elem),
-        CORBA::SequenceDef::_tao_any_destructor
+        CORBA_SequenceDef::_duplicate (_tao_elem),
+        CORBA_SequenceDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SequenceDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_SequenceDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::SequenceDef::_nil ();
+    _tao_elem = CORBA_SequenceDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_SequenceDef, ACE_TRY_ENV);
@@ -28261,29 +28261,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::SequenceDef_ptr &
           CORBA::_tc_SequenceDef,
           1,
           _tao_elem,
-          CORBA::SequenceDef::_tao_any_destructor
+          CORBA_SequenceDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::SequenceDef::_nil ();
+    _tao_elem = CORBA_SequenceDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::SequenceDef::_nil ();
+  _tao_elem = CORBA_SequenceDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::SequenceDef,CORBA::SequenceDef_var>;
+    template class TAO_Object_Manager<CORBA_SequenceDef,CORBA_SequenceDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::SequenceDef,CORBA::SequenceDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_SequenceDef,CORBA_SequenceDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ArrayDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_ArrayDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -28293,17 +28293,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ArrayDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::ArrayDef::_duplicate (_tao_elem),
-        CORBA::ArrayDef::_tao_any_destructor
+        CORBA_ArrayDef::_duplicate (_tao_elem),
+        CORBA_ArrayDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ArrayDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ArrayDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::ArrayDef::_nil ();
+    _tao_elem = CORBA_ArrayDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ArrayDef, ACE_TRY_ENV);
@@ -28322,29 +28322,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ArrayDef_ptr &_ta
           CORBA::_tc_ArrayDef,
           1,
           _tao_elem,
-          CORBA::ArrayDef::_tao_any_destructor
+          CORBA_ArrayDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::ArrayDef::_nil ();
+    _tao_elem = CORBA_ArrayDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::ArrayDef::_nil ();
+  _tao_elem = CORBA_ArrayDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::ArrayDef,CORBA::ArrayDef_var>;
+    template class TAO_Object_Manager<CORBA_ArrayDef,CORBA_ArrayDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::ArrayDef,CORBA::ArrayDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_ArrayDef,CORBA_ArrayDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ExceptionDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_ExceptionDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -28354,17 +28354,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ExceptionDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::ExceptionDef::_duplicate (_tao_elem),
-        CORBA::ExceptionDef::_tao_any_destructor
+        CORBA_ExceptionDef::_duplicate (_tao_elem),
+        CORBA_ExceptionDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ExceptionDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ExceptionDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::ExceptionDef::_nil ();
+    _tao_elem = CORBA_ExceptionDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDef, ACE_TRY_ENV);
@@ -28383,29 +28383,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ExceptionDef_ptr
           CORBA::_tc_ExceptionDef,
           1,
           _tao_elem,
-          CORBA::ExceptionDef::_tao_any_destructor
+          CORBA_ExceptionDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::ExceptionDef::_nil ();
+    _tao_elem = CORBA_ExceptionDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::ExceptionDef::_nil ();
+  _tao_elem = CORBA_ExceptionDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var>;
+    template class TAO_Object_Manager<CORBA_ExceptionDef,CORBA_ExceptionDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_ExceptionDef,CORBA_ExceptionDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ExceptionDescription &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA_ExceptionDescription &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
@@ -28416,7 +28416,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA::ExceptionDescription &_tao_
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ExceptionDescription *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_ExceptionDescription *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -28426,16 +28426,16 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ExceptionDescription *_tao_elem)
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::ExceptionDescription::_tao_any_destructor
+      CORBA_ExceptionDescription::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ExceptionDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ExceptionDescription *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::ExceptionDescription*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_ExceptionDescription*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ExceptionDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ExceptionDescription *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -28451,15 +28451,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ExceptionDe
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::ExceptionDescription*,
+          const CORBA_ExceptionDescription*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::ExceptionDescription *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::ExceptionDescription, 0);
+      CORBA_ExceptionDescription *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_ExceptionDescription, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -28470,7 +28470,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ExceptionDe
             CORBA::_tc_ExceptionDescription,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::ExceptionDescription::_tao_any_destructor
+            CORBA_ExceptionDescription::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -28490,7 +28490,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ExceptionDe
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::ExceptionDefSeq &_tao_elem
+    const CORBA_ExceptionDefSeq &_tao_elem
   ) // copying
 {
   TAO_OutputCDR stream;
@@ -28504,7 +28504,7 @@ void operator<<= (
   }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ExceptionDefSeq *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_ExceptionDefSeq *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -28514,19 +28514,19 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ExceptionDefSeq *_tao_elem) // no
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::ExceptionDefSeq::_tao_any_destructor
+      CORBA_ExceptionDefSeq::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ExceptionDefSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ExceptionDefSeq *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA::ExceptionDefSeq*&,
+      const CORBA_ExceptionDefSeq*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ExceptionDefSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ExceptionDefSeq *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -28542,15 +28542,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ExceptionDe
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::ExceptionDefSeq*,
+          const CORBA_ExceptionDefSeq*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::ExceptionDefSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::ExceptionDefSeq, 0);
+      CORBA_ExceptionDefSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_ExceptionDefSeq, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -28561,7 +28561,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ExceptionDe
             CORBA::_tc_ExceptionDefSeq,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::ExceptionDefSeq::_tao_any_destructor
+            CORBA_ExceptionDefSeq::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -28581,7 +28581,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ExceptionDe
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::ExcDescriptionSeq &_tao_elem
+    const CORBA_ExcDescriptionSeq &_tao_elem
   ) // copying
 {
   TAO_OutputCDR stream;
@@ -28595,7 +28595,7 @@ void operator<<= (
   }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ExcDescriptionSeq *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_ExcDescriptionSeq *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -28605,19 +28605,19 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ExcDescriptionSeq *_tao_elem) //
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::ExcDescriptionSeq::_tao_any_destructor
+      CORBA_ExcDescriptionSeq::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ExcDescriptionSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ExcDescriptionSeq *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA::ExcDescriptionSeq*&,
+      const CORBA_ExcDescriptionSeq*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ExcDescriptionSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ExcDescriptionSeq *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -28633,15 +28633,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ExcDescript
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::ExcDescriptionSeq*,
+          const CORBA_ExcDescriptionSeq*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::ExcDescriptionSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::ExcDescriptionSeq, 0);
+      CORBA_ExcDescriptionSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_ExcDescriptionSeq, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -28652,7 +28652,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ExcDescript
             CORBA::_tc_ExcDescriptionSeq,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::ExcDescriptionSeq::_tao_any_destructor
+            CORBA_ExcDescriptionSeq::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -28710,7 +28710,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AttributeMode &_t
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::AttributeDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_AttributeDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -28720,17 +28720,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::AttributeDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::AttributeDef::_duplicate (_tao_elem),
-        CORBA::AttributeDef::_tao_any_destructor
+        CORBA_AttributeDef::_duplicate (_tao_elem),
+        CORBA_AttributeDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AttributeDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AttributeDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::AttributeDef::_nil ();
+    _tao_elem = CORBA_AttributeDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDef, ACE_TRY_ENV);
@@ -28749,29 +28749,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AttributeDef_ptr
           CORBA::_tc_AttributeDef,
           1,
           _tao_elem,
-          CORBA::AttributeDef::_tao_any_destructor
+          CORBA_AttributeDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::AttributeDef::_nil ();
+    _tao_elem = CORBA_AttributeDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::AttributeDef::_nil ();
+  _tao_elem = CORBA_AttributeDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::AttributeDef,CORBA::AttributeDef_var>;
+    template class TAO_Object_Manager<CORBA_AttributeDef,CORBA_AttributeDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::AttributeDef,CORBA::AttributeDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_AttributeDef,CORBA_AttributeDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::AttributeDescription &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA_AttributeDescription &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
@@ -28782,7 +28782,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA::AttributeDescription &_tao_
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::AttributeDescription *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_AttributeDescription *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -28792,16 +28792,16 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::AttributeDescription *_tao_elem)
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::AttributeDescription::_tao_any_destructor
+      CORBA_AttributeDescription::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AttributeDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AttributeDescription *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::AttributeDescription*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_AttributeDescription*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::AttributeDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_AttributeDescription *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -28817,15 +28817,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::AttributeDe
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::AttributeDescription*,
+          const CORBA_AttributeDescription*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::AttributeDescription *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::AttributeDescription, 0);
+      CORBA_AttributeDescription *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_AttributeDescription, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -28836,7 +28836,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::AttributeDe
             CORBA::_tc_AttributeDescription,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::AttributeDescription::_tao_any_destructor
+            CORBA_AttributeDescription::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -28934,7 +28934,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ParameterMode &_t
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ParameterDescription &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA_ParameterDescription &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
@@ -28945,7 +28945,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA::ParameterDescription &_tao_
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ParameterDescription *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_ParameterDescription *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -28955,16 +28955,16 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ParameterDescription *_tao_elem)
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::ParameterDescription::_tao_any_destructor
+      CORBA_ParameterDescription::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ParameterDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ParameterDescription *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::ParameterDescription*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_ParameterDescription*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ParameterDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ParameterDescription *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -28980,15 +28980,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ParameterDe
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::ParameterDescription*,
+          const CORBA_ParameterDescription*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::ParameterDescription *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::ParameterDescription, 0);
+      CORBA_ParameterDescription *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_ParameterDescription, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -28999,7 +28999,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ParameterDe
             CORBA::_tc_ParameterDescription,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::ParameterDescription::_tao_any_destructor
+            CORBA_ParameterDescription::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -29019,7 +29019,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ParameterDe
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::ParDescriptionSeq &_tao_elem
+    const CORBA_ParDescriptionSeq &_tao_elem
   ) // copying
 {
   TAO_OutputCDR stream;
@@ -29033,7 +29033,7 @@ void operator<<= (
   }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ParDescriptionSeq *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_ParDescriptionSeq *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -29043,19 +29043,19 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ParDescriptionSeq *_tao_elem) //
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::ParDescriptionSeq::_tao_any_destructor
+      CORBA_ParDescriptionSeq::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ParDescriptionSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ParDescriptionSeq *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA::ParDescriptionSeq*&,
+      const CORBA_ParDescriptionSeq*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ParDescriptionSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ParDescriptionSeq *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -29071,15 +29071,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ParDescript
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::ParDescriptionSeq*,
+          const CORBA_ParDescriptionSeq*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::ParDescriptionSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::ParDescriptionSeq, 0);
+      CORBA_ParDescriptionSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_ParDescriptionSeq, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -29090,7 +29090,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ParDescript
             CORBA::_tc_ParDescriptionSeq,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::ParDescriptionSeq::_tao_any_destructor
+            CORBA_ParDescriptionSeq::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -29110,7 +29110,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ParDescript
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::ContextIdSeq &_tao_elem
+    const CORBA_ContextIdSeq &_tao_elem
   ) // copying
 {
   TAO_OutputCDR stream;
@@ -29124,7 +29124,7 @@ void operator<<= (
   }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ContextIdSeq *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_ContextIdSeq *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -29134,19 +29134,19 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ContextIdSeq *_tao_elem) // non c
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::ContextIdSeq::_tao_any_destructor
+      CORBA_ContextIdSeq::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ContextIdSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ContextIdSeq *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA::ContextIdSeq*&,
+      const CORBA_ContextIdSeq*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ContextIdSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ContextIdSeq *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -29162,15 +29162,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ContextIdSe
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::ContextIdSeq*,
+          const CORBA_ContextIdSeq*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::ContextIdSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::ContextIdSeq, 0);
+      CORBA_ContextIdSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_ContextIdSeq, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -29181,7 +29181,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ContextIdSe
             CORBA::_tc_ContextIdSeq,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::ContextIdSeq::_tao_any_destructor
+            CORBA_ContextIdSeq::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -29199,7 +29199,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ContextIdSe
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::OperationDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_OperationDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -29209,17 +29209,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::OperationDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::OperationDef::_duplicate (_tao_elem),
-        CORBA::OperationDef::_tao_any_destructor
+        CORBA_OperationDef::_duplicate (_tao_elem),
+        CORBA_OperationDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OperationDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_OperationDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::OperationDef::_nil ();
+    _tao_elem = CORBA_OperationDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDef, ACE_TRY_ENV);
@@ -29238,29 +29238,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OperationDef_ptr
           CORBA::_tc_OperationDef,
           1,
           _tao_elem,
-          CORBA::OperationDef::_tao_any_destructor
+          CORBA_OperationDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::OperationDef::_nil ();
+    _tao_elem = CORBA_OperationDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::OperationDef::_nil ();
+  _tao_elem = CORBA_OperationDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::OperationDef,CORBA::OperationDef_var>;
+    template class TAO_Object_Manager<CORBA_OperationDef,CORBA_OperationDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::OperationDef,CORBA::OperationDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_OperationDef,CORBA_OperationDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::OperationDescription &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA_OperationDescription &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
@@ -29271,7 +29271,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA::OperationDescription &_tao_
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::OperationDescription *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_OperationDescription *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -29281,16 +29281,16 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::OperationDescription *_tao_elem)
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::OperationDescription::_tao_any_destructor
+      CORBA_OperationDescription::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OperationDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_OperationDescription *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::OperationDescription*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_OperationDescription*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::OperationDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OperationDescription *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -29306,15 +29306,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::OperationDe
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::OperationDescription*,
+          const CORBA_OperationDescription*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::OperationDescription *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::OperationDescription, 0);
+      CORBA_OperationDescription *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_OperationDescription, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -29325,7 +29325,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::OperationDe
             CORBA::_tc_OperationDescription,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::OperationDescription::_tao_any_destructor
+            CORBA_OperationDescription::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -29345,7 +29345,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::OperationDe
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::RepositoryIdSeq &_tao_elem
+    const CORBA_RepositoryIdSeq &_tao_elem
   ) // copying
 {
   TAO_OutputCDR stream;
@@ -29359,7 +29359,7 @@ void operator<<= (
   }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::RepositoryIdSeq *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_RepositoryIdSeq *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -29369,19 +29369,19 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::RepositoryIdSeq *_tao_elem) // no
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::RepositoryIdSeq::_tao_any_destructor
+      CORBA_RepositoryIdSeq::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::RepositoryIdSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_RepositoryIdSeq *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA::RepositoryIdSeq*&,
+      const CORBA_RepositoryIdSeq*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::RepositoryIdSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_RepositoryIdSeq *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -29397,15 +29397,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::RepositoryI
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::RepositoryIdSeq*,
+          const CORBA_RepositoryIdSeq*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::RepositoryIdSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::RepositoryIdSeq, 0);
+      CORBA_RepositoryIdSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_RepositoryIdSeq, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -29416,7 +29416,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::RepositoryI
             CORBA::_tc_RepositoryIdSeq,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::RepositoryIdSeq::_tao_any_destructor
+            CORBA_RepositoryIdSeq::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -29436,7 +29436,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::RepositoryI
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::OpDescriptionSeq &_tao_elem
+    const CORBA_OpDescriptionSeq &_tao_elem
   ) // copying
 {
   TAO_OutputCDR stream;
@@ -29450,7 +29450,7 @@ void operator<<= (
   }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::OpDescriptionSeq *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_OpDescriptionSeq *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -29460,19 +29460,19 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::OpDescriptionSeq *_tao_elem) // n
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::OpDescriptionSeq::_tao_any_destructor
+      CORBA_OpDescriptionSeq::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OpDescriptionSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_OpDescriptionSeq *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA::OpDescriptionSeq*&,
+      const CORBA_OpDescriptionSeq*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::OpDescriptionSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_OpDescriptionSeq *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -29488,15 +29488,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::OpDescripti
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::OpDescriptionSeq*,
+          const CORBA_OpDescriptionSeq*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::OpDescriptionSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::OpDescriptionSeq, 0);
+      CORBA_OpDescriptionSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_OpDescriptionSeq, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -29507,7 +29507,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::OpDescripti
             CORBA::_tc_OpDescriptionSeq,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::OpDescriptionSeq::_tao_any_destructor
+            CORBA_OpDescriptionSeq::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -29527,7 +29527,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::OpDescripti
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::AttrDescriptionSeq &_tao_elem
+    const CORBA_AttrDescriptionSeq &_tao_elem
   ) // copying
 {
   TAO_OutputCDR stream;
@@ -29541,7 +29541,7 @@ void operator<<= (
   }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::AttrDescriptionSeq *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_AttrDescriptionSeq *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -29551,19 +29551,19 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::AttrDescriptionSeq *_tao_elem) //
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::AttrDescriptionSeq::_tao_any_destructor
+      CORBA_AttrDescriptionSeq::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AttrDescriptionSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AttrDescriptionSeq *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA::AttrDescriptionSeq*&,
+      const CORBA_AttrDescriptionSeq*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::AttrDescriptionSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_AttrDescriptionSeq *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -29579,15 +29579,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::AttrDescrip
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::AttrDescriptionSeq*,
+          const CORBA_AttrDescriptionSeq*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::AttrDescriptionSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::AttrDescriptionSeq, 0);
+      CORBA_AttrDescriptionSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_AttrDescriptionSeq, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -29598,7 +29598,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::AttrDescrip
             CORBA::_tc_AttrDescriptionSeq,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::AttrDescriptionSeq::_tao_any_destructor
+            CORBA_AttrDescriptionSeq::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -29616,7 +29616,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::AttrDescrip
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::InterfaceDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_InterfaceDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -29626,17 +29626,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::InterfaceDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::InterfaceDef::_duplicate (_tao_elem),
-        CORBA::InterfaceDef::_tao_any_destructor
+        CORBA_InterfaceDef::_duplicate (_tao_elem),
+        CORBA_InterfaceDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::InterfaceDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_InterfaceDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::InterfaceDef::_nil ();
+    _tao_elem = CORBA_InterfaceDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDef, ACE_TRY_ENV);
@@ -29655,66 +29655,66 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::InterfaceDef_ptr
           CORBA::_tc_InterfaceDef,
           1,
           _tao_elem,
-          CORBA::InterfaceDef::_tao_any_destructor
+          CORBA_InterfaceDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::InterfaceDef::_nil ();
+    _tao_elem = CORBA_InterfaceDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::InterfaceDef::_nil ();
+  _tao_elem = CORBA_InterfaceDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var>;
+    template class TAO_Object_Manager<CORBA_InterfaceDef,CORBA_InterfaceDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::InterfaceDef::FullInterfaceDescription &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA_InterfaceDef::FullInterfaceDescription &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
   _tao_any._tao_replace (
-      CORBA::InterfaceDef::_tc_FullInterfaceDescription,
+      CORBA_InterfaceDef::_tc_FullInterfaceDescription,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin ()
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::InterfaceDef::FullInterfaceDescription *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_InterfaceDef::FullInterfaceDescription *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
   _tao_any._tao_replace (
-      CORBA::InterfaceDef::_tc_FullInterfaceDescription,
+      CORBA_InterfaceDef::_tc_FullInterfaceDescription,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor
+      CORBA_InterfaceDef::FullInterfaceDescription::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::InterfaceDef::FullInterfaceDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_InterfaceDef::FullInterfaceDescription *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::InterfaceDef::FullInterfaceDescription*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_InterfaceDef::FullInterfaceDescription*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::InterfaceDef::FullInterfaceDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InterfaceDef::FullInterfaceDescription *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (CORBA::InterfaceDef::_tc_FullInterfaceDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA_InterfaceDef::_tc_FullInterfaceDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
     
     if (!result)
@@ -29723,15 +29723,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::InterfaceDe
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::InterfaceDef::FullInterfaceDescription*,
+          const CORBA_InterfaceDef::FullInterfaceDescription*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::InterfaceDef::FullInterfaceDescription *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::InterfaceDef::FullInterfaceDescription, 0);
+      CORBA_InterfaceDef::FullInterfaceDescription *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_InterfaceDef::FullInterfaceDescription, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -29739,10 +29739,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::InterfaceDe
       if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::InterfaceDef::_tc_FullInterfaceDescription,
+            CORBA_InterfaceDef::_tc_FullInterfaceDescription,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor
+            CORBA_InterfaceDef::FullInterfaceDescription::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -29760,7 +29760,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::InterfaceDe
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::InterfaceDescription &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA_InterfaceDescription &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
@@ -29771,7 +29771,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA::InterfaceDescription &_tao_
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::InterfaceDescription *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_InterfaceDescription *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -29781,16 +29781,16 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::InterfaceDescription *_tao_elem)
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::InterfaceDescription::_tao_any_destructor
+      CORBA_InterfaceDescription::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::InterfaceDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_InterfaceDescription *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::InterfaceDescription*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_InterfaceDescription*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::InterfaceDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_InterfaceDescription *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -29806,15 +29806,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::InterfaceDe
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::InterfaceDescription*,
+          const CORBA_InterfaceDescription*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::InterfaceDescription *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::InterfaceDescription, 0);
+      CORBA_InterfaceDescription *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_InterfaceDescription, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -29825,7 +29825,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::InterfaceDe
             CORBA::_tc_InterfaceDescription,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::InterfaceDescription::_tao_any_destructor
+            CORBA_InterfaceDescription::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -29843,7 +29843,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::InterfaceDe
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::AbstractInterfaceDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_AbstractInterfaceDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -29853,17 +29853,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::AbstractInterfaceDef_ptr _tao_ele
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::AbstractInterfaceDef::_duplicate (_tao_elem),
-        CORBA::AbstractInterfaceDef::_tao_any_destructor
+        CORBA_AbstractInterfaceDef::_duplicate (_tao_elem),
+        CORBA_AbstractInterfaceDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AbstractInterfaceDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_AbstractInterfaceDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::AbstractInterfaceDef::_nil ();
+    _tao_elem = CORBA_AbstractInterfaceDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDef, ACE_TRY_ENV);
@@ -29882,29 +29882,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AbstractInterface
           CORBA::_tc_AbstractInterfaceDef,
           1,
           _tao_elem,
-          CORBA::AbstractInterfaceDef::_tao_any_destructor
+          CORBA_AbstractInterfaceDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::AbstractInterfaceDef::_nil ();
+    _tao_elem = CORBA_AbstractInterfaceDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::AbstractInterfaceDef::_nil ();
+  _tao_elem = CORBA_AbstractInterfaceDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var>;
+    template class TAO_Object_Manager<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::LocalInterfaceDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_LocalInterfaceDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -29914,17 +29914,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::LocalInterfaceDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::LocalInterfaceDef::_duplicate (_tao_elem),
-        CORBA::LocalInterfaceDef::_tao_any_destructor
+        CORBA_LocalInterfaceDef::_duplicate (_tao_elem),
+        CORBA_LocalInterfaceDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::LocalInterfaceDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_LocalInterfaceDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::LocalInterfaceDef::_nil ();
+    _tao_elem = CORBA_LocalInterfaceDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDef, ACE_TRY_ENV);
@@ -29943,162 +29943,535 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::LocalInterfaceDef
           CORBA::_tc_LocalInterfaceDef,
           1,
           _tao_elem,
-          CORBA::LocalInterfaceDef::_tao_any_destructor
+          CORBA_LocalInterfaceDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::LocalInterfaceDef::_nil ();
+    _tao_elem = CORBA_LocalInterfaceDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::LocalInterfaceDef::_nil ();
+  _tao_elem = CORBA_LocalInterfaceDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var>;
+    template class TAO_Object_Manager<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// **********************************************************
-// CDR operators for classes moved from IFR_BaseC.cpp
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_Repository_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_Repository_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_Repository::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::InterfaceDefSeq &_tao_sequence
+    const CORBA_ModuleDef_ptr _tao_objref
   )
 {
-  if (strm << _tao_sequence.length ())
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_ModuleDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
   {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-    {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    }
-    return _tao_marshal_flag;
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_ModuleDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
   }
-  return 0; // error
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_ConstantDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
 }
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::InterfaceDefSeq &_tao_sequence
+    CORBA_ConstantDef_ptr &_tao_objref
   )
 {
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
+  ACE_TRY_NEW_ENV
   {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-    {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    }
-    return _tao_marshal_flag;
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_ConstantDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
   }
-  return 0; // error
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
 }
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::AbstractInterfaceDefSeq &_tao_sequence
+    const CORBA_StructDef_ptr _tao_objref
   )
 {
-  if (strm << _tao_sequence.length ())
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_StructDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
   {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-    {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    }
-    return _tao_marshal_flag;
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_StructDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
   }
-  return 0; // error
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_UnionDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
 }
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::AbstractInterfaceDefSeq &_tao_sequence
+    CORBA_UnionDef_ptr &_tao_objref
   )
 {
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
+  ACE_TRY_NEW_ENV
   {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-    {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    }
-    return _tao_marshal_flag;
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_UnionDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
   }
-  return 0; // error
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
 }
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::LocalInterfaceDefSeq &_tao_sequence
+    const CORBA_EnumDef_ptr _tao_objref
   )
 {
-  if (strm << _tao_sequence.length ())
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_EnumDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
   {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-    {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-    }
-    return _tao_marshal_flag;
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_EnumDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
   }
-  return 0; // error
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_AliasDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
 }
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::LocalInterfaceDefSeq &_tao_sequence
+    CORBA_AliasDef_ptr &_tao_objref
   )
 {
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
+  ACE_TRY_NEW_ENV
   {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-    {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-    }
-    return _tao_marshal_flag;
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_AliasDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
   }
-  return 0; // error
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
 }
 
-// **************************************************************
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_NativeDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_NativeDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_NativeDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::ExceptionDefSeq &_tao_sequence
+    const CORBA::PrimitiveDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA::PrimitiveDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_PrimitiveDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_StringDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_StringDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_StringDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_WstringDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_WstringDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_WstringDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_SequenceDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_SequenceDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_SequenceDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_ArrayDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_ArrayDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_ArrayDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_ExceptionDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_ExceptionDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_ExceptionDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_ExceptionDefSeq &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -30116,7 +30489,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::ExceptionDefSeq &_tao_sequence
+    CORBA_ExceptionDefSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -30140,7 +30513,7 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::ExcDescriptionSeq &_tao_sequence
+    const CORBA_ExcDescriptionSeq &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -30158,7 +30531,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::ExcDescriptionSeq &_tao_sequence
+    CORBA_ExcDescriptionSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -30182,7 +30555,43 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::ParDescriptionSeq &_tao_sequence
+    const CORBA_AttributeDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_AttributeDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_AttributeDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_ParDescriptionSeq &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -30200,7 +30609,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::ParDescriptionSeq &_tao_sequence
+    CORBA_ParDescriptionSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -30224,7 +30633,7 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::ContextIdSeq &_tao_sequence
+    const CORBA_ContextIdSeq &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -30242,7 +30651,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::ContextIdSeq &_tao_sequence
+    CORBA_ContextIdSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -30266,7 +30675,43 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::RepositoryIdSeq &_tao_sequence
+    const CORBA_OperationDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_OperationDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_OperationDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_RepositoryIdSeq &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -30284,7 +30729,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::RepositoryIdSeq &_tao_sequence
+    CORBA_RepositoryIdSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -30308,7 +30753,7 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::OpDescriptionSeq &_tao_sequence
+    const CORBA_OpDescriptionSeq &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -30326,7 +30771,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::OpDescriptionSeq &_tao_sequence
+    CORBA_OpDescriptionSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -30350,7 +30795,7 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::AttrDescriptionSeq &_tao_sequence
+    const CORBA_AttrDescriptionSeq &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -30368,7 +30813,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::AttrDescriptionSeq &_tao_sequence
+    CORBA_AttrDescriptionSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -30390,3 +30835,111 @@ CORBA::Boolean operator>> (
   return 0; // error
 }
 
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_InterfaceDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_InterfaceDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_InterfaceDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_AbstractInterfaceDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_AbstractInterfaceDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_AbstractInterfaceDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_LocalInterfaceDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_LocalInterfaceDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_LocalInterfaceDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h
index fc4509cf9d2..f724bf7d756 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.h
+++ b/TAO/tao/IFR_Client/IFR_BasicC.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_IDL_IFR_BASICC_H
-#define TAO_IDL_IFR_BASICC_H
+#ifndef _TAO_IDL_IFR_BASICC_H_
+#define _TAO_IDL_IFR_BASICC_H_
 
 #include "ace/pre.h"
 #include "IFR_BaseC.h"
@@ -52,664 +52,236 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// *******************************************************************
-// Sequence classes moved fron IFR_BaseC.h
+class CORBA_PrimitiveDef;
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CH_
-
-  class _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_InterfaceDef* *value,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs);
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs);
-    TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var> operator[] (CORBA::ULong index) const;
-    static CORBA_InterfaceDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (CORBA_InterfaceDef **buffer);
-    // The Base_Sequence functions, please see tao/Sequence.h
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    CORBA_InterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_InterfaceDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-    virtual void _downcast (
-        void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    virtual CORBA_Object* _upcast (void *src) const;
-    
-  };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_INTERFACEDEFSEQ_CH_)
-#define _CORBA_INTERFACEDEFSEQ_CH_
-
-class CORBA_InterfaceDefSeq;
-class CORBA_InterfaceDefSeq_var;
-
-// *************************************************************
-// CORBA_InterfaceDefSeq
-// *************************************************************
-
-class TAO_IFR_Client_Export CORBA_InterfaceDefSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_InterfaceDef,CORBA_InterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_InterfaceDefSeq (void); // default ctor
-  CORBA_InterfaceDefSeq (CORBA::ULong max); // uses max size
-  CORBA_InterfaceDefSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_InterfaceDef_ptr *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_InterfaceDefSeq (const CORBA_InterfaceDefSeq &); // copy ctor
-  ~CORBA_InterfaceDefSeq (void);
-  static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_InterfaceDefSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+#if !defined (_CORBA_PRIMITIVEDEF___PTR_CH_)
+#define _CORBA_PRIMITIVEDEF___PTR_CH_
 
-};
+typedef CORBA_PrimitiveDef *CORBA_PrimitiveDef_ptr;
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_INTERFACEDEFSEQ___VAR_CH_)
-#define _CORBA_INTERFACEDEFSEQ___VAR_CH_
-
-// *************************************************************
-// class CORBA_InterfaceDefSeq_var
-// *************************************************************
+#if !defined (_CORBA_PRIMITIVEDEF___VAR_CH_)
+#define _CORBA_PRIMITIVEDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_InterfaceDefSeq_var
+class TAO_IFR_Client_Export CORBA_PrimitiveDef_var : public TAO_Base_var
 {
 public:
-  CORBA_InterfaceDefSeq_var (void); // default constructor
-  CORBA_InterfaceDefSeq_var (CORBA_InterfaceDefSeq *);
-  CORBA_InterfaceDefSeq_var (const CORBA_InterfaceDefSeq_var &); // copy constructor
-  ~CORBA_InterfaceDefSeq_var (void); // destructor
-  
-  CORBA_InterfaceDefSeq_var &operator= (CORBA_InterfaceDefSeq *);
-  CORBA_InterfaceDefSeq_var &operator= (const CORBA_InterfaceDefSeq_var &);
-  CORBA_InterfaceDefSeq *operator-> (void);
-  const CORBA_InterfaceDefSeq *operator-> (void) const;
-  
-  operator const CORBA_InterfaceDefSeq &() const;
-  operator CORBA_InterfaceDefSeq &();
-  operator CORBA_InterfaceDefSeq &() const;
-  operator CORBA_InterfaceDefSeq *&(); // variable-size base types only
+  CORBA_PrimitiveDef_var (void); // default constructor
+  CORBA_PrimitiveDef_var (CORBA::PrimitiveDef_ptr p) : ptr_ (p) {} 
+  CORBA_PrimitiveDef_var (const CORBA_PrimitiveDef_var &); // copy constructor
+  ~CORBA_PrimitiveDef_var (void); // destructor
   
-  TAO_Object_Manager<CORBA::InterfaceDef, CORBA::InterfaceDef_var> operator[] (CORBA::ULong index);
+  CORBA_PrimitiveDef_var &operator= (CORBA::PrimitiveDef_ptr);
+  CORBA_PrimitiveDef_var &operator= (const CORBA_PrimitiveDef_var &);
+  CORBA::PrimitiveDef_ptr operator-> (void) const;
   
+  operator const CORBA::PrimitiveDef_ptr &() const;
+  operator CORBA::PrimitiveDef_ptr &();
   // in, inout, out, _retn 
-  const CORBA_InterfaceDefSeq &in (void) const;
-  CORBA_InterfaceDefSeq &inout (void);
-  CORBA_InterfaceDefSeq *&out (void);
-  CORBA_InterfaceDefSeq *_retn (void);
-  CORBA_InterfaceDefSeq *ptr (void) const;
+  CORBA::PrimitiveDef_ptr in (void) const;
+  CORBA::PrimitiveDef_ptr &inout (void);
+  CORBA::PrimitiveDef_ptr &out (void);
+  CORBA::PrimitiveDef_ptr _retn (void);
+  CORBA::PrimitiveDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA::PrimitiveDef_ptr duplicate (CORBA::PrimitiveDef_ptr);
+  static void release (CORBA::PrimitiveDef_ptr);
+  static CORBA::PrimitiveDef_ptr nil (void);
+  static CORBA::PrimitiveDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
-  CORBA_InterfaceDefSeq *ptr_;
+  CORBA::PrimitiveDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_PrimitiveDef_var (const TAO_Base_var &rhs);
+  CORBA_PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_INTERFACEDEFSEQ___OUT_CH_)
-#define _CORBA_INTERFACEDEFSEQ___OUT_CH_
+#if !defined (_CORBA_PRIMITIVEDEF___OUT_CH_)
+#define _CORBA_PRIMITIVEDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_InterfaceDefSeq_out
+class TAO_IFR_Client_Export CORBA_PrimitiveDef_out
 {
 public:
-  CORBA_InterfaceDefSeq_out (CORBA_InterfaceDefSeq *&);
-  CORBA_InterfaceDefSeq_out (CORBA_InterfaceDefSeq_var &);
-  CORBA_InterfaceDefSeq_out (const CORBA_InterfaceDefSeq_out &);
-  CORBA_InterfaceDefSeq_out &operator= (const CORBA_InterfaceDefSeq_out &);
-  CORBA_InterfaceDefSeq_out &operator= (CORBA_InterfaceDefSeq *);
-  operator CORBA_InterfaceDefSeq *&();
-  CORBA_InterfaceDefSeq *&ptr (void);
-  CORBA_InterfaceDefSeq *operator-> (void);
-  TAO_Object_Manager<CORBA::InterfaceDef, CORBA::InterfaceDef_var> operator[] (CORBA::ULong index);
-  
+  CORBA_PrimitiveDef_out (CORBA::PrimitiveDef_ptr &);
+  CORBA_PrimitiveDef_out (CORBA_PrimitiveDef_var &);
+  CORBA_PrimitiveDef_out (const CORBA_PrimitiveDef_out &);
+  CORBA_PrimitiveDef_out &operator= (const CORBA_PrimitiveDef_out &);
+  CORBA_PrimitiveDef_out &operator= (const CORBA_PrimitiveDef_var &);
+  CORBA_PrimitiveDef_out &operator= (CORBA::PrimitiveDef_ptr);
+  operator CORBA::PrimitiveDef_ptr &();
+  CORBA::PrimitiveDef_ptr &ptr (void);
+  CORBA::PrimitiveDef_ptr operator-> (void);
+
 private:
-  CORBA_InterfaceDefSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_InterfaceDefSeq_var &);
+  CORBA::PrimitiveDef_ptr &ptr_;
 };
 
 
 #endif /* end #if !defined */
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_
-
-  class _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_AbstractInterfaceDef* *value,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs);
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs);
-    TAO_Object_Manager<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var> operator[] (CORBA::ULong index) const;
-    static CORBA_AbstractInterfaceDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (CORBA_AbstractInterfaceDef **buffer);
-    // The Base_Sequence functions, please see tao/Sequence.h
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    CORBA_AbstractInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_AbstractInterfaceDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-    virtual void _downcast (
-        void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    virtual CORBA_Object* _upcast (void *src) const;
-    
-  };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ_CH_
-
-class CORBA_AbstractInterfaceDefSeq;
-class CORBA_AbstractInterfaceDefSeq_var;
-
-// *************************************************************
-// CORBA_AbstractInterfaceDefSeq
-// *************************************************************
+class CORBA_StringDef;
 
-class TAO_IFR_Client_Export CORBA_AbstractInterfaceDefSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_AbstractInterfaceDef,CORBA_AbstractInterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_AbstractInterfaceDefSeq (void); // default ctor
-  CORBA_AbstractInterfaceDefSeq (CORBA::ULong max); // uses max size
-  CORBA_AbstractInterfaceDefSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_AbstractInterfaceDef_ptr *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_AbstractInterfaceDefSeq (const CORBA_AbstractInterfaceDefSeq &); // copy ctor
-  ~CORBA_AbstractInterfaceDefSeq (void);
-  static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_AbstractInterfaceDefSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+#if !defined (_CORBA_STRINGDEF___PTR_CH_)
+#define _CORBA_STRINGDEF___PTR_CH_
 
-};
+typedef CORBA_StringDef *CORBA_StringDef_ptr;
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ___VAR_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ___VAR_CH_
-
-// *************************************************************
-// class CORBA_AbstractInterfaceDefSeq_var
-// *************************************************************
+#if !defined (_CORBA_STRINGDEF___VAR_CH_)
+#define _CORBA_STRINGDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_AbstractInterfaceDefSeq_var
+class TAO_IFR_Client_Export CORBA_StringDef_var : public TAO_Base_var
 {
 public:
-  CORBA_AbstractInterfaceDefSeq_var (void); // default constructor
-  CORBA_AbstractInterfaceDefSeq_var (CORBA_AbstractInterfaceDefSeq *);
-  CORBA_AbstractInterfaceDefSeq_var (const CORBA_AbstractInterfaceDefSeq_var &); // copy constructor
-  ~CORBA_AbstractInterfaceDefSeq_var (void); // destructor
-  
-  CORBA_AbstractInterfaceDefSeq_var &operator= (CORBA_AbstractInterfaceDefSeq *);
-  CORBA_AbstractInterfaceDefSeq_var &operator= (const CORBA_AbstractInterfaceDefSeq_var &);
-  CORBA_AbstractInterfaceDefSeq *operator-> (void);
-  const CORBA_AbstractInterfaceDefSeq *operator-> (void) const;
-  
-  operator const CORBA_AbstractInterfaceDefSeq &() const;
-  operator CORBA_AbstractInterfaceDefSeq &();
-  operator CORBA_AbstractInterfaceDefSeq &() const;
-  operator CORBA_AbstractInterfaceDefSeq *&(); // variable-size base types only
+  CORBA_StringDef_var (void); // default constructor
+  CORBA_StringDef_var (CORBA_StringDef_ptr p) : ptr_ (p) {} 
+  CORBA_StringDef_var (const CORBA_StringDef_var &); // copy constructor
+  ~CORBA_StringDef_var (void); // destructor
   
-  TAO_Object_Manager<CORBA::AbstractInterfaceDef, CORBA::AbstractInterfaceDef_var> operator[] (CORBA::ULong index);
+  CORBA_StringDef_var &operator= (CORBA_StringDef_ptr);
+  CORBA_StringDef_var &operator= (const CORBA_StringDef_var &);
+  CORBA_StringDef_ptr operator-> (void) const;
   
+  operator const CORBA_StringDef_ptr &() const;
+  operator CORBA_StringDef_ptr &();
   // in, inout, out, _retn 
-  const CORBA_AbstractInterfaceDefSeq &in (void) const;
-  CORBA_AbstractInterfaceDefSeq &inout (void);
-  CORBA_AbstractInterfaceDefSeq *&out (void);
-  CORBA_AbstractInterfaceDefSeq *_retn (void);
-  CORBA_AbstractInterfaceDefSeq *ptr (void) const;
+  CORBA_StringDef_ptr in (void) const;
+  CORBA_StringDef_ptr &inout (void);
+  CORBA_StringDef_ptr &out (void);
+  CORBA_StringDef_ptr _retn (void);
+  CORBA_StringDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_StringDef_ptr duplicate (CORBA_StringDef_ptr);
+  static void release (CORBA_StringDef_ptr);
+  static CORBA_StringDef_ptr nil (void);
+  static CORBA_StringDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
-  CORBA_AbstractInterfaceDefSeq *ptr_;
+  CORBA_StringDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_StringDef_var (const TAO_Base_var &rhs);
+  CORBA_StringDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ___OUT_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ___OUT_CH_
+#if !defined (_CORBA_STRINGDEF___OUT_CH_)
+#define _CORBA_STRINGDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_AbstractInterfaceDefSeq_out
+class TAO_IFR_Client_Export CORBA_StringDef_out
 {
 public:
-  CORBA_AbstractInterfaceDefSeq_out (CORBA_AbstractInterfaceDefSeq *&);
-  CORBA_AbstractInterfaceDefSeq_out (CORBA_AbstractInterfaceDefSeq_var &);
-  CORBA_AbstractInterfaceDefSeq_out (const CORBA_AbstractInterfaceDefSeq_out &);
-  CORBA_AbstractInterfaceDefSeq_out &operator= (const CORBA_AbstractInterfaceDefSeq_out &);
-  CORBA_AbstractInterfaceDefSeq_out &operator= (CORBA_AbstractInterfaceDefSeq *);
-  operator CORBA_AbstractInterfaceDefSeq *&();
-  CORBA_AbstractInterfaceDefSeq *&ptr (void);
-  CORBA_AbstractInterfaceDefSeq *operator-> (void);
-  TAO_Object_Manager<CORBA::AbstractInterfaceDef, CORBA::AbstractInterfaceDef_var> operator[] (CORBA::ULong index);
-  
+  CORBA_StringDef_out (CORBA_StringDef_ptr &);
+  CORBA_StringDef_out (CORBA_StringDef_var &);
+  CORBA_StringDef_out (const CORBA_StringDef_out &);
+  CORBA_StringDef_out &operator= (const CORBA_StringDef_out &);
+  CORBA_StringDef_out &operator= (const CORBA_StringDef_var &);
+  CORBA_StringDef_out &operator= (CORBA_StringDef_ptr);
+  operator CORBA_StringDef_ptr &();
+  CORBA_StringDef_ptr &ptr (void);
+  CORBA_StringDef_ptr operator-> (void);
+
 private:
-  CORBA_AbstractInterfaceDefSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_AbstractInterfaceDefSeq_var &);
+  CORBA_StringDef_ptr &ptr_;
 };
 
 
 #endif /* end #if !defined */
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CH_
-
-  class _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_LocalInterfaceDef* *value,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs);
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs);
-    TAO_Object_Manager<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var> operator[] (CORBA::ULong index) const;
-    static CORBA_LocalInterfaceDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (CORBA_LocalInterfaceDef **buffer);
-    // The Base_Sequence functions, please see tao/Sequence.h
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    CORBA_LocalInterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_LocalInterfaceDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-    virtual void _downcast (
-        void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    virtual CORBA_Object* _upcast (void *src) const;
-    
-  };
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CH_)
-#define _CORBA_LOCALINTERFACEDEFSEQ_CH_
-
-class CORBA_LocalInterfaceDefSeq;
-class CORBA_LocalInterfaceDefSeq_var;
-
-// *************************************************************
-// CORBA_LocalInterfaceDefSeq
-// *************************************************************
-
-class TAO_IFR_Client_Export CORBA_LocalInterfaceDefSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_LocalInterfaceDef,CORBA_LocalInterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_LocalInterfaceDefSeq (void); // default ctor
-  CORBA_LocalInterfaceDefSeq (CORBA::ULong max); // uses max size
-  CORBA_LocalInterfaceDefSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_LocalInterfaceDef_ptr *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_LocalInterfaceDefSeq (const CORBA_LocalInterfaceDefSeq &); // copy ctor
-  ~CORBA_LocalInterfaceDefSeq (void);
-  static void _tao_any_destructor (void*);
+class CORBA_SequenceDef;
 
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_LocalInterfaceDefSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
+#if !defined (_CORBA_SEQUENCEDEF___PTR_CH_)
+#define _CORBA_SEQUENCEDEF___PTR_CH_
 
-};
+typedef CORBA_SequenceDef *CORBA_SequenceDef_ptr;
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_LOCALINTERFACEDEFSEQ___VAR_CH_)
-#define _CORBA_LOCALINTERFACEDEFSEQ___VAR_CH_
-
-// *************************************************************
-// class CORBA_LocalInterfaceDefSeq_var
-// *************************************************************
+#if !defined (_CORBA_SEQUENCEDEF___VAR_CH_)
+#define _CORBA_SEQUENCEDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_LocalInterfaceDefSeq_var
+class TAO_IFR_Client_Export CORBA_SequenceDef_var : public TAO_Base_var
 {
 public:
-  CORBA_LocalInterfaceDefSeq_var (void); // default constructor
-  CORBA_LocalInterfaceDefSeq_var (CORBA_LocalInterfaceDefSeq *);
-  CORBA_LocalInterfaceDefSeq_var (const CORBA_LocalInterfaceDefSeq_var &); // copy constructor
-  ~CORBA_LocalInterfaceDefSeq_var (void); // destructor
-  
-  CORBA_LocalInterfaceDefSeq_var &operator= (CORBA_LocalInterfaceDefSeq *);
-  CORBA_LocalInterfaceDefSeq_var &operator= (const CORBA_LocalInterfaceDefSeq_var &);
-  CORBA_LocalInterfaceDefSeq *operator-> (void);
-  const CORBA_LocalInterfaceDefSeq *operator-> (void) const;
-  
-  operator const CORBA_LocalInterfaceDefSeq &() const;
-  operator CORBA_LocalInterfaceDefSeq &();
-  operator CORBA_LocalInterfaceDefSeq &() const;
-  operator CORBA_LocalInterfaceDefSeq *&(); // variable-size base types only
+  CORBA_SequenceDef_var (void); // default constructor
+  CORBA_SequenceDef_var (CORBA_SequenceDef_ptr p) : ptr_ (p) {} 
+  CORBA_SequenceDef_var (const CORBA_SequenceDef_var &); // copy constructor
+  ~CORBA_SequenceDef_var (void); // destructor
   
-  TAO_Object_Manager<CORBA::LocalInterfaceDef, CORBA::LocalInterfaceDef_var> operator[] (CORBA::ULong index);
+  CORBA_SequenceDef_var &operator= (CORBA_SequenceDef_ptr);
+  CORBA_SequenceDef_var &operator= (const CORBA_SequenceDef_var &);
+  CORBA_SequenceDef_ptr operator-> (void) const;
   
+  operator const CORBA_SequenceDef_ptr &() const;
+  operator CORBA_SequenceDef_ptr &();
   // in, inout, out, _retn 
-  const CORBA_LocalInterfaceDefSeq &in (void) const;
-  CORBA_LocalInterfaceDefSeq &inout (void);
-  CORBA_LocalInterfaceDefSeq *&out (void);
-  CORBA_LocalInterfaceDefSeq *_retn (void);
-  CORBA_LocalInterfaceDefSeq *ptr (void) const;
+  CORBA_SequenceDef_ptr in (void) const;
+  CORBA_SequenceDef_ptr &inout (void);
+  CORBA_SequenceDef_ptr &out (void);
+  CORBA_SequenceDef_ptr _retn (void);
+  CORBA_SequenceDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_SequenceDef_ptr duplicate (CORBA_SequenceDef_ptr);
+  static void release (CORBA_SequenceDef_ptr);
+  static CORBA_SequenceDef_ptr nil (void);
+  static CORBA_SequenceDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
-  CORBA_LocalInterfaceDefSeq *ptr_;
+  CORBA_SequenceDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_SequenceDef_var (const TAO_Base_var &rhs);
+  CORBA_SequenceDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_LOCALINTERFACEDEFSEQ___OUT_CH_)
-#define _CORBA_LOCALINTERFACEDEFSEQ___OUT_CH_
+#if !defined (_CORBA_SEQUENCEDEF___OUT_CH_)
+#define _CORBA_SEQUENCEDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_LocalInterfaceDefSeq_out
+class TAO_IFR_Client_Export CORBA_SequenceDef_out
 {
 public:
-  CORBA_LocalInterfaceDefSeq_out (CORBA_LocalInterfaceDefSeq *&);
-  CORBA_LocalInterfaceDefSeq_out (CORBA_LocalInterfaceDefSeq_var &);
-  CORBA_LocalInterfaceDefSeq_out (const CORBA_LocalInterfaceDefSeq_out &);
-  CORBA_LocalInterfaceDefSeq_out &operator= (const CORBA_LocalInterfaceDefSeq_out &);
-  CORBA_LocalInterfaceDefSeq_out &operator= (CORBA_LocalInterfaceDefSeq *);
-  operator CORBA_LocalInterfaceDefSeq *&();
-  CORBA_LocalInterfaceDefSeq *&ptr (void);
-  CORBA_LocalInterfaceDefSeq *operator-> (void);
-  TAO_Object_Manager<CORBA::LocalInterfaceDef, CORBA::LocalInterfaceDef_var> operator[] (CORBA::ULong index);
-  
+  CORBA_SequenceDef_out (CORBA_SequenceDef_ptr &);
+  CORBA_SequenceDef_out (CORBA_SequenceDef_var &);
+  CORBA_SequenceDef_out (const CORBA_SequenceDef_out &);
+  CORBA_SequenceDef_out &operator= (const CORBA_SequenceDef_out &);
+  CORBA_SequenceDef_out &operator= (const CORBA_SequenceDef_var &);
+  CORBA_SequenceDef_out &operator= (CORBA_SequenceDef_ptr);
+  operator CORBA_SequenceDef_ptr &();
+  CORBA_SequenceDef_ptr &ptr (void);
+  CORBA_SequenceDef_ptr operator-> (void);
+
 private:
-  CORBA_LocalInterfaceDefSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_LocalInterfaceDefSeq_var &);
+  CORBA_SequenceDef_ptr &ptr_;
 };
 
 
 #endif /* end #if !defined */
 
-// ************************************************************************
+class CORBA_ArrayDef;
 
-  class CORBA_PrimitiveDef;
-  
-#if !defined (_CORBA_PRIMITIVEDEF___PTR_CH_)
-#define _CORBA_PRIMITIVEDEF___PTR_CH_
-
-typedef CORBA_PrimitiveDef *CORBA_PrimitiveDef_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_PRIMITIVEDEF___VAR_CH_)
-#define _CORBA_PRIMITIVEDEF___VAR_CH_
-
-  class TAO_IFR_Client_Export CORBA_PrimitiveDef_var : public TAO_Base_var
-  {
-  public:
-    CORBA_PrimitiveDef_var (void); // default constructor
-    CORBA_PrimitiveDef_var (CORBA_PrimitiveDef_ptr p) : ptr_ (p) {} 
-    CORBA_PrimitiveDef_var (const CORBA_PrimitiveDef_var &); // copy constructor
-    ~CORBA_PrimitiveDef_var (void); // destructor
-    
-    CORBA_PrimitiveDef_var &operator= (CORBA_PrimitiveDef_ptr);
-    CORBA_PrimitiveDef_var &operator= (const CORBA_PrimitiveDef_var &);
-    CORBA_PrimitiveDef_ptr operator-> (void) const;
-    
-    operator const CORBA_PrimitiveDef_ptr &() const;
-    operator CORBA_PrimitiveDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_PrimitiveDef_ptr in (void) const;
-    CORBA_PrimitiveDef_ptr &inout (void);
-    CORBA_PrimitiveDef_ptr &out (void);
-    CORBA_PrimitiveDef_ptr _retn (void);
-    CORBA_PrimitiveDef_ptr ptr (void) const;
-
-  private:
-    CORBA_PrimitiveDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    CORBA_PrimitiveDef_var (const TAO_Base_var &rhs);
-    CORBA_PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_PRIMITIVEDEF___OUT_CH_)
-#define _CORBA_PRIMITIVEDEF___OUT_CH_
-
-  class TAO_IFR_Client_Export CORBA_PrimitiveDef_out
-  {
-  public:
-    CORBA_PrimitiveDef_out (CORBA_PrimitiveDef_ptr &);
-    CORBA_PrimitiveDef_out (CORBA_PrimitiveDef_var &);
-    CORBA_PrimitiveDef_out (const CORBA_PrimitiveDef_out &);
-    CORBA_PrimitiveDef_out &operator= (const CORBA_PrimitiveDef_out &);
-    CORBA_PrimitiveDef_out &operator= (const CORBA_PrimitiveDef_var &);
-    CORBA_PrimitiveDef_out &operator= (CORBA_PrimitiveDef_ptr);
-    operator CORBA_PrimitiveDef_ptr &();
-    CORBA_PrimitiveDef_ptr &ptr (void);
-    CORBA_PrimitiveDef_ptr operator-> (void);
-    
-  private:
-    CORBA_PrimitiveDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-  class CORBA_StringDef;
-  
-#if !defined (_CORBA_STRINGDEF___PTR_CH_)
-#define _CORBA_STRINGDEF___PTR_CH_
-
-typedef CORBA_StringDef *CORBA_StringDef_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRINGDEF___VAR_CH_)
-#define _CORBA_STRINGDEF___VAR_CH_
-
-  class TAO_IFR_Client_Export CORBA_StringDef_var : public TAO_Base_var
-  {
-  public:
-    CORBA_StringDef_var (void); // default constructor
-    CORBA_StringDef_var (CORBA_StringDef_ptr p) : ptr_ (p) {} 
-    CORBA_StringDef_var (const CORBA_StringDef_var &); // copy constructor
-    ~CORBA_StringDef_var (void); // destructor
-    
-    CORBA_StringDef_var &operator= (CORBA_StringDef_ptr);
-    CORBA_StringDef_var &operator= (const CORBA_StringDef_var &);
-    CORBA_StringDef_ptr operator-> (void) const;
-    
-    operator const CORBA_StringDef_ptr &() const;
-    operator CORBA_StringDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_StringDef_ptr in (void) const;
-    CORBA_StringDef_ptr &inout (void);
-    CORBA_StringDef_ptr &out (void);
-    CORBA_StringDef_ptr _retn (void);
-    CORBA_StringDef_ptr ptr (void) const;
-
-  private:
-    CORBA_StringDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    CORBA_StringDef_var (const TAO_Base_var &rhs);
-    CORBA_StringDef_var &operator= (const TAO_Base_var &rhs);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRINGDEF___OUT_CH_)
-#define _CORBA_STRINGDEF___OUT_CH_
-
-  class TAO_IFR_Client_Export CORBA_StringDef_out
-  {
-  public:
-    CORBA_StringDef_out (CORBA_StringDef_ptr &);
-    CORBA_StringDef_out (CORBA_StringDef_var &);
-    CORBA_StringDef_out (const CORBA_StringDef_out &);
-    CORBA_StringDef_out &operator= (const CORBA_StringDef_out &);
-    CORBA_StringDef_out &operator= (const CORBA_StringDef_var &);
-    CORBA_StringDef_out &operator= (CORBA_StringDef_ptr);
-    operator CORBA_StringDef_ptr &();
-    CORBA_StringDef_ptr &ptr (void);
-    CORBA_StringDef_ptr operator-> (void);
-    
-  private:
-    CORBA_StringDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-  class CORBA_SequenceDef;
-  
-#if !defined (_CORBA_SEQUENCEDEF___PTR_CH_)
-#define _CORBA_SEQUENCEDEF___PTR_CH_
-
-typedef CORBA_SequenceDef *CORBA_SequenceDef_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SEQUENCEDEF___VAR_CH_)
-#define _CORBA_SEQUENCEDEF___VAR_CH_
-
-  class TAO_IFR_Client_Export CORBA_SequenceDef_var : public TAO_Base_var
-  {
-  public:
-    CORBA_SequenceDef_var (void); // default constructor
-    CORBA_SequenceDef_var (CORBA_SequenceDef_ptr p) : ptr_ (p) {} 
-    CORBA_SequenceDef_var (const CORBA_SequenceDef_var &); // copy constructor
-    ~CORBA_SequenceDef_var (void); // destructor
-    
-    CORBA_SequenceDef_var &operator= (CORBA_SequenceDef_ptr);
-    CORBA_SequenceDef_var &operator= (const CORBA_SequenceDef_var &);
-    CORBA_SequenceDef_ptr operator-> (void) const;
-    
-    operator const CORBA_SequenceDef_ptr &() const;
-    operator CORBA_SequenceDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_SequenceDef_ptr in (void) const;
-    CORBA_SequenceDef_ptr &inout (void);
-    CORBA_SequenceDef_ptr &out (void);
-    CORBA_SequenceDef_ptr _retn (void);
-    CORBA_SequenceDef_ptr ptr (void) const;
-
-  private:
-    CORBA_SequenceDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    CORBA_SequenceDef_var (const TAO_Base_var &rhs);
-    CORBA_SequenceDef_var &operator= (const TAO_Base_var &rhs);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SEQUENCEDEF___OUT_CH_)
-#define _CORBA_SEQUENCEDEF___OUT_CH_
-
-  class TAO_IFR_Client_Export CORBA_SequenceDef_out
-  {
-  public:
-    CORBA_SequenceDef_out (CORBA_SequenceDef_ptr &);
-    CORBA_SequenceDef_out (CORBA_SequenceDef_var &);
-    CORBA_SequenceDef_out (const CORBA_SequenceDef_out &);
-    CORBA_SequenceDef_out &operator= (const CORBA_SequenceDef_out &);
-    CORBA_SequenceDef_out &operator= (const CORBA_SequenceDef_var &);
-    CORBA_SequenceDef_out &operator= (CORBA_SequenceDef_ptr);
-    operator CORBA_SequenceDef_ptr &();
-    CORBA_SequenceDef_ptr &ptr (void);
-    CORBA_SequenceDef_ptr operator-> (void);
-    
-  private:
-    CORBA_SequenceDef_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-  class CORBA_ArrayDef;
-  
 #if !defined (_CORBA_ARRAYDEF___PTR_CH_)
 #define _CORBA_ARRAYDEF___PTR_CH_
 
@@ -721,33 +293,41 @@ typedef CORBA_ArrayDef *CORBA_ArrayDef_ptr;
 #if !defined (_CORBA_ARRAYDEF___VAR_CH_)
 #define _CORBA_ARRAYDEF___VAR_CH_
 
-  class TAO_IFR_Client_Export CORBA_ArrayDef_var : public TAO_Base_var
-  {
-  public:
-    CORBA_ArrayDef_var (void); // default constructor
-    CORBA_ArrayDef_var (CORBA_ArrayDef_ptr p) : ptr_ (p) {} 
-    CORBA_ArrayDef_var (const CORBA_ArrayDef_var &); // copy constructor
-    ~CORBA_ArrayDef_var (void); // destructor
-    
-    CORBA_ArrayDef_var &operator= (CORBA_ArrayDef_ptr);
-    CORBA_ArrayDef_var &operator= (const CORBA_ArrayDef_var &);
-    CORBA_ArrayDef_ptr operator-> (void) const;
-    
-    operator const CORBA_ArrayDef_ptr &() const;
-    operator CORBA_ArrayDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_ArrayDef_ptr in (void) const;
-    CORBA_ArrayDef_ptr &inout (void);
-    CORBA_ArrayDef_ptr &out (void);
-    CORBA_ArrayDef_ptr _retn (void);
-    CORBA_ArrayDef_ptr ptr (void) const;
+class TAO_IFR_Client_Export CORBA_ArrayDef_var : public TAO_Base_var
+{
+public:
+  CORBA_ArrayDef_var (void); // default constructor
+  CORBA_ArrayDef_var (CORBA_ArrayDef_ptr p) : ptr_ (p) {} 
+  CORBA_ArrayDef_var (const CORBA_ArrayDef_var &); // copy constructor
+  ~CORBA_ArrayDef_var (void); // destructor
+  
+  CORBA_ArrayDef_var &operator= (CORBA_ArrayDef_ptr);
+  CORBA_ArrayDef_var &operator= (const CORBA_ArrayDef_var &);
+  CORBA_ArrayDef_ptr operator-> (void) const;
+  
+  operator const CORBA_ArrayDef_ptr &() const;
+  operator CORBA_ArrayDef_ptr &();
+  // in, inout, out, _retn 
+  CORBA_ArrayDef_ptr in (void) const;
+  CORBA_ArrayDef_ptr &inout (void);
+  CORBA_ArrayDef_ptr &out (void);
+  CORBA_ArrayDef_ptr _retn (void);
+  CORBA_ArrayDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_ArrayDef_ptr duplicate (CORBA_ArrayDef_ptr);
+  static void release (CORBA_ArrayDef_ptr);
+  static CORBA_ArrayDef_ptr nil (void);
+  static CORBA_ArrayDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
-  private:
-    CORBA_ArrayDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    CORBA_ArrayDef_var (const TAO_Base_var &rhs);
-    CORBA_ArrayDef_var &operator= (const TAO_Base_var &rhs);
-  };
+private:
+  CORBA_ArrayDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_ArrayDef_var (const TAO_Base_var &rhs);
+  CORBA_ArrayDef_var &operator= (const TAO_Base_var &rhs);
+};
 
 
 #endif /* end #if !defined */
@@ -756,28 +336,28 @@ typedef CORBA_ArrayDef *CORBA_ArrayDef_ptr;
 #if !defined (_CORBA_ARRAYDEF___OUT_CH_)
 #define _CORBA_ARRAYDEF___OUT_CH_
 
-  class TAO_IFR_Client_Export CORBA_ArrayDef_out
-  {
-  public:
-    CORBA_ArrayDef_out (CORBA_ArrayDef_ptr &);
-    CORBA_ArrayDef_out (CORBA_ArrayDef_var &);
-    CORBA_ArrayDef_out (const CORBA_ArrayDef_out &);
-    CORBA_ArrayDef_out &operator= (const CORBA_ArrayDef_out &);
-    CORBA_ArrayDef_out &operator= (const CORBA_ArrayDef_var &);
-    CORBA_ArrayDef_out &operator= (CORBA_ArrayDef_ptr);
-    operator CORBA_ArrayDef_ptr &();
-    CORBA_ArrayDef_ptr &ptr (void);
-    CORBA_ArrayDef_ptr operator-> (void);
-    
-  private:
-    CORBA_ArrayDef_ptr &ptr_;
-  };
+class TAO_IFR_Client_Export CORBA_ArrayDef_out
+{
+public:
+  CORBA_ArrayDef_out (CORBA_ArrayDef_ptr &);
+  CORBA_ArrayDef_out (CORBA_ArrayDef_var &);
+  CORBA_ArrayDef_out (const CORBA_ArrayDef_out &);
+  CORBA_ArrayDef_out &operator= (const CORBA_ArrayDef_out &);
+  CORBA_ArrayDef_out &operator= (const CORBA_ArrayDef_var &);
+  CORBA_ArrayDef_out &operator= (CORBA_ArrayDef_ptr);
+  operator CORBA_ArrayDef_ptr &();
+  CORBA_ArrayDef_ptr &ptr (void);
+  CORBA_ArrayDef_ptr operator-> (void);
+
+private:
+  CORBA_ArrayDef_ptr &ptr_;
+};
 
 
 #endif /* end #if !defined */
 
-  class CORBA_WstringDef;
-  
+class CORBA_WstringDef;
+
 #if !defined (_CORBA_WSTRINGDEF___PTR_CH_)
 #define _CORBA_WSTRINGDEF___PTR_CH_
 
@@ -789,33 +369,41 @@ typedef CORBA_WstringDef *CORBA_WstringDef_ptr;
 #if !defined (_CORBA_WSTRINGDEF___VAR_CH_)
 #define _CORBA_WSTRINGDEF___VAR_CH_
 
-  class TAO_IFR_Client_Export CORBA_WstringDef_var : public TAO_Base_var
-  {
-  public:
-    CORBA_WstringDef_var (void); // default constructor
-    CORBA_WstringDef_var (CORBA_WstringDef_ptr p) : ptr_ (p) {} 
-    CORBA_WstringDef_var (const CORBA_WstringDef_var &); // copy constructor
-    ~CORBA_WstringDef_var (void); // destructor
-    
-    CORBA_WstringDef_var &operator= (CORBA_WstringDef_ptr);
-    CORBA_WstringDef_var &operator= (const CORBA_WstringDef_var &);
-    CORBA_WstringDef_ptr operator-> (void) const;
-    
-    operator const CORBA_WstringDef_ptr &() const;
-    operator CORBA_WstringDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_WstringDef_ptr in (void) const;
-    CORBA_WstringDef_ptr &inout (void);
-    CORBA_WstringDef_ptr &out (void);
-    CORBA_WstringDef_ptr _retn (void);
-    CORBA_WstringDef_ptr ptr (void) const;
+class TAO_IFR_Client_Export CORBA_WstringDef_var : public TAO_Base_var
+{
+public:
+  CORBA_WstringDef_var (void); // default constructor
+  CORBA_WstringDef_var (CORBA_WstringDef_ptr p) : ptr_ (p) {} 
+  CORBA_WstringDef_var (const CORBA_WstringDef_var &); // copy constructor
+  ~CORBA_WstringDef_var (void); // destructor
+  
+  CORBA_WstringDef_var &operator= (CORBA_WstringDef_ptr);
+  CORBA_WstringDef_var &operator= (const CORBA_WstringDef_var &);
+  CORBA_WstringDef_ptr operator-> (void) const;
+  
+  operator const CORBA_WstringDef_ptr &() const;
+  operator CORBA_WstringDef_ptr &();
+  // in, inout, out, _retn 
+  CORBA_WstringDef_ptr in (void) const;
+  CORBA_WstringDef_ptr &inout (void);
+  CORBA_WstringDef_ptr &out (void);
+  CORBA_WstringDef_ptr _retn (void);
+  CORBA_WstringDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_WstringDef_ptr duplicate (CORBA_WstringDef_ptr);
+  static void release (CORBA_WstringDef_ptr);
+  static CORBA_WstringDef_ptr nil (void);
+  static CORBA_WstringDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
-  private:
-    CORBA_WstringDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    CORBA_WstringDef_var (const TAO_Base_var &rhs);
-    CORBA_WstringDef_var &operator= (const TAO_Base_var &rhs);
-  };
+private:
+  CORBA_WstringDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_WstringDef_var (const TAO_Base_var &rhs);
+  CORBA_WstringDef_var &operator= (const TAO_Base_var &rhs);
+};
 
 
 #endif /* end #if !defined */
@@ -824,28 +412,28 @@ typedef CORBA_WstringDef *CORBA_WstringDef_ptr;
 #if !defined (_CORBA_WSTRINGDEF___OUT_CH_)
 #define _CORBA_WSTRINGDEF___OUT_CH_
 
-  class TAO_IFR_Client_Export CORBA_WstringDef_out
-  {
-  public:
-    CORBA_WstringDef_out (CORBA_WstringDef_ptr &);
-    CORBA_WstringDef_out (CORBA_WstringDef_var &);
-    CORBA_WstringDef_out (const CORBA_WstringDef_out &);
-    CORBA_WstringDef_out &operator= (const CORBA_WstringDef_out &);
-    CORBA_WstringDef_out &operator= (const CORBA_WstringDef_var &);
-    CORBA_WstringDef_out &operator= (CORBA_WstringDef_ptr);
-    operator CORBA_WstringDef_ptr &();
-    CORBA_WstringDef_ptr &ptr (void);
-    CORBA_WstringDef_ptr operator-> (void);
-    
-  private:
-    CORBA_WstringDef_ptr &ptr_;
-  };
+class TAO_IFR_Client_Export CORBA_WstringDef_out
+{
+public:
+  CORBA_WstringDef_out (CORBA_WstringDef_ptr &);
+  CORBA_WstringDef_out (CORBA_WstringDef_var &);
+  CORBA_WstringDef_out (const CORBA_WstringDef_out &);
+  CORBA_WstringDef_out &operator= (const CORBA_WstringDef_out &);
+  CORBA_WstringDef_out &operator= (const CORBA_WstringDef_var &);
+  CORBA_WstringDef_out &operator= (CORBA_WstringDef_ptr);
+  operator CORBA_WstringDef_ptr &();
+  CORBA_WstringDef_ptr &ptr (void);
+  CORBA_WstringDef_ptr operator-> (void);
+
+private:
+  CORBA_WstringDef_ptr &ptr_;
+};
 
 
 #endif /* end #if !defined */
 
-  class CORBA_FixedDef;
-  
+class CORBA_FixedDef;
+
 #if !defined (_CORBA_FIXEDDEF___PTR_CH_)
 #define _CORBA_FIXEDDEF___PTR_CH_
 
@@ -857,33 +445,41 @@ typedef CORBA_FixedDef *CORBA_FixedDef_ptr;
 #if !defined (_CORBA_FIXEDDEF___VAR_CH_)
 #define _CORBA_FIXEDDEF___VAR_CH_
 
-  class TAO_IFR_Client_Export CORBA_FixedDef_var : public TAO_Base_var
-  {
-  public:
-    CORBA_FixedDef_var (void); // default constructor
-    CORBA_FixedDef_var (CORBA_FixedDef_ptr p) : ptr_ (p) {} 
-    CORBA_FixedDef_var (const CORBA_FixedDef_var &); // copy constructor
-    ~CORBA_FixedDef_var (void); // destructor
-    
-    CORBA_FixedDef_var &operator= (CORBA_FixedDef_ptr);
-    CORBA_FixedDef_var &operator= (const CORBA_FixedDef_var &);
-    CORBA_FixedDef_ptr operator-> (void) const;
-    
-    operator const CORBA_FixedDef_ptr &() const;
-    operator CORBA_FixedDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_FixedDef_ptr in (void) const;
-    CORBA_FixedDef_ptr &inout (void);
-    CORBA_FixedDef_ptr &out (void);
-    CORBA_FixedDef_ptr _retn (void);
-    CORBA_FixedDef_ptr ptr (void) const;
+class TAO_IFR_Client_Export CORBA_FixedDef_var : public TAO_Base_var
+{
+public:
+  CORBA_FixedDef_var (void); // default constructor
+  CORBA_FixedDef_var (CORBA_FixedDef_ptr p) : ptr_ (p) {} 
+  CORBA_FixedDef_var (const CORBA_FixedDef_var &); // copy constructor
+  ~CORBA_FixedDef_var (void); // destructor
+  
+  CORBA_FixedDef_var &operator= (CORBA_FixedDef_ptr);
+  CORBA_FixedDef_var &operator= (const CORBA_FixedDef_var &);
+  CORBA_FixedDef_ptr operator-> (void) const;
+  
+  operator const CORBA_FixedDef_ptr &() const;
+  operator CORBA_FixedDef_ptr &();
+  // in, inout, out, _retn 
+  CORBA_FixedDef_ptr in (void) const;
+  CORBA_FixedDef_ptr &inout (void);
+  CORBA_FixedDef_ptr &out (void);
+  CORBA_FixedDef_ptr _retn (void);
+  CORBA_FixedDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_FixedDef_ptr duplicate (CORBA_FixedDef_ptr);
+  static void release (CORBA_FixedDef_ptr);
+  static CORBA_FixedDef_ptr nil (void);
+  static CORBA_FixedDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
-  private:
-    CORBA_FixedDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    CORBA_FixedDef_var (const TAO_Base_var &rhs);
-    CORBA_FixedDef_var &operator= (const TAO_Base_var &rhs);
-  };
+private:
+  CORBA_FixedDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_FixedDef_var (const TAO_Base_var &rhs);
+  CORBA_FixedDef_var &operator= (const TAO_Base_var &rhs);
+};
 
 
 #endif /* end #if !defined */
@@ -892,57 +488,73 @@ typedef CORBA_FixedDef *CORBA_FixedDef_ptr;
 #if !defined (_CORBA_FIXEDDEF___OUT_CH_)
 #define _CORBA_FIXEDDEF___OUT_CH_
 
-  class TAO_IFR_Client_Export CORBA_FixedDef_out
-  {
-  public:
-    CORBA_FixedDef_out (CORBA_FixedDef_ptr &);
-    CORBA_FixedDef_out (CORBA_FixedDef_var &);
-    CORBA_FixedDef_out (const CORBA_FixedDef_out &);
-    CORBA_FixedDef_out &operator= (const CORBA_FixedDef_out &);
-    CORBA_FixedDef_out &operator= (const CORBA_FixedDef_var &);
-    CORBA_FixedDef_out &operator= (CORBA_FixedDef_ptr);
-    operator CORBA_FixedDef_ptr &();
-    CORBA_FixedDef_ptr &ptr (void);
-    CORBA_FixedDef_ptr operator-> (void);
-    
-  private:
-    CORBA_FixedDef_ptr &ptr_;
-  };
+class TAO_IFR_Client_Export CORBA_FixedDef_out
+{
+public:
+  CORBA_FixedDef_out (CORBA_FixedDef_ptr &);
+  CORBA_FixedDef_out (CORBA_FixedDef_var &);
+  CORBA_FixedDef_out (const CORBA_FixedDef_out &);
+  CORBA_FixedDef_out &operator= (const CORBA_FixedDef_out &);
+  CORBA_FixedDef_out &operator= (const CORBA_FixedDef_var &);
+  CORBA_FixedDef_out &operator= (CORBA_FixedDef_ptr);
+  operator CORBA_FixedDef_ptr &();
+  CORBA_FixedDef_ptr &ptr (void);
+  CORBA_FixedDef_ptr operator-> (void);
+
+private:
+  CORBA_FixedDef_ptr &ptr_;
+};
 
 
 #endif /* end #if !defined */
 
+#if !defined (_CORBA_REPOSITORY___PTR_CH_)
+#define _CORBA_REPOSITORY___PTR_CH_
+
+class CORBA_Repository;
+typedef CORBA_Repository *CORBA_Repository_ptr;
+
+#endif /* end #if !defined */
+
 
 #if !defined (_CORBA_REPOSITORY___VAR_CH_)
 #define _CORBA_REPOSITORY___VAR_CH_
 
-  class TAO_IFR_Client_Export CORBA_Repository_var : public TAO_Base_var
-  {
-  public:
-    CORBA_Repository_var (void); // default constructor
-    CORBA_Repository_var (CORBA_Repository_ptr p) : ptr_ (p) {} 
-    CORBA_Repository_var (const CORBA_Repository_var &); // copy constructor
-    ~CORBA_Repository_var (void); // destructor
-    
-    CORBA_Repository_var &operator= (CORBA_Repository_ptr);
-    CORBA_Repository_var &operator= (const CORBA_Repository_var &);
-    CORBA_Repository_ptr operator-> (void) const;
-    
-    operator const CORBA_Repository_ptr &() const;
-    operator CORBA_Repository_ptr &();
-    // in, inout, out, _retn 
-    CORBA_Repository_ptr in (void) const;
-    CORBA_Repository_ptr &inout (void);
-    CORBA_Repository_ptr &out (void);
-    CORBA_Repository_ptr _retn (void);
-    CORBA_Repository_ptr ptr (void) const;
+class TAO_IFR_Client_Export CORBA_Repository_var : public TAO_Base_var
+{
+public:
+  CORBA_Repository_var (void); // default constructor
+  CORBA_Repository_var (CORBA_Repository_ptr p) : ptr_ (p) {} 
+  CORBA_Repository_var (const CORBA_Repository_var &); // copy constructor
+  ~CORBA_Repository_var (void); // destructor
+  
+  CORBA_Repository_var &operator= (CORBA_Repository_ptr);
+  CORBA_Repository_var &operator= (const CORBA_Repository_var &);
+  CORBA_Repository_ptr operator-> (void) const;
+  
+  operator const CORBA_Repository_ptr &() const;
+  operator CORBA_Repository_ptr &();
+  // in, inout, out, _retn 
+  CORBA_Repository_ptr in (void) const;
+  CORBA_Repository_ptr &inout (void);
+  CORBA_Repository_ptr &out (void);
+  CORBA_Repository_ptr _retn (void);
+  CORBA_Repository_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_Repository_ptr duplicate (CORBA_Repository_ptr);
+  static void release (CORBA_Repository_ptr);
+  static CORBA_Repository_ptr nil (void);
+  static CORBA_Repository_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
-  private:
-    CORBA_Repository_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    CORBA_Repository_var (const TAO_Base_var &rhs);
-    CORBA_Repository_var &operator= (const TAO_Base_var &rhs);
-  };
+private:
+  CORBA_Repository_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_Repository_var (const TAO_Base_var &rhs);
+  CORBA_Repository_var &operator= (const TAO_Base_var &rhs);
+};
 
 
 #endif /* end #if !defined */
@@ -951,22 +563,22 @@ typedef CORBA_FixedDef *CORBA_FixedDef_ptr;
 #if !defined (_CORBA_REPOSITORY___OUT_CH_)
 #define _CORBA_REPOSITORY___OUT_CH_
 
-  class TAO_IFR_Client_Export CORBA_Repository_out
-  {
-  public:
-    CORBA_Repository_out (CORBA_Repository_ptr &);
-    CORBA_Repository_out (CORBA_Repository_var &);
-    CORBA_Repository_out (const CORBA_Repository_out &);
-    CORBA_Repository_out &operator= (const CORBA_Repository_out &);
-    CORBA_Repository_out &operator= (const CORBA_Repository_var &);
-    CORBA_Repository_out &operator= (CORBA_Repository_ptr);
-    operator CORBA_Repository_ptr &();
-    CORBA_Repository_ptr &ptr (void);
-    CORBA_Repository_ptr operator-> (void);
-    
-  private:
-    CORBA_Repository_ptr &ptr_;
-  };
+class TAO_IFR_Client_Export CORBA_Repository_out
+{
+public:
+  CORBA_Repository_out (CORBA_Repository_ptr &);
+  CORBA_Repository_out (CORBA_Repository_var &);
+  CORBA_Repository_out (const CORBA_Repository_out &);
+  CORBA_Repository_out &operator= (const CORBA_Repository_out &);
+  CORBA_Repository_out &operator= (const CORBA_Repository_var &);
+  CORBA_Repository_out &operator= (CORBA_Repository_ptr);
+  operator CORBA_Repository_ptr &();
+  CORBA_Repository_ptr &ptr (void);
+  CORBA_Repository_ptr operator-> (void);
+
+private:
+  CORBA_Repository_ptr &ptr_;
+};
 
 
 #endif /* end #if !defined */
@@ -976,147 +588,147 @@ typedef CORBA_FixedDef *CORBA_FixedDef_ptr;
 #define _CORBA_REPOSITORY_CH_
 
 // Forward Classes Declaration
-  class _TAO_Repository_Proxy_Impl;
-  class _TAO_Repository_Remote_Proxy_Impl;
-  class _TAO_Repository_Proxy_Broker;
-  class _TAO_Repository_Remote_Proxy_Broker;
-  
-  class TAO_IFR_Client_Export CORBA_Repository: public virtual CORBA_Container
-  {
-  public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef CORBA_Repository_ptr _ptr_type;
-    typedef CORBA_Repository_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    // the static operations
-    static CORBA_Repository_ptr _duplicate (CORBA_Repository_ptr obj);
-    static CORBA_Repository_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    static CORBA_Repository_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    static CORBA_Repository_ptr _nil (void)
-      {
-        return (CORBA_Repository_ptr)0;
-      }
+class _TAO_CORBA_Repository_Proxy_Impl;
+class _TAO_CORBA_Repository_Remote_Proxy_Impl;
+class _TAO_CORBA_Repository_Proxy_Broker;
+class _TAO_CORBA_Repository_Remote_Proxy_Broker;
 
-    static void _tao_any_destructor (void*);
+class TAO_IFR_Client_Export CORBA_Repository: public virtual CORBA_Container
+{
+public:
+#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+  typedef CORBA_Repository_ptr _ptr_type;
+  typedef CORBA_Repository_var _var_type;
+#endif /* ! __GNUC__ || g++ >= 2.8 */
 
-    virtual CORBA::Contained_ptr lookup_id (
-        const char * search_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::TypeCode_ptr get_canonical_typecode (
-        CORBA::TypeCode_ptr tc,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::PrimitiveDef_ptr get_primitive (
-        CORBA::PrimitiveKind kind,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::StringDef_ptr create_string (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::WstringDef_ptr create_wstring (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual 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
-      ));
-
-    virtual 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
-      ));
-
-    virtual CORBA::FixedDef_ptr create_fixed (
-        CORBA::UShort digits,
-        CORBA::Short scale,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
-    virtual const char* _interface_repository_id (void) const;
+  // the static operations
+  static CORBA_Repository_ptr _duplicate (CORBA_Repository_ptr obj);
+  static CORBA_Repository_ptr _narrow (
+      CORBA::Object_ptr obj,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  static CORBA_Repository_ptr _unchecked_narrow (
+      CORBA::Object_ptr obj,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  static CORBA_Repository_ptr _nil (void)
+    {
+      return (CORBA_Repository_ptr)0;
+    }
 
-  private:
-    _TAO_Repository_Proxy_Broker *the_TAO_Repository_Proxy_Broker_;
-    
+  static void _tao_any_destructor (void*);
+
+  virtual CORBA_Contained_ptr lookup_id (
+      const char * search_id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  virtual CORBA::TypeCode_ptr get_canonical_typecode (
+      CORBA::TypeCode_ptr tc,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  virtual CORBA::PrimitiveDef_ptr get_primitive (
+      CORBA::PrimitiveKind kind,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  virtual CORBA_StringDef_ptr create_string (
+      CORBA::ULong bound,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  virtual CORBA_WstringDef_ptr create_wstring (
+      CORBA::ULong bound,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  virtual 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
+    ));
+
+  virtual 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
+    ));
+
+  virtual CORBA_FixedDef_ptr create_fixed (
+      CORBA::UShort digits,
+      CORBA::Short scale,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+
+  virtual CORBA::Boolean _is_a (
+      const CORBA::Char *type_id, 
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  virtual void *_tao_QueryInterface (ptr_arith_t type);
+  
+  virtual const char* _interface_repository_id (void) const;
+
+private:
+  _TAO_CORBA_Repository_Proxy_Broker *the_TAO_CORBA_Repository_Proxy_Broker_;
+  
+protected:
+  CORBA_Repository (int collocated = 0);
+  
   protected:
-    CORBA_Repository (int collocated = 0);
+    // This methods travese the inheritance tree and set the
+    // parents piece of the given class in the right mode
+    virtual void CORBA_Repository_setup_collocation (int collocated);
     
-    protected:
-      // This methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode
-      virtual void CORBA_Repository_setup_collocation (int collocated);
-      
-      CORBA_Repository (
-        TAO_Stub *objref, 
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0
-        );
-      
-      friend class _TAO_Repository_Remote_Proxy_Impl;
-      friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-      friend class _TAO_Repository_Direct_Proxy_Impl;
+    CORBA_Repository (
+      TAO_Stub *objref, 
+      CORBA::Boolean _tao_collocated = 0,
+      TAO_Abstract_ServantBase *servant = 0
+      );
     
-    virtual ~CORBA_Repository (void);
-  private:
-    CORBA_Repository (const CORBA_Repository &);
-    void operator= (const CORBA_Repository &);    
+    friend class _TAO_CORBA_Repository_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_Repository_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_Repository_Direct_Proxy_Impl;
+  
+  virtual ~CORBA_Repository (void);
+private:
+  CORBA_Repository (const CORBA_Repository &);
+  void operator= (const CORBA_Repository &);
 };
 
 
@@ -1129,13 +741,13 @@ typedef CORBA_FixedDef *CORBA_FixedDef_ptr;
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_Repository_Proxy_Impl : 
-  public virtual _TAO_Container_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_Repository_Proxy_Impl : 
+  public virtual _TAO_CORBA_Container_Proxy_Impl
 {
 public:
-  virtual ~_TAO_Repository_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_Repository_Proxy_Impl (void) { }
   
-    virtual CORBA::Contained_ptr lookup_id (
+    virtual CORBA_Contained_ptr lookup_id (
       CORBA_Object *_collocated_tao_target_,
       const char * search_id,
       CORBA::Environment &ACE_TRY_ENV
@@ -1162,7 +774,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::StringDef_ptr create_string (
+  virtual CORBA_StringDef_ptr create_string (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
       CORBA::Environment &ACE_TRY_ENV
@@ -1171,7 +783,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::WstringDef_ptr create_wstring (
+  virtual CORBA_WstringDef_ptr create_wstring (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
       CORBA::Environment &ACE_TRY_ENV
@@ -1180,27 +792,27 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::SequenceDef_ptr create_sequence (
+  virtual CORBA_SequenceDef_ptr create_sequence (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
-      CORBA::IDLType_ptr element_type,
+      CORBA_IDLType_ptr element_type,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ArrayDef_ptr create_array (
+  virtual CORBA_ArrayDef_ptr create_array (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong length,
-      CORBA::IDLType_ptr element_type,
+      CORBA_IDLType_ptr element_type,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::FixedDef_ptr create_fixed (
+  virtual CORBA_FixedDef_ptr create_fixed (
       CORBA_Object *_collocated_tao_target_,
       CORBA::UShort digits,
       CORBA::Short scale,
@@ -1211,7 +823,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_Repository_Proxy_Impl (void);
+  _TAO_CORBA_Repository_Proxy_Impl (void);
 
 };
 //
@@ -1223,18 +835,18 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_Repository_Remote_Proxy_Impl : 
-  public virtual _TAO_Repository_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_Repository_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_Repository_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_Container_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_Container_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_Repository_Remote_Proxy_Impl (void);
+  _TAO_CORBA_Repository_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_Repository_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_Repository_Remote_Proxy_Impl (void) { }
   
-    virtual CORBA::Contained_ptr lookup_id (
+    virtual CORBA_Contained_ptr lookup_id (
       CORBA_Object *_collocated_tao_target_,
       const char * search_id,
       CORBA::Environment &ACE_TRY_ENV
@@ -1261,7 +873,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::StringDef_ptr create_string (
+  virtual CORBA_StringDef_ptr create_string (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
       CORBA::Environment &ACE_TRY_ENV
@@ -1270,7 +882,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::WstringDef_ptr create_wstring (
+  virtual CORBA_WstringDef_ptr create_wstring (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
       CORBA::Environment &ACE_TRY_ENV
@@ -1279,27 +891,27 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::SequenceDef_ptr create_sequence (
+  virtual CORBA_SequenceDef_ptr create_sequence (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
-      CORBA::IDLType_ptr element_type,
+      CORBA_IDLType_ptr element_type,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::ArrayDef_ptr create_array (
+  virtual CORBA_ArrayDef_ptr create_array (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong length,
-      CORBA::IDLType_ptr element_type,
+      CORBA_IDLType_ptr element_type,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::FixedDef_ptr create_fixed (
+  virtual CORBA_FixedDef_ptr create_fixed (
       CORBA_Object *_collocated_tao_target_,
       CORBA::UShort digits,
       CORBA::Short scale,
@@ -1327,17 +939,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_Repository_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_Repository_Proxy_Broker
 {
 public:
-  virtual ~_TAO_Repository_Proxy_Broker (void);
-  virtual _TAO_Repository_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_Repository_Proxy_Broker (void);
+  virtual _TAO_CORBA_Repository_Proxy_Impl &select_proxy (
     CORBA_Repository *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_Repository_Proxy_Broker (void);
+  _TAO_CORBA_Repository_Proxy_Broker (void);
   
 };
 
@@ -1350,26 +962,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_Repository_Remote_Proxy_Broker : public virtual _TAO_Repository_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_Repository_Remote_Proxy_Broker : public virtual _TAO_CORBA_Repository_Proxy_Broker
 {
 public: 
-  _TAO_Repository_Remote_Proxy_Broker (void);
+  _TAO_CORBA_Repository_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_Repository_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_Repository_Remote_Proxy_Broker (void);
   
-  virtual _TAO_Repository_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_Repository_Proxy_Impl &select_proxy (
     CORBA_Repository *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_Repository_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_Repository_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_Repository_Remote_Proxy_Broker *the_TAO_Repository_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_Repository_Remote_Proxy_Broker *the_TAO_CORBA_Repository_Remote_Proxy_Broker (void);
 };
 
 
@@ -1381,6 +993,15 @@ public:
 #endif /* end #if !defined */
 
 
+#if !defined (_CORBA_MODULEDEF___PTR_CH_)
+#define _CORBA_MODULEDEF___PTR_CH_
+
+class CORBA_ModuleDef;
+typedef CORBA_ModuleDef *CORBA_ModuleDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_MODULEDEF___VAR_CH_)
 #define _CORBA_MODULEDEF___VAR_CH_
 
@@ -1404,6 +1025,14 @@ public:
   CORBA_ModuleDef_ptr &out (void);
   CORBA_ModuleDef_ptr _retn (void);
   CORBA_ModuleDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_ModuleDef_ptr duplicate (CORBA_ModuleDef_ptr);
+  static void release (CORBA_ModuleDef_ptr);
+  static CORBA_ModuleDef_ptr nil (void);
+  static CORBA_ModuleDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_ModuleDef_ptr ptr_;
@@ -1431,7 +1060,7 @@ public:
   operator CORBA_ModuleDef_ptr &();
   CORBA_ModuleDef_ptr &ptr (void);
   CORBA_ModuleDef_ptr operator-> (void);
-  
+
 private:
   CORBA_ModuleDef_ptr &ptr_;
 };
@@ -1444,10 +1073,10 @@ private:
 #define _CORBA_MODULEDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_ModuleDef_Proxy_Impl;
-class _TAO_ModuleDef_Remote_Proxy_Impl;
-class _TAO_ModuleDef_Proxy_Broker;
-class _TAO_ModuleDef_Remote_Proxy_Broker;
+class _TAO_CORBA_ModuleDef_Proxy_Impl;
+class _TAO_CORBA_ModuleDef_Remote_Proxy_Impl;
+class _TAO_CORBA_ModuleDef_Proxy_Broker;
+class _TAO_CORBA_ModuleDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_ModuleDef: public virtual CORBA_Container, public virtual CORBA_Contained
 {
@@ -1486,7 +1115,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_ModuleDef_Proxy_Broker *the_TAO_ModuleDef_Proxy_Broker_;
+  _TAO_CORBA_ModuleDef_Proxy_Broker *the_TAO_CORBA_ModuleDef_Proxy_Broker_;
   
 protected:
   CORBA_ModuleDef (int collocated = 0);
@@ -1502,14 +1131,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_ModuleDef_Remote_Proxy_Impl;
-    friend class _TAO_ModuleDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ModuleDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_ModuleDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_ModuleDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_ModuleDef (void);
 private:
   CORBA_ModuleDef (const CORBA_ModuleDef &);
-  void operator= (const CORBA_ModuleDef &);  
+  void operator= (const CORBA_ModuleDef &);
 };
 
 
@@ -1522,15 +1151,15 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Impl : 
-  public virtual _TAO_Container_Proxy_Impl, 
-  public virtual _TAO_Contained_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_ModuleDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_Container_Proxy_Impl, 
+  public virtual _TAO_CORBA_Contained_Proxy_Impl
 {
 public:
-  virtual ~_TAO_ModuleDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ModuleDef_Proxy_Impl (void) { }
   
   protected:
-  _TAO_ModuleDef_Proxy_Impl (void);
+  _TAO_CORBA_ModuleDef_Proxy_Impl (void);
 
 };
 //
@@ -1542,17 +1171,17 @@ public:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_ModuleDef_Remote_Proxy_Impl : 
-  public virtual _TAO_ModuleDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_ModuleDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_ModuleDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_Container_Remote_Proxy_Impl, 
-  public virtual _TAO_Contained_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_Container_Remote_Proxy_Impl, 
+  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_ModuleDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_ModuleDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_ModuleDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ModuleDef_Remote_Proxy_Impl (void) { }
   
   };
 
@@ -1572,17 +1201,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_ModuleDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_ModuleDef_Proxy_Broker (void);
-  virtual _TAO_ModuleDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_ModuleDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy (
     CORBA_ModuleDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_ModuleDef_Proxy_Broker (void);
+  _TAO_CORBA_ModuleDef_Proxy_Broker (void);
   
 };
 
@@ -1595,26 +1224,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_ModuleDef_Remote_Proxy_Broker : public virtual _TAO_ModuleDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_ModuleDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_ModuleDef_Proxy_Broker
 {
 public: 
-  _TAO_ModuleDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_ModuleDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_ModuleDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_ModuleDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_ModuleDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy (
     CORBA_ModuleDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_ModuleDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_ModuleDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_ModuleDef_Remote_Proxy_Broker *the_TAO_ModuleDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_ModuleDef_Remote_Proxy_Broker *the_TAO_CORBA_ModuleDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -1691,6 +1320,15 @@ private:
 };
 
 
+#if !defined (_CORBA_CONSTANTDEF___PTR_CH_)
+#define _CORBA_CONSTANTDEF___PTR_CH_
+
+class CORBA_ConstantDef;
+typedef CORBA_ConstantDef *CORBA_ConstantDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_CONSTANTDEF___VAR_CH_)
 #define _CORBA_CONSTANTDEF___VAR_CH_
 
@@ -1714,6 +1352,14 @@ public:
   CORBA_ConstantDef_ptr &out (void);
   CORBA_ConstantDef_ptr _retn (void);
   CORBA_ConstantDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_ConstantDef_ptr duplicate (CORBA_ConstantDef_ptr);
+  static void release (CORBA_ConstantDef_ptr);
+  static CORBA_ConstantDef_ptr nil (void);
+  static CORBA_ConstantDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_ConstantDef_ptr ptr_;
@@ -1741,7 +1387,7 @@ public:
   operator CORBA_ConstantDef_ptr &();
   CORBA_ConstantDef_ptr &ptr (void);
   CORBA_ConstantDef_ptr operator-> (void);
-  
+
 private:
   CORBA_ConstantDef_ptr &ptr_;
 };
@@ -1754,10 +1400,10 @@ private:
 #define _CORBA_CONSTANTDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_ConstantDef_Proxy_Impl;
-class _TAO_ConstantDef_Remote_Proxy_Impl;
-class _TAO_ConstantDef_Proxy_Broker;
-class _TAO_ConstantDef_Remote_Proxy_Broker;
+class _TAO_CORBA_ConstantDef_Proxy_Impl;
+class _TAO_CORBA_ConstantDef_Remote_Proxy_Impl;
+class _TAO_CORBA_ConstantDef_Proxy_Broker;
+class _TAO_CORBA_ConstantDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_ConstantDef: public virtual CORBA_Contained
 {
@@ -1794,7 +1440,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr type_def (
+  virtual CORBA_IDLType_ptr type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1803,7 +1449,7 @@ public:
     ));
 
   virtual void type_def (
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1838,7 +1484,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_ConstantDef_Proxy_Broker *the_TAO_ConstantDef_Proxy_Broker_;
+  _TAO_CORBA_ConstantDef_Proxy_Broker *the_TAO_CORBA_ConstantDef_Proxy_Broker_;
   
 protected:
   CORBA_ConstantDef (int collocated = 0);
@@ -1854,14 +1500,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_ConstantDef_Remote_Proxy_Impl;
-    friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ConstantDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_ConstantDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_ConstantDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_ConstantDef (void);
 private:
   CORBA_ConstantDef (const CORBA_ConstantDef &);
-  void operator= (const CORBA_ConstantDef &);  
+  void operator= (const CORBA_ConstantDef &);
 };
 
 
@@ -1874,11 +1520,11 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Impl : 
-  public virtual _TAO_Contained_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_ConstantDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_Contained_Proxy_Impl
 {
 public:
-  virtual ~_TAO_ConstantDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ConstantDef_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
@@ -1888,7 +1534,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::IDLType_ptr type_def (
+  virtual CORBA_IDLType_ptr type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1898,7 +1544,7 @@ public:
 
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -1923,7 +1569,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_ConstantDef_Proxy_Impl (void);
+  _TAO_CORBA_ConstantDef_Proxy_Impl (void);
 
 };
 //
@@ -1935,16 +1581,16 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_ConstantDef_Remote_Proxy_Impl : 
-  public virtual _TAO_ConstantDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_ConstantDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_ConstantDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_Contained_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_ConstantDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_ConstantDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_ConstantDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ConstantDef_Remote_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
@@ -1954,7 +1600,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr type_def (
+  virtual CORBA_IDLType_ptr type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1964,7 +1610,7 @@ public:
 
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -2006,17 +1652,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_ConstantDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_ConstantDef_Proxy_Broker (void);
-  virtual _TAO_ConstantDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_ConstantDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy (
     CORBA_ConstantDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_ConstantDef_Proxy_Broker (void);
+  _TAO_CORBA_ConstantDef_Proxy_Broker (void);
   
 };
 
@@ -2029,26 +1675,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_ConstantDef_Remote_Proxy_Broker : public virtual _TAO_ConstantDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_ConstantDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_ConstantDef_Proxy_Broker
 {
 public: 
-  _TAO_ConstantDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_ConstantDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_ConstantDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_ConstantDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_ConstantDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy (
     CORBA_ConstantDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_ConstantDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_ConstantDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_ConstantDef_Remote_Proxy_Broker *the_TAO_ConstantDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_ConstantDef_Remote_Proxy_Broker *the_TAO_CORBA_ConstantDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -2127,6 +1773,15 @@ private:
 };
 
 
+#if !defined (_CORBA_STRUCTDEF___PTR_CH_)
+#define _CORBA_STRUCTDEF___PTR_CH_
+
+class CORBA_StructDef;
+typedef CORBA_StructDef *CORBA_StructDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_STRUCTDEF___VAR_CH_)
 #define _CORBA_STRUCTDEF___VAR_CH_
 
@@ -2150,6 +1805,14 @@ public:
   CORBA_StructDef_ptr &out (void);
   CORBA_StructDef_ptr _retn (void);
   CORBA_StructDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_StructDef_ptr duplicate (CORBA_StructDef_ptr);
+  static void release (CORBA_StructDef_ptr);
+  static CORBA_StructDef_ptr nil (void);
+  static CORBA_StructDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_StructDef_ptr ptr_;
@@ -2177,7 +1840,7 @@ public:
   operator CORBA_StructDef_ptr &();
   CORBA_StructDef_ptr &ptr (void);
   CORBA_StructDef_ptr operator-> (void);
-  
+
 private:
   CORBA_StructDef_ptr &ptr_;
 };
@@ -2190,10 +1853,10 @@ private:
 #define _CORBA_STRUCTDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_StructDef_Proxy_Impl;
-class _TAO_StructDef_Remote_Proxy_Impl;
-class _TAO_StructDef_Proxy_Broker;
-class _TAO_StructDef_Remote_Proxy_Broker;
+class _TAO_CORBA_StructDef_Proxy_Impl;
+class _TAO_CORBA_StructDef_Remote_Proxy_Impl;
+class _TAO_CORBA_StructDef_Proxy_Broker;
+class _TAO_CORBA_StructDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_StructDef: public virtual CORBA_TypedefDef, public virtual CORBA_Container
 {
@@ -2222,7 +1885,7 @@ public:
 
   static void _tao_any_destructor (void*);
 
-  virtual CORBA::StructMemberSeq * members (
+  virtual CORBA_StructMemberSeq * members (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2231,7 +1894,7 @@ public:
     ));
 
   virtual void members (
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2249,7 +1912,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_StructDef_Proxy_Broker *the_TAO_StructDef_Proxy_Broker_;
+  _TAO_CORBA_StructDef_Proxy_Broker *the_TAO_CORBA_StructDef_Proxy_Broker_;
   
 protected:
   CORBA_StructDef (int collocated = 0);
@@ -2265,14 +1928,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_StructDef_Remote_Proxy_Impl;
-    friend class _TAO_StructDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_StructDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_StructDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_StructDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_StructDef (void);
 private:
   CORBA_StructDef (const CORBA_StructDef &);
-  void operator= (const CORBA_StructDef &);  
+  void operator= (const CORBA_StructDef &);
 };
 
 
@@ -2285,14 +1948,14 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_StructDef_Proxy_Impl : 
-  public virtual _TAO_TypedefDef_Proxy_Impl, 
-  public virtual _TAO_Container_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_StructDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_TypedefDef_Proxy_Impl, 
+  public virtual _TAO_CORBA_Container_Proxy_Impl
 {
 public:
-  virtual ~_TAO_StructDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_StructDef_Proxy_Impl (void) { }
   
-    virtual CORBA::StructMemberSeq * members (
+    virtual CORBA_StructMemberSeq * members (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -2302,7 +1965,7 @@ public:
 
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -2310,7 +1973,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_StructDef_Proxy_Impl (void);
+  _TAO_CORBA_StructDef_Proxy_Impl (void);
 
 };
 //
@@ -2322,19 +1985,19 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_StructDef_Remote_Proxy_Impl : 
-  public virtual _TAO_StructDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_StructDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_StructDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_TypedefDef_Remote_Proxy_Impl, 
-  public virtual _TAO_Container_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl, 
+  public virtual _TAO_CORBA_Container_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_StructDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_StructDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_StructDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_StructDef_Remote_Proxy_Impl (void) { }
   
-    virtual CORBA::StructMemberSeq * members (
+    virtual CORBA_StructMemberSeq * members (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -2344,7 +2007,7 @@ public:
 
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -2369,17 +2032,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_StructDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_StructDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_StructDef_Proxy_Broker (void);
-  virtual _TAO_StructDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_StructDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_StructDef_Proxy_Impl &select_proxy (
     CORBA_StructDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_StructDef_Proxy_Broker (void);
+  _TAO_CORBA_StructDef_Proxy_Broker (void);
   
 };
 
@@ -2392,26 +2055,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_StructDef_Remote_Proxy_Broker : public virtual _TAO_StructDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_StructDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_StructDef_Proxy_Broker
 {
 public: 
-  _TAO_StructDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_StructDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_StructDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_StructDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_StructDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_StructDef_Proxy_Impl &select_proxy (
     CORBA_StructDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_StructDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_StructDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_StructDef_Remote_Proxy_Broker *the_TAO_StructDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_StructDef_Remote_Proxy_Broker *the_TAO_CORBA_StructDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -2423,6 +2086,15 @@ public:
 #endif /* end #if !defined */
 
 
+#if !defined (_CORBA_UNIONDEF___PTR_CH_)
+#define _CORBA_UNIONDEF___PTR_CH_
+
+class CORBA_UnionDef;
+typedef CORBA_UnionDef *CORBA_UnionDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_UNIONDEF___VAR_CH_)
 #define _CORBA_UNIONDEF___VAR_CH_
 
@@ -2446,6 +2118,14 @@ public:
   CORBA_UnionDef_ptr &out (void);
   CORBA_UnionDef_ptr _retn (void);
   CORBA_UnionDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_UnionDef_ptr duplicate (CORBA_UnionDef_ptr);
+  static void release (CORBA_UnionDef_ptr);
+  static CORBA_UnionDef_ptr nil (void);
+  static CORBA_UnionDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_UnionDef_ptr ptr_;
@@ -2473,7 +2153,7 @@ public:
   operator CORBA_UnionDef_ptr &();
   CORBA_UnionDef_ptr &ptr (void);
   CORBA_UnionDef_ptr operator-> (void);
-  
+
 private:
   CORBA_UnionDef_ptr &ptr_;
 };
@@ -2486,10 +2166,10 @@ private:
 #define _CORBA_UNIONDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_UnionDef_Proxy_Impl;
-class _TAO_UnionDef_Remote_Proxy_Impl;
-class _TAO_UnionDef_Proxy_Broker;
-class _TAO_UnionDef_Remote_Proxy_Broker;
+class _TAO_CORBA_UnionDef_Proxy_Impl;
+class _TAO_CORBA_UnionDef_Remote_Proxy_Impl;
+class _TAO_CORBA_UnionDef_Proxy_Broker;
+class _TAO_CORBA_UnionDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_UnionDef: public virtual CORBA_TypedefDef, public virtual CORBA_Container
 {
@@ -2526,7 +2206,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr discriminator_type_def (
+  virtual CORBA_IDLType_ptr discriminator_type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2535,7 +2215,7 @@ public:
     ));
 
   virtual void discriminator_type_def (
-      CORBA::IDLType_ptr discriminator_type_def,
+      CORBA_IDLType_ptr discriminator_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2543,7 +2223,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::UnionMemberSeq * members (
+  virtual CORBA_UnionMemberSeq * members (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2552,7 +2232,7 @@ public:
     ));
 
   virtual void members (
-      const CORBA::UnionMemberSeq & members,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2570,7 +2250,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_UnionDef_Proxy_Broker *the_TAO_UnionDef_Proxy_Broker_;
+  _TAO_CORBA_UnionDef_Proxy_Broker *the_TAO_CORBA_UnionDef_Proxy_Broker_;
   
 protected:
   CORBA_UnionDef (int collocated = 0);
@@ -2586,14 +2266,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_UnionDef_Remote_Proxy_Impl;
-    friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_UnionDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_UnionDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_UnionDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_UnionDef (void);
 private:
   CORBA_UnionDef (const CORBA_UnionDef &);
-  void operator= (const CORBA_UnionDef &);  
+  void operator= (const CORBA_UnionDef &);
 };
 
 
@@ -2606,12 +2286,12 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_UnionDef_Proxy_Impl : 
-  public virtual _TAO_TypedefDef_Proxy_Impl, 
-  public virtual _TAO_Container_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_UnionDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_TypedefDef_Proxy_Impl, 
+  public virtual _TAO_CORBA_Container_Proxy_Impl
 {
 public:
-  virtual ~_TAO_UnionDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_UnionDef_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr discriminator_type (
       CORBA_Object *_collocated_tao_target_,
@@ -2621,7 +2301,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::IDLType_ptr discriminator_type_def (
+  virtual CORBA_IDLType_ptr discriminator_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -2631,14 +2311,14 @@ public:
 
   virtual void discriminator_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr discriminator_type_def,
+      CORBA_IDLType_ptr discriminator_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::UnionMemberSeq * members (
+  virtual CORBA_UnionMemberSeq * members (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -2648,7 +2328,7 @@ public:
 
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::UnionMemberSeq & members,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -2656,7 +2336,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_UnionDef_Proxy_Impl (void);
+  _TAO_CORBA_UnionDef_Proxy_Impl (void);
 
 };
 //
@@ -2668,17 +2348,17 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_UnionDef_Remote_Proxy_Impl : 
-  public virtual _TAO_UnionDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_UnionDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_UnionDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_TypedefDef_Remote_Proxy_Impl, 
-  public virtual _TAO_Container_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl, 
+  public virtual _TAO_CORBA_Container_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_UnionDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_UnionDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_UnionDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_UnionDef_Remote_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr discriminator_type (
       CORBA_Object *_collocated_tao_target_,
@@ -2688,7 +2368,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr discriminator_type_def (
+  virtual CORBA_IDLType_ptr discriminator_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -2698,14 +2378,14 @@ public:
 
   virtual void discriminator_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr discriminator_type_def,
+      CORBA_IDLType_ptr discriminator_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::UnionMemberSeq * members (
+  virtual CORBA_UnionMemberSeq * members (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -2715,7 +2395,7 @@ public:
 
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::UnionMemberSeq & members,
+      const CORBA_UnionMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -2740,17 +2420,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_UnionDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_UnionDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_UnionDef_Proxy_Broker (void);
-  virtual _TAO_UnionDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_UnionDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_UnionDef_Proxy_Impl &select_proxy (
     CORBA_UnionDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_UnionDef_Proxy_Broker (void);
+  _TAO_CORBA_UnionDef_Proxy_Broker (void);
   
 };
 
@@ -2763,26 +2443,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_UnionDef_Remote_Proxy_Broker : public virtual _TAO_UnionDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_UnionDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_UnionDef_Proxy_Broker
 {
 public: 
-  _TAO_UnionDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_UnionDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_UnionDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_UnionDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_UnionDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_UnionDef_Proxy_Impl &select_proxy (
     CORBA_UnionDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_UnionDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_UnionDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_UnionDef_Remote_Proxy_Broker *the_TAO_UnionDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_UnionDef_Remote_Proxy_Broker *the_TAO_CORBA_UnionDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -2794,6 +2474,15 @@ public:
 #endif /* end #if !defined */
 
 
+#if !defined (_CORBA_ENUMDEF___PTR_CH_)
+#define _CORBA_ENUMDEF___PTR_CH_
+
+class CORBA_EnumDef;
+typedef CORBA_EnumDef *CORBA_EnumDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_ENUMDEF___VAR_CH_)
 #define _CORBA_ENUMDEF___VAR_CH_
 
@@ -2817,6 +2506,14 @@ public:
   CORBA_EnumDef_ptr &out (void);
   CORBA_EnumDef_ptr _retn (void);
   CORBA_EnumDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_EnumDef_ptr duplicate (CORBA_EnumDef_ptr);
+  static void release (CORBA_EnumDef_ptr);
+  static CORBA_EnumDef_ptr nil (void);
+  static CORBA_EnumDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_EnumDef_ptr ptr_;
@@ -2844,7 +2541,7 @@ public:
   operator CORBA_EnumDef_ptr &();
   CORBA_EnumDef_ptr &ptr (void);
   CORBA_EnumDef_ptr operator-> (void);
-  
+
 private:
   CORBA_EnumDef_ptr &ptr_;
 };
@@ -2857,10 +2554,10 @@ private:
 #define _CORBA_ENUMDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_EnumDef_Proxy_Impl;
-class _TAO_EnumDef_Remote_Proxy_Impl;
-class _TAO_EnumDef_Proxy_Broker;
-class _TAO_EnumDef_Remote_Proxy_Broker;
+class _TAO_CORBA_EnumDef_Proxy_Impl;
+class _TAO_CORBA_EnumDef_Remote_Proxy_Impl;
+class _TAO_CORBA_EnumDef_Proxy_Broker;
+class _TAO_CORBA_EnumDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_EnumDef: public virtual CORBA_TypedefDef
 {
@@ -2889,7 +2586,7 @@ public:
 
   static void _tao_any_destructor (void*);
 
-  virtual CORBA::EnumMemberSeq * members (
+  virtual CORBA_EnumMemberSeq * members (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2898,7 +2595,7 @@ public:
     ));
 
   virtual void members (
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2916,7 +2613,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_EnumDef_Proxy_Broker *the_TAO_EnumDef_Proxy_Broker_;
+  _TAO_CORBA_EnumDef_Proxy_Broker *the_TAO_CORBA_EnumDef_Proxy_Broker_;
   
 protected:
   CORBA_EnumDef (int collocated = 0);
@@ -2932,14 +2629,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_EnumDef_Remote_Proxy_Impl;
-    friend class _TAO_EnumDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_EnumDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_EnumDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_EnumDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_EnumDef (void);
 private:
   CORBA_EnumDef (const CORBA_EnumDef &);
-  void operator= (const CORBA_EnumDef &);  
+  void operator= (const CORBA_EnumDef &);
 };
 
 
@@ -2952,13 +2649,13 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_EnumDef_Proxy_Impl : 
-  public virtual _TAO_TypedefDef_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_EnumDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_TypedefDef_Proxy_Impl
 {
 public:
-  virtual ~_TAO_EnumDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_EnumDef_Proxy_Impl (void) { }
   
-    virtual CORBA::EnumMemberSeq * members (
+    virtual CORBA_EnumMemberSeq * members (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -2968,7 +2665,7 @@ public:
 
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -2976,7 +2673,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_EnumDef_Proxy_Impl (void);
+  _TAO_CORBA_EnumDef_Proxy_Impl (void);
 
 };
 //
@@ -2988,18 +2685,18 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_EnumDef_Remote_Proxy_Impl : 
-  public virtual _TAO_EnumDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_EnumDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_EnumDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_TypedefDef_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_EnumDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_EnumDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_EnumDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_EnumDef_Remote_Proxy_Impl (void) { }
   
-    virtual CORBA::EnumMemberSeq * members (
+    virtual CORBA_EnumMemberSeq * members (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -3009,7 +2706,7 @@ public:
 
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::EnumMemberSeq & members,
+      const CORBA_EnumMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -3034,17 +2731,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_EnumDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_EnumDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_EnumDef_Proxy_Broker (void);
-  virtual _TAO_EnumDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_EnumDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_EnumDef_Proxy_Impl &select_proxy (
     CORBA_EnumDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_EnumDef_Proxy_Broker (void);
+  _TAO_CORBA_EnumDef_Proxy_Broker (void);
   
 };
 
@@ -3057,26 +2754,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_EnumDef_Remote_Proxy_Broker : public virtual _TAO_EnumDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_EnumDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_EnumDef_Proxy_Broker
 {
 public: 
-  _TAO_EnumDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_EnumDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_EnumDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_EnumDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_EnumDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_EnumDef_Proxy_Impl &select_proxy (
     CORBA_EnumDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_EnumDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_EnumDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_EnumDef_Remote_Proxy_Broker *the_TAO_EnumDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_EnumDef_Remote_Proxy_Broker *the_TAO_CORBA_EnumDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -3088,6 +2785,15 @@ public:
 #endif /* end #if !defined */
 
 
+#if !defined (_CORBA_ALIASDEF___PTR_CH_)
+#define _CORBA_ALIASDEF___PTR_CH_
+
+class CORBA_AliasDef;
+typedef CORBA_AliasDef *CORBA_AliasDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_ALIASDEF___VAR_CH_)
 #define _CORBA_ALIASDEF___VAR_CH_
 
@@ -3111,6 +2817,14 @@ public:
   CORBA_AliasDef_ptr &out (void);
   CORBA_AliasDef_ptr _retn (void);
   CORBA_AliasDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_AliasDef_ptr duplicate (CORBA_AliasDef_ptr);
+  static void release (CORBA_AliasDef_ptr);
+  static CORBA_AliasDef_ptr nil (void);
+  static CORBA_AliasDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_AliasDef_ptr ptr_;
@@ -3138,7 +2852,7 @@ public:
   operator CORBA_AliasDef_ptr &();
   CORBA_AliasDef_ptr &ptr (void);
   CORBA_AliasDef_ptr operator-> (void);
-  
+
 private:
   CORBA_AliasDef_ptr &ptr_;
 };
@@ -3151,10 +2865,10 @@ private:
 #define _CORBA_ALIASDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_AliasDef_Proxy_Impl;
-class _TAO_AliasDef_Remote_Proxy_Impl;
-class _TAO_AliasDef_Proxy_Broker;
-class _TAO_AliasDef_Remote_Proxy_Broker;
+class _TAO_CORBA_AliasDef_Proxy_Impl;
+class _TAO_CORBA_AliasDef_Remote_Proxy_Impl;
+class _TAO_CORBA_AliasDef_Proxy_Broker;
+class _TAO_CORBA_AliasDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_AliasDef: public virtual CORBA_TypedefDef
 {
@@ -3183,7 +2897,7 @@ public:
 
   static void _tao_any_destructor (void*);
 
-  virtual CORBA::IDLType_ptr original_type_def (
+  virtual CORBA_IDLType_ptr original_type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3192,7 +2906,7 @@ public:
     ));
 
   virtual void original_type_def (
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3210,7 +2924,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_AliasDef_Proxy_Broker *the_TAO_AliasDef_Proxy_Broker_;
+  _TAO_CORBA_AliasDef_Proxy_Broker *the_TAO_CORBA_AliasDef_Proxy_Broker_;
   
 protected:
   CORBA_AliasDef (int collocated = 0);
@@ -3226,14 +2940,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_AliasDef_Remote_Proxy_Impl;
-    friend class _TAO_AliasDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_AliasDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_AliasDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_AliasDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_AliasDef (void);
 private:
   CORBA_AliasDef (const CORBA_AliasDef &);
-  void operator= (const CORBA_AliasDef &);  
+  void operator= (const CORBA_AliasDef &);
 };
 
 
@@ -3246,13 +2960,13 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_AliasDef_Proxy_Impl : 
-  public virtual _TAO_TypedefDef_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_AliasDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_TypedefDef_Proxy_Impl
 {
 public:
-  virtual ~_TAO_AliasDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_AliasDef_Proxy_Impl (void) { }
   
-    virtual CORBA::IDLType_ptr original_type_def (
+    virtual CORBA_IDLType_ptr original_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -3262,7 +2976,7 @@ public:
 
   virtual void original_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -3270,7 +2984,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_AliasDef_Proxy_Impl (void);
+  _TAO_CORBA_AliasDef_Proxy_Impl (void);
 
 };
 //
@@ -3282,18 +2996,18 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_AliasDef_Remote_Proxy_Impl : 
-  public virtual _TAO_AliasDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_AliasDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_AliasDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_TypedefDef_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_AliasDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_AliasDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_AliasDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_AliasDef_Remote_Proxy_Impl (void) { }
   
-    virtual CORBA::IDLType_ptr original_type_def (
+    virtual CORBA_IDLType_ptr original_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -3303,7 +3017,7 @@ public:
 
   virtual void original_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -3328,17 +3042,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_AliasDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_AliasDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_AliasDef_Proxy_Broker (void);
-  virtual _TAO_AliasDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_AliasDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_AliasDef_Proxy_Impl &select_proxy (
     CORBA_AliasDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_AliasDef_Proxy_Broker (void);
+  _TAO_CORBA_AliasDef_Proxy_Broker (void);
   
 };
 
@@ -3351,26 +3065,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_AliasDef_Remote_Proxy_Broker : public virtual _TAO_AliasDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_AliasDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_AliasDef_Proxy_Broker
 {
 public: 
-  _TAO_AliasDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_AliasDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_AliasDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_AliasDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_AliasDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_AliasDef_Proxy_Impl &select_proxy (
     CORBA_AliasDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_AliasDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_AliasDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_AliasDef_Remote_Proxy_Broker *the_TAO_AliasDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_AliasDef_Remote_Proxy_Broker *the_TAO_CORBA_AliasDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -3382,6 +3096,15 @@ public:
 #endif /* end #if !defined */
 
 
+#if !defined (_CORBA_NATIVEDEF___PTR_CH_)
+#define _CORBA_NATIVEDEF___PTR_CH_
+
+class CORBA_NativeDef;
+typedef CORBA_NativeDef *CORBA_NativeDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_NATIVEDEF___VAR_CH_)
 #define _CORBA_NATIVEDEF___VAR_CH_
 
@@ -3405,6 +3128,14 @@ public:
   CORBA_NativeDef_ptr &out (void);
   CORBA_NativeDef_ptr _retn (void);
   CORBA_NativeDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_NativeDef_ptr duplicate (CORBA_NativeDef_ptr);
+  static void release (CORBA_NativeDef_ptr);
+  static CORBA_NativeDef_ptr nil (void);
+  static CORBA_NativeDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_NativeDef_ptr ptr_;
@@ -3432,7 +3163,7 @@ public:
   operator CORBA_NativeDef_ptr &();
   CORBA_NativeDef_ptr &ptr (void);
   CORBA_NativeDef_ptr operator-> (void);
-  
+
 private:
   CORBA_NativeDef_ptr &ptr_;
 };
@@ -3445,10 +3176,10 @@ private:
 #define _CORBA_NATIVEDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_NativeDef_Proxy_Impl;
-class _TAO_NativeDef_Remote_Proxy_Impl;
-class _TAO_NativeDef_Proxy_Broker;
-class _TAO_NativeDef_Remote_Proxy_Broker;
+class _TAO_CORBA_NativeDef_Proxy_Impl;
+class _TAO_CORBA_NativeDef_Remote_Proxy_Impl;
+class _TAO_CORBA_NativeDef_Proxy_Broker;
+class _TAO_CORBA_NativeDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_NativeDef: public virtual CORBA_TypedefDef
 {
@@ -3487,7 +3218,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_NativeDef_Proxy_Broker *the_TAO_NativeDef_Proxy_Broker_;
+  _TAO_CORBA_NativeDef_Proxy_Broker *the_TAO_CORBA_NativeDef_Proxy_Broker_;
   
 protected:
   CORBA_NativeDef (int collocated = 0);
@@ -3503,14 +3234,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_NativeDef_Remote_Proxy_Impl;
-    friend class _TAO_NativeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_NativeDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_NativeDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_NativeDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_NativeDef (void);
 private:
   CORBA_NativeDef (const CORBA_NativeDef &);
-  void operator= (const CORBA_NativeDef &);  
+  void operator= (const CORBA_NativeDef &);
 };
 
 
@@ -3523,14 +3254,14 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Impl : 
-  public virtual _TAO_TypedefDef_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_NativeDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_TypedefDef_Proxy_Impl
 {
 public:
-  virtual ~_TAO_NativeDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_NativeDef_Proxy_Impl (void) { }
   
   protected:
-  _TAO_NativeDef_Proxy_Impl (void);
+  _TAO_CORBA_NativeDef_Proxy_Impl (void);
 
 };
 //
@@ -3542,16 +3273,16 @@ public:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_NativeDef_Remote_Proxy_Impl : 
-  public virtual _TAO_NativeDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_NativeDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_NativeDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_TypedefDef_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_NativeDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_NativeDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_NativeDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_NativeDef_Remote_Proxy_Impl (void) { }
   
   };
 
@@ -3571,17 +3302,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_NativeDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_NativeDef_Proxy_Broker (void);
-  virtual _TAO_NativeDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_NativeDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_NativeDef_Proxy_Impl &select_proxy (
     CORBA_NativeDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_NativeDef_Proxy_Broker (void);
+  _TAO_CORBA_NativeDef_Proxy_Broker (void);
   
 };
 
@@ -3594,26 +3325,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_NativeDef_Remote_Proxy_Broker : public virtual _TAO_NativeDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_NativeDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_NativeDef_Proxy_Broker
 {
 public: 
-  _TAO_NativeDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_NativeDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_NativeDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_NativeDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_NativeDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_NativeDef_Proxy_Impl &select_proxy (
     CORBA_NativeDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_NativeDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_NativeDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_NativeDef_Remote_Proxy_Broker *the_TAO_NativeDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_NativeDef_Remote_Proxy_Broker *the_TAO_CORBA_NativeDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -3625,97 +3356,38 @@ public:
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_PRIMITIVEDEF___VAR_CH_)
-#define _CORBA_PRIMITIVEDEF___VAR_CH_
-
-class TAO_IFR_Client_Export CORBA_PrimitiveDef_var : public TAO_Base_var
-{
-public:
-  CORBA_PrimitiveDef_var (void); // default constructor
-  CORBA_PrimitiveDef_var (CORBA_PrimitiveDef_ptr p) : ptr_ (p) {} 
-  CORBA_PrimitiveDef_var (const CORBA_PrimitiveDef_var &); // copy constructor
-  ~CORBA_PrimitiveDef_var (void); // destructor
-  
-  CORBA_PrimitiveDef_var &operator= (CORBA_PrimitiveDef_ptr);
-  CORBA_PrimitiveDef_var &operator= (const CORBA_PrimitiveDef_var &);
-  CORBA_PrimitiveDef_ptr operator-> (void) const;
-  
-  operator const CORBA_PrimitiveDef_ptr &() const;
-  operator CORBA_PrimitiveDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_PrimitiveDef_ptr in (void) const;
-  CORBA_PrimitiveDef_ptr &inout (void);
-  CORBA_PrimitiveDef_ptr &out (void);
-  CORBA_PrimitiveDef_ptr _retn (void);
-  CORBA_PrimitiveDef_ptr ptr (void) const;
-
-private:
-  CORBA_PrimitiveDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_PrimitiveDef_var (const TAO_Base_var &rhs);
-  CORBA_PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_PRIMITIVEDEF___OUT_CH_)
-#define _CORBA_PRIMITIVEDEF___OUT_CH_
-
-class TAO_IFR_Client_Export CORBA_PrimitiveDef_out
-{
-public:
-  CORBA_PrimitiveDef_out (CORBA_PrimitiveDef_ptr &);
-  CORBA_PrimitiveDef_out (CORBA_PrimitiveDef_var &);
-  CORBA_PrimitiveDef_out (const CORBA_PrimitiveDef_out &);
-  CORBA_PrimitiveDef_out &operator= (const CORBA_PrimitiveDef_out &);
-  CORBA_PrimitiveDef_out &operator= (const CORBA_PrimitiveDef_var &);
-  CORBA_PrimitiveDef_out &operator= (CORBA_PrimitiveDef_ptr);
-  operator CORBA_PrimitiveDef_ptr &();
-  CORBA_PrimitiveDef_ptr &ptr (void);
-  CORBA_PrimitiveDef_ptr operator-> (void);
-  
-private:
-  CORBA_PrimitiveDef_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_CORBA_PRIMITIVEDEF_CH_)
 #define _CORBA_PRIMITIVEDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_PrimitiveDef_Proxy_Impl;
-class _TAO_PrimitiveDef_Remote_Proxy_Impl;
-class _TAO_PrimitiveDef_Proxy_Broker;
-class _TAO_PrimitiveDef_Remote_Proxy_Broker;
+class _TAO_CORBA_PrimitiveDef_Proxy_Impl;
+class _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl;
+class _TAO_CORBA_PrimitiveDef_Proxy_Broker;
+class _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_PrimitiveDef: public virtual CORBA_IDLType
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_PrimitiveDef_ptr _ptr_type;
+  typedef CORBA::PrimitiveDef_ptr _ptr_type;
   typedef CORBA_PrimitiveDef_var _var_type;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
   // the static operations
-  static CORBA_PrimitiveDef_ptr _duplicate (CORBA_PrimitiveDef_ptr obj);
-  static CORBA_PrimitiveDef_ptr _narrow (
+  static CORBA::PrimitiveDef_ptr _duplicate (CORBA::PrimitiveDef_ptr obj);
+  static CORBA::PrimitiveDef_ptr _narrow (
       CORBA::Object_ptr obj,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  static CORBA_PrimitiveDef_ptr _unchecked_narrow (
+  static CORBA::PrimitiveDef_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
-  static CORBA_PrimitiveDef_ptr _nil (void)
+  static CORBA::PrimitiveDef_ptr _nil (void)
     {
-      return (CORBA_PrimitiveDef_ptr)0;
+      return (CORBA::PrimitiveDef_ptr)0;
     }
 
   static void _tao_any_destructor (void*);
@@ -3738,7 +3410,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_PrimitiveDef_Proxy_Broker *the_TAO_PrimitiveDef_Proxy_Broker_;
+  _TAO_CORBA_PrimitiveDef_Proxy_Broker *the_TAO_CORBA_PrimitiveDef_Proxy_Broker_;
   
 protected:
   CORBA_PrimitiveDef (int collocated = 0);
@@ -3754,14 +3426,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_PrimitiveDef_Remote_Proxy_Impl;
-    friend class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_PrimitiveDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_PrimitiveDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_PrimitiveDef (void);
 private:
   CORBA_PrimitiveDef (const CORBA_PrimitiveDef &);
-  void operator= (const CORBA_PrimitiveDef &);  
+  void operator= (const CORBA_PrimitiveDef &);
 };
 
 
@@ -3774,11 +3446,11 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_PrimitiveDef_Proxy_Impl : 
-  public virtual _TAO_IDLType_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_PrimitiveDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_IDLType_Proxy_Impl
 {
 public:
-  virtual ~_TAO_PrimitiveDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_PrimitiveDef_Proxy_Impl (void) { }
   
     virtual CORBA::PrimitiveKind kind (
       CORBA_Object *_collocated_tao_target_,
@@ -3789,7 +3461,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_PrimitiveDef_Proxy_Impl (void);
+  _TAO_CORBA_PrimitiveDef_Proxy_Impl (void);
 
 };
 //
@@ -3801,16 +3473,16 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_PrimitiveDef_Remote_Proxy_Impl : 
-  public virtual _TAO_PrimitiveDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_PrimitiveDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_IDLType_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_PrimitiveDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_PrimitiveDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl (void) { }
   
     virtual CORBA::PrimitiveKind kind (
       CORBA_Object *_collocated_tao_target_,
@@ -3838,17 +3510,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_PrimitiveDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_PrimitiveDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_PrimitiveDef_Proxy_Broker (void);
-  virtual _TAO_PrimitiveDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_PrimitiveDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy (
     CORBA_PrimitiveDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_PrimitiveDef_Proxy_Broker (void);
+  _TAO_CORBA_PrimitiveDef_Proxy_Broker (void);
   
 };
 
@@ -3861,26 +3533,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_PrimitiveDef_Remote_Proxy_Broker : public virtual _TAO_PrimitiveDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_PrimitiveDef_Proxy_Broker
 {
 public: 
-  _TAO_PrimitiveDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_PrimitiveDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_PrimitiveDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy (
     CORBA_PrimitiveDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_PrimitiveDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_PrimitiveDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_PrimitiveDef_Remote_Proxy_Broker *the_TAO_PrimitiveDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker *the_TAO_CORBA_PrimitiveDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -3892,73 +3564,14 @@ public:
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_STRINGDEF___VAR_CH_)
-#define _CORBA_STRINGDEF___VAR_CH_
-
-class TAO_IFR_Client_Export CORBA_StringDef_var : public TAO_Base_var
-{
-public:
-  CORBA_StringDef_var (void); // default constructor
-  CORBA_StringDef_var (CORBA_StringDef_ptr p) : ptr_ (p) {} 
-  CORBA_StringDef_var (const CORBA_StringDef_var &); // copy constructor
-  ~CORBA_StringDef_var (void); // destructor
-  
-  CORBA_StringDef_var &operator= (CORBA_StringDef_ptr);
-  CORBA_StringDef_var &operator= (const CORBA_StringDef_var &);
-  CORBA_StringDef_ptr operator-> (void) const;
-  
-  operator const CORBA_StringDef_ptr &() const;
-  operator CORBA_StringDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_StringDef_ptr in (void) const;
-  CORBA_StringDef_ptr &inout (void);
-  CORBA_StringDef_ptr &out (void);
-  CORBA_StringDef_ptr _retn (void);
-  CORBA_StringDef_ptr ptr (void) const;
-
-private:
-  CORBA_StringDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_StringDef_var (const TAO_Base_var &rhs);
-  CORBA_StringDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRINGDEF___OUT_CH_)
-#define _CORBA_STRINGDEF___OUT_CH_
-
-class TAO_IFR_Client_Export CORBA_StringDef_out
-{
-public:
-  CORBA_StringDef_out (CORBA_StringDef_ptr &);
-  CORBA_StringDef_out (CORBA_StringDef_var &);
-  CORBA_StringDef_out (const CORBA_StringDef_out &);
-  CORBA_StringDef_out &operator= (const CORBA_StringDef_out &);
-  CORBA_StringDef_out &operator= (const CORBA_StringDef_var &);
-  CORBA_StringDef_out &operator= (CORBA_StringDef_ptr);
-  operator CORBA_StringDef_ptr &();
-  CORBA_StringDef_ptr &ptr (void);
-  CORBA_StringDef_ptr operator-> (void);
-  
-private:
-  CORBA_StringDef_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_CORBA_STRINGDEF_CH_)
 #define _CORBA_STRINGDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_StringDef_Proxy_Impl;
-class _TAO_StringDef_Remote_Proxy_Impl;
-class _TAO_StringDef_Proxy_Broker;
-class _TAO_StringDef_Remote_Proxy_Broker;
+class _TAO_CORBA_StringDef_Proxy_Impl;
+class _TAO_CORBA_StringDef_Remote_Proxy_Impl;
+class _TAO_CORBA_StringDef_Proxy_Broker;
+class _TAO_CORBA_StringDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_StringDef: public virtual CORBA_IDLType
 {
@@ -4014,7 +3627,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_StringDef_Proxy_Broker *the_TAO_StringDef_Proxy_Broker_;
+  _TAO_CORBA_StringDef_Proxy_Broker *the_TAO_CORBA_StringDef_Proxy_Broker_;
   
 protected:
   CORBA_StringDef (int collocated = 0);
@@ -4030,14 +3643,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_StringDef_Remote_Proxy_Impl;
-    friend class _TAO_StringDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_StringDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_StringDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_StringDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_StringDef (void);
 private:
   CORBA_StringDef (const CORBA_StringDef &);
-  void operator= (const CORBA_StringDef &);  
+  void operator= (const CORBA_StringDef &);
 };
 
 
@@ -4050,11 +3663,11 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_StringDef_Proxy_Impl : 
-  public virtual _TAO_IDLType_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_StringDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_IDLType_Proxy_Impl
 {
 public:
-  virtual ~_TAO_StringDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_StringDef_Proxy_Impl (void) { }
   
     virtual CORBA::ULong bound (
       CORBA_Object *_collocated_tao_target_,
@@ -4074,7 +3687,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_StringDef_Proxy_Impl (void);
+  _TAO_CORBA_StringDef_Proxy_Impl (void);
 
 };
 //
@@ -4086,16 +3699,16 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_StringDef_Remote_Proxy_Impl : 
-  public virtual _TAO_StringDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_StringDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_StringDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_IDLType_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_StringDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_StringDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_StringDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_StringDef_Remote_Proxy_Impl (void) { }
   
     virtual CORBA::ULong bound (
       CORBA_Object *_collocated_tao_target_,
@@ -4132,17 +3745,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_StringDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_StringDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_StringDef_Proxy_Broker (void);
-  virtual _TAO_StringDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_StringDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_StringDef_Proxy_Impl &select_proxy (
     CORBA_StringDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_StringDef_Proxy_Broker (void);
+  _TAO_CORBA_StringDef_Proxy_Broker (void);
   
 };
 
@@ -4155,26 +3768,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_StringDef_Remote_Proxy_Broker : public virtual _TAO_StringDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_StringDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_StringDef_Proxy_Broker
 {
 public: 
-  _TAO_StringDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_StringDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_StringDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_StringDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_StringDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_StringDef_Proxy_Impl &select_proxy (
     CORBA_StringDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_StringDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_StringDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_StringDef_Remote_Proxy_Broker *the_TAO_StringDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_StringDef_Remote_Proxy_Broker *the_TAO_CORBA_StringDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -4186,73 +3799,14 @@ public:
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_WSTRINGDEF___VAR_CH_)
-#define _CORBA_WSTRINGDEF___VAR_CH_
-
-class TAO_IFR_Client_Export CORBA_WstringDef_var : public TAO_Base_var
-{
-public:
-  CORBA_WstringDef_var (void); // default constructor
-  CORBA_WstringDef_var (CORBA_WstringDef_ptr p) : ptr_ (p) {} 
-  CORBA_WstringDef_var (const CORBA_WstringDef_var &); // copy constructor
-  ~CORBA_WstringDef_var (void); // destructor
-  
-  CORBA_WstringDef_var &operator= (CORBA_WstringDef_ptr);
-  CORBA_WstringDef_var &operator= (const CORBA_WstringDef_var &);
-  CORBA_WstringDef_ptr operator-> (void) const;
-  
-  operator const CORBA_WstringDef_ptr &() const;
-  operator CORBA_WstringDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_WstringDef_ptr in (void) const;
-  CORBA_WstringDef_ptr &inout (void);
-  CORBA_WstringDef_ptr &out (void);
-  CORBA_WstringDef_ptr _retn (void);
-  CORBA_WstringDef_ptr ptr (void) const;
-
-private:
-  CORBA_WstringDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_WstringDef_var (const TAO_Base_var &rhs);
-  CORBA_WstringDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_WSTRINGDEF___OUT_CH_)
-#define _CORBA_WSTRINGDEF___OUT_CH_
-
-class TAO_IFR_Client_Export CORBA_WstringDef_out
-{
-public:
-  CORBA_WstringDef_out (CORBA_WstringDef_ptr &);
-  CORBA_WstringDef_out (CORBA_WstringDef_var &);
-  CORBA_WstringDef_out (const CORBA_WstringDef_out &);
-  CORBA_WstringDef_out &operator= (const CORBA_WstringDef_out &);
-  CORBA_WstringDef_out &operator= (const CORBA_WstringDef_var &);
-  CORBA_WstringDef_out &operator= (CORBA_WstringDef_ptr);
-  operator CORBA_WstringDef_ptr &();
-  CORBA_WstringDef_ptr &ptr (void);
-  CORBA_WstringDef_ptr operator-> (void);
-  
-private:
-  CORBA_WstringDef_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_CORBA_WSTRINGDEF_CH_)
 #define _CORBA_WSTRINGDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_WstringDef_Proxy_Impl;
-class _TAO_WstringDef_Remote_Proxy_Impl;
-class _TAO_WstringDef_Proxy_Broker;
-class _TAO_WstringDef_Remote_Proxy_Broker;
+class _TAO_CORBA_WstringDef_Proxy_Impl;
+class _TAO_CORBA_WstringDef_Remote_Proxy_Impl;
+class _TAO_CORBA_WstringDef_Proxy_Broker;
+class _TAO_CORBA_WstringDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_WstringDef: public virtual CORBA_IDLType
 {
@@ -4308,7 +3862,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_WstringDef_Proxy_Broker *the_TAO_WstringDef_Proxy_Broker_;
+  _TAO_CORBA_WstringDef_Proxy_Broker *the_TAO_CORBA_WstringDef_Proxy_Broker_;
   
 protected:
   CORBA_WstringDef (int collocated = 0);
@@ -4324,14 +3878,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_WstringDef_Remote_Proxy_Impl;
-    friend class _TAO_WstringDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_WstringDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_WstringDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_WstringDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_WstringDef (void);
 private:
   CORBA_WstringDef (const CORBA_WstringDef &);
-  void operator= (const CORBA_WstringDef &);  
+  void operator= (const CORBA_WstringDef &);
 };
 
 
@@ -4344,11 +3898,11 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Impl : 
-  public virtual _TAO_IDLType_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_WstringDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_IDLType_Proxy_Impl
 {
 public:
-  virtual ~_TAO_WstringDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_WstringDef_Proxy_Impl (void) { }
   
     virtual CORBA::ULong bound (
       CORBA_Object *_collocated_tao_target_,
@@ -4368,7 +3922,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_WstringDef_Proxy_Impl (void);
+  _TAO_CORBA_WstringDef_Proxy_Impl (void);
 
 };
 //
@@ -4380,16 +3934,16 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_WstringDef_Remote_Proxy_Impl : 
-  public virtual _TAO_WstringDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_WstringDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_WstringDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_IDLType_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_WstringDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_WstringDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_WstringDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_WstringDef_Remote_Proxy_Impl (void) { }
   
     virtual CORBA::ULong bound (
       CORBA_Object *_collocated_tao_target_,
@@ -4426,17 +3980,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_WstringDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_WstringDef_Proxy_Broker (void);
-  virtual _TAO_WstringDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_WstringDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_WstringDef_Proxy_Impl &select_proxy (
     CORBA_WstringDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_WstringDef_Proxy_Broker (void);
+  _TAO_CORBA_WstringDef_Proxy_Broker (void);
   
 };
 
@@ -4449,26 +4003,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_WstringDef_Remote_Proxy_Broker : public virtual _TAO_WstringDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_WstringDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_WstringDef_Proxy_Broker
 {
 public: 
-  _TAO_WstringDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_WstringDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_WstringDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_WstringDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_WstringDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_WstringDef_Proxy_Impl &select_proxy (
     CORBA_WstringDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_WstringDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_WstringDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_WstringDef_Remote_Proxy_Broker *the_TAO_WstringDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_WstringDef_Remote_Proxy_Broker *the_TAO_CORBA_WstringDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -4480,75 +4034,16 @@ public:
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_SEQUENCEDEF___VAR_CH_)
-#define _CORBA_SEQUENCEDEF___VAR_CH_
-
-class TAO_IFR_Client_Export CORBA_SequenceDef_var : public TAO_Base_var
-{
-public:
-  CORBA_SequenceDef_var (void); // default constructor
-  CORBA_SequenceDef_var (CORBA_SequenceDef_ptr p) : ptr_ (p) {} 
-  CORBA_SequenceDef_var (const CORBA_SequenceDef_var &); // copy constructor
-  ~CORBA_SequenceDef_var (void); // destructor
-  
-  CORBA_SequenceDef_var &operator= (CORBA_SequenceDef_ptr);
-  CORBA_SequenceDef_var &operator= (const CORBA_SequenceDef_var &);
-  CORBA_SequenceDef_ptr operator-> (void) const;
-  
-  operator const CORBA_SequenceDef_ptr &() const;
-  operator CORBA_SequenceDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_SequenceDef_ptr in (void) const;
-  CORBA_SequenceDef_ptr &inout (void);
-  CORBA_SequenceDef_ptr &out (void);
-  CORBA_SequenceDef_ptr _retn (void);
-  CORBA_SequenceDef_ptr ptr (void) const;
-
-private:
-  CORBA_SequenceDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_SequenceDef_var (const TAO_Base_var &rhs);
-  CORBA_SequenceDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SEQUENCEDEF___OUT_CH_)
-#define _CORBA_SEQUENCEDEF___OUT_CH_
-
-class TAO_IFR_Client_Export CORBA_SequenceDef_out
-{
-public:
-  CORBA_SequenceDef_out (CORBA_SequenceDef_ptr &);
-  CORBA_SequenceDef_out (CORBA_SequenceDef_var &);
-  CORBA_SequenceDef_out (const CORBA_SequenceDef_out &);
-  CORBA_SequenceDef_out &operator= (const CORBA_SequenceDef_out &);
-  CORBA_SequenceDef_out &operator= (const CORBA_SequenceDef_var &);
-  CORBA_SequenceDef_out &operator= (CORBA_SequenceDef_ptr);
-  operator CORBA_SequenceDef_ptr &();
-  CORBA_SequenceDef_ptr &ptr (void);
-  CORBA_SequenceDef_ptr operator-> (void);
-  
-private:
-  CORBA_SequenceDef_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_CORBA_SEQUENCEDEF_CH_)
 #define _CORBA_SEQUENCEDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_SequenceDef_Proxy_Impl;
-class _TAO_SequenceDef_Remote_Proxy_Impl;
-class _TAO_SequenceDef_Proxy_Broker;
-class _TAO_SequenceDef_Remote_Proxy_Broker;
+class _TAO_CORBA_SequenceDef_Proxy_Impl;
+class _TAO_CORBA_SequenceDef_Remote_Proxy_Impl;
+class _TAO_CORBA_SequenceDef_Proxy_Broker;
+class _TAO_CORBA_SequenceDef_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export CORBA_SequenceDef: public virtual CORBA_IDLType
+class TAO_IFR_Client_Export CORBA_SequenceDef : public virtual CORBA_IDLType
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -4600,7 +4095,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr element_type_def (
+  virtual CORBA_IDLType_ptr element_type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4609,7 +4104,7 @@ public:
     ));
 
   virtual void element_type_def (
-      CORBA::IDLType_ptr element_type_def,
+      CORBA_IDLType_ptr element_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4627,7 +4122,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_SequenceDef_Proxy_Broker *the_TAO_SequenceDef_Proxy_Broker_;
+  _TAO_CORBA_SequenceDef_Proxy_Broker *the_TAO_CORBA_SequenceDef_Proxy_Broker_;
   
 protected:
   CORBA_SequenceDef (int collocated = 0);
@@ -4643,14 +4138,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_SequenceDef_Remote_Proxy_Impl;
-    friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_SequenceDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_SequenceDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_SequenceDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_SequenceDef (void);
 private:
   CORBA_SequenceDef (const CORBA_SequenceDef &);
-  void operator= (const CORBA_SequenceDef &);  
+  void operator= (const CORBA_SequenceDef &);
 };
 
 
@@ -4663,11 +4158,10 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Impl : 
-  public virtual _TAO_IDLType_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_SequenceDef_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
 {
 public:
-  virtual ~_TAO_SequenceDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_SequenceDef_Proxy_Impl (void) { }
   
     virtual CORBA::ULong bound (
       CORBA_Object *_collocated_tao_target_,
@@ -4694,7 +4188,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::IDLType_ptr element_type_def (
+  virtual CORBA_IDLType_ptr element_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -4704,7 +4198,7 @@ public:
 
   virtual void element_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr element_type_def,
+      CORBA_IDLType_ptr element_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -4712,7 +4206,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_SequenceDef_Proxy_Impl (void);
+  _TAO_CORBA_SequenceDef_Proxy_Impl (void);
 
 };
 //
@@ -4724,16 +4218,14 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_SequenceDef_Remote_Proxy_Impl : 
-  public virtual _TAO_SequenceDef_Proxy_Impl,
-  public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_IDLType_Remote_Proxy_Impl
-  
+class TAO_IFR_Client_Export _TAO_CORBA_SequenceDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_SequenceDef_Proxy_Impl,
+  public virtual TAO_Remote_Object_Proxy_Impl
 {
 public:
-  _TAO_SequenceDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_SequenceDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_SequenceDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_SequenceDef_Remote_Proxy_Impl (void) { }
   
     virtual CORBA::ULong bound (
       CORBA_Object *_collocated_tao_target_,
@@ -4760,7 +4252,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr element_type_def (
+  virtual CORBA_IDLType_ptr element_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -4770,7 +4262,7 @@ public:
 
   virtual void element_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr element_type_def,
+      CORBA_IDLType_ptr element_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -4795,17 +4287,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_SequenceDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_SequenceDef_Proxy_Broker (void);
-  virtual _TAO_SequenceDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_SequenceDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy (
     CORBA_SequenceDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_SequenceDef_Proxy_Broker (void);
+  _TAO_CORBA_SequenceDef_Proxy_Broker (void);
   
 };
 
@@ -4818,26 +4310,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_SequenceDef_Remote_Proxy_Broker : public virtual _TAO_SequenceDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_SequenceDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_SequenceDef_Proxy_Broker
 {
 public: 
-  _TAO_SequenceDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_SequenceDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_SequenceDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_SequenceDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_SequenceDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy (
     CORBA_SequenceDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_SequenceDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_SequenceDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_SequenceDef_Remote_Proxy_Broker *the_TAO_SequenceDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_SequenceDef_Remote_Proxy_Broker *the_TAO_CORBA_SequenceDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -4849,73 +4341,14 @@ public:
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_ARRAYDEF___VAR_CH_)
-#define _CORBA_ARRAYDEF___VAR_CH_
-
-class TAO_IFR_Client_Export CORBA_ArrayDef_var : public TAO_Base_var
-{
-public:
-  CORBA_ArrayDef_var (void); // default constructor
-  CORBA_ArrayDef_var (CORBA_ArrayDef_ptr p) : ptr_ (p) {} 
-  CORBA_ArrayDef_var (const CORBA_ArrayDef_var &); // copy constructor
-  ~CORBA_ArrayDef_var (void); // destructor
-  
-  CORBA_ArrayDef_var &operator= (CORBA_ArrayDef_ptr);
-  CORBA_ArrayDef_var &operator= (const CORBA_ArrayDef_var &);
-  CORBA_ArrayDef_ptr operator-> (void) const;
-  
-  operator const CORBA_ArrayDef_ptr &() const;
-  operator CORBA_ArrayDef_ptr &();
-  // in, inout, out, _retn 
-  CORBA_ArrayDef_ptr in (void) const;
-  CORBA_ArrayDef_ptr &inout (void);
-  CORBA_ArrayDef_ptr &out (void);
-  CORBA_ArrayDef_ptr _retn (void);
-  CORBA_ArrayDef_ptr ptr (void) const;
-
-private:
-  CORBA_ArrayDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_ArrayDef_var (const TAO_Base_var &rhs);
-  CORBA_ArrayDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ARRAYDEF___OUT_CH_)
-#define _CORBA_ARRAYDEF___OUT_CH_
-
-class TAO_IFR_Client_Export CORBA_ArrayDef_out
-{
-public:
-  CORBA_ArrayDef_out (CORBA_ArrayDef_ptr &);
-  CORBA_ArrayDef_out (CORBA_ArrayDef_var &);
-  CORBA_ArrayDef_out (const CORBA_ArrayDef_out &);
-  CORBA_ArrayDef_out &operator= (const CORBA_ArrayDef_out &);
-  CORBA_ArrayDef_out &operator= (const CORBA_ArrayDef_var &);
-  CORBA_ArrayDef_out &operator= (CORBA_ArrayDef_ptr);
-  operator CORBA_ArrayDef_ptr &();
-  CORBA_ArrayDef_ptr &ptr (void);
-  CORBA_ArrayDef_ptr operator-> (void);
-  
-private:
-  CORBA_ArrayDef_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_CORBA_ARRAYDEF_CH_)
 #define _CORBA_ARRAYDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_ArrayDef_Proxy_Impl;
-class _TAO_ArrayDef_Remote_Proxy_Impl;
-class _TAO_ArrayDef_Proxy_Broker;
-class _TAO_ArrayDef_Remote_Proxy_Broker;
+class _TAO_CORBA_ArrayDef_Proxy_Impl;
+class _TAO_CORBA_ArrayDef_Remote_Proxy_Impl;
+class _TAO_CORBA_ArrayDef_Proxy_Broker;
+class _TAO_CORBA_ArrayDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_ArrayDef: public virtual CORBA_IDLType
 {
@@ -4969,7 +4402,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr element_type_def (
+  virtual CORBA_IDLType_ptr element_type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4978,7 +4411,7 @@ public:
     ));
 
   virtual void element_type_def (
-      CORBA::IDLType_ptr element_type_def,
+      CORBA_IDLType_ptr element_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4996,7 +4429,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_ArrayDef_Proxy_Broker *the_TAO_ArrayDef_Proxy_Broker_;
+  _TAO_CORBA_ArrayDef_Proxy_Broker *the_TAO_CORBA_ArrayDef_Proxy_Broker_;
   
 protected:
   CORBA_ArrayDef (int collocated = 0);
@@ -5012,14 +4445,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_ArrayDef_Remote_Proxy_Impl;
-    friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ArrayDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_ArrayDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_ArrayDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_ArrayDef (void);
 private:
   CORBA_ArrayDef (const CORBA_ArrayDef &);
-  void operator= (const CORBA_ArrayDef &);  
+  void operator= (const CORBA_ArrayDef &);
 };
 
 
@@ -5032,11 +4465,11 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Impl : 
-  public virtual _TAO_IDLType_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_ArrayDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_IDLType_Proxy_Impl
 {
 public:
-  virtual ~_TAO_ArrayDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ArrayDef_Proxy_Impl (void) { }
   
     virtual CORBA::ULong length (
       CORBA_Object *_collocated_tao_target_,
@@ -5063,7 +4496,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::IDLType_ptr element_type_def (
+  virtual CORBA_IDLType_ptr element_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -5073,7 +4506,7 @@ public:
 
   virtual void element_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr element_type_def,
+      CORBA_IDLType_ptr element_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -5081,7 +4514,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_ArrayDef_Proxy_Impl (void);
+  _TAO_CORBA_ArrayDef_Proxy_Impl (void);
 
 };
 //
@@ -5093,16 +4526,16 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_ArrayDef_Remote_Proxy_Impl : 
-  public virtual _TAO_ArrayDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_ArrayDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_ArrayDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_IDLType_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_ArrayDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_ArrayDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_ArrayDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ArrayDef_Remote_Proxy_Impl (void) { }
   
     virtual CORBA::ULong length (
       CORBA_Object *_collocated_tao_target_,
@@ -5129,7 +4562,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr element_type_def (
+  virtual CORBA_IDLType_ptr element_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -5139,7 +4572,7 @@ public:
 
   virtual void element_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr element_type_def,
+      CORBA_IDLType_ptr element_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -5164,17 +4597,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_ArrayDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_ArrayDef_Proxy_Broker (void);
-  virtual _TAO_ArrayDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_ArrayDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy (
     CORBA_ArrayDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_ArrayDef_Proxy_Broker (void);
+  _TAO_CORBA_ArrayDef_Proxy_Broker (void);
   
 };
 
@@ -5187,26 +4620,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_ArrayDef_Remote_Proxy_Broker : public virtual _TAO_ArrayDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_ArrayDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_ArrayDef_Proxy_Broker
 {
 public: 
-  _TAO_ArrayDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_ArrayDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_ArrayDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_ArrayDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_ArrayDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy (
     CORBA_ArrayDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_ArrayDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_ArrayDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_ArrayDef_Remote_Proxy_Broker *the_TAO_ArrayDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_ArrayDef_Remote_Proxy_Broker *the_TAO_CORBA_ArrayDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -5218,6 +4651,15 @@ public:
 #endif /* end #if !defined */
 
 
+#if !defined (_CORBA_EXCEPTIONDEF___PTR_CH_)
+#define _CORBA_EXCEPTIONDEF___PTR_CH_
+
+class CORBA_ExceptionDef;
+typedef CORBA_ExceptionDef *CORBA_ExceptionDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_EXCEPTIONDEF___VAR_CH_)
 #define _CORBA_EXCEPTIONDEF___VAR_CH_
 
@@ -5241,6 +4683,14 @@ public:
   CORBA_ExceptionDef_ptr &out (void);
   CORBA_ExceptionDef_ptr _retn (void);
   CORBA_ExceptionDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_ExceptionDef_ptr duplicate (CORBA_ExceptionDef_ptr);
+  static void release (CORBA_ExceptionDef_ptr);
+  static CORBA_ExceptionDef_ptr nil (void);
+  static CORBA_ExceptionDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_ExceptionDef_ptr ptr_;
@@ -5268,7 +4718,7 @@ public:
   operator CORBA_ExceptionDef_ptr &();
   CORBA_ExceptionDef_ptr &ptr (void);
   CORBA_ExceptionDef_ptr operator-> (void);
-  
+
 private:
   CORBA_ExceptionDef_ptr &ptr_;
 };
@@ -5281,10 +4731,10 @@ private:
 #define _CORBA_EXCEPTIONDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_ExceptionDef_Proxy_Impl;
-class _TAO_ExceptionDef_Remote_Proxy_Impl;
-class _TAO_ExceptionDef_Proxy_Broker;
-class _TAO_ExceptionDef_Remote_Proxy_Broker;
+class _TAO_CORBA_ExceptionDef_Proxy_Impl;
+class _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl;
+class _TAO_CORBA_ExceptionDef_Proxy_Broker;
+class _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_ExceptionDef: public virtual CORBA_Contained, public virtual CORBA_Container
 {
@@ -5321,7 +4771,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::StructMemberSeq * members (
+  virtual CORBA_StructMemberSeq * members (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5330,7 +4780,7 @@ public:
     ));
 
   virtual void members (
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5348,7 +4798,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_ExceptionDef_Proxy_Broker *the_TAO_ExceptionDef_Proxy_Broker_;
+  _TAO_CORBA_ExceptionDef_Proxy_Broker *the_TAO_CORBA_ExceptionDef_Proxy_Broker_;
   
 protected:
   CORBA_ExceptionDef (int collocated = 0);
@@ -5364,14 +4814,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_ExceptionDef_Remote_Proxy_Impl;
-    friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ExceptionDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_ExceptionDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_ExceptionDef (void);
 private:
   CORBA_ExceptionDef (const CORBA_ExceptionDef &);
-  void operator= (const CORBA_ExceptionDef &);  
+  void operator= (const CORBA_ExceptionDef &);
 };
 
 
@@ -5384,12 +4834,12 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_ExceptionDef_Proxy_Impl : 
-  public virtual _TAO_Contained_Proxy_Impl, 
-  public virtual _TAO_Container_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_ExceptionDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_Contained_Proxy_Impl, 
+  public virtual _TAO_CORBA_Container_Proxy_Impl
 {
 public:
-  virtual ~_TAO_ExceptionDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ExceptionDef_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
@@ -5399,7 +4849,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::StructMemberSeq * members (
+  virtual CORBA_StructMemberSeq * members (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -5409,7 +4859,7 @@ public:
 
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -5417,7 +4867,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_ExceptionDef_Proxy_Impl (void);
+  _TAO_CORBA_ExceptionDef_Proxy_Impl (void);
 
 };
 //
@@ -5429,17 +4879,17 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_ExceptionDef_Remote_Proxy_Impl : 
-  public virtual _TAO_ExceptionDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_ExceptionDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_Contained_Remote_Proxy_Impl, 
-  public virtual _TAO_Container_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl, 
+  public virtual _TAO_CORBA_Container_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_ExceptionDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_ExceptionDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ExceptionDef_Remote_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
@@ -5449,7 +4899,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::StructMemberSeq * members (
+  virtual CORBA_StructMemberSeq * members (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -5459,7 +4909,7 @@ public:
 
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::StructMemberSeq & members,
+      const CORBA_StructMemberSeq & members,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -5484,17 +4934,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_ExceptionDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_ExceptionDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_ExceptionDef_Proxy_Broker (void);
-  virtual _TAO_ExceptionDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_ExceptionDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy (
     CORBA_ExceptionDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_ExceptionDef_Proxy_Broker (void);
+  _TAO_CORBA_ExceptionDef_Proxy_Broker (void);
   
 };
 
@@ -5507,26 +4957,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_ExceptionDef_Remote_Proxy_Broker : public virtual _TAO_ExceptionDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_ExceptionDef_Proxy_Broker
 {
 public: 
-  _TAO_ExceptionDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_ExceptionDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_ExceptionDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy (
     CORBA_ExceptionDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_ExceptionDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_ExceptionDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_ExceptionDef_Remote_Proxy_Broker *the_TAO_ExceptionDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_ExceptionDef_Remote_Proxy_Broker *the_TAO_CORBA_ExceptionDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -5623,7 +5073,7 @@ private:
     _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &rhs);
     virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (void);
     _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq &rhs);
-    TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var> operator[] (CORBA::ULong index) const;
+    TAO_Object_Manager<CORBA_ExceptionDef,CORBA_ExceptionDef_var> operator[] (CORBA::ULong index) const;
     static CORBA_ExceptionDef **allocbuf (CORBA::ULong nelems);
     static void freebuf (CORBA_ExceptionDef **buffer);
     // The Base_Sequence functions, please see tao/Sequence.h
@@ -5711,7 +5161,7 @@ public:
   operator CORBA_ExceptionDefSeq &() const;
   operator CORBA_ExceptionDefSeq *&(); // variable-size base types only
   
-  TAO_Object_Manager<CORBA::ExceptionDef, CORBA::ExceptionDef_var> operator[] (CORBA::ULong index);
+  TAO_Object_Manager<CORBA_ExceptionDef, CORBA_ExceptionDef_var> operator[] (CORBA::ULong index);
   
   // in, inout, out, _retn 
   const CORBA_ExceptionDefSeq &in (void) const;
@@ -5742,7 +5192,7 @@ public:
   operator CORBA_ExceptionDefSeq *&();
   CORBA_ExceptionDefSeq *&ptr (void);
   CORBA_ExceptionDefSeq *operator-> (void);
-  TAO_Object_Manager<CORBA::ExceptionDef, CORBA::ExceptionDef_var> operator[] (CORBA::ULong index);
+  TAO_Object_Manager<CORBA_ExceptionDef, CORBA_ExceptionDef_var> operator[] (CORBA::ULong index);
   
 private:
   CORBA_ExceptionDefSeq *&ptr_;
@@ -5819,7 +5269,7 @@ public:
   CORBA_ExcDescriptionSeq (
     CORBA::ULong max, 
     CORBA::ULong length, 
-    CORBA::ExceptionDescription *buffer, 
+    CORBA_ExceptionDescription *buffer, 
     CORBA::Boolean release = 0
   );
   CORBA_ExcDescriptionSeq (const CORBA_ExcDescriptionSeq &); // copy ctor
@@ -5860,8 +5310,8 @@ public:
   operator CORBA_ExcDescriptionSeq &() const;
   operator CORBA_ExcDescriptionSeq *&(); // variable-size base types only
   
-  CORBA::ExceptionDescription & operator[] (CORBA::ULong index);
-  const CORBA::ExceptionDescription & operator[] (CORBA::ULong index) const;
+  CORBA_ExceptionDescription & operator[] (CORBA::ULong index);
+  const CORBA_ExceptionDescription & operator[] (CORBA::ULong index) const;
   
   // in, inout, out, _retn 
   const CORBA_ExcDescriptionSeq &in (void) const;
@@ -5892,7 +5342,7 @@ public:
   operator CORBA_ExcDescriptionSeq *&();
   CORBA_ExcDescriptionSeq *&ptr (void);
   CORBA_ExcDescriptionSeq *operator-> (void);
-  CORBA::ExceptionDescription & operator[] (CORBA::ULong index);
+  CORBA_ExceptionDescription & operator[] (CORBA::ULong index);
   
 private:
   CORBA_ExcDescriptionSeq *&ptr_;
@@ -5904,6 +5354,15 @@ private:
 #endif /* end #if !defined */
 
 
+#if !defined (_CORBA_ATTRIBUTEDEF___PTR_CH_)
+#define _CORBA_ATTRIBUTEDEF___PTR_CH_
+
+class CORBA_AttributeDef;
+typedef CORBA_AttributeDef *CORBA_AttributeDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_ATTRIBUTEDEF___VAR_CH_)
 #define _CORBA_ATTRIBUTEDEF___VAR_CH_
 
@@ -5927,6 +5386,14 @@ public:
   CORBA_AttributeDef_ptr &out (void);
   CORBA_AttributeDef_ptr _retn (void);
   CORBA_AttributeDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_AttributeDef_ptr duplicate (CORBA_AttributeDef_ptr);
+  static void release (CORBA_AttributeDef_ptr);
+  static CORBA_AttributeDef_ptr nil (void);
+  static CORBA_AttributeDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_AttributeDef_ptr ptr_;
@@ -5954,7 +5421,7 @@ public:
   operator CORBA_AttributeDef_ptr &();
   CORBA_AttributeDef_ptr &ptr (void);
   CORBA_AttributeDef_ptr operator-> (void);
-  
+
 private:
   CORBA_AttributeDef_ptr &ptr_;
 };
@@ -5967,10 +5434,10 @@ private:
 #define _CORBA_ATTRIBUTEDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_AttributeDef_Proxy_Impl;
-class _TAO_AttributeDef_Remote_Proxy_Impl;
-class _TAO_AttributeDef_Proxy_Broker;
-class _TAO_AttributeDef_Remote_Proxy_Broker;
+class _TAO_CORBA_AttributeDef_Proxy_Impl;
+class _TAO_CORBA_AttributeDef_Remote_Proxy_Impl;
+class _TAO_CORBA_AttributeDef_Proxy_Broker;
+class _TAO_CORBA_AttributeDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_AttributeDef: public virtual CORBA_Contained
 {
@@ -6007,7 +5474,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr type_def (
+  virtual CORBA_IDLType_ptr type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6016,7 +5483,7 @@ public:
     ));
 
   virtual void type_def (
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6051,7 +5518,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_AttributeDef_Proxy_Broker *the_TAO_AttributeDef_Proxy_Broker_;
+  _TAO_CORBA_AttributeDef_Proxy_Broker *the_TAO_CORBA_AttributeDef_Proxy_Broker_;
   
 protected:
   CORBA_AttributeDef (int collocated = 0);
@@ -6067,14 +5534,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_AttributeDef_Remote_Proxy_Impl;
-    friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_AttributeDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_AttributeDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_AttributeDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_AttributeDef (void);
 private:
   CORBA_AttributeDef (const CORBA_AttributeDef &);
-  void operator= (const CORBA_AttributeDef &);  
+  void operator= (const CORBA_AttributeDef &);
 };
 
 
@@ -6087,11 +5554,11 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_AttributeDef_Proxy_Impl : 
-  public virtual _TAO_Contained_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_AttributeDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_Contained_Proxy_Impl
 {
 public:
-  virtual ~_TAO_AttributeDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_AttributeDef_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
@@ -6101,7 +5568,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::IDLType_ptr type_def (
+  virtual CORBA_IDLType_ptr type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -6111,7 +5578,7 @@ public:
 
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -6136,7 +5603,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_AttributeDef_Proxy_Impl (void);
+  _TAO_CORBA_AttributeDef_Proxy_Impl (void);
 
 };
 //
@@ -6148,16 +5615,16 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_AttributeDef_Remote_Proxy_Impl : 
-  public virtual _TAO_AttributeDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_AttributeDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_AttributeDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_Contained_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_AttributeDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_AttributeDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_AttributeDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_AttributeDef_Remote_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
@@ -6167,7 +5634,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr type_def (
+  virtual CORBA_IDLType_ptr type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -6177,7 +5644,7 @@ public:
 
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -6219,17 +5686,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_AttributeDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_AttributeDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_AttributeDef_Proxy_Broker (void);
-  virtual _TAO_AttributeDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_AttributeDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy (
     CORBA_AttributeDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_AttributeDef_Proxy_Broker (void);
+  _TAO_CORBA_AttributeDef_Proxy_Broker (void);
   
 };
 
@@ -6242,26 +5709,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_AttributeDef_Remote_Proxy_Broker : public virtual _TAO_AttributeDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_AttributeDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_AttributeDef_Proxy_Broker
 {
 public: 
-  _TAO_AttributeDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_AttributeDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_AttributeDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_AttributeDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_AttributeDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy (
     CORBA_AttributeDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_AttributeDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_AttributeDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_AttributeDef_Remote_Proxy_Broker *the_TAO_AttributeDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_AttributeDef_Remote_Proxy_Broker *the_TAO_CORBA_AttributeDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -6353,7 +5820,7 @@ struct TAO_IFR_Client_Export CORBA_ParameterDescription
 
   TAO_String_Manager name;
   CORBA::TypeCode_var type;
-  CORBA::IDLType_var type_def;
+  CORBA_IDLType_var type_def;
   CORBA::ParameterMode mode;
 };
 
@@ -6470,7 +5937,7 @@ public:
   CORBA_ParDescriptionSeq (
     CORBA::ULong max, 
     CORBA::ULong length, 
-    CORBA::ParameterDescription *buffer, 
+    CORBA_ParameterDescription *buffer, 
     CORBA::Boolean release = 0
   );
   CORBA_ParDescriptionSeq (const CORBA_ParDescriptionSeq &); // copy ctor
@@ -6511,8 +5978,8 @@ public:
   operator CORBA_ParDescriptionSeq &() const;
   operator CORBA_ParDescriptionSeq *&(); // variable-size base types only
   
-  CORBA::ParameterDescription & operator[] (CORBA::ULong index);
-  const CORBA::ParameterDescription & operator[] (CORBA::ULong index) const;
+  CORBA_ParameterDescription & operator[] (CORBA::ULong index);
+  const CORBA_ParameterDescription & operator[] (CORBA::ULong index) const;
   
   // in, inout, out, _retn 
   const CORBA_ParDescriptionSeq &in (void) const;
@@ -6543,7 +6010,7 @@ public:
   operator CORBA_ParDescriptionSeq *&();
   CORBA_ParDescriptionSeq *&ptr (void);
   CORBA_ParDescriptionSeq *operator-> (void);
-  CORBA::ParameterDescription & operator[] (CORBA::ULong index);
+  CORBA_ParameterDescription & operator[] (CORBA::ULong index);
   
 private:
   CORBA_ParDescriptionSeq *&ptr_;
@@ -6554,9 +6021,6 @@ private:
 
 #endif /* end #if !defined */
 
-typedef char * ContextIdentifier;
-typedef CORBA::String_var ContextIdentifier_var;
-typedef CORBA::String_out ContextIdentifier_out;
 
 #if !defined (_CORBA_CONTEXTIDSEQ_CH_)
 #define _CORBA_CONTEXTIDSEQ_CH_
@@ -6665,6 +6129,15 @@ private:
 #endif /* end #if !defined */
 
 
+#if !defined (_CORBA_OPERATIONDEF___PTR_CH_)
+#define _CORBA_OPERATIONDEF___PTR_CH_
+
+class CORBA_OperationDef;
+typedef CORBA_OperationDef *CORBA_OperationDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_OPERATIONDEF___VAR_CH_)
 #define _CORBA_OPERATIONDEF___VAR_CH_
 
@@ -6688,6 +6161,14 @@ public:
   CORBA_OperationDef_ptr &out (void);
   CORBA_OperationDef_ptr _retn (void);
   CORBA_OperationDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_OperationDef_ptr duplicate (CORBA_OperationDef_ptr);
+  static void release (CORBA_OperationDef_ptr);
+  static CORBA_OperationDef_ptr nil (void);
+  static CORBA_OperationDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_OperationDef_ptr ptr_;
@@ -6715,7 +6196,7 @@ public:
   operator CORBA_OperationDef_ptr &();
   CORBA_OperationDef_ptr &ptr (void);
   CORBA_OperationDef_ptr operator-> (void);
-  
+
 private:
   CORBA_OperationDef_ptr &ptr_;
 };
@@ -6728,10 +6209,10 @@ private:
 #define _CORBA_OPERATIONDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_OperationDef_Proxy_Impl;
-class _TAO_OperationDef_Remote_Proxy_Impl;
-class _TAO_OperationDef_Proxy_Broker;
-class _TAO_OperationDef_Remote_Proxy_Broker;
+class _TAO_CORBA_OperationDef_Proxy_Impl;
+class _TAO_CORBA_OperationDef_Remote_Proxy_Impl;
+class _TAO_CORBA_OperationDef_Proxy_Broker;
+class _TAO_CORBA_OperationDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_OperationDef: public virtual CORBA_Contained
 {
@@ -6768,7 +6249,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr result_def (
+  virtual CORBA_IDLType_ptr result_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6777,7 +6258,7 @@ public:
     ));
 
   virtual void result_def (
-      CORBA::IDLType_ptr result_def,
+      CORBA_IDLType_ptr result_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6785,7 +6266,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ParDescriptionSeq * params (
+  virtual CORBA_ParDescriptionSeq * params (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6794,7 +6275,7 @@ public:
     ));
 
   virtual void params (
-      const CORBA::ParDescriptionSeq & params,
+      const CORBA_ParDescriptionSeq & params,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6819,7 +6300,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ContextIdSeq * contexts (
+  virtual CORBA_ContextIdSeq * contexts (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6828,7 +6309,7 @@ public:
     ));
 
   virtual void contexts (
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6836,7 +6317,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ExceptionDefSeq * exceptions (
+  virtual CORBA_ExceptionDefSeq * exceptions (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6845,7 +6326,7 @@ public:
     ));
 
   virtual void exceptions (
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6863,7 +6344,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_OperationDef_Proxy_Broker *the_TAO_OperationDef_Proxy_Broker_;
+  _TAO_CORBA_OperationDef_Proxy_Broker *the_TAO_CORBA_OperationDef_Proxy_Broker_;
   
 protected:
   CORBA_OperationDef (int collocated = 0);
@@ -6879,14 +6360,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_OperationDef_Remote_Proxy_Impl;
-    friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_OperationDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_OperationDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_OperationDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_OperationDef (void);
 private:
   CORBA_OperationDef (const CORBA_OperationDef &);
-  void operator= (const CORBA_OperationDef &);  
+  void operator= (const CORBA_OperationDef &);
 };
 
 
@@ -6899,11 +6380,11 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_OperationDef_Proxy_Impl : 
-  public virtual _TAO_Contained_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_OperationDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_Contained_Proxy_Impl
 {
 public:
-  virtual ~_TAO_OperationDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_OperationDef_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr result (
       CORBA_Object *_collocated_tao_target_,
@@ -6913,7 +6394,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::IDLType_ptr result_def (
+  virtual CORBA_IDLType_ptr result_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -6923,14 +6404,14 @@ public:
 
   virtual void result_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr result_def,
+      CORBA_IDLType_ptr result_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ParDescriptionSeq * params (
+  virtual CORBA_ParDescriptionSeq * params (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -6940,7 +6421,7 @@ public:
 
   virtual void params (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::ParDescriptionSeq & params,
+      const CORBA_ParDescriptionSeq & params,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -6964,7 +6445,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ContextIdSeq * contexts (
+  virtual CORBA_ContextIdSeq * contexts (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -6974,14 +6455,14 @@ public:
 
   virtual void contexts (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ExceptionDefSeq * exceptions (
+  virtual CORBA_ExceptionDefSeq * exceptions (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -6991,7 +6472,7 @@ public:
 
   virtual void exceptions (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -6999,7 +6480,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_OperationDef_Proxy_Impl (void);
+  _TAO_CORBA_OperationDef_Proxy_Impl (void);
 
 };
 //
@@ -7011,16 +6492,16 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_OperationDef_Remote_Proxy_Impl : 
-  public virtual _TAO_OperationDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_OperationDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_OperationDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_Contained_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_OperationDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_OperationDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_OperationDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_OperationDef_Remote_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr result (
       CORBA_Object *_collocated_tao_target_,
@@ -7030,7 +6511,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr result_def (
+  virtual CORBA_IDLType_ptr result_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -7040,14 +6521,14 @@ public:
 
   virtual void result_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr result_def,
+      CORBA_IDLType_ptr result_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::ParDescriptionSeq * params (
+  virtual CORBA_ParDescriptionSeq * params (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -7057,7 +6538,7 @@ public:
 
   virtual void params (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::ParDescriptionSeq & params,
+      const CORBA_ParDescriptionSeq & params,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -7081,7 +6562,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ContextIdSeq * contexts (
+  virtual CORBA_ContextIdSeq * contexts (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -7091,14 +6572,14 @@ public:
 
   virtual void contexts (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::ExceptionDefSeq * exceptions (
+  virtual CORBA_ExceptionDefSeq * exceptions (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -7108,7 +6589,7 @@ public:
 
   virtual void exceptions (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -7133,17 +6614,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_OperationDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_OperationDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_OperationDef_Proxy_Broker (void);
-  virtual _TAO_OperationDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_OperationDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_OperationDef_Proxy_Impl &select_proxy (
     CORBA_OperationDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_OperationDef_Proxy_Broker (void);
+  _TAO_CORBA_OperationDef_Proxy_Broker (void);
   
 };
 
@@ -7156,26 +6637,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_OperationDef_Remote_Proxy_Broker : public virtual _TAO_OperationDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_OperationDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_OperationDef_Proxy_Broker
 {
 public: 
-  _TAO_OperationDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_OperationDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_OperationDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_OperationDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_OperationDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_OperationDef_Proxy_Impl &select_proxy (
     CORBA_OperationDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_OperationDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_OperationDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_OperationDef_Remote_Proxy_Broker *the_TAO_OperationDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_OperationDef_Remote_Proxy_Broker *the_TAO_CORBA_OperationDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -7204,9 +6685,9 @@ struct TAO_IFR_Client_Export CORBA_OperationDescription
   TAO_String_Manager version;
   CORBA::TypeCode_var result;
   CORBA::OperationMode mode;
-  CORBA::ContextIdSeq contexts;
-  CORBA::ParDescriptionSeq parameters;
-  CORBA::ExcDescriptionSeq exceptions;
+  CORBA_ContextIdSeq contexts;
+  CORBA_ParDescriptionSeq parameters;
+  CORBA_ExcDescriptionSeq exceptions;
 };
 
 class TAO_IFR_Client_Export CORBA_OperationDescription_var
@@ -7429,7 +6910,7 @@ public:
   CORBA_OpDescriptionSeq (
     CORBA::ULong max, 
     CORBA::ULong length, 
-    CORBA::OperationDescription *buffer, 
+    CORBA_OperationDescription *buffer, 
     CORBA::Boolean release = 0
   );
   CORBA_OpDescriptionSeq (const CORBA_OpDescriptionSeq &); // copy ctor
@@ -7470,8 +6951,8 @@ public:
   operator CORBA_OpDescriptionSeq &() const;
   operator CORBA_OpDescriptionSeq *&(); // variable-size base types only
   
-  CORBA::OperationDescription & operator[] (CORBA::ULong index);
-  const CORBA::OperationDescription & operator[] (CORBA::ULong index) const;
+  CORBA_OperationDescription & operator[] (CORBA::ULong index);
+  const CORBA_OperationDescription & operator[] (CORBA::ULong index) const;
   
   // in, inout, out, _retn 
   const CORBA_OpDescriptionSeq &in (void) const;
@@ -7502,7 +6983,7 @@ public:
   operator CORBA_OpDescriptionSeq *&();
   CORBA_OpDescriptionSeq *&ptr (void);
   CORBA_OpDescriptionSeq *operator-> (void);
-  CORBA::OperationDescription & operator[] (CORBA::ULong index);
+  CORBA_OperationDescription & operator[] (CORBA::ULong index);
   
 private:
   CORBA_OpDescriptionSeq *&ptr_;
@@ -7579,7 +7060,7 @@ public:
   CORBA_AttrDescriptionSeq (
     CORBA::ULong max, 
     CORBA::ULong length, 
-    CORBA::AttributeDescription *buffer, 
+    CORBA_AttributeDescription *buffer, 
     CORBA::Boolean release = 0
   );
   CORBA_AttrDescriptionSeq (const CORBA_AttrDescriptionSeq &); // copy ctor
@@ -7620,8 +7101,8 @@ public:
   operator CORBA_AttrDescriptionSeq &() const;
   operator CORBA_AttrDescriptionSeq *&(); // variable-size base types only
   
-  CORBA::AttributeDescription & operator[] (CORBA::ULong index);
-  const CORBA::AttributeDescription & operator[] (CORBA::ULong index) const;
+  CORBA_AttributeDescription & operator[] (CORBA::ULong index);
+  const CORBA_AttributeDescription & operator[] (CORBA::ULong index) const;
   
   // in, inout, out, _retn 
   const CORBA_AttrDescriptionSeq &in (void) const;
@@ -7652,7 +7133,7 @@ public:
   operator CORBA_AttrDescriptionSeq *&();
   CORBA_AttrDescriptionSeq *&ptr (void);
   CORBA_AttrDescriptionSeq *operator-> (void);
-  CORBA::AttributeDescription & operator[] (CORBA::ULong index);
+  CORBA_AttributeDescription & operator[] (CORBA::ULong index);
   
 private:
   CORBA_AttrDescriptionSeq *&ptr_;
@@ -7664,6 +7145,15 @@ private:
 #endif /* end #if !defined */
 
 
+#if !defined (_CORBA_INTERFACEDEF___PTR_CH_)
+#define _CORBA_INTERFACEDEF___PTR_CH_
+
+class CORBA_InterfaceDef;
+typedef CORBA_InterfaceDef *CORBA_InterfaceDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_INTERFACEDEF___VAR_CH_)
 #define _CORBA_INTERFACEDEF___VAR_CH_
 
@@ -7687,6 +7177,14 @@ public:
   CORBA_InterfaceDef_ptr &out (void);
   CORBA_InterfaceDef_ptr _retn (void);
   CORBA_InterfaceDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_InterfaceDef_ptr duplicate (CORBA_InterfaceDef_ptr);
+  static void release (CORBA_InterfaceDef_ptr);
+  static CORBA_InterfaceDef_ptr nil (void);
+  static CORBA_InterfaceDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_InterfaceDef_ptr ptr_;
@@ -7714,7 +7212,7 @@ public:
   operator CORBA_InterfaceDef_ptr &();
   CORBA_InterfaceDef_ptr &ptr (void);
   CORBA_InterfaceDef_ptr operator-> (void);
-  
+
 private:
   CORBA_InterfaceDef_ptr &ptr_;
 };
@@ -7727,10 +7225,10 @@ private:
 #define _CORBA_INTERFACEDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_InterfaceDef_Proxy_Impl;
-class _TAO_InterfaceDef_Remote_Proxy_Impl;
-class _TAO_InterfaceDef_Proxy_Broker;
-class _TAO_InterfaceDef_Remote_Proxy_Broker;
+class _TAO_CORBA_InterfaceDef_Proxy_Impl;
+class _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl;
+class _TAO_CORBA_InterfaceDef_Proxy_Broker;
+class _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_InterfaceDef: public virtual CORBA_Container, public virtual CORBA_Contained, public virtual CORBA_IDLType
 {
@@ -7759,7 +7257,7 @@ public:
 
   static void _tao_any_destructor (void*);
 
-  virtual CORBA::InterfaceDefSeq * base_interfaces (
+  virtual CORBA_InterfaceDefSeq * base_interfaces (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7768,7 +7266,7 @@ public:
     ));
 
   virtual void base_interfaces (
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7801,9 +7299,9 @@ public:
     TAO_String_Manager id;
     TAO_String_Manager defined_in;
     TAO_String_Manager version;
-    CORBA::OpDescriptionSeq operations;
-    CORBA::AttrDescriptionSeq attributes;
-    CORBA::RepositoryIdSeq base_interfaces;
+    CORBA_OpDescriptionSeq operations;
+    CORBA_AttrDescriptionSeq attributes;
+    CORBA_RepositoryIdSeq base_interfaces;
     CORBA::TypeCode_var type;
   };
 
@@ -7856,7 +7354,7 @@ public:
 
   static CORBA::TypeCode_ptr _tc_FullInterfaceDescription;
 
-  virtual CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
+  virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7864,11 +7362,11 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::AttributeDef_ptr create_attribute (
+  virtual CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -7877,15 +7375,15 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::OperationDef_ptr create_operation (
+  virtual CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -7903,7 +7401,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_InterfaceDef_Proxy_Broker *the_TAO_InterfaceDef_Proxy_Broker_;
+  _TAO_CORBA_InterfaceDef_Proxy_Broker *the_TAO_CORBA_InterfaceDef_Proxy_Broker_;
   
 protected:
   CORBA_InterfaceDef (int collocated = 0);
@@ -7919,14 +7417,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-    friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_InterfaceDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_InterfaceDef (void);
 private:
   CORBA_InterfaceDef (const CORBA_InterfaceDef &);
-  void operator= (const CORBA_InterfaceDef &);  
+  void operator= (const CORBA_InterfaceDef &);
 };
 
 
@@ -7939,15 +7437,15 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_InterfaceDef_Proxy_Impl : 
-  public virtual _TAO_Container_Proxy_Impl, 
-  public virtual _TAO_Contained_Proxy_Impl, 
-  public virtual _TAO_IDLType_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_InterfaceDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_Container_Proxy_Impl, 
+  public virtual _TAO_CORBA_Contained_Proxy_Impl, 
+  public virtual _TAO_CORBA_IDLType_Proxy_Impl
 {
 public:
-  virtual ~_TAO_InterfaceDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_InterfaceDef_Proxy_Impl (void) { }
   
-    virtual CORBA::InterfaceDefSeq * base_interfaces (
+    virtual CORBA_InterfaceDefSeq * base_interfaces (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -7957,7 +7455,7 @@ public:
 
   virtual void base_interfaces (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -7973,7 +7471,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
+  virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -7981,12 +7479,12 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::AttributeDef_ptr create_attribute (
+  virtual CORBA_AttributeDef_ptr create_attribute (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -7994,16 +7492,16 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::OperationDef_ptr create_operation (
+  virtual CORBA_OperationDef_ptr create_operation (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -8011,7 +7509,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_InterfaceDef_Proxy_Impl (void);
+  _TAO_CORBA_InterfaceDef_Proxy_Impl (void);
 
 };
 //
@@ -8023,20 +7521,20 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_InterfaceDef_Remote_Proxy_Impl : 
-  public virtual _TAO_InterfaceDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_Container_Remote_Proxy_Impl, 
-  public virtual _TAO_Contained_Remote_Proxy_Impl, 
-  public virtual _TAO_IDLType_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_Container_Remote_Proxy_Impl, 
+  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl, 
+  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_InterfaceDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_InterfaceDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_InterfaceDef_Remote_Proxy_Impl (void) { }
   
-    virtual CORBA::InterfaceDefSeq * base_interfaces (
+    virtual CORBA_InterfaceDefSeq * base_interfaces (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -8046,7 +7544,7 @@ public:
 
   virtual void base_interfaces (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::InterfaceDefSeq & base_interfaces,
+      const CORBA_InterfaceDefSeq & base_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -8062,7 +7560,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
+  virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -8070,12 +7568,12 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::AttributeDef_ptr create_attribute (
+  virtual CORBA_AttributeDef_ptr create_attribute (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -8083,16 +7581,16 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::OperationDef_ptr create_operation (
+  virtual CORBA_OperationDef_ptr create_operation (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -8117,17 +7615,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_InterfaceDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_InterfaceDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_InterfaceDef_Proxy_Broker (void);
-  virtual _TAO_InterfaceDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_InterfaceDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy (
     CORBA_InterfaceDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_InterfaceDef_Proxy_Broker (void);
+  _TAO_CORBA_InterfaceDef_Proxy_Broker (void);
   
 };
 
@@ -8140,26 +7638,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_InterfaceDef_Remote_Proxy_Broker : public virtual _TAO_InterfaceDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_InterfaceDef_Proxy_Broker
 {
 public: 
-  _TAO_InterfaceDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_InterfaceDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_InterfaceDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy (
     CORBA_InterfaceDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_InterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_InterfaceDef_Remote_Proxy_Broker *the_TAO_InterfaceDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_InterfaceDef_Remote_Proxy_Broker *the_TAO_CORBA_InterfaceDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -8186,7 +7684,7 @@ struct TAO_IFR_Client_Export CORBA_InterfaceDescription
   TAO_String_Manager id;
   TAO_String_Manager defined_in;
   TAO_String_Manager version;
-  CORBA::RepositoryIdSeq base_interfaces;
+  CORBA_RepositoryIdSeq base_interfaces;
 };
 
 class TAO_IFR_Client_Export CORBA_InterfaceDescription_var
@@ -8237,6 +7735,15 @@ private:
 };
 
 
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF___PTR_CH_)
+#define _CORBA_ABSTRACTINTERFACEDEF___PTR_CH_
+
+class CORBA_AbstractInterfaceDef;
+typedef CORBA_AbstractInterfaceDef *CORBA_AbstractInterfaceDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF___VAR_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF___VAR_CH_
 
@@ -8260,6 +7767,14 @@ public:
   CORBA_AbstractInterfaceDef_ptr &out (void);
   CORBA_AbstractInterfaceDef_ptr _retn (void);
   CORBA_AbstractInterfaceDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_AbstractInterfaceDef_ptr duplicate (CORBA_AbstractInterfaceDef_ptr);
+  static void release (CORBA_AbstractInterfaceDef_ptr);
+  static CORBA_AbstractInterfaceDef_ptr nil (void);
+  static CORBA_AbstractInterfaceDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_AbstractInterfaceDef_ptr ptr_;
@@ -8287,7 +7802,7 @@ public:
   operator CORBA_AbstractInterfaceDef_ptr &();
   CORBA_AbstractInterfaceDef_ptr &ptr (void);
   CORBA_AbstractInterfaceDef_ptr operator-> (void);
-  
+
 private:
   CORBA_AbstractInterfaceDef_ptr &ptr_;
 };
@@ -8300,10 +7815,10 @@ private:
 #define _CORBA_ABSTRACTINTERFACEDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_AbstractInterfaceDef_Proxy_Impl;
-class _TAO_AbstractInterfaceDef_Remote_Proxy_Impl;
-class _TAO_AbstractInterfaceDef_Proxy_Broker;
-class _TAO_AbstractInterfaceDef_Remote_Proxy_Broker;
+class _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl;
+class _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl;
+class _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker;
+class _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_AbstractInterfaceDef: public virtual CORBA_InterfaceDef
 {
@@ -8342,7 +7857,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_AbstractInterfaceDef_Proxy_Broker *the_TAO_AbstractInterfaceDef_Proxy_Broker_;
+  _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker *the_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_;
   
 protected:
   CORBA_AbstractInterfaceDef (int collocated = 0);
@@ -8358,14 +7873,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_AbstractInterfaceDef_Remote_Proxy_Impl;
-    friend class _TAO_AbstractInterfaceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_AbstractInterfaceDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_AbstractInterfaceDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_AbstractInterfaceDef (void);
 private:
   CORBA_AbstractInterfaceDef (const CORBA_AbstractInterfaceDef &);
-  void operator= (const CORBA_AbstractInterfaceDef &);  
+  void operator= (const CORBA_AbstractInterfaceDef &);
 };
 
 
@@ -8378,14 +7893,14 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_AbstractInterfaceDef_Proxy_Impl : 
-  public virtual _TAO_InterfaceDef_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl
 {
 public:
-  virtual ~_TAO_AbstractInterfaceDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl (void) { }
   
   protected:
-  _TAO_AbstractInterfaceDef_Proxy_Impl (void);
+  _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl (void);
 
 };
 //
@@ -8397,16 +7912,16 @@ public:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_AbstractInterfaceDef_Remote_Proxy_Impl : 
-  public virtual _TAO_AbstractInterfaceDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_InterfaceDef_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_AbstractInterfaceDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_AbstractInterfaceDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl (void) { }
   
   };
 
@@ -8426,17 +7941,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_AbstractInterfaceDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_AbstractInterfaceDef_Proxy_Broker (void);
-  virtual _TAO_AbstractInterfaceDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy (
     CORBA_AbstractInterfaceDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_AbstractInterfaceDef_Proxy_Broker (void);
+  _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker (void);
   
 };
 
@@ -8449,26 +7964,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_AbstractInterfaceDef_Remote_Proxy_Broker : public virtual _TAO_AbstractInterfaceDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Broker
 {
 public: 
-  _TAO_AbstractInterfaceDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_AbstractInterfaceDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_AbstractInterfaceDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy (
     CORBA_AbstractInterfaceDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_AbstractInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_AbstractInterfaceDef_Remote_Proxy_Broker *the_TAO_AbstractInterfaceDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker *the_TAO_CORBA_AbstractInterfaceDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -8480,6 +7995,15 @@ public:
 #endif /* end #if !defined */
 
 
+#if !defined (_CORBA_LOCALINTERFACEDEF___PTR_CH_)
+#define _CORBA_LOCALINTERFACEDEF___PTR_CH_
+
+class CORBA_LocalInterfaceDef;
+typedef CORBA_LocalInterfaceDef *CORBA_LocalInterfaceDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_LOCALINTERFACEDEF___VAR_CH_)
 #define _CORBA_LOCALINTERFACEDEF___VAR_CH_
 
@@ -8503,6 +8027,14 @@ public:
   CORBA_LocalInterfaceDef_ptr &out (void);
   CORBA_LocalInterfaceDef_ptr _retn (void);
   CORBA_LocalInterfaceDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_LocalInterfaceDef_ptr duplicate (CORBA_LocalInterfaceDef_ptr);
+  static void release (CORBA_LocalInterfaceDef_ptr);
+  static CORBA_LocalInterfaceDef_ptr nil (void);
+  static CORBA_LocalInterfaceDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_LocalInterfaceDef_ptr ptr_;
@@ -8530,7 +8062,7 @@ public:
   operator CORBA_LocalInterfaceDef_ptr &();
   CORBA_LocalInterfaceDef_ptr &ptr (void);
   CORBA_LocalInterfaceDef_ptr operator-> (void);
-  
+
 private:
   CORBA_LocalInterfaceDef_ptr &ptr_;
 };
@@ -8543,10 +8075,10 @@ private:
 #define _CORBA_LOCALINTERFACEDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_LocalInterfaceDef_Proxy_Impl;
-class _TAO_LocalInterfaceDef_Remote_Proxy_Impl;
-class _TAO_LocalInterfaceDef_Proxy_Broker;
-class _TAO_LocalInterfaceDef_Remote_Proxy_Broker;
+class _TAO_CORBA_LocalInterfaceDef_Proxy_Impl;
+class _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl;
+class _TAO_CORBA_LocalInterfaceDef_Proxy_Broker;
+class _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_LocalInterfaceDef: public virtual CORBA_InterfaceDef
 {
@@ -8585,7 +8117,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_LocalInterfaceDef_Proxy_Broker *the_TAO_LocalInterfaceDef_Proxy_Broker_;
+  _TAO_CORBA_LocalInterfaceDef_Proxy_Broker *the_TAO_CORBA_LocalInterfaceDef_Proxy_Broker_;
   
 protected:
   CORBA_LocalInterfaceDef (int collocated = 0);
@@ -8601,14 +8133,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_LocalInterfaceDef_Remote_Proxy_Impl;
-    friend class _TAO_LocalInterfaceDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_LocalInterfaceDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_LocalInterfaceDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_LocalInterfaceDef (void);
 private:
   CORBA_LocalInterfaceDef (const CORBA_LocalInterfaceDef &);
-  void operator= (const CORBA_LocalInterfaceDef &);  
+  void operator= (const CORBA_LocalInterfaceDef &);
 };
 
 
@@ -8621,14 +8153,14 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_LocalInterfaceDef_Proxy_Impl : 
-  public virtual _TAO_InterfaceDef_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_LocalInterfaceDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl
 {
 public:
-  virtual ~_TAO_LocalInterfaceDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_LocalInterfaceDef_Proxy_Impl (void) { }
   
   protected:
-  _TAO_LocalInterfaceDef_Proxy_Impl (void);
+  _TAO_CORBA_LocalInterfaceDef_Proxy_Impl (void);
 
 };
 //
@@ -8640,16 +8172,16 @@ public:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_LocalInterfaceDef_Remote_Proxy_Impl : 
-  public virtual _TAO_LocalInterfaceDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_InterfaceDef_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_LocalInterfaceDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_LocalInterfaceDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl (void) { }
   
   };
 
@@ -8669,17 +8201,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_LocalInterfaceDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_LocalInterfaceDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_LocalInterfaceDef_Proxy_Broker (void);
-  virtual _TAO_LocalInterfaceDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_LocalInterfaceDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy (
     CORBA_LocalInterfaceDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_LocalInterfaceDef_Proxy_Broker (void);
+  _TAO_CORBA_LocalInterfaceDef_Proxy_Broker (void);
   
 };
 
@@ -8692,26 +8224,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_LocalInterfaceDef_Remote_Proxy_Broker : public virtual _TAO_LocalInterfaceDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Broker
 {
 public: 
-  _TAO_LocalInterfaceDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_LocalInterfaceDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_LocalInterfaceDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy (
     CORBA_LocalInterfaceDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_LocalInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_LocalInterfaceDef_Remote_Proxy_Broker *the_TAO_LocalInterfaceDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker *the_TAO_CORBA_LocalInterfaceDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -8724,324 +8256,329 @@ public:
 
 // Proxy Broker Factory function pointer declarations.
 
-extern TAO_IFR_Client_Export _TAO_Repository_Proxy_Broker * (*CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_Repository_Proxy_Broker *
+(*_TAO_CORBA_Repository_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Broker * (*CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_ModuleDef_Proxy_Broker *
+(*_TAO_CORBA_ModuleDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Broker * (*CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_ConstantDef_Proxy_Broker *
+(*_TAO_CORBA_ConstantDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_StructDef_Proxy_Broker * (*CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_StructDef_Proxy_Broker *
+(*_TAO_CORBA_StructDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_UnionDef_Proxy_Broker * (*CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_UnionDef_Proxy_Broker *
+(*_TAO_CORBA_UnionDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_EnumDef_Proxy_Broker * (*CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_EnumDef_Proxy_Broker *
+(*_TAO_CORBA_EnumDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_AliasDef_Proxy_Broker * (*CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_AliasDef_Proxy_Broker *
+(*_TAO_CORBA_AliasDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Broker * (*CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_NativeDef_Proxy_Broker *
+(*_TAO_CORBA_NativeDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_PrimitiveDef_Proxy_Broker * (*CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_PrimitiveDef_Proxy_Broker *
+(*_TAO_CORBA_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_StringDef_Proxy_Broker * (*CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_StringDef_Proxy_Broker *
+(*_TAO_CORBA_StringDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Broker * (*CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_WstringDef_Proxy_Broker *
+(*_TAO_CORBA_WstringDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Broker * (*CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_SequenceDef_Proxy_Broker *
+(*_TAO_CORBA_SequenceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Broker * (*CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_ArrayDef_Proxy_Broker *
+(*_TAO_CORBA_ArrayDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_ExceptionDef_Proxy_Broker * (*CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_ExceptionDef_Proxy_Broker *
+(*_TAO_CORBA_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_AttributeDef_Proxy_Broker * (*CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_AttributeDef_Proxy_Broker *
+(*_TAO_CORBA_AttributeDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_OperationDef_Proxy_Broker * (*CORBA__TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_OperationDef_Proxy_Broker *
+(*_TAO_CORBA_OperationDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_InterfaceDef_Proxy_Broker * (*CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_InterfaceDef_Proxy_Broker *
+(*_TAO_CORBA_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_AbstractInterfaceDef_Proxy_Broker * (*CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker *
+(*_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_LocalInterfaceDef_Proxy_Broker * (*CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_LocalInterfaceDef_Proxy_Broker *
+(*_TAO_CORBA_LocalInterfaceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-// ********************************************************
-// Any operators for classes moved from IFR_BaseC.h
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InterfaceDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InterfaceDefSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::AbstractInterfaceDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AbstractInterfaceDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AbstractInterfaceDefSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::LocalInterfaceDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LocalInterfaceDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LocalInterfaceDefSeq *&);
-
-// ********************************************************
+// External declarations for undefined interface
+// CORBA_FixedDef
+extern TAO_IFR_Client_Export
+CORBA_FixedDef_ptr
+tao_CORBA_FixedDef_duplicate (
+    CORBA_FixedDef_ptr
+  );
+extern TAO_IFR_Client_Export
+void
+tao_CORBA_FixedDef_release (
+    CORBA_FixedDef_ptr
+  );
+extern TAO_IFR_Client_Export
+CORBA_FixedDef_ptr
+tao_CORBA_FixedDef_nil (
+    void
+  );
+extern TAO_IFR_Client_Export
+CORBA_FixedDef_ptr
+tao_CORBA_FixedDef_narrow (
+    CORBA::Object *,
+    CORBA::Environment &
+  );
+extern TAO_IFR_Client_Export
+CORBA::Object *
+tao_CORBA_FixedDef_upcast (
+    void *
+  );
 
+// Any operators for interface CORBA_FixedDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_FixedDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_FixedDef *&);
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveKind);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PrimitiveKind &);
-// Any operators for interface CORBA::Repository
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Repository_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Repository *&);
-// Any operators for interface CORBA::ModuleDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ModuleDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ModuleDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ModuleDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ModuleDescription *&);
-// Any operators for interface CORBA::ConstantDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstantDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ConstantDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstantDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ConstantDescription *&);
-// Any operators for interface CORBA::StructDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StructDef *&);
-// Any operators for interface CORBA::UnionDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UnionDef *&);
-// Any operators for interface CORBA::EnumDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::EnumDef *&);
-// Any operators for interface CORBA::AliasDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AliasDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AliasDef *&);
-// Any operators for interface CORBA::NativeDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::NativeDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::NativeDef *&);
-// Any operators for interface CORBA::PrimitiveDef
+// Any operators for interface CORBA_Repository
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Repository_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Repository *&);
+// Any operators for interface CORBA_ModuleDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ModuleDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ModuleDef *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ModuleDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ModuleDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ModuleDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ModuleDescription *&);
+// Any operators for interface CORBA_ConstantDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ConstantDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ConstantDef *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ConstantDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ConstantDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ConstantDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ConstantDescription *&);
+// Any operators for interface CORBA_StructDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_StructDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StructDef *&);
+// Any operators for interface CORBA_UnionDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_UnionDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_UnionDef *&);
+// Any operators for interface CORBA_EnumDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_EnumDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_EnumDef *&);
+// Any operators for interface CORBA_AliasDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AliasDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AliasDef *&);
+// Any operators for interface CORBA_NativeDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_NativeDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_NativeDef *&);
+// Any operators for interface CORBA_PrimitiveDef
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PrimitiveDef *&);
-// Any operators for interface CORBA::StringDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StringDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringDef *&);
-// Any operators for interface CORBA::WstringDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::WstringDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WstringDef *&);
-// Any operators for interface CORBA::SequenceDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::SequenceDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::SequenceDef *&);
-// Any operators for interface CORBA::ArrayDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ArrayDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ArrayDef *&);
-// Any operators for interface CORBA::ExceptionDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExceptionDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExceptionDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExceptionDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExceptionDescription *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExceptionDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExceptionDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExceptionDefSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExcDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExcDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExcDescriptionSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExcDescriptionSeq *&);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_PrimitiveDef *&);
+// Any operators for interface CORBA_StringDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_StringDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_StringDef *&);
+// Any operators for interface CORBA_WstringDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_WstringDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_WstringDef *&);
+// Any operators for interface CORBA_SequenceDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_SequenceDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_SequenceDef *&);
+// Any operators for interface CORBA_ArrayDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ArrayDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ArrayDef *&);
+// Any operators for interface CORBA_ExceptionDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ExceptionDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ExceptionDef *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ExceptionDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ExceptionDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ExceptionDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ExceptionDescription *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ExceptionDefSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ExceptionDefSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ExceptionDefSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ExceptionDefSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ExcDescriptionSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ExcDescriptionSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ExcDescriptionSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ExcDescriptionSeq *&);
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeMode);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AttributeMode &);
-// Any operators for interface CORBA::AttributeDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AttributeDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::AttributeDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AttributeDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AttributeDescription *&);
+// Any operators for interface CORBA_AttributeDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AttributeDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AttributeDef *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_AttributeDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AttributeDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AttributeDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_AttributeDescription *&);
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationMode);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OperationMode &);
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ParameterMode);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ParameterMode &);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ParameterDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ParameterDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ParameterDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ParameterDescription *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ParDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ParDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ParDescriptionSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ParDescriptionSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ContextIdSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ContextIdSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ContextIdSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ContextIdSeq *&);
-// Any operators for interface CORBA::OperationDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OperationDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::OperationDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OperationDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OperationDescription *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::RepositoryIdSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::RepositoryIdSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::RepositoryIdSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::RepositoryIdSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::OpDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OpDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OpDescriptionSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OpDescriptionSeq *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::AttrDescriptionSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttrDescriptionSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AttrDescriptionSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AttrDescriptionSeq *&);
-// Any operators for interface CORBA::InterfaceDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InterfaceDef::FullInterfaceDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef::FullInterfaceDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceDef::FullInterfaceDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InterfaceDef::FullInterfaceDescription *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InterfaceDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InterfaceDescription *&);
-// Any operators for interface CORBA::AbstractInterfaceDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AbstractInterfaceDef *&);
-// Any operators for interface CORBA::LocalInterfaceDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LocalInterfaceDef *&);
-
-// **************************************************************
-// CDR operators for classes moved from IFR_BaseC.h
-
-#if !defined _TAO_CDR_OP_CORBA_InterfaceDefSeq_H_
-#define _TAO_CDR_OP_CORBA_InterfaceDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::InterfaceDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::InterfaceDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_InterfaceDefSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_H_
-#define _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::AbstractInterfaceDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::AbstractInterfaceDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_AbstractInterfaceDefSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_H_
-#define _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::LocalInterfaceDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::LocalInterfaceDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_LocalInterfaceDefSeq_H_ */
-
-// **********************************************************
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ParameterDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ParameterDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ParameterDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ParameterDescription *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ParDescriptionSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ParDescriptionSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ParDescriptionSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ParDescriptionSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ContextIdSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ContextIdSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ContextIdSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ContextIdSeq *&);
+// Any operators for interface CORBA_OperationDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_OperationDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_OperationDef *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_OperationDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_OperationDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_OperationDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_OperationDescription *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_RepositoryIdSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_RepositoryIdSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_RepositoryIdSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_RepositoryIdSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_OpDescriptionSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_OpDescriptionSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_OpDescriptionSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_OpDescriptionSeq *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_AttrDescriptionSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AttrDescriptionSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AttrDescriptionSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_AttrDescriptionSeq *&);
+// Any operators for interface CORBA_InterfaceDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDef *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_InterfaceDef::FullInterfaceDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDef::FullInterfaceDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDef::FullInterfaceDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_InterfaceDef::FullInterfaceDescription *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_InterfaceDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_InterfaceDescription *&);
+// Any operators for interface CORBA_AbstractInterfaceDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AbstractInterfaceDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AbstractInterfaceDef *&);
+// Any operators for interface CORBA_LocalInterfaceDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_LocalInterfaceDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_LocalInterfaceDef *&);
 
 #ifndef __ACE_INLINE__
 
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_FixedDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_FixedDef_ptr &);
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PrimitiveKind &); // 
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PrimitiveKind &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Repository_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Repository_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ModuleDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ModuleDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ModuleDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ModuleDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ConstantDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ConstantDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ConstantDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ConstantDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::StructDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::StructDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::UnionDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::UnionDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::EnumDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::EnumDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AliasDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AliasDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::NativeDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::NativeDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Repository_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Repository_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ModuleDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ModuleDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ModuleDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ModuleDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ConstantDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ConstantDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ConstantDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ConstantDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_StructDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_StructDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_UnionDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_UnionDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_EnumDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_EnumDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AliasDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AliasDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_NativeDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_NativeDef_ptr &);
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PrimitiveDef_ptr );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PrimitiveDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::StringDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::StringDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::WstringDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WstringDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::SequenceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SequenceDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ArrayDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ArrayDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExceptionDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExceptionDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ExceptionDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExceptionDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_StringDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_StringDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_WstringDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_WstringDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_SequenceDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_SequenceDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ArrayDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ArrayDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ExceptionDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ExceptionDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ExceptionDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ExceptionDescription &);
 
 #if !defined _TAO_CDR_OP_CORBA_ExceptionDefSeq_H_
 #define _TAO_CDR_OP_CORBA_ExceptionDefSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::ExceptionDefSeq &
+    const CORBA_ExceptionDefSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::ExceptionDefSeq &
+    CORBA_ExceptionDefSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_ExceptionDefSeq_H_ */
@@ -9052,38 +8589,38 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::ExcDescriptionSeq &
+    const CORBA_ExcDescriptionSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::ExcDescriptionSeq &
+    CORBA_ExcDescriptionSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_ExcDescriptionSeq_H_ */
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AttributeMode &); // 
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AttributeMode &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AttributeDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AttributeDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AttributeDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AttributeDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AttributeDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AttributeDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AttributeDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AttributeDescription &);
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::OperationMode &); // 
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::OperationMode &);
 TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ParameterMode &); // 
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ParameterMode &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ParameterDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ParameterDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ParameterDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ParameterDescription &);
 
 #if !defined _TAO_CDR_OP_CORBA_ParDescriptionSeq_H_
 #define _TAO_CDR_OP_CORBA_ParDescriptionSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::ParDescriptionSeq &
+    const CORBA_ParDescriptionSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::ParDescriptionSeq &
+    CORBA_ParDescriptionSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_ParDescriptionSeq_H_ */
@@ -9094,30 +8631,30 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::ContextIdSeq &
+    const CORBA_ContextIdSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::ContextIdSeq &
+    CORBA_ContextIdSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_ContextIdSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::OperationDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::OperationDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::OperationDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::OperationDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_OperationDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_OperationDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_OperationDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_OperationDescription &);
 
 #if !defined _TAO_CDR_OP_CORBA_RepositoryIdSeq_H_
 #define _TAO_CDR_OP_CORBA_RepositoryIdSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::RepositoryIdSeq &
+    const CORBA_RepositoryIdSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::RepositoryIdSeq &
+    CORBA_RepositoryIdSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_RepositoryIdSeq_H_ */
@@ -9128,11 +8665,11 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::OpDescriptionSeq &
+    const CORBA_OpDescriptionSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::OpDescriptionSeq &
+    CORBA_OpDescriptionSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_OpDescriptionSeq_H_ */
@@ -9143,25 +8680,25 @@ TAO_IFR_Client_Export CORBA::Boolean operator>> (
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::AttrDescriptionSeq &
+    const CORBA_AttrDescriptionSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::AttrDescriptionSeq &
+    CORBA_AttrDescriptionSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_AttrDescriptionSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InterfaceDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InterfaceDef::FullInterfaceDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InterfaceDef::FullInterfaceDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InterfaceDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InterfaceDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AbstractInterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AbstractInterfaceDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::LocalInterfaceDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::LocalInterfaceDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_InterfaceDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_InterfaceDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_InterfaceDef::FullInterfaceDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_InterfaceDef::FullInterfaceDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_InterfaceDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_InterfaceDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AbstractInterfaceDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AbstractInterfaceDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_LocalInterfaceDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_LocalInterfaceDef_ptr &);
 
 #endif /* __ACE_INLINE__ */
 
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.i b/TAO/tao/IFR_Client/IFR_BasicC.i
index d51384effc6..60b041da43c 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.i
+++ b/TAO/tao/IFR_Client/IFR_BasicC.i
@@ -20,2055 +20,52 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// *******************************************************************
-// Sequence classes forward moved fron IFR_BaseC.i
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CI_
-
-  ACE_INLINE CORBA::InterfaceDef **
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (CORBA::ULong nelems)
-  {
-    CORBA::InterfaceDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, CORBA::InterfaceDef*[nelems], 0);
-    
-    for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = CORBA::InterfaceDef::_nil ();
-    
-    return buf;
-  }
-  
-  ACE_INLINE void 
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (CORBA::InterfaceDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::InterfaceDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
-    {
-      CORBA::InterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (this->maximum_);
-      CORBA::InterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA::InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = CORBA::InterfaceDef::_duplicate (tmp2[i]);
-      
-      this->buffer_ = tmp1;
-    }
-    else
-    {
-      this->buffer_ = 0;
-    }
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      CORBA::InterfaceDef **tmp = ACE_reinterpret_cast (CORBA::InterfaceDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA::InterfaceDef::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::InterfaceDef **tmp1 = ACE_reinterpret_cast (CORBA::InterfaceDef **, this->buffer_);
-    CORBA::InterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA::InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA::InterfaceDef::_duplicate (tmp2[i]);
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    CORBA::InterfaceDef ** const tmp = ACE_reinterpret_cast (CORBA::InterfaceDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var> (tmp + index, this->release_);
-  }
-  
-  ACE_INLINE CORBA::InterfaceDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::InterfaceDef **result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::InterfaceDef**, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::InterfaceDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::InterfaceDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_InterfaceDefSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::InterfaceDef ** ACE_CAST_CONST, this->buffer_);
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_INTERFACEDEFSEQ_CI_)
-#define _CORBA_INTERFACEDEFSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_InterfaceDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_InterfaceDefSeq_var::CORBA_InterfaceDefSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_InterfaceDefSeq_var::CORBA_InterfaceDefSeq_var (CORBA_InterfaceDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_InterfaceDefSeq_var::CORBA_InterfaceDefSeq_var (const ::CORBA_InterfaceDefSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA_InterfaceDefSeq (*p.ptr_));
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_InterfaceDefSeq_var::~CORBA_InterfaceDefSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_InterfaceDefSeq_var &
-CORBA_InterfaceDefSeq_var::operator= (CORBA_InterfaceDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE ::CORBA_InterfaceDefSeq_var &
-CORBA_InterfaceDefSeq_var::operator= (const ::CORBA_InterfaceDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          CORBA_InterfaceDefSeq *deep_copy =
-            new CORBA_InterfaceDefSeq (*p.ptr_);
-          
-          if (deep_copy != 0)
-            {
-              CORBA_InterfaceDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA_InterfaceDefSeq *
-CORBA_InterfaceDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_InterfaceDefSeq *
-CORBA_InterfaceDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_InterfaceDefSeq_var::operator const ::CORBA_InterfaceDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_InterfaceDefSeq_var::operator ::CORBA_InterfaceDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_InterfaceDefSeq_var::operator ::CORBA_InterfaceDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// variable-size types only
-ACE_INLINE
-CORBA_InterfaceDefSeq_var::operator ::CORBA_InterfaceDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::InterfaceDef, CORBA::InterfaceDef_var>
-CORBA_InterfaceDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const ::CORBA_InterfaceDefSeq &
-CORBA_InterfaceDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA_InterfaceDefSeq &
-CORBA_InterfaceDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE ::CORBA_InterfaceDefSeq *&
-CORBA_InterfaceDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_InterfaceDefSeq *
-CORBA_InterfaceDefSeq_var::_retn (void)
-{
-  ::CORBA_InterfaceDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA_InterfaceDefSeq *
-CORBA_InterfaceDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_InterfaceDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_InterfaceDefSeq_out::CORBA_InterfaceDefSeq_out (CORBA_InterfaceDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_InterfaceDefSeq_out::CORBA_InterfaceDefSeq_out (CORBA_InterfaceDefSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_InterfaceDefSeq_out::CORBA_InterfaceDefSeq_out (const ::CORBA_InterfaceDefSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_InterfaceDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_InterfaceDefSeq_out &
-CORBA_InterfaceDefSeq_out::operator= (const ::CORBA_InterfaceDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_InterfaceDefSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE ::CORBA_InterfaceDefSeq_out &
-CORBA_InterfaceDefSeq_out::operator= (CORBA_InterfaceDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_InterfaceDefSeq_out::operator ::CORBA_InterfaceDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_InterfaceDefSeq *&
-CORBA_InterfaceDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_InterfaceDefSeq *
-CORBA_InterfaceDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::InterfaceDef, CORBA::InterfaceDef_var>
-CORBA_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CI_
-
-  ACE_INLINE CORBA::AbstractInterfaceDef **
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (CORBA::ULong nelems)
-  {
-    CORBA::AbstractInterfaceDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, CORBA::AbstractInterfaceDef*[nelems], 0);
-    
-    for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = CORBA::AbstractInterfaceDef::_nil ();
-    
-    return buf;
-  }
-  
-  ACE_INLINE void 
- _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::freebuf (CORBA::AbstractInterfaceDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
- _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
- _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
- _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::AbstractInterfaceDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-  {
-  }
-  
-  ACE_INLINE
- _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
-    {
-      CORBA::AbstractInterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (this->maximum_);
-      CORBA::AbstractInterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA::AbstractInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = CORBA::AbstractInterfaceDef::_duplicate (tmp2[i]);
-      
-      this->buffer_ = tmp1;
-    }
-    else
-    {
-      this->buffer_ = 0;
-    }
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &
- _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      CORBA::AbstractInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::AbstractInterfaceDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA::AbstractInterfaceDef::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::AbstractInterfaceDef **tmp1 = ACE_reinterpret_cast (CORBA::AbstractInterfaceDef **, this->buffer_);
-    CORBA::AbstractInterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA::AbstractInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA::AbstractInterfaceDef::_duplicate (tmp2[i]);
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var>
- _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    CORBA::AbstractInterfaceDef ** const tmp = ACE_reinterpret_cast (CORBA::AbstractInterfaceDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<CORBA::AbstractInterfaceDef,CORBA::AbstractInterfaceDef_var> (tmp + index, this->release_);
-  }
-  
-  ACE_INLINE CORBA::AbstractInterfaceDef* *
- _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::AbstractInterfaceDef **result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::AbstractInterfaceDef**, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::AbstractInterfaceDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::AbstractInterfaceDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_AbstractInterfaceDefSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::AbstractInterfaceDef ** ACE_CAST_CONST, this->buffer_);
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CI_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_AbstractInterfaceDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_AbstractInterfaceDefSeq_var::CORBA_AbstractInterfaceDefSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_AbstractInterfaceDefSeq_var::CORBA_AbstractInterfaceDefSeq_var (CORBA_AbstractInterfaceDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_AbstractInterfaceDefSeq_var::CORBA_AbstractInterfaceDefSeq_var (const ::CORBA_AbstractInterfaceDefSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA_AbstractInterfaceDefSeq (*p.ptr_));
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_AbstractInterfaceDefSeq_var::~CORBA_AbstractInterfaceDefSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_AbstractInterfaceDefSeq_var &
-CORBA_AbstractInterfaceDefSeq_var::operator= (CORBA_AbstractInterfaceDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE ::CORBA_AbstractInterfaceDefSeq_var &
-CORBA_AbstractInterfaceDefSeq_var::operator= (const ::CORBA_AbstractInterfaceDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          CORBA_AbstractInterfaceDefSeq *deep_copy =
-            new CORBA_AbstractInterfaceDefSeq (*p.ptr_);
-          
-          if (deep_copy != 0)
-            {
-              CORBA_AbstractInterfaceDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA_AbstractInterfaceDefSeq *
-CORBA_AbstractInterfaceDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_AbstractInterfaceDefSeq *
-CORBA_AbstractInterfaceDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_AbstractInterfaceDefSeq_var::operator const ::CORBA_AbstractInterfaceDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_AbstractInterfaceDefSeq_var::operator ::CORBA_AbstractInterfaceDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_AbstractInterfaceDefSeq_var::operator ::CORBA_AbstractInterfaceDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// variable-size types only
-ACE_INLINE
-CORBA_AbstractInterfaceDefSeq_var::operator ::CORBA_AbstractInterfaceDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::AbstractInterfaceDef, CORBA::AbstractInterfaceDef_var>
-CORBA_AbstractInterfaceDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const ::CORBA_AbstractInterfaceDefSeq &
-CORBA_AbstractInterfaceDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA_AbstractInterfaceDefSeq &
-CORBA_AbstractInterfaceDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE ::CORBA_AbstractInterfaceDefSeq *&
-CORBA_AbstractInterfaceDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_AbstractInterfaceDefSeq *
-CORBA_AbstractInterfaceDefSeq_var::_retn (void)
-{
-  ::CORBA_AbstractInterfaceDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA_AbstractInterfaceDefSeq *
-CORBA_AbstractInterfaceDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_AbstractInterfaceDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_AbstractInterfaceDefSeq_out::CORBA_AbstractInterfaceDefSeq_out (CORBA_AbstractInterfaceDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_AbstractInterfaceDefSeq_out::CORBA_AbstractInterfaceDefSeq_out (CORBA_AbstractInterfaceDefSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_AbstractInterfaceDefSeq_out::CORBA_AbstractInterfaceDefSeq_out (const ::CORBA_AbstractInterfaceDefSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_AbstractInterfaceDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_AbstractInterfaceDefSeq_out &
-CORBA_AbstractInterfaceDefSeq_out::operator= (const ::CORBA_AbstractInterfaceDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_AbstractInterfaceDefSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE ::CORBA_AbstractInterfaceDefSeq_out &
-CORBA_AbstractInterfaceDefSeq_out::operator= (CORBA_AbstractInterfaceDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_AbstractInterfaceDefSeq_out::operator ::CORBA_AbstractInterfaceDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_AbstractInterfaceDefSeq *&
-CORBA_AbstractInterfaceDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_AbstractInterfaceDefSeq *
-CORBA_AbstractInterfaceDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::AbstractInterfaceDef, CORBA::AbstractInterfaceDef_var>
-CORBA_AbstractInterfaceDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CI_
-
-  ACE_INLINE CORBA::LocalInterfaceDef **
- _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (CORBA::ULong nelems)
-  {
-    CORBA::LocalInterfaceDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, CORBA::LocalInterfaceDef*[nelems], 0);
-    
-    for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = CORBA::LocalInterfaceDef::_nil ();
-    
-    return buf;
-  }
-  
-  ACE_INLINE void 
- _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::freebuf (CORBA::LocalInterfaceDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
- _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::LocalInterfaceDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-  {
-  }
-  
-  ACE_INLINE
- _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
-    {
-      CORBA::LocalInterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (this->maximum_);
-      CORBA::LocalInterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA::LocalInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = CORBA::LocalInterfaceDef::_duplicate (tmp2[i]);
-      
-      this->buffer_ = tmp1;
-    }
-    else
-    {
-      this->buffer_ = 0;
-    }
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      CORBA::LocalInterfaceDef **tmp = ACE_reinterpret_cast (CORBA::LocalInterfaceDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA::LocalInterfaceDef::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::LocalInterfaceDef **tmp1 = ACE_reinterpret_cast (CORBA::LocalInterfaceDef **, this->buffer_);
-    CORBA::LocalInterfaceDef ** const tmp2 = ACE_reinterpret_cast (CORBA::LocalInterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA::LocalInterfaceDef::_duplicate (tmp2[i]);
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var>
- _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    CORBA::LocalInterfaceDef ** const tmp = ACE_reinterpret_cast (CORBA::LocalInterfaceDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<CORBA::LocalInterfaceDef,CORBA::LocalInterfaceDef_var> (tmp + index, this->release_);
-  }
-  
-  ACE_INLINE CORBA::LocalInterfaceDef* *
-  _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::LocalInterfaceDef **result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::LocalInterfaceDef**, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::LocalInterfaceDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::LocalInterfaceDef* *
- _TAO_Unbounded_Object_Sequence_CORBA_LocalInterfaceDefSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::LocalInterfaceDef ** ACE_CAST_CONST, this->buffer_);
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CI_)
-#define _CORBA_LOCALINTERFACEDEFSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_LocalInterfaceDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_LocalInterfaceDefSeq_var::CORBA_LocalInterfaceDefSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_LocalInterfaceDefSeq_var::CORBA_LocalInterfaceDefSeq_var (CORBA_LocalInterfaceDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_LocalInterfaceDefSeq_var::CORBA_LocalInterfaceDefSeq_var (const ::CORBA_LocalInterfaceDefSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA_LocalInterfaceDefSeq (*p.ptr_));
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_LocalInterfaceDefSeq_var::~CORBA_LocalInterfaceDefSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_LocalInterfaceDefSeq_var &
-CORBA_LocalInterfaceDefSeq_var::operator= (CORBA_LocalInterfaceDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE ::CORBA_LocalInterfaceDefSeq_var &
-CORBA_LocalInterfaceDefSeq_var::operator= (const ::CORBA_LocalInterfaceDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          CORBA_LocalInterfaceDefSeq *deep_copy =
-            new CORBA_LocalInterfaceDefSeq (*p.ptr_);
-          
-          if (deep_copy != 0)
-            {
-              CORBA_LocalInterfaceDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA_LocalInterfaceDefSeq *
-CORBA_LocalInterfaceDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_LocalInterfaceDefSeq *
-CORBA_LocalInterfaceDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_LocalInterfaceDefSeq_var::operator const ::CORBA_LocalInterfaceDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_LocalInterfaceDefSeq_var::operator ::CORBA_LocalInterfaceDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_LocalInterfaceDefSeq_var::operator ::CORBA_LocalInterfaceDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// variable-size types only
-ACE_INLINE
-CORBA_LocalInterfaceDefSeq_var::operator ::CORBA_LocalInterfaceDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::LocalInterfaceDef, CORBA::LocalInterfaceDef_var>
-CORBA_LocalInterfaceDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const ::CORBA_LocalInterfaceDefSeq &
-CORBA_LocalInterfaceDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA_LocalInterfaceDefSeq &
-CORBA_LocalInterfaceDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE ::CORBA_LocalInterfaceDefSeq *&
-CORBA_LocalInterfaceDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_LocalInterfaceDefSeq *
-CORBA_LocalInterfaceDefSeq_var::_retn (void)
-{
-  ::CORBA_LocalInterfaceDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA_LocalInterfaceDefSeq *
-CORBA_LocalInterfaceDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_LocalInterfaceDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_LocalInterfaceDefSeq_out::CORBA_LocalInterfaceDefSeq_out (CORBA_LocalInterfaceDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_LocalInterfaceDefSeq_out::CORBA_LocalInterfaceDefSeq_out (CORBA_LocalInterfaceDefSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_LocalInterfaceDefSeq_out::CORBA_LocalInterfaceDefSeq_out (const ::CORBA_LocalInterfaceDefSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_LocalInterfaceDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_LocalInterfaceDefSeq_out &
-CORBA_LocalInterfaceDefSeq_out::operator= (const ::CORBA_LocalInterfaceDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_LocalInterfaceDefSeq_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE ::CORBA_LocalInterfaceDefSeq_out &
-CORBA_LocalInterfaceDefSeq_out::operator= (CORBA_LocalInterfaceDefSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_LocalInterfaceDefSeq_out::operator ::CORBA_LocalInterfaceDefSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_LocalInterfaceDefSeq *&
-CORBA_LocalInterfaceDefSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_LocalInterfaceDefSeq *
-CORBA_LocalInterfaceDefSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::LocalInterfaceDef, CORBA::LocalInterfaceDef_var>
-CORBA_LocalInterfaceDefSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-// *******************************************************************
-
-#if !defined (_CORBA_PRIMITIVEDEF___CI_)
-#define _CORBA_PRIMITIVEDEF___CI_
+#if !defined (_CORBA_REPOSITORY___CI_)
+#define _CORBA_REPOSITORY___CI_
 
-ACE_INLINE
-CORBA_PrimitiveDef::CORBA_PrimitiveDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE CORBA_Repository_ptr
+tao_CORBA_Repository_duplicate (
+    CORBA_Repository_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->CORBA_PrimitiveDef_setup_collocation (_tao_collocated);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_PRIMITIVEDEF___VAR_CI_)
-#define _CORBA_PRIMITIVEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_PrimitiveDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_PrimitiveDef_var::CORBA_PrimitiveDef_var (void) // default constructor
-  : ptr_ (CORBA_PrimitiveDef::_nil ())
-{}
-
-ACE_INLINE CORBA_PrimitiveDef_ptr 
-CORBA_PrimitiveDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PrimitiveDef_var::CORBA_PrimitiveDef_var (const CORBA_PrimitiveDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_PrimitiveDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_PrimitiveDef_var::~CORBA_PrimitiveDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_PrimitiveDef_var &
-CORBA_PrimitiveDef_var::operator= (CORBA_PrimitiveDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_PrimitiveDef_var &
-CORBA_PrimitiveDef_var::operator= (const CORBA_PrimitiveDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_PrimitiveDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_PrimitiveDef_var::operator const CORBA_PrimitiveDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_PrimitiveDef_var::operator CORBA_PrimitiveDef_ptr &() // cast 
 {
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PrimitiveDef_ptr 
-CORBA_PrimitiveDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PrimitiveDef_ptr
-CORBA_PrimitiveDef_var::in (void) const
-{
-  return this->ptr_;
+  return CORBA_Repository::_duplicate (p);
 }
 
-ACE_INLINE CORBA_PrimitiveDef_ptr &
-CORBA_PrimitiveDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PrimitiveDef_ptr &
-CORBA_PrimitiveDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_PrimitiveDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PrimitiveDef_ptr 
-CORBA_PrimitiveDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_PrimitiveDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA_PrimitiveDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_PRIMITIVEDEF___OUT_CI_)
-#define _CORBA_PRIMITIVEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_PrimitiveDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_PrimitiveDef_out::CORBA_PrimitiveDef_out (CORBA_PrimitiveDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_PrimitiveDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_PrimitiveDef_out::CORBA_PrimitiveDef_out (CORBA_PrimitiveDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_PrimitiveDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_PrimitiveDef_out::CORBA_PrimitiveDef_out (const CORBA_PrimitiveDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_PrimitiveDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_PrimitiveDef_out &
-CORBA_PrimitiveDef_out::operator= (const CORBA_PrimitiveDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_PrimitiveDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_PrimitiveDef_out &
-CORBA_PrimitiveDef_out::operator= (const CORBA_PrimitiveDef_var &p)
-{
-  this->ptr_ = CORBA_PrimitiveDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_PrimitiveDef_out &
-CORBA_PrimitiveDef_out::operator= (CORBA_PrimitiveDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_PrimitiveDef_out::operator CORBA_PrimitiveDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PrimitiveDef_ptr &
-CORBA_PrimitiveDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PrimitiveDef_ptr 
-CORBA_PrimitiveDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRINGDEF___CI_)
-#define _CORBA_STRINGDEF___CI_
-
-ACE_INLINE
-CORBA_StringDef::CORBA_StringDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE void
+tao_CORBA_Repository_release (
+    CORBA_Repository_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->CORBA_StringDef_setup_collocation (_tao_collocated);
+  CORBA::release (p);
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRINGDEF___VAR_CI_)
-#define _CORBA_STRINGDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_StringDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_StringDef_var::CORBA_StringDef_var (void) // default constructor
-  : ptr_ (CORBA_StringDef::_nil ())
-{}
-
-ACE_INLINE CORBA_StringDef_ptr 
-CORBA_StringDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_StringDef_var::CORBA_StringDef_var (const CORBA_StringDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_StringDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_StringDef_var::~CORBA_StringDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_StringDef_var &
-CORBA_StringDef_var::operator= (CORBA_StringDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_StringDef_var &
-CORBA_StringDef_var::operator= (const CORBA_StringDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_StringDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_StringDef_var::operator const CORBA_StringDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_StringDef_var::operator CORBA_StringDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_StringDef_ptr 
-CORBA_StringDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_StringDef_ptr
-CORBA_StringDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_StringDef_ptr &
-CORBA_StringDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_StringDef_ptr &
-CORBA_StringDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_StringDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_StringDef_ptr 
-CORBA_StringDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_StringDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA_StringDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRINGDEF___OUT_CI_)
-#define _CORBA_STRINGDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_StringDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_StringDef_out::CORBA_StringDef_out (CORBA_StringDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_StringDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_StringDef_out::CORBA_StringDef_out (CORBA_StringDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_StringDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_StringDef_out::CORBA_StringDef_out (const CORBA_StringDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_StringDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_StringDef_out &
-CORBA_StringDef_out::operator= (const CORBA_StringDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_StringDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_StringDef_out &
-CORBA_StringDef_out::operator= (const CORBA_StringDef_var &p)
-{
-  this->ptr_ = CORBA_StringDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_StringDef_out &
-CORBA_StringDef_out::operator= (CORBA_StringDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_StringDef_out::operator CORBA_StringDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_StringDef_ptr &
-CORBA_StringDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_StringDef_ptr 
-CORBA_StringDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SEQUENCEDEF___CI_)
-#define _CORBA_SEQUENCEDEF___CI_
-
-ACE_INLINE
-CORBA_SequenceDef::CORBA_SequenceDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE CORBA_Repository_ptr
+tao_CORBA_Repository_nil (
+    void
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->CORBA_SequenceDef_setup_collocation (_tao_collocated);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SEQUENCEDEF___VAR_CI_)
-#define _CORBA_SEQUENCEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_SequenceDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_SequenceDef_var::CORBA_SequenceDef_var (void) // default constructor
-  : ptr_ (CORBA_SequenceDef::_nil ())
-{}
-
-ACE_INLINE CORBA_SequenceDef_ptr 
-CORBA_SequenceDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_SequenceDef_var::CORBA_SequenceDef_var (const CORBA_SequenceDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_SequenceDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_SequenceDef_var::~CORBA_SequenceDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_SequenceDef_var &
-CORBA_SequenceDef_var::operator= (CORBA_SequenceDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_SequenceDef_var &
-CORBA_SequenceDef_var::operator= (const CORBA_SequenceDef_var &p)
 {
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_SequenceDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_SequenceDef_var::operator const CORBA_SequenceDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_SequenceDef_var::operator CORBA_SequenceDef_ptr &() // cast 
-{
-  return this->ptr_;
+  return CORBA_Repository::_nil ();
 }
 
-ACE_INLINE CORBA_SequenceDef_ptr 
-CORBA_SequenceDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_SequenceDef_ptr
-CORBA_SequenceDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_SequenceDef_ptr &
-CORBA_SequenceDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_SequenceDef_ptr &
-CORBA_SequenceDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_SequenceDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_SequenceDef_ptr 
-CORBA_SequenceDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_SequenceDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA_SequenceDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SEQUENCEDEF___OUT_CI_)
-#define _CORBA_SEQUENCEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_SequenceDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_SequenceDef_out::CORBA_SequenceDef_out (CORBA_SequenceDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_SequenceDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_SequenceDef_out::CORBA_SequenceDef_out (CORBA_SequenceDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_SequenceDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_SequenceDef_out::CORBA_SequenceDef_out (const CORBA_SequenceDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_SequenceDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_SequenceDef_out &
-CORBA_SequenceDef_out::operator= (const CORBA_SequenceDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_SequenceDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_SequenceDef_out &
-CORBA_SequenceDef_out::operator= (const CORBA_SequenceDef_var &p)
-{
-  this->ptr_ = CORBA_SequenceDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_SequenceDef_out &
-CORBA_SequenceDef_out::operator= (CORBA_SequenceDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_SequenceDef_out::operator CORBA_SequenceDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_SequenceDef_ptr &
-CORBA_SequenceDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_SequenceDef_ptr 
-CORBA_SequenceDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ARRAYDEF___CI_)
-#define _CORBA_ARRAYDEF___CI_
-
-ACE_INLINE
-CORBA_ArrayDef::CORBA_ArrayDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE CORBA_Repository_ptr
+tao_CORBA_Repository_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->CORBA_ArrayDef_setup_collocation (_tao_collocated);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ARRAYDEF___VAR_CI_)
-#define _CORBA_ARRAYDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ArrayDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ArrayDef_var::CORBA_ArrayDef_var (void) // default constructor
-  : ptr_ (CORBA_ArrayDef::_nil ())
-{}
-
-ACE_INLINE CORBA_ArrayDef_ptr 
-CORBA_ArrayDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ArrayDef_var::CORBA_ArrayDef_var (const CORBA_ArrayDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_ArrayDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_ArrayDef_var::~CORBA_ArrayDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_ArrayDef_var &
-CORBA_ArrayDef_var::operator= (CORBA_ArrayDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ArrayDef_var &
-CORBA_ArrayDef_var::operator= (const CORBA_ArrayDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_ArrayDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ArrayDef_var::operator const CORBA_ArrayDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ArrayDef_var::operator CORBA_ArrayDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ArrayDef_ptr 
-CORBA_ArrayDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ArrayDef_ptr
-CORBA_ArrayDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ArrayDef_ptr &
-CORBA_ArrayDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ArrayDef_ptr &
-CORBA_ArrayDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_ArrayDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ArrayDef_ptr 
-CORBA_ArrayDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_ArrayDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA_ArrayDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ARRAYDEF___OUT_CI_)
-#define _CORBA_ARRAYDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ArrayDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ArrayDef_out::CORBA_ArrayDef_out (CORBA_ArrayDef_ptr &p)
-  : ptr_ (p)
 {
-  this->ptr_ = CORBA_ArrayDef::_nil ();
+  return CORBA_Repository::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE
-CORBA_ArrayDef_out::CORBA_ArrayDef_out (CORBA_ArrayDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_ArrayDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_ArrayDef_out::CORBA_ArrayDef_out (const CORBA_ArrayDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ArrayDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ArrayDef_out &
-CORBA_ArrayDef_out::operator= (const CORBA_ArrayDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ArrayDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ArrayDef_out &
-CORBA_ArrayDef_out::operator= (const CORBA_ArrayDef_var &p)
-{
-  this->ptr_ = CORBA_ArrayDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_ArrayDef_out &
-CORBA_ArrayDef_out::operator= (CORBA_ArrayDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ArrayDef_out::operator CORBA_ArrayDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ArrayDef_ptr &
-CORBA_ArrayDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ArrayDef_ptr 
-CORBA_ArrayDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_WSTRINGDEF___CI_)
-#define _CORBA_WSTRINGDEF___CI_
-
-ACE_INLINE
-CORBA_WstringDef::CORBA_WstringDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE CORBA::Object *
+tao_CORBA_Repository_upcast (
+    void *src
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->CORBA_WstringDef_setup_collocation (_tao_collocated);
+  CORBA_Repository **tmp =
+    ACE_static_cast (CORBA_Repository **, src);
+  return *tmp;
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_WSTRINGDEF___VAR_CI_)
-#define _CORBA_WSTRINGDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_WstringDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_WstringDef_var::CORBA_WstringDef_var (void) // default constructor
-  : ptr_ (CORBA_WstringDef::_nil ())
-{}
-
-ACE_INLINE CORBA_WstringDef_ptr 
-CORBA_WstringDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_WstringDef_var::CORBA_WstringDef_var (const CORBA_WstringDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_WstringDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_WstringDef_var::~CORBA_WstringDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_WstringDef_var &
-CORBA_WstringDef_var::operator= (CORBA_WstringDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_WstringDef_var &
-CORBA_WstringDef_var::operator= (const CORBA_WstringDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_WstringDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_WstringDef_var::operator const CORBA_WstringDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_WstringDef_var::operator CORBA_WstringDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_WstringDef_ptr 
-CORBA_WstringDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_WstringDef_ptr
-CORBA_WstringDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_WstringDef_ptr &
-CORBA_WstringDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_WstringDef_ptr &
-CORBA_WstringDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_WstringDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_WstringDef_ptr 
-CORBA_WstringDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_WstringDef_ptr val = this->ptr_;
-  this->ptr_ = CORBA_WstringDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_WSTRINGDEF___OUT_CI_)
-#define _CORBA_WSTRINGDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_WstringDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_WstringDef_out::CORBA_WstringDef_out (CORBA_WstringDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_WstringDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_WstringDef_out::CORBA_WstringDef_out (CORBA_WstringDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_WstringDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_WstringDef_out::CORBA_WstringDef_out (const CORBA_WstringDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_WstringDef_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_WstringDef_out &
-CORBA_WstringDef_out::operator= (const CORBA_WstringDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_WstringDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_WstringDef_out &
-CORBA_WstringDef_out::operator= (const CORBA_WstringDef_var &p)
-{
-  this->ptr_ = CORBA_WstringDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_WstringDef_out &
-CORBA_WstringDef_out::operator= (CORBA_WstringDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_WstringDef_out::operator CORBA_WstringDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_WstringDef_ptr &
-CORBA_WstringDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_WstringDef_ptr 
-CORBA_WstringDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_REPOSITORY___CI_)
-#define _CORBA_REPOSITORY___CI_
-
 ACE_INLINE
 CORBA_Repository::CORBA_Repository (
     TAO_Stub *objref,
@@ -2080,182 +77,56 @@ CORBA_Repository::CORBA_Repository (
   this->CORBA_Repository_setup_collocation (_tao_collocated);
 }
 
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_REPOSITORY___VAR_CI_)
-#define _CORBA_REPOSITORY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_Repository_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_Repository_var::CORBA_Repository_var (void) // default constructor
-  : ptr_ (CORBA_Repository::_nil ())
-{}
-
-ACE_INLINE ::CORBA_Repository_ptr
-CORBA_Repository_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Repository_var::CORBA_Repository_var (const ::CORBA_Repository_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_Repository::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_Repository_var::~CORBA_Repository_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_Repository_var &
-CORBA_Repository_var::operator= (CORBA_Repository_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_Repository_var &
-CORBA_Repository_var::operator= (const ::CORBA_Repository_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_Repository::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_Repository_var::operator const ::CORBA_Repository_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_Repository_var::operator ::CORBA_Repository_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Repository_ptr
-CORBA_Repository_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Repository_ptr
-CORBA_Repository_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Repository_ptr &
-CORBA_Repository_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Repository_ptr &
-CORBA_Repository_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_Repository::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Repository_ptr
-CORBA_Repository_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA_Repository_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_Repository::_nil ();
-  return val;
-}
-
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_REPOSITORY___OUT_CI_)
-#define _CORBA_REPOSITORY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_Repository_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_Repository_out::CORBA_Repository_out (CORBA_Repository_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_Repository::_nil ();
-}
-
-ACE_INLINE
-CORBA_Repository_out::CORBA_Repository_out (CORBA_Repository_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_Repository::_nil ();
-}
-
-ACE_INLINE
-CORBA_Repository_out::CORBA_Repository_out (const ::CORBA_Repository_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_Repository_out &, p).ptr_)
-{}
+#if !defined (_CORBA_MODULEDEF___CI_)
+#define _CORBA_MODULEDEF___CI_
 
-ACE_INLINE ::CORBA_Repository_out &
-CORBA_Repository_out::operator= (const ::CORBA_Repository_out &p)
+ACE_INLINE CORBA_ModuleDef_ptr
+tao_CORBA_ModuleDef_duplicate (
+    CORBA_ModuleDef_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (CORBA_Repository_out&, p).ptr_;
-  return *this;
+  return CORBA_ModuleDef::_duplicate (p);
 }
 
-ACE_INLINE CORBA_Repository_out &
-CORBA_Repository_out::operator= (const ::CORBA_Repository_var &p)
+ACE_INLINE void
+tao_CORBA_ModuleDef_release (
+    CORBA_ModuleDef_ptr p
+  )
 {
-  this->ptr_ = ::CORBA_Repository::_duplicate (p.ptr ());
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE CORBA_Repository_out &
-CORBA_Repository_out::operator= (CORBA_Repository_ptr p)
+ACE_INLINE CORBA_ModuleDef_ptr
+tao_CORBA_ModuleDef_nil (
+    void
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  return CORBA_ModuleDef::_nil ();
 }
 
-ACE_INLINE 
-CORBA_Repository_out::operator ::CORBA_Repository_ptr &() // cast
+ACE_INLINE CORBA_ModuleDef_ptr
+tao_CORBA_ModuleDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_ModuleDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_Repository_ptr &
-CORBA_Repository_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Repository_ptr
-CORBA_Repository_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_ModuleDef_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  CORBA_ModuleDef **tmp =
+    ACE_static_cast (CORBA_ModuleDef **, src);
+  return *tmp;
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_MODULEDEF___CI_)
-#define _CORBA_MODULEDEF___CI_
-
 ACE_INLINE
 CORBA_ModuleDef::CORBA_ModuleDef (
     TAO_Stub *objref,
@@ -2267,175 +138,6 @@ CORBA_ModuleDef::CORBA_ModuleDef (
   this->CORBA_ModuleDef_setup_collocation (_tao_collocated);
 }
 
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_MODULEDEF___VAR_CI_)
-#define _CORBA_MODULEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ModuleDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ModuleDef_var::CORBA_ModuleDef_var (void) // default constructor
-  : ptr_ (CORBA_ModuleDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_ModuleDef_ptr
-CORBA_ModuleDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ModuleDef_var::CORBA_ModuleDef_var (const ::CORBA_ModuleDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_ModuleDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_ModuleDef_var::~CORBA_ModuleDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_ModuleDef_var &
-CORBA_ModuleDef_var::operator= (CORBA_ModuleDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ModuleDef_var &
-CORBA_ModuleDef_var::operator= (const ::CORBA_ModuleDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_ModuleDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ModuleDef_var::operator const ::CORBA_ModuleDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ModuleDef_var::operator ::CORBA_ModuleDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ModuleDef_ptr
-CORBA_ModuleDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ModuleDef_ptr
-CORBA_ModuleDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ModuleDef_ptr &
-CORBA_ModuleDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ModuleDef_ptr &
-CORBA_ModuleDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_ModuleDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ModuleDef_ptr
-CORBA_ModuleDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA_ModuleDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_ModuleDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_MODULEDEF___OUT_CI_)
-#define _CORBA_MODULEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ModuleDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ModuleDef_out::CORBA_ModuleDef_out (CORBA_ModuleDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_ModuleDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_ModuleDef_out::CORBA_ModuleDef_out (CORBA_ModuleDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_ModuleDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_ModuleDef_out::CORBA_ModuleDef_out (const ::CORBA_ModuleDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ModuleDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_ModuleDef_out &
-CORBA_ModuleDef_out::operator= (const ::CORBA_ModuleDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ModuleDef_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ModuleDef_out &
-CORBA_ModuleDef_out::operator= (const ::CORBA_ModuleDef_var &p)
-{
-  this->ptr_ = ::CORBA_ModuleDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_ModuleDef_out &
-CORBA_ModuleDef_out::operator= (CORBA_ModuleDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ModuleDef_out::operator ::CORBA_ModuleDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ModuleDef_ptr &
-CORBA_ModuleDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ModuleDef_ptr
-CORBA_ModuleDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
 
 #endif /* end #if !defined */
 
@@ -2636,184 +338,58 @@ CORBA_ModuleDescription_out::operator-> (void)
 #if !defined (_CORBA_CONSTANTDEF___CI_)
 #define _CORBA_CONSTANTDEF___CI_
 
-ACE_INLINE
-CORBA_ConstantDef::CORBA_ConstantDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE CORBA_ConstantDef_ptr
+tao_CORBA_ConstantDef_duplicate (
+    CORBA_ConstantDef_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->CORBA_ConstantDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONSTANTDEF___VAR_CI_)
-#define _CORBA_CONSTANTDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ConstantDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ConstantDef_var::CORBA_ConstantDef_var (void) // default constructor
-  : ptr_ (CORBA_ConstantDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_ConstantDef_ptr
-CORBA_ConstantDef_var::ptr (void) const
 {
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ConstantDef_var::CORBA_ConstantDef_var (const ::CORBA_ConstantDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_ConstantDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_ConstantDef_var::~CORBA_ConstantDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_ConstantDef_var &
-CORBA_ConstantDef_var::operator= (CORBA_ConstantDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ConstantDef_var &
-CORBA_ConstantDef_var::operator= (const ::CORBA_ConstantDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_ConstantDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ConstantDef_var::operator const ::CORBA_ConstantDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ConstantDef_var::operator ::CORBA_ConstantDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ConstantDef_ptr
-CORBA_ConstantDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ConstantDef_ptr
-CORBA_ConstantDef_var::in (void) const
-{
-  return this->ptr_;
+  return CORBA_ConstantDef::_duplicate (p);
 }
 
-ACE_INLINE ::CORBA_ConstantDef_ptr &
-CORBA_ConstantDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ConstantDef_ptr &
-CORBA_ConstantDef_var::out (void)
+ACE_INLINE void
+tao_CORBA_ConstantDef_release (
+    CORBA_ConstantDef_ptr p
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_ConstantDef::_nil ();
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_ConstantDef_ptr
-CORBA_ConstantDef_var::_retn (void)
+ACE_INLINE CORBA_ConstantDef_ptr
+tao_CORBA_ConstantDef_nil (
+    void
+  )
 {
-  // yield ownership of managed obj reference
-  ::CORBA_ConstantDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_ConstantDef::_nil ();
-  return val;
+  return CORBA_ConstantDef::_nil ();
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_CONSTANTDEF___OUT_CI_)
-#define _CORBA_CONSTANTDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ConstantDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ConstantDef_out::CORBA_ConstantDef_out (CORBA_ConstantDef_ptr &p)
-  : ptr_ (p)
+ACE_INLINE CORBA_ConstantDef_ptr
+tao_CORBA_ConstantDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  this->ptr_ = ::CORBA_ConstantDef::_nil ();
+  return CORBA_ConstantDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE
-CORBA_ConstantDef_out::CORBA_ConstantDef_out (CORBA_ConstantDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
+ACE_INLINE CORBA::Object *
+tao_CORBA_ConstantDef_upcast (
+    void *src
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_ConstantDef::_nil ();
+  CORBA_ConstantDef **tmp =
+    ACE_static_cast (CORBA_ConstantDef **, src);
+  return *tmp;
 }
 
 ACE_INLINE
-CORBA_ConstantDef_out::CORBA_ConstantDef_out (const ::CORBA_ConstantDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ConstantDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_ConstantDef_out &
-CORBA_ConstantDef_out::operator= (const ::CORBA_ConstantDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ConstantDef_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ConstantDef_out &
-CORBA_ConstantDef_out::operator= (const ::CORBA_ConstantDef_var &p)
-{
-  this->ptr_ = ::CORBA_ConstantDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_ConstantDef_out &
-CORBA_ConstantDef_out::operator= (CORBA_ConstantDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ConstantDef_out::operator ::CORBA_ConstantDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ConstantDef_ptr &
-CORBA_ConstantDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ConstantDef_ptr
-CORBA_ConstantDef_out::operator-> (void)
+CORBA_ConstantDef::CORBA_ConstantDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->CORBA_ConstantDef_setup_collocation (_tao_collocated);
 }
 
 
@@ -3016,193 +592,110 @@ CORBA_ConstantDescription_out::operator-> (void)
 #if !defined (_CORBA_STRUCTDEF___CI_)
 #define _CORBA_STRUCTDEF___CI_
 
-ACE_INLINE
-CORBA_StructDef::CORBA_StructDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE CORBA_StructDef_ptr
+tao_CORBA_StructDef_duplicate (
+    CORBA_StructDef_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->CORBA_StructDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_STRUCTDEF___VAR_CI_)
-#define _CORBA_STRUCTDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_StructDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_StructDef_var::CORBA_StructDef_var (void) // default constructor
-  : ptr_ (CORBA_StructDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_StructDef_ptr
-CORBA_StructDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_StructDef_var::CORBA_StructDef_var (const ::CORBA_StructDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_StructDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_StructDef_var::~CORBA_StructDef_var (void) // destructor
 {
-  CORBA::release (this->ptr_);
+  return CORBA_StructDef::_duplicate (p);
 }
 
-ACE_INLINE CORBA_StructDef_var &
-CORBA_StructDef_var::operator= (CORBA_StructDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_StructDef_var &
-CORBA_StructDef_var::operator= (const ::CORBA_StructDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_StructDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_StructDef_var::operator const ::CORBA_StructDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_StructDef_var::operator ::CORBA_StructDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_StructDef_ptr
-CORBA_StructDef_var::operator-> (void) const
+ACE_INLINE void
+tao_CORBA_StructDef_release (
+    CORBA_StructDef_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_StructDef_ptr
-CORBA_StructDef_var::in (void) const
+ACE_INLINE CORBA_StructDef_ptr
+tao_CORBA_StructDef_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_StructDef::_nil ();
 }
 
-ACE_INLINE ::CORBA_StructDef_ptr &
-CORBA_StructDef_var::inout (void)
+ACE_INLINE CORBA_StructDef_ptr
+tao_CORBA_StructDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_StructDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_StructDef_ptr &
-CORBA_StructDef_var::out (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_StructDef_upcast (
+    void *src
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_StructDef::_nil ();
-  return this->ptr_;
+  CORBA_StructDef **tmp =
+    ACE_static_cast (CORBA_StructDef **, src);
+  return *tmp;
 }
 
-ACE_INLINE ::CORBA_StructDef_ptr
-CORBA_StructDef_var::_retn (void)
+ACE_INLINE
+CORBA_StructDef::CORBA_StructDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  // yield ownership of managed obj reference
-  ::CORBA_StructDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_StructDef::_nil ();
-  return val;
+  this->CORBA_StructDef_setup_collocation (_tao_collocated);
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_STRUCTDEF___OUT_CI_)
-#define _CORBA_STRUCTDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_StructDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_StructDef_out::CORBA_StructDef_out (CORBA_StructDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_StructDef::_nil ();
-}
+#if !defined (_CORBA_UNIONDEF___CI_)
+#define _CORBA_UNIONDEF___CI_
 
-ACE_INLINE
-CORBA_StructDef_out::CORBA_StructDef_out (CORBA_StructDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
+ACE_INLINE CORBA_UnionDef_ptr
+tao_CORBA_UnionDef_duplicate (
+    CORBA_UnionDef_ptr p
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_StructDef::_nil ();
+  return CORBA_UnionDef::_duplicate (p);
 }
 
-ACE_INLINE
-CORBA_StructDef_out::CORBA_StructDef_out (const ::CORBA_StructDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_StructDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_StructDef_out &
-CORBA_StructDef_out::operator= (const ::CORBA_StructDef_out &p)
+ACE_INLINE void
+tao_CORBA_UnionDef_release (
+    CORBA_UnionDef_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (CORBA_StructDef_out&, p).ptr_;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE CORBA_StructDef_out &
-CORBA_StructDef_out::operator= (const ::CORBA_StructDef_var &p)
-{
-  this->ptr_ = ::CORBA_StructDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_StructDef_out &
-CORBA_StructDef_out::operator= (CORBA_StructDef_ptr p)
+ACE_INLINE CORBA_UnionDef_ptr
+tao_CORBA_UnionDef_nil (
+    void
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  return CORBA_UnionDef::_nil ();
 }
 
-ACE_INLINE 
-CORBA_StructDef_out::operator ::CORBA_StructDef_ptr &() // cast
+ACE_INLINE CORBA_UnionDef_ptr
+tao_CORBA_UnionDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_UnionDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_StructDef_ptr &
-CORBA_StructDef_out::ptr (void) // ptr
+ACE_INLINE CORBA::Object *
+tao_CORBA_UnionDef_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  CORBA_UnionDef **tmp =
+    ACE_static_cast (CORBA_UnionDef **, src);
+  return *tmp;
 }
 
-ACE_INLINE ::CORBA_StructDef_ptr
-CORBA_StructDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_UNIONDEF___CI_)
-#define _CORBA_UNIONDEF___CI_
-
 ACE_INLINE
 CORBA_UnionDef::CORBA_UnionDef (
     TAO_Stub *objref,
@@ -3214,182 +707,56 @@ CORBA_UnionDef::CORBA_UnionDef (
   this->CORBA_UnionDef_setup_collocation (_tao_collocated);
 }
 
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_UNIONDEF___VAR_CI_)
-#define _CORBA_UNIONDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_UnionDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_UnionDef_var::CORBA_UnionDef_var (void) // default constructor
-  : ptr_ (CORBA_UnionDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_UnionDef_ptr
-CORBA_UnionDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_UnionDef_var::CORBA_UnionDef_var (const ::CORBA_UnionDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_UnionDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_UnionDef_var::~CORBA_UnionDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_UnionDef_var &
-CORBA_UnionDef_var::operator= (CORBA_UnionDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_UnionDef_var &
-CORBA_UnionDef_var::operator= (const ::CORBA_UnionDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_UnionDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_UnionDef_var::operator const ::CORBA_UnionDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_UnionDef_var::operator ::CORBA_UnionDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_UnionDef_ptr
-CORBA_UnionDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_UnionDef_ptr
-CORBA_UnionDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_UnionDef_ptr &
-CORBA_UnionDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_UnionDef_ptr &
-CORBA_UnionDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_UnionDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_UnionDef_ptr
-CORBA_UnionDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA_UnionDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_UnionDef::_nil ();
-  return val;
-}
-
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_UNIONDEF___OUT_CI_)
-#define _CORBA_UNIONDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_UnionDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_UnionDef_out::CORBA_UnionDef_out (CORBA_UnionDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_UnionDef::_nil ();
-}
+#if !defined (_CORBA_ENUMDEF___CI_)
+#define _CORBA_ENUMDEF___CI_
 
-ACE_INLINE
-CORBA_UnionDef_out::CORBA_UnionDef_out (CORBA_UnionDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
+ACE_INLINE CORBA_EnumDef_ptr
+tao_CORBA_EnumDef_duplicate (
+    CORBA_EnumDef_ptr p
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_UnionDef::_nil ();
+  return CORBA_EnumDef::_duplicate (p);
 }
 
-ACE_INLINE
-CORBA_UnionDef_out::CORBA_UnionDef_out (const ::CORBA_UnionDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_UnionDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_UnionDef_out &
-CORBA_UnionDef_out::operator= (const ::CORBA_UnionDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_UnionDef_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_UnionDef_out &
-CORBA_UnionDef_out::operator= (const ::CORBA_UnionDef_var &p)
+ACE_INLINE void
+tao_CORBA_EnumDef_release (
+    CORBA_EnumDef_ptr p
+  )
 {
-  this->ptr_ = ::CORBA_UnionDef::_duplicate (p.ptr ());
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE CORBA_UnionDef_out &
-CORBA_UnionDef_out::operator= (CORBA_UnionDef_ptr p)
+ACE_INLINE CORBA_EnumDef_ptr
+tao_CORBA_EnumDef_nil (
+    void
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  return CORBA_EnumDef::_nil ();
 }
 
-ACE_INLINE 
-CORBA_UnionDef_out::operator ::CORBA_UnionDef_ptr &() // cast
+ACE_INLINE CORBA_EnumDef_ptr
+tao_CORBA_EnumDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_EnumDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_UnionDef_ptr &
-CORBA_UnionDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_UnionDef_ptr
-CORBA_UnionDef_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_EnumDef_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  CORBA_EnumDef **tmp =
+    ACE_static_cast (CORBA_EnumDef **, src);
+  return *tmp;
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ENUMDEF___CI_)
-#define _CORBA_ENUMDEF___CI_
-
 ACE_INLINE
 CORBA_EnumDef::CORBA_EnumDef (
     TAO_Stub *objref,
@@ -3401,734 +768,492 @@ CORBA_EnumDef::CORBA_EnumDef (
   this->CORBA_EnumDef_setup_collocation (_tao_collocated);
 }
 
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ENUMDEF___VAR_CI_)
-#define _CORBA_ENUMDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_EnumDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_EnumDef_var::CORBA_EnumDef_var (void) // default constructor
-  : ptr_ (CORBA_EnumDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_EnumDef_ptr
-CORBA_EnumDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_EnumDef_var::CORBA_EnumDef_var (const ::CORBA_EnumDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_EnumDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_EnumDef_var::~CORBA_EnumDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
 
-ACE_INLINE CORBA_EnumDef_var &
-CORBA_EnumDef_var::operator= (CORBA_EnumDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
+#endif /* end #if !defined */
 
-ACE_INLINE CORBA_EnumDef_var &
-CORBA_EnumDef_var::operator= (const ::CORBA_EnumDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_EnumDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
 
-ACE_INLINE 
-CORBA_EnumDef_var::operator const ::CORBA_EnumDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
+#if !defined (_CORBA_ALIASDEF___CI_)
+#define _CORBA_ALIASDEF___CI_
 
-ACE_INLINE 
-CORBA_EnumDef_var::operator ::CORBA_EnumDef_ptr &() // cast 
+ACE_INLINE CORBA_AliasDef_ptr
+tao_CORBA_AliasDef_duplicate (
+    CORBA_AliasDef_ptr p
+  )
 {
-  return this->ptr_;
+  return CORBA_AliasDef::_duplicate (p);
 }
 
-ACE_INLINE ::CORBA_EnumDef_ptr
-CORBA_EnumDef_var::operator-> (void) const
+ACE_INLINE void
+tao_CORBA_AliasDef_release (
+    CORBA_AliasDef_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_EnumDef_ptr
-CORBA_EnumDef_var::in (void) const
+ACE_INLINE CORBA_AliasDef_ptr
+tao_CORBA_AliasDef_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_AliasDef::_nil ();
 }
 
-ACE_INLINE ::CORBA_EnumDef_ptr &
-CORBA_EnumDef_var::inout (void)
+ACE_INLINE CORBA_AliasDef_ptr
+tao_CORBA_AliasDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_AliasDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_EnumDef_ptr &
-CORBA_EnumDef_var::out (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_AliasDef_upcast (
+    void *src
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_EnumDef::_nil ();
-  return this->ptr_;
+  CORBA_AliasDef **tmp =
+    ACE_static_cast (CORBA_AliasDef **, src);
+  return *tmp;
 }
 
-ACE_INLINE ::CORBA_EnumDef_ptr
-CORBA_EnumDef_var::_retn (void)
+ACE_INLINE
+CORBA_AliasDef::CORBA_AliasDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  // yield ownership of managed obj reference
-  ::CORBA_EnumDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_EnumDef::_nil ();
-  return val;
+  this->CORBA_AliasDef_setup_collocation (_tao_collocated);
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_ENUMDEF___OUT_CI_)
-#define _CORBA_ENUMDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_EnumDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_EnumDef_out::CORBA_EnumDef_out (CORBA_EnumDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_EnumDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_EnumDef_out::CORBA_EnumDef_out (CORBA_EnumDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_EnumDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_EnumDef_out::CORBA_EnumDef_out (const ::CORBA_EnumDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_EnumDef_out &, p).ptr_)
-{}
+#if !defined (_CORBA_NATIVEDEF___CI_)
+#define _CORBA_NATIVEDEF___CI_
 
-ACE_INLINE ::CORBA_EnumDef_out &
-CORBA_EnumDef_out::operator= (const ::CORBA_EnumDef_out &p)
+ACE_INLINE CORBA_NativeDef_ptr
+tao_CORBA_NativeDef_duplicate (
+    CORBA_NativeDef_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (CORBA_EnumDef_out&, p).ptr_;
-  return *this;
+  return CORBA_NativeDef::_duplicate (p);
 }
 
-ACE_INLINE CORBA_EnumDef_out &
-CORBA_EnumDef_out::operator= (const ::CORBA_EnumDef_var &p)
-{
-  this->ptr_ = ::CORBA_EnumDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_EnumDef_out &
-CORBA_EnumDef_out::operator= (CORBA_EnumDef_ptr p)
+ACE_INLINE void
+tao_CORBA_NativeDef_release (
+    CORBA_NativeDef_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-CORBA_EnumDef_out::operator ::CORBA_EnumDef_ptr &() // cast
+ACE_INLINE CORBA_NativeDef_ptr
+tao_CORBA_NativeDef_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_NativeDef::_nil ();
 }
 
-ACE_INLINE ::CORBA_EnumDef_ptr &
-CORBA_EnumDef_out::ptr (void) // ptr
+ACE_INLINE CORBA_NativeDef_ptr
+tao_CORBA_NativeDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_NativeDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_EnumDef_ptr
-CORBA_EnumDef_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_NativeDef_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  CORBA_NativeDef **tmp =
+    ACE_static_cast (CORBA_NativeDef **, src);
+  return *tmp;
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ALIASDEF___CI_)
-#define _CORBA_ALIASDEF___CI_
-
 ACE_INLINE
-CORBA_AliasDef::CORBA_AliasDef (
+CORBA_NativeDef::CORBA_NativeDef (
     TAO_Stub *objref,
     CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->CORBA_AliasDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ALIASDEF___VAR_CI_)
-#define _CORBA_ALIASDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_AliasDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_AliasDef_var::CORBA_AliasDef_var (void) // default constructor
-  : ptr_ (CORBA_AliasDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_AliasDef_ptr
-CORBA_AliasDef_var::ptr (void) const
-{
-  return this->ptr_;
+  this->CORBA_NativeDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA_AliasDef_var::CORBA_AliasDef_var (const ::CORBA_AliasDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_AliasDef::_duplicate (p.ptr ()))
-{}
 
-ACE_INLINE
-CORBA_AliasDef_var::~CORBA_AliasDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
+#endif /* end #if !defined */
 
-ACE_INLINE CORBA_AliasDef_var &
-CORBA_AliasDef_var::operator= (CORBA_AliasDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
 
-ACE_INLINE CORBA_AliasDef_var &
-CORBA_AliasDef_var::operator= (const ::CORBA_AliasDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_AliasDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
+#if !defined (_CORBA_PRIMITIVEDEF___CI_)
+#define _CORBA_PRIMITIVEDEF___CI_
 
-ACE_INLINE 
-CORBA_AliasDef_var::operator const ::CORBA_AliasDef_ptr &() const // cast
+ACE_INLINE CORBA::PrimitiveDef_ptr
+tao_CORBA_PrimitiveDef_duplicate (
+    CORBA::PrimitiveDef_ptr p
+  )
 {
-  return this->ptr_;
+  return CORBA_PrimitiveDef::_duplicate (p);
 }
 
-ACE_INLINE 
-CORBA_AliasDef_var::operator ::CORBA_AliasDef_ptr &() // cast 
+ACE_INLINE void
+tao_CORBA_PrimitiveDef_release (
+    CORBA::PrimitiveDef_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_AliasDef_ptr
-CORBA_AliasDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_AliasDef_ptr
-CORBA_AliasDef_var::in (void) const
+ACE_INLINE CORBA::PrimitiveDef_ptr
+tao_CORBA_PrimitiveDef_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_PrimitiveDef::_nil ();
 }
 
-ACE_INLINE ::CORBA_AliasDef_ptr &
-CORBA_AliasDef_var::inout (void)
+ACE_INLINE CORBA::PrimitiveDef_ptr
+tao_CORBA_PrimitiveDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_PrimitiveDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_AliasDef_ptr &
-CORBA_AliasDef_var::out (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_PrimitiveDef_upcast (
+    void *src
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_AliasDef::_nil ();
-  return this->ptr_;
+  CORBA_PrimitiveDef **tmp =
+    ACE_static_cast (CORBA_PrimitiveDef **, src);
+  return *tmp;
 }
 
-ACE_INLINE ::CORBA_AliasDef_ptr
-CORBA_AliasDef_var::_retn (void)
+ACE_INLINE
+CORBA_PrimitiveDef::CORBA_PrimitiveDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  // yield ownership of managed obj reference
-  ::CORBA_AliasDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_AliasDef::_nil ();
-  return val;
+  this->CORBA_PrimitiveDef_setup_collocation (_tao_collocated);
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_ALIASDEF___OUT_CI_)
-#define _CORBA_ALIASDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_AliasDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_AliasDef_out::CORBA_AliasDef_out (CORBA_AliasDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_AliasDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_AliasDef_out::CORBA_AliasDef_out (CORBA_AliasDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_AliasDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_AliasDef_out::CORBA_AliasDef_out (const ::CORBA_AliasDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_AliasDef_out &, p).ptr_)
-{}
+#if !defined (_CORBA_STRINGDEF___CI_)
+#define _CORBA_STRINGDEF___CI_
 
-ACE_INLINE ::CORBA_AliasDef_out &
-CORBA_AliasDef_out::operator= (const ::CORBA_AliasDef_out &p)
+ACE_INLINE CORBA_StringDef_ptr
+tao_CORBA_StringDef_duplicate (
+    CORBA_StringDef_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (CORBA_AliasDef_out&, p).ptr_;
-  return *this;
+  return CORBA_StringDef::_duplicate (p);
 }
 
-ACE_INLINE CORBA_AliasDef_out &
-CORBA_AliasDef_out::operator= (const ::CORBA_AliasDef_var &p)
+ACE_INLINE void
+tao_CORBA_StringDef_release (
+    CORBA_StringDef_ptr p
+  )
 {
-  this->ptr_ = ::CORBA_AliasDef::_duplicate (p.ptr ());
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE CORBA_AliasDef_out &
-CORBA_AliasDef_out::operator= (CORBA_AliasDef_ptr p)
+ACE_INLINE CORBA_StringDef_ptr
+tao_CORBA_StringDef_nil (
+    void
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  return CORBA_StringDef::_nil ();
 }
 
-ACE_INLINE 
-CORBA_AliasDef_out::operator ::CORBA_AliasDef_ptr &() // cast
+ACE_INLINE CORBA_StringDef_ptr
+tao_CORBA_StringDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_StringDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_AliasDef_ptr &
-CORBA_AliasDef_out::ptr (void) // ptr
+ACE_INLINE CORBA::Object *
+tao_CORBA_StringDef_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  CORBA_StringDef **tmp =
+    ACE_static_cast (CORBA_StringDef **, src);
+  return *tmp;
 }
 
-ACE_INLINE ::CORBA_AliasDef_ptr
-CORBA_AliasDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_NATIVEDEF___CI_)
-#define _CORBA_NATIVEDEF___CI_
-
 ACE_INLINE
-CORBA_NativeDef::CORBA_NativeDef (
+CORBA_StringDef::CORBA_StringDef (
     TAO_Stub *objref,
     CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->CORBA_NativeDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_NATIVEDEF___VAR_CI_)
-#define _CORBA_NATIVEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_NativeDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_NativeDef_var::CORBA_NativeDef_var (void) // default constructor
-  : ptr_ (CORBA_NativeDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_NativeDef_ptr
-CORBA_NativeDef_var::ptr (void) const
-{
-  return this->ptr_;
+  this->CORBA_StringDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA_NativeDef_var::CORBA_NativeDef_var (const ::CORBA_NativeDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_NativeDef::_duplicate (p.ptr ()))
-{}
 
-ACE_INLINE
-CORBA_NativeDef_var::~CORBA_NativeDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
+#endif /* end #if !defined */
 
-ACE_INLINE CORBA_NativeDef_var &
-CORBA_NativeDef_var::operator= (CORBA_NativeDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
 
-ACE_INLINE CORBA_NativeDef_var &
-CORBA_NativeDef_var::operator= (const ::CORBA_NativeDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_NativeDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_NativeDef_var::operator const ::CORBA_NativeDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
+#if !defined (_CORBA_WSTRINGDEF___CI_)
+#define _CORBA_WSTRINGDEF___CI_
 
-ACE_INLINE 
-CORBA_NativeDef_var::operator ::CORBA_NativeDef_ptr &() // cast 
+ACE_INLINE CORBA_WstringDef_ptr
+tao_CORBA_WstringDef_duplicate (
+    CORBA_WstringDef_ptr p
+  )
 {
-  return this->ptr_;
+  return CORBA_WstringDef::_duplicate (p);
 }
 
-ACE_INLINE ::CORBA_NativeDef_ptr
-CORBA_NativeDef_var::operator-> (void) const
+ACE_INLINE void
+tao_CORBA_WstringDef_release (
+    CORBA_WstringDef_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_NativeDef_ptr
-CORBA_NativeDef_var::in (void) const
+ACE_INLINE CORBA_WstringDef_ptr
+tao_CORBA_WstringDef_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_WstringDef::_nil ();
 }
 
-ACE_INLINE ::CORBA_NativeDef_ptr &
-CORBA_NativeDef_var::inout (void)
+ACE_INLINE CORBA_WstringDef_ptr
+tao_CORBA_WstringDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_WstringDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_NativeDef_ptr &
-CORBA_NativeDef_var::out (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_WstringDef_upcast (
+    void *src
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_NativeDef::_nil ();
-  return this->ptr_;
+  CORBA_WstringDef **tmp =
+    ACE_static_cast (CORBA_WstringDef **, src);
+  return *tmp;
 }
 
-ACE_INLINE ::CORBA_NativeDef_ptr
-CORBA_NativeDef_var::_retn (void)
+ACE_INLINE
+CORBA_WstringDef::CORBA_WstringDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  // yield ownership of managed obj reference
-  ::CORBA_NativeDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_NativeDef::_nil ();
-  return val;
+  this->CORBA_WstringDef_setup_collocation (_tao_collocated);
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_NATIVEDEF___OUT_CI_)
-#define _CORBA_NATIVEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_NativeDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_NativeDef_out::CORBA_NativeDef_out (CORBA_NativeDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_NativeDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_NativeDef_out::CORBA_NativeDef_out (CORBA_NativeDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_NativeDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_NativeDef_out::CORBA_NativeDef_out (const ::CORBA_NativeDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_NativeDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_NativeDef_out &
-CORBA_NativeDef_out::operator= (const ::CORBA_NativeDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_NativeDef_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_CORBA_SEQUENCEDEF___CI_)
+#define _CORBA_SEQUENCEDEF___CI_
 
-ACE_INLINE CORBA_NativeDef_out &
-CORBA_NativeDef_out::operator= (const ::CORBA_NativeDef_var &p)
+ACE_INLINE CORBA_SequenceDef_ptr
+tao_CORBA_SequenceDef_duplicate (
+    CORBA_SequenceDef_ptr p
+  )
 {
-  this->ptr_ = ::CORBA_NativeDef::_duplicate (p.ptr ());
-  return *this;
+  return CORBA_SequenceDef::_duplicate (p);
 }
 
-ACE_INLINE CORBA_NativeDef_out &
-CORBA_NativeDef_out::operator= (CORBA_NativeDef_ptr p)
+ACE_INLINE void
+tao_CORBA_SequenceDef_release (
+    CORBA_SequenceDef_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-CORBA_NativeDef_out::operator ::CORBA_NativeDef_ptr &() // cast
+ACE_INLINE CORBA_SequenceDef_ptr
+tao_CORBA_SequenceDef_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_SequenceDef::_nil ();
 }
 
-ACE_INLINE ::CORBA_NativeDef_ptr &
-CORBA_NativeDef_out::ptr (void) // ptr
+ACE_INLINE CORBA_SequenceDef_ptr
+tao_CORBA_SequenceDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_SequenceDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_NativeDef_ptr
-CORBA_NativeDef_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_SequenceDef_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  CORBA_SequenceDef **tmp =
+    ACE_static_cast (CORBA_SequenceDef **, src);
+  return *tmp;
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_EXCEPTIONDEF___CI_)
-#define _CORBA_EXCEPTIONDEF___CI_
-
 ACE_INLINE
-CORBA_ExceptionDef::CORBA_ExceptionDef (
+CORBA_SequenceDef::CORBA_SequenceDef (
     TAO_Stub *objref,
     CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant
   )
   : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->CORBA_ExceptionDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_EXCEPTIONDEF___VAR_CI_)
-#define _CORBA_EXCEPTIONDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ExceptionDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ExceptionDef_var::CORBA_ExceptionDef_var (void) // default constructor
-  : ptr_ (CORBA_ExceptionDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_ExceptionDef_ptr
-CORBA_ExceptionDef_var::ptr (void) const
-{
-  return this->ptr_;
+  this->CORBA_SequenceDef_setup_collocation (_tao_collocated);
 }
 
-ACE_INLINE
-CORBA_ExceptionDef_var::CORBA_ExceptionDef_var (const ::CORBA_ExceptionDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_ExceptionDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_ExceptionDef_var::~CORBA_ExceptionDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
 
-ACE_INLINE CORBA_ExceptionDef_var &
-CORBA_ExceptionDef_var::operator= (CORBA_ExceptionDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
+#endif /* end #if !defined */
 
-ACE_INLINE CORBA_ExceptionDef_var &
-CORBA_ExceptionDef_var::operator= (const ::CORBA_ExceptionDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_ExceptionDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
 
-ACE_INLINE 
-CORBA_ExceptionDef_var::operator const ::CORBA_ExceptionDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
+#if !defined (_CORBA_ARRAYDEF___CI_)
+#define _CORBA_ARRAYDEF___CI_
 
-ACE_INLINE 
-CORBA_ExceptionDef_var::operator ::CORBA_ExceptionDef_ptr &() // cast 
+ACE_INLINE CORBA_ArrayDef_ptr
+tao_CORBA_ArrayDef_duplicate (
+    CORBA_ArrayDef_ptr p
+  )
 {
-  return this->ptr_;
+  return CORBA_ArrayDef::_duplicate (p);
 }
 
-ACE_INLINE ::CORBA_ExceptionDef_ptr
-CORBA_ExceptionDef_var::operator-> (void) const
+ACE_INLINE void
+tao_CORBA_ArrayDef_release (
+    CORBA_ArrayDef_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_ExceptionDef_ptr
-CORBA_ExceptionDef_var::in (void) const
+ACE_INLINE CORBA_ArrayDef_ptr
+tao_CORBA_ArrayDef_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_ArrayDef::_nil ();
 }
 
-ACE_INLINE ::CORBA_ExceptionDef_ptr &
-CORBA_ExceptionDef_var::inout (void)
+ACE_INLINE CORBA_ArrayDef_ptr
+tao_CORBA_ArrayDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_ArrayDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_ExceptionDef_ptr &
-CORBA_ExceptionDef_var::out (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_ArrayDef_upcast (
+    void *src
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_ExceptionDef::_nil ();
-  return this->ptr_;
+  CORBA_ArrayDef **tmp =
+    ACE_static_cast (CORBA_ArrayDef **, src);
+  return *tmp;
 }
 
-ACE_INLINE ::CORBA_ExceptionDef_ptr
-CORBA_ExceptionDef_var::_retn (void)
+ACE_INLINE
+CORBA_ArrayDef::CORBA_ArrayDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  // yield ownership of managed obj reference
-  ::CORBA_ExceptionDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_ExceptionDef::_nil ();
-  return val;
+  this->CORBA_ArrayDef_setup_collocation (_tao_collocated);
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_EXCEPTIONDEF___OUT_CI_)
-#define _CORBA_EXCEPTIONDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ExceptionDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ExceptionDef_out::CORBA_ExceptionDef_out (CORBA_ExceptionDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_ExceptionDef::_nil ();
-}
+#if !defined (_CORBA_EXCEPTIONDEF___CI_)
+#define _CORBA_EXCEPTIONDEF___CI_
 
-ACE_INLINE
-CORBA_ExceptionDef_out::CORBA_ExceptionDef_out (CORBA_ExceptionDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
+ACE_INLINE CORBA_ExceptionDef_ptr
+tao_CORBA_ExceptionDef_duplicate (
+    CORBA_ExceptionDef_ptr p
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_ExceptionDef::_nil ();
+  return CORBA_ExceptionDef::_duplicate (p);
 }
 
-ACE_INLINE
-CORBA_ExceptionDef_out::CORBA_ExceptionDef_out (const ::CORBA_ExceptionDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ExceptionDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_ExceptionDef_out &
-CORBA_ExceptionDef_out::operator= (const ::CORBA_ExceptionDef_out &p)
+ACE_INLINE void
+tao_CORBA_ExceptionDef_release (
+    CORBA_ExceptionDef_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (CORBA_ExceptionDef_out&, p).ptr_;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE CORBA_ExceptionDef_out &
-CORBA_ExceptionDef_out::operator= (const ::CORBA_ExceptionDef_var &p)
+ACE_INLINE CORBA_ExceptionDef_ptr
+tao_CORBA_ExceptionDef_nil (
+    void
+  )
 {
-  this->ptr_ = ::CORBA_ExceptionDef::_duplicate (p.ptr ());
-  return *this;
+  return CORBA_ExceptionDef::_nil ();
 }
 
-ACE_INLINE CORBA_ExceptionDef_out &
-CORBA_ExceptionDef_out::operator= (CORBA_ExceptionDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ExceptionDef_out::operator ::CORBA_ExceptionDef_ptr &() // cast
+ACE_INLINE CORBA_ExceptionDef_ptr
+tao_CORBA_ExceptionDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_ExceptionDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_ExceptionDef_ptr &
-CORBA_ExceptionDef_out::ptr (void) // ptr
+ACE_INLINE CORBA::Object *
+tao_CORBA_ExceptionDef_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  CORBA_ExceptionDef **tmp =
+    ACE_static_cast (CORBA_ExceptionDef **, src);
+  return *tmp;
 }
 
-ACE_INLINE ::CORBA_ExceptionDef_ptr
-CORBA_ExceptionDef_out::operator-> (void)
+ACE_INLINE
+CORBA_ExceptionDef::CORBA_ExceptionDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->CORBA_ExceptionDef_setup_collocation (_tao_collocated);
 }
 
 
@@ -4333,21 +1458,23 @@ CORBA_ExceptionDescription_out::operator-> (void)
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CI_
 
-  ACE_INLINE CORBA::ExceptionDef **
- _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (CORBA::ULong nelems)
+  ACE_INLINE CORBA_ExceptionDef **
+  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (CORBA::ULong nelems)
   {
-    CORBA::ExceptionDef **buf = 0;
+    CORBA_ExceptionDef **buf = 0;
     
-    ACE_NEW_RETURN (buf, CORBA::ExceptionDef*[nelems], 0);
+    ACE_NEW_RETURN (buf, CORBA_ExceptionDef*[nelems], 0);
     
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = CORBA::ExceptionDef::_nil ();
+      {
+        buf[i] = CORBA_ExceptionDef::_nil ();
+      }
     
     return buf;
   }
   
   ACE_INLINE void 
-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::freebuf (CORBA::ExceptionDef **buffer)
+  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::freebuf (CORBA_ExceptionDef **buffer)
   {
     if (buffer == 0)
       return;
@@ -4368,7 +1495,7 @@ CORBA_ExceptionDescription_out::operator-> (void)
   ACE_INLINE
   _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq (CORBA::ULong maximum,
     CORBA::ULong length,
-    CORBA::ExceptionDef* *value,
+    CORBA_ExceptionDef* *value,
     CORBA::Boolean release)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
@@ -4380,11 +1507,13 @@ CORBA_ExceptionDescription_out::operator-> (void)
   {
     if (rhs.buffer_ != 0)
     {
-      CORBA::ExceptionDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (this->maximum_);
-      CORBA::ExceptionDef ** const tmp2 = ACE_reinterpret_cast (CORBA::ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
+      CORBA_ExceptionDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (this->maximum_);
+      CORBA_ExceptionDef ** const tmp2 = ACE_reinterpret_cast (CORBA_ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = CORBA::ExceptionDef::_duplicate (tmp2[i]);
+        {
+          tmp1[i] = CORBA_ExceptionDef::_duplicate (tmp2[i]);
+        }
       
       this->buffer_ = tmp1;
     }
@@ -4402,12 +1531,12 @@ CORBA_ExceptionDescription_out::operator-> (void)
     
     if (this->release_)
     {
-      CORBA::ExceptionDef **tmp = ACE_reinterpret_cast (CORBA::ExceptionDef **, this->buffer_);
+      CORBA_ExceptionDef **tmp = ACE_reinterpret_cast (CORBA_ExceptionDef **, this->buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
-        tmp[i] = CORBA::ExceptionDef::_nil ();
+        tmp[i] = CORBA_ExceptionDef::_nil ();
       }
       if (this->maximum_ < rhs.maximum_)
       {
@@ -4420,28 +1549,30 @@ CORBA_ExceptionDescription_out::operator-> (void)
     
     TAO_Unbounded_Base_Sequence::operator= (rhs);
     
-    CORBA::ExceptionDef **tmp1 = ACE_reinterpret_cast (CORBA::ExceptionDef **, this->buffer_);
-    CORBA::ExceptionDef ** const tmp2 = ACE_reinterpret_cast (CORBA::ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
+    CORBA_ExceptionDef **tmp1 = ACE_reinterpret_cast (CORBA_ExceptionDef **, this->buffer_);
+    CORBA_ExceptionDef ** const tmp2 = ACE_reinterpret_cast (CORBA_ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA::ExceptionDef::_duplicate (tmp2[i]);
+      {
+        tmp1[i] = CORBA_ExceptionDef::_duplicate (tmp2[i]);
+      }
     
     return *this;
   }
   
-  ACE_INLINE TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var>
+  ACE_INLINE TAO_Object_Manager<CORBA_ExceptionDef,CORBA_ExceptionDef_var>
   _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::operator[] (CORBA::ULong index) const
   // read-write accessor
   {
     ACE_ASSERT (index < this->maximum_);
-    CORBA::ExceptionDef ** const tmp = ACE_reinterpret_cast (CORBA::ExceptionDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<CORBA::ExceptionDef,CORBA::ExceptionDef_var> (tmp + index, this->release_);
+    CORBA_ExceptionDef ** const tmp = ACE_reinterpret_cast (CORBA_ExceptionDef ** ACE_CAST_CONST, this->buffer_);
+    return TAO_Object_Manager<CORBA_ExceptionDef,CORBA_ExceptionDef_var> (tmp + index, this->release_);
   }
   
-  ACE_INLINE CORBA::ExceptionDef* *
+  ACE_INLINE CORBA_ExceptionDef* *
   _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::get_buffer (CORBA::Boolean orphan)
   {
-    CORBA::ExceptionDef **result = 0;
+    CORBA_ExceptionDef **result = 0;
     if (orphan == 0)
     {
       // We retain ownership.
@@ -4453,7 +1584,7 @@ CORBA_ExceptionDescription_out::operator-> (void)
       }
       else
       {
-        result = ACE_reinterpret_cast (CORBA::ExceptionDef**, this->buffer_);
+        result = ACE_reinterpret_cast (CORBA_ExceptionDef**, this->buffer_);
       }
     }
     else // if (orphan == 1)
@@ -4462,7 +1593,7 @@ CORBA_ExceptionDescription_out::operator-> (void)
       {
         // We set the state back to default and relinquish
         // ownership.
-        result = ACE_reinterpret_cast(CORBA::ExceptionDef**,this->buffer_);
+        result = ACE_reinterpret_cast(CORBA_ExceptionDef**,this->buffer_);
         this->maximum_ = 0;
         this->length_ = 0;
         this->buffer_ = 0;
@@ -4472,10 +1603,10 @@ CORBA_ExceptionDescription_out::operator-> (void)
     return result;
   }
   
-  ACE_INLINE const CORBA::ExceptionDef* *
+  ACE_INLINE const CORBA_ExceptionDef* *
   _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::get_buffer (void) const
   {
-    return ACE_reinterpret_cast(const CORBA::ExceptionDef ** ACE_CAST_CONST, this->buffer_);
+    return ACE_reinterpret_cast(const CORBA_ExceptionDef ** ACE_CAST_CONST, this->buffer_);
   }
   
   
@@ -4589,7 +1720,7 @@ CORBA_ExceptionDefSeq_var::operator ::CORBA_ExceptionDefSeq *&() // cast
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::ExceptionDef, CORBA::ExceptionDef_var>
+ACE_INLINE TAO_Object_Manager<CORBA_ExceptionDef, CORBA_ExceptionDef_var>
 CORBA_ExceptionDefSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -4686,7 +1817,7 @@ CORBA_ExceptionDefSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::ExceptionDef, CORBA::ExceptionDef_var>
+ACE_INLINE TAO_Object_Manager<CORBA_ExceptionDef, CORBA_ExceptionDef_var>
 CORBA_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -4702,16 +1833,16 @@ CORBA_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CI_
 
   // = Static operations.
-  ACE_INLINE CORBA::ExceptionDescription *
+  ACE_INLINE CORBA_ExceptionDescription *
   _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (CORBA::ULong size)
   // Allocate storage for the sequence.
   {
-    CORBA::ExceptionDescription *retval = 0;
-    ACE_NEW_RETURN (retval, CORBA::ExceptionDescription[size], 0);
+    CORBA_ExceptionDescription *retval = 0;
+    ACE_NEW_RETURN (retval, CORBA_ExceptionDescription[size], 0);
     return retval;
   }
   
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (CORBA::ExceptionDescription *buffer)
+  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (CORBA_ExceptionDescription *buffer)
   // Free the sequence.
   {
     delete [] buffer;
@@ -4731,7 +1862,7 @@ CORBA_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
   ACE_INLINE
   _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq (CORBA::ULong maximum,
     CORBA::ULong length,
-    CORBA::ExceptionDescription *data,
+    CORBA_ExceptionDescription *data,
     CORBA::Boolean release)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
@@ -4744,8 +1875,8 @@ CORBA_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
   {
     if (rhs.buffer_ != 0)
     {
-      CORBA::ExceptionDescription *tmp1 = _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (this->maximum_);
-      CORBA::ExceptionDescription * const tmp2 = ACE_reinterpret_cast (CORBA::ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
+      CORBA_ExceptionDescription *tmp1 = _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (this->maximum_);
+      CORBA_ExceptionDescription * const tmp2 = ACE_reinterpret_cast (CORBA_ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
@@ -4770,7 +1901,7 @@ CORBA_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
       if (this->maximum_ < rhs.maximum_)
       {
         // free the old buffer
-        CORBA::ExceptionDescription *tmp = ACE_reinterpret_cast (CORBA::ExceptionDescription *, this->buffer_);
+        CORBA_ExceptionDescription *tmp = ACE_reinterpret_cast (CORBA_ExceptionDescription *, this->buffer_);
         _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
         this->buffer_ = _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::allocbuf (rhs.maximum_);
       }
@@ -4780,8 +1911,8 @@ CORBA_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
     
     TAO_Unbounded_Base_Sequence::operator= (rhs);
     
-    CORBA::ExceptionDescription *tmp1 = ACE_reinterpret_cast (CORBA::ExceptionDescription *, this->buffer_);
-    CORBA::ExceptionDescription * const tmp2 = ACE_reinterpret_cast (CORBA::ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
+    CORBA_ExceptionDescription *tmp1 = ACE_reinterpret_cast (CORBA_ExceptionDescription *, this->buffer_);
+    CORBA_ExceptionDescription * const tmp2 = ACE_reinterpret_cast (CORBA_ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
@@ -4790,30 +1921,30 @@ CORBA_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
   }
   
   // = Accessors.
-  ACE_INLINE CORBA::ExceptionDescription &
+  ACE_INLINE CORBA_ExceptionDescription &
   _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::operator[] (CORBA::ULong i)
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    CORBA::ExceptionDescription* tmp = ACE_reinterpret_cast(CORBA::ExceptionDescription*,this->buffer_);
+    CORBA_ExceptionDescription* tmp = ACE_reinterpret_cast(CORBA_ExceptionDescription*,this->buffer_);
     return tmp[i];
   }
   
-  ACE_INLINE const CORBA::ExceptionDescription &
+  ACE_INLINE const CORBA_ExceptionDescription &
   _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::operator[] (CORBA::ULong i) const
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    CORBA::ExceptionDescription * const tmp = ACE_reinterpret_cast (CORBA::ExceptionDescription* ACE_CAST_CONST, this->buffer_);
+    CORBA_ExceptionDescription * const tmp = ACE_reinterpret_cast (CORBA_ExceptionDescription* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
   
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
   
-  ACE_INLINE CORBA::ExceptionDescription *
+  ACE_INLINE CORBA_ExceptionDescription *
   _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::get_buffer (CORBA::Boolean orphan)
   {
-    CORBA::ExceptionDescription *result = 0;
+    CORBA_ExceptionDescription *result = 0;
     if (orphan == 0)
     {
       // We retain ownership.
@@ -4825,7 +1956,7 @@ CORBA_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
       }
       else
       {
-        result = ACE_reinterpret_cast (CORBA::ExceptionDescription*, this->buffer_);
+        result = ACE_reinterpret_cast (CORBA_ExceptionDescription*, this->buffer_);
       }
     }
     else // if (orphan == 1)
@@ -4834,7 +1965,7 @@ CORBA_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
       {
         // We set the state back to default and relinquish
         // ownership.
-        result = ACE_reinterpret_cast(CORBA::ExceptionDescription*,this->buffer_);
+        result = ACE_reinterpret_cast(CORBA_ExceptionDescription*,this->buffer_);
         this->maximum_ = 0;
         this->length_ = 0;
         this->buffer_ = 0;
@@ -4844,23 +1975,23 @@ CORBA_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
     return result;
   }
   
-  ACE_INLINE const CORBA::ExceptionDescription *
+  ACE_INLINE const CORBA_ExceptionDescription *
   _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::get_buffer (void) const
   {
-    return ACE_reinterpret_cast(const CORBA::ExceptionDescription * ACE_CAST_CONST, this->buffer_);
+    return ACE_reinterpret_cast(const CORBA_ExceptionDescription * ACE_CAST_CONST, this->buffer_);
   }
   
   ACE_INLINE void
   _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
-  CORBA::ExceptionDescription *data,
+  CORBA_ExceptionDescription *data,
   CORBA::Boolean release)
   {
     this->maximum_ = max;
     this->length_ = length;
     if (this->buffer_ && this->release_ == 1)
     {
-      CORBA::ExceptionDescription *tmp = ACE_reinterpret_cast(CORBA::ExceptionDescription*,this->buffer_);
+      CORBA_ExceptionDescription *tmp = ACE_reinterpret_cast(CORBA_ExceptionDescription*,this->buffer_);
       _TAO_Unbounded_Sequence_CORBA_ExcDescriptionSeq::freebuf (tmp);
     }
     this->buffer_ = data;
@@ -4977,16 +2108,16 @@ CORBA_ExcDescriptionSeq_var::operator ::CORBA_ExcDescriptionSeq *&() // cast
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::ExceptionDescription &
+ACE_INLINE CORBA_ExceptionDescription &
 CORBA_ExcDescriptionSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::ExceptionDescription &
+ACE_INLINE const CORBA_ExceptionDescription &
 CORBA_ExcDescriptionSeq_var::operator[] (CORBA::ULong index) const
 {
-  return ACE_const_cast (const CORBA::ExceptionDescription &, this->ptr_->operator[] (index));
+  return ACE_const_cast (const CORBA_ExceptionDescription &, this->ptr_->operator[] (index));
 }
 
 ACE_INLINE const ::CORBA_ExcDescriptionSeq &
@@ -5080,7 +2211,7 @@ CORBA_ExcDescriptionSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::ExceptionDescription &
+ACE_INLINE CORBA_ExceptionDescription &
 CORBA_ExcDescriptionSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -5093,184 +2224,58 @@ CORBA_ExcDescriptionSeq_out::operator[] (CORBA::ULong index)
 #if !defined (_CORBA_ATTRIBUTEDEF___CI_)
 #define _CORBA_ATTRIBUTEDEF___CI_
 
-ACE_INLINE
-CORBA_AttributeDef::CORBA_AttributeDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE CORBA_AttributeDef_ptr
+tao_CORBA_AttributeDef_duplicate (
+    CORBA_AttributeDef_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->CORBA_AttributeDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ATTRIBUTEDEF___VAR_CI_)
-#define _CORBA_ATTRIBUTEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_AttributeDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_AttributeDef_var::CORBA_AttributeDef_var (void) // default constructor
-  : ptr_ (CORBA_AttributeDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_AttributeDef_ptr
-CORBA_AttributeDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_AttributeDef_var::CORBA_AttributeDef_var (const ::CORBA_AttributeDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_AttributeDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_AttributeDef_var::~CORBA_AttributeDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_AttributeDef_var &
-CORBA_AttributeDef_var::operator= (CORBA_AttributeDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_AttributeDef_var &
-CORBA_AttributeDef_var::operator= (const ::CORBA_AttributeDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_AttributeDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_AttributeDef_var::operator const ::CORBA_AttributeDef_ptr &() const // cast
 {
-  return this->ptr_;
+  return CORBA_AttributeDef::_duplicate (p);
 }
 
-ACE_INLINE 
-CORBA_AttributeDef_var::operator ::CORBA_AttributeDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_AttributeDef_ptr
-CORBA_AttributeDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_AttributeDef_ptr
-CORBA_AttributeDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_AttributeDef_ptr &
-CORBA_AttributeDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_AttributeDef_ptr &
-CORBA_AttributeDef_var::out (void)
+ACE_INLINE void
+tao_CORBA_AttributeDef_release (
+    CORBA_AttributeDef_ptr p
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_AttributeDef::_nil ();
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_AttributeDef_ptr
-CORBA_AttributeDef_var::_retn (void)
+ACE_INLINE CORBA_AttributeDef_ptr
+tao_CORBA_AttributeDef_nil (
+    void
+  )
 {
-  // yield ownership of managed obj reference
-  ::CORBA_AttributeDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_AttributeDef::_nil ();
-  return val;
+  return CORBA_AttributeDef::_nil ();
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ATTRIBUTEDEF___OUT_CI_)
-#define _CORBA_ATTRIBUTEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_AttributeDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_AttributeDef_out::CORBA_AttributeDef_out (CORBA_AttributeDef_ptr &p)
-  : ptr_ (p)
+ACE_INLINE CORBA_AttributeDef_ptr
+tao_CORBA_AttributeDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  this->ptr_ = ::CORBA_AttributeDef::_nil ();
+  return CORBA_AttributeDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE
-CORBA_AttributeDef_out::CORBA_AttributeDef_out (CORBA_AttributeDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
+ACE_INLINE CORBA::Object *
+tao_CORBA_AttributeDef_upcast (
+    void *src
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_AttributeDef::_nil ();
+  CORBA_AttributeDef **tmp =
+    ACE_static_cast (CORBA_AttributeDef **, src);
+  return *tmp;
 }
 
 ACE_INLINE
-CORBA_AttributeDef_out::CORBA_AttributeDef_out (const ::CORBA_AttributeDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_AttributeDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_AttributeDef_out &
-CORBA_AttributeDef_out::operator= (const ::CORBA_AttributeDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_AttributeDef_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_AttributeDef_out &
-CORBA_AttributeDef_out::operator= (const ::CORBA_AttributeDef_var &p)
-{
-  this->ptr_ = ::CORBA_AttributeDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_AttributeDef_out &
-CORBA_AttributeDef_out::operator= (CORBA_AttributeDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_AttributeDef_out::operator ::CORBA_AttributeDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_AttributeDef_ptr &
-CORBA_AttributeDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_AttributeDef_ptr
-CORBA_AttributeDef_out::operator-> (void)
+CORBA_AttributeDef::CORBA_AttributeDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->CORBA_AttributeDef_setup_collocation (_tao_collocated);
 }
 
 
@@ -5669,16 +2674,16 @@ CORBA_ParameterDescription_out::operator-> (void)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CI_
 
   // = Static operations.
-  ACE_INLINE CORBA::ParameterDescription *
+  ACE_INLINE CORBA_ParameterDescription *
   _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (CORBA::ULong size)
   // Allocate storage for the sequence.
   {
-    CORBA::ParameterDescription *retval = 0;
-    ACE_NEW_RETURN (retval, CORBA::ParameterDescription[size], 0);
+    CORBA_ParameterDescription *retval = 0;
+    ACE_NEW_RETURN (retval, CORBA_ParameterDescription[size], 0);
     return retval;
   }
   
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (CORBA::ParameterDescription *buffer)
+  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (CORBA_ParameterDescription *buffer)
   // Free the sequence.
   {
     delete [] buffer;
@@ -5698,7 +2703,7 @@ CORBA_ParameterDescription_out::operator-> (void)
   ACE_INLINE
   _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq (CORBA::ULong maximum,
     CORBA::ULong length,
-    CORBA::ParameterDescription *data,
+    CORBA_ParameterDescription *data,
     CORBA::Boolean release)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
@@ -5711,8 +2716,8 @@ CORBA_ParameterDescription_out::operator-> (void)
   {
     if (rhs.buffer_ != 0)
     {
-      CORBA::ParameterDescription *tmp1 = _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (this->maximum_);
-      CORBA::ParameterDescription * const tmp2 = ACE_reinterpret_cast (CORBA::ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
+      CORBA_ParameterDescription *tmp1 = _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (this->maximum_);
+      CORBA_ParameterDescription * const tmp2 = ACE_reinterpret_cast (CORBA_ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
@@ -5737,7 +2742,7 @@ CORBA_ParameterDescription_out::operator-> (void)
       if (this->maximum_ < rhs.maximum_)
       {
         // free the old buffer
-        CORBA::ParameterDescription *tmp = ACE_reinterpret_cast (CORBA::ParameterDescription *, this->buffer_);
+        CORBA_ParameterDescription *tmp = ACE_reinterpret_cast (CORBA_ParameterDescription *, this->buffer_);
         _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (tmp);
         this->buffer_ = _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (rhs.maximum_);
       }
@@ -5747,8 +2752,8 @@ CORBA_ParameterDescription_out::operator-> (void)
     
     TAO_Unbounded_Base_Sequence::operator= (rhs);
     
-    CORBA::ParameterDescription *tmp1 = ACE_reinterpret_cast (CORBA::ParameterDescription *, this->buffer_);
-    CORBA::ParameterDescription * const tmp2 = ACE_reinterpret_cast (CORBA::ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
+    CORBA_ParameterDescription *tmp1 = ACE_reinterpret_cast (CORBA_ParameterDescription *, this->buffer_);
+    CORBA_ParameterDescription * const tmp2 = ACE_reinterpret_cast (CORBA_ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
@@ -5757,30 +2762,30 @@ CORBA_ParameterDescription_out::operator-> (void)
   }
   
   // = Accessors.
-  ACE_INLINE CORBA::ParameterDescription &
+  ACE_INLINE CORBA_ParameterDescription &
   _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::operator[] (CORBA::ULong i)
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    CORBA::ParameterDescription* tmp = ACE_reinterpret_cast(CORBA::ParameterDescription*,this->buffer_);
+    CORBA_ParameterDescription* tmp = ACE_reinterpret_cast(CORBA_ParameterDescription*,this->buffer_);
     return tmp[i];
   }
   
-  ACE_INLINE const CORBA::ParameterDescription &
+  ACE_INLINE const CORBA_ParameterDescription &
   _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::operator[] (CORBA::ULong i) const
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    CORBA::ParameterDescription * const tmp = ACE_reinterpret_cast (CORBA::ParameterDescription* ACE_CAST_CONST, this->buffer_);
+    CORBA_ParameterDescription * const tmp = ACE_reinterpret_cast (CORBA_ParameterDescription* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
   
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
   
-  ACE_INLINE CORBA::ParameterDescription *
+  ACE_INLINE CORBA_ParameterDescription *
   _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::get_buffer (CORBA::Boolean orphan)
   {
-    CORBA::ParameterDescription *result = 0;
+    CORBA_ParameterDescription *result = 0;
     if (orphan == 0)
     {
       // We retain ownership.
@@ -5792,7 +2797,7 @@ CORBA_ParameterDescription_out::operator-> (void)
       }
       else
       {
-        result = ACE_reinterpret_cast (CORBA::ParameterDescription*, this->buffer_);
+        result = ACE_reinterpret_cast (CORBA_ParameterDescription*, this->buffer_);
       }
     }
     else // if (orphan == 1)
@@ -5801,7 +2806,7 @@ CORBA_ParameterDescription_out::operator-> (void)
       {
         // We set the state back to default and relinquish
         // ownership.
-        result = ACE_reinterpret_cast(CORBA::ParameterDescription*,this->buffer_);
+        result = ACE_reinterpret_cast(CORBA_ParameterDescription*,this->buffer_);
         this->maximum_ = 0;
         this->length_ = 0;
         this->buffer_ = 0;
@@ -5811,23 +2816,23 @@ CORBA_ParameterDescription_out::operator-> (void)
     return result;
   }
   
-  ACE_INLINE const CORBA::ParameterDescription *
+  ACE_INLINE const CORBA_ParameterDescription *
   _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::get_buffer (void) const
   {
-    return ACE_reinterpret_cast(const CORBA::ParameterDescription * ACE_CAST_CONST, this->buffer_);
+    return ACE_reinterpret_cast(const CORBA_ParameterDescription * ACE_CAST_CONST, this->buffer_);
   }
   
   ACE_INLINE void
   _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
-  CORBA::ParameterDescription *data,
+  CORBA_ParameterDescription *data,
   CORBA::Boolean release)
   {
     this->maximum_ = max;
     this->length_ = length;
     if (this->buffer_ && this->release_ == 1)
     {
-      CORBA::ParameterDescription *tmp = ACE_reinterpret_cast(CORBA::ParameterDescription*,this->buffer_);
+      CORBA_ParameterDescription *tmp = ACE_reinterpret_cast(CORBA_ParameterDescription*,this->buffer_);
       _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::freebuf (tmp);
     }
     this->buffer_ = data;
@@ -5944,16 +2949,16 @@ CORBA_ParDescriptionSeq_var::operator ::CORBA_ParDescriptionSeq *&() // cast
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::ParameterDescription &
+ACE_INLINE CORBA_ParameterDescription &
 CORBA_ParDescriptionSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::ParameterDescription &
+ACE_INLINE const CORBA_ParameterDescription &
 CORBA_ParDescriptionSeq_var::operator[] (CORBA::ULong index) const
 {
-  return ACE_const_cast (const CORBA::ParameterDescription &, this->ptr_->operator[] (index));
+  return ACE_const_cast (const CORBA_ParameterDescription &, this->ptr_->operator[] (index));
 }
 
 ACE_INLINE const ::CORBA_ParDescriptionSeq &
@@ -6047,7 +3052,7 @@ CORBA_ParDescriptionSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::ParameterDescription &
+ACE_INLINE CORBA_ParameterDescription &
 CORBA_ParDescriptionSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -6272,184 +3277,58 @@ CORBA_ContextIdSeq_out::operator[] (CORBA::ULong index)
 #if !defined (_CORBA_OPERATIONDEF___CI_)
 #define _CORBA_OPERATIONDEF___CI_
 
-ACE_INLINE
-CORBA_OperationDef::CORBA_OperationDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE CORBA_OperationDef_ptr
+tao_CORBA_OperationDef_duplicate (
+    CORBA_OperationDef_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->CORBA_OperationDef_setup_collocation (_tao_collocated);
+  return CORBA_OperationDef::_duplicate (p);
 }
 
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_OPERATIONDEF___VAR_CI_)
-#define _CORBA_OPERATIONDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_OperationDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_OperationDef_var::CORBA_OperationDef_var (void) // default constructor
-  : ptr_ (CORBA_OperationDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_OperationDef_ptr
-CORBA_OperationDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_OperationDef_var::CORBA_OperationDef_var (const ::CORBA_OperationDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_OperationDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_OperationDef_var::~CORBA_OperationDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_OperationDef_var &
-CORBA_OperationDef_var::operator= (CORBA_OperationDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_OperationDef_var &
-CORBA_OperationDef_var::operator= (const ::CORBA_OperationDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_OperationDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_OperationDef_var::operator const ::CORBA_OperationDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_OperationDef_var::operator ::CORBA_OperationDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_OperationDef_ptr
-CORBA_OperationDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_OperationDef_ptr
-CORBA_OperationDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_OperationDef_ptr &
-CORBA_OperationDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_OperationDef_ptr &
-CORBA_OperationDef_var::out (void)
+ACE_INLINE void
+tao_CORBA_OperationDef_release (
+    CORBA_OperationDef_ptr p
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_OperationDef::_nil ();
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_OperationDef_ptr
-CORBA_OperationDef_var::_retn (void)
+ACE_INLINE CORBA_OperationDef_ptr
+tao_CORBA_OperationDef_nil (
+    void
+  )
 {
-  // yield ownership of managed obj reference
-  ::CORBA_OperationDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_OperationDef::_nil ();
-  return val;
+  return CORBA_OperationDef::_nil ();
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_OPERATIONDEF___OUT_CI_)
-#define _CORBA_OPERATIONDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_OperationDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_OperationDef_out::CORBA_OperationDef_out (CORBA_OperationDef_ptr &p)
-  : ptr_ (p)
+ACE_INLINE CORBA_OperationDef_ptr
+tao_CORBA_OperationDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  this->ptr_ = ::CORBA_OperationDef::_nil ();
+  return CORBA_OperationDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE
-CORBA_OperationDef_out::CORBA_OperationDef_out (CORBA_OperationDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
+ACE_INLINE CORBA::Object *
+tao_CORBA_OperationDef_upcast (
+    void *src
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_OperationDef::_nil ();
+  CORBA_OperationDef **tmp =
+    ACE_static_cast (CORBA_OperationDef **, src);
+  return *tmp;
 }
 
 ACE_INLINE
-CORBA_OperationDef_out::CORBA_OperationDef_out (const ::CORBA_OperationDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_OperationDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_OperationDef_out &
-CORBA_OperationDef_out::operator= (const ::CORBA_OperationDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_OperationDef_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_OperationDef_out &
-CORBA_OperationDef_out::operator= (const ::CORBA_OperationDef_var &p)
-{
-  this->ptr_ = ::CORBA_OperationDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_OperationDef_out &
-CORBA_OperationDef_out::operator= (CORBA_OperationDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_OperationDef_out::operator ::CORBA_OperationDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_OperationDef_ptr &
-CORBA_OperationDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_OperationDef_ptr
-CORBA_OperationDef_out::operator-> (void)
+CORBA_OperationDef::CORBA_OperationDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->CORBA_OperationDef_setup_collocation (_tao_collocated);
 }
 
 
@@ -6867,16 +3746,16 @@ CORBA_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CI_
 
   // = Static operations.
-  ACE_INLINE CORBA::OperationDescription *
+  ACE_INLINE CORBA_OperationDescription *
   _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (CORBA::ULong size)
   // Allocate storage for the sequence.
   {
-    CORBA::OperationDescription *retval = 0;
-    ACE_NEW_RETURN (retval, CORBA::OperationDescription[size], 0);
+    CORBA_OperationDescription *retval = 0;
+    ACE_NEW_RETURN (retval, CORBA_OperationDescription[size], 0);
     return retval;
   }
   
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (CORBA::OperationDescription *buffer)
+  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (CORBA_OperationDescription *buffer)
   // Free the sequence.
   {
     delete [] buffer;
@@ -6896,7 +3775,7 @@ CORBA_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
   ACE_INLINE
   _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (CORBA::ULong maximum,
     CORBA::ULong length,
-    CORBA::OperationDescription *data,
+    CORBA_OperationDescription *data,
     CORBA::Boolean release)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
@@ -6909,8 +3788,8 @@ CORBA_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
   {
     if (rhs.buffer_ != 0)
     {
-      CORBA::OperationDescription *tmp1 = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (this->maximum_);
-      CORBA::OperationDescription * const tmp2 = ACE_reinterpret_cast (CORBA::OperationDescription * ACE_CAST_CONST, rhs.buffer_);
+      CORBA_OperationDescription *tmp1 = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (this->maximum_);
+      CORBA_OperationDescription * const tmp2 = ACE_reinterpret_cast (CORBA_OperationDescription * ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
@@ -6935,7 +3814,7 @@ CORBA_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
       if (this->maximum_ < rhs.maximum_)
       {
         // free the old buffer
-        CORBA::OperationDescription *tmp = ACE_reinterpret_cast (CORBA::OperationDescription *, this->buffer_);
+        CORBA_OperationDescription *tmp = ACE_reinterpret_cast (CORBA_OperationDescription *, this->buffer_);
         _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (tmp);
         this->buffer_ = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (rhs.maximum_);
       }
@@ -6945,8 +3824,8 @@ CORBA_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
     
     TAO_Unbounded_Base_Sequence::operator= (rhs);
     
-    CORBA::OperationDescription *tmp1 = ACE_reinterpret_cast (CORBA::OperationDescription *, this->buffer_);
-    CORBA::OperationDescription * const tmp2 = ACE_reinterpret_cast (CORBA::OperationDescription * ACE_CAST_CONST, rhs.buffer_);
+    CORBA_OperationDescription *tmp1 = ACE_reinterpret_cast (CORBA_OperationDescription *, this->buffer_);
+    CORBA_OperationDescription * const tmp2 = ACE_reinterpret_cast (CORBA_OperationDescription * ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
@@ -6955,30 +3834,30 @@ CORBA_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
   }
   
   // = Accessors.
-  ACE_INLINE CORBA::OperationDescription &
+  ACE_INLINE CORBA_OperationDescription &
   _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::operator[] (CORBA::ULong i)
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    CORBA::OperationDescription* tmp = ACE_reinterpret_cast(CORBA::OperationDescription*,this->buffer_);
+    CORBA_OperationDescription* tmp = ACE_reinterpret_cast(CORBA_OperationDescription*,this->buffer_);
     return tmp[i];
   }
   
-  ACE_INLINE const CORBA::OperationDescription &
+  ACE_INLINE const CORBA_OperationDescription &
   _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::operator[] (CORBA::ULong i) const
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    CORBA::OperationDescription * const tmp = ACE_reinterpret_cast (CORBA::OperationDescription* ACE_CAST_CONST, this->buffer_);
+    CORBA_OperationDescription * const tmp = ACE_reinterpret_cast (CORBA_OperationDescription* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
   
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
   
-  ACE_INLINE CORBA::OperationDescription *
+  ACE_INLINE CORBA_OperationDescription *
   _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::get_buffer (CORBA::Boolean orphan)
   {
-    CORBA::OperationDescription *result = 0;
+    CORBA_OperationDescription *result = 0;
     if (orphan == 0)
     {
       // We retain ownership.
@@ -6990,7 +3869,7 @@ CORBA_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
       }
       else
       {
-        result = ACE_reinterpret_cast (CORBA::OperationDescription*, this->buffer_);
+        result = ACE_reinterpret_cast (CORBA_OperationDescription*, this->buffer_);
       }
     }
     else // if (orphan == 1)
@@ -6999,7 +3878,7 @@ CORBA_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
       {
         // We set the state back to default and relinquish
         // ownership.
-        result = ACE_reinterpret_cast(CORBA::OperationDescription*,this->buffer_);
+        result = ACE_reinterpret_cast(CORBA_OperationDescription*,this->buffer_);
         this->maximum_ = 0;
         this->length_ = 0;
         this->buffer_ = 0;
@@ -7009,23 +3888,23 @@ CORBA_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
     return result;
   }
   
-  ACE_INLINE const CORBA::OperationDescription *
+  ACE_INLINE const CORBA_OperationDescription *
   _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::get_buffer (void) const
   {
-    return ACE_reinterpret_cast(const CORBA::OperationDescription * ACE_CAST_CONST, this->buffer_);
+    return ACE_reinterpret_cast(const CORBA_OperationDescription * ACE_CAST_CONST, this->buffer_);
   }
   
   ACE_INLINE void
   _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
-  CORBA::OperationDescription *data,
+  CORBA_OperationDescription *data,
   CORBA::Boolean release)
   {
     this->maximum_ = max;
     this->length_ = length;
     if (this->buffer_ && this->release_ == 1)
     {
-      CORBA::OperationDescription *tmp = ACE_reinterpret_cast(CORBA::OperationDescription*,this->buffer_);
+      CORBA_OperationDescription *tmp = ACE_reinterpret_cast(CORBA_OperationDescription*,this->buffer_);
       _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (tmp);
     }
     this->buffer_ = data;
@@ -7142,16 +4021,16 @@ CORBA_OpDescriptionSeq_var::operator ::CORBA_OpDescriptionSeq *&() // cast
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::OperationDescription &
+ACE_INLINE CORBA_OperationDescription &
 CORBA_OpDescriptionSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::OperationDescription &
+ACE_INLINE const CORBA_OperationDescription &
 CORBA_OpDescriptionSeq_var::operator[] (CORBA::ULong index) const
 {
-  return ACE_const_cast (const CORBA::OperationDescription &, this->ptr_->operator[] (index));
+  return ACE_const_cast (const CORBA_OperationDescription &, this->ptr_->operator[] (index));
 }
 
 ACE_INLINE const ::CORBA_OpDescriptionSeq &
@@ -7245,7 +4124,7 @@ CORBA_OpDescriptionSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::OperationDescription &
+ACE_INLINE CORBA_OperationDescription &
 CORBA_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -7261,16 +4140,16 @@ CORBA_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CI_
 
   // = Static operations.
-  ACE_INLINE CORBA::AttributeDescription *
+  ACE_INLINE CORBA_AttributeDescription *
   _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (CORBA::ULong size)
   // Allocate storage for the sequence.
   {
-    CORBA::AttributeDescription *retval = 0;
-    ACE_NEW_RETURN (retval, CORBA::AttributeDescription[size], 0);
+    CORBA_AttributeDescription *retval = 0;
+    ACE_NEW_RETURN (retval, CORBA_AttributeDescription[size], 0);
     return retval;
   }
   
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (CORBA::AttributeDescription *buffer)
+  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (CORBA_AttributeDescription *buffer)
   // Free the sequence.
   {
     delete [] buffer;
@@ -7290,7 +4169,7 @@ CORBA_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
   ACE_INLINE
   _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (CORBA::ULong maximum,
     CORBA::ULong length,
-    CORBA::AttributeDescription *data,
+    CORBA_AttributeDescription *data,
     CORBA::Boolean release)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
@@ -7303,8 +4182,8 @@ CORBA_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
   {
     if (rhs.buffer_ != 0)
     {
-      CORBA::AttributeDescription *tmp1 = _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (this->maximum_);
-      CORBA::AttributeDescription * const tmp2 = ACE_reinterpret_cast (CORBA::AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
+      CORBA_AttributeDescription *tmp1 = _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (this->maximum_);
+      CORBA_AttributeDescription * const tmp2 = ACE_reinterpret_cast (CORBA_AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
@@ -7329,7 +4208,7 @@ CORBA_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
       if (this->maximum_ < rhs.maximum_)
       {
         // free the old buffer
-        CORBA::AttributeDescription *tmp = ACE_reinterpret_cast (CORBA::AttributeDescription *, this->buffer_);
+        CORBA_AttributeDescription *tmp = ACE_reinterpret_cast (CORBA_AttributeDescription *, this->buffer_);
         _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
         this->buffer_ = _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (rhs.maximum_);
       }
@@ -7339,8 +4218,8 @@ CORBA_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
     
     TAO_Unbounded_Base_Sequence::operator= (rhs);
     
-    CORBA::AttributeDescription *tmp1 = ACE_reinterpret_cast (CORBA::AttributeDescription *, this->buffer_);
-    CORBA::AttributeDescription * const tmp2 = ACE_reinterpret_cast (CORBA::AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
+    CORBA_AttributeDescription *tmp1 = ACE_reinterpret_cast (CORBA_AttributeDescription *, this->buffer_);
+    CORBA_AttributeDescription * const tmp2 = ACE_reinterpret_cast (CORBA_AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
@@ -7349,30 +4228,30 @@ CORBA_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
   }
   
   // = Accessors.
-  ACE_INLINE CORBA::AttributeDescription &
+  ACE_INLINE CORBA_AttributeDescription &
   _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::operator[] (CORBA::ULong i)
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    CORBA::AttributeDescription* tmp = ACE_reinterpret_cast(CORBA::AttributeDescription*,this->buffer_);
+    CORBA_AttributeDescription* tmp = ACE_reinterpret_cast(CORBA_AttributeDescription*,this->buffer_);
     return tmp[i];
   }
   
-  ACE_INLINE const CORBA::AttributeDescription &
+  ACE_INLINE const CORBA_AttributeDescription &
   _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::operator[] (CORBA::ULong i) const
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    CORBA::AttributeDescription * const tmp = ACE_reinterpret_cast (CORBA::AttributeDescription* ACE_CAST_CONST, this->buffer_);
+    CORBA_AttributeDescription * const tmp = ACE_reinterpret_cast (CORBA_AttributeDescription* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
   
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
   
-  ACE_INLINE CORBA::AttributeDescription *
+  ACE_INLINE CORBA_AttributeDescription *
   _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::get_buffer (CORBA::Boolean orphan)
   {
-    CORBA::AttributeDescription *result = 0;
+    CORBA_AttributeDescription *result = 0;
     if (orphan == 0)
     {
       // We retain ownership.
@@ -7384,7 +4263,7 @@ CORBA_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
       }
       else
       {
-        result = ACE_reinterpret_cast (CORBA::AttributeDescription*, this->buffer_);
+        result = ACE_reinterpret_cast (CORBA_AttributeDescription*, this->buffer_);
       }
     }
     else // if (orphan == 1)
@@ -7393,7 +4272,7 @@ CORBA_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
       {
         // We set the state back to default and relinquish
         // ownership.
-        result = ACE_reinterpret_cast(CORBA::AttributeDescription*,this->buffer_);
+        result = ACE_reinterpret_cast(CORBA_AttributeDescription*,this->buffer_);
         this->maximum_ = 0;
         this->length_ = 0;
         this->buffer_ = 0;
@@ -7403,23 +4282,23 @@ CORBA_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
     return result;
   }
   
-  ACE_INLINE const CORBA::AttributeDescription *
+  ACE_INLINE const CORBA_AttributeDescription *
   _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::get_buffer (void) const
   {
-    return ACE_reinterpret_cast(const CORBA::AttributeDescription * ACE_CAST_CONST, this->buffer_);
+    return ACE_reinterpret_cast(const CORBA_AttributeDescription * ACE_CAST_CONST, this->buffer_);
   }
   
   ACE_INLINE void
   _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
-  CORBA::AttributeDescription *data,
+  CORBA_AttributeDescription *data,
   CORBA::Boolean release)
   {
     this->maximum_ = max;
     this->length_ = length;
     if (this->buffer_ && this->release_ == 1)
     {
-      CORBA::AttributeDescription *tmp = ACE_reinterpret_cast(CORBA::AttributeDescription*,this->buffer_);
+      CORBA_AttributeDescription *tmp = ACE_reinterpret_cast(CORBA_AttributeDescription*,this->buffer_);
       _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
     }
     this->buffer_ = data;
@@ -7536,16 +4415,16 @@ CORBA_AttrDescriptionSeq_var::operator ::CORBA_AttrDescriptionSeq *&() // cast
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::AttributeDescription &
+ACE_INLINE CORBA_AttributeDescription &
 CORBA_AttrDescriptionSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::AttributeDescription &
+ACE_INLINE const CORBA_AttributeDescription &
 CORBA_AttrDescriptionSeq_var::operator[] (CORBA::ULong index) const
 {
-  return ACE_const_cast (const CORBA::AttributeDescription &, this->ptr_->operator[] (index));
+  return ACE_const_cast (const CORBA_AttributeDescription &, this->ptr_->operator[] (index));
 }
 
 ACE_INLINE const ::CORBA_AttrDescriptionSeq &
@@ -7639,7 +4518,7 @@ CORBA_AttrDescriptionSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::AttributeDescription &
+ACE_INLINE CORBA_AttributeDescription &
 CORBA_AttrDescriptionSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -7649,44 +4528,44 @@ CORBA_AttrDescriptionSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 // *************************************************************
-// Inline operations for class CORBA::InterfaceDef::FullInterfaceDescription_var
+// Inline operations for class CORBA_InterfaceDef::FullInterfaceDescription_var
 // *************************************************************
 
 ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::FullInterfaceDescription_var (void) // default constructor
+CORBA_InterfaceDef::FullInterfaceDescription_var::FullInterfaceDescription_var (void) // default constructor
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::FullInterfaceDescription_var (FullInterfaceDescription *p)
+CORBA_InterfaceDef::FullInterfaceDescription_var::FullInterfaceDescription_var (FullInterfaceDescription *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::FullInterfaceDescription_var (const ::CORBA::InterfaceDef::FullInterfaceDescription_var &p) // copy constructor
+CORBA_InterfaceDef::FullInterfaceDescription_var::FullInterfaceDescription_var (const ::CORBA_InterfaceDef::FullInterfaceDescription_var &p) // copy constructor
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::InterfaceDef::FullInterfaceDescription (*p.ptr_));
+    ACE_NEW (this->ptr_, ::CORBA_InterfaceDef::FullInterfaceDescription (*p.ptr_));
   else
     this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::~FullInterfaceDescription_var (void) // destructor
+CORBA_InterfaceDef::FullInterfaceDescription_var::~FullInterfaceDescription_var (void) // destructor
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA::InterfaceDef::FullInterfaceDescription_var &
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator= (FullInterfaceDescription *p)
+ACE_INLINE CORBA_InterfaceDef::FullInterfaceDescription_var &
+CORBA_InterfaceDef::FullInterfaceDescription_var::operator= (FullInterfaceDescription *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription_var &
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator= (const ::CORBA::InterfaceDef::FullInterfaceDescription_var &p)
+ACE_INLINE ::CORBA_InterfaceDef::FullInterfaceDescription_var &
+CORBA_InterfaceDef::FullInterfaceDescription_var::operator= (const ::CORBA_InterfaceDef::FullInterfaceDescription_var &p)
 {
   if (this != &p)
     {
@@ -7713,91 +4592,91 @@ CORBA::InterfaceDef::FullInterfaceDescription_var::operator= (const ::CORBA::Int
   return *this;
 }
 
-ACE_INLINE const ::CORBA::InterfaceDef::FullInterfaceDescription *
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator-> (void) const
+ACE_INLINE const ::CORBA_InterfaceDef::FullInterfaceDescription *
+CORBA_InterfaceDef::FullInterfaceDescription_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription *
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator-> (void)
+ACE_INLINE ::CORBA_InterfaceDef::FullInterfaceDescription *
+CORBA_InterfaceDef::FullInterfaceDescription_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator const ::CORBA::InterfaceDef::FullInterfaceDescription &() const // cast
+CORBA_InterfaceDef::FullInterfaceDescription_var::operator const ::CORBA_InterfaceDef::FullInterfaceDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator ::CORBA::InterfaceDef::FullInterfaceDescription &() // cast 
+CORBA_InterfaceDef::FullInterfaceDescription_var::operator ::CORBA_InterfaceDef::FullInterfaceDescription &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator ::CORBA::InterfaceDef::FullInterfaceDescription &() const // cast 
+CORBA_InterfaceDef::FullInterfaceDescription_var::operator ::CORBA_InterfaceDef::FullInterfaceDescription &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_var::operator ::CORBA::InterfaceDef::FullInterfaceDescription *&() // cast 
+CORBA_InterfaceDef::FullInterfaceDescription_var::operator ::CORBA_InterfaceDef::FullInterfaceDescription *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE const ::CORBA::InterfaceDef::FullInterfaceDescription &
-CORBA::InterfaceDef::FullInterfaceDescription_var::in (void) const
+ACE_INLINE const ::CORBA_InterfaceDef::FullInterfaceDescription &
+CORBA_InterfaceDef::FullInterfaceDescription_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription &
-CORBA::InterfaceDef::FullInterfaceDescription_var::inout (void)
+ACE_INLINE ::CORBA_InterfaceDef::FullInterfaceDescription &
+CORBA_InterfaceDef::FullInterfaceDescription_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // mapping for variable size 
-ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription *&
-CORBA::InterfaceDef::FullInterfaceDescription_var::out (void)
+ACE_INLINE ::CORBA_InterfaceDef::FullInterfaceDescription *&
+CORBA_InterfaceDef::FullInterfaceDescription_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription *
-CORBA::InterfaceDef::FullInterfaceDescription_var::_retn (void)
+ACE_INLINE ::CORBA_InterfaceDef::FullInterfaceDescription *
+CORBA_InterfaceDef::FullInterfaceDescription_var::_retn (void)
 {
-  ::CORBA::InterfaceDef::FullInterfaceDescription *tmp = this->ptr_;
+  ::CORBA_InterfaceDef::FullInterfaceDescription *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription *
-CORBA::InterfaceDef::FullInterfaceDescription_var::ptr (void) const
+ACE_INLINE ::CORBA_InterfaceDef::FullInterfaceDescription *
+CORBA_InterfaceDef::FullInterfaceDescription_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // *************************************************************
-// Inline operations for class CORBA::InterfaceDef::FullInterfaceDescription_out
+// Inline operations for class CORBA_InterfaceDef::FullInterfaceDescription_out
 // *************************************************************
 
 ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_out::FullInterfaceDescription_out (::CORBA::InterfaceDef::FullInterfaceDescription *&p)
+CORBA_InterfaceDef::FullInterfaceDescription_out::FullInterfaceDescription_out (::CORBA_InterfaceDef::FullInterfaceDescription *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_out::FullInterfaceDescription_out (FullInterfaceDescription_var &p) // constructor from _var
+CORBA_InterfaceDef::FullInterfaceDescription_out::FullInterfaceDescription_out (FullInterfaceDescription_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -7805,38 +4684,38 @@ CORBA::InterfaceDef::FullInterfaceDescription_out::FullInterfaceDescription_out
 }
 
 ACE_INLINE
-CORBA::InterfaceDef::FullInterfaceDescription_out::FullInterfaceDescription_out (const ::CORBA::InterfaceDef::FullInterfaceDescription_out &p) // copy constructor
+CORBA_InterfaceDef::FullInterfaceDescription_out::FullInterfaceDescription_out (const ::CORBA_InterfaceDef::FullInterfaceDescription_out &p) // copy constructor
   : ptr_ (ACE_const_cast (FullInterfaceDescription_out&, p).ptr_)
 {}
 
-ACE_INLINE CORBA::InterfaceDef::FullInterfaceDescription_out &
-CORBA::InterfaceDef::FullInterfaceDescription_out::operator= (const ::CORBA::InterfaceDef::FullInterfaceDescription_out &p)
+ACE_INLINE CORBA_InterfaceDef::FullInterfaceDescription_out &
+CORBA_InterfaceDef::FullInterfaceDescription_out::operator= (const ::CORBA_InterfaceDef::FullInterfaceDescription_out &p)
 {
   this->ptr_ = ACE_const_cast (FullInterfaceDescription_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE CORBA::InterfaceDef::FullInterfaceDescription_out &
-CORBA::InterfaceDef::FullInterfaceDescription_out::operator= (FullInterfaceDescription *p)
+ACE_INLINE CORBA_InterfaceDef::FullInterfaceDescription_out &
+CORBA_InterfaceDef::FullInterfaceDescription_out::operator= (FullInterfaceDescription *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE 
-CORBA::InterfaceDef::FullInterfaceDescription_out::operator ::CORBA::InterfaceDef::FullInterfaceDescription *&() // cast
+CORBA_InterfaceDef::FullInterfaceDescription_out::operator ::CORBA_InterfaceDef::FullInterfaceDescription *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription *&
-CORBA::InterfaceDef::FullInterfaceDescription_out::ptr (void) // ptr
+ACE_INLINE ::CORBA_InterfaceDef::FullInterfaceDescription *&
+CORBA_InterfaceDef::FullInterfaceDescription_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::InterfaceDef::FullInterfaceDescription *
-CORBA::InterfaceDef::FullInterfaceDescription_out::operator-> (void)
+ACE_INLINE ::CORBA_InterfaceDef::FullInterfaceDescription *
+CORBA_InterfaceDef::FullInterfaceDescription_out::operator-> (void)
 {
   return this->ptr_;
 }
@@ -7845,184 +4724,58 @@ CORBA::InterfaceDef::FullInterfaceDescription_out::operator-> (void)
 #if !defined (_CORBA_INTERFACEDEF___CI_)
 #define _CORBA_INTERFACEDEF___CI_
 
-ACE_INLINE
-CORBA_InterfaceDef::CORBA_InterfaceDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE CORBA_InterfaceDef_ptr
+tao_CORBA_InterfaceDef_duplicate (
+    CORBA_InterfaceDef_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->CORBA_InterfaceDef_setup_collocation (_tao_collocated);
+  return CORBA_InterfaceDef::_duplicate (p);
 }
 
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_INTERFACEDEF___VAR_CI_)
-#define _CORBA_INTERFACEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_InterfaceDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_InterfaceDef_var::CORBA_InterfaceDef_var (void) // default constructor
-  : ptr_ (CORBA_InterfaceDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_InterfaceDef_ptr
-CORBA_InterfaceDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_InterfaceDef_var::CORBA_InterfaceDef_var (const ::CORBA_InterfaceDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_InterfaceDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_InterfaceDef_var::~CORBA_InterfaceDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_InterfaceDef_var &
-CORBA_InterfaceDef_var::operator= (CORBA_InterfaceDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_InterfaceDef_var &
-CORBA_InterfaceDef_var::operator= (const ::CORBA_InterfaceDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_InterfaceDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_InterfaceDef_var::operator const ::CORBA_InterfaceDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_InterfaceDef_var::operator ::CORBA_InterfaceDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_InterfaceDef_ptr
-CORBA_InterfaceDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_InterfaceDef_ptr
-CORBA_InterfaceDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_InterfaceDef_ptr &
-CORBA_InterfaceDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_InterfaceDef_ptr &
-CORBA_InterfaceDef_var::out (void)
+ACE_INLINE void
+tao_CORBA_InterfaceDef_release (
+    CORBA_InterfaceDef_ptr p
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_InterfaceDef::_nil ();
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_InterfaceDef_ptr
-CORBA_InterfaceDef_var::_retn (void)
+ACE_INLINE CORBA_InterfaceDef_ptr
+tao_CORBA_InterfaceDef_nil (
+    void
+  )
 {
-  // yield ownership of managed obj reference
-  ::CORBA_InterfaceDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_InterfaceDef::_nil ();
-  return val;
+  return CORBA_InterfaceDef::_nil ();
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_INTERFACEDEF___OUT_CI_)
-#define _CORBA_INTERFACEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_InterfaceDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_InterfaceDef_out::CORBA_InterfaceDef_out (CORBA_InterfaceDef_ptr &p)
-  : ptr_ (p)
+ACE_INLINE CORBA_InterfaceDef_ptr
+tao_CORBA_InterfaceDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  this->ptr_ = ::CORBA_InterfaceDef::_nil ();
+  return CORBA_InterfaceDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE
-CORBA_InterfaceDef_out::CORBA_InterfaceDef_out (CORBA_InterfaceDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
+ACE_INLINE CORBA::Object *
+tao_CORBA_InterfaceDef_upcast (
+    void *src
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_InterfaceDef::_nil ();
+  CORBA_InterfaceDef **tmp =
+    ACE_static_cast (CORBA_InterfaceDef **, src);
+  return *tmp;
 }
 
 ACE_INLINE
-CORBA_InterfaceDef_out::CORBA_InterfaceDef_out (const ::CORBA_InterfaceDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_InterfaceDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_InterfaceDef_out &
-CORBA_InterfaceDef_out::operator= (const ::CORBA_InterfaceDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_InterfaceDef_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_InterfaceDef_out &
-CORBA_InterfaceDef_out::operator= (const ::CORBA_InterfaceDef_var &p)
-{
-  this->ptr_ = ::CORBA_InterfaceDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_InterfaceDef_out &
-CORBA_InterfaceDef_out::operator= (CORBA_InterfaceDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_InterfaceDef_out::operator ::CORBA_InterfaceDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_InterfaceDef_ptr &
-CORBA_InterfaceDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_InterfaceDef_ptr
-CORBA_InterfaceDef_out::operator-> (void)
+CORBA_InterfaceDef::CORBA_InterfaceDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->CORBA_InterfaceDef_setup_collocation (_tao_collocated);
 }
 
 
@@ -8225,193 +4978,110 @@ CORBA_InterfaceDescription_out::operator-> (void)
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF___CI_)
 #define _CORBA_ABSTRACTINTERFACEDEF___CI_
 
-ACE_INLINE
-CORBA_AbstractInterfaceDef::CORBA_AbstractInterfaceDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE CORBA_AbstractInterfaceDef_ptr
+tao_CORBA_AbstractInterfaceDef_duplicate (
+    CORBA_AbstractInterfaceDef_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->CORBA_AbstractInterfaceDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF___VAR_CI_)
-#define _CORBA_ABSTRACTINTERFACEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_AbstractInterfaceDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_AbstractInterfaceDef_var::CORBA_AbstractInterfaceDef_var (void) // default constructor
-  : ptr_ (CORBA_AbstractInterfaceDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_AbstractInterfaceDef_ptr
-CORBA_AbstractInterfaceDef_var::ptr (void) const
 {
-  return this->ptr_;
+  return CORBA_AbstractInterfaceDef::_duplicate (p);
 }
 
-ACE_INLINE
-CORBA_AbstractInterfaceDef_var::CORBA_AbstractInterfaceDef_var (const ::CORBA_AbstractInterfaceDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_AbstractInterfaceDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_AbstractInterfaceDef_var::~CORBA_AbstractInterfaceDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_AbstractInterfaceDef_var &
-CORBA_AbstractInterfaceDef_var::operator= (CORBA_AbstractInterfaceDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_AbstractInterfaceDef_var &
-CORBA_AbstractInterfaceDef_var::operator= (const ::CORBA_AbstractInterfaceDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_AbstractInterfaceDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_AbstractInterfaceDef_var::operator const ::CORBA_AbstractInterfaceDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_AbstractInterfaceDef_var::operator ::CORBA_AbstractInterfaceDef_ptr &() // cast 
+ACE_INLINE void
+tao_CORBA_AbstractInterfaceDef_release (
+    CORBA_AbstractInterfaceDef_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_AbstractInterfaceDef_ptr
-CORBA_AbstractInterfaceDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_AbstractInterfaceDef_ptr
-CORBA_AbstractInterfaceDef_var::in (void) const
+ACE_INLINE CORBA_AbstractInterfaceDef_ptr
+tao_CORBA_AbstractInterfaceDef_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_AbstractInterfaceDef::_nil ();
 }
 
-ACE_INLINE ::CORBA_AbstractInterfaceDef_ptr &
-CORBA_AbstractInterfaceDef_var::inout (void)
+ACE_INLINE CORBA_AbstractInterfaceDef_ptr
+tao_CORBA_AbstractInterfaceDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_AbstractInterfaceDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_AbstractInterfaceDef_ptr &
-CORBA_AbstractInterfaceDef_var::out (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_AbstractInterfaceDef_upcast (
+    void *src
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_AbstractInterfaceDef::_nil ();
-  return this->ptr_;
+  CORBA_AbstractInterfaceDef **tmp =
+    ACE_static_cast (CORBA_AbstractInterfaceDef **, src);
+  return *tmp;
 }
 
-ACE_INLINE ::CORBA_AbstractInterfaceDef_ptr
-CORBA_AbstractInterfaceDef_var::_retn (void)
+ACE_INLINE
+CORBA_AbstractInterfaceDef::CORBA_AbstractInterfaceDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  // yield ownership of managed obj reference
-  ::CORBA_AbstractInterfaceDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_AbstractInterfaceDef::_nil ();
-  return val;
+  this->CORBA_AbstractInterfaceDef_setup_collocation (_tao_collocated);
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF___OUT_CI_)
-#define _CORBA_ABSTRACTINTERFACEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_AbstractInterfaceDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_AbstractInterfaceDef_out::CORBA_AbstractInterfaceDef_out (CORBA_AbstractInterfaceDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_AbstractInterfaceDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_AbstractInterfaceDef_out::CORBA_AbstractInterfaceDef_out (CORBA_AbstractInterfaceDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_AbstractInterfaceDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_AbstractInterfaceDef_out::CORBA_AbstractInterfaceDef_out (const ::CORBA_AbstractInterfaceDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_AbstractInterfaceDef_out &, p).ptr_)
-{}
+#if !defined (_CORBA_LOCALINTERFACEDEF___CI_)
+#define _CORBA_LOCALINTERFACEDEF___CI_
 
-ACE_INLINE ::CORBA_AbstractInterfaceDef_out &
-CORBA_AbstractInterfaceDef_out::operator= (const ::CORBA_AbstractInterfaceDef_out &p)
+ACE_INLINE CORBA_LocalInterfaceDef_ptr
+tao_CORBA_LocalInterfaceDef_duplicate (
+    CORBA_LocalInterfaceDef_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (CORBA_AbstractInterfaceDef_out&, p).ptr_;
-  return *this;
+  return CORBA_LocalInterfaceDef::_duplicate (p);
 }
 
-ACE_INLINE CORBA_AbstractInterfaceDef_out &
-CORBA_AbstractInterfaceDef_out::operator= (const ::CORBA_AbstractInterfaceDef_var &p)
-{
-  this->ptr_ = ::CORBA_AbstractInterfaceDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_AbstractInterfaceDef_out &
-CORBA_AbstractInterfaceDef_out::operator= (CORBA_AbstractInterfaceDef_ptr p)
+ACE_INLINE void
+tao_CORBA_LocalInterfaceDef_release (
+    CORBA_LocalInterfaceDef_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-CORBA_AbstractInterfaceDef_out::operator ::CORBA_AbstractInterfaceDef_ptr &() // cast
+ACE_INLINE CORBA_LocalInterfaceDef_ptr
+tao_CORBA_LocalInterfaceDef_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_LocalInterfaceDef::_nil ();
 }
 
-ACE_INLINE ::CORBA_AbstractInterfaceDef_ptr &
-CORBA_AbstractInterfaceDef_out::ptr (void) // ptr
+ACE_INLINE CORBA_LocalInterfaceDef_ptr
+tao_CORBA_LocalInterfaceDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_LocalInterfaceDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_AbstractInterfaceDef_ptr
-CORBA_AbstractInterfaceDef_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_LocalInterfaceDef_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  CORBA_LocalInterfaceDef **tmp =
+    ACE_static_cast (CORBA_LocalInterfaceDef **, src);
+  return *tmp;
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_LOCALINTERFACEDEF___CI_)
-#define _CORBA_LOCALINTERFACEDEF___CI_
-
 ACE_INLINE
 CORBA_LocalInterfaceDef::CORBA_LocalInterfaceDef (
     TAO_Stub *objref,
@@ -8423,238 +5093,69 @@ CORBA_LocalInterfaceDef::CORBA_LocalInterfaceDef (
   this->CORBA_LocalInterfaceDef_setup_collocation (_tao_collocated);
 }
 
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_LOCALINTERFACEDEF___VAR_CI_)
-#define _CORBA_LOCALINTERFACEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_LocalInterfaceDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_LocalInterfaceDef_var::CORBA_LocalInterfaceDef_var (void) // default constructor
-  : ptr_ (CORBA_LocalInterfaceDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_LocalInterfaceDef_ptr
-CORBA_LocalInterfaceDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_LocalInterfaceDef_var::CORBA_LocalInterfaceDef_var (const ::CORBA_LocalInterfaceDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_LocalInterfaceDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_LocalInterfaceDef_var::~CORBA_LocalInterfaceDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_LocalInterfaceDef_var &
-CORBA_LocalInterfaceDef_var::operator= (CORBA_LocalInterfaceDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_LocalInterfaceDef_var &
-CORBA_LocalInterfaceDef_var::operator= (const ::CORBA_LocalInterfaceDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_LocalInterfaceDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_LocalInterfaceDef_var::operator const ::CORBA_LocalInterfaceDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_LocalInterfaceDef_var::operator ::CORBA_LocalInterfaceDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_LocalInterfaceDef_ptr
-CORBA_LocalInterfaceDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_LocalInterfaceDef_ptr
-CORBA_LocalInterfaceDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_LocalInterfaceDef_ptr &
-CORBA_LocalInterfaceDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_LocalInterfaceDef_ptr &
-CORBA_LocalInterfaceDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_LocalInterfaceDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_LocalInterfaceDef_ptr
-CORBA_LocalInterfaceDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA_LocalInterfaceDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_LocalInterfaceDef::_nil ();
-  return val;
-}
-
 
 #endif /* end #if !defined */
 
-
-#if !defined (_CORBA_LOCALINTERFACEDEF___OUT_CI_)
-#define _CORBA_LOCALINTERFACEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_LocalInterfaceDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_LocalInterfaceDef_out::CORBA_LocalInterfaceDef_out (CORBA_LocalInterfaceDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_LocalInterfaceDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_LocalInterfaceDef_out::CORBA_LocalInterfaceDef_out (CORBA_LocalInterfaceDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_LocalInterfaceDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_LocalInterfaceDef_out::CORBA_LocalInterfaceDef_out (const ::CORBA_LocalInterfaceDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_LocalInterfaceDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_LocalInterfaceDef_out &
-CORBA_LocalInterfaceDef_out::operator= (const ::CORBA_LocalInterfaceDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_LocalInterfaceDef_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_LocalInterfaceDef_out &
-CORBA_LocalInterfaceDef_out::operator= (const ::CORBA_LocalInterfaceDef_var &p)
-{
-  this->ptr_ = ::CORBA_LocalInterfaceDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_LocalInterfaceDef_out &
-CORBA_LocalInterfaceDef_out::operator= (CORBA_LocalInterfaceDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_LocalInterfaceDef_out::operator ::CORBA_LocalInterfaceDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_LocalInterfaceDef_ptr &
-CORBA_LocalInterfaceDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_LocalInterfaceDef_ptr
-CORBA_LocalInterfaceDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const CORBA::PrimitiveDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     CORBA::PrimitiveDef_ptr &
   );
-ACE_INLINE CORBA::Boolean
-operator<< (
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::StringDef_ptr
+    const CORBA_StringDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::StringDef_ptr &
+    CORBA_StringDef_ptr &
   );
-ACE_INLINE CORBA::Boolean
-operator<< (
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::SequenceDef_ptr
+    const CORBA_SequenceDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::SequenceDef_ptr &
+    CORBA_SequenceDef_ptr &
   );
-ACE_INLINE CORBA::Boolean
-operator<< (
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::ArrayDef_ptr
+    const CORBA_ArrayDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::ArrayDef_ptr &
+    CORBA_ArrayDef_ptr &
   );
-ACE_INLINE CORBA::Boolean
-operator<< (
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::WstringDef_ptr
+    const CORBA_WstringDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::WstringDef_ptr &
+    CORBA_WstringDef_ptr &
   );
-ACE_INLINE CORBA::Boolean
-operator<< (
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::FixedDef_ptr
+    const CORBA_FixedDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::FixedDef_ptr &
+    CORBA_FixedDef_ptr &
   );
+
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::PrimitiveKind &_tao_enumval)
 {
   CORBA::ULong _tao_temp = _tao_enumval;
@@ -8674,105 +5175,27 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::PrimitiveKind &
   return _tao_result;
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::Repository_ptr
+    const CORBA_Repository_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::Repository_ptr &
+    CORBA_Repository_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Repository_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::Repository_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::Repository::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::ModuleDef_ptr
+    const CORBA_ModuleDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::ModuleDef_ptr &
+    CORBA_ModuleDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ModuleDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ModuleDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::ModuleDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ModuleDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_ModuleDescription &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.name.in ()) &&
@@ -8786,7 +5209,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ModuleDe
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ModuleDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ModuleDescription &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.name.out ()) &&
@@ -8800,56 +5223,17 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ModuleDescripti
   
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::ConstantDef_ptr
+    const CORBA_ConstantDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::ConstantDef_ptr &
+    CORBA_ConstantDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ConstantDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ConstantDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::ConstantDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ConstantDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_ConstantDescription &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.name.in ()) &&
@@ -8865,7 +5249,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Constant
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ConstantDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ConstantDescription &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.name.out ()) &&
@@ -8881,546 +5265,67 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ConstantDescrip
   
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::StructDef_ptr
+    const CORBA_StructDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::StructDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::StructDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::StructDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::StructDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::UnionDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::UnionDef_ptr &
+    CORBA_StructDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::UnionDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::UnionDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::UnionDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::EnumDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::EnumDef_ptr &
+    const CORBA_UnionDef_ptr
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::EnumDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::EnumDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::EnumDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::AliasDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::AliasDef_ptr &
+    CORBA_UnionDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::AliasDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::AliasDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::AliasDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::NativeDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::NativeDef_ptr &
+    const CORBA_EnumDef_ptr
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::NativeDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::NativeDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::NativeDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::PrimitiveDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::PrimitiveDef_ptr &
+    CORBA_EnumDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::PrimitiveDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::PrimitiveDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::PrimitiveDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::StringDef_ptr
+    const CORBA_AliasDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::StringDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::StringDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
 
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::StringDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::StringDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::WstringDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::WstringDef_ptr &
+    CORBA_AliasDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::WstringDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::WstringDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::WstringDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::SequenceDef_ptr
+    const CORBA_NativeDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::SequenceDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::SequenceDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::SequenceDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::SequenceDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ArrayDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::ArrayDef_ptr &
+    CORBA_NativeDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ArrayDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ArrayDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::ArrayDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::ExceptionDef_ptr
+    const CORBA_ExceptionDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::ExceptionDef_ptr &
+    CORBA_ExceptionDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ExceptionDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ExceptionDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::ExceptionDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ExceptionDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_ExceptionDescription &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.name.in ()) &&
@@ -9435,7 +5340,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Exceptio
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ExceptionDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ExceptionDescription &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.name.out ()) &&
@@ -9456,11 +5361,11 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ExceptionDescri
 
 CORBA::Boolean TAO_IFR_Client_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA::ExceptionDefSeq &
+    const CORBA_ExceptionDefSeq &
   );
 CORBA::Boolean TAO_IFR_Client_Export operator>> (
     TAO_InputCDR &,
-    CORBA::ExceptionDefSeq &
+    CORBA_ExceptionDefSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_ExceptionDefSeq_I_ */
@@ -9471,11 +5376,11 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 
 CORBA::Boolean TAO_IFR_Client_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA::ExcDescriptionSeq &
+    const CORBA_ExcDescriptionSeq &
   );
 CORBA::Boolean TAO_IFR_Client_Export operator>> (
     TAO_InputCDR &,
-    CORBA::ExcDescriptionSeq &
+    CORBA_ExcDescriptionSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_ExcDescriptionSeq_I_ */
@@ -9499,56 +5404,17 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::AttributeMode &
   return _tao_result;
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::AttributeDef_ptr
+    const CORBA_AttributeDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::AttributeDef_ptr &
+    CORBA_AttributeDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::AttributeDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::AttributeDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::AttributeDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::AttributeDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_AttributeDescription &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.name.in ()) &&
@@ -9564,7 +5430,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Attribut
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::AttributeDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_AttributeDescription &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.name.out ()) &&
@@ -9618,7 +5484,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ParameterMode &
   return _tao_result;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ParameterDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_ParameterDescription &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.name.in ()) &&
@@ -9632,7 +5498,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Paramete
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ParameterDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ParameterDescription &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.name.out ()) &&
@@ -9652,11 +5518,11 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ParameterDescri
 
 CORBA::Boolean TAO_IFR_Client_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA::ParDescriptionSeq &
+    const CORBA_ParDescriptionSeq &
   );
 CORBA::Boolean TAO_IFR_Client_Export operator>> (
     TAO_InputCDR &,
-    CORBA::ParDescriptionSeq &
+    CORBA_ParDescriptionSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_ParDescriptionSeq_I_ */
@@ -9667,65 +5533,26 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 
 CORBA::Boolean TAO_IFR_Client_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA::ContextIdSeq &
+    const CORBA_ContextIdSeq &
   );
 CORBA::Boolean TAO_IFR_Client_Export operator>> (
     TAO_InputCDR &,
-    CORBA::ContextIdSeq &
+    CORBA_ContextIdSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_ContextIdSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::OperationDef_ptr
+    const CORBA_OperationDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::OperationDef_ptr &
+    CORBA_OperationDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::OperationDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::OperationDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::OperationDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::OperationDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_OperationDescription &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.name.in ()) &&
@@ -9744,7 +5571,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Operatio
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::OperationDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_OperationDescription &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.name.out ()) &&
@@ -9769,11 +5596,11 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::OperationDescri
 
 CORBA::Boolean TAO_IFR_Client_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA::RepositoryIdSeq &
+    const CORBA_RepositoryIdSeq &
   );
 CORBA::Boolean TAO_IFR_Client_Export operator>> (
     TAO_InputCDR &,
-    CORBA::RepositoryIdSeq &
+    CORBA_RepositoryIdSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_RepositoryIdSeq_I_ */
@@ -9784,11 +5611,11 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 
 CORBA::Boolean TAO_IFR_Client_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA::OpDescriptionSeq &
+    const CORBA_OpDescriptionSeq &
   );
 CORBA::Boolean TAO_IFR_Client_Export operator>> (
     TAO_InputCDR &,
-    CORBA::OpDescriptionSeq &
+    CORBA_OpDescriptionSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_OpDescriptionSeq_I_ */
@@ -9799,27 +5626,26 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 
 CORBA::Boolean TAO_IFR_Client_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA::AttrDescriptionSeq &
+    const CORBA_AttrDescriptionSeq &
   );
 CORBA::Boolean TAO_IFR_Client_Export operator>> (
     TAO_InputCDR &,
-    CORBA::AttrDescriptionSeq &
+    CORBA_AttrDescriptionSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_AttrDescriptionSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::InterfaceDef_ptr
+    const CORBA_InterfaceDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::InterfaceDef_ptr &
+    CORBA_InterfaceDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::InterfaceDef::FullInterfaceDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_InterfaceDef::FullInterfaceDescription &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.name.in ()) &&
@@ -9837,7 +5663,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Interfac
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::InterfaceDef::FullInterfaceDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_InterfaceDef::FullInterfaceDescription &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.name.out ()) &&
@@ -9855,45 +5681,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::InterfaceDef::F
   
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::InterfaceDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::InterfaceDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::InterfaceDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::InterfaceDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_InterfaceDescription &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.name.in ()) &&
@@ -9908,7 +5696,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Interfac
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::InterfaceDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_InterfaceDescription &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.name.out ()) &&
@@ -9923,101 +5711,23 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::InterfaceDescri
   
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::AbstractInterfaceDef_ptr
+    const CORBA_AbstractInterfaceDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::AbstractInterfaceDef_ptr &
+    CORBA_AbstractInterfaceDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::AbstractInterfaceDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::AbstractInterfaceDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::AbstractInterfaceDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::LocalInterfaceDef_ptr
+    const CORBA_LocalInterfaceDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::LocalInterfaceDef_ptr &
+    CORBA_LocalInterfaceDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::LocalInterfaceDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::LocalInterfaceDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::LocalInterfaceDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
diff --git a/TAO/tao/IFR_Client/IFR_Components.pidl b/TAO/tao/IFR_Client/IFR_Components.pidl
index aee440cf962..6d4b54dd82a 100644
--- a/TAO/tao/IFR_Client/IFR_Components.pidl
+++ b/TAO/tao/IFR_Client/IFR_Components.pidl
@@ -16,15 +16,41 @@
 //   time. This IDL file contains all the interfaces and other data
 //   types related to CORBA components.
 //
-//   The command used to generate code from this IDL file is:
+//   1. Patch this pidl file with
 //
-//     tao_idl -o orig -Ge 1 \
+//      patch < diffs/IFR_Components.pidl.diff
+//
+//   This will remove the CORBA module, rename most types foo
+//   declared in it as CORBA_foo, unalias the simple typedefs
+//   which don't have a CORBA_ analog in corbafwd.h.
+//
+//   2. Generate the code. The command used to generate code from this 
+//   IDL file is:
+//
+//     tao_idl -o orig -Ge 1 -I.. \
 //          -Wb,export_macro=TAO_IFR_Client_Export \
 //          -Wb,export_include=ifr_client_export.h \
 //          -Wb,pre_include="ace/pre.h" \
 //          -Wb,post_include="ace/post.h" \
 //          IFR_Components.pidl
 //
+//   3. Copy the generated files to the current directory.
+//
+//   4. Patch the generated files, using
+//      
+//      patch < diffs/IFR_ComponentsC.h.diff
+//      patch < diffs/IFR_ComponentsC.i.diff
+//      patch < diffs/IFR_ComponentsC.cpp.diff
+//
+//   If this fails for some reason, the files must be patched
+//   by hand, and the diff files regenerated with
+//
+//      diff -wbu orig/IFR_ComponentsC.h IFR_ComponentsC.h > diffs/IFR_ComponentsC.h.diff
+//      diff -wbu orig/IFR_ComponentsC.i IFR_ComponentsC.i > diffs/IFR_ComponentsC.i.diff
+//      diff -wbu orig/IFR_ComponentsC.cpp IFR_ComponentsC.cpp > diffs/IFR_ComponentsC.cpp.diff
+//
+//   5. Restore IFR_Components.pidl.
+//
 //   To regenerate the skeleton files IFR_ComponentsS.{h,i,cpp} and 
 //   IFR_ComponentsS_T.{h,i.cpp} in ACE_ROOT/TAO/orbsvcs/IFR_Service,
 //   use the command
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
index b02687460ec..e504beb5fae 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
@@ -21,6 +21,7 @@
 
 #include "IFR_ComponentsC.h"
 
+#include "tao/ClientRequestInfo.h"
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
@@ -33,181 +34,6 @@
 #include "IFR_ComponentsC.i"
 #endif /* !defined INLINE */
 
-static const CORBA::Long _oc_IR_DefinitionKind[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f44), 
-  ACE_NTOHL (0x6566696e), 
-  ACE_NTOHL (0x6974696f), 
-  ACE_NTOHL (0x6e4b696e), 
-  ACE_NTOHL (0x643a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/DefinitionKind:1.0
-  15,
-  ACE_NTOHL (0x44656669), 
-  ACE_NTOHL (0x6e697469), 
-  ACE_NTOHL (0x6f6e4b69), 
-  ACE_NTOHL (0x6e640000),  // name = DefinitionKind
-  34, // member count
-  8,
-  ACE_NTOHL (0x646b5f6e), 
-  ACE_NTOHL (0x6f6e6500),  // name = dk_none
-  7,
-  ACE_NTOHL (0x646b5f61), 
-  ACE_NTOHL (0x6c6c0000),  // name = dk_all
-  13,
-  ACE_NTOHL (0x646b5f41), 
-  ACE_NTOHL (0x74747269), 
-  ACE_NTOHL (0x62757465), 
-  ACE_NTOHL (0x0),  // name = dk_Attribute
-  12,
-  ACE_NTOHL (0x646b5f43), 
-  ACE_NTOHL (0x6f6e7374), 
-  ACE_NTOHL (0x616e7400),  // name = dk_Constant
-  13,
-  ACE_NTOHL (0x646b5f45), 
-  ACE_NTOHL (0x78636570), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x0),  // name = dk_Exception
-  13,
-  ACE_NTOHL (0x646b5f49), 
-  ACE_NTOHL (0x6e746572), 
-  ACE_NTOHL (0x66616365), 
-  ACE_NTOHL (0x0),  // name = dk_Interface
-  10,
-  ACE_NTOHL (0x646b5f4d), 
-  ACE_NTOHL (0x6f64756c), 
-  ACE_NTOHL (0x65000000),  // name = dk_Module
-  13,
-  ACE_NTOHL (0x646b5f4f), 
-  ACE_NTOHL (0x70657261), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x0),  // name = dk_Operation
-  11,
-  ACE_NTOHL (0x646b5f54), 
-  ACE_NTOHL (0x79706564), 
-  ACE_NTOHL (0x65660000),  // name = dk_Typedef
-  9,
-  ACE_NTOHL (0x646b5f41), 
-  ACE_NTOHL (0x6c696173), 
-  ACE_NTOHL (0x0),  // name = dk_Alias
-  10,
-  ACE_NTOHL (0x646b5f53), 
-  ACE_NTOHL (0x74727563), 
-  ACE_NTOHL (0x74000000),  // name = dk_Struct
-  9,
-  ACE_NTOHL (0x646b5f55), 
-  ACE_NTOHL (0x6e696f6e), 
-  ACE_NTOHL (0x0),  // name = dk_Union
-  8,
-  ACE_NTOHL (0x646b5f45), 
-  ACE_NTOHL (0x6e756d00),  // name = dk_Enum
-  13,
-  ACE_NTOHL (0x646b5f50), 
-  ACE_NTOHL (0x72696d69), 
-  ACE_NTOHL (0x74697665), 
-  ACE_NTOHL (0x0),  // name = dk_Primitive
-  10,
-  ACE_NTOHL (0x646b5f53), 
-  ACE_NTOHL (0x7472696e), 
-  ACE_NTOHL (0x67000000),  // name = dk_String
-  12,
-  ACE_NTOHL (0x646b5f53), 
-  ACE_NTOHL (0x65717565), 
-  ACE_NTOHL (0x6e636500),  // name = dk_Sequence
-  9,
-  ACE_NTOHL (0x646b5f41), 
-  ACE_NTOHL (0x72726179), 
-  ACE_NTOHL (0x0),  // name = dk_Array
-  14,
-  ACE_NTOHL (0x646b5f52), 
-  ACE_NTOHL (0x65706f73), 
-  ACE_NTOHL (0x69746f72), 
-  ACE_NTOHL (0x79000000),  // name = dk_Repository
-  11,
-  ACE_NTOHL (0x646b5f57), 
-  ACE_NTOHL (0x73747269), 
-  ACE_NTOHL (0x6e670000),  // name = dk_Wstring
-  9,
-  ACE_NTOHL (0x646b5f46), 
-  ACE_NTOHL (0x69786564), 
-  ACE_NTOHL (0x0),  // name = dk_Fixed
-  9,
-  ACE_NTOHL (0x646b5f56), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x0),  // name = dk_Value
-  12,
-  ACE_NTOHL (0x646b5f56), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
-  15,
-  ACE_NTOHL (0x646b5f56), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x4d656d62), 
-  ACE_NTOHL (0x65720000),  // name = dk_ValueMember
-  10,
-  ACE_NTOHL (0x646b5f4e), 
-  ACE_NTOHL (0x61746976), 
-  ACE_NTOHL (0x65000000),  // name = dk_Native
-  13,
-  ACE_NTOHL (0x646b5f43), 
-  ACE_NTOHL (0x6f6d706f), 
-  ACE_NTOHL (0x6e656e74), 
-  ACE_NTOHL (0x0),  // name = dk_Component
-  8,
-  ACE_NTOHL (0x646b5f48), 
-  ACE_NTOHL (0x6f6d6500),  // name = dk_Home
-  11,
-  ACE_NTOHL (0x646b5f46), 
-  ACE_NTOHL (0x6163746f), 
-  ACE_NTOHL (0x72790000),  // name = dk_Factory
-  10,
-  ACE_NTOHL (0x646b5f46), 
-  ACE_NTOHL (0x696e6465), 
-  ACE_NTOHL (0x72000000),  // name = dk_Finder
-  14,
-  ACE_NTOHL (0x646b5f50), 
-  ACE_NTOHL (0x72696d61), 
-  ACE_NTOHL (0x72794b65), 
-  ACE_NTOHL (0x79000000),  // name = dk_PrimaryKey
-  9,
-  ACE_NTOHL (0x646b5f45), 
-  ACE_NTOHL (0x6d697473), 
-  ACE_NTOHL (0x0),  // name = dk_Emits
-  13,
-  ACE_NTOHL (0x646b5f50), 
-  ACE_NTOHL (0x75626c69), 
-  ACE_NTOHL (0x73686573), 
-  ACE_NTOHL (0x0),  // name = dk_Publishes
-  12,
-  ACE_NTOHL (0x646b5f43), 
-  ACE_NTOHL (0x6f6e7375), 
-  ACE_NTOHL (0x6d657300),  // name = dk_Consumes
-  12,
-  ACE_NTOHL (0x646b5f50), 
-  ACE_NTOHL (0x726f7669), 
-  ACE_NTOHL (0x64657300),  // name = dk_Provides
-  8,
-  ACE_NTOHL (0x646b5f55), 
-  ACE_NTOHL (0x73657300),  // name = dk_Uses
-};
-
-static CORBA::TypeCode _tc_TAO_tc_IR_DefinitionKind (
-    CORBA::tk_enum,
-    sizeof (_oc_IR_DefinitionKind),
-    (char *) &_oc_IR_DefinitionKind,
-    0,
-    sizeof (IR::DefinitionKind)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_DefinitionKind, &_tc_TAO_tc_IR_DefinitionKind)
-TAO_NAMESPACE_END
-
 static const CORBA::Long _oc_IR_Identifier[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -464,14 +290,21 @@ TAO_NAMESPACE_END
     {
       IR::ComponentDef **old = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = IR::ComponentDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
+        {
+          if (!this->release_)
+            {
+              tmp[i] = IR::ComponentDef::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
       
+      if (this->release_)
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
@@ -482,11 +315,13 @@ TAO_NAMESPACE_END
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     IR::ComponentDef **tmp = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::ComponentDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::ComponentDef::_nil ();
+      }
+    
     _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (tmp);
     this->buffer_ = 0;
   }
@@ -502,11 +337,12 @@ TAO_NAMESPACE_END
     IR::ComponentDef **tmp = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
     
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::ComponentDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::ComponentDef::_nil ();
+      }
   }
+  
   void 
   IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_downcast (
       void* target,
@@ -651,14 +487,21 @@ TAO_NAMESPACE_END
     {
       IR::ProvidesDef **old = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = IR::ProvidesDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
+        {
+          if (!this->release_)
+            {
+              tmp[i] = IR::ProvidesDef::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
       
+      if (this->release_)
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
@@ -669,11 +512,13 @@ TAO_NAMESPACE_END
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     IR::ProvidesDef **tmp = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::ProvidesDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::ProvidesDef::_nil ();
+      }
+    
     _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (tmp);
     this->buffer_ = 0;
   }
@@ -689,11 +534,12 @@ TAO_NAMESPACE_END
     IR::ProvidesDef **tmp = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
     
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::ProvidesDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::ProvidesDef::_nil ();
+      }
   }
+  
   void 
   IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_downcast (
       void* target,
@@ -837,14 +683,21 @@ TAO_NAMESPACE_END
     {
       IR::UsesDef **old = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = IR::UsesDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
+        {
+          if (!this->release_)
+            {
+              tmp[i] = IR::UsesDef::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
       
+      if (this->release_)
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
@@ -855,11 +708,13 @@ TAO_NAMESPACE_END
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     IR::UsesDef **tmp = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::UsesDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::UsesDef::_nil ();
+      }
+    
     _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (tmp);
     this->buffer_ = 0;
   }
@@ -875,11 +730,12 @@ TAO_NAMESPACE_END
     IR::UsesDef **tmp = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
     
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::UsesDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::UsesDef::_nil ();
+      }
   }
+  
   void 
   IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_downcast (
       void* target,
@@ -1019,14 +875,21 @@ TAO_NAMESPACE_END
     {
       IR::HomeDef **old = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = IR::HomeDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
+        {
+          if (!this->release_)
+            {
+              tmp[i] = IR::HomeDef::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
       
+      if (this->release_)
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
@@ -1037,11 +900,13 @@ TAO_NAMESPACE_END
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     IR::HomeDef **tmp = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::HomeDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::HomeDef::_nil ();
+      }
+    
     _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (tmp);
     this->buffer_ = 0;
   }
@@ -1057,11 +922,12 @@ TAO_NAMESPACE_END
     IR::HomeDef **tmp = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
     
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::HomeDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::HomeDef::_nil ();
+      }
   }
+  
   void 
   IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_downcast (
       void* target,
@@ -1201,14 +1067,21 @@ TAO_NAMESPACE_END
     {
       IR::EmitsDef **old = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = IR::EmitsDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
+        {
+          if (!this->release_)
+            {
+              tmp[i] = IR::EmitsDef::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
       
+      if (this->release_)
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
@@ -1219,11 +1092,13 @@ TAO_NAMESPACE_END
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     IR::EmitsDef **tmp = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::EmitsDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::EmitsDef::_nil ();
+      }
+    
     _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (tmp);
     this->buffer_ = 0;
   }
@@ -1239,11 +1114,12 @@ TAO_NAMESPACE_END
     IR::EmitsDef **tmp = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
     
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::EmitsDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::EmitsDef::_nil ();
+      }
   }
+  
   void 
   IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_downcast (
       void* target,
@@ -1384,14 +1260,21 @@ TAO_NAMESPACE_END
     {
       IR::PublishesDef **old = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = IR::PublishesDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
+        {
+          if (!this->release_)
+            {
+              tmp[i] = IR::PublishesDef::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
       
+      if (this->release_)
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
@@ -1402,11 +1285,13 @@ TAO_NAMESPACE_END
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     IR::PublishesDef **tmp = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::PublishesDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::PublishesDef::_nil ();
+      }
+    
     _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (tmp);
     this->buffer_ = 0;
   }
@@ -1422,11 +1307,12 @@ TAO_NAMESPACE_END
     IR::PublishesDef **tmp = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
     
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::PublishesDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::PublishesDef::_nil ();
+      }
   }
+  
   void 
   IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_downcast (
       void* target,
@@ -1571,14 +1457,21 @@ TAO_NAMESPACE_END
     {
       IR::ConsumesDef **old = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = IR::ConsumesDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
+        {
+          if (!this->release_)
+            {
+              tmp[i] = IR::ConsumesDef::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
       
+      if (this->release_)
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
@@ -1589,11 +1482,13 @@ TAO_NAMESPACE_END
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     IR::ConsumesDef **tmp = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::ConsumesDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::ConsumesDef::_nil ();
+      }
+    
     _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (tmp);
     this->buffer_ = 0;
   }
@@ -1609,11 +1504,12 @@ TAO_NAMESPACE_END
     IR::ConsumesDef **tmp = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
     
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::ConsumesDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::ConsumesDef::_nil ();
+      }
   }
+  
   void 
   IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_downcast (
       void* target,
@@ -1757,14 +1653,21 @@ TAO_NAMESPACE_END
     {
       IR::FactoryDef **old = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = IR::FactoryDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
+        {
+          if (!this->release_)
+            {
+              tmp[i] = IR::FactoryDef::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
       
+      if (this->release_)
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
@@ -1775,11 +1678,13 @@ TAO_NAMESPACE_END
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     IR::FactoryDef **tmp = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::FactoryDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::FactoryDef::_nil ();
+      }
+    
     _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (tmp);
     this->buffer_ = 0;
   }
@@ -1795,11 +1700,12 @@ TAO_NAMESPACE_END
     IR::FactoryDef **tmp = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
     
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::FactoryDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::FactoryDef::_nil ();
+      }
   }
+  
   void 
   IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_downcast (
       void* target,
@@ -1943,14 +1849,21 @@ TAO_NAMESPACE_END
     {
       IR::FinderDef **old = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = IR::FinderDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
+        {
+          if (!this->release_)
+            {
+              tmp[i] = IR::FinderDef::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
       
+      if (this->release_)
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
@@ -1961,11 +1874,13 @@ TAO_NAMESPACE_END
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     IR::FinderDef **tmp = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::FinderDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::FinderDef::_nil ();
+      }
+    
     _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (tmp);
     this->buffer_ = 0;
   }
@@ -1981,11 +1896,12 @@ TAO_NAMESPACE_END
     IR::FinderDef **tmp = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
     
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = IR::FinderDef::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = IR::FinderDef::_nil ();
+      }
   }
+  
   void 
   IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_downcast (
       void* target,
@@ -2111,6 +2027,188 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FinderDefSeq, &_tc_TAO_tc_IR_FinderDefSeq)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class IR::ComponentRepository_var
+// *************************************************************
+
+IR::ComponentRepository_var::ComponentRepository_var (void) // default constructor
+  : ptr_ (ComponentRepository::_nil ())
+{}
+
+::IR::ComponentRepository_ptr
+IR::ComponentRepository_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+IR::ComponentRepository_var::ComponentRepository_var (const ::IR::ComponentRepository_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ComponentRepository::_duplicate (p.ptr ()))
+{}
+
+IR::ComponentRepository_var::~ComponentRepository_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+IR::ComponentRepository_var &
+IR::ComponentRepository_var::operator= (ComponentRepository_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::ComponentRepository_var &
+IR::ComponentRepository_var::operator= (const ::IR::ComponentRepository_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::IR::ComponentRepository::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+IR::ComponentRepository_var::operator const ::IR::ComponentRepository_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+IR::ComponentRepository_var::operator ::IR::ComponentRepository_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::IR::ComponentRepository_ptr
+IR::ComponentRepository_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::IR::ComponentRepository_ptr
+IR::ComponentRepository_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::IR::ComponentRepository_ptr &
+IR::ComponentRepository_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::IR::ComponentRepository_ptr &
+IR::ComponentRepository_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::ComponentRepository::_nil ();
+  return this->ptr_;
+}
+
+::IR::ComponentRepository_ptr
+IR::ComponentRepository_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::IR::ComponentRepository_ptr val = this->ptr_;
+  this->ptr_ = ::IR::ComponentRepository::_nil ();
+  return val;
+}
+
+::IR::ComponentRepository_ptr
+IR::ComponentRepository_var::duplicate (ComponentRepository_ptr p)
+{
+  return ::IR::ComponentRepository::_duplicate (p);
+}
+
+void
+IR::ComponentRepository_var::release (ComponentRepository_ptr p)
+{
+  CORBA::release (p);
+}
+
+::IR::ComponentRepository_ptr
+IR::ComponentRepository_var::nil (void)
+{
+  return ::IR::ComponentRepository::_nil ();
+}
+
+::IR::ComponentRepository_ptr
+IR::ComponentRepository_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::IR::ComponentRepository::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+IR::ComponentRepository_var::upcast (void *src)
+{
+  ComponentRepository **tmp =
+    ACE_static_cast (ComponentRepository **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class IR::ComponentRepository_out
+// *************************************************************
+
+IR::ComponentRepository_out::ComponentRepository_out (ComponentRepository_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::IR::ComponentRepository::_nil ();
+}
+
+IR::ComponentRepository_out::ComponentRepository_out (ComponentRepository_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::ComponentRepository::_nil ();
+}
+
+IR::ComponentRepository_out::ComponentRepository_out (const ::IR::ComponentRepository_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ComponentRepository_out &, p).ptr_)
+{}
+
+::IR::ComponentRepository_out &
+IR::ComponentRepository_out::operator= (const ::IR::ComponentRepository_out &p)
+{
+  this->ptr_ = ACE_const_cast (ComponentRepository_out&, p).ptr_;
+  return *this;
+}
+
+IR::ComponentRepository_out &
+IR::ComponentRepository_out::operator= (const ::IR::ComponentRepository_var &p)
+{
+  this->ptr_ = ::IR::ComponentRepository::_duplicate (p.ptr ());
+  return *this;
+}
+
+IR::ComponentRepository_out &
+IR::ComponentRepository_out::operator= (ComponentRepository_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::ComponentRepository_out::operator ::IR::ComponentRepository_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::IR::ComponentRepository_ptr &
+IR::ComponentRepository_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::IR::ComponentRepository_ptr
+IR::ComponentRepository_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_IR_ComponentRepository_create_component : public TAO_ClientRequestInfo
@@ -2123,7 +2221,7 @@ public:
       const char * name,
       const char * version,
       IR::ComponentDef_ptr base_component,
-      const CORBA::InterfaceDefSeq & supports_interfaces,
+      const CORBA_InterfaceDefSeq & supports_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -2156,7 +2254,7 @@ private:
   const char * name_;
   const char * version_;
   IR::ComponentDef_ptr base_component_;
-  const CORBA::InterfaceDefSeq & supports_interfaces_;
+  const CORBA_InterfaceDefSeq & supports_interfaces_;
   IR::ComponentDef_ptr _result;
 };
 
@@ -2167,7 +2265,7 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_component::TAO_ClientRequest
     const char * name,
     const char * version,
     IR::ComponentDef_ptr base_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces,
+    const CORBA_InterfaceDefSeq & supports_interfaces,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -2266,7 +2364,7 @@ public:
       const char * version,
       IR::HomeDef_ptr base_home,
       IR::ComponentDef_ptr managed_component,
-      CORBA::ValueDef_ptr primary_key,
+      CORBA_ValueDef_ptr primary_key,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -2300,7 +2398,7 @@ private:
   const char * version_;
   IR::HomeDef_ptr base_home_;
   IR::ComponentDef_ptr managed_component_;
-  CORBA::ValueDef_ptr primary_key_;
+  CORBA_ValueDef_ptr primary_key_;
   IR::HomeDef_ptr _result;
 };
 
@@ -2312,7 +2410,7 @@ TAO_ClientRequestInfo_IR_ComponentRepository_create_home::TAO_ClientRequestInfo_
     const char * version,
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
-    CORBA::ValueDef_ptr primary_key,
+    CORBA_ValueDef_ptr primary_key,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -2427,7 +2525,7 @@ IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_comp
     const char * name,
     const char * version,
     IR::ComponentDef_ptr base_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces,
+    const CORBA_InterfaceDefSeq & supports_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2612,7 +2710,7 @@ IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
     const char * version,
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
-    CORBA::ValueDef_ptr primary_key,
+    CORBA_ValueDef_ptr primary_key,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -2952,9 +3050,9 @@ CORBA::Boolean IR::ComponentRepository::_is_a (const CORBA::Char *value, CORBA::
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentRepository:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Repository:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
@@ -2970,37 +3068,37 @@ void *IR::ComponentRepository::_tao_QueryInterface (ptr_arith_t type)
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Repository::_narrow))
+      &CORBA_Repository::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Repository_ptr,
+            CORBA_Repository_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Container::_narrow))
+      &CORBA_Container::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Container_ptr,
+            CORBA_Container_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -3023,7 +3121,7 @@ IR::ComponentDef_ptr IR::ComponentRepository::create_component (
     const char * name,
     const char * version,
     IR::ComponentDef_ptr base_component,
-    const CORBA::InterfaceDefSeq & supports_interfaces,
+    const CORBA_InterfaceDefSeq & supports_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3051,7 +3149,7 @@ IR::HomeDef_ptr IR::ComponentRepository::create_home (
     const char * version,
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
-    CORBA::ValueDef_ptr primary_key,
+    CORBA_ValueDef_ptr primary_key,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3074,7 +3172,6 @@ IR::HomeDef_ptr IR::ComponentRepository::create_home (
     );
 }
 
-
 static const CORBA::Long _oc_IR_ComponentRepository[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -3110,6 +3207,188 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentRepository, &_tc_TAO_tc_IR_ComponentRepository)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class IR::ProvidesDef_var
+// *************************************************************
+
+IR::ProvidesDef_var::ProvidesDef_var (void) // default constructor
+  : ptr_ (ProvidesDef::_nil ())
+{}
+
+::IR::ProvidesDef_ptr
+IR::ProvidesDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+IR::ProvidesDef_var::ProvidesDef_var (const ::IR::ProvidesDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ProvidesDef::_duplicate (p.ptr ()))
+{}
+
+IR::ProvidesDef_var::~ProvidesDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+IR::ProvidesDef_var &
+IR::ProvidesDef_var::operator= (ProvidesDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::ProvidesDef_var &
+IR::ProvidesDef_var::operator= (const ::IR::ProvidesDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::IR::ProvidesDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+IR::ProvidesDef_var::operator const ::IR::ProvidesDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+IR::ProvidesDef_var::operator ::IR::ProvidesDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::IR::ProvidesDef_ptr
+IR::ProvidesDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::IR::ProvidesDef_ptr
+IR::ProvidesDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::IR::ProvidesDef_ptr &
+IR::ProvidesDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::IR::ProvidesDef_ptr &
+IR::ProvidesDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::ProvidesDef::_nil ();
+  return this->ptr_;
+}
+
+::IR::ProvidesDef_ptr
+IR::ProvidesDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::IR::ProvidesDef_ptr val = this->ptr_;
+  this->ptr_ = ::IR::ProvidesDef::_nil ();
+  return val;
+}
+
+::IR::ProvidesDef_ptr
+IR::ProvidesDef_var::duplicate (ProvidesDef_ptr p)
+{
+  return ::IR::ProvidesDef::_duplicate (p);
+}
+
+void
+IR::ProvidesDef_var::release (ProvidesDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::IR::ProvidesDef_ptr
+IR::ProvidesDef_var::nil (void)
+{
+  return ::IR::ProvidesDef::_nil ();
+}
+
+::IR::ProvidesDef_ptr
+IR::ProvidesDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::IR::ProvidesDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+IR::ProvidesDef_var::upcast (void *src)
+{
+  ProvidesDef **tmp =
+    ACE_static_cast (ProvidesDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class IR::ProvidesDef_out
+// *************************************************************
+
+IR::ProvidesDef_out::ProvidesDef_out (ProvidesDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::IR::ProvidesDef::_nil ();
+}
+
+IR::ProvidesDef_out::ProvidesDef_out (ProvidesDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::ProvidesDef::_nil ();
+}
+
+IR::ProvidesDef_out::ProvidesDef_out (const ::IR::ProvidesDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ProvidesDef_out &, p).ptr_)
+{}
+
+::IR::ProvidesDef_out &
+IR::ProvidesDef_out::operator= (const ::IR::ProvidesDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (ProvidesDef_out&, p).ptr_;
+  return *this;
+}
+
+IR::ProvidesDef_out &
+IR::ProvidesDef_out::operator= (const ::IR::ProvidesDef_var &p)
+{
+  this->ptr_ = ::IR::ProvidesDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+IR::ProvidesDef_out &
+IR::ProvidesDef_out::operator= (ProvidesDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::ProvidesDef_out::operator ::IR::ProvidesDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::IR::ProvidesDef_ptr &
+IR::ProvidesDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::IR::ProvidesDef_ptr
+IR::ProvidesDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get : public TAO_ClientRequestInfo
@@ -3140,13 +3419,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::InterfaceDef_ptr result);
+  void result (CORBA_InterfaceDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (const TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get &);
   void operator= (const TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get &);
 
-  CORBA::InterfaceDef_ptr _result;
+  CORBA_InterfaceDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
@@ -3199,7 +3478,7 @@ TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environm
 }
 
 void 
-TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::InterfaceDef_ptr result)
+TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA_InterfaceDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -3219,7 +3498,7 @@ IR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
+CORBA_InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3228,8 +3507,8 @@ CORBA::InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
   ))
 {
   
-  CORBA::InterfaceDef_ptr _tao_retval = CORBA::InterfaceDef::_nil ();
-  CORBA::InterfaceDef_var _tao_safe_retval (_tao_retval);
+  CORBA_InterfaceDef_ptr _tao_retval = CORBA_InterfaceDef::_nil ();
+  CORBA_InterfaceDef_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -3313,7 +3592,7 @@ CORBA::InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -3539,8 +3818,8 @@ CORBA::Boolean IR::ProvidesDef::_is_a (const CORBA::Char *value, CORBA::Environm
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ProvidesDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
@@ -3556,25 +3835,25 @@ void *IR::ProvidesDef::_tao_QueryInterface (ptr_arith_t type)
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -3592,7 +3871,7 @@ const char* IR::ProvidesDef::_interface_repository_id (void) const
   return "IDL:omg.org/IR/ProvidesDef:1.0";
 }
 
-CORBA::InterfaceDef_ptr IR::ProvidesDef::interface_type (
+CORBA_InterfaceDef_ptr IR::ProvidesDef::interface_type (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3609,7 +3888,6 @@ CORBA::InterfaceDef_ptr IR::ProvidesDef::interface_type (
     );
 }
 
-
 static const CORBA::Long _oc_IR_ProvidesDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -3758,23 +4036,24 @@ static const CORBA::Long _oc_IR_ProvidesDescription[] =
   ACE_NTOHL (0x655f7479), 
   ACE_NTOHL (0x70650000),  // name = interface_type
   CORBA::tk_objref, // typecode kind
-  64, // encapsulation length
+  68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
     ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f496e), 
+    ACE_NTOHL (0x415f496e), 
     ACE_NTOHL (0x74657266), 
     ACE_NTOHL (0x61636544), 
     ACE_NTOHL (0x65663a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
-    13,
-    ACE_NTOHL (0x496e7465), 
-    ACE_NTOHL (0x72666163), 
-    ACE_NTOHL (0x65446566), 
-    ACE_NTOHL (0x0),  // name = InterfaceDef
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_InterfaceDef:1.0
+    19,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x415f496e), 
+    ACE_NTOHL (0x74657266), 
+    ACE_NTOHL (0x61636544), 
+    ACE_NTOHL (0x65660000),  // name = CORBA_InterfaceDef
 
 };
 
@@ -3797,6 +4076,188 @@ void IR::ProvidesDescription::_tao_any_destructor (void *x)
   delete tmp;
 }
 
+// *************************************************************
+// Operations for class IR::UsesDef_var
+// *************************************************************
+
+IR::UsesDef_var::UsesDef_var (void) // default constructor
+  : ptr_ (UsesDef::_nil ())
+{}
+
+::IR::UsesDef_ptr
+IR::UsesDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+IR::UsesDef_var::UsesDef_var (const ::IR::UsesDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (UsesDef::_duplicate (p.ptr ()))
+{}
+
+IR::UsesDef_var::~UsesDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+IR::UsesDef_var &
+IR::UsesDef_var::operator= (UsesDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::UsesDef_var &
+IR::UsesDef_var::operator= (const ::IR::UsesDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::IR::UsesDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+IR::UsesDef_var::operator const ::IR::UsesDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+IR::UsesDef_var::operator ::IR::UsesDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::IR::UsesDef_ptr
+IR::UsesDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::IR::UsesDef_ptr
+IR::UsesDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::IR::UsesDef_ptr &
+IR::UsesDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::IR::UsesDef_ptr &
+IR::UsesDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::UsesDef::_nil ();
+  return this->ptr_;
+}
+
+::IR::UsesDef_ptr
+IR::UsesDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::IR::UsesDef_ptr val = this->ptr_;
+  this->ptr_ = ::IR::UsesDef::_nil ();
+  return val;
+}
+
+::IR::UsesDef_ptr
+IR::UsesDef_var::duplicate (UsesDef_ptr p)
+{
+  return ::IR::UsesDef::_duplicate (p);
+}
+
+void
+IR::UsesDef_var::release (UsesDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::IR::UsesDef_ptr
+IR::UsesDef_var::nil (void)
+{
+  return ::IR::UsesDef::_nil ();
+}
+
+::IR::UsesDef_ptr
+IR::UsesDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::IR::UsesDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+IR::UsesDef_var::upcast (void *src)
+{
+  UsesDef **tmp =
+    ACE_static_cast (UsesDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class IR::UsesDef_out
+// *************************************************************
+
+IR::UsesDef_out::UsesDef_out (UsesDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::IR::UsesDef::_nil ();
+}
+
+IR::UsesDef_out::UsesDef_out (UsesDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::UsesDef::_nil ();
+}
+
+IR::UsesDef_out::UsesDef_out (const ::IR::UsesDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (UsesDef_out &, p).ptr_)
+{}
+
+::IR::UsesDef_out &
+IR::UsesDef_out::operator= (const ::IR::UsesDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (UsesDef_out&, p).ptr_;
+  return *this;
+}
+
+IR::UsesDef_out &
+IR::UsesDef_out::operator= (const ::IR::UsesDef_var &p)
+{
+  this->ptr_ = ::IR::UsesDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+IR::UsesDef_out &
+IR::UsesDef_out::operator= (UsesDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::UsesDef_out::operator ::IR::UsesDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::IR::UsesDef_ptr &
+IR::UsesDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::IR::UsesDef_ptr
+IR::UsesDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_IR_UsesDef_interface_type_get : public TAO_ClientRequestInfo
@@ -3827,13 +4288,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::InterfaceDef_ptr result);
+  void result (CORBA_InterfaceDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (const TAO_ClientRequestInfo_IR_UsesDef_interface_type_get &);
   void operator= (const TAO_ClientRequestInfo_IR_UsesDef_interface_type_get &);
 
-  CORBA::InterfaceDef_ptr _result;
+  CORBA_InterfaceDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
@@ -3886,7 +4347,7 @@ TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment
 }
 
 void 
-TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::InterfaceDef_ptr result)
+TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (CORBA_InterfaceDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -3999,7 +4460,7 @@ IR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void)
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
+CORBA_InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -4008,8 +4469,8 @@ CORBA::InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
   ))
 {
   
-  CORBA::InterfaceDef_ptr _tao_retval = CORBA::InterfaceDef::_nil ();
-  CORBA::InterfaceDef_var _tao_safe_retval (_tao_retval);
+  CORBA_InterfaceDef_ptr _tao_retval = CORBA_InterfaceDef::_nil ();
+  CORBA_InterfaceDef_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -4093,7 +4554,7 @@ CORBA::InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -4477,8 +4938,8 @@ CORBA::Boolean IR::UsesDef::_is_a (const CORBA::Char *value, CORBA::Environment
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UsesDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
@@ -4494,25 +4955,25 @@ void *IR::UsesDef::_tao_QueryInterface (ptr_arith_t type)
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -4530,7 +4991,7 @@ const char* IR::UsesDef::_interface_repository_id (void) const
   return "IDL:omg.org/IR/UsesDef:1.0";
 }
 
-CORBA::InterfaceDef_ptr IR::UsesDef::interface_type (
+CORBA_InterfaceDef_ptr IR::UsesDef::interface_type (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -4564,7 +5025,6 @@ CORBA::Boolean IR::UsesDef::is_multiple (
     );
 }
 
-
 static const CORBA::Long _oc_IR_UsesDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -4709,23 +5169,24 @@ static const CORBA::Long _oc_IR_UsesDescription[] =
   ACE_NTOHL (0x655f7479), 
   ACE_NTOHL (0x70650000),  // name = interface_type
   CORBA::tk_objref, // typecode kind
-  64, // encapsulation length
+  68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
     ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f496e), 
+    ACE_NTOHL (0x415f496e), 
     ACE_NTOHL (0x74657266), 
     ACE_NTOHL (0x61636544), 
     ACE_NTOHL (0x65663a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
-    13,
-    ACE_NTOHL (0x496e7465), 
-    ACE_NTOHL (0x72666163), 
-    ACE_NTOHL (0x65446566), 
-    ACE_NTOHL (0x0),  // name = InterfaceDef
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_InterfaceDef:1.0
+    19,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x415f496e), 
+    ACE_NTOHL (0x74657266), 
+    ACE_NTOHL (0x61636544), 
+    ACE_NTOHL (0x65660000),  // name = CORBA_InterfaceDef
 
   12,
   ACE_NTOHL (0x69735f6d), 
@@ -4869,10 +5330,10 @@ static const CORBA::Long _oc_IR_ProvidesDescSeq[] =
   ACE_NTOHL (0x44657363), 
   ACE_NTOHL (0x53657100),  // name = ProvidesDescSeq
   CORBA::tk_sequence, // typecode kind
-  528, // encapsulation length
+  532, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
-    512, // encapsulation length
+    516, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       39,
       ACE_NTOHL (0x49444c3a), 
@@ -4988,23 +5449,24 @@ static const CORBA::Long _oc_IR_ProvidesDescSeq[] =
       ACE_NTOHL (0x655f7479), 
       ACE_NTOHL (0x70650000),  // name = interface_type
       CORBA::tk_objref, // typecode kind
-      64, // encapsulation length
+      68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
         ACE_NTOHL (0x49444c3a), 
         ACE_NTOHL (0x6f6d672e), 
         ACE_NTOHL (0x6f72672f), 
         ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f496e), 
+        ACE_NTOHL (0x415f496e), 
         ACE_NTOHL (0x74657266), 
         ACE_NTOHL (0x61636544), 
         ACE_NTOHL (0x65663a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
-        13,
-        ACE_NTOHL (0x496e7465), 
-        ACE_NTOHL (0x72666163), 
-        ACE_NTOHL (0x65446566), 
-        ACE_NTOHL (0x0),  // name = InterfaceDef
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_InterfaceDef:1.0
+        19,
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x415f496e), 
+        ACE_NTOHL (0x74657266), 
+        ACE_NTOHL (0x61636544), 
+        ACE_NTOHL (0x65660000),  // name = CORBA_InterfaceDef
 
 
     0U,
@@ -5137,10 +5599,10 @@ static const CORBA::Long _oc_IR_UsesDescSeq[] =
   ACE_NTOHL (0x44657363), 
   ACE_NTOHL (0x53657100),  // name = UsesDescSeq
   CORBA::tk_sequence, // typecode kind
-  540, // encapsulation length
+  544, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
-    524, // encapsulation length
+    528, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       35,
       ACE_NTOHL (0x49444c3a), 
@@ -5254,23 +5716,24 @@ static const CORBA::Long _oc_IR_UsesDescSeq[] =
       ACE_NTOHL (0x655f7479), 
       ACE_NTOHL (0x70650000),  // name = interface_type
       CORBA::tk_objref, // typecode kind
-      64, // encapsulation length
+      68, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         35,
         ACE_NTOHL (0x49444c3a), 
         ACE_NTOHL (0x6f6d672e), 
         ACE_NTOHL (0x6f72672f), 
         ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f496e), 
+        ACE_NTOHL (0x415f496e), 
         ACE_NTOHL (0x74657266), 
         ACE_NTOHL (0x61636544), 
         ACE_NTOHL (0x65663a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
-        13,
-        ACE_NTOHL (0x496e7465), 
-        ACE_NTOHL (0x72666163), 
-        ACE_NTOHL (0x65446566), 
-        ACE_NTOHL (0x0),  // name = InterfaceDef
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_InterfaceDef:1.0
+        19,
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x415f496e), 
+        ACE_NTOHL (0x74657266), 
+        ACE_NTOHL (0x61636544), 
+        ACE_NTOHL (0x65660000),  // name = CORBA_InterfaceDef
 
       12,
       ACE_NTOHL (0x69735f6d), 
@@ -5296,6 +5759,188 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDescSeq, &_tc_TAO_tc_IR_UsesDescSeq)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class IR::EventDef_var
+// *************************************************************
+
+IR::EventDef_var::EventDef_var (void) // default constructor
+  : ptr_ (EventDef::_nil ())
+{}
+
+::IR::EventDef_ptr
+IR::EventDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+IR::EventDef_var::EventDef_var (const ::IR::EventDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (EventDef::_duplicate (p.ptr ()))
+{}
+
+IR::EventDef_var::~EventDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+IR::EventDef_var &
+IR::EventDef_var::operator= (EventDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::EventDef_var &
+IR::EventDef_var::operator= (const ::IR::EventDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::IR::EventDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+IR::EventDef_var::operator const ::IR::EventDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+IR::EventDef_var::operator ::IR::EventDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::IR::EventDef_ptr
+IR::EventDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::IR::EventDef_ptr
+IR::EventDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::IR::EventDef_ptr &
+IR::EventDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::IR::EventDef_ptr &
+IR::EventDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::EventDef::_nil ();
+  return this->ptr_;
+}
+
+::IR::EventDef_ptr
+IR::EventDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::IR::EventDef_ptr val = this->ptr_;
+  this->ptr_ = ::IR::EventDef::_nil ();
+  return val;
+}
+
+::IR::EventDef_ptr
+IR::EventDef_var::duplicate (EventDef_ptr p)
+{
+  return ::IR::EventDef::_duplicate (p);
+}
+
+void
+IR::EventDef_var::release (EventDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::IR::EventDef_ptr
+IR::EventDef_var::nil (void)
+{
+  return ::IR::EventDef::_nil ();
+}
+
+::IR::EventDef_ptr
+IR::EventDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::IR::EventDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+IR::EventDef_var::upcast (void *src)
+{
+  EventDef **tmp =
+    ACE_static_cast (EventDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class IR::EventDef_out
+// *************************************************************
+
+IR::EventDef_out::EventDef_out (EventDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::IR::EventDef::_nil ();
+}
+
+IR::EventDef_out::EventDef_out (EventDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::EventDef::_nil ();
+}
+
+IR::EventDef_out::EventDef_out (const ::IR::EventDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (EventDef_out &, p).ptr_)
+{}
+
+::IR::EventDef_out &
+IR::EventDef_out::operator= (const ::IR::EventDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (EventDef_out&, p).ptr_;
+  return *this;
+}
+
+IR::EventDef_out &
+IR::EventDef_out::operator= (const ::IR::EventDef_var &p)
+{
+  this->ptr_ = ::IR::EventDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+IR::EventDef_out &
+IR::EventDef_out::operator= (EventDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::EventDef_out::operator ::IR::EventDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::IR::EventDef_ptr &
+IR::EventDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::IR::EventDef_ptr
+IR::EventDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_IR_EventDef_is_a : public TAO_ClientRequestInfo
@@ -5430,13 +6075,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ValueDef_ptr result);
+  void result (CORBA_ValueDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_IR_EventDef_event_get (const TAO_ClientRequestInfo_IR_EventDef_event_get &);
   void operator= (const TAO_ClientRequestInfo_IR_EventDef_event_get &);
 
-  CORBA::ValueDef_ptr _result;
+  CORBA_ValueDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_IR_EventDef_event_get::TAO_ClientRequestInfo_IR_EventDef_event_get (
@@ -5489,7 +6134,7 @@ TAO_ClientRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY
 }
 
 void 
-TAO_ClientRequestInfo_IR_EventDef_event_get::result (CORBA::ValueDef_ptr result)
+TAO_ClientRequestInfo_IR_EventDef_event_get::result (CORBA_ValueDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -5679,7 +6324,7 @@ CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
   return _tao_retval;
 }
 
-CORBA::ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
+CORBA_ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5688,8 +6333,8 @@ CORBA::ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
   ))
 {
   
-  CORBA::ValueDef_ptr _tao_retval = CORBA::ValueDef::_nil ();
-  CORBA::ValueDef_var _tao_safe_retval (_tao_retval);
+  CORBA_ValueDef_ptr _tao_retval = CORBA_ValueDef::_nil ();
+  CORBA_ValueDef_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -5773,7 +6418,7 @@ CORBA::ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -5999,8 +6644,8 @@ CORBA::Boolean IR::EventDef::_is_a (const CORBA::Char *value, CORBA::Environment
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
@@ -6016,25 +6661,25 @@ void *IR::EventDef::_tao_QueryInterface (ptr_arith_t type)
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -6071,7 +6716,7 @@ CORBA::Boolean IR::EventDef::is_a (
     );
 }
 
-CORBA::ValueDef_ptr IR::EventDef::event (
+CORBA_ValueDef_ptr IR::EventDef::event (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6088,7 +6733,6 @@ CORBA::ValueDef_ptr IR::EventDef::event (
     );
 }
 
-
 static const CORBA::Long _oc_IR_EventDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -6233,21 +6877,22 @@ static const CORBA::Long _oc_IR_EventDescription[] =
   ACE_NTOHL (0x76616c75), 
   ACE_NTOHL (0x65000000),  // name = value
   CORBA::tk_objref, // typecode kind
-  56, // encapsulation length
+  60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
     ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5661), 
+    ACE_NTOHL (0x415f5661), 
     ACE_NTOHL (0x6c756544), 
     ACE_NTOHL (0x65663a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
-    9,
-    ACE_NTOHL (0x56616c75), 
-    ACE_NTOHL (0x65446566), 
-    ACE_NTOHL (0x0),  // name = ValueDef
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ValueDef:1.0
+    15,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x415f5661), 
+    ACE_NTOHL (0x6c756544), 
+    ACE_NTOHL (0x65660000),  // name = CORBA_ValueDef
 
 };
 
@@ -6270,6 +6915,191 @@ void IR::EventDescription::_tao_any_destructor (void *x)
   delete tmp;
 }
 
+// *************************************************************
+// Operations for class IR::EmitsDef_var
+// *************************************************************
+
+IR::EmitsDef_var::EmitsDef_var (void) // default constructor
+  : ptr_ (EmitsDef::_nil ())
+{}
+
+::IR::EmitsDef_ptr
+IR::EmitsDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+IR::EmitsDef_var::EmitsDef_var (const ::IR::EmitsDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (EmitsDef::_duplicate (p.ptr ()))
+{}
+
+IR::EmitsDef_var::~EmitsDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+IR::EmitsDef_var &
+IR::EmitsDef_var::operator= (EmitsDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::EmitsDef_var &
+IR::EmitsDef_var::operator= (const ::IR::EmitsDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::IR::EmitsDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+IR::EmitsDef_var::operator const ::IR::EmitsDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+IR::EmitsDef_var::operator ::IR::EmitsDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::IR::EmitsDef_ptr
+IR::EmitsDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::IR::EmitsDef_ptr
+IR::EmitsDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::IR::EmitsDef_ptr &
+IR::EmitsDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::IR::EmitsDef_ptr &
+IR::EmitsDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::EmitsDef::_nil ();
+  return this->ptr_;
+}
+
+::IR::EmitsDef_ptr
+IR::EmitsDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::IR::EmitsDef_ptr val = this->ptr_;
+  this->ptr_ = ::IR::EmitsDef::_nil ();
+  return val;
+}
+
+::IR::EmitsDef_ptr
+IR::EmitsDef_var::duplicate (EmitsDef_ptr p)
+{
+  return ::IR::EmitsDef::_duplicate (p);
+}
+
+void
+IR::EmitsDef_var::release (EmitsDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::IR::EmitsDef_ptr
+IR::EmitsDef_var::nil (void)
+{
+  return ::IR::EmitsDef::_nil ();
+}
+
+::IR::EmitsDef_ptr
+IR::EmitsDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::IR::EmitsDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+IR::EmitsDef_var::upcast (void *src)
+{
+  EmitsDef **tmp =
+    ACE_static_cast (EmitsDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class IR::EmitsDef_out
+// *************************************************************
+
+IR::EmitsDef_out::EmitsDef_out (EmitsDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::IR::EmitsDef::_nil ();
+}
+
+IR::EmitsDef_out::EmitsDef_out (EmitsDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::EmitsDef::_nil ();
+}
+
+IR::EmitsDef_out::EmitsDef_out (const ::IR::EmitsDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (EmitsDef_out &, p).ptr_)
+{}
+
+::IR::EmitsDef_out &
+IR::EmitsDef_out::operator= (const ::IR::EmitsDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (EmitsDef_out&, p).ptr_;
+  return *this;
+}
+
+IR::EmitsDef_out &
+IR::EmitsDef_out::operator= (const ::IR::EmitsDef_var &p)
+{
+  this->ptr_ = ::IR::EmitsDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+IR::EmitsDef_out &
+IR::EmitsDef_out::operator= (EmitsDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::EmitsDef_out::operator ::IR::EmitsDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::IR::EmitsDef_ptr &
+IR::EmitsDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::IR::EmitsDef_ptr
+IR::EmitsDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+#endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -6444,8 +7274,8 @@ CORBA::Boolean IR::EmitsDef::_is_a (const CORBA::Char *value, CORBA::Environment
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EmitsDef:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
@@ -6473,25 +7303,25 @@ void *IR::EmitsDef::_tao_QueryInterface (ptr_arith_t type)
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -6539,6 +7369,191 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EmitsDef, &_tc_TAO_tc_IR_EmitsDef)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class IR::PublishesDef_var
+// *************************************************************
+
+IR::PublishesDef_var::PublishesDef_var (void) // default constructor
+  : ptr_ (PublishesDef::_nil ())
+{}
+
+::IR::PublishesDef_ptr
+IR::PublishesDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+IR::PublishesDef_var::PublishesDef_var (const ::IR::PublishesDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (PublishesDef::_duplicate (p.ptr ()))
+{}
+
+IR::PublishesDef_var::~PublishesDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+IR::PublishesDef_var &
+IR::PublishesDef_var::operator= (PublishesDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::PublishesDef_var &
+IR::PublishesDef_var::operator= (const ::IR::PublishesDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::IR::PublishesDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+IR::PublishesDef_var::operator const ::IR::PublishesDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+IR::PublishesDef_var::operator ::IR::PublishesDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::IR::PublishesDef_ptr
+IR::PublishesDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::IR::PublishesDef_ptr
+IR::PublishesDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::IR::PublishesDef_ptr &
+IR::PublishesDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::IR::PublishesDef_ptr &
+IR::PublishesDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::PublishesDef::_nil ();
+  return this->ptr_;
+}
+
+::IR::PublishesDef_ptr
+IR::PublishesDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::IR::PublishesDef_ptr val = this->ptr_;
+  this->ptr_ = ::IR::PublishesDef::_nil ();
+  return val;
+}
+
+::IR::PublishesDef_ptr
+IR::PublishesDef_var::duplicate (PublishesDef_ptr p)
+{
+  return ::IR::PublishesDef::_duplicate (p);
+}
+
+void
+IR::PublishesDef_var::release (PublishesDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::IR::PublishesDef_ptr
+IR::PublishesDef_var::nil (void)
+{
+  return ::IR::PublishesDef::_nil ();
+}
+
+::IR::PublishesDef_ptr
+IR::PublishesDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::IR::PublishesDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+IR::PublishesDef_var::upcast (void *src)
+{
+  PublishesDef **tmp =
+    ACE_static_cast (PublishesDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class IR::PublishesDef_out
+// *************************************************************
+
+IR::PublishesDef_out::PublishesDef_out (PublishesDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::IR::PublishesDef::_nil ();
+}
+
+IR::PublishesDef_out::PublishesDef_out (PublishesDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::PublishesDef::_nil ();
+}
+
+IR::PublishesDef_out::PublishesDef_out (const ::IR::PublishesDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (PublishesDef_out &, p).ptr_)
+{}
+
+::IR::PublishesDef_out &
+IR::PublishesDef_out::operator= (const ::IR::PublishesDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (PublishesDef_out&, p).ptr_;
+  return *this;
+}
+
+IR::PublishesDef_out &
+IR::PublishesDef_out::operator= (const ::IR::PublishesDef_var &p)
+{
+  this->ptr_ = ::IR::PublishesDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+IR::PublishesDef_out &
+IR::PublishesDef_out::operator= (PublishesDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::PublishesDef_out::operator ::IR::PublishesDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::IR::PublishesDef_ptr &
+IR::PublishesDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::IR::PublishesDef_ptr
+IR::PublishesDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+#endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -6713,8 +7728,8 @@ CORBA::Boolean IR::PublishesDef::_is_a (const CORBA::Char *value, CORBA::Environ
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PublishesDef:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
@@ -6742,25 +7757,25 @@ void *IR::PublishesDef::_tao_QueryInterface (ptr_arith_t type)
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -6810,6 +7825,191 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PublishesDef, &_tc_TAO_tc_IR_PublishesDef)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class IR::ConsumesDef_var
+// *************************************************************
+
+IR::ConsumesDef_var::ConsumesDef_var (void) // default constructor
+  : ptr_ (ConsumesDef::_nil ())
+{}
+
+::IR::ConsumesDef_ptr
+IR::ConsumesDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+IR::ConsumesDef_var::ConsumesDef_var (const ::IR::ConsumesDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ConsumesDef::_duplicate (p.ptr ()))
+{}
+
+IR::ConsumesDef_var::~ConsumesDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+IR::ConsumesDef_var &
+IR::ConsumesDef_var::operator= (ConsumesDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::ConsumesDef_var &
+IR::ConsumesDef_var::operator= (const ::IR::ConsumesDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::IR::ConsumesDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+IR::ConsumesDef_var::operator const ::IR::ConsumesDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+IR::ConsumesDef_var::operator ::IR::ConsumesDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::IR::ConsumesDef_ptr
+IR::ConsumesDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::IR::ConsumesDef_ptr
+IR::ConsumesDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::IR::ConsumesDef_ptr &
+IR::ConsumesDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::IR::ConsumesDef_ptr &
+IR::ConsumesDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::ConsumesDef::_nil ();
+  return this->ptr_;
+}
+
+::IR::ConsumesDef_ptr
+IR::ConsumesDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::IR::ConsumesDef_ptr val = this->ptr_;
+  this->ptr_ = ::IR::ConsumesDef::_nil ();
+  return val;
+}
+
+::IR::ConsumesDef_ptr
+IR::ConsumesDef_var::duplicate (ConsumesDef_ptr p)
+{
+  return ::IR::ConsumesDef::_duplicate (p);
+}
+
+void
+IR::ConsumesDef_var::release (ConsumesDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::IR::ConsumesDef_ptr
+IR::ConsumesDef_var::nil (void)
+{
+  return ::IR::ConsumesDef::_nil ();
+}
+
+::IR::ConsumesDef_ptr
+IR::ConsumesDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::IR::ConsumesDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+IR::ConsumesDef_var::upcast (void *src)
+{
+  ConsumesDef **tmp =
+    ACE_static_cast (ConsumesDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class IR::ConsumesDef_out
+// *************************************************************
+
+IR::ConsumesDef_out::ConsumesDef_out (ConsumesDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::IR::ConsumesDef::_nil ();
+}
+
+IR::ConsumesDef_out::ConsumesDef_out (ConsumesDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::ConsumesDef::_nil ();
+}
+
+IR::ConsumesDef_out::ConsumesDef_out (const ::IR::ConsumesDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ConsumesDef_out &, p).ptr_)
+{}
+
+::IR::ConsumesDef_out &
+IR::ConsumesDef_out::operator= (const ::IR::ConsumesDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (ConsumesDef_out&, p).ptr_;
+  return *this;
+}
+
+IR::ConsumesDef_out &
+IR::ConsumesDef_out::operator= (const ::IR::ConsumesDef_var &p)
+{
+  this->ptr_ = ::IR::ConsumesDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+IR::ConsumesDef_out &
+IR::ConsumesDef_out::operator= (ConsumesDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::ConsumesDef_out::operator ::IR::ConsumesDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::IR::ConsumesDef_ptr &
+IR::ConsumesDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::IR::ConsumesDef_ptr
+IR::ConsumesDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+#endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -6984,8 +8184,8 @@ CORBA::Boolean IR::ConsumesDef::_is_a (const CORBA::Char *value, CORBA::Environm
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConsumesDef:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
@@ -7013,25 +8213,25 @@ void *IR::ConsumesDef::_tao_QueryInterface (ptr_arith_t type)
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -7080,6 +8280,188 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConsumesDef, &_tc_TAO_tc_IR_ConsumesDef)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class IR::ComponentDef_var
+// *************************************************************
+
+IR::ComponentDef_var::ComponentDef_var (void) // default constructor
+  : ptr_ (ComponentDef::_nil ())
+{}
+
+::IR::ComponentDef_ptr
+IR::ComponentDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+IR::ComponentDef_var::ComponentDef_var (const ::IR::ComponentDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ComponentDef::_duplicate (p.ptr ()))
+{}
+
+IR::ComponentDef_var::~ComponentDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+IR::ComponentDef_var &
+IR::ComponentDef_var::operator= (ComponentDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::ComponentDef_var &
+IR::ComponentDef_var::operator= (const ::IR::ComponentDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::IR::ComponentDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+IR::ComponentDef_var::operator const ::IR::ComponentDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+IR::ComponentDef_var::operator ::IR::ComponentDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::IR::ComponentDef_ptr
+IR::ComponentDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::IR::ComponentDef_ptr
+IR::ComponentDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::IR::ComponentDef_ptr &
+IR::ComponentDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::IR::ComponentDef_ptr &
+IR::ComponentDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::ComponentDef::_nil ();
+  return this->ptr_;
+}
+
+::IR::ComponentDef_ptr
+IR::ComponentDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::IR::ComponentDef_ptr val = this->ptr_;
+  this->ptr_ = ::IR::ComponentDef::_nil ();
+  return val;
+}
+
+::IR::ComponentDef_ptr
+IR::ComponentDef_var::duplicate (ComponentDef_ptr p)
+{
+  return ::IR::ComponentDef::_duplicate (p);
+}
+
+void
+IR::ComponentDef_var::release (ComponentDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::IR::ComponentDef_ptr
+IR::ComponentDef_var::nil (void)
+{
+  return ::IR::ComponentDef::_nil ();
+}
+
+::IR::ComponentDef_ptr
+IR::ComponentDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::IR::ComponentDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+IR::ComponentDef_var::upcast (void *src)
+{
+  ComponentDef **tmp =
+    ACE_static_cast (ComponentDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class IR::ComponentDef_out
+// *************************************************************
+
+IR::ComponentDef_out::ComponentDef_out (ComponentDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::IR::ComponentDef::_nil ();
+}
+
+IR::ComponentDef_out::ComponentDef_out (ComponentDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::ComponentDef::_nil ();
+}
+
+IR::ComponentDef_out::ComponentDef_out (const ::IR::ComponentDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ComponentDef_out &, p).ptr_)
+{}
+
+::IR::ComponentDef_out &
+IR::ComponentDef_out::operator= (const ::IR::ComponentDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (ComponentDef_out&, p).ptr_;
+  return *this;
+}
+
+IR::ComponentDef_out &
+IR::ComponentDef_out::operator= (const ::IR::ComponentDef_var &p)
+{
+  this->ptr_ = ::IR::ComponentDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+IR::ComponentDef_out &
+IR::ComponentDef_out::operator= (ComponentDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::ComponentDef_out::operator ::IR::ComponentDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::IR::ComponentDef_ptr &
+IR::ComponentDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::IR::ComponentDef_ptr
+IR::ComponentDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get : public TAO_ClientRequestInfo
@@ -7110,13 +8492,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::InterfaceDefSeq * result);
+  void result (CORBA_InterfaceDefSeq * result);
 
 private:
   TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get &);
   void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get &);
 
-  CORBA::InterfaceDefSeq * _result;
+  CORBA_InterfaceDefSeq * _result;
 };
 
 TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
@@ -7169,7 +8551,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::E
 }
 
 void 
-TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::InterfaceDefSeq * result)
+TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA_InterfaceDefSeq * result)
 {
   // update the result 
   this->_result = result;
@@ -7181,7 +8563,7 @@ public:
   TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -7208,14 +8590,14 @@ private:
   TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set &);
   void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set &);
 
-  const CORBA::InterfaceDefSeq & supported_interfaces_;
+  const CORBA_InterfaceDefSeq & supported_interfaces_;
   
 };
 
 TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -7928,7 +9310,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::InterfaceDef_ptr interface_type,
+      CORBA_InterfaceDef_ptr interface_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -7960,7 +9342,7 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::InterfaceDef_ptr interface_type_;
+  CORBA_InterfaceDef_ptr interface_type_;
   IR::ProvidesDef_ptr _result;
 };
 
@@ -7970,7 +9352,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_provides::TAO_ClientRequestInfo_IR_
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
+    CORBA_InterfaceDef_ptr interface_type,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -8060,7 +9442,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::InterfaceDef_ptr interface_type,
+      CORBA_InterfaceDef_ptr interface_type,
       const CORBA::Boolean & is_multiple,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -8093,7 +9475,7 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::InterfaceDef_ptr interface_type_;
+  CORBA_InterfaceDef_ptr interface_type_;
   const CORBA::Boolean & is_multiple_;
   IR::UsesDef_ptr _result;
 };
@@ -8104,7 +9486,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_uses::TAO_ClientRequestInfo_IR_Comp
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
+    CORBA_InterfaceDef_ptr interface_type,
     const CORBA::Boolean & is_multiple,
     CORBA::Environment &    
   )
@@ -8201,7 +9583,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -8233,7 +9615,7 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::ValueDef_ptr value_;
+  CORBA_ValueDef_ptr value_;
   IR::EmitsDef_ptr _result;
 };
 
@@ -8243,7 +9625,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_emits::TAO_ClientRequestInfo_IR_Com
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -8333,7 +9715,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -8365,7 +9747,7 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::ValueDef_ptr value_;
+  CORBA_ValueDef_ptr value_;
   IR::PublishesDef_ptr _result;
 };
 
@@ -8375,7 +9757,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::TAO_ClientRequestInfo_IR
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -8465,7 +9847,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -8497,7 +9879,7 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::ValueDef_ptr value_;
+  CORBA_ValueDef_ptr value_;
   IR::ConsumesDef_ptr _result;
 };
 
@@ -8507,7 +9889,7 @@ TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::TAO_ClientRequestInfo_IR_
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -8602,7 +9984,7 @@ IR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (vo
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
+CORBA_InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8611,7 +9993,7 @@ CORBA::InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inte
   ))
 {
   
-  CORBA::InterfaceDefSeq *_tao_retval = 0;
+  CORBA_InterfaceDefSeq *_tao_retval = 0;
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -8619,8 +10001,8 @@ CORBA::InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inte
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::InterfaceDefSeq, _tao_retval);
-  CORBA::InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_InterfaceDefSeq, _tao_retval);
+  CORBA_InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_supported_interfaces",
@@ -8697,7 +10079,7 @@ CORBA::InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inte
             }
           
           TAO_INTERCEPTOR (
-              CORBA::InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -8765,7 +10147,7 @@ CORBA::InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_inte
 
 void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -10043,7 +11425,7 @@ IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
+    CORBA_InterfaceDef_ptr interface_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -10224,7 +11606,7 @@ IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
+    CORBA_InterfaceDef_ptr interface_type,
     CORBA::Boolean is_multiple,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -10408,7 +11790,7 @@ IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -10589,7 +11971,7 @@ IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -10770,7 +12152,7 @@ IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -11106,11 +12488,11 @@ CORBA::Boolean IR::ComponentDef::_is_a (const CORBA::Char *value, CORBA::Environ
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
@@ -11126,61 +12508,61 @@ void *IR::ComponentDef::_tao_QueryInterface (ptr_arith_t type)
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::InterfaceDef::_narrow))
+      &CORBA_InterfaceDef::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::InterfaceDef_ptr,
+            CORBA_InterfaceDef_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Container::_narrow))
+      &CORBA_Container::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Container_ptr,
+            CORBA_Container_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -11198,7 +12580,7 @@ const char* IR::ComponentDef::_interface_repository_id (void) const
   return "IDL:omg.org/IR/ComponentDef:1.0";
 }
 
-CORBA::InterfaceDefSeq * IR::ComponentDef::supported_interfaces (
+CORBA_InterfaceDefSeq * IR::ComponentDef::supported_interfaces (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -11216,7 +12598,7 @@ CORBA::InterfaceDefSeq * IR::ComponentDef::supported_interfaces (
 }
 
 void IR::ComponentDef::supported_interfaces (
-    const CORBA::InterfaceDefSeq & supported_interfaces,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -11357,7 +12739,7 @@ IR::ProvidesDef_ptr IR::ComponentDef::create_provides (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
+    CORBA_InterfaceDef_ptr interface_type,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -11382,7 +12764,7 @@ IR::UsesDef_ptr IR::ComponentDef::create_uses (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::InterfaceDef_ptr interface_type,
+    CORBA_InterfaceDef_ptr interface_type,
     CORBA::Boolean is_multiple,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -11409,7 +12791,7 @@ IR::EmitsDef_ptr IR::ComponentDef::create_emits (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -11434,7 +12816,7 @@ IR::PublishesDef_ptr IR::ComponentDef::create_publishes (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -11459,7 +12841,7 @@ IR::ConsumesDef_ptr IR::ComponentDef::create_consumes (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr value,
+    CORBA_ValueDef_ptr value,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -11480,7 +12862,6 @@ IR::ConsumesDef_ptr IR::ComponentDef::create_consumes (
     );
 }
 
-
 static const CORBA::Long _oc_IR_ComponentDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -11794,146 +13175,75 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
   ACE_NTOHL (0x69627574), 
   ACE_NTOHL (0x65730000),  // name = attributes
   CORBA::tk_alias, // typecode kind for typedefs
-  684, // encapsulation length
+  420, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
     ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4174), 
+    ACE_NTOHL (0x415f4174), 
     ACE_NTOHL (0x74724465), 
     ACE_NTOHL (0x73637269), 
     ACE_NTOHL (0x7074696f), 
     ACE_NTOHL (0x6e536571), 
     ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
-    19,
-    ACE_NTOHL (0x41747472), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
-    ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_AttrDescriptionSeq:1.0
+    25,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x415f4174), 
+    ACE_NTOHL (0x74724465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x0),  // name = CORBA_AttrDescriptionSeq
     CORBA::tk_sequence, // typecode kind
-    600, // encapsulation length
+    328, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
-      584, // encapsulation length
+      312, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
         ACE_NTOHL (0x49444c3a), 
         ACE_NTOHL (0x6f6d672e), 
         ACE_NTOHL (0x6f72672f), 
         ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4174), 
+        ACE_NTOHL (0x415f4174), 
         ACE_NTOHL (0x74726962), 
         ACE_NTOHL (0x75746544), 
         ACE_NTOHL (0x65736372), 
         ACE_NTOHL (0x69707469), 
         ACE_NTOHL (0x6f6e3a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
-        21,
-        ACE_NTOHL (0x41747472), 
-        ACE_NTOHL (0x69627574), 
-        ACE_NTOHL (0x65446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
-        ACE_NTOHL (0x0),  // name = AttributeDescription
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_AttributeDescription:1.0
+        27,
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x415f4174), 
+        ACE_NTOHL (0x74726962), 
+        ACE_NTOHL (0x75746544), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e0000),  // name = CORBA_AttributeDescription
         6, // member count
         5,
         ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4964), 
-          ACE_NTOHL (0x656e7469), 
-          ACE_NTOHL (0x66696572), 
-          ACE_NTOHL (0x3a312e30), 
-          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11,
-          ACE_NTOHL (0x4964656e), 
-          ACE_NTOHL (0x74696669), 
-          ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
-
+        CORBA::tk_string, 
+        0U, // string length
         3,
         ACE_NTOHL (0x69640000),  // name = id
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
-          ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
+        CORBA::tk_string, 
+        0U, // string length
         11,
         ACE_NTOHL (0x64656669), 
         ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
-          ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
+        CORBA::tk_string, 
+        0U, // string length
         8,
         ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          34,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5665), 
-          ACE_NTOHL (0x7273696f), 
-          ACE_NTOHL (0x6e537065), 
-          ACE_NTOHL (0x633a312e), 
-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-          12,
-          ACE_NTOHL (0x56657273), 
-          ACE_NTOHL (0x696f6e53), 
-          ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
-          0U, // string length
-
+        CORBA::tk_string, 
+        0U, // string length
         5,
         ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
@@ -11943,23 +13253,24 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
         ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
         CORBA::tk_enum, // typecode kind
-        104, // encapsulation length
+        108, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           36,
           ACE_NTOHL (0x49444c3a), 
           ACE_NTOHL (0x6f6d672e), 
           ACE_NTOHL (0x6f72672f), 
           ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4174), 
+          ACE_NTOHL (0x415f4174), 
           ACE_NTOHL (0x74726962), 
           ACE_NTOHL (0x7574654d), 
           ACE_NTOHL (0x6f64653a), 
-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-          14,
-          ACE_NTOHL (0x41747472), 
-          ACE_NTOHL (0x69627574), 
-          ACE_NTOHL (0x654d6f64), 
-          ACE_NTOHL (0x65000000),  // name = AttributeMode
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_AttributeMode:1.0
+          20,
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x415f4174), 
+          ACE_NTOHL (0x74726962), 
+          ACE_NTOHL (0x7574654d), 
+          ACE_NTOHL (0x6f646500),  // name = CORBA_AttributeMode
           2, // member count
           12,
           ACE_NTOHL (0x41545452), 
@@ -12139,6 +13450,188 @@ void IR::ComponentDescription::_tao_any_destructor (void *x)
   delete tmp;
 }
 
+// *************************************************************
+// Operations for class IR::PrimaryKeyDef_var
+// *************************************************************
+
+IR::PrimaryKeyDef_var::PrimaryKeyDef_var (void) // default constructor
+  : ptr_ (PrimaryKeyDef::_nil ())
+{}
+
+::IR::PrimaryKeyDef_ptr
+IR::PrimaryKeyDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+IR::PrimaryKeyDef_var::PrimaryKeyDef_var (const ::IR::PrimaryKeyDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (PrimaryKeyDef::_duplicate (p.ptr ()))
+{}
+
+IR::PrimaryKeyDef_var::~PrimaryKeyDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+IR::PrimaryKeyDef_var &
+IR::PrimaryKeyDef_var::operator= (PrimaryKeyDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::PrimaryKeyDef_var &
+IR::PrimaryKeyDef_var::operator= (const ::IR::PrimaryKeyDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::IR::PrimaryKeyDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+IR::PrimaryKeyDef_var::operator const ::IR::PrimaryKeyDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+IR::PrimaryKeyDef_var::operator ::IR::PrimaryKeyDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::IR::PrimaryKeyDef_ptr
+IR::PrimaryKeyDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::IR::PrimaryKeyDef_ptr
+IR::PrimaryKeyDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::IR::PrimaryKeyDef_ptr &
+IR::PrimaryKeyDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::IR::PrimaryKeyDef_ptr &
+IR::PrimaryKeyDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::PrimaryKeyDef::_nil ();
+  return this->ptr_;
+}
+
+::IR::PrimaryKeyDef_ptr
+IR::PrimaryKeyDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::IR::PrimaryKeyDef_ptr val = this->ptr_;
+  this->ptr_ = ::IR::PrimaryKeyDef::_nil ();
+  return val;
+}
+
+::IR::PrimaryKeyDef_ptr
+IR::PrimaryKeyDef_var::duplicate (PrimaryKeyDef_ptr p)
+{
+  return ::IR::PrimaryKeyDef::_duplicate (p);
+}
+
+void
+IR::PrimaryKeyDef_var::release (PrimaryKeyDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::IR::PrimaryKeyDef_ptr
+IR::PrimaryKeyDef_var::nil (void)
+{
+  return ::IR::PrimaryKeyDef::_nil ();
+}
+
+::IR::PrimaryKeyDef_ptr
+IR::PrimaryKeyDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::IR::PrimaryKeyDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+IR::PrimaryKeyDef_var::upcast (void *src)
+{
+  PrimaryKeyDef **tmp =
+    ACE_static_cast (PrimaryKeyDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class IR::PrimaryKeyDef_out
+// *************************************************************
+
+IR::PrimaryKeyDef_out::PrimaryKeyDef_out (PrimaryKeyDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::IR::PrimaryKeyDef::_nil ();
+}
+
+IR::PrimaryKeyDef_out::PrimaryKeyDef_out (PrimaryKeyDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::PrimaryKeyDef::_nil ();
+}
+
+IR::PrimaryKeyDef_out::PrimaryKeyDef_out (const ::IR::PrimaryKeyDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (PrimaryKeyDef_out &, p).ptr_)
+{}
+
+::IR::PrimaryKeyDef_out &
+IR::PrimaryKeyDef_out::operator= (const ::IR::PrimaryKeyDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (PrimaryKeyDef_out&, p).ptr_;
+  return *this;
+}
+
+IR::PrimaryKeyDef_out &
+IR::PrimaryKeyDef_out::operator= (const ::IR::PrimaryKeyDef_var &p)
+{
+  this->ptr_ = ::IR::PrimaryKeyDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+IR::PrimaryKeyDef_out &
+IR::PrimaryKeyDef_out::operator= (PrimaryKeyDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::PrimaryKeyDef_out::operator ::IR::PrimaryKeyDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::IR::PrimaryKeyDef_ptr &
+IR::PrimaryKeyDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::IR::PrimaryKeyDef_ptr
+IR::PrimaryKeyDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a : public TAO_ClientRequestInfo
@@ -12273,13 +13766,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ValueDef_ptr result);
+  void result (CORBA_ValueDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
   void operator= (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
 
-  CORBA::ValueDef_ptr _result;
+  CORBA_ValueDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
@@ -12332,7 +13825,7 @@ TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environme
 }
 
 void 
-TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::ValueDef_ptr result)
+TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA_ValueDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -12522,7 +14015,7 @@ CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
   return _tao_retval;
 }
 
-CORBA::ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
+CORBA_ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -12531,8 +14024,8 @@ CORBA::ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
   ))
 {
   
-  CORBA::ValueDef_ptr _tao_retval = CORBA::ValueDef::_nil ();
-  CORBA::ValueDef_var _tao_safe_retval (_tao_retval);
+  CORBA_ValueDef_ptr _tao_retval = CORBA_ValueDef::_nil ();
+  CORBA_ValueDef_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -12616,7 +14109,7 @@ CORBA::ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -12842,8 +14335,8 @@ CORBA::Boolean IR::PrimaryKeyDef::_is_a (const CORBA::Char *value, CORBA::Enviro
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimaryKeyDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
@@ -12859,25 +14352,25 @@ void *IR::PrimaryKeyDef::_tao_QueryInterface (ptr_arith_t type)
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -12914,7 +14407,7 @@ CORBA::Boolean IR::PrimaryKeyDef::is_a (
     );
 }
 
-CORBA::ValueDef_ptr IR::PrimaryKeyDef::primary_key (
+CORBA_ValueDef_ptr IR::PrimaryKeyDef::primary_key (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -12931,7 +14424,6 @@ CORBA::ValueDef_ptr IR::PrimaryKeyDef::primary_key (
     );
 }
 
-
 static const CORBA::Long _oc_IR_PrimaryKeyDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -13083,21 +14575,22 @@ static const CORBA::Long _oc_IR_PrimaryKeyDescription[] =
   ACE_NTOHL (0x6172795f), 
   ACE_NTOHL (0x6b657900),  // name = primary_key
   CORBA::tk_objref, // typecode kind
-  56, // encapsulation length
+  60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     31,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
     ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f5661), 
+    ACE_NTOHL (0x415f5661), 
     ACE_NTOHL (0x6c756544), 
     ACE_NTOHL (0x65663a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
-    9,
-    ACE_NTOHL (0x56616c75), 
-    ACE_NTOHL (0x65446566), 
-    ACE_NTOHL (0x0),  // name = ValueDef
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ValueDef:1.0
+    15,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x415f5661), 
+    ACE_NTOHL (0x6c756544), 
+    ACE_NTOHL (0x65660000),  // name = CORBA_ValueDef
 
 };
 
@@ -13120,6 +14613,191 @@ void IR::PrimaryKeyDescription::_tao_any_destructor (void *x)
   delete tmp;
 }
 
+// *************************************************************
+// Operations for class IR::FactoryDef_var
+// *************************************************************
+
+IR::FactoryDef_var::FactoryDef_var (void) // default constructor
+  : ptr_ (FactoryDef::_nil ())
+{}
+
+::IR::FactoryDef_ptr
+IR::FactoryDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+IR::FactoryDef_var::FactoryDef_var (const ::IR::FactoryDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (FactoryDef::_duplicate (p.ptr ()))
+{}
+
+IR::FactoryDef_var::~FactoryDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+IR::FactoryDef_var &
+IR::FactoryDef_var::operator= (FactoryDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::FactoryDef_var &
+IR::FactoryDef_var::operator= (const ::IR::FactoryDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::IR::FactoryDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+IR::FactoryDef_var::operator const ::IR::FactoryDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+IR::FactoryDef_var::operator ::IR::FactoryDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::IR::FactoryDef_ptr
+IR::FactoryDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::IR::FactoryDef_ptr
+IR::FactoryDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::IR::FactoryDef_ptr &
+IR::FactoryDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::IR::FactoryDef_ptr &
+IR::FactoryDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::FactoryDef::_nil ();
+  return this->ptr_;
+}
+
+::IR::FactoryDef_ptr
+IR::FactoryDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::IR::FactoryDef_ptr val = this->ptr_;
+  this->ptr_ = ::IR::FactoryDef::_nil ();
+  return val;
+}
+
+::IR::FactoryDef_ptr
+IR::FactoryDef_var::duplicate (FactoryDef_ptr p)
+{
+  return ::IR::FactoryDef::_duplicate (p);
+}
+
+void
+IR::FactoryDef_var::release (FactoryDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::IR::FactoryDef_ptr
+IR::FactoryDef_var::nil (void)
+{
+  return ::IR::FactoryDef::_nil ();
+}
+
+::IR::FactoryDef_ptr
+IR::FactoryDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::IR::FactoryDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+IR::FactoryDef_var::upcast (void *src)
+{
+  FactoryDef **tmp =
+    ACE_static_cast (FactoryDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class IR::FactoryDef_out
+// *************************************************************
+
+IR::FactoryDef_out::FactoryDef_out (FactoryDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::IR::FactoryDef::_nil ();
+}
+
+IR::FactoryDef_out::FactoryDef_out (FactoryDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::FactoryDef::_nil ();
+}
+
+IR::FactoryDef_out::FactoryDef_out (const ::IR::FactoryDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (FactoryDef_out &, p).ptr_)
+{}
+
+::IR::FactoryDef_out &
+IR::FactoryDef_out::operator= (const ::IR::FactoryDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (FactoryDef_out&, p).ptr_;
+  return *this;
+}
+
+IR::FactoryDef_out &
+IR::FactoryDef_out::operator= (const ::IR::FactoryDef_var &p)
+{
+  this->ptr_ = ::IR::FactoryDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+IR::FactoryDef_out &
+IR::FactoryDef_out::operator= (FactoryDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::FactoryDef_out::operator ::IR::FactoryDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::IR::FactoryDef_ptr &
+IR::FactoryDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::IR::FactoryDef_ptr
+IR::FactoryDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+#endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -13293,9 +14971,9 @@ CORBA::Boolean IR::FactoryDef::_is_a (const CORBA::Char *value, CORBA::Environme
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
@@ -13311,37 +14989,37 @@ void *IR::FactoryDef::_tao_QueryInterface (ptr_arith_t type)
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::OperationDef::_narrow))
+      &CORBA_OperationDef::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::OperationDef_ptr,
+            CORBA_OperationDef_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -13390,6 +15068,191 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FactoryDef, &_tc_TAO_tc_IR_FactoryDef)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class IR::FinderDef_var
+// *************************************************************
+
+IR::FinderDef_var::FinderDef_var (void) // default constructor
+  : ptr_ (FinderDef::_nil ())
+{}
+
+::IR::FinderDef_ptr
+IR::FinderDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+IR::FinderDef_var::FinderDef_var (const ::IR::FinderDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (FinderDef::_duplicate (p.ptr ()))
+{}
+
+IR::FinderDef_var::~FinderDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+IR::FinderDef_var &
+IR::FinderDef_var::operator= (FinderDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::FinderDef_var &
+IR::FinderDef_var::operator= (const ::IR::FinderDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::IR::FinderDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+IR::FinderDef_var::operator const ::IR::FinderDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+IR::FinderDef_var::operator ::IR::FinderDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::IR::FinderDef_ptr
+IR::FinderDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::IR::FinderDef_ptr
+IR::FinderDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::IR::FinderDef_ptr &
+IR::FinderDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::IR::FinderDef_ptr &
+IR::FinderDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::FinderDef::_nil ();
+  return this->ptr_;
+}
+
+::IR::FinderDef_ptr
+IR::FinderDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::IR::FinderDef_ptr val = this->ptr_;
+  this->ptr_ = ::IR::FinderDef::_nil ();
+  return val;
+}
+
+::IR::FinderDef_ptr
+IR::FinderDef_var::duplicate (FinderDef_ptr p)
+{
+  return ::IR::FinderDef::_duplicate (p);
+}
+
+void
+IR::FinderDef_var::release (FinderDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::IR::FinderDef_ptr
+IR::FinderDef_var::nil (void)
+{
+  return ::IR::FinderDef::_nil ();
+}
+
+::IR::FinderDef_ptr
+IR::FinderDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::IR::FinderDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+IR::FinderDef_var::upcast (void *src)
+{
+  FinderDef **tmp =
+    ACE_static_cast (FinderDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class IR::FinderDef_out
+// *************************************************************
+
+IR::FinderDef_out::FinderDef_out (FinderDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::IR::FinderDef::_nil ();
+}
+
+IR::FinderDef_out::FinderDef_out (FinderDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::FinderDef::_nil ();
+}
+
+IR::FinderDef_out::FinderDef_out (const ::IR::FinderDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (FinderDef_out &, p).ptr_)
+{}
+
+::IR::FinderDef_out &
+IR::FinderDef_out::operator= (const ::IR::FinderDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (FinderDef_out&, p).ptr_;
+  return *this;
+}
+
+IR::FinderDef_out &
+IR::FinderDef_out::operator= (const ::IR::FinderDef_var &p)
+{
+  this->ptr_ = ::IR::FinderDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+IR::FinderDef_out &
+IR::FinderDef_out::operator= (FinderDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::FinderDef_out::operator ::IR::FinderDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::IR::FinderDef_ptr &
+IR::FinderDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::IR::FinderDef_ptr
+IR::FinderDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+#endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
 //                Base & Remote Proxy  Implementation. 
@@ -13563,9 +15426,9 @@ CORBA::Boolean IR::FinderDef::_is_a (const CORBA::Char *value, CORBA::Environmen
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
@@ -13581,37 +15444,37 @@ void *IR::FinderDef::_tao_QueryInterface (ptr_arith_t type)
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::OperationDef::_narrow))
+      &CORBA_OperationDef::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::OperationDef_ptr,
+            CORBA_OperationDef_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -13660,6 +15523,188 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FinderDef, &_tc_TAO_tc_IR_FinderDef)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class IR::HomeDef_var
+// *************************************************************
+
+IR::HomeDef_var::HomeDef_var (void) // default constructor
+  : ptr_ (HomeDef::_nil ())
+{}
+
+::IR::HomeDef_ptr
+IR::HomeDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+IR::HomeDef_var::HomeDef_var (const ::IR::HomeDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (HomeDef::_duplicate (p.ptr ()))
+{}
+
+IR::HomeDef_var::~HomeDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+IR::HomeDef_var &
+IR::HomeDef_var::operator= (HomeDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::HomeDef_var &
+IR::HomeDef_var::operator= (const ::IR::HomeDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::IR::HomeDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+IR::HomeDef_var::operator const ::IR::HomeDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+IR::HomeDef_var::operator ::IR::HomeDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::IR::HomeDef_ptr
+IR::HomeDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::IR::HomeDef_ptr
+IR::HomeDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::IR::HomeDef_ptr &
+IR::HomeDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::IR::HomeDef_ptr &
+IR::HomeDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::HomeDef::_nil ();
+  return this->ptr_;
+}
+
+::IR::HomeDef_ptr
+IR::HomeDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::IR::HomeDef_ptr val = this->ptr_;
+  this->ptr_ = ::IR::HomeDef::_nil ();
+  return val;
+}
+
+::IR::HomeDef_ptr
+IR::HomeDef_var::duplicate (HomeDef_ptr p)
+{
+  return ::IR::HomeDef::_duplicate (p);
+}
+
+void
+IR::HomeDef_var::release (HomeDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::IR::HomeDef_ptr
+IR::HomeDef_var::nil (void)
+{
+  return ::IR::HomeDef::_nil ();
+}
+
+::IR::HomeDef_ptr
+IR::HomeDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::IR::HomeDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+IR::HomeDef_var::upcast (void *src)
+{
+  HomeDef **tmp =
+    ACE_static_cast (HomeDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class IR::HomeDef_out
+// *************************************************************
+
+IR::HomeDef_out::HomeDef_out (HomeDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::IR::HomeDef::_nil ();
+}
+
+IR::HomeDef_out::HomeDef_out (HomeDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IR::HomeDef::_nil ();
+}
+
+IR::HomeDef_out::HomeDef_out (const ::IR::HomeDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (HomeDef_out &, p).ptr_)
+{}
+
+::IR::HomeDef_out &
+IR::HomeDef_out::operator= (const ::IR::HomeDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (HomeDef_out&, p).ptr_;
+  return *this;
+}
+
+IR::HomeDef_out &
+IR::HomeDef_out::operator= (const ::IR::HomeDef_var &p)
+{
+  this->ptr_ = ::IR::HomeDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+IR::HomeDef_out &
+IR::HomeDef_out::operator= (HomeDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+IR::HomeDef_out::operator ::IR::HomeDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::IR::HomeDef_ptr &
+IR::HomeDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::IR::HomeDef_ptr
+IR::HomeDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_IR_HomeDef_base_home_get : public TAO_ClientRequestInfo
@@ -14229,7 +16274,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr primary_key,
+      CORBA_ValueDef_ptr primary_key,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -14261,7 +16306,7 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::ValueDef_ptr primary_key_;
+  CORBA_ValueDef_ptr primary_key_;
   IR::PrimaryKeyDef_ptr _result;
 };
 
@@ -14271,7 +16316,7 @@ TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::TAO_ClientRequestInfo_IR_Ho
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr primary_key,
+    CORBA_ValueDef_ptr primary_key,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -14361,8 +16406,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -14394,8 +16439,8 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::ParDescriptionSeq & params_;
-  const CORBA::ExceptionDefSeq & exceptions_;
+  const CORBA_ParDescriptionSeq & params_;
+  const CORBA_ExceptionDefSeq & exceptions_;
   IR::FactoryDef_ptr _result;
 };
 
@@ -14405,8 +16450,8 @@ TAO_ClientRequestInfo_IR_HomeDef_create_factory::TAO_ClientRequestInfo_IR_HomeDe
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -14503,8 +16548,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -14536,8 +16581,8 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  const CORBA::ParDescriptionSeq & params_;
-  const CORBA::ExceptionDefSeq & exceptions_;
+  const CORBA_ParDescriptionSeq & params_;
+  const CORBA_ExceptionDefSeq & exceptions_;
   IR::FinderDef_ptr _result;
 };
 
@@ -14547,8 +16592,8 @@ TAO_ClientRequestInfo_IR_HomeDef_create_finder::TAO_ClientRequestInfo_IR_HomeDef
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -15615,7 +17660,7 @@ IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr primary_key,
+    CORBA_ValueDef_ptr primary_key,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -15796,8 +17841,8 @@ IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -15980,8 +18025,8 @@ IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -16319,11 +18364,11 @@ CORBA::Boolean IR::HomeDef::_is_a (const CORBA::Char *value, CORBA::Environment
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
   return 1; // success using local knowledge
   else
@@ -16339,61 +18384,61 @@ void *IR::HomeDef::_tao_QueryInterface (ptr_arith_t type)
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::InterfaceDef::_narrow))
+      &CORBA_InterfaceDef::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::InterfaceDef_ptr,
+            CORBA_InterfaceDef_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Container::_narrow))
+      &CORBA_Container::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Container_ptr,
+            CORBA_Container_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -16517,7 +18562,7 @@ IR::PrimaryKeyDef_ptr IR::HomeDef::create_primary_key (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::ValueDef_ptr primary_key,
+    CORBA_ValueDef_ptr primary_key,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -16542,8 +18587,8 @@ IR::FactoryDef_ptr IR::HomeDef::create_factory (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -16569,8 +18614,8 @@ IR::FinderDef_ptr IR::HomeDef::create_finder (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -16592,7 +18637,6 @@ IR::FinderDef_ptr IR::HomeDef::create_finder (
     );
 }
 
-
 static const CORBA::Long _oc_IR_HomeDef[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -16898,145 +18942,73 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
   ACE_NTOHL (0x6174696f), 
   ACE_NTOHL (0x6e730000),  // name = operations
   CORBA::tk_alias, // typecode kind for typedefs
-  2036, // encapsulation length
+  1304, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     39,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
     ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4f70), 
+    ACE_NTOHL (0x415f4f70), 
     ACE_NTOHL (0x44657363), 
     ACE_NTOHL (0x72697074), 
     ACE_NTOHL (0x696f6e53), 
     ACE_NTOHL (0x65713a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
-    17,
-    ACE_NTOHL (0x4f704465), 
-    ACE_NTOHL (0x73637269), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e536571), 
-    ACE_NTOHL (0x0),  // name = OpDescriptionSeq
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_OpDescriptionSeq:1.0
+    23,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x415f4f70), 
+    ACE_NTOHL (0x44657363), 
+    ACE_NTOHL (0x72697074), 
+    ACE_NTOHL (0x696f6e53), 
+    ACE_NTOHL (0x65710000),  // name = CORBA_OpDescriptionSeq
     CORBA::tk_sequence, // typecode kind
-    1956, // encapsulation length
+    1220, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
-      1940, // encapsulation length
+      1204, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
         ACE_NTOHL (0x49444c3a), 
         ACE_NTOHL (0x6f6d672e), 
         ACE_NTOHL (0x6f72672f), 
         ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4f70), 
+        ACE_NTOHL (0x415f4f70), 
         ACE_NTOHL (0x65726174), 
         ACE_NTOHL (0x696f6e44), 
         ACE_NTOHL (0x65736372), 
         ACE_NTOHL (0x69707469), 
         ACE_NTOHL (0x6f6e3a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
-        21,
-        ACE_NTOHL (0x4f706572), 
-        ACE_NTOHL (0x6174696f), 
-        ACE_NTOHL (0x6e446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
-        ACE_NTOHL (0x0),  // name = OperationDescription
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_OperationDescription:1.0
+        27,
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x415f4f70), 
+        ACE_NTOHL (0x65726174), 
+        ACE_NTOHL (0x696f6e44), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e0000),  // name = CORBA_OperationDescription
         9, // member count
         5,
         ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4964), 
-          ACE_NTOHL (0x656e7469), 
-          ACE_NTOHL (0x66696572), 
-          ACE_NTOHL (0x3a312e30), 
-          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11,
-          ACE_NTOHL (0x4964656e), 
-          ACE_NTOHL (0x74696669), 
-          ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
-
+        CORBA::tk_string, 
+        0U, // string length
         3,
         ACE_NTOHL (0x69640000),  // name = id
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
-          ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
+        CORBA::tk_string, 
+        0U, // string length
         11,
         ACE_NTOHL (0x64656669), 
         ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
-          ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
+        CORBA::tk_string, 
+        0U, // string length
         8,
         ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          34,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5665), 
-          ACE_NTOHL (0x7273696f), 
-          ACE_NTOHL (0x6e537065), 
-          ACE_NTOHL (0x633a312e), 
-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-          12,
-          ACE_NTOHL (0x56657273), 
-          ACE_NTOHL (0x696f6e53), 
-          ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
-          0U, // string length
-
+        CORBA::tk_string, 
+        0U, // string length
         7,
         ACE_NTOHL (0x72657375), 
         ACE_NTOHL (0x6c740000),  // name = result
@@ -17046,23 +19018,24 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
         ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
         CORBA::tk_enum, // typecode kind
-        100, // encapsulation length
+        104, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           36,
           ACE_NTOHL (0x49444c3a), 
           ACE_NTOHL (0x6f6d672e), 
           ACE_NTOHL (0x6f72672f), 
           ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4f70), 
+          ACE_NTOHL (0x415f4f70), 
           ACE_NTOHL (0x65726174), 
           ACE_NTOHL (0x696f6e4d), 
           ACE_NTOHL (0x6f64653a), 
-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
-          14,
-          ACE_NTOHL (0x4f706572), 
-          ACE_NTOHL (0x6174696f), 
-          ACE_NTOHL (0x6e4d6f64), 
-          ACE_NTOHL (0x65000000),  // name = OperationMode
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_OperationMode:1.0
+          20,
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x415f4f70), 
+          ACE_NTOHL (0x65726174), 
+          ACE_NTOHL (0x696f6e4d), 
+          ACE_NTOHL (0x6f646500),  // name = CORBA_OperationMode
           2, // member count
           10,
           ACE_NTOHL (0x4f505f4e), 
@@ -17078,67 +19051,29 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
         ACE_NTOHL (0x65787473), 
         ACE_NTOHL (0x0),  // name = contexts
         CORBA::tk_alias, // typecode kind for typedefs
-        236, // encapsulation length
+        92, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           35,
           ACE_NTOHL (0x49444c3a), 
           ACE_NTOHL (0x6f6d672e), 
           ACE_NTOHL (0x6f72672f), 
           ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f436f), 
+          ACE_NTOHL (0x415f436f), 
           ACE_NTOHL (0x6e746578), 
           ACE_NTOHL (0x74496453), 
           ACE_NTOHL (0x65713a31), 
-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
-          13,
-          ACE_NTOHL (0x436f6e74), 
-          ACE_NTOHL (0x65787449), 
-          ACE_NTOHL (0x64536571), 
-          ACE_NTOHL (0x0),  // name = ContextIdSeq
+          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ContextIdSeq:1.0
+          19,
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x415f436f), 
+          ACE_NTOHL (0x6e746578), 
+          ACE_NTOHL (0x74496453), 
+          ACE_NTOHL (0x65710000),  // name = CORBA_ContextIdSeq
           CORBA::tk_sequence, // typecode kind
-          164, // encapsulation length
+          16, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_alias, // typecode kind for typedefs
-            148, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              40,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x6f6d672e), 
-              ACE_NTOHL (0x6f72672f), 
-              ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f436f), 
-              ACE_NTOHL (0x6e746578), 
-              ACE_NTOHL (0x74496465), 
-              ACE_NTOHL (0x6e746966), 
-              ACE_NTOHL (0x6965723a), 
-              ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
-              18,
-              ACE_NTOHL (0x436f6e74), 
-              ACE_NTOHL (0x65787449), 
-              ACE_NTOHL (0x64656e74), 
-              ACE_NTOHL (0x69666965), 
-              ACE_NTOHL (0x72000000),  // name = ContextIdentifier
-              CORBA::tk_alias, // typecode kind for typedefs
-              68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
-                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
-                ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
-
-
+            CORBA::tk_string, 
+            0U, // string length
             0U,
 
 
@@ -17147,74 +19082,58 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
         ACE_NTOHL (0x6d657465), 
         ACE_NTOHL (0x72730000),  // name = parameters
         CORBA::tk_alias, // typecode kind for typedefs
-        496, // encapsulation length
+        448, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
           ACE_NTOHL (0x49444c3a), 
           ACE_NTOHL (0x6f6d672e), 
           ACE_NTOHL (0x6f72672f), 
           ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5061), 
+          ACE_NTOHL (0x415f5061), 
           ACE_NTOHL (0x72446573), 
           ACE_NTOHL (0x63726970), 
           ACE_NTOHL (0x74696f6e), 
           ACE_NTOHL (0x5365713a), 
-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
-          18,
-          ACE_NTOHL (0x50617244), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
-          ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ParDescriptionSeq:1.0
+          24,
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x415f5061), 
+          ACE_NTOHL (0x72446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x53657100),  // name = CORBA_ParDescriptionSeq
           CORBA::tk_sequence, // typecode kind
-          416, // encapsulation length
+          364, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             CORBA::tk_struct, // typecode kind
-            400, // encapsulation length
+            348, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
               ACE_NTOHL (0x49444c3a), 
               ACE_NTOHL (0x6f6d672e), 
               ACE_NTOHL (0x6f72672f), 
               ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f5061), 
+              ACE_NTOHL (0x415f5061), 
               ACE_NTOHL (0x72616d65), 
               ACE_NTOHL (0x74657244), 
               ACE_NTOHL (0x65736372), 
               ACE_NTOHL (0x69707469), 
               ACE_NTOHL (0x6f6e3a31), 
-              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
-              21,
-              ACE_NTOHL (0x50617261), 
-              ACE_NTOHL (0x6d657465), 
-              ACE_NTOHL (0x72446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
-              ACE_NTOHL (0x0),  // name = ParameterDescription
+              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ParameterDescription:1.0
+              27,
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x415f5061), 
+              ACE_NTOHL (0x72616d65), 
+              ACE_NTOHL (0x74657244), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e0000),  // name = CORBA_ParameterDescription
               4, // member count
               5,
               ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
-              CORBA::tk_alias, // typecode kind for typedefs
-              68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
-                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
-                ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
-
+              CORBA::tk_string, 
+              0U, // string length
               5,
               ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
@@ -17225,42 +19144,45 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
               ACE_NTOHL (0x5f646566), 
               ACE_NTOHL (0x0),  // name = type_def
               CORBA::tk_objref, // typecode kind
-              52, // encapsulation length
+              60, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 30,
                 ACE_NTOHL (0x49444c3a), 
                 ACE_NTOHL (0x6f6d672e), 
                 ACE_NTOHL (0x6f72672f), 
                 ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4944), 
+                ACE_NTOHL (0x415f4944), 
                 ACE_NTOHL (0x4c547970), 
                 ACE_NTOHL (0x653a312e), 
-                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-                8,
-                ACE_NTOHL (0x49444c54), 
-                ACE_NTOHL (0x79706500),  // name = IDLType
+                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+                14,
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x415f4944), 
+                ACE_NTOHL (0x4c547970), 
+                ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
 
               5,
               ACE_NTOHL (0x6d6f6465), 
               ACE_NTOHL (0x0),  // name = mode
               CORBA::tk_enum, // typecode kind
-              116, // encapsulation length
+              120, // encapsulation length
                 TAO_ENCAP_BYTE_ORDER, // byte order
                 36,
                 ACE_NTOHL (0x49444c3a), 
                 ACE_NTOHL (0x6f6d672e), 
                 ACE_NTOHL (0x6f72672f), 
                 ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5061), 
+                ACE_NTOHL (0x415f5061), 
                 ACE_NTOHL (0x72616d65), 
                 ACE_NTOHL (0x7465724d), 
                 ACE_NTOHL (0x6f64653a), 
-                ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
-                14,
-                ACE_NTOHL (0x50617261), 
-                ACE_NTOHL (0x6d657465), 
-                ACE_NTOHL (0x724d6f64), 
-                ACE_NTOHL (0x65000000),  // name = ParameterMode
+                ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ParameterMode:1.0
+                20,
+                ACE_NTOHL (0x434f5242), 
+                ACE_NTOHL (0x415f5061), 
+                ACE_NTOHL (0x72616d65), 
+                ACE_NTOHL (0x7465724d), 
+                ACE_NTOHL (0x6f646500),  // name = CORBA_ParameterMode
                 3, // member count
                 9,
                 ACE_NTOHL (0x50415241), 
@@ -17284,145 +19206,73 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
         ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = exceptions
         CORBA::tk_alias, // typecode kind for typedefs
-        556, // encapsulation length
+        284, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           40,
           ACE_NTOHL (0x49444c3a), 
           ACE_NTOHL (0x6f6d672e), 
           ACE_NTOHL (0x6f72672f), 
           ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4578), 
+          ACE_NTOHL (0x415f4578), 
           ACE_NTOHL (0x63446573), 
           ACE_NTOHL (0x63726970), 
           ACE_NTOHL (0x74696f6e), 
           ACE_NTOHL (0x5365713a), 
-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
-          18,
-          ACE_NTOHL (0x45786344), 
-          ACE_NTOHL (0x65736372), 
-          ACE_NTOHL (0x69707469), 
-          ACE_NTOHL (0x6f6e5365), 
-          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ExcDescriptionSeq:1.0
+          24,
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x415f4578), 
+          ACE_NTOHL (0x63446573), 
+          ACE_NTOHL (0x63726970), 
+          ACE_NTOHL (0x74696f6e), 
+          ACE_NTOHL (0x53657100),  // name = CORBA_ExcDescriptionSeq
           CORBA::tk_sequence, // typecode kind
-          476, // encapsulation length
+          200, // encapsulation length
             TAO_ENCAP_BYTE_ORDER, // byte order
             CORBA::tk_struct, // typecode kind
-            460, // encapsulation length
+            184, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               43,
               ACE_NTOHL (0x49444c3a), 
               ACE_NTOHL (0x6f6d672e), 
               ACE_NTOHL (0x6f72672f), 
               ACE_NTOHL (0x434f5242), 
-              ACE_NTOHL (0x412f4578), 
+              ACE_NTOHL (0x415f4578), 
               ACE_NTOHL (0x63657074), 
               ACE_NTOHL (0x696f6e44), 
               ACE_NTOHL (0x65736372), 
               ACE_NTOHL (0x69707469), 
               ACE_NTOHL (0x6f6e3a31), 
-              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
-              21,
-              ACE_NTOHL (0x45786365), 
-              ACE_NTOHL (0x7074696f), 
-              ACE_NTOHL (0x6e446573), 
-              ACE_NTOHL (0x63726970), 
-              ACE_NTOHL (0x74696f6e), 
-              ACE_NTOHL (0x0),  // name = ExceptionDescription
+              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ExceptionDescription:1.0
+              27,
+              ACE_NTOHL (0x434f5242), 
+              ACE_NTOHL (0x415f4578), 
+              ACE_NTOHL (0x63657074), 
+              ACE_NTOHL (0x696f6e44), 
+              ACE_NTOHL (0x65736372), 
+              ACE_NTOHL (0x69707469), 
+              ACE_NTOHL (0x6f6e0000),  // name = CORBA_ExceptionDescription
               5, // member count
               5,
               ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
-              CORBA::tk_alias, // typecode kind for typedefs
-              68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                33,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f4964), 
-                ACE_NTOHL (0x656e7469), 
-                ACE_NTOHL (0x66696572), 
-                ACE_NTOHL (0x3a312e30), 
-                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-                11,
-                ACE_NTOHL (0x4964656e), 
-                ACE_NTOHL (0x74696669), 
-                ACE_NTOHL (0x65720000),  // name = Identifier
-                CORBA::tk_string, 
-                0U, // string length
-
+              CORBA::tk_string, 
+              0U, // string length
               3,
               ACE_NTOHL (0x69640000),  // name = id
-              CORBA::tk_alias, // typecode kind for typedefs
-              72, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                35,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5265), 
-                ACE_NTOHL (0x706f7369), 
-                ACE_NTOHL (0x746f7279), 
-                ACE_NTOHL (0x49643a31), 
-                ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-                13,
-                ACE_NTOHL (0x5265706f), 
-                ACE_NTOHL (0x7369746f), 
-                ACE_NTOHL (0x72794964), 
-                ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
-                0U, // string length
-
+              CORBA::tk_string, 
+              0U, // string length
               11,
               ACE_NTOHL (0x64656669), 
               ACE_NTOHL (0x6e65645f), 
               ACE_NTOHL (0x696e0000),  // name = defined_in
-              CORBA::tk_alias, // typecode kind for typedefs
-              72, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                35,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5265), 
-                ACE_NTOHL (0x706f7369), 
-                ACE_NTOHL (0x746f7279), 
-                ACE_NTOHL (0x49643a31), 
-                ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-                13,
-                ACE_NTOHL (0x5265706f), 
-                ACE_NTOHL (0x7369746f), 
-                ACE_NTOHL (0x72794964), 
-                ACE_NTOHL (0x0),  // name = RepositoryId
-                CORBA::tk_string, 
-                0U, // string length
-
+              CORBA::tk_string, 
+              0U, // string length
               8,
               ACE_NTOHL (0x76657273), 
               ACE_NTOHL (0x696f6e00),  // name = version
-              CORBA::tk_alias, // typecode kind for typedefs
-              68, // encapsulation length
-                TAO_ENCAP_BYTE_ORDER, // byte order
-                34,
-                ACE_NTOHL (0x49444c3a), 
-                ACE_NTOHL (0x6f6d672e), 
-                ACE_NTOHL (0x6f72672f), 
-                ACE_NTOHL (0x434f5242), 
-                ACE_NTOHL (0x412f5665), 
-                ACE_NTOHL (0x7273696f), 
-                ACE_NTOHL (0x6e537065), 
-                ACE_NTOHL (0x633a312e), 
-                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-                12,
-                ACE_NTOHL (0x56657273), 
-                ACE_NTOHL (0x696f6e53), 
-                ACE_NTOHL (0x70656300),  // name = VersionSpec
-                CORBA::tk_string, 
-                0U, // string length
-
+              CORBA::tk_string, 
+              0U, // string length
               5,
               ACE_NTOHL (0x74797065), 
               ACE_NTOHL (0x0),  // name = type
@@ -17441,146 +19291,75 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
   ACE_NTOHL (0x69627574), 
   ACE_NTOHL (0x65730000),  // name = attributes
   CORBA::tk_alias, // typecode kind for typedefs
-  684, // encapsulation length
+  420, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
     ACE_NTOHL (0x49444c3a), 
     ACE_NTOHL (0x6f6d672e), 
     ACE_NTOHL (0x6f72672f), 
     ACE_NTOHL (0x434f5242), 
-    ACE_NTOHL (0x412f4174), 
+    ACE_NTOHL (0x415f4174), 
     ACE_NTOHL (0x74724465), 
     ACE_NTOHL (0x73637269), 
     ACE_NTOHL (0x7074696f), 
     ACE_NTOHL (0x6e536571), 
     ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
-    19,
-    ACE_NTOHL (0x41747472), 
-    ACE_NTOHL (0x44657363), 
-    ACE_NTOHL (0x72697074), 
-    ACE_NTOHL (0x696f6e53), 
-    ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_AttrDescriptionSeq:1.0
+    25,
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x415f4174), 
+    ACE_NTOHL (0x74724465), 
+    ACE_NTOHL (0x73637269), 
+    ACE_NTOHL (0x7074696f), 
+    ACE_NTOHL (0x6e536571), 
+    ACE_NTOHL (0x0),  // name = CORBA_AttrDescriptionSeq
     CORBA::tk_sequence, // typecode kind
-    600, // encapsulation length
+    328, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       CORBA::tk_struct, // typecode kind
-      584, // encapsulation length
+      312, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         43,
         ACE_NTOHL (0x49444c3a), 
         ACE_NTOHL (0x6f6d672e), 
         ACE_NTOHL (0x6f72672f), 
         ACE_NTOHL (0x434f5242), 
-        ACE_NTOHL (0x412f4174), 
+        ACE_NTOHL (0x415f4174), 
         ACE_NTOHL (0x74726962), 
         ACE_NTOHL (0x75746544), 
         ACE_NTOHL (0x65736372), 
         ACE_NTOHL (0x69707469), 
         ACE_NTOHL (0x6f6e3a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
-        21,
-        ACE_NTOHL (0x41747472), 
-        ACE_NTOHL (0x69627574), 
-        ACE_NTOHL (0x65446573), 
-        ACE_NTOHL (0x63726970), 
-        ACE_NTOHL (0x74696f6e), 
-        ACE_NTOHL (0x0),  // name = AttributeDescription
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_AttributeDescription:1.0
+        27,
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x415f4174), 
+        ACE_NTOHL (0x74726962), 
+        ACE_NTOHL (0x75746544), 
+        ACE_NTOHL (0x65736372), 
+        ACE_NTOHL (0x69707469), 
+        ACE_NTOHL (0x6f6e0000),  // name = CORBA_AttributeDescription
         6, // member count
         5,
         ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          33,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4964), 
-          ACE_NTOHL (0x656e7469), 
-          ACE_NTOHL (0x66696572), 
-          ACE_NTOHL (0x3a312e30), 
-          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-          11,
-          ACE_NTOHL (0x4964656e), 
-          ACE_NTOHL (0x74696669), 
-          ACE_NTOHL (0x65720000),  // name = Identifier
-          CORBA::tk_string, 
-          0U, // string length
-
+        CORBA::tk_string, 
+        0U, // string length
         3,
         ACE_NTOHL (0x69640000),  // name = id
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
-          ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
+        CORBA::tk_string, 
+        0U, // string length
         11,
         ACE_NTOHL (0x64656669), 
         ACE_NTOHL (0x6e65645f), 
         ACE_NTOHL (0x696e0000),  // name = defined_in
-        CORBA::tk_alias, // typecode kind for typedefs
-        72, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          35,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x49643a31), 
-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-          13,
-          ACE_NTOHL (0x5265706f), 
-          ACE_NTOHL (0x7369746f), 
-          ACE_NTOHL (0x72794964), 
-          ACE_NTOHL (0x0),  // name = RepositoryId
-          CORBA::tk_string, 
-          0U, // string length
-
+        CORBA::tk_string, 
+        0U, // string length
         8,
         ACE_NTOHL (0x76657273), 
         ACE_NTOHL (0x696f6e00),  // name = version
-        CORBA::tk_alias, // typecode kind for typedefs
-        68, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          34,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x6f6d672e), 
-          ACE_NTOHL (0x6f72672f), 
-          ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f5665), 
-          ACE_NTOHL (0x7273696f), 
-          ACE_NTOHL (0x6e537065), 
-          ACE_NTOHL (0x633a312e), 
-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
-          12,
-          ACE_NTOHL (0x56657273), 
-          ACE_NTOHL (0x696f6e53), 
-          ACE_NTOHL (0x70656300),  // name = VersionSpec
-          CORBA::tk_string, 
-          0U, // string length
-
+        CORBA::tk_string, 
+        0U, // string length
         5,
         ACE_NTOHL (0x74797065), 
         ACE_NTOHL (0x0),  // name = type
@@ -17590,23 +19369,24 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
         ACE_NTOHL (0x6d6f6465), 
         ACE_NTOHL (0x0),  // name = mode
         CORBA::tk_enum, // typecode kind
-        104, // encapsulation length
+        108, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           36,
           ACE_NTOHL (0x49444c3a), 
           ACE_NTOHL (0x6f6d672e), 
           ACE_NTOHL (0x6f72672f), 
           ACE_NTOHL (0x434f5242), 
-          ACE_NTOHL (0x412f4174), 
+          ACE_NTOHL (0x415f4174), 
           ACE_NTOHL (0x74726962), 
           ACE_NTOHL (0x7574654d), 
           ACE_NTOHL (0x6f64653a), 
-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
-          14,
-          ACE_NTOHL (0x41747472), 
-          ACE_NTOHL (0x69627574), 
-          ACE_NTOHL (0x654d6f64), 
-          ACE_NTOHL (0x65000000),  // name = AttributeMode
+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_AttributeMode:1.0
+          20,
+          ACE_NTOHL (0x434f5242), 
+          ACE_NTOHL (0x415f4174), 
+          ACE_NTOHL (0x74726962), 
+          ACE_NTOHL (0x7574654d), 
+          ACE_NTOHL (0x6f646500),  // name = CORBA_AttributeMode
           2, // member count
           12,
           ACE_NTOHL (0x41545452), 
@@ -17649,46 +19429,6 @@ void IR::HomeDescription::_tao_any_destructor (void *x)
   delete tmp;
 }
 
-void operator<<= (CORBA::Any &_tao_any, IR::DefinitionKind _tao_elem)
-{
-  TAO_OutputCDR stream;
-  stream << _tao_elem;
-  _tao_any._tao_replace (
-      IR::_tc_DefinitionKind,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin ()
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::DefinitionKind &_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (IR::_tc_DefinitionKind, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      return 0; // not equivalent
-    
-    TAO_InputCDR stream (
-        _tao_any._tao_get_cdr (),
-        _tao_any._tao_byte_order ()
-      );
-    if (stream >> _tao_elem)
-    {
-      return 1;
-    }
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
 void operator<<= (
     CORBA::Any &_tao_any,
     const IR::RepositoryIdSeq &_tao_elem
@@ -20433,6 +22173,114 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
+    const IR::ComponentRepository_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IR::ComponentRepository_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      IR::ComponentRepository::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IR::ProvidesDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IR::ProvidesDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      IR::ProvidesDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IR::UsesDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IR::UsesDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      IR::UsesDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
     const IR::ProvidesDescSeq &_tao_sequence
   )
 {
@@ -20515,3 +22363,327 @@ CORBA::Boolean operator>> (
   return 0; // error
 }
 
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IR::EventDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IR::EventDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      IR::EventDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IR::EmitsDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IR::EmitsDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      IR::EmitsDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IR::PublishesDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IR::PublishesDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      IR::PublishesDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IR::ConsumesDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IR::ConsumesDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      IR::ConsumesDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IR::ComponentDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IR::ComponentDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      IR::ComponentDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IR::PrimaryKeyDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IR::PrimaryKeyDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      IR::PrimaryKeyDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IR::FactoryDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IR::FactoryDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      IR::FactoryDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IR::FinderDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IR::FinderDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      IR::FinderDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const IR::HomeDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    IR::HomeDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      IR::HomeDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h
index 8b2f1b76727..102985b1e2b 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.h
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_IDL_IFR_COMPONENTSC_H
-#define TAO_IDL_IFR_COMPONENTSC_H
+#ifndef _TAO_IDL_IFR_COMPONENTSC_H_
+#define _TAO_IDL_IFR_COMPONENTSC_H_
 
 #include "ace/pre.h"
 #include "ifr_client_export.h"
@@ -56,46 +56,6 @@
 
 TAO_NAMESPACE  IR
 {
-  enum DefinitionKind
-  {
-        dk_none,
-        dk_all,
-        dk_Attribute,
-        dk_Constant,
-        dk_Exception,
-        dk_Interface,
-        dk_Module,
-        dk_Operation,
-        dk_Typedef,
-        dk_Alias,
-        dk_Struct,
-        dk_Union,
-        dk_Enum,
-        dk_Primitive,
-        dk_String,
-        dk_Sequence,
-        dk_Array,
-        dk_Repository,
-        dk_Wstring,
-        dk_Fixed,
-        dk_Value,
-        dk_ValueBox,
-        dk_ValueMember,
-        dk_Native,
-        dk_Component,
-        dk_Home,
-        dk_Factory,
-        dk_Finder,
-        dk_PrimaryKey,
-        dk_Emits,
-        dk_Publishes,
-        dk_Consumes,
-        dk_Provides,
-        dk_Uses    
-  };
-  typedef DefinitionKind &DefinitionKind_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_DefinitionKind;
-
   typedef char * Identifier;
   typedef CORBA::String_var Identifier_var;
   typedef CORBA::String_out Identifier_out;
@@ -230,7 +190,7 @@ TAO_NAMESPACE  IR
 #if !defined (_IR_COMPONENTDEF___PTR_CH_)
 #define _IR_COMPONENTDEF___PTR_CH_
 
-typedef ComponentDef *ComponentDef_ptr;
+  typedef ComponentDef *ComponentDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -258,7 +218,15 @@ typedef ComponentDef *ComponentDef_ptr;
     ComponentDef_ptr &out (void);
     ComponentDef_ptr _retn (void);
     ComponentDef_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ComponentDef_ptr duplicate (ComponentDef_ptr);
+    static void release (ComponentDef_ptr);
+    static ComponentDef_ptr nil (void);
+    static ComponentDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ComponentDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -285,7 +253,7 @@ typedef ComponentDef *ComponentDef_ptr;
     operator ComponentDef_ptr &();
     ComponentDef_ptr &ptr (void);
     ComponentDef_ptr operator-> (void);
-    
+  
   private:
     ComponentDef_ptr &ptr_;
   };
@@ -450,7 +418,7 @@ typedef ComponentDef *ComponentDef_ptr;
 #if !defined (_IR_PROVIDESDEF___PTR_CH_)
 #define _IR_PROVIDESDEF___PTR_CH_
 
-typedef ProvidesDef *ProvidesDef_ptr;
+  typedef ProvidesDef *ProvidesDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -478,7 +446,15 @@ typedef ProvidesDef *ProvidesDef_ptr;
     ProvidesDef_ptr &out (void);
     ProvidesDef_ptr _retn (void);
     ProvidesDef_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ProvidesDef_ptr duplicate (ProvidesDef_ptr);
+    static void release (ProvidesDef_ptr);
+    static ProvidesDef_ptr nil (void);
+    static ProvidesDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ProvidesDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -505,7 +481,7 @@ typedef ProvidesDef *ProvidesDef_ptr;
     operator ProvidesDef_ptr &();
     ProvidesDef_ptr &ptr (void);
     ProvidesDef_ptr operator-> (void);
-    
+  
   private:
     ProvidesDef_ptr &ptr_;
   };
@@ -670,7 +646,7 @@ typedef ProvidesDef *ProvidesDef_ptr;
 #if !defined (_IR_USESDEF___PTR_CH_)
 #define _IR_USESDEF___PTR_CH_
 
-typedef UsesDef *UsesDef_ptr;
+  typedef UsesDef *UsesDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -698,7 +674,15 @@ typedef UsesDef *UsesDef_ptr;
     UsesDef_ptr &out (void);
     UsesDef_ptr _retn (void);
     UsesDef_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static UsesDef_ptr duplicate (UsesDef_ptr);
+    static void release (UsesDef_ptr);
+    static UsesDef_ptr nil (void);
+    static UsesDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     UsesDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -725,7 +709,7 @@ typedef UsesDef *UsesDef_ptr;
     operator UsesDef_ptr &();
     UsesDef_ptr &ptr (void);
     UsesDef_ptr operator-> (void);
-    
+  
   private:
     UsesDef_ptr &ptr_;
   };
@@ -890,7 +874,7 @@ typedef UsesDef *UsesDef_ptr;
 #if !defined (_IR_HOMEDEF___PTR_CH_)
 #define _IR_HOMEDEF___PTR_CH_
 
-typedef HomeDef *HomeDef_ptr;
+  typedef HomeDef *HomeDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -918,7 +902,15 @@ typedef HomeDef *HomeDef_ptr;
     HomeDef_ptr &out (void);
     HomeDef_ptr _retn (void);
     HomeDef_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static HomeDef_ptr duplicate (HomeDef_ptr);
+    static void release (HomeDef_ptr);
+    static HomeDef_ptr nil (void);
+    static HomeDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     HomeDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -945,7 +937,7 @@ typedef HomeDef *HomeDef_ptr;
     operator HomeDef_ptr &();
     HomeDef_ptr &ptr (void);
     HomeDef_ptr operator-> (void);
-    
+  
   private:
     HomeDef_ptr &ptr_;
   };
@@ -1110,7 +1102,7 @@ typedef HomeDef *HomeDef_ptr;
 #if !defined (_IR_EVENTDEF___PTR_CH_)
 #define _IR_EVENTDEF___PTR_CH_
 
-typedef EventDef *EventDef_ptr;
+  typedef EventDef *EventDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1138,7 +1130,15 @@ typedef EventDef *EventDef_ptr;
     EventDef_ptr &out (void);
     EventDef_ptr _retn (void);
     EventDef_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static EventDef_ptr duplicate (EventDef_ptr);
+    static void release (EventDef_ptr);
+    static EventDef_ptr nil (void);
+    static EventDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     EventDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1165,7 +1165,7 @@ typedef EventDef *EventDef_ptr;
     operator EventDef_ptr &();
     EventDef_ptr &ptr (void);
     EventDef_ptr operator-> (void);
-    
+  
   private:
     EventDef_ptr &ptr_;
   };
@@ -1178,7 +1178,7 @@ typedef EventDef *EventDef_ptr;
 #if !defined (_IR_EMITSDEF___PTR_CH_)
 #define _IR_EMITSDEF___PTR_CH_
 
-typedef EmitsDef *EmitsDef_ptr;
+  typedef EmitsDef *EmitsDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1206,7 +1206,15 @@ typedef EmitsDef *EmitsDef_ptr;
     EmitsDef_ptr &out (void);
     EmitsDef_ptr _retn (void);
     EmitsDef_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static EmitsDef_ptr duplicate (EmitsDef_ptr);
+    static void release (EmitsDef_ptr);
+    static EmitsDef_ptr nil (void);
+    static EmitsDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     EmitsDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1233,7 +1241,7 @@ typedef EmitsDef *EmitsDef_ptr;
     operator EmitsDef_ptr &();
     EmitsDef_ptr &ptr (void);
     EmitsDef_ptr operator-> (void);
-    
+  
   private:
     EmitsDef_ptr &ptr_;
   };
@@ -1398,7 +1406,7 @@ typedef EmitsDef *EmitsDef_ptr;
 #if !defined (_IR_PUBLISHESDEF___PTR_CH_)
 #define _IR_PUBLISHESDEF___PTR_CH_
 
-typedef PublishesDef *PublishesDef_ptr;
+  typedef PublishesDef *PublishesDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1426,7 +1434,15 @@ typedef PublishesDef *PublishesDef_ptr;
     PublishesDef_ptr &out (void);
     PublishesDef_ptr _retn (void);
     PublishesDef_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static PublishesDef_ptr duplicate (PublishesDef_ptr);
+    static void release (PublishesDef_ptr);
+    static PublishesDef_ptr nil (void);
+    static PublishesDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     PublishesDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1453,7 +1469,7 @@ typedef PublishesDef *PublishesDef_ptr;
     operator PublishesDef_ptr &();
     PublishesDef_ptr &ptr (void);
     PublishesDef_ptr operator-> (void);
-    
+  
   private:
     PublishesDef_ptr &ptr_;
   };
@@ -1618,7 +1634,7 @@ typedef PublishesDef *PublishesDef_ptr;
 #if !defined (_IR_CONSUMESDEF___PTR_CH_)
 #define _IR_CONSUMESDEF___PTR_CH_
 
-typedef ConsumesDef *ConsumesDef_ptr;
+  typedef ConsumesDef *ConsumesDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1646,7 +1662,15 @@ typedef ConsumesDef *ConsumesDef_ptr;
     ConsumesDef_ptr &out (void);
     ConsumesDef_ptr _retn (void);
     ConsumesDef_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ConsumesDef_ptr duplicate (ConsumesDef_ptr);
+    static void release (ConsumesDef_ptr);
+    static ConsumesDef_ptr nil (void);
+    static ConsumesDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ConsumesDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1673,7 +1697,7 @@ typedef ConsumesDef *ConsumesDef_ptr;
     operator ConsumesDef_ptr &();
     ConsumesDef_ptr &ptr (void);
     ConsumesDef_ptr operator-> (void);
-    
+  
   private:
     ConsumesDef_ptr &ptr_;
   };
@@ -1838,7 +1862,7 @@ typedef ConsumesDef *ConsumesDef_ptr;
 #if !defined (_IR_FACTORYDEF___PTR_CH_)
 #define _IR_FACTORYDEF___PTR_CH_
 
-typedef FactoryDef *FactoryDef_ptr;
+  typedef FactoryDef *FactoryDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -1866,7 +1890,15 @@ typedef FactoryDef *FactoryDef_ptr;
     FactoryDef_ptr &out (void);
     FactoryDef_ptr _retn (void);
     FactoryDef_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static FactoryDef_ptr duplicate (FactoryDef_ptr);
+    static void release (FactoryDef_ptr);
+    static FactoryDef_ptr nil (void);
+    static FactoryDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     FactoryDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1893,7 +1925,7 @@ typedef FactoryDef *FactoryDef_ptr;
     operator FactoryDef_ptr &();
     FactoryDef_ptr &ptr (void);
     FactoryDef_ptr operator-> (void);
-    
+  
   private:
     FactoryDef_ptr &ptr_;
   };
@@ -2058,7 +2090,7 @@ typedef FactoryDef *FactoryDef_ptr;
 #if !defined (_IR_FINDERDEF___PTR_CH_)
 #define _IR_FINDERDEF___PTR_CH_
 
-typedef FinderDef *FinderDef_ptr;
+  typedef FinderDef *FinderDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -2086,7 +2118,15 @@ typedef FinderDef *FinderDef_ptr;
     FinderDef_ptr &out (void);
     FinderDef_ptr _retn (void);
     FinderDef_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static FinderDef_ptr duplicate (FinderDef_ptr);
+    static void release (FinderDef_ptr);
+    static FinderDef_ptr nil (void);
+    static FinderDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     FinderDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2113,7 +2153,7 @@ typedef FinderDef *FinderDef_ptr;
     operator FinderDef_ptr &();
     FinderDef_ptr &ptr (void);
     FinderDef_ptr operator-> (void);
-    
+  
   private:
     FinderDef_ptr &ptr_;
   };
@@ -2278,7 +2318,7 @@ typedef FinderDef *FinderDef_ptr;
 #if !defined (_IR_PRIMARYKEYDEF___PTR_CH_)
 #define _IR_PRIMARYKEYDEF___PTR_CH_
 
-typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
+  typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
 
 #endif /* end #if !defined */
 
@@ -2306,7 +2346,15 @@ typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
     PrimaryKeyDef_ptr &out (void);
     PrimaryKeyDef_ptr _retn (void);
     PrimaryKeyDef_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static PrimaryKeyDef_ptr duplicate (PrimaryKeyDef_ptr);
+    static void release (PrimaryKeyDef_ptr);
+    static PrimaryKeyDef_ptr nil (void);
+    static PrimaryKeyDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     PrimaryKeyDef_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2333,7 +2381,7 @@ typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
     operator PrimaryKeyDef_ptr &();
     PrimaryKeyDef_ptr &ptr (void);
     PrimaryKeyDef_ptr operator-> (void);
-    
+  
   private:
     PrimaryKeyDef_ptr &ptr_;
   };
@@ -2374,7 +2422,15 @@ typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
     ComponentRepository_ptr &out (void);
     ComponentRepository_ptr _retn (void);
     ComponentRepository_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ComponentRepository_ptr duplicate (ComponentRepository_ptr);
+    static void release (ComponentRepository_ptr);
+    static ComponentRepository_ptr nil (void);
+    static ComponentRepository_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ComponentRepository_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2401,7 +2457,7 @@ typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
     operator ComponentRepository_ptr &();
     ComponentRepository_ptr &ptr (void);
     ComponentRepository_ptr operator-> (void);
-    
+  
   private:
     ComponentRepository_ptr &ptr_;
   };
@@ -2419,7 +2475,7 @@ typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
   class _TAO_ComponentRepository_Proxy_Broker;
   class _TAO_ComponentRepository_Remote_Proxy_Broker;
   
-  class TAO_IFR_Client_Export ComponentRepository: public virtual CORBA::Repository
+  class TAO_IFR_Client_Export ComponentRepository: public virtual CORBA_Repository
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -2451,7 +2507,7 @@ typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
         const char * name,
         const char * version,
         IR::ComponentDef_ptr base_component,
-        const CORBA::InterfaceDefSeq & supports_interfaces,
+        const CORBA_InterfaceDefSeq & supports_interfaces,
         CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
@@ -2465,7 +2521,7 @@ typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
         const char * version,
         IR::HomeDef_ptr base_home,
         IR::ComponentDef_ptr managed_component,
-        CORBA::ValueDef_ptr primary_key,
+        CORBA_ValueDef_ptr primary_key,
         CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
@@ -2506,61 +2562,61 @@ typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
     virtual ~ComponentRepository (void);
   private:
     ComponentRepository (const ComponentRepository &);
-    void operator= (const ComponentRepository &);    
-};
-
+    void operator= (const ComponentRepository &);
+  };
 
+  
 // The Proxy Implementations are used by each interface to
 // perform a call. Each different implementation encapsulate
 // an invocation logics.
 
 
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Impl : 
-  public virtual _TAO_Repository_Proxy_Impl
-{
-public:
-  virtual ~_TAO_ComponentRepository_Proxy_Impl (void) { }
+  ///////////////////////////////////////////////////////////////////////
+  //                    Base  Impl. Declaration
+  //
   
-    virtual IR::ComponentDef_ptr create_component (
-      CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      const char * name,
-      const char * version,
-      IR::ComponentDef_ptr base_component,
-      const CORBA::InterfaceDefSeq & supports_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+  class TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Impl : 
+    public virtual _TAO_CORBA_Repository_Proxy_Impl
+  {
+  public:
+    virtual ~_TAO_ComponentRepository_Proxy_Impl (void) { }
+    
+        virtual IR::ComponentDef_ptr create_component (
+        CORBA_Object *_collocated_tao_target_,
+        const char * id,
+        const char * name,
+        const char * version,
+        IR::ComponentDef_ptr base_component,
+        const CORBA_InterfaceDefSeq & supports_interfaces,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
 
-  virtual IR::HomeDef_ptr create_home (
-      CORBA_Object *_collocated_tao_target_,
-      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
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+    virtual IR::HomeDef_ptr create_home (
+        CORBA_Object *_collocated_tao_target_,
+        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
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
 
 protected:
-  _TAO_ComponentRepository_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
+    _TAO_ComponentRepository_Proxy_Impl (void);
+  
+  };
+  //
+  //                Base  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  
+  
 ///////////////////////////////////////////////////////////////////////
 //                    Remote  Impl. Declaration
 //
@@ -2568,7 +2624,7 @@ protected:
 class TAO_IFR_Client_Export _TAO_ComponentRepository_Remote_Proxy_Impl : 
   public virtual _TAO_ComponentRepository_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_Repository_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_Repository_Remote_Proxy_Impl
   
 {
 public:
@@ -2582,7 +2638,7 @@ public:
       const char * name,
       const char * version,
       IR::ComponentDef_ptr base_component,
-      const CORBA::InterfaceDefSeq & supports_interfaces,
+      const CORBA_InterfaceDefSeq & supports_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -2596,7 +2652,7 @@ public:
       const char * version,
       IR::HomeDef_ptr base_home,
       IR::ComponentDef_ptr managed_component,
-      CORBA::ValueDef_ptr primary_key,
+      CORBA_ValueDef_ptr primary_key,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -2677,74 +2733,6 @@ public:
 TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentRepository;
 
 
-#if !defined (_IR_PROVIDESDEF___PTR_CH_)
-#define _IR_PROVIDESDEF___PTR_CH_
-
-class ProvidesDef;
-typedef ProvidesDef *ProvidesDef_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_PROVIDESDEF___VAR_CH_)
-#define _IR_PROVIDESDEF___VAR_CH_
-
-class TAO_IFR_Client_Export ProvidesDef_var : public TAO_Base_var
-{
-public:
-  ProvidesDef_var (void); // default constructor
-  ProvidesDef_var (ProvidesDef_ptr p) : ptr_ (p) {} 
-  ProvidesDef_var (const ProvidesDef_var &); // copy constructor
-  ~ProvidesDef_var (void); // destructor
-  
-  ProvidesDef_var &operator= (ProvidesDef_ptr);
-  ProvidesDef_var &operator= (const ProvidesDef_var &);
-  ProvidesDef_ptr operator-> (void) const;
-  
-  operator const ProvidesDef_ptr &() const;
-  operator ProvidesDef_ptr &();
-  // in, inout, out, _retn 
-  ProvidesDef_ptr in (void) const;
-  ProvidesDef_ptr &inout (void);
-  ProvidesDef_ptr &out (void);
-  ProvidesDef_ptr _retn (void);
-  ProvidesDef_ptr ptr (void) const;
-
-private:
-  ProvidesDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  ProvidesDef_var (const TAO_Base_var &rhs);
-  ProvidesDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_PROVIDESDEF___OUT_CH_)
-#define _IR_PROVIDESDEF___OUT_CH_
-
-class TAO_IFR_Client_Export ProvidesDef_out
-{
-public:
-  ProvidesDef_out (ProvidesDef_ptr &);
-  ProvidesDef_out (ProvidesDef_var &);
-  ProvidesDef_out (const ProvidesDef_out &);
-  ProvidesDef_out &operator= (const ProvidesDef_out &);
-  ProvidesDef_out &operator= (const ProvidesDef_var &);
-  ProvidesDef_out &operator= (ProvidesDef_ptr);
-  operator ProvidesDef_ptr &();
-  ProvidesDef_ptr &ptr (void);
-  ProvidesDef_ptr operator-> (void);
-  
-private:
-  ProvidesDef_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_IR_PROVIDESDEF_CH_)
 #define _IR_PROVIDESDEF_CH_
 
@@ -2754,7 +2742,7 @@ class _TAO_ProvidesDef_Remote_Proxy_Impl;
 class _TAO_ProvidesDef_Proxy_Broker;
 class _TAO_ProvidesDef_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export ProvidesDef: public virtual CORBA::Contained
+class TAO_IFR_Client_Export ProvidesDef: public virtual CORBA_Contained
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -2781,7 +2769,7 @@ public:
 
   static void _tao_any_destructor (void*);
 
-  virtual CORBA::InterfaceDef_ptr interface_type (
+  virtual CORBA_InterfaceDef_ptr interface_type (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2822,7 +2810,7 @@ protected:
   virtual ~ProvidesDef (void);
 private:
   ProvidesDef (const ProvidesDef &);
-  void operator= (const ProvidesDef &);  
+  void operator= (const ProvidesDef &);
 };
 
 
@@ -2836,12 +2824,12 @@ private:
 //
 
 class TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Impl : 
-  public virtual _TAO_Contained_Proxy_Impl
+  public virtual _TAO_CORBA_Contained_Proxy_Impl
 {
 public:
   virtual ~_TAO_ProvidesDef_Proxy_Impl (void) { }
   
-    virtual CORBA::InterfaceDef_ptr interface_type (
+    virtual CORBA_InterfaceDef_ptr interface_type (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -2865,7 +2853,7 @@ protected:
 class TAO_IFR_Client_Export _TAO_ProvidesDef_Remote_Proxy_Impl : 
   public virtual _TAO_ProvidesDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_Contained_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
   
 {
 public:
@@ -2873,7 +2861,7 @@ public:
   
   virtual ~_TAO_ProvidesDef_Remote_Proxy_Impl (void) { }
   
-    virtual CORBA::InterfaceDef_ptr interface_type (
+    virtual CORBA_InterfaceDef_ptr interface_type (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -2970,7 +2958,7 @@ struct TAO_IFR_Client_Export ProvidesDescription
   TAO_String_Manager id;
   TAO_String_Manager defined_in;
   TAO_String_Manager version;
-  CORBA::InterfaceDef_var interface_type;
+  CORBA_InterfaceDef_var interface_type;
 };
 
 class TAO_IFR_Client_Export ProvidesDescription_var
@@ -3023,74 +3011,6 @@ private:
 TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDescription;
 
 
-#if !defined (_IR_USESDEF___PTR_CH_)
-#define _IR_USESDEF___PTR_CH_
-
-class UsesDef;
-typedef UsesDef *UsesDef_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_USESDEF___VAR_CH_)
-#define _IR_USESDEF___VAR_CH_
-
-class TAO_IFR_Client_Export UsesDef_var : public TAO_Base_var
-{
-public:
-  UsesDef_var (void); // default constructor
-  UsesDef_var (UsesDef_ptr p) : ptr_ (p) {} 
-  UsesDef_var (const UsesDef_var &); // copy constructor
-  ~UsesDef_var (void); // destructor
-  
-  UsesDef_var &operator= (UsesDef_ptr);
-  UsesDef_var &operator= (const UsesDef_var &);
-  UsesDef_ptr operator-> (void) const;
-  
-  operator const UsesDef_ptr &() const;
-  operator UsesDef_ptr &();
-  // in, inout, out, _retn 
-  UsesDef_ptr in (void) const;
-  UsesDef_ptr &inout (void);
-  UsesDef_ptr &out (void);
-  UsesDef_ptr _retn (void);
-  UsesDef_ptr ptr (void) const;
-
-private:
-  UsesDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  UsesDef_var (const TAO_Base_var &rhs);
-  UsesDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_USESDEF___OUT_CH_)
-#define _IR_USESDEF___OUT_CH_
-
-class TAO_IFR_Client_Export UsesDef_out
-{
-public:
-  UsesDef_out (UsesDef_ptr &);
-  UsesDef_out (UsesDef_var &);
-  UsesDef_out (const UsesDef_out &);
-  UsesDef_out &operator= (const UsesDef_out &);
-  UsesDef_out &operator= (const UsesDef_var &);
-  UsesDef_out &operator= (UsesDef_ptr);
-  operator UsesDef_ptr &();
-  UsesDef_ptr &ptr (void);
-  UsesDef_ptr operator-> (void);
-  
-private:
-  UsesDef_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_IR_USESDEF_CH_)
 #define _IR_USESDEF_CH_
 
@@ -3100,7 +3020,7 @@ class _TAO_UsesDef_Remote_Proxy_Impl;
 class _TAO_UsesDef_Proxy_Broker;
 class _TAO_UsesDef_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export UsesDef: public virtual CORBA::Contained
+class TAO_IFR_Client_Export UsesDef: public virtual CORBA_Contained
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -3127,7 +3047,7 @@ public:
 
   static void _tao_any_destructor (void*);
 
-  virtual CORBA::InterfaceDef_ptr interface_type (
+  virtual CORBA_InterfaceDef_ptr interface_type (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3176,7 +3096,7 @@ protected:
   virtual ~UsesDef (void);
 private:
   UsesDef (const UsesDef &);
-  void operator= (const UsesDef &);  
+  void operator= (const UsesDef &);
 };
 
 
@@ -3190,12 +3110,12 @@ private:
 //
 
 class TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Impl : 
-  public virtual _TAO_Contained_Proxy_Impl
+  public virtual _TAO_CORBA_Contained_Proxy_Impl
 {
 public:
   virtual ~_TAO_UsesDef_Proxy_Impl (void) { }
   
-    virtual CORBA::InterfaceDef_ptr interface_type (
+    virtual CORBA_InterfaceDef_ptr interface_type (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -3227,7 +3147,7 @@ protected:
 class TAO_IFR_Client_Export _TAO_UsesDef_Remote_Proxy_Impl : 
   public virtual _TAO_UsesDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_Contained_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
   
 {
 public:
@@ -3235,7 +3155,7 @@ public:
   
   virtual ~_TAO_UsesDef_Remote_Proxy_Impl (void) { }
   
-    virtual CORBA::InterfaceDef_ptr interface_type (
+    virtual CORBA_InterfaceDef_ptr interface_type (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -3340,7 +3260,7 @@ struct TAO_IFR_Client_Export UsesDescription
   TAO_String_Manager id;
   TAO_String_Manager defined_in;
   TAO_String_Manager version;
-  CORBA::InterfaceDef_var interface_type;
+  CORBA_InterfaceDef_var interface_type;
   CORBA::Boolean is_multiple;
 };
 
@@ -3698,74 +3618,6 @@ private:
 TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDescSeq;
 
 
-#if !defined (_IR_EVENTDEF___PTR_CH_)
-#define _IR_EVENTDEF___PTR_CH_
-
-class EventDef;
-typedef EventDef *EventDef_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_EVENTDEF___VAR_CH_)
-#define _IR_EVENTDEF___VAR_CH_
-
-class TAO_IFR_Client_Export EventDef_var : public TAO_Base_var
-{
-public:
-  EventDef_var (void); // default constructor
-  EventDef_var (EventDef_ptr p) : ptr_ (p) {} 
-  EventDef_var (const EventDef_var &); // copy constructor
-  ~EventDef_var (void); // destructor
-  
-  EventDef_var &operator= (EventDef_ptr);
-  EventDef_var &operator= (const EventDef_var &);
-  EventDef_ptr operator-> (void) const;
-  
-  operator const EventDef_ptr &() const;
-  operator EventDef_ptr &();
-  // in, inout, out, _retn 
-  EventDef_ptr in (void) const;
-  EventDef_ptr &inout (void);
-  EventDef_ptr &out (void);
-  EventDef_ptr _retn (void);
-  EventDef_ptr ptr (void) const;
-
-private:
-  EventDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  EventDef_var (const TAO_Base_var &rhs);
-  EventDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_EVENTDEF___OUT_CH_)
-#define _IR_EVENTDEF___OUT_CH_
-
-class TAO_IFR_Client_Export EventDef_out
-{
-public:
-  EventDef_out (EventDef_ptr &);
-  EventDef_out (EventDef_var &);
-  EventDef_out (const EventDef_out &);
-  EventDef_out &operator= (const EventDef_out &);
-  EventDef_out &operator= (const EventDef_var &);
-  EventDef_out &operator= (EventDef_ptr);
-  operator EventDef_ptr &();
-  EventDef_ptr &ptr (void);
-  EventDef_ptr operator-> (void);
-  
-private:
-  EventDef_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_IR_EVENTDEF_CH_)
 #define _IR_EVENTDEF_CH_
 
@@ -3775,7 +3627,7 @@ class _TAO_EventDef_Remote_Proxy_Impl;
 class _TAO_EventDef_Proxy_Broker;
 class _TAO_EventDef_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export EventDef: public virtual CORBA::Contained
+class TAO_IFR_Client_Export EventDef: public virtual CORBA_Contained
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -3811,7 +3663,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDef_ptr event (
+  virtual CORBA_ValueDef_ptr event (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -3852,7 +3704,7 @@ protected:
   virtual ~EventDef (void);
 private:
   EventDef (const EventDef &);
-  void operator= (const EventDef &);  
+  void operator= (const EventDef &);
 };
 
 
@@ -3866,7 +3718,7 @@ private:
 //
 
 class TAO_IFR_Client_Export _TAO_EventDef_Proxy_Impl : 
-  public virtual _TAO_Contained_Proxy_Impl
+  public virtual _TAO_CORBA_Contained_Proxy_Impl
 {
 public:
   virtual ~_TAO_EventDef_Proxy_Impl (void) { }
@@ -3880,7 +3732,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ValueDef_ptr event (
+  virtual CORBA_ValueDef_ptr event (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -3904,7 +3756,7 @@ protected:
 class TAO_IFR_Client_Export _TAO_EventDef_Remote_Proxy_Impl : 
   public virtual _TAO_EventDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_Contained_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
   
 {
 public:
@@ -3921,7 +3773,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDef_ptr event (
+  virtual CORBA_ValueDef_ptr event (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -4018,7 +3870,7 @@ struct TAO_IFR_Client_Export EventDescription
   TAO_String_Manager id;
   TAO_String_Manager defined_in;
   TAO_String_Manager version;
-  CORBA::ValueDef_var value;
+  CORBA_ValueDef_var value;
 };
 
 class TAO_IFR_Client_Export EventDescription_var
@@ -4071,74 +3923,6 @@ private:
 TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EventDescription;
 
 
-#if !defined (_IR_EMITSDEF___PTR_CH_)
-#define _IR_EMITSDEF___PTR_CH_
-
-class EmitsDef;
-typedef EmitsDef *EmitsDef_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_EMITSDEF___VAR_CH_)
-#define _IR_EMITSDEF___VAR_CH_
-
-class TAO_IFR_Client_Export EmitsDef_var : public TAO_Base_var
-{
-public:
-  EmitsDef_var (void); // default constructor
-  EmitsDef_var (EmitsDef_ptr p) : ptr_ (p) {} 
-  EmitsDef_var (const EmitsDef_var &); // copy constructor
-  ~EmitsDef_var (void); // destructor
-  
-  EmitsDef_var &operator= (EmitsDef_ptr);
-  EmitsDef_var &operator= (const EmitsDef_var &);
-  EmitsDef_ptr operator-> (void) const;
-  
-  operator const EmitsDef_ptr &() const;
-  operator EmitsDef_ptr &();
-  // in, inout, out, _retn 
-  EmitsDef_ptr in (void) const;
-  EmitsDef_ptr &inout (void);
-  EmitsDef_ptr &out (void);
-  EmitsDef_ptr _retn (void);
-  EmitsDef_ptr ptr (void) const;
-
-private:
-  EmitsDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  EmitsDef_var (const TAO_Base_var &rhs);
-  EmitsDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_EMITSDEF___OUT_CH_)
-#define _IR_EMITSDEF___OUT_CH_
-
-class TAO_IFR_Client_Export EmitsDef_out
-{
-public:
-  EmitsDef_out (EmitsDef_ptr &);
-  EmitsDef_out (EmitsDef_var &);
-  EmitsDef_out (const EmitsDef_out &);
-  EmitsDef_out &operator= (const EmitsDef_out &);
-  EmitsDef_out &operator= (const EmitsDef_var &);
-  EmitsDef_out &operator= (EmitsDef_ptr);
-  operator EmitsDef_ptr &();
-  EmitsDef_ptr &ptr (void);
-  EmitsDef_ptr operator-> (void);
-  
-private:
-  EmitsDef_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_IR_EMITSDEF_CH_)
 #define _IR_EMITSDEF_CH_
 
@@ -4208,7 +3992,7 @@ protected:
   virtual ~EmitsDef (void);
 private:
   EmitsDef (const EmitsDef &);
-  void operator= (const EmitsDef &);  
+  void operator= (const EmitsDef &);
 };
 
 
@@ -4325,74 +4109,6 @@ public:
 TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EmitsDef;
 
 
-#if !defined (_IR_PUBLISHESDEF___PTR_CH_)
-#define _IR_PUBLISHESDEF___PTR_CH_
-
-class PublishesDef;
-typedef PublishesDef *PublishesDef_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_PUBLISHESDEF___VAR_CH_)
-#define _IR_PUBLISHESDEF___VAR_CH_
-
-class TAO_IFR_Client_Export PublishesDef_var : public TAO_Base_var
-{
-public:
-  PublishesDef_var (void); // default constructor
-  PublishesDef_var (PublishesDef_ptr p) : ptr_ (p) {} 
-  PublishesDef_var (const PublishesDef_var &); // copy constructor
-  ~PublishesDef_var (void); // destructor
-  
-  PublishesDef_var &operator= (PublishesDef_ptr);
-  PublishesDef_var &operator= (const PublishesDef_var &);
-  PublishesDef_ptr operator-> (void) const;
-  
-  operator const PublishesDef_ptr &() const;
-  operator PublishesDef_ptr &();
-  // in, inout, out, _retn 
-  PublishesDef_ptr in (void) const;
-  PublishesDef_ptr &inout (void);
-  PublishesDef_ptr &out (void);
-  PublishesDef_ptr _retn (void);
-  PublishesDef_ptr ptr (void) const;
-
-private:
-  PublishesDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  PublishesDef_var (const TAO_Base_var &rhs);
-  PublishesDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_PUBLISHESDEF___OUT_CH_)
-#define _IR_PUBLISHESDEF___OUT_CH_
-
-class TAO_IFR_Client_Export PublishesDef_out
-{
-public:
-  PublishesDef_out (PublishesDef_ptr &);
-  PublishesDef_out (PublishesDef_var &);
-  PublishesDef_out (const PublishesDef_out &);
-  PublishesDef_out &operator= (const PublishesDef_out &);
-  PublishesDef_out &operator= (const PublishesDef_var &);
-  PublishesDef_out &operator= (PublishesDef_ptr);
-  operator PublishesDef_ptr &();
-  PublishesDef_ptr &ptr (void);
-  PublishesDef_ptr operator-> (void);
-  
-private:
-  PublishesDef_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_IR_PUBLISHESDEF_CH_)
 #define _IR_PUBLISHESDEF_CH_
 
@@ -4462,7 +4178,7 @@ protected:
   virtual ~PublishesDef (void);
 private:
   PublishesDef (const PublishesDef &);
-  void operator= (const PublishesDef &);  
+  void operator= (const PublishesDef &);
 };
 
 
@@ -4579,74 +4295,6 @@ public:
 TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PublishesDef;
 
 
-#if !defined (_IR_CONSUMESDEF___PTR_CH_)
-#define _IR_CONSUMESDEF___PTR_CH_
-
-class ConsumesDef;
-typedef ConsumesDef *ConsumesDef_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_CONSUMESDEF___VAR_CH_)
-#define _IR_CONSUMESDEF___VAR_CH_
-
-class TAO_IFR_Client_Export ConsumesDef_var : public TAO_Base_var
-{
-public:
-  ConsumesDef_var (void); // default constructor
-  ConsumesDef_var (ConsumesDef_ptr p) : ptr_ (p) {} 
-  ConsumesDef_var (const ConsumesDef_var &); // copy constructor
-  ~ConsumesDef_var (void); // destructor
-  
-  ConsumesDef_var &operator= (ConsumesDef_ptr);
-  ConsumesDef_var &operator= (const ConsumesDef_var &);
-  ConsumesDef_ptr operator-> (void) const;
-  
-  operator const ConsumesDef_ptr &() const;
-  operator ConsumesDef_ptr &();
-  // in, inout, out, _retn 
-  ConsumesDef_ptr in (void) const;
-  ConsumesDef_ptr &inout (void);
-  ConsumesDef_ptr &out (void);
-  ConsumesDef_ptr _retn (void);
-  ConsumesDef_ptr ptr (void) const;
-
-private:
-  ConsumesDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  ConsumesDef_var (const TAO_Base_var &rhs);
-  ConsumesDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_CONSUMESDEF___OUT_CH_)
-#define _IR_CONSUMESDEF___OUT_CH_
-
-class TAO_IFR_Client_Export ConsumesDef_out
-{
-public:
-  ConsumesDef_out (ConsumesDef_ptr &);
-  ConsumesDef_out (ConsumesDef_var &);
-  ConsumesDef_out (const ConsumesDef_out &);
-  ConsumesDef_out &operator= (const ConsumesDef_out &);
-  ConsumesDef_out &operator= (const ConsumesDef_var &);
-  ConsumesDef_out &operator= (ConsumesDef_ptr);
-  operator ConsumesDef_ptr &();
-  ConsumesDef_ptr &ptr (void);
-  ConsumesDef_ptr operator-> (void);
-  
-private:
-  ConsumesDef_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_IR_CONSUMESDEF_CH_)
 #define _IR_CONSUMESDEF_CH_
 
@@ -4716,7 +4364,7 @@ protected:
   virtual ~ConsumesDef (void);
 private:
   ConsumesDef (const ConsumesDef &);
-  void operator= (const ConsumesDef &);  
+  void operator= (const ConsumesDef &);
 };
 
 
@@ -4833,74 +4481,6 @@ public:
 TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConsumesDef;
 
 
-#if !defined (_IR_COMPONENTDEF___PTR_CH_)
-#define _IR_COMPONENTDEF___PTR_CH_
-
-class ComponentDef;
-typedef ComponentDef *ComponentDef_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_COMPONENTDEF___VAR_CH_)
-#define _IR_COMPONENTDEF___VAR_CH_
-
-class TAO_IFR_Client_Export ComponentDef_var : public TAO_Base_var
-{
-public:
-  ComponentDef_var (void); // default constructor
-  ComponentDef_var (ComponentDef_ptr p) : ptr_ (p) {} 
-  ComponentDef_var (const ComponentDef_var &); // copy constructor
-  ~ComponentDef_var (void); // destructor
-  
-  ComponentDef_var &operator= (ComponentDef_ptr);
-  ComponentDef_var &operator= (const ComponentDef_var &);
-  ComponentDef_ptr operator-> (void) const;
-  
-  operator const ComponentDef_ptr &() const;
-  operator ComponentDef_ptr &();
-  // in, inout, out, _retn 
-  ComponentDef_ptr in (void) const;
-  ComponentDef_ptr &inout (void);
-  ComponentDef_ptr &out (void);
-  ComponentDef_ptr _retn (void);
-  ComponentDef_ptr ptr (void) const;
-
-private:
-  ComponentDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  ComponentDef_var (const TAO_Base_var &rhs);
-  ComponentDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_COMPONENTDEF___OUT_CH_)
-#define _IR_COMPONENTDEF___OUT_CH_
-
-class TAO_IFR_Client_Export ComponentDef_out
-{
-public:
-  ComponentDef_out (ComponentDef_ptr &);
-  ComponentDef_out (ComponentDef_var &);
-  ComponentDef_out (const ComponentDef_out &);
-  ComponentDef_out &operator= (const ComponentDef_out &);
-  ComponentDef_out &operator= (const ComponentDef_var &);
-  ComponentDef_out &operator= (ComponentDef_ptr);
-  operator ComponentDef_ptr &();
-  ComponentDef_ptr &ptr (void);
-  ComponentDef_ptr operator-> (void);
-  
-private:
-  ComponentDef_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_IR_COMPONENTDEF_CH_)
 #define _IR_COMPONENTDEF_CH_
 
@@ -4910,7 +4490,7 @@ class _TAO_ComponentDef_Remote_Proxy_Impl;
 class _TAO_ComponentDef_Proxy_Broker;
 class _TAO_ComponentDef_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export ComponentDef: public virtual CORBA::InterfaceDef
+class TAO_IFR_Client_Export ComponentDef: public virtual CORBA_InterfaceDef
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -4937,7 +4517,7 @@ public:
 
   static void _tao_any_destructor (void*);
 
-  virtual CORBA::InterfaceDefSeq * supported_interfaces (
+  virtual CORBA_InterfaceDefSeq * supported_interfaces (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -4946,7 +4526,7 @@ public:
     ));
 
   virtual void supported_interfaces (
-      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5014,7 +4594,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::InterfaceDef_ptr interface_type,
+      CORBA_InterfaceDef_ptr interface_type,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5026,7 +4606,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::InterfaceDef_ptr interface_type,
+      CORBA_InterfaceDef_ptr interface_type,
       CORBA::Boolean is_multiple,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -5039,7 +4619,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5051,7 +4631,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5063,7 +4643,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5104,7 +4684,7 @@ protected:
   virtual ~ComponentDef (void);
 private:
   ComponentDef (const ComponentDef &);
-  void operator= (const ComponentDef &);  
+  void operator= (const ComponentDef &);
 };
 
 
@@ -5118,12 +4698,12 @@ private:
 //
 
 class TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Impl : 
-  public virtual _TAO_InterfaceDef_Proxy_Impl
+  public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl
 {
 public:
   virtual ~_TAO_ComponentDef_Proxy_Impl (void) { }
   
-    virtual CORBA::InterfaceDefSeq * supported_interfaces (
+    virtual CORBA_InterfaceDefSeq * supported_interfaces (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -5133,7 +4713,7 @@ public:
 
   virtual void supported_interfaces (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -5201,7 +4781,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::InterfaceDef_ptr interface_type,
+      CORBA_InterfaceDef_ptr interface_type,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -5213,7 +4793,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::InterfaceDef_ptr interface_type,
+      CORBA_InterfaceDef_ptr interface_type,
       CORBA::Boolean is_multiple,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -5226,7 +4806,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -5238,7 +4818,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -5250,7 +4830,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -5273,7 +4853,7 @@ protected:
 class TAO_IFR_Client_Export _TAO_ComponentDef_Remote_Proxy_Impl : 
   public virtual _TAO_ComponentDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_InterfaceDef_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl
   
 {
 public:
@@ -5281,7 +4861,7 @@ public:
   
   virtual ~_TAO_ComponentDef_Remote_Proxy_Impl (void) { }
   
-    virtual CORBA::InterfaceDefSeq * supported_interfaces (
+    virtual CORBA_InterfaceDefSeq * supported_interfaces (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -5291,7 +4871,7 @@ public:
 
   virtual void supported_interfaces (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -5359,7 +4939,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::InterfaceDef_ptr interface_type,
+      CORBA_InterfaceDef_ptr interface_type,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -5371,7 +4951,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::InterfaceDef_ptr interface_type,
+      CORBA_InterfaceDef_ptr interface_type,
       CORBA::Boolean is_multiple,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -5384,7 +4964,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -5396,7 +4976,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -5408,7 +4988,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr value,
+      CORBA_ValueDef_ptr value,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -5508,7 +5088,7 @@ struct TAO_IFR_Client_Export ComponentDescription
   ACE_NESTED_CLASS (IR, RepositoryIdSeq) supports_interfaces;
   ACE_NESTED_CLASS (IR, ProvidesDefSeq) provides_interfaces;
   ACE_NESTED_CLASS (IR, UsesDefSeq) uses_interfaces;
-  CORBA::AttrDescriptionSeq attributes;
+  CORBA_AttrDescriptionSeq attributes;
   ACE_NESTED_CLASS (IR, EmitsDefSeq) emits_events;
   ACE_NESTED_CLASS (IR, PublishesDefSeq) publishes_events;
   ACE_NESTED_CLASS (IR, ConsumesDefSeq) consumes_events;
@@ -5565,74 +5145,6 @@ private:
 TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentDescription;
 
 
-#if !defined (_IR_PRIMARYKEYDEF___PTR_CH_)
-#define _IR_PRIMARYKEYDEF___PTR_CH_
-
-class PrimaryKeyDef;
-typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_PRIMARYKEYDEF___VAR_CH_)
-#define _IR_PRIMARYKEYDEF___VAR_CH_
-
-class TAO_IFR_Client_Export PrimaryKeyDef_var : public TAO_Base_var
-{
-public:
-  PrimaryKeyDef_var (void); // default constructor
-  PrimaryKeyDef_var (PrimaryKeyDef_ptr p) : ptr_ (p) {} 
-  PrimaryKeyDef_var (const PrimaryKeyDef_var &); // copy constructor
-  ~PrimaryKeyDef_var (void); // destructor
-  
-  PrimaryKeyDef_var &operator= (PrimaryKeyDef_ptr);
-  PrimaryKeyDef_var &operator= (const PrimaryKeyDef_var &);
-  PrimaryKeyDef_ptr operator-> (void) const;
-  
-  operator const PrimaryKeyDef_ptr &() const;
-  operator PrimaryKeyDef_ptr &();
-  // in, inout, out, _retn 
-  PrimaryKeyDef_ptr in (void) const;
-  PrimaryKeyDef_ptr &inout (void);
-  PrimaryKeyDef_ptr &out (void);
-  PrimaryKeyDef_ptr _retn (void);
-  PrimaryKeyDef_ptr ptr (void) const;
-
-private:
-  PrimaryKeyDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  PrimaryKeyDef_var (const TAO_Base_var &rhs);
-  PrimaryKeyDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_PRIMARYKEYDEF___OUT_CH_)
-#define _IR_PRIMARYKEYDEF___OUT_CH_
-
-class TAO_IFR_Client_Export PrimaryKeyDef_out
-{
-public:
-  PrimaryKeyDef_out (PrimaryKeyDef_ptr &);
-  PrimaryKeyDef_out (PrimaryKeyDef_var &);
-  PrimaryKeyDef_out (const PrimaryKeyDef_out &);
-  PrimaryKeyDef_out &operator= (const PrimaryKeyDef_out &);
-  PrimaryKeyDef_out &operator= (const PrimaryKeyDef_var &);
-  PrimaryKeyDef_out &operator= (PrimaryKeyDef_ptr);
-  operator PrimaryKeyDef_ptr &();
-  PrimaryKeyDef_ptr &ptr (void);
-  PrimaryKeyDef_ptr operator-> (void);
-  
-private:
-  PrimaryKeyDef_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_IR_PRIMARYKEYDEF_CH_)
 #define _IR_PRIMARYKEYDEF_CH_
 
@@ -5642,7 +5154,7 @@ class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
 class _TAO_PrimaryKeyDef_Proxy_Broker;
 class _TAO_PrimaryKeyDef_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export PrimaryKeyDef: public virtual CORBA::Contained
+class TAO_IFR_Client_Export PrimaryKeyDef: public virtual CORBA_Contained
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -5678,7 +5190,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDef_ptr primary_key (
+  virtual CORBA_ValueDef_ptr primary_key (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -5719,7 +5231,7 @@ protected:
   virtual ~PrimaryKeyDef (void);
 private:
   PrimaryKeyDef (const PrimaryKeyDef &);
-  void operator= (const PrimaryKeyDef &);  
+  void operator= (const PrimaryKeyDef &);
 };
 
 
@@ -5733,7 +5245,7 @@ private:
 //
 
 class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Impl : 
-  public virtual _TAO_Contained_Proxy_Impl
+  public virtual _TAO_CORBA_Contained_Proxy_Impl
 {
 public:
   virtual ~_TAO_PrimaryKeyDef_Proxy_Impl (void) { }
@@ -5747,7 +5259,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ValueDef_ptr primary_key (
+  virtual CORBA_ValueDef_ptr primary_key (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -5771,7 +5283,7 @@ protected:
 class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Remote_Proxy_Impl : 
   public virtual _TAO_PrimaryKeyDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_Contained_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
   
 {
 public:
@@ -5788,7 +5300,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDef_ptr primary_key (
+  virtual CORBA_ValueDef_ptr primary_key (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -5885,7 +5397,7 @@ struct TAO_IFR_Client_Export PrimaryKeyDescription
   TAO_String_Manager id;
   TAO_String_Manager defined_in;
   TAO_String_Manager version;
-  CORBA::ValueDef_var primary_key;
+  CORBA_ValueDef_var primary_key;
 };
 
 class TAO_IFR_Client_Export PrimaryKeyDescription_var
@@ -5938,74 +5450,6 @@ private:
 TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimaryKeyDescription;
 
 
-#if !defined (_IR_FACTORYDEF___PTR_CH_)
-#define _IR_FACTORYDEF___PTR_CH_
-
-class FactoryDef;
-typedef FactoryDef *FactoryDef_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_FACTORYDEF___VAR_CH_)
-#define _IR_FACTORYDEF___VAR_CH_
-
-class TAO_IFR_Client_Export FactoryDef_var : public TAO_Base_var
-{
-public:
-  FactoryDef_var (void); // default constructor
-  FactoryDef_var (FactoryDef_ptr p) : ptr_ (p) {} 
-  FactoryDef_var (const FactoryDef_var &); // copy constructor
-  ~FactoryDef_var (void); // destructor
-  
-  FactoryDef_var &operator= (FactoryDef_ptr);
-  FactoryDef_var &operator= (const FactoryDef_var &);
-  FactoryDef_ptr operator-> (void) const;
-  
-  operator const FactoryDef_ptr &() const;
-  operator FactoryDef_ptr &();
-  // in, inout, out, _retn 
-  FactoryDef_ptr in (void) const;
-  FactoryDef_ptr &inout (void);
-  FactoryDef_ptr &out (void);
-  FactoryDef_ptr _retn (void);
-  FactoryDef_ptr ptr (void) const;
-
-private:
-  FactoryDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  FactoryDef_var (const TAO_Base_var &rhs);
-  FactoryDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_FACTORYDEF___OUT_CH_)
-#define _IR_FACTORYDEF___OUT_CH_
-
-class TAO_IFR_Client_Export FactoryDef_out
-{
-public:
-  FactoryDef_out (FactoryDef_ptr &);
-  FactoryDef_out (FactoryDef_var &);
-  FactoryDef_out (const FactoryDef_out &);
-  FactoryDef_out &operator= (const FactoryDef_out &);
-  FactoryDef_out &operator= (const FactoryDef_var &);
-  FactoryDef_out &operator= (FactoryDef_ptr);
-  operator FactoryDef_ptr &();
-  FactoryDef_ptr &ptr (void);
-  FactoryDef_ptr operator-> (void);
-  
-private:
-  FactoryDef_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_IR_FACTORYDEF_CH_)
 #define _IR_FACTORYDEF_CH_
 
@@ -6015,7 +5459,7 @@ class _TAO_FactoryDef_Remote_Proxy_Impl;
 class _TAO_FactoryDef_Proxy_Broker;
 class _TAO_FactoryDef_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export FactoryDef: public virtual CORBA::OperationDef
+class TAO_IFR_Client_Export FactoryDef: public virtual CORBA_OperationDef
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -6075,7 +5519,7 @@ protected:
   virtual ~FactoryDef (void);
 private:
   FactoryDef (const FactoryDef &);
-  void operator= (const FactoryDef &);  
+  void operator= (const FactoryDef &);
 };
 
 
@@ -6089,7 +5533,7 @@ private:
 //
 
 class TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Impl : 
-  public virtual _TAO_OperationDef_Proxy_Impl
+  public virtual _TAO_CORBA_OperationDef_Proxy_Impl
 {
 public:
   virtual ~_TAO_FactoryDef_Proxy_Impl (void) { }
@@ -6110,7 +5554,7 @@ public:
 class TAO_IFR_Client_Export _TAO_FactoryDef_Remote_Proxy_Impl : 
   public virtual _TAO_FactoryDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_OperationDef_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_OperationDef_Remote_Proxy_Impl
   
 {
 public:
@@ -6192,74 +5636,6 @@ public:
 TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FactoryDef;
 
 
-#if !defined (_IR_FINDERDEF___PTR_CH_)
-#define _IR_FINDERDEF___PTR_CH_
-
-class FinderDef;
-typedef FinderDef *FinderDef_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_FINDERDEF___VAR_CH_)
-#define _IR_FINDERDEF___VAR_CH_
-
-class TAO_IFR_Client_Export FinderDef_var : public TAO_Base_var
-{
-public:
-  FinderDef_var (void); // default constructor
-  FinderDef_var (FinderDef_ptr p) : ptr_ (p) {} 
-  FinderDef_var (const FinderDef_var &); // copy constructor
-  ~FinderDef_var (void); // destructor
-  
-  FinderDef_var &operator= (FinderDef_ptr);
-  FinderDef_var &operator= (const FinderDef_var &);
-  FinderDef_ptr operator-> (void) const;
-  
-  operator const FinderDef_ptr &() const;
-  operator FinderDef_ptr &();
-  // in, inout, out, _retn 
-  FinderDef_ptr in (void) const;
-  FinderDef_ptr &inout (void);
-  FinderDef_ptr &out (void);
-  FinderDef_ptr _retn (void);
-  FinderDef_ptr ptr (void) const;
-
-private:
-  FinderDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  FinderDef_var (const TAO_Base_var &rhs);
-  FinderDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_FINDERDEF___OUT_CH_)
-#define _IR_FINDERDEF___OUT_CH_
-
-class TAO_IFR_Client_Export FinderDef_out
-{
-public:
-  FinderDef_out (FinderDef_ptr &);
-  FinderDef_out (FinderDef_var &);
-  FinderDef_out (const FinderDef_out &);
-  FinderDef_out &operator= (const FinderDef_out &);
-  FinderDef_out &operator= (const FinderDef_var &);
-  FinderDef_out &operator= (FinderDef_ptr);
-  operator FinderDef_ptr &();
-  FinderDef_ptr &ptr (void);
-  FinderDef_ptr operator-> (void);
-  
-private:
-  FinderDef_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_IR_FINDERDEF_CH_)
 #define _IR_FINDERDEF_CH_
 
@@ -6269,7 +5645,7 @@ class _TAO_FinderDef_Remote_Proxy_Impl;
 class _TAO_FinderDef_Proxy_Broker;
 class _TAO_FinderDef_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export FinderDef: public virtual CORBA::OperationDef
+class TAO_IFR_Client_Export FinderDef: public virtual CORBA_OperationDef
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -6329,7 +5705,7 @@ protected:
   virtual ~FinderDef (void);
 private:
   FinderDef (const FinderDef &);
-  void operator= (const FinderDef &);  
+  void operator= (const FinderDef &);
 };
 
 
@@ -6343,7 +5719,7 @@ private:
 //
 
 class TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Impl : 
-  public virtual _TAO_OperationDef_Proxy_Impl
+  public virtual _TAO_CORBA_OperationDef_Proxy_Impl
 {
 public:
   virtual ~_TAO_FinderDef_Proxy_Impl (void) { }
@@ -6364,7 +5740,7 @@ public:
 class TAO_IFR_Client_Export _TAO_FinderDef_Remote_Proxy_Impl : 
   public virtual _TAO_FinderDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_OperationDef_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_OperationDef_Remote_Proxy_Impl
   
 {
 public:
@@ -6446,74 +5822,6 @@ public:
 TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FinderDef;
 
 
-#if !defined (_IR_HOMEDEF___PTR_CH_)
-#define _IR_HOMEDEF___PTR_CH_
-
-class HomeDef;
-typedef HomeDef *HomeDef_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_HOMEDEF___VAR_CH_)
-#define _IR_HOMEDEF___VAR_CH_
-
-class TAO_IFR_Client_Export HomeDef_var : public TAO_Base_var
-{
-public:
-  HomeDef_var (void); // default constructor
-  HomeDef_var (HomeDef_ptr p) : ptr_ (p) {} 
-  HomeDef_var (const HomeDef_var &); // copy constructor
-  ~HomeDef_var (void); // destructor
-  
-  HomeDef_var &operator= (HomeDef_ptr);
-  HomeDef_var &operator= (const HomeDef_var &);
-  HomeDef_ptr operator-> (void) const;
-  
-  operator const HomeDef_ptr &() const;
-  operator HomeDef_ptr &();
-  // in, inout, out, _retn 
-  HomeDef_ptr in (void) const;
-  HomeDef_ptr &inout (void);
-  HomeDef_ptr &out (void);
-  HomeDef_ptr _retn (void);
-  HomeDef_ptr ptr (void) const;
-
-private:
-  HomeDef_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  HomeDef_var (const TAO_Base_var &rhs);
-  HomeDef_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_HOMEDEF___OUT_CH_)
-#define _IR_HOMEDEF___OUT_CH_
-
-class TAO_IFR_Client_Export HomeDef_out
-{
-public:
-  HomeDef_out (HomeDef_ptr &);
-  HomeDef_out (HomeDef_var &);
-  HomeDef_out (const HomeDef_out &);
-  HomeDef_out &operator= (const HomeDef_out &);
-  HomeDef_out &operator= (const HomeDef_var &);
-  HomeDef_out &operator= (HomeDef_ptr);
-  operator HomeDef_ptr &();
-  HomeDef_ptr &ptr (void);
-  HomeDef_ptr operator-> (void);
-  
-private:
-  HomeDef_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_IR_HOMEDEF_CH_)
 #define _IR_HOMEDEF_CH_
 
@@ -6523,7 +5831,7 @@ class _TAO_HomeDef_Remote_Proxy_Impl;
 class _TAO_HomeDef_Proxy_Broker;
 class _TAO_HomeDef_Remote_Proxy_Broker;
 
-class TAO_IFR_Client_Export HomeDef: public virtual CORBA::InterfaceDef
+class TAO_IFR_Client_Export HomeDef: public virtual CORBA_InterfaceDef
 {
 public:
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -6602,7 +5910,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr primary_key,
+      CORBA_ValueDef_ptr primary_key,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6614,8 +5922,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6627,8 +5935,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -6669,7 +5977,7 @@ protected:
   virtual ~HomeDef (void);
 private:
   HomeDef (const HomeDef &);
-  void operator= (const HomeDef &);  
+  void operator= (const HomeDef &);
 };
 
 
@@ -6683,7 +5991,7 @@ private:
 //
 
 class TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Impl : 
-  public virtual _TAO_InterfaceDef_Proxy_Impl
+  public virtual _TAO_CORBA_InterfaceDef_Proxy_Impl
 {
 public:
   virtual ~_TAO_HomeDef_Proxy_Impl (void) { }
@@ -6741,7 +6049,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr primary_key,
+      CORBA_ValueDef_ptr primary_key,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -6753,8 +6061,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -6766,8 +6074,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -6790,7 +6098,7 @@ protected:
 class TAO_IFR_Client_Export _TAO_HomeDef_Remote_Proxy_Impl : 
   public virtual _TAO_HomeDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_InterfaceDef_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_InterfaceDef_Remote_Proxy_Impl
   
 {
 public:
@@ -6851,7 +6159,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::ValueDef_ptr primary_key,
+      CORBA_ValueDef_ptr primary_key,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -6863,8 +6171,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -6876,8 +6184,8 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -6978,8 +6286,8 @@ struct TAO_IFR_Client_Export HomeDescription
   ACE_NESTED_CLASS (IR, PrimaryKeyDef_var) primary_key_def;
   ACE_NESTED_CLASS (IR, FactoryDefSeq) factories;
   ACE_NESTED_CLASS (IR, FinderDefSeq) finders;
-  CORBA::OpDescriptionSeq operations;
-  CORBA::AttrDescriptionSeq attributes;
+  CORBA_OpDescriptionSeq operations;
+  CORBA_AttrDescriptionSeq attributes;
   CORBA::Boolean is_basic;
 };
 
@@ -7038,56 +6346,78 @@ TAO_NAMESPACE_CLOSE // module IR
 
 // Proxy Broker Factory function pointer declarations.
 
-extern TAO_IFR_Client_Export IR::_TAO_ComponentRepository_Proxy_Broker * (*IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+IR::_TAO_ComponentRepository_Proxy_Broker *
+(*IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export IR::_TAO_ProvidesDef_Proxy_Broker * (*IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+IR::_TAO_ProvidesDef_Proxy_Broker *
+(*IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export IR::_TAO_UsesDef_Proxy_Broker * (*IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+IR::_TAO_UsesDef_Proxy_Broker *
+(*IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export IR::_TAO_EventDef_Proxy_Broker * (*IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+IR::_TAO_EventDef_Proxy_Broker *
+(*IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export IR::_TAO_EmitsDef_Proxy_Broker * (*IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+IR::_TAO_EmitsDef_Proxy_Broker *
+(*IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export IR::_TAO_PublishesDef_Proxy_Broker * (*IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+IR::_TAO_PublishesDef_Proxy_Broker *
+(*IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export IR::_TAO_ConsumesDef_Proxy_Broker * (*IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+IR::_TAO_ConsumesDef_Proxy_Broker *
+(*IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export IR::_TAO_ComponentDef_Proxy_Broker * (*IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+IR::_TAO_ComponentDef_Proxy_Broker *
+(*IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export IR::_TAO_PrimaryKeyDef_Proxy_Broker * (*IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+IR::_TAO_PrimaryKeyDef_Proxy_Broker *
+(*IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export IR::_TAO_FactoryDef_Proxy_Broker * (*IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+IR::_TAO_FactoryDef_Proxy_Broker *
+(*IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export IR::_TAO_FinderDef_Proxy_Broker * (*IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+IR::_TAO_FinderDef_Proxy_Broker *
+(*IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export IR::_TAO_HomeDef_Proxy_Broker * (*IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+IR::_TAO_HomeDef_Proxy_Broker *
+(*IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::DefinitionKind);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::DefinitionKind &);
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::RepositoryIdSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::RepositoryIdSeq*); // noncopying version
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::RepositoryIdSeq *&); // deprecated
@@ -7199,8 +6529,6 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::
 
 #ifndef __ACE_INLINE__
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::DefinitionKind &); // 
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::DefinitionKind &);
 
 #if !defined _TAO_CDR_OP_IR_RepositoryIdSeq_H_
 #define _TAO_CDR_OP_IR_RepositoryIdSeq_H_
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.i b/TAO/tao/IFR_Client/IFR_ComponentsC.i
index ef243412bc6..fd62303f138 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.i
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.i
@@ -232,194 +232,6 @@ IR::RepositoryIdSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_IR_COMPONENTDEF___CI_)
-#define _IR_COMPONENTDEF___CI_
-
-ACE_INLINE
-IR::ComponentDef::ComponentDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->IR_ComponentDef_setup_collocation (_tao_collocated);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_COMPONENTDEF___VAR_CI_)
-#define _IR_COMPONENTDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR::ComponentDef_var
-// *************************************************************
-
-ACE_INLINE
-IR::ComponentDef_var::ComponentDef_var (void) // default constructor
-  : ptr_ (IR::ComponentDef::_nil ())
-{}
-
-ACE_INLINE IR::ComponentDef_ptr 
-IR::ComponentDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::ComponentDef_var::ComponentDef_var (const IR::ComponentDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ComponentDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR::ComponentDef_var::~ComponentDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR::ComponentDef_var &
-IR::ComponentDef_var::operator= (IR::ComponentDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IR::ComponentDef_var &
-IR::ComponentDef_var::operator= (const IR::ComponentDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = IR::ComponentDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-IR::ComponentDef_var::operator const IR::ComponentDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IR::ComponentDef_var::operator IR::ComponentDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ComponentDef_ptr 
-IR::ComponentDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ComponentDef_ptr
-IR::ComponentDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ComponentDef_ptr &
-IR::ComponentDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ComponentDef_ptr &
-IR::ComponentDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::ComponentDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ComponentDef_ptr 
-IR::ComponentDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  IR::ComponentDef_ptr val = this->ptr_;
-  this->ptr_ = IR::ComponentDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_COMPONENTDEF___OUT_CI_)
-#define _IR_COMPONENTDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR::ComponentDef_out
-// *************************************************************
-
-ACE_INLINE
-IR::ComponentDef_out::ComponentDef_out (IR::ComponentDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = IR::ComponentDef::_nil ();
-}
-
-ACE_INLINE
-IR::ComponentDef_out::ComponentDef_out (IR::ComponentDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::ComponentDef::_nil ();
-}
-
-ACE_INLINE
-IR::ComponentDef_out::ComponentDef_out (const IR::ComponentDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IR::ComponentDef_out&,p).ptr_)
-{}
-
-ACE_INLINE IR::ComponentDef_out &
-IR::ComponentDef_out::operator= (const IR::ComponentDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (IR::ComponentDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IR::ComponentDef_out &
-IR::ComponentDef_out::operator= (const IR::ComponentDef_var &p)
-{
-  this->ptr_ = IR::ComponentDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE IR::ComponentDef_out &
-IR::ComponentDef_out::operator= (IR::ComponentDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IR::ComponentDef_out::operator IR::ComponentDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ComponentDef_ptr &
-IR::ComponentDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ComponentDef_ptr 
-IR::ComponentDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_)
@@ -433,7 +245,9 @@ IR::ComponentDef_out::operator-> (void)
     ACE_NEW_RETURN (buf, IR::ComponentDef*[nelems], 0);
     
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = IR::ComponentDef::_nil ();
+      {
+        buf[i] = IR::ComponentDef::_nil ();
+      }
     
     return buf;
   }
@@ -476,7 +290,9 @@ IR::ComponentDef_out::operator-> (void)
       IR::ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = IR::ComponentDef::_duplicate (tmp2[i]);
+        {
+          tmp1[i] = IR::ComponentDef::_duplicate (tmp2[i]);
+        }
       
       this->buffer_ = tmp1;
     }
@@ -516,7 +332,9 @@ IR::ComponentDef_out::operator-> (void)
     IR::ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = IR::ComponentDef::_duplicate (tmp2[i]);
+      {
+        tmp1[i] = IR::ComponentDef::_duplicate (tmp2[i]);
+      }
     
     return *this;
   }
@@ -788,194 +606,6 @@ IR::ComponentDefSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_IR_PROVIDESDEF___CI_)
-#define _IR_PROVIDESDEF___CI_
-
-ACE_INLINE
-IR::ProvidesDef::ProvidesDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->IR_ProvidesDef_setup_collocation (_tao_collocated);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_PROVIDESDEF___VAR_CI_)
-#define _IR_PROVIDESDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR::ProvidesDef_var
-// *************************************************************
-
-ACE_INLINE
-IR::ProvidesDef_var::ProvidesDef_var (void) // default constructor
-  : ptr_ (IR::ProvidesDef::_nil ())
-{}
-
-ACE_INLINE IR::ProvidesDef_ptr 
-IR::ProvidesDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::ProvidesDef_var::ProvidesDef_var (const IR::ProvidesDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ProvidesDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR::ProvidesDef_var::~ProvidesDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR::ProvidesDef_var &
-IR::ProvidesDef_var::operator= (IR::ProvidesDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IR::ProvidesDef_var &
-IR::ProvidesDef_var::operator= (const IR::ProvidesDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = IR::ProvidesDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-IR::ProvidesDef_var::operator const IR::ProvidesDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IR::ProvidesDef_var::operator IR::ProvidesDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ProvidesDef_ptr 
-IR::ProvidesDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ProvidesDef_ptr
-IR::ProvidesDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ProvidesDef_ptr &
-IR::ProvidesDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ProvidesDef_ptr &
-IR::ProvidesDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::ProvidesDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ProvidesDef_ptr 
-IR::ProvidesDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  IR::ProvidesDef_ptr val = this->ptr_;
-  this->ptr_ = IR::ProvidesDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_PROVIDESDEF___OUT_CI_)
-#define _IR_PROVIDESDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR::ProvidesDef_out
-// *************************************************************
-
-ACE_INLINE
-IR::ProvidesDef_out::ProvidesDef_out (IR::ProvidesDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = IR::ProvidesDef::_nil ();
-}
-
-ACE_INLINE
-IR::ProvidesDef_out::ProvidesDef_out (IR::ProvidesDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::ProvidesDef::_nil ();
-}
-
-ACE_INLINE
-IR::ProvidesDef_out::ProvidesDef_out (const IR::ProvidesDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IR::ProvidesDef_out&,p).ptr_)
-{}
-
-ACE_INLINE IR::ProvidesDef_out &
-IR::ProvidesDef_out::operator= (const IR::ProvidesDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (IR::ProvidesDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IR::ProvidesDef_out &
-IR::ProvidesDef_out::operator= (const IR::ProvidesDef_var &p)
-{
-  this->ptr_ = IR::ProvidesDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE IR::ProvidesDef_out &
-IR::ProvidesDef_out::operator= (IR::ProvidesDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IR::ProvidesDef_out::operator IR::ProvidesDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ProvidesDef_ptr &
-IR::ProvidesDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ProvidesDef_ptr 
-IR::ProvidesDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_)
@@ -989,7 +619,9 @@ IR::ProvidesDef_out::operator-> (void)
     ACE_NEW_RETURN (buf, IR::ProvidesDef*[nelems], 0);
     
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = IR::ProvidesDef::_nil ();
+      {
+        buf[i] = IR::ProvidesDef::_nil ();
+      }
     
     return buf;
   }
@@ -1032,7 +664,9 @@ IR::ProvidesDef_out::operator-> (void)
       IR::ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = IR::ProvidesDef::_duplicate (tmp2[i]);
+        {
+          tmp1[i] = IR::ProvidesDef::_duplicate (tmp2[i]);
+        }
       
       this->buffer_ = tmp1;
     }
@@ -1072,7 +706,9 @@ IR::ProvidesDef_out::operator-> (void)
     IR::ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = IR::ProvidesDef::_duplicate (tmp2[i]);
+      {
+        tmp1[i] = IR::ProvidesDef::_duplicate (tmp2[i]);
+      }
     
     return *this;
   }
@@ -1344,194 +980,6 @@ IR::ProvidesDefSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_IR_USESDEF___CI_)
-#define _IR_USESDEF___CI_
-
-ACE_INLINE
-IR::UsesDef::UsesDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->IR_UsesDef_setup_collocation (_tao_collocated);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_USESDEF___VAR_CI_)
-#define _IR_USESDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR::UsesDef_var
-// *************************************************************
-
-ACE_INLINE
-IR::UsesDef_var::UsesDef_var (void) // default constructor
-  : ptr_ (IR::UsesDef::_nil ())
-{}
-
-ACE_INLINE IR::UsesDef_ptr 
-IR::UsesDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::UsesDef_var::UsesDef_var (const IR::UsesDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (UsesDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR::UsesDef_var::~UsesDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR::UsesDef_var &
-IR::UsesDef_var::operator= (IR::UsesDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IR::UsesDef_var &
-IR::UsesDef_var::operator= (const IR::UsesDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = IR::UsesDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-IR::UsesDef_var::operator const IR::UsesDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IR::UsesDef_var::operator IR::UsesDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::UsesDef_ptr 
-IR::UsesDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::UsesDef_ptr
-IR::UsesDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::UsesDef_ptr &
-IR::UsesDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::UsesDef_ptr &
-IR::UsesDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::UsesDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE IR::UsesDef_ptr 
-IR::UsesDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  IR::UsesDef_ptr val = this->ptr_;
-  this->ptr_ = IR::UsesDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_USESDEF___OUT_CI_)
-#define _IR_USESDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR::UsesDef_out
-// *************************************************************
-
-ACE_INLINE
-IR::UsesDef_out::UsesDef_out (IR::UsesDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = IR::UsesDef::_nil ();
-}
-
-ACE_INLINE
-IR::UsesDef_out::UsesDef_out (IR::UsesDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::UsesDef::_nil ();
-}
-
-ACE_INLINE
-IR::UsesDef_out::UsesDef_out (const IR::UsesDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IR::UsesDef_out&,p).ptr_)
-{}
-
-ACE_INLINE IR::UsesDef_out &
-IR::UsesDef_out::operator= (const IR::UsesDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (IR::UsesDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IR::UsesDef_out &
-IR::UsesDef_out::operator= (const IR::UsesDef_var &p)
-{
-  this->ptr_ = IR::UsesDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE IR::UsesDef_out &
-IR::UsesDef_out::operator= (IR::UsesDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IR::UsesDef_out::operator IR::UsesDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::UsesDef_ptr &
-IR::UsesDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::UsesDef_ptr 
-IR::UsesDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_)
@@ -1545,7 +993,9 @@ IR::UsesDef_out::operator-> (void)
     ACE_NEW_RETURN (buf, IR::UsesDef*[nelems], 0);
     
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = IR::UsesDef::_nil ();
+      {
+        buf[i] = IR::UsesDef::_nil ();
+      }
     
     return buf;
   }
@@ -1588,7 +1038,9 @@ IR::UsesDef_out::operator-> (void)
       IR::UsesDef ** const tmp2 = ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = IR::UsesDef::_duplicate (tmp2[i]);
+        {
+          tmp1[i] = IR::UsesDef::_duplicate (tmp2[i]);
+        }
       
       this->buffer_ = tmp1;
     }
@@ -1628,7 +1080,9 @@ IR::UsesDef_out::operator-> (void)
     IR::UsesDef ** const tmp2 = ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = IR::UsesDef::_duplicate (tmp2[i]);
+      {
+        tmp1[i] = IR::UsesDef::_duplicate (tmp2[i]);
+      }
     
     return *this;
   }
@@ -1900,194 +1354,6 @@ IR::UsesDefSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_IR_HOMEDEF___CI_)
-#define _IR_HOMEDEF___CI_
-
-ACE_INLINE
-IR::HomeDef::HomeDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->IR_HomeDef_setup_collocation (_tao_collocated);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_HOMEDEF___VAR_CI_)
-#define _IR_HOMEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR::HomeDef_var
-// *************************************************************
-
-ACE_INLINE
-IR::HomeDef_var::HomeDef_var (void) // default constructor
-  : ptr_ (IR::HomeDef::_nil ())
-{}
-
-ACE_INLINE IR::HomeDef_ptr 
-IR::HomeDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::HomeDef_var::HomeDef_var (const IR::HomeDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (HomeDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR::HomeDef_var::~HomeDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR::HomeDef_var &
-IR::HomeDef_var::operator= (IR::HomeDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IR::HomeDef_var &
-IR::HomeDef_var::operator= (const IR::HomeDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = IR::HomeDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-IR::HomeDef_var::operator const IR::HomeDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IR::HomeDef_var::operator IR::HomeDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::HomeDef_ptr 
-IR::HomeDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::HomeDef_ptr
-IR::HomeDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::HomeDef_ptr &
-IR::HomeDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::HomeDef_ptr &
-IR::HomeDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::HomeDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE IR::HomeDef_ptr 
-IR::HomeDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  IR::HomeDef_ptr val = this->ptr_;
-  this->ptr_ = IR::HomeDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_HOMEDEF___OUT_CI_)
-#define _IR_HOMEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR::HomeDef_out
-// *************************************************************
-
-ACE_INLINE
-IR::HomeDef_out::HomeDef_out (IR::HomeDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = IR::HomeDef::_nil ();
-}
-
-ACE_INLINE
-IR::HomeDef_out::HomeDef_out (IR::HomeDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::HomeDef::_nil ();
-}
-
-ACE_INLINE
-IR::HomeDef_out::HomeDef_out (const IR::HomeDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IR::HomeDef_out&,p).ptr_)
-{}
-
-ACE_INLINE IR::HomeDef_out &
-IR::HomeDef_out::operator= (const IR::HomeDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (IR::HomeDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IR::HomeDef_out &
-IR::HomeDef_out::operator= (const IR::HomeDef_var &p)
-{
-  this->ptr_ = IR::HomeDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE IR::HomeDef_out &
-IR::HomeDef_out::operator= (IR::HomeDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IR::HomeDef_out::operator IR::HomeDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::HomeDef_ptr &
-IR::HomeDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::HomeDef_ptr 
-IR::HomeDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_)
@@ -2101,7 +1367,9 @@ IR::HomeDef_out::operator-> (void)
     ACE_NEW_RETURN (buf, IR::HomeDef*[nelems], 0);
     
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = IR::HomeDef::_nil ();
+      {
+        buf[i] = IR::HomeDef::_nil ();
+      }
     
     return buf;
   }
@@ -2144,7 +1412,9 @@ IR::HomeDef_out::operator-> (void)
       IR::HomeDef ** const tmp2 = ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = IR::HomeDef::_duplicate (tmp2[i]);
+        {
+          tmp1[i] = IR::HomeDef::_duplicate (tmp2[i]);
+        }
       
       this->buffer_ = tmp1;
     }
@@ -2184,7 +1454,9 @@ IR::HomeDef_out::operator-> (void)
     IR::HomeDef ** const tmp2 = ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = IR::HomeDef::_duplicate (tmp2[i]);
+      {
+        tmp1[i] = IR::HomeDef::_duplicate (tmp2[i]);
+      }
     
     return *this;
   }
@@ -2456,382 +1728,6 @@ IR::HomeDefSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_IR_EVENTDEF___CI_)
-#define _IR_EVENTDEF___CI_
-
-ACE_INLINE
-IR::EventDef::EventDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->IR_EventDef_setup_collocation (_tao_collocated);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_EVENTDEF___VAR_CI_)
-#define _IR_EVENTDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR::EventDef_var
-// *************************************************************
-
-ACE_INLINE
-IR::EventDef_var::EventDef_var (void) // default constructor
-  : ptr_ (IR::EventDef::_nil ())
-{}
-
-ACE_INLINE IR::EventDef_ptr 
-IR::EventDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::EventDef_var::EventDef_var (const IR::EventDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (EventDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR::EventDef_var::~EventDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR::EventDef_var &
-IR::EventDef_var::operator= (IR::EventDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IR::EventDef_var &
-IR::EventDef_var::operator= (const IR::EventDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = IR::EventDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-IR::EventDef_var::operator const IR::EventDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IR::EventDef_var::operator IR::EventDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::EventDef_ptr 
-IR::EventDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::EventDef_ptr
-IR::EventDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::EventDef_ptr &
-IR::EventDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::EventDef_ptr &
-IR::EventDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::EventDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE IR::EventDef_ptr 
-IR::EventDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  IR::EventDef_ptr val = this->ptr_;
-  this->ptr_ = IR::EventDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_EVENTDEF___OUT_CI_)
-#define _IR_EVENTDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR::EventDef_out
-// *************************************************************
-
-ACE_INLINE
-IR::EventDef_out::EventDef_out (IR::EventDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = IR::EventDef::_nil ();
-}
-
-ACE_INLINE
-IR::EventDef_out::EventDef_out (IR::EventDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::EventDef::_nil ();
-}
-
-ACE_INLINE
-IR::EventDef_out::EventDef_out (const IR::EventDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IR::EventDef_out&,p).ptr_)
-{}
-
-ACE_INLINE IR::EventDef_out &
-IR::EventDef_out::operator= (const IR::EventDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (IR::EventDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IR::EventDef_out &
-IR::EventDef_out::operator= (const IR::EventDef_var &p)
-{
-  this->ptr_ = IR::EventDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE IR::EventDef_out &
-IR::EventDef_out::operator= (IR::EventDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IR::EventDef_out::operator IR::EventDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::EventDef_ptr &
-IR::EventDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::EventDef_ptr 
-IR::EventDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_EMITSDEF___CI_)
-#define _IR_EMITSDEF___CI_
-
-ACE_INLINE
-IR::EmitsDef::EmitsDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->IR_EmitsDef_setup_collocation (_tao_collocated);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_EMITSDEF___VAR_CI_)
-#define _IR_EMITSDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR::EmitsDef_var
-// *************************************************************
-
-ACE_INLINE
-IR::EmitsDef_var::EmitsDef_var (void) // default constructor
-  : ptr_ (IR::EmitsDef::_nil ())
-{}
-
-ACE_INLINE IR::EmitsDef_ptr 
-IR::EmitsDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::EmitsDef_var::EmitsDef_var (const IR::EmitsDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (EmitsDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR::EmitsDef_var::~EmitsDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR::EmitsDef_var &
-IR::EmitsDef_var::operator= (IR::EmitsDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IR::EmitsDef_var &
-IR::EmitsDef_var::operator= (const IR::EmitsDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = IR::EmitsDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-IR::EmitsDef_var::operator const IR::EmitsDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IR::EmitsDef_var::operator IR::EmitsDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::EmitsDef_ptr 
-IR::EmitsDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::EmitsDef_ptr
-IR::EmitsDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::EmitsDef_ptr &
-IR::EmitsDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::EmitsDef_ptr &
-IR::EmitsDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::EmitsDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE IR::EmitsDef_ptr 
-IR::EmitsDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  IR::EmitsDef_ptr val = this->ptr_;
-  this->ptr_ = IR::EmitsDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_EMITSDEF___OUT_CI_)
-#define _IR_EMITSDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR::EmitsDef_out
-// *************************************************************
-
-ACE_INLINE
-IR::EmitsDef_out::EmitsDef_out (IR::EmitsDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = IR::EmitsDef::_nil ();
-}
-
-ACE_INLINE
-IR::EmitsDef_out::EmitsDef_out (IR::EmitsDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::EmitsDef::_nil ();
-}
-
-ACE_INLINE
-IR::EmitsDef_out::EmitsDef_out (const IR::EmitsDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IR::EmitsDef_out&,p).ptr_)
-{}
-
-ACE_INLINE IR::EmitsDef_out &
-IR::EmitsDef_out::operator= (const IR::EmitsDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (IR::EmitsDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IR::EmitsDef_out &
-IR::EmitsDef_out::operator= (const IR::EmitsDef_var &p)
-{
-  this->ptr_ = IR::EmitsDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE IR::EmitsDef_out &
-IR::EmitsDef_out::operator= (IR::EmitsDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IR::EmitsDef_out::operator IR::EmitsDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::EmitsDef_ptr &
-IR::EmitsDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::EmitsDef_ptr 
-IR::EmitsDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_)
@@ -2845,7 +1741,9 @@ IR::EmitsDef_out::operator-> (void)
     ACE_NEW_RETURN (buf, IR::EmitsDef*[nelems], 0);
     
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = IR::EmitsDef::_nil ();
+      {
+        buf[i] = IR::EmitsDef::_nil ();
+      }
     
     return buf;
   }
@@ -2888,7 +1786,9 @@ IR::EmitsDef_out::operator-> (void)
       IR::EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = IR::EmitsDef::_duplicate (tmp2[i]);
+        {
+          tmp1[i] = IR::EmitsDef::_duplicate (tmp2[i]);
+        }
       
       this->buffer_ = tmp1;
     }
@@ -2928,7 +1828,9 @@ IR::EmitsDef_out::operator-> (void)
     IR::EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = IR::EmitsDef::_duplicate (tmp2[i]);
+      {
+        tmp1[i] = IR::EmitsDef::_duplicate (tmp2[i]);
+      }
     
     return *this;
   }
@@ -3200,194 +2102,6 @@ IR::EmitsDefSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_IR_PUBLISHESDEF___CI_)
-#define _IR_PUBLISHESDEF___CI_
-
-ACE_INLINE
-IR::PublishesDef::PublishesDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->IR_PublishesDef_setup_collocation (_tao_collocated);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_PUBLISHESDEF___VAR_CI_)
-#define _IR_PUBLISHESDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR::PublishesDef_var
-// *************************************************************
-
-ACE_INLINE
-IR::PublishesDef_var::PublishesDef_var (void) // default constructor
-  : ptr_ (IR::PublishesDef::_nil ())
-{}
-
-ACE_INLINE IR::PublishesDef_ptr 
-IR::PublishesDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::PublishesDef_var::PublishesDef_var (const IR::PublishesDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (PublishesDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR::PublishesDef_var::~PublishesDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR::PublishesDef_var &
-IR::PublishesDef_var::operator= (IR::PublishesDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IR::PublishesDef_var &
-IR::PublishesDef_var::operator= (const IR::PublishesDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = IR::PublishesDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-IR::PublishesDef_var::operator const IR::PublishesDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IR::PublishesDef_var::operator IR::PublishesDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::PublishesDef_ptr 
-IR::PublishesDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::PublishesDef_ptr
-IR::PublishesDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::PublishesDef_ptr &
-IR::PublishesDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::PublishesDef_ptr &
-IR::PublishesDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::PublishesDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE IR::PublishesDef_ptr 
-IR::PublishesDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  IR::PublishesDef_ptr val = this->ptr_;
-  this->ptr_ = IR::PublishesDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_PUBLISHESDEF___OUT_CI_)
-#define _IR_PUBLISHESDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR::PublishesDef_out
-// *************************************************************
-
-ACE_INLINE
-IR::PublishesDef_out::PublishesDef_out (IR::PublishesDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = IR::PublishesDef::_nil ();
-}
-
-ACE_INLINE
-IR::PublishesDef_out::PublishesDef_out (IR::PublishesDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::PublishesDef::_nil ();
-}
-
-ACE_INLINE
-IR::PublishesDef_out::PublishesDef_out (const IR::PublishesDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IR::PublishesDef_out&,p).ptr_)
-{}
-
-ACE_INLINE IR::PublishesDef_out &
-IR::PublishesDef_out::operator= (const IR::PublishesDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (IR::PublishesDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IR::PublishesDef_out &
-IR::PublishesDef_out::operator= (const IR::PublishesDef_var &p)
-{
-  this->ptr_ = IR::PublishesDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE IR::PublishesDef_out &
-IR::PublishesDef_out::operator= (IR::PublishesDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IR::PublishesDef_out::operator IR::PublishesDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::PublishesDef_ptr &
-IR::PublishesDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::PublishesDef_ptr 
-IR::PublishesDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_)
@@ -3401,7 +2115,9 @@ IR::PublishesDef_out::operator-> (void)
     ACE_NEW_RETURN (buf, IR::PublishesDef*[nelems], 0);
     
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = IR::PublishesDef::_nil ();
+      {
+        buf[i] = IR::PublishesDef::_nil ();
+      }
     
     return buf;
   }
@@ -3444,7 +2160,9 @@ IR::PublishesDef_out::operator-> (void)
       IR::PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = IR::PublishesDef::_duplicate (tmp2[i]);
+        {
+          tmp1[i] = IR::PublishesDef::_duplicate (tmp2[i]);
+        }
       
       this->buffer_ = tmp1;
     }
@@ -3484,7 +2202,9 @@ IR::PublishesDef_out::operator-> (void)
     IR::PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = IR::PublishesDef::_duplicate (tmp2[i]);
+      {
+        tmp1[i] = IR::PublishesDef::_duplicate (tmp2[i]);
+      }
     
     return *this;
   }
@@ -3756,194 +2476,6 @@ IR::PublishesDefSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_IR_CONSUMESDEF___CI_)
-#define _IR_CONSUMESDEF___CI_
-
-ACE_INLINE
-IR::ConsumesDef::ConsumesDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->IR_ConsumesDef_setup_collocation (_tao_collocated);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_CONSUMESDEF___VAR_CI_)
-#define _IR_CONSUMESDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR::ConsumesDef_var
-// *************************************************************
-
-ACE_INLINE
-IR::ConsumesDef_var::ConsumesDef_var (void) // default constructor
-  : ptr_ (IR::ConsumesDef::_nil ())
-{}
-
-ACE_INLINE IR::ConsumesDef_ptr 
-IR::ConsumesDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::ConsumesDef_var::ConsumesDef_var (const IR::ConsumesDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ConsumesDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR::ConsumesDef_var::~ConsumesDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR::ConsumesDef_var &
-IR::ConsumesDef_var::operator= (IR::ConsumesDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IR::ConsumesDef_var &
-IR::ConsumesDef_var::operator= (const IR::ConsumesDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = IR::ConsumesDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-IR::ConsumesDef_var::operator const IR::ConsumesDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IR::ConsumesDef_var::operator IR::ConsumesDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ConsumesDef_ptr 
-IR::ConsumesDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ConsumesDef_ptr
-IR::ConsumesDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ConsumesDef_ptr &
-IR::ConsumesDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ConsumesDef_ptr &
-IR::ConsumesDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::ConsumesDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ConsumesDef_ptr 
-IR::ConsumesDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  IR::ConsumesDef_ptr val = this->ptr_;
-  this->ptr_ = IR::ConsumesDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_CONSUMESDEF___OUT_CI_)
-#define _IR_CONSUMESDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR::ConsumesDef_out
-// *************************************************************
-
-ACE_INLINE
-IR::ConsumesDef_out::ConsumesDef_out (IR::ConsumesDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = IR::ConsumesDef::_nil ();
-}
-
-ACE_INLINE
-IR::ConsumesDef_out::ConsumesDef_out (IR::ConsumesDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::ConsumesDef::_nil ();
-}
-
-ACE_INLINE
-IR::ConsumesDef_out::ConsumesDef_out (const IR::ConsumesDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IR::ConsumesDef_out&,p).ptr_)
-{}
-
-ACE_INLINE IR::ConsumesDef_out &
-IR::ConsumesDef_out::operator= (const IR::ConsumesDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (IR::ConsumesDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IR::ConsumesDef_out &
-IR::ConsumesDef_out::operator= (const IR::ConsumesDef_var &p)
-{
-  this->ptr_ = IR::ConsumesDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE IR::ConsumesDef_out &
-IR::ConsumesDef_out::operator= (IR::ConsumesDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IR::ConsumesDef_out::operator IR::ConsumesDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ConsumesDef_ptr &
-IR::ConsumesDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::ConsumesDef_ptr 
-IR::ConsumesDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_)
@@ -3957,7 +2489,9 @@ IR::ConsumesDef_out::operator-> (void)
     ACE_NEW_RETURN (buf, IR::ConsumesDef*[nelems], 0);
     
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = IR::ConsumesDef::_nil ();
+      {
+        buf[i] = IR::ConsumesDef::_nil ();
+      }
     
     return buf;
   }
@@ -4000,7 +2534,9 @@ IR::ConsumesDef_out::operator-> (void)
       IR::ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = IR::ConsumesDef::_duplicate (tmp2[i]);
+        {
+          tmp1[i] = IR::ConsumesDef::_duplicate (tmp2[i]);
+        }
       
       this->buffer_ = tmp1;
     }
@@ -4040,7 +2576,9 @@ IR::ConsumesDef_out::operator-> (void)
     IR::ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = IR::ConsumesDef::_duplicate (tmp2[i]);
+      {
+        tmp1[i] = IR::ConsumesDef::_duplicate (tmp2[i]);
+      }
     
     return *this;
   }
@@ -4312,194 +2850,6 @@ IR::ConsumesDefSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_IR_FACTORYDEF___CI_)
-#define _IR_FACTORYDEF___CI_
-
-ACE_INLINE
-IR::FactoryDef::FactoryDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->IR_FactoryDef_setup_collocation (_tao_collocated);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_FACTORYDEF___VAR_CI_)
-#define _IR_FACTORYDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR::FactoryDef_var
-// *************************************************************
-
-ACE_INLINE
-IR::FactoryDef_var::FactoryDef_var (void) // default constructor
-  : ptr_ (IR::FactoryDef::_nil ())
-{}
-
-ACE_INLINE IR::FactoryDef_ptr 
-IR::FactoryDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::FactoryDef_var::FactoryDef_var (const IR::FactoryDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (FactoryDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR::FactoryDef_var::~FactoryDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR::FactoryDef_var &
-IR::FactoryDef_var::operator= (IR::FactoryDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IR::FactoryDef_var &
-IR::FactoryDef_var::operator= (const IR::FactoryDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = IR::FactoryDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-IR::FactoryDef_var::operator const IR::FactoryDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IR::FactoryDef_var::operator IR::FactoryDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::FactoryDef_ptr 
-IR::FactoryDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::FactoryDef_ptr
-IR::FactoryDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::FactoryDef_ptr &
-IR::FactoryDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::FactoryDef_ptr &
-IR::FactoryDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::FactoryDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE IR::FactoryDef_ptr 
-IR::FactoryDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  IR::FactoryDef_ptr val = this->ptr_;
-  this->ptr_ = IR::FactoryDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_FACTORYDEF___OUT_CI_)
-#define _IR_FACTORYDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR::FactoryDef_out
-// *************************************************************
-
-ACE_INLINE
-IR::FactoryDef_out::FactoryDef_out (IR::FactoryDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = IR::FactoryDef::_nil ();
-}
-
-ACE_INLINE
-IR::FactoryDef_out::FactoryDef_out (IR::FactoryDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::FactoryDef::_nil ();
-}
-
-ACE_INLINE
-IR::FactoryDef_out::FactoryDef_out (const IR::FactoryDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IR::FactoryDef_out&,p).ptr_)
-{}
-
-ACE_INLINE IR::FactoryDef_out &
-IR::FactoryDef_out::operator= (const IR::FactoryDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (IR::FactoryDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IR::FactoryDef_out &
-IR::FactoryDef_out::operator= (const IR::FactoryDef_var &p)
-{
-  this->ptr_ = IR::FactoryDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE IR::FactoryDef_out &
-IR::FactoryDef_out::operator= (IR::FactoryDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IR::FactoryDef_out::operator IR::FactoryDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::FactoryDef_ptr &
-IR::FactoryDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::FactoryDef_ptr 
-IR::FactoryDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_)
@@ -4513,7 +2863,9 @@ IR::FactoryDef_out::operator-> (void)
     ACE_NEW_RETURN (buf, IR::FactoryDef*[nelems], 0);
     
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = IR::FactoryDef::_nil ();
+      {
+        buf[i] = IR::FactoryDef::_nil ();
+      }
     
     return buf;
   }
@@ -4556,7 +2908,9 @@ IR::FactoryDef_out::operator-> (void)
       IR::FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = IR::FactoryDef::_duplicate (tmp2[i]);
+        {
+          tmp1[i] = IR::FactoryDef::_duplicate (tmp2[i]);
+        }
       
       this->buffer_ = tmp1;
     }
@@ -4596,7 +2950,9 @@ IR::FactoryDef_out::operator-> (void)
     IR::FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = IR::FactoryDef::_duplicate (tmp2[i]);
+      {
+        tmp1[i] = IR::FactoryDef::_duplicate (tmp2[i]);
+      }
     
     return *this;
   }
@@ -4868,194 +3224,6 @@ IR::FactoryDefSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_IR_FINDERDEF___CI_)
-#define _IR_FINDERDEF___CI_
-
-ACE_INLINE
-IR::FinderDef::FinderDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->IR_FinderDef_setup_collocation (_tao_collocated);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_FINDERDEF___VAR_CI_)
-#define _IR_FINDERDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR::FinderDef_var
-// *************************************************************
-
-ACE_INLINE
-IR::FinderDef_var::FinderDef_var (void) // default constructor
-  : ptr_ (IR::FinderDef::_nil ())
-{}
-
-ACE_INLINE IR::FinderDef_ptr 
-IR::FinderDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::FinderDef_var::FinderDef_var (const IR::FinderDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (FinderDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR::FinderDef_var::~FinderDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR::FinderDef_var &
-IR::FinderDef_var::operator= (IR::FinderDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IR::FinderDef_var &
-IR::FinderDef_var::operator= (const IR::FinderDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = IR::FinderDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-IR::FinderDef_var::operator const IR::FinderDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IR::FinderDef_var::operator IR::FinderDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::FinderDef_ptr 
-IR::FinderDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::FinderDef_ptr
-IR::FinderDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::FinderDef_ptr &
-IR::FinderDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::FinderDef_ptr &
-IR::FinderDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::FinderDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE IR::FinderDef_ptr 
-IR::FinderDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  IR::FinderDef_ptr val = this->ptr_;
-  this->ptr_ = IR::FinderDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_FINDERDEF___OUT_CI_)
-#define _IR_FINDERDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR::FinderDef_out
-// *************************************************************
-
-ACE_INLINE
-IR::FinderDef_out::FinderDef_out (IR::FinderDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = IR::FinderDef::_nil ();
-}
-
-ACE_INLINE
-IR::FinderDef_out::FinderDef_out (IR::FinderDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::FinderDef::_nil ();
-}
-
-ACE_INLINE
-IR::FinderDef_out::FinderDef_out (const IR::FinderDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IR::FinderDef_out&,p).ptr_)
-{}
-
-ACE_INLINE IR::FinderDef_out &
-IR::FinderDef_out::operator= (const IR::FinderDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (IR::FinderDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IR::FinderDef_out &
-IR::FinderDef_out::operator= (const IR::FinderDef_var &p)
-{
-  this->ptr_ = IR::FinderDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE IR::FinderDef_out &
-IR::FinderDef_out::operator= (IR::FinderDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IR::FinderDef_out::operator IR::FinderDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::FinderDef_ptr &
-IR::FinderDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::FinderDef_ptr 
-IR::FinderDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_)
@@ -5069,7 +3237,9 @@ IR::FinderDef_out::operator-> (void)
     ACE_NEW_RETURN (buf, IR::FinderDef*[nelems], 0);
     
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = IR::FinderDef::_nil ();
+      {
+        buf[i] = IR::FinderDef::_nil ();
+      }
     
     return buf;
   }
@@ -5112,7 +3282,9 @@ IR::FinderDef_out::operator-> (void)
       IR::FinderDef ** const tmp2 = ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = IR::FinderDef::_duplicate (tmp2[i]);
+        {
+          tmp1[i] = IR::FinderDef::_duplicate (tmp2[i]);
+        }
       
       this->buffer_ = tmp1;
     }
@@ -5152,7 +3324,9 @@ IR::FinderDef_out::operator-> (void)
     IR::FinderDef ** const tmp2 = ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = IR::FinderDef::_duplicate (tmp2[i]);
+      {
+        tmp1[i] = IR::FinderDef::_duplicate (tmp2[i]);
+      }
     
     return *this;
   }
@@ -5424,197 +3598,52 @@ IR::FinderDefSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_IR_PRIMARYKEYDEF___CI_)
-#define _IR_PRIMARYKEYDEF___CI_
+#if !defined (_IR_COMPONENTREPOSITORY___CI_)
+#define _IR_COMPONENTREPOSITORY___CI_
 
-ACE_INLINE
-IR::PrimaryKeyDef::PrimaryKeyDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE IR::ComponentRepository_ptr
+tao_IR_ComponentRepository_duplicate (
+    IR::ComponentRepository_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->IR_PrimaryKeyDef_setup_collocation (_tao_collocated);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_PRIMARYKEYDEF___VAR_CI_)
-#define _IR_PRIMARYKEYDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR::PrimaryKeyDef_var
-// *************************************************************
-
-ACE_INLINE
-IR::PrimaryKeyDef_var::PrimaryKeyDef_var (void) // default constructor
-  : ptr_ (IR::PrimaryKeyDef::_nil ())
-{}
-
-ACE_INLINE IR::PrimaryKeyDef_ptr 
-IR::PrimaryKeyDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::PrimaryKeyDef_var::PrimaryKeyDef_var (const IR::PrimaryKeyDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (PrimaryKeyDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR::PrimaryKeyDef_var::~PrimaryKeyDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR::PrimaryKeyDef_var &
-IR::PrimaryKeyDef_var::operator= (IR::PrimaryKeyDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IR::PrimaryKeyDef_var &
-IR::PrimaryKeyDef_var::operator= (const IR::PrimaryKeyDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = IR::PrimaryKeyDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-IR::PrimaryKeyDef_var::operator const IR::PrimaryKeyDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IR::PrimaryKeyDef_var::operator IR::PrimaryKeyDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::PrimaryKeyDef_ptr 
-IR::PrimaryKeyDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::PrimaryKeyDef_ptr
-IR::PrimaryKeyDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::PrimaryKeyDef_ptr &
-IR::PrimaryKeyDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IR::PrimaryKeyDef_ptr &
-IR::PrimaryKeyDef_var::out (void)
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::PrimaryKeyDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE IR::PrimaryKeyDef_ptr 
-IR::PrimaryKeyDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  IR::PrimaryKeyDef_ptr val = this->ptr_;
-  this->ptr_ = IR::PrimaryKeyDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_PRIMARYKEYDEF___OUT_CI_)
-#define _IR_PRIMARYKEYDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR::PrimaryKeyDef_out
-// *************************************************************
-
-ACE_INLINE
-IR::PrimaryKeyDef_out::PrimaryKeyDef_out (IR::PrimaryKeyDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = IR::PrimaryKeyDef::_nil ();
+  return IR::ComponentRepository::_duplicate (p);
 }
 
-ACE_INLINE
-IR::PrimaryKeyDef_out::PrimaryKeyDef_out (IR::PrimaryKeyDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IR::PrimaryKeyDef::_nil ();
-}
-
-ACE_INLINE
-IR::PrimaryKeyDef_out::PrimaryKeyDef_out (const IR::PrimaryKeyDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IR::PrimaryKeyDef_out&,p).ptr_)
-{}
-
-ACE_INLINE IR::PrimaryKeyDef_out &
-IR::PrimaryKeyDef_out::operator= (const IR::PrimaryKeyDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (IR::PrimaryKeyDef_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IR::PrimaryKeyDef_out &
-IR::PrimaryKeyDef_out::operator= (const IR::PrimaryKeyDef_var &p)
-{
-  this->ptr_ = IR::PrimaryKeyDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE IR::PrimaryKeyDef_out &
-IR::PrimaryKeyDef_out::operator= (IR::PrimaryKeyDef_ptr p)
+ACE_INLINE void
+tao_IR_ComponentRepository_release (
+    IR::ComponentRepository_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-IR::PrimaryKeyDef_out::operator IR::PrimaryKeyDef_ptr &() // cast
+ACE_INLINE IR::ComponentRepository_ptr
+tao_IR_ComponentRepository_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return IR::ComponentRepository::_nil ();
 }
 
-ACE_INLINE IR::PrimaryKeyDef_ptr &
-IR::PrimaryKeyDef_out::ptr (void) // ptr
+ACE_INLINE IR::ComponentRepository_ptr
+tao_IR_ComponentRepository_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return IR::ComponentRepository::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE IR::PrimaryKeyDef_ptr 
-IR::PrimaryKeyDef_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_IR_ComponentRepository_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  IR::ComponentRepository **tmp =
+    ACE_static_cast (IR::ComponentRepository **, src);
+  return *tmp;
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_COMPONENTREPOSITORY___CI_)
-#define _IR_COMPONENTREPOSITORY___CI_
-
 ACE_INLINE
 IR::ComponentRepository::ComponentRepository (
     TAO_Stub *objref,
@@ -5626,173 +3655,65 @@ IR::ComponentRepository::ComponentRepository (
   this->IR_ComponentRepository_setup_collocation (_tao_collocated);
 }
 
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_COMPONENTREPOSITORY___VAR_CI_)
-#define _IR_COMPONENTREPOSITORY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR::ComponentRepository_var
-// *************************************************************
-
-ACE_INLINE
-IR::ComponentRepository_var::ComponentRepository_var (void) // default constructor
-  : ptr_ (ComponentRepository::_nil ())
-{}
-
-ACE_INLINE ::IR::ComponentRepository_ptr
-IR::ComponentRepository_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IR::ComponentRepository_var::ComponentRepository_var (const ::IR::ComponentRepository_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ComponentRepository::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR::ComponentRepository_var::~ComponentRepository_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR::ComponentRepository_var &
-IR::ComponentRepository_var::operator= (ComponentRepository_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IR::ComponentRepository_var &
-IR::ComponentRepository_var::operator= (const ::IR::ComponentRepository_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::IR::ComponentRepository::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-IR::ComponentRepository_var::operator const ::IR::ComponentRepository_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IR::ComponentRepository_var::operator ::IR::ComponentRepository_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::ComponentRepository_ptr
-IR::ComponentRepository_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::ComponentRepository_ptr
-IR::ComponentRepository_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::ComponentRepository_ptr &
-IR::ComponentRepository_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::ComponentRepository_ptr &
-IR::ComponentRepository_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::ComponentRepository::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::IR::ComponentRepository_ptr
-IR::ComponentRepository_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::IR::ComponentRepository_ptr val = this->ptr_;
-  this->ptr_ = ::IR::ComponentRepository::_nil ();
-  return val;
-}
-
 
 #endif /* end #if !defined */
 
 
-#if !defined (_IR_COMPONENTREPOSITORY___OUT_CI_)
-#define _IR_COMPONENTREPOSITORY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR::ComponentRepository_out
-// *************************************************************
-
-ACE_INLINE
-IR::ComponentRepository_out::ComponentRepository_out (ComponentRepository_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::IR::ComponentRepository::_nil ();
-}
-
-ACE_INLINE
-IR::ComponentRepository_out::ComponentRepository_out (ComponentRepository_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IR::ComponentRepository::_nil ();
-}
-
-ACE_INLINE
-IR::ComponentRepository_out::ComponentRepository_out (const ::IR::ComponentRepository_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ComponentRepository_out &, p).ptr_)
-{}
+#if !defined (_IR_PROVIDESDEF___CI_)
+#define _IR_PROVIDESDEF___CI_
 
-ACE_INLINE ::IR::ComponentRepository_out &
-IR::ComponentRepository_out::operator= (const ::IR::ComponentRepository_out &p)
+ACE_INLINE IR::ProvidesDef_ptr
+tao_IR_ProvidesDef_duplicate (
+    IR::ProvidesDef_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (ComponentRepository_out&, p).ptr_;
-  return *this;
+  return IR::ProvidesDef::_duplicate (p);
 }
 
-ACE_INLINE IR::ComponentRepository_out &
-IR::ComponentRepository_out::operator= (const ::IR::ComponentRepository_var &p)
+ACE_INLINE void
+tao_IR_ProvidesDef_release (
+    IR::ProvidesDef_ptr p
+  )
 {
-  this->ptr_ = ::IR::ComponentRepository::_duplicate (p.ptr ());
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE IR::ComponentRepository_out &
-IR::ComponentRepository_out::operator= (ComponentRepository_ptr p)
+ACE_INLINE IR::ProvidesDef_ptr
+tao_IR_ProvidesDef_nil (
+    void
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  return IR::ProvidesDef::_nil ();
 }
 
-ACE_INLINE 
-IR::ComponentRepository_out::operator ::IR::ComponentRepository_ptr &() // cast
+ACE_INLINE IR::ProvidesDef_ptr
+tao_IR_ProvidesDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return IR::ProvidesDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::IR::ComponentRepository_ptr &
-IR::ComponentRepository_out::ptr (void) // ptr
+ACE_INLINE CORBA::Object *
+tao_IR_ProvidesDef_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  IR::ProvidesDef **tmp =
+    ACE_static_cast (IR::ProvidesDef **, src);
+  return *tmp;
 }
 
-ACE_INLINE ::IR::ComponentRepository_ptr
-IR::ComponentRepository_out::operator-> (void)
+ACE_INLINE
+IR::ProvidesDef::ProvidesDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->IR_ProvidesDef_setup_collocation (_tao_collocated);
 }
 
 
@@ -5991,6 +3912,67 @@ IR::ProvidesDescription_out::operator-> (void)
   return this->ptr_;
 }
 
+
+#if !defined (_IR_USESDEF___CI_)
+#define _IR_USESDEF___CI_
+
+ACE_INLINE IR::UsesDef_ptr
+tao_IR_UsesDef_duplicate (
+    IR::UsesDef_ptr p
+  )
+{
+  return IR::UsesDef::_duplicate (p);
+}
+
+ACE_INLINE void
+tao_IR_UsesDef_release (
+    IR::UsesDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_INLINE IR::UsesDef_ptr
+tao_IR_UsesDef_nil (
+    void
+  )
+{
+  return IR::UsesDef::_nil ();
+}
+
+ACE_INLINE IR::UsesDef_ptr
+tao_IR_UsesDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::UsesDef::_narrow (p, ACE_TRY_ENV);
+}
+
+ACE_INLINE CORBA::Object *
+tao_IR_UsesDef_upcast (
+    void *src
+  )
+{
+  IR::UsesDef **tmp =
+    ACE_static_cast (IR::UsesDef **, src);
+  return *tmp;
+}
+
+ACE_INLINE
+IR::UsesDef::UsesDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
+{
+  this->IR_UsesDef_setup_collocation (_tao_collocated);
+}
+
+
+#endif /* end #if !defined */
+
 // *************************************************************
 // Inline operations for class IR::UsesDescription_var
 // *************************************************************
@@ -6972,6 +4954,67 @@ IR::UsesDescSeq_out::operator[] (CORBA::ULong index)
 
 #endif /* end #if !defined */
 
+
+#if !defined (_IR_EVENTDEF___CI_)
+#define _IR_EVENTDEF___CI_
+
+ACE_INLINE IR::EventDef_ptr
+tao_IR_EventDef_duplicate (
+    IR::EventDef_ptr p
+  )
+{
+  return IR::EventDef::_duplicate (p);
+}
+
+ACE_INLINE void
+tao_IR_EventDef_release (
+    IR::EventDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_INLINE IR::EventDef_ptr
+tao_IR_EventDef_nil (
+    void
+  )
+{
+  return IR::EventDef::_nil ();
+}
+
+ACE_INLINE IR::EventDef_ptr
+tao_IR_EventDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::EventDef::_narrow (p, ACE_TRY_ENV);
+}
+
+ACE_INLINE CORBA::Object *
+tao_IR_EventDef_upcast (
+    void *src
+  )
+{
+  IR::EventDef **tmp =
+    ACE_static_cast (IR::EventDef **, src);
+  return *tmp;
+}
+
+ACE_INLINE
+IR::EventDef::EventDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
+{
+  this->IR_EventDef_setup_collocation (_tao_collocated);
+}
+
+
+#endif /* end #if !defined */
+
 // *************************************************************
 // Inline operations for class IR::EventDescription_var
 // *************************************************************
@@ -7165,6 +5208,250 @@ IR::EventDescription_out::operator-> (void)
   return this->ptr_;
 }
 
+
+#if !defined (_IR_EMITSDEF___CI_)
+#define _IR_EMITSDEF___CI_
+
+ACE_INLINE IR::EmitsDef_ptr
+tao_IR_EmitsDef_duplicate (
+    IR::EmitsDef_ptr p
+  )
+{
+  return IR::EmitsDef::_duplicate (p);
+}
+
+ACE_INLINE void
+tao_IR_EmitsDef_release (
+    IR::EmitsDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_INLINE IR::EmitsDef_ptr
+tao_IR_EmitsDef_nil (
+    void
+  )
+{
+  return IR::EmitsDef::_nil ();
+}
+
+ACE_INLINE IR::EmitsDef_ptr
+tao_IR_EmitsDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::EmitsDef::_narrow (p, ACE_TRY_ENV);
+}
+
+ACE_INLINE CORBA::Object *
+tao_IR_EmitsDef_upcast (
+    void *src
+  )
+{
+  IR::EmitsDef **tmp =
+    ACE_static_cast (IR::EmitsDef **, src);
+  return *tmp;
+}
+
+ACE_INLINE
+IR::EmitsDef::EmitsDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
+{
+  this->IR_EmitsDef_setup_collocation (_tao_collocated);
+}
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_IR_PUBLISHESDEF___CI_)
+#define _IR_PUBLISHESDEF___CI_
+
+ACE_INLINE IR::PublishesDef_ptr
+tao_IR_PublishesDef_duplicate (
+    IR::PublishesDef_ptr p
+  )
+{
+  return IR::PublishesDef::_duplicate (p);
+}
+
+ACE_INLINE void
+tao_IR_PublishesDef_release (
+    IR::PublishesDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_INLINE IR::PublishesDef_ptr
+tao_IR_PublishesDef_nil (
+    void
+  )
+{
+  return IR::PublishesDef::_nil ();
+}
+
+ACE_INLINE IR::PublishesDef_ptr
+tao_IR_PublishesDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::PublishesDef::_narrow (p, ACE_TRY_ENV);
+}
+
+ACE_INLINE CORBA::Object *
+tao_IR_PublishesDef_upcast (
+    void *src
+  )
+{
+  IR::PublishesDef **tmp =
+    ACE_static_cast (IR::PublishesDef **, src);
+  return *tmp;
+}
+
+ACE_INLINE
+IR::PublishesDef::PublishesDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
+{
+  this->IR_PublishesDef_setup_collocation (_tao_collocated);
+}
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_IR_CONSUMESDEF___CI_)
+#define _IR_CONSUMESDEF___CI_
+
+ACE_INLINE IR::ConsumesDef_ptr
+tao_IR_ConsumesDef_duplicate (
+    IR::ConsumesDef_ptr p
+  )
+{
+  return IR::ConsumesDef::_duplicate (p);
+}
+
+ACE_INLINE void
+tao_IR_ConsumesDef_release (
+    IR::ConsumesDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_INLINE IR::ConsumesDef_ptr
+tao_IR_ConsumesDef_nil (
+    void
+  )
+{
+  return IR::ConsumesDef::_nil ();
+}
+
+ACE_INLINE IR::ConsumesDef_ptr
+tao_IR_ConsumesDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::ConsumesDef::_narrow (p, ACE_TRY_ENV);
+}
+
+ACE_INLINE CORBA::Object *
+tao_IR_ConsumesDef_upcast (
+    void *src
+  )
+{
+  IR::ConsumesDef **tmp =
+    ACE_static_cast (IR::ConsumesDef **, src);
+  return *tmp;
+}
+
+ACE_INLINE
+IR::ConsumesDef::ConsumesDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
+{
+  this->IR_ConsumesDef_setup_collocation (_tao_collocated);
+}
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_IR_COMPONENTDEF___CI_)
+#define _IR_COMPONENTDEF___CI_
+
+ACE_INLINE IR::ComponentDef_ptr
+tao_IR_ComponentDef_duplicate (
+    IR::ComponentDef_ptr p
+  )
+{
+  return IR::ComponentDef::_duplicate (p);
+}
+
+ACE_INLINE void
+tao_IR_ComponentDef_release (
+    IR::ComponentDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_INLINE IR::ComponentDef_ptr
+tao_IR_ComponentDef_nil (
+    void
+  )
+{
+  return IR::ComponentDef::_nil ();
+}
+
+ACE_INLINE IR::ComponentDef_ptr
+tao_IR_ComponentDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::ComponentDef::_narrow (p, ACE_TRY_ENV);
+}
+
+ACE_INLINE CORBA::Object *
+tao_IR_ComponentDef_upcast (
+    void *src
+  )
+{
+  IR::ComponentDef **tmp =
+    ACE_static_cast (IR::ComponentDef **, src);
+  return *tmp;
+}
+
+ACE_INLINE
+IR::ComponentDef::ComponentDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
+{
+  this->IR_ComponentDef_setup_collocation (_tao_collocated);
+}
+
+
+#endif /* end #if !defined */
+
 // *************************************************************
 // Inline operations for class IR::ComponentDescription_var
 // *************************************************************
@@ -7358,6 +5645,67 @@ IR::ComponentDescription_out::operator-> (void)
   return this->ptr_;
 }
 
+
+#if !defined (_IR_PRIMARYKEYDEF___CI_)
+#define _IR_PRIMARYKEYDEF___CI_
+
+ACE_INLINE IR::PrimaryKeyDef_ptr
+tao_IR_PrimaryKeyDef_duplicate (
+    IR::PrimaryKeyDef_ptr p
+  )
+{
+  return IR::PrimaryKeyDef::_duplicate (p);
+}
+
+ACE_INLINE void
+tao_IR_PrimaryKeyDef_release (
+    IR::PrimaryKeyDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_INLINE IR::PrimaryKeyDef_ptr
+tao_IR_PrimaryKeyDef_nil (
+    void
+  )
+{
+  return IR::PrimaryKeyDef::_nil ();
+}
+
+ACE_INLINE IR::PrimaryKeyDef_ptr
+tao_IR_PrimaryKeyDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::PrimaryKeyDef::_narrow (p, ACE_TRY_ENV);
+}
+
+ACE_INLINE CORBA::Object *
+tao_IR_PrimaryKeyDef_upcast (
+    void *src
+  )
+{
+  IR::PrimaryKeyDef **tmp =
+    ACE_static_cast (IR::PrimaryKeyDef **, src);
+  return *tmp;
+}
+
+ACE_INLINE
+IR::PrimaryKeyDef::PrimaryKeyDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
+{
+  this->IR_PrimaryKeyDef_setup_collocation (_tao_collocated);
+}
+
+
+#endif /* end #if !defined */
+
 // *************************************************************
 // Inline operations for class IR::PrimaryKeyDescription_var
 // *************************************************************
@@ -7551,6 +5899,189 @@ IR::PrimaryKeyDescription_out::operator-> (void)
   return this->ptr_;
 }
 
+
+#if !defined (_IR_FACTORYDEF___CI_)
+#define _IR_FACTORYDEF___CI_
+
+ACE_INLINE IR::FactoryDef_ptr
+tao_IR_FactoryDef_duplicate (
+    IR::FactoryDef_ptr p
+  )
+{
+  return IR::FactoryDef::_duplicate (p);
+}
+
+ACE_INLINE void
+tao_IR_FactoryDef_release (
+    IR::FactoryDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_INLINE IR::FactoryDef_ptr
+tao_IR_FactoryDef_nil (
+    void
+  )
+{
+  return IR::FactoryDef::_nil ();
+}
+
+ACE_INLINE IR::FactoryDef_ptr
+tao_IR_FactoryDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::FactoryDef::_narrow (p, ACE_TRY_ENV);
+}
+
+ACE_INLINE CORBA::Object *
+tao_IR_FactoryDef_upcast (
+    void *src
+  )
+{
+  IR::FactoryDef **tmp =
+    ACE_static_cast (IR::FactoryDef **, src);
+  return *tmp;
+}
+
+ACE_INLINE
+IR::FactoryDef::FactoryDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
+{
+  this->IR_FactoryDef_setup_collocation (_tao_collocated);
+}
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_IR_FINDERDEF___CI_)
+#define _IR_FINDERDEF___CI_
+
+ACE_INLINE IR::FinderDef_ptr
+tao_IR_FinderDef_duplicate (
+    IR::FinderDef_ptr p
+  )
+{
+  return IR::FinderDef::_duplicate (p);
+}
+
+ACE_INLINE void
+tao_IR_FinderDef_release (
+    IR::FinderDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_INLINE IR::FinderDef_ptr
+tao_IR_FinderDef_nil (
+    void
+  )
+{
+  return IR::FinderDef::_nil ();
+}
+
+ACE_INLINE IR::FinderDef_ptr
+tao_IR_FinderDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::FinderDef::_narrow (p, ACE_TRY_ENV);
+}
+
+ACE_INLINE CORBA::Object *
+tao_IR_FinderDef_upcast (
+    void *src
+  )
+{
+  IR::FinderDef **tmp =
+    ACE_static_cast (IR::FinderDef **, src);
+  return *tmp;
+}
+
+ACE_INLINE
+IR::FinderDef::FinderDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
+{
+  this->IR_FinderDef_setup_collocation (_tao_collocated);
+}
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_IR_HOMEDEF___CI_)
+#define _IR_HOMEDEF___CI_
+
+ACE_INLINE IR::HomeDef_ptr
+tao_IR_HomeDef_duplicate (
+    IR::HomeDef_ptr p
+  )
+{
+  return IR::HomeDef::_duplicate (p);
+}
+
+ACE_INLINE void
+tao_IR_HomeDef_release (
+    IR::HomeDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_INLINE IR::HomeDef_ptr
+tao_IR_HomeDef_nil (
+    void
+  )
+{
+  return IR::HomeDef::_nil ();
+}
+
+ACE_INLINE IR::HomeDef_ptr
+tao_IR_HomeDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::HomeDef::_narrow (p, ACE_TRY_ENV);
+}
+
+ACE_INLINE CORBA::Object *
+tao_IR_HomeDef_upcast (
+    void *src
+  )
+{
+  IR::HomeDef **tmp =
+    ACE_static_cast (IR::HomeDef **, src);
+  return *tmp;
+}
+
+ACE_INLINE
+IR::HomeDef::HomeDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
+{
+  this->IR_HomeDef_setup_collocation (_tao_collocated);
+}
+
+
+#endif /* end #if !defined */
+
 // *************************************************************
 // Inline operations for class IR::HomeDescription_var
 // *************************************************************
@@ -7744,25 +6275,6 @@ IR::HomeDescription_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::DefinitionKind &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::DefinitionKind &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean _tao_result = strm >> _tao_temp;
-  
-  if (_tao_result == 1)
-    {
-      _tao_enumval = ACE_static_cast (IR::DefinitionKind, _tao_temp);
-    }
-  
-  return _tao_result;
-}
-
 
 #if !defined _TAO_CDR_OP_IR_RepositoryIdSeq_I_
 #define _TAO_CDR_OP_IR_RepositoryIdSeq_I_
@@ -7778,17 +6290,17 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IR_RepositoryIdSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const IR::ComponentDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     IR::ComponentDef_ptr &
   );
 
+
 #if !defined _TAO_CDR_OP_IR_ComponentDefSeq_I_
 #define _TAO_CDR_OP_IR_ComponentDefSeq_I_
 
@@ -7803,17 +6315,17 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IR_ComponentDefSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const IR::ProvidesDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     IR::ProvidesDef_ptr &
   );
 
+
 #if !defined _TAO_CDR_OP_IR_ProvidesDefSeq_I_
 #define _TAO_CDR_OP_IR_ProvidesDefSeq_I_
 
@@ -7828,17 +6340,17 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IR_ProvidesDefSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const IR::UsesDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     IR::UsesDef_ptr &
   );
 
+
 #if !defined _TAO_CDR_OP_IR_UsesDefSeq_I_
 #define _TAO_CDR_OP_IR_UsesDefSeq_I_
 
@@ -7853,17 +6365,17 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IR_UsesDefSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const IR::HomeDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     IR::HomeDef_ptr &
   );
 
+
 #if !defined _TAO_CDR_OP_IR_HomeDefSeq_I_
 #define _TAO_CDR_OP_IR_HomeDefSeq_I_
 
@@ -7878,27 +6390,27 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IR_HomeDefSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const IR::EventDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     IR::EventDef_ptr &
   );
-ACE_INLINE CORBA::Boolean
-operator<< (
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const IR::EmitsDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     IR::EmitsDef_ptr &
   );
 
+
 #if !defined _TAO_CDR_OP_IR_EmitsDefSeq_I_
 #define _TAO_CDR_OP_IR_EmitsDefSeq_I_
 
@@ -7913,17 +6425,17 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IR_EmitsDefSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const IR::PublishesDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     IR::PublishesDef_ptr &
   );
 
+
 #if !defined _TAO_CDR_OP_IR_PublishesDefSeq_I_
 #define _TAO_CDR_OP_IR_PublishesDefSeq_I_
 
@@ -7938,17 +6450,17 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IR_PublishesDefSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const IR::ConsumesDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     IR::ConsumesDef_ptr &
   );
 
+
 #if !defined _TAO_CDR_OP_IR_ConsumesDefSeq_I_
 #define _TAO_CDR_OP_IR_ConsumesDefSeq_I_
 
@@ -7963,17 +6475,17 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IR_ConsumesDefSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const IR::FactoryDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     IR::FactoryDef_ptr &
   );
 
+
 #if !defined _TAO_CDR_OP_IR_FactoryDefSeq_I_
 #define _TAO_CDR_OP_IR_FactoryDefSeq_I_
 
@@ -7988,17 +6500,17 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IR_FactoryDefSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const IR::FinderDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     IR::FinderDef_ptr &
   );
 
+
 #if !defined _TAO_CDR_OP_IR_FinderDefSeq_I_
 #define _TAO_CDR_OP_IR_FinderDefSeq_I_
 
@@ -8013,114 +6525,26 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IR_FinderDefSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const IR::PrimaryKeyDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     IR::PrimaryKeyDef_ptr &
   );
-ACE_INLINE CORBA::Boolean
-operator<< (
+
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const IR::ComponentRepository_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    IR::ComponentRepository_ptr &
-  );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const IR::ComponentRepository_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    IR::ComponentRepository_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      IR::ComponentRepository::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const IR::ProvidesDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    IR::ProvidesDef_ptr &
+    IR::ComponentRepository_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const IR::ProvidesDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    IR::ProvidesDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      IR::ProvidesDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ProvidesDescription &_tao_aggregate)
 {
   if (
@@ -8151,55 +6575,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ProvidesDescriptio
   
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const IR::UsesDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    IR::UsesDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const IR::UsesDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    IR::UsesDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      IR::UsesDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::UsesDescription &_tao_aggregate)
 {
   if (
@@ -8262,55 +6637,6 @@ CORBA::Boolean TAO_IFR_Client_Export operator>> (
 
 #endif /* _TAO_CDR_OP_IR_UsesDescSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const IR::EventDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    IR::EventDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const IR::EventDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    IR::EventDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      IR::EventDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::EventDescription &_tao_aggregate)
 {
   if (
@@ -8341,202 +6667,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::EventDescription &
   
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const IR::EmitsDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    IR::EmitsDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const IR::EmitsDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    IR::EmitsDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      IR::EmitsDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const IR::PublishesDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    IR::PublishesDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const IR::PublishesDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    IR::PublishesDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      IR::PublishesDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const IR::ConsumesDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    IR::ConsumesDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const IR::ConsumesDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    IR::ConsumesDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      IR::ConsumesDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const IR::ComponentDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    IR::ComponentDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const IR::ComponentDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    IR::ComponentDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      IR::ComponentDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ComponentDescription &_tao_aggregate)
 {
   if (
@@ -8583,55 +6713,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ComponentDescripti
   
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const IR::PrimaryKeyDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    IR::PrimaryKeyDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const IR::PrimaryKeyDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    IR::PrimaryKeyDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      IR::PrimaryKeyDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::PrimaryKeyDescription &_tao_aggregate)
 {
   if (
@@ -8662,153 +6743,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::PrimaryKeyDescript
   
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const IR::FactoryDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    IR::FactoryDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const IR::FactoryDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    IR::FactoryDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      IR::FactoryDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const IR::FinderDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    IR::FinderDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const IR::FinderDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    IR::FinderDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      IR::FinderDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const IR::HomeDef_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    IR::HomeDef_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const IR::HomeDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    IR::HomeDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      IR::HomeDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::HomeDescription &_tao_aggregate)
 {
   if (
diff --git a/TAO/tao/IFR_Client/IFR_Extended.pidl b/TAO/tao/IFR_Client/IFR_Extended.pidl
index f64d02c111d..032bcce4dae 100644
--- a/TAO/tao/IFR_Client/IFR_Extended.pidl
+++ b/TAO/tao/IFR_Client/IFR_Extended.pidl
@@ -16,15 +16,41 @@
 //   time. This IDL file contains all the interfaces and other data
 //   types related to fixed types and valuetypes.
 //
-//   The command used to generate code from this IDL file is:
+//   1. Patch this pidl file with
 //
-//     tao_idl -o orig -Ge 1 \
+//      patch < diffs/IFR_Extended.pidl.diff
+//
+//   This will remove the CORBA module, rename most types foo
+//   declared in it as CORBA_foo, unalias the simple typedefs
+//   which don't have a CORBA_ analog in corbafwd.h.
+//
+//   2. Generate the code. The command used to generate code from this 
+//   IDL file is:
+//
+//     tao_idl -o orig -Ge 1 -I.. \
 //          -Wb,export_macro=TAO_IFR_Client_Export \
 //          -Wb,export_include=ifr_client_export.h \
 //          -Wb,pre_include="ace/pre.h" \
 //          -Wb,post_include="ace/post.h" \
 //          IFR_Extended.pidl
 //
+//   3. Copy the generated files to the current directory.
+//
+//   4. Patch the generated files, using
+//      
+//      patch < diffs/IFR_ExtendedC.h.diff
+//      patch < diffs/IFR_ExtendedC.i.diff
+//      patch < diffs/IFR_ExtendedC.cpp.diff
+//
+//   If this fails for some reason, the files must be patched
+//   by hand, and the diff files regenerated with
+//
+//      diff -wbu orig/IFR_ExtendedC.h IFR_ExtendedC.h > diffs/IFR_ExtendedC.h.diff
+//      diff -wbu orig/IFR_ExtendedC.i IFR_ExtendedC.i > diffs/IFR_ExtendedC.i.diff
+//      diff -wbu orig/IFR_ExtendedC.cpp IFR_ExtendedC.cpp > diffs/IFR_ExtendedC.cpp.diff
+//
+//   5. Restore IFR_Extended.pidl.
+//
 //   To regenerate the skeleton files IFR_ExtendedS.{h,i,cpp} and 
 //   IFR_ExtendedS_T.{h,i.cpp} in ACE_ROOT/TAO/orbsvcs/IFR_Service,
 //   use the command
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
index de3eb4e6569..6f4317018eb 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
@@ -20,6 +20,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IFR_ExtendedC.h"
+#include "tao/ClientRequestInfo.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
@@ -33,965 +34,188 @@
 #include "IFR_ExtendedC.i"
 #endif /* !defined INLINE */
 
-// ********************************************************************
-// Methods for sequences classes moved from IFR_BaseC.cpp
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CS_
-
-  // The Base_Sequence functions, please see tao/Sequence.h
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::ValueDef **tmp = 0;
-    tmp = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::ValueDef **old = ACE_reinterpret_cast (CORBA::ValueDef**, this->buffer_);
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = CORBA::ValueDef::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    CORBA::ValueDef **tmp = ACE_reinterpret_cast (CORBA::ValueDef**, this->buffer_);
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::ValueDef::_nil ();
-    }
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (tmp);
-    this->buffer_ = 0;
-  }
-  
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::~_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void)
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  void
- _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-  {
-    CORBA::ValueDef **tmp = ACE_reinterpret_cast (CORBA::ValueDef**, this->buffer_);
-    
-    for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::ValueDef::_nil ();
-    }
-  }
-  void 
- _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_downcast (
-      void* target,
-      CORBA_Object *src,
-      CORBA_Environment &ACE_TRY_ENV
-    )
-  {
-    CORBA::ValueDef **tmp = ACE_static_cast (CORBA::ValueDef**, target);
-    *tmp = CORBA::ValueDef::_narrow (src, ACE_TRY_ENV);
-    ACE_CHECK;
-  }
-
-  CORBA_Object*
- _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_upcast (void *src) const
-  {
-    CORBA::ValueDef **tmp = ACE_static_cast (CORBA::ValueDef**, src);
-    return *tmp;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_VALUEDEFSEQ_CS_)
-#define _CORBA_VALUEDEFSEQ_CS_
-
 // *************************************************************
-// CORBA_ValueDefSeq
+// Operations for class CORBA_FixedDef_var
 // *************************************************************
 
-CORBA_ValueDefSeq::CORBA_ValueDefSeq (void)
-{}
-CORBA_ValueDefSeq::CORBA_ValueDefSeq (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::ValueDef,CORBA::ValueDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA_ValueDefSeq::CORBA_ValueDefSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ValueDef_ptr *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::ValueDef,CORBA::ValueDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA_ValueDefSeq::CORBA_ValueDefSeq (const CORBA_ValueDefSeq &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA::ValueDef,CORBA::ValueDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA_ValueDefSeq::~CORBA_ValueDefSeq (void) // dtor
+CORBA_FixedDef_var::CORBA_FixedDef_var (void) // default constructor
+  : ptr_ (CORBA_FixedDef::_nil ())
 {}
-void CORBA_ValueDefSeq::_tao_any_destructor (void *x)
+
+::CORBA_FixedDef_ptr
+CORBA_FixedDef_var::ptr (void) const
 {
-  CORBA_ValueDefSeq *tmp = ACE_static_cast (CORBA_ValueDefSeq*,x);
-  delete tmp;
+  return this->ptr_;
 }
 
+CORBA_FixedDef_var::CORBA_FixedDef_var (const ::CORBA_FixedDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_FixedDef::_duplicate (p.ptr ()))
+{}
 
-#endif /* end #if !defined */
-
-// **************************************************************
-// Repository::create_fixed methods from IFR_BasicC.cpp
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-class TAO_ClientRequestInfo_CORBA_Repository_create_fixed : public TAO_ClientRequestInfo
+CORBA_FixedDef_var::~CORBA_FixedDef_var (void) // destructor
 {
-public:
-  TAO_ClientRequestInfo_CORBA_Repository_create_fixed (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const CORBA::UShort & digits,
-      const CORBA::Short & scale,
-      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));
-
-  void result (CORBA::FixedDef_ptr result);
-
-private:
-  TAO_ClientRequestInfo_CORBA_Repository_create_fixed (const TAO_ClientRequestInfo_CORBA_Repository_create_fixed &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Repository_create_fixed &);
-
-  const CORBA::UShort & digits_;
-  const CORBA::Short & scale_;
-  CORBA::FixedDef_ptr _result;
-};
+  CORBA::release (this->ptr_);
+}
 
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Repository_create_fixed::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+CORBA_FixedDef_var &
+CORBA_FixedDef_var::operator= (CORBA_FixedDef_ptr p)
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-CORBA::FixedDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_fixed (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::UShort digits,
-    CORBA::Short scale,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+CORBA_FixedDef_var &
+CORBA_FixedDef_var::operator= (const ::CORBA_FixedDef_var &p)
 {
-  CORBA::FixedDef_ptr _tao_retval = CORBA::FixedDef::_nil ();
-  CORBA::FixedDef_var _tao_safe_retval (_tao_retval);
-  
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_fixed",
-      12,
-      1,
-      istub->orb_core ()
-    );
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_CORBA_Repository_create_fixed ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        digits,
-        scale,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << digits) &&
-              (_tao_out << scale)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::FixedDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_FixedDef::_duplicate (p.ptr ());
+  }
+  return *this;
 }
-      
-// *******************************************************************
-// Container::create_value* methods from IFR_BaseC.cpp
 
-#if TAO_HAS_INTERCEPTORS == 1
+CORBA_FixedDef_var::operator const ::CORBA_FixedDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
 
-class TAO_ClientRequestInfo_CORBA_Container_create_value : public TAO_ClientRequestInfo
+CORBA_FixedDef_var::operator ::CORBA_FixedDef_ptr &() // cast 
 {
-public:
-  TAO_ClientRequestInfo_CORBA_Container_create_value (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * id,
-      const char * name,
-      const char * version,
-      const CORBA::Boolean & is_custom,
-      const CORBA::Boolean & is_abstract,
-      CORBA::ValueDef_ptr base_value,
-      const 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 ()
-    );
+  return this->ptr_;
+}
 
-  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));
+::CORBA_FixedDef_ptr
+CORBA_FixedDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
 
-  void result (CORBA::ValueDef_ptr result);
+::CORBA_FixedDef_ptr
+CORBA_FixedDef_var::in (void) const
+{
+  return this->ptr_;
+}
 
-private:
-  TAO_ClientRequestInfo_CORBA_Container_create_value (const TAO_ClientRequestInfo_CORBA_Container_create_value &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_value &);
+::CORBA_FixedDef_ptr &
+CORBA_FixedDef_var::inout (void)
+{
+  return this->ptr_;
+}
 
-  const char * id_;
-  const char * name_;
-  const char * version_;
-  const CORBA::Boolean & is_custom_;
-  const CORBA::Boolean & is_abstract_;
-  CORBA::ValueDef_ptr base_value_;
-  const CORBA::Boolean & is_truncatable_;
-  const CORBA::ValueDefSeq & abstract_base_values_;
-  const CORBA::InterfaceDefSeq & supported_interfaces_;
-  const CORBA::InitializerSeq & initializers_;
-  CORBA::ValueDef_ptr _result;
-};
+::CORBA_FixedDef_ptr &
+CORBA_FixedDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_FixedDef::_nil ();
+  return this->ptr_;
+}
 
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_CORBA_Container_create_value::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+::CORBA_FixedDef_ptr
+CORBA_FixedDef_var::_retn (void)
 {
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-    
-  CORBA::ULong length_id = parameter_list->length ();
-  parameter_list->length (length_id + 1);
-  (*parameter_list)[length_id].argument <<= id_;
-  (*parameter_list)[length_id].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_name = parameter_list->length ();
-  parameter_list->length (length_name + 1);
-  (*parameter_list)[length_name].argument <<= name_;
-  (*parameter_list)[length_name].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_version = parameter_list->length ();
-  parameter_list->length (length_version + 1);
-  (*parameter_list)[length_version].argument <<= version_;
-  (*parameter_list)[length_version].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_custom = parameter_list->length ();
-  parameter_list->length (length_is_custom + 1);
-  (*parameter_list)[length_is_custom].argument <<= CORBA::Any::from_boolean (this->is_custom_);
-  (*parameter_list)[length_is_custom].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_abstract = parameter_list->length ();
-  parameter_list->length (length_is_abstract + 1);
-  (*parameter_list)[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
-  (*parameter_list)[length_is_abstract].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_base_value = parameter_list->length ();
-  parameter_list->length (length_base_value + 1);
-  (*parameter_list)[length_base_value].argument <<=  this->base_value_;
-  
-  (*parameter_list)[length_base_value].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_is_truncatable = parameter_list->length ();
-  parameter_list->length (length_is_truncatable + 1);
-  (*parameter_list)[length_is_truncatable].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
-  (*parameter_list)[length_is_truncatable].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_abstract_base_values = parameter_list->length ();
-  parameter_list->length (length_abstract_base_values + 1);
-  (*parameter_list)[length_abstract_base_values].argument <<=  this->abstract_base_values_;
-  
-  (*parameter_list)[length_abstract_base_values].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_supported_interfaces = parameter_list->length ();
-  parameter_list->length (length_supported_interfaces + 1);
-  (*parameter_list)[length_supported_interfaces].argument <<=  this->supported_interfaces_;
-  
-  (*parameter_list)[length_supported_interfaces].mode = Dynamic::PARAM_IN;
-    
-  CORBA::ULong length_initializers = parameter_list->length ();
-  parameter_list->length (length_initializers + 1);
-  (*parameter_list)[length_initializers].argument <<=  this->initializers_;
-  
-  (*parameter_list)[length_initializers].mode = Dynamic::PARAM_IN;
-  
-  return safe_parameter_list._retn ();
+  // yield ownership of managed obj reference
+  ::CORBA_FixedDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_FixedDef::_nil ();
+  return val;
 }
 
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Container_create_value::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+::CORBA_FixedDef_ptr
+CORBA_FixedDef_var::duplicate (CORBA_FixedDef_ptr p)
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  return ::CORBA_FixedDef::_duplicate (p);
 }
 
-class TAO_ClientRequestInfo_CORBA_Container_create_value_box : public TAO_ClientRequestInfo
+void
+CORBA_FixedDef_var::release (CORBA_FixedDef_ptr p)
 {
-public:
-  TAO_ClientRequestInfo_CORBA_Container_create_value_box (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * id,
-      const char * name,
-      const char * version,
-      CORBA::IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+  CORBA::release (p);
+}
 
-  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));
+::CORBA_FixedDef_ptr
+CORBA_FixedDef_var::nil (void)
+{
+  return ::CORBA_FixedDef::_nil ();
+}
 
-  void result (CORBA::ValueBoxDef_ptr result);
+::CORBA_FixedDef_ptr
+CORBA_FixedDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_FixedDef::_narrow (p, ACE_TRY_ENV);
+}
 
-private:
-  TAO_ClientRequestInfo_CORBA_Container_create_value_box (const TAO_ClientRequestInfo_CORBA_Container_create_value_box &);
-  void operator= (const TAO_ClientRequestInfo_CORBA_Container_create_value_box &);
+CORBA::Object *
+CORBA_FixedDef_var::upcast (void *src)
+{
+  CORBA_FixedDef **tmp =
+    ACE_static_cast (CORBA_FixedDef **, src);
+  return *tmp;
+}
 
-  const char * id_;
-  const char * name_;
-  const char * version_;
-  CORBA::IDLType_ptr original_type_def_;
-  CORBA::ValueBoxDef_ptr _result;
-};
+// *************************************************************
+// Inline operations for class CORBA_FixedDef_out
+// *************************************************************
 
-CORBA::Any * 
-TAO_ClientRequestInfo_CORBA_Container_create_value_box::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+CORBA_FixedDef_out::CORBA_FixedDef_out (CORBA_FixedDef_ptr &p)
+  : ptr_ (p)
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  CORBA::Any_var safe_result_any = result_any;
-  
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  this->ptr_ = ::CORBA_FixedDef::_nil ();
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
-CORBA::ValueDef_ptr _TAO_Container_Remote_Proxy_Impl::create_value (
-    CORBA_Object *_collocated_tao_target_,
-    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
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+CORBA_FixedDef_out::CORBA_FixedDef_out (CORBA_FixedDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
 {
-  CORBA::ValueDef_ptr _tao_retval = CORBA::ValueDef::_nil ();
-  CORBA::ValueDef_var _tao_safe_retval (_tao_retval);
-  
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_FixedDef::_nil ();
+}
 
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_value",
-      12,
-      1,
-      istub->orb_core ()
-    );
+CORBA_FixedDef_out::CORBA_FixedDef_out (const ::CORBA_FixedDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_FixedDef_out &, p).ptr_)
+{}
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_CORBA_Container_create_value ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        is_custom,
-        is_abstract,
-        base_value,
-        is_truncatable,
-        abstract_base_values,
-        supported_interfaces,
-        initializers,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << CORBA::Any::from_boolean (is_custom)) &&
-              (_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
-              (_tao_out << base_value) &&
-              (_tao_out << CORBA::Any::from_boolean (is_truncatable)) &&
-              (_tao_out << abstract_base_values) &&
-              (_tao_out << supported_interfaces) &&
-              (_tao_out << initializers)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+::CORBA_FixedDef_out &
+CORBA_FixedDef_out::operator= (const ::CORBA_FixedDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_FixedDef_out&, p).ptr_;
+  return *this;
+}
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+CORBA_FixedDef_out &
+CORBA_FixedDef_out::operator= (const ::CORBA_FixedDef_var &p)
+{
+  this->ptr_ = ::CORBA_FixedDef::_duplicate (p.ptr ());
+  return *this;
 }
 
-CORBA::ValueBoxDef_ptr _TAO_Container_Remote_Proxy_Impl::create_value_box (
-    CORBA_Object *_collocated_tao_target_,
-    const char * id,
-    const char * name,
-    const char * version,
-    CORBA::IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
+CORBA_FixedDef_out &
+CORBA_FixedDef_out::operator= (CORBA_FixedDef_ptr p)
 {
-  CORBA::ValueBoxDef_ptr _tao_retval = CORBA::ValueBoxDef::_nil ();
-  CORBA::ValueBoxDef_var _tao_safe_retval (_tao_retval);
-  
-  
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+  this->ptr_ = p;
+  return *this;
+}
 
-  
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_value_box",
-      16,
-      1,
-      istub->orb_core ()
-    );
+CORBA_FixedDef_out::operator ::CORBA_FixedDef_ptr &() // cast
+{
+  return this->ptr_;
+}
 
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors ()
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      int _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_CORBA_Container_create_value_box ri (
-        &_tao_call,
-        _collocated_tao_target_,
-        id,
-        name,
-        version,
-        original_type_def,
-        ACE_TRY_ENV
-      );
-      ACE_CHECK_RETURN (0);
-      
-      ACE_TRY
-        {
-#endif /* TAO_HAS_INTERCEPTORS */
-        
-          _tao_call.start (ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-          TAO_INTERCEPTOR (ri.response_expected (1));
-          
-          TAO_INTERCEPTOR (
-            _tao_vfr.send_request (
-              &ri,
-              ACE_TRY_ENV
-            )
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          _tao_call.prepare_header (
-              ACE_static_cast (CORBA::Octet, _tao_response_flag),
-              ACE_TRY_ENV
-            );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-          if (!(
-                            (_tao_out << id) &&
-              (_tao_out << name) &&
-              (_tao_out << version) &&
-              (_tao_out << original_type_def)
-            ))
-            TAO_INTERCEPTOR_THROW_RETURN (
-              CORBA::MARSHAL (),
-              0
-            );
-            
-          _invoke_status =
-            _tao_call.invoke (0, 0, ACE_TRY_ENV);
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-          if (_invoke_status == TAO_INVOKE_EXCEPTION)
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-          if (!(
-                            (_tao_in >> _tao_safe_retval.inout ())
-              ))
-            {
-              TAO_INTERCEPTOR_THROW_RETURN (
-                CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                0
-              );
-              
-            }
-          
-          TAO_INTERCEPTOR (
-              CORBA::ValueBoxDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-              ri.result (_tao_retval_info);
-              _tao_safe_retval = _tao_retval_info;
-            );
-          
-          TAO_INTERCEPTOR (
-            ri.reply_status (_invoke_status);
-            if (_invoke_status == TAO_INVOKE_OK)
-              {
-                _tao_vfr.receive_reply (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            else
-              {
-                _tao_vfr.receive_other (
-                  &ri,
-                  ACE_TRY_ENV
-                );
-              }
-            
-          );
-          TAO_INTERCEPTOR_CHECK_RETURN (0);
-          
-#if TAO_HAS_INTERCEPTORS == 1
-        }
-      ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-        {
-          _invoke_status =
-            _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          
-          ri.forward_reference (exc); 
-          _tao_vfr.receive_other (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-            &ri,
-            ACE_TRY_ENV
-          );
-          ACE_TRY_CHECK;
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
+::CORBA_FixedDef_ptr &
+CORBA_FixedDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
 
-      if (_invoke_status == TAO_INVOKE_RESTART)
-        {
-          _tao_call.restart_flag (1);
-          continue;
-        }
-      
-      break;
-    }
-  return _tao_safe_retval._retn ();
+::CORBA_FixedDef_ptr
+CORBA_FixedDef_out::operator-> (void)
+{
+  return this->ptr_;
 }
-          
-// **********************************************************************
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_FixedDef_digits_get : public TAO_ClientRequestInfo
@@ -1370,15 +594,15 @@ TAO_ClientRequestInfo_CORBA_FixedDef_scale_set::result (CORBA::Environment &ACE_
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_FixedDef_Proxy_Impl::_TAO_FixedDef_Proxy_Impl (void)
+_TAO_CORBA_FixedDef_Proxy_Impl::_TAO_CORBA_FixedDef_Proxy_Impl (void)
 {}
 
-_TAO_FixedDef_Remote_Proxy_Impl::_TAO_FixedDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_FixedDef_Remote_Proxy_Impl::_TAO_CORBA_FixedDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::UShort _TAO_FixedDef_Remote_Proxy_Impl::digits (
+CORBA::UShort _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1536,7 +760,7 @@ CORBA::UShort _TAO_FixedDef_Remote_Proxy_Impl::digits (
   return _tao_retval;
 }
 
-void _TAO_FixedDef_Remote_Proxy_Impl::digits (
+void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::digits (
     CORBA_Object *_collocated_tao_target_,
     CORBA::UShort digits,
     CORBA::Environment &ACE_TRY_ENV
@@ -1688,7 +912,7 @@ void _TAO_FixedDef_Remote_Proxy_Impl::digits (
   
 }
 
-CORBA::Short _TAO_FixedDef_Remote_Proxy_Impl::scale (
+CORBA::Short _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -1846,7 +1070,7 @@ CORBA::Short _TAO_FixedDef_Remote_Proxy_Impl::scale (
   return _tao_retval;
 }
 
-void _TAO_FixedDef_Remote_Proxy_Impl::scale (
+void _TAO_CORBA_FixedDef_Remote_Proxy_Impl::scale (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Short scale,
     CORBA::Environment &ACE_TRY_ENV
@@ -2008,36 +1232,36 @@ void _TAO_FixedDef_Remote_Proxy_Impl::scale (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_FixedDef_Proxy_Broker::_TAO_FixedDef_Proxy_Broker (void)
+_TAO_CORBA_FixedDef_Proxy_Broker::_TAO_CORBA_FixedDef_Proxy_Broker (void)
 {
 }
 
-_TAO_FixedDef_Proxy_Broker::~_TAO_FixedDef_Proxy_Broker (void)
+_TAO_CORBA_FixedDef_Proxy_Broker::~_TAO_CORBA_FixedDef_Proxy_Broker (void)
 {
 }
 
-_TAO_FixedDef_Proxy_Broker * (*CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_FixedDef_Proxy_Broker * (*_TAO_CORBA_FixedDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_FixedDef_Remote_Proxy_Broker *
-_TAO_FixedDef_Remote_Proxy_Broker::the_TAO_FixedDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_FixedDef_Remote_Proxy_Broker *
+_TAO_CORBA_FixedDef_Remote_Proxy_Broker::the_TAO_CORBA_FixedDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_FixedDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_FixedDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_FixedDef_Remote_Proxy_Broker::_TAO_FixedDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_FixedDef_Remote_Proxy_Broker::_TAO_CORBA_FixedDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_FixedDef_Remote_Proxy_Broker::~_TAO_FixedDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_FixedDef_Remote_Proxy_Broker::~_TAO_CORBA_FixedDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_FixedDef_Proxy_Impl&
-_TAO_FixedDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_FixedDef_Proxy_Impl&
+_TAO_CORBA_FixedDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_FixedDef *,
   CORBA::Environment &
 )
@@ -2062,72 +1286,72 @@ CORBA_FixedDef::~CORBA_FixedDef (void)
 {}
 
 void
-CORBA::FixedDef::CORBA_FixedDef_setup_collocation (int collocated)
+CORBA_FixedDef::CORBA_FixedDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_FixedDef_Proxy_Broker_ =
-      ::CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_FixedDef_Proxy_Broker_ =
+      ::_TAO_CORBA_FixedDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_FixedDef_Proxy_Broker_ =
-      ::_TAO_FixedDef_Remote_Proxy_Broker::the_TAO_FixedDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_FixedDef_Proxy_Broker_ =
+      ::_TAO_CORBA_FixedDef_Remote_Proxy_Broker::the_TAO_CORBA_FixedDef_Remote_Proxy_Broker ();
   
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA::FixedDef::_tao_any_destructor (void *x)
+void CORBA_FixedDef::_tao_any_destructor (void *x)
 {
   CORBA_FixedDef *tmp = ACE_static_cast (CORBA_FixedDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::FixedDef_ptr CORBA::FixedDef::_narrow (
+CORBA_FixedDef_ptr CORBA_FixedDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::FixedDef::_nil ();
+    return CORBA_FixedDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/FixedDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::FixedDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_FixedDef::_nil ());
       if (is_a == 0)
-        return CORBA::FixedDef::_nil ();
+        return CORBA_FixedDef::_nil ();
     }
-  return CORBA::FixedDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_FixedDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::FixedDef_ptr CORBA::FixedDef::_unchecked_narrow (
+CORBA_FixedDef_ptr CORBA_FixedDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::FixedDef::_nil ();
+    return CORBA_FixedDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::FixedDef_ptr default_proxy = CORBA::FixedDef::_nil ();
+      CORBA_FixedDef_ptr default_proxy = CORBA_FixedDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_FixedDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::FixedDef (
+          ::CORBA_FixedDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::FixedDef::_nil ());
+          CORBA_FixedDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::FixedDef (stub, 0, obj->_servant ()), CORBA::FixedDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_FixedDef (stub, 0, obj->_servant ()), CORBA_FixedDef::_nil ());
         return default_proxy;
       }
     else 
@@ -2146,15 +1370,15 @@ CORBA::FixedDef_ptr CORBA::FixedDef::_unchecked_narrow (
           );
 }
 
-CORBA::FixedDef_ptr
-CORBA::FixedDef::_duplicate (CORBA::FixedDef_ptr obj)
+CORBA_FixedDef_ptr
+CORBA_FixedDef::_duplicate (CORBA_FixedDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::FixedDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_FixedDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/FixedDef:1.0")) ||
@@ -2166,34 +1390,34 @@ CORBA::Boolean CORBA::FixedDef::_is_a (const CORBA::Char *value, CORBA::Environm
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::FixedDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_FixedDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_FixedDef::_narrow))
+      &CORBA_FixedDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -2206,20 +1430,20 @@ void *CORBA::FixedDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::FixedDef::_interface_repository_id (void) const
+const char* CORBA_FixedDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/FixedDef:1.0";
 }
 
-CORBA::UShort CORBA::FixedDef::digits (
+CORBA::UShort CORBA_FixedDef::digits (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_FixedDef_Proxy_Impl &proxy = 
-    this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_FixedDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.digits (
@@ -2228,7 +1452,7 @@ CORBA::UShort CORBA::FixedDef::digits (
     );
 }
 
-void CORBA::FixedDef::digits (
+void CORBA_FixedDef::digits (
     CORBA::UShort digits,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2236,8 +1460,8 @@ void CORBA::FixedDef::digits (
     CORBA::SystemException
   ))
 {
-  _TAO_FixedDef_Proxy_Impl &proxy = 
-    this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_FixedDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.digits (
@@ -2247,15 +1471,15 @@ void CORBA::FixedDef::digits (
     );
 }
 
-CORBA::Short CORBA::FixedDef::scale (
+CORBA::Short CORBA_FixedDef::scale (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_FixedDef_Proxy_Impl &proxy = 
-    this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_FixedDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.scale (
@@ -2264,7 +1488,7 @@ CORBA::Short CORBA::FixedDef::scale (
     );
 }
 
-void CORBA::FixedDef::scale (
+void CORBA_FixedDef::scale (
     CORBA::Short scale,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2272,8 +1496,8 @@ void CORBA::FixedDef::scale (
     CORBA::SystemException
   ))
 {
-  _TAO_FixedDef_Proxy_Impl &proxy = 
-    this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_FixedDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.scale (
@@ -2283,8 +1507,7 @@ void CORBA::FixedDef::scale (
     );
 }
 
-
-void CORBA::ValueMember::_tao_any_destructor (void *x)
+void CORBA_ValueMember::_tao_any_destructor (void *x)
 {
   CORBA_ValueMember *tmp = ACE_static_cast (CORBA_ValueMember*,x);
   delete tmp;
@@ -2299,12 +1522,12 @@ void CORBA::ValueMember::_tao_any_destructor (void *x)
   void
   _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_allocate_buffer (CORBA::ULong length)
   {
-    CORBA::ValueMember* tmp = 0;
+    CORBA_ValueMember* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (length);
     
     if (this->buffer_ != 0)
     {
-      CORBA::ValueMember *old = ACE_reinterpret_cast (CORBA::ValueMember *,this->buffer_);
+      CORBA_ValueMember *old = ACE_reinterpret_cast (CORBA_ValueMember *,this->buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
@@ -2322,7 +1545,7 @@ void CORBA::ValueMember::_tao_any_destructor (void *x)
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     
-    CORBA::ValueMember *tmp = ACE_reinterpret_cast (CORBA::ValueMember *,this->buffer_);
+    CORBA_ValueMember *tmp = ACE_reinterpret_cast (CORBA_ValueMember *,this->buffer_);
     
     _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (tmp);
     this->buffer_ = 0;
@@ -2353,16 +1576,16 @@ CORBA_ValueMemberSeq::CORBA_ValueMemberSeq (CORBA::ULong max) // uses max size
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ValueMember>
+  TAO_Unbounded_Sequence<CORBA_ValueMember>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
-CORBA_ValueMemberSeq::CORBA_ValueMemberSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ValueMember *buffer, CORBA::Boolean release)
+CORBA_ValueMemberSeq::CORBA_ValueMemberSeq (CORBA::ULong max, CORBA::ULong length, CORBA_ValueMember *buffer, CORBA::Boolean release)
   : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ValueMember>
+  TAO_Unbounded_Sequence<CORBA_ValueMember>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
@@ -2371,7 +1594,7 @@ CORBA_ValueMemberSeq::CORBA_ValueMemberSeq (const CORBA_ValueMemberSeq &seq) //
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ValueMember>
+  TAO_Unbounded_Sequence<CORBA_ValueMember>
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
@@ -2386,6 +1609,189 @@ void CORBA_ValueMemberSeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
+// *************************************************************
+// Operations for class CORBA_ValueMemberDef_var
+// *************************************************************
+
+CORBA_ValueMemberDef_var::CORBA_ValueMemberDef_var (void) // default constructor
+  : ptr_ (CORBA_ValueMemberDef::_nil ())
+{}
+
+::CORBA_ValueMemberDef_ptr
+CORBA_ValueMemberDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_ValueMemberDef_var::CORBA_ValueMemberDef_var (const ::CORBA_ValueMemberDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_ValueMemberDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_ValueMemberDef_var::~CORBA_ValueMemberDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_ValueMemberDef_var &
+CORBA_ValueMemberDef_var::operator= (CORBA_ValueMemberDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_ValueMemberDef_var &
+CORBA_ValueMemberDef_var::operator= (const ::CORBA_ValueMemberDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_ValueMemberDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_ValueMemberDef_var::operator const ::CORBA_ValueMemberDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_ValueMemberDef_var::operator ::CORBA_ValueMemberDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueMemberDef_ptr
+CORBA_ValueMemberDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueMemberDef_ptr
+CORBA_ValueMemberDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueMemberDef_ptr &
+CORBA_ValueMemberDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueMemberDef_ptr &
+CORBA_ValueMemberDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_ValueMemberDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_ValueMemberDef_ptr
+CORBA_ValueMemberDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_ValueMemberDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_ValueMemberDef::_nil ();
+  return val;
+}
+
+::CORBA_ValueMemberDef_ptr
+CORBA_ValueMemberDef_var::duplicate (CORBA_ValueMemberDef_ptr p)
+{
+  return ::CORBA_ValueMemberDef::_duplicate (p);
+}
+
+void
+CORBA_ValueMemberDef_var::release (CORBA_ValueMemberDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_ValueMemberDef_ptr
+CORBA_ValueMemberDef_var::nil (void)
+{
+  return ::CORBA_ValueMemberDef::_nil ();
+}
+
+::CORBA_ValueMemberDef_ptr
+CORBA_ValueMemberDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_ValueMemberDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_ValueMemberDef_var::upcast (void *src)
+{
+  CORBA_ValueMemberDef **tmp =
+    ACE_static_cast (CORBA_ValueMemberDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_ValueMemberDef_out
+// *************************************************************
+
+CORBA_ValueMemberDef_out::CORBA_ValueMemberDef_out (CORBA_ValueMemberDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_ValueMemberDef::_nil ();
+}
+
+CORBA_ValueMemberDef_out::CORBA_ValueMemberDef_out (CORBA_ValueMemberDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_ValueMemberDef::_nil ();
+}
+
+CORBA_ValueMemberDef_out::CORBA_ValueMemberDef_out (const ::CORBA_ValueMemberDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_ValueMemberDef_out &, p).ptr_)
+{}
+
+::CORBA_ValueMemberDef_out &
+CORBA_ValueMemberDef_out::operator= (const ::CORBA_ValueMemberDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_ValueMemberDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_ValueMemberDef_out &
+CORBA_ValueMemberDef_out::operator= (const ::CORBA_ValueMemberDef_var &p)
+{
+  this->ptr_ = ::CORBA_ValueMemberDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_ValueMemberDef_out &
+CORBA_ValueMemberDef_out::operator= (CORBA_ValueMemberDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_ValueMemberDef_out::operator ::CORBA_ValueMemberDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueMemberDef_ptr &
+CORBA_ValueMemberDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueMemberDef_ptr
+CORBA_ValueMemberDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_get : public TAO_ClientRequestInfo
 {
@@ -2508,13 +1914,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get &);
 
-  CORBA::IDLType_ptr _result;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get (
@@ -2567,7 +1973,7 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA::Environm
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA::IDLType_ptr result)
+TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA_IDLType_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -2579,7 +1985,7 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -2606,14 +2012,14 @@ private:
   TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set &);
 
-  CORBA::IDLType_ptr type_def_;
+  CORBA_IDLType_ptr type_def_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ClientRequestInfo_CORBA_ValueMemberDef_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::IDLType_ptr type_def,
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -2857,15 +2263,15 @@ TAO_ClientRequestInfo_CORBA_ValueMemberDef_access_set::result (CORBA::Environmen
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_ValueMemberDef_Proxy_Impl::_TAO_ValueMemberDef_Proxy_Impl (void)
+_TAO_CORBA_ValueMemberDef_Proxy_Impl::_TAO_CORBA_ValueMemberDef_Proxy_Impl (void)
 {}
 
-_TAO_ValueMemberDef_Remote_Proxy_Impl::_TAO_ValueMemberDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::_TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::TypeCode_ptr _TAO_ValueMemberDef_Remote_Proxy_Impl::type (
+CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3025,7 +2431,7 @@ CORBA::TypeCode_ptr _TAO_ValueMemberDef_Remote_Proxy_Impl::type (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::IDLType_ptr _TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
+CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3034,8 +2440,8 @@ CORBA::IDLType_ptr _TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
   ))
 {
   
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  CORBA::IDLType_var _tao_safe_retval (_tao_retval);
+  CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
+  CORBA_IDLType_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -3119,7 +2525,7 @@ CORBA::IDLType_ptr _TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -3185,9 +2591,9 @@ CORBA::IDLType_ptr _TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
+void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr type_def,
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -3337,7 +2743,7 @@ void _TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
   
 }
 
-CORBA::Visibility _TAO_ValueMemberDef_Remote_Proxy_Impl::access (
+CORBA::Visibility _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3495,7 +2901,7 @@ CORBA::Visibility _TAO_ValueMemberDef_Remote_Proxy_Impl::access (
   return _tao_retval;
 }
 
-void _TAO_ValueMemberDef_Remote_Proxy_Impl::access (
+void _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl::access (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Visibility access,
     CORBA::Environment &ACE_TRY_ENV
@@ -3657,36 +3063,36 @@ void _TAO_ValueMemberDef_Remote_Proxy_Impl::access (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_ValueMemberDef_Proxy_Broker::_TAO_ValueMemberDef_Proxy_Broker (void)
+_TAO_CORBA_ValueMemberDef_Proxy_Broker::_TAO_CORBA_ValueMemberDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ValueMemberDef_Proxy_Broker::~_TAO_ValueMemberDef_Proxy_Broker (void)
+_TAO_CORBA_ValueMemberDef_Proxy_Broker::~_TAO_CORBA_ValueMemberDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ValueMemberDef_Proxy_Broker * (*CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_ValueMemberDef_Proxy_Broker * (*_TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_ValueMemberDef_Remote_Proxy_Broker *
-_TAO_ValueMemberDef_Remote_Proxy_Broker::the_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker *
+_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker::the_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_ValueMemberDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_ValueMemberDef_Remote_Proxy_Broker::_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker::_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_ValueMemberDef_Remote_Proxy_Broker::~_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker::~_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_ValueMemberDef_Proxy_Impl&
-_TAO_ValueMemberDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_ValueMemberDef_Proxy_Impl&
+_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_ValueMemberDef *,
   CORBA::Environment &
 )
@@ -3711,72 +3117,72 @@ CORBA_ValueMemberDef::~CORBA_ValueMemberDef (void)
 {}
 
 void
-CORBA::ValueMemberDef::CORBA_ValueMemberDef_setup_collocation (int collocated)
+CORBA_ValueMemberDef::CORBA_ValueMemberDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_ValueMemberDef_Proxy_Broker_ =
-      ::CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_ =
+      ::_TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_ValueMemberDef_Proxy_Broker_ =
-      ::_TAO_ValueMemberDef_Remote_Proxy_Broker::the_TAO_ValueMemberDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_ =
+      ::_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker::the_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker ();
   
   this->CORBA_Contained_setup_collocation (collocated);
 }
 
-void CORBA::ValueMemberDef::_tao_any_destructor (void *x)
+void CORBA_ValueMemberDef::_tao_any_destructor (void *x)
 {
   CORBA_ValueMemberDef *tmp = ACE_static_cast (CORBA_ValueMemberDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::ValueMemberDef_ptr CORBA::ValueMemberDef::_narrow (
+CORBA_ValueMemberDef_ptr CORBA_ValueMemberDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::ValueMemberDef::_nil ();
+    return CORBA_ValueMemberDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueMemberDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::ValueMemberDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_ValueMemberDef::_nil ());
       if (is_a == 0)
-        return CORBA::ValueMemberDef::_nil ();
+        return CORBA_ValueMemberDef::_nil ();
     }
-  return CORBA::ValueMemberDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_ValueMemberDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::ValueMemberDef_ptr CORBA::ValueMemberDef::_unchecked_narrow (
+CORBA_ValueMemberDef_ptr CORBA_ValueMemberDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::ValueMemberDef::_nil ();
+    return CORBA_ValueMemberDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::ValueMemberDef_ptr default_proxy = CORBA::ValueMemberDef::_nil ();
+      CORBA_ValueMemberDef_ptr default_proxy = CORBA_ValueMemberDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::ValueMemberDef (
+          ::CORBA_ValueMemberDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::ValueMemberDef::_nil ());
+          CORBA_ValueMemberDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::ValueMemberDef (stub, 0, obj->_servant ()), CORBA::ValueMemberDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_ValueMemberDef (stub, 0, obj->_servant ()), CORBA_ValueMemberDef::_nil ());
         return default_proxy;
       }
     else 
@@ -3795,15 +3201,15 @@ CORBA::ValueMemberDef_ptr CORBA::ValueMemberDef::_unchecked_narrow (
           );
 }
 
-CORBA::ValueMemberDef_ptr
-CORBA::ValueMemberDef::_duplicate (CORBA::ValueMemberDef_ptr obj)
+CORBA_ValueMemberDef_ptr
+CORBA_ValueMemberDef::_duplicate (CORBA_ValueMemberDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::ValueMemberDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_ValueMemberDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueMemberDef:1.0")) ||
@@ -3815,34 +3221,34 @@ CORBA::Boolean CORBA::ValueMemberDef::_is_a (const CORBA::Char *value, CORBA::En
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::ValueMemberDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_ValueMemberDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_ValueMemberDef::_narrow))
+      &CORBA_ValueMemberDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -3855,20 +3261,20 @@ void *CORBA::ValueMemberDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::ValueMemberDef::_interface_repository_id (void) const
+const char* CORBA_ValueMemberDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/ValueMemberDef:1.0";
 }
 
-CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
+CORBA::TypeCode_ptr CORBA_ValueMemberDef::type (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueMemberDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.type (
@@ -3877,15 +3283,15 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
     );
 }
 
-CORBA::IDLType_ptr CORBA::ValueMemberDef::type_def (
+CORBA_IDLType_ptr CORBA_ValueMemberDef::type_def (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueMemberDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.type_def (
@@ -3894,16 +3300,16 @@ CORBA::IDLType_ptr CORBA::ValueMemberDef::type_def (
     );
 }
 
-void CORBA::ValueMemberDef::type_def (
-    CORBA::IDLType_ptr type_def,
+void CORBA_ValueMemberDef::type_def (
+    CORBA_IDLType_ptr type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueMemberDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.type_def (
@@ -3913,15 +3319,15 @@ void CORBA::ValueMemberDef::type_def (
     );
 }
 
-CORBA::Visibility CORBA::ValueMemberDef::access (
+CORBA::Visibility CORBA_ValueMemberDef::access (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueMemberDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.access (
@@ -3930,7 +3336,7 @@ CORBA::Visibility CORBA::ValueMemberDef::access (
     );
 }
 
-void CORBA::ValueMemberDef::access (
+void CORBA_ValueMemberDef::access (
     CORBA::Visibility access,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -3938,8 +3344,8 @@ void CORBA::ValueMemberDef::access (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueMemberDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueMemberDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.access (
@@ -3949,6 +3355,188 @@ void CORBA::ValueMemberDef::access (
     );
 }
 
+// *************************************************************
+// Operations for class CORBA_ValueDef_var
+// *************************************************************
+
+CORBA_ValueDef_var::CORBA_ValueDef_var (void) // default constructor
+  : ptr_ (CORBA_ValueDef::_nil ())
+{}
+
+::CORBA_ValueDef_ptr
+CORBA_ValueDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_ValueDef_var::CORBA_ValueDef_var (const ::CORBA_ValueDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_ValueDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_ValueDef_var::~CORBA_ValueDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_ValueDef_var &
+CORBA_ValueDef_var::operator= (CORBA_ValueDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_ValueDef_var &
+CORBA_ValueDef_var::operator= (const ::CORBA_ValueDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_ValueDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_ValueDef_var::operator const ::CORBA_ValueDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_ValueDef_var::operator ::CORBA_ValueDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueDef_ptr
+CORBA_ValueDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueDef_ptr
+CORBA_ValueDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueDef_ptr &
+CORBA_ValueDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueDef_ptr &
+CORBA_ValueDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_ValueDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_ValueDef_ptr
+CORBA_ValueDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_ValueDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_ValueDef::_nil ();
+  return val;
+}
+
+::CORBA_ValueDef_ptr
+CORBA_ValueDef_var::duplicate (CORBA_ValueDef_ptr p)
+{
+  return ::CORBA_ValueDef::_duplicate (p);
+}
+
+void
+CORBA_ValueDef_var::release (CORBA_ValueDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_ValueDef_ptr
+CORBA_ValueDef_var::nil (void)
+{
+  return ::CORBA_ValueDef::_nil ();
+}
+
+::CORBA_ValueDef_ptr
+CORBA_ValueDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_ValueDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_ValueDef_var::upcast (void *src)
+{
+  CORBA_ValueDef **tmp =
+    ACE_static_cast (CORBA_ValueDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_ValueDef_out
+// *************************************************************
+
+CORBA_ValueDef_out::CORBA_ValueDef_out (CORBA_ValueDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_ValueDef::_nil ();
+}
+
+CORBA_ValueDef_out::CORBA_ValueDef_out (CORBA_ValueDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_ValueDef::_nil ();
+}
+
+CORBA_ValueDef_out::CORBA_ValueDef_out (const ::CORBA_ValueDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_ValueDef_out &, p).ptr_)
+{}
+
+::CORBA_ValueDef_out &
+CORBA_ValueDef_out::operator= (const ::CORBA_ValueDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_ValueDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_ValueDef_out &
+CORBA_ValueDef_out::operator= (const ::CORBA_ValueDef_var &p)
+{
+  this->ptr_ = ::CORBA_ValueDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_ValueDef_out &
+CORBA_ValueDef_out::operator= (CORBA_ValueDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_ValueDef_out::operator ::CORBA_ValueDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueDef_ptr &
+CORBA_ValueDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueDef_ptr
+CORBA_ValueDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get : public TAO_ClientRequestInfo
@@ -3979,13 +3567,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::InterfaceDefSeq * result);
+  void result (CORBA_InterfaceDefSeq * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get (const TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get &);
 
-  CORBA::InterfaceDefSeq * _result;
+  CORBA_InterfaceDefSeq * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get (
@@ -4038,7 +3626,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA::En
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA::InterfaceDefSeq * result)
+TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA_InterfaceDefSeq * result)
 {
   // update the result 
   this->_result = result;
@@ -4050,7 +3638,7 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -4077,14 +3665,14 @@ private:
   TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set (const TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set &);
 
-  const CORBA::InterfaceDefSeq & supported_interfaces_;
+  const CORBA_InterfaceDefSeq & supported_interfaces_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ClientRequestInfo_CORBA_ValueDef_supported_interfaces_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -4165,13 +3753,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::InitializerSeq * result);
+  void result (CORBA_InitializerSeq * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get (const TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get &);
 
-  CORBA::InitializerSeq * _result;
+  CORBA_InitializerSeq * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get (
@@ -4224,7 +3812,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA::Environmen
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA::InitializerSeq * result)
+TAO_ClientRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA_InitializerSeq * result)
 {
   // update the result 
   this->_result = result;
@@ -4236,7 +3824,7 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -4263,14 +3851,14 @@ private:
   TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set (const TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set &);
 
-  const CORBA::InitializerSeq & initializers_;
+  const CORBA_InitializerSeq & initializers_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set::TAO_ClientRequestInfo_CORBA_ValueDef_initializers_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -4351,13 +3939,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ValueDef_ptr result);
+  void result (CORBA_ValueDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get (const TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get &);
 
-  CORBA::ValueDef_ptr _result;
+  CORBA_ValueDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get (
@@ -4410,7 +3998,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA::Environment
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA::ValueDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA_ValueDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -4422,7 +4010,7 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::ValueDef_ptr base_value,
+      CORBA_ValueDef_ptr base_value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -4449,14 +4037,14 @@ private:
   TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set (const TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set &);
 
-  CORBA::ValueDef_ptr base_value_;
+  CORBA_ValueDef_ptr base_value_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set::TAO_ClientRequestInfo_CORBA_ValueDef_base_value_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::ValueDef_ptr base_value,
+    CORBA_ValueDef_ptr base_value,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -4537,13 +4125,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ValueDefSeq * result);
+  void result (CORBA_ValueDefSeq * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get (const TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get &);
 
-  CORBA::ValueDefSeq * _result;
+  CORBA_ValueDefSeq * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get (
@@ -4596,7 +4184,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA::En
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA::ValueDefSeq * result)
+TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA_ValueDefSeq * result)
 {
   // update the result 
   this->_result = result;
@@ -4608,7 +4196,7 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      const CORBA::ValueDefSeq & abstract_base_values,
+      const CORBA_ValueDefSeq & abstract_base_values,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -4635,14 +4223,14 @@ private:
   TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set (const TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set &);
 
-  const CORBA::ValueDefSeq & abstract_base_values_;
+  const CORBA_ValueDefSeq & abstract_base_values_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ClientRequestInfo_CORBA_ValueDef_abstract_base_values_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::ValueDefSeq & abstract_base_values,
+    const CORBA_ValueDefSeq & abstract_base_values,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -5382,13 +4970,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ValueDef::FullValueDescription * result);
+  void result (CORBA_ValueDef::FullValueDescription * result);
 
 private:
   TAO_ClientRequestInfo_CORBA_ValueDef_describe_value (const TAO_ClientRequestInfo_CORBA_ValueDef_describe_value &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueDef_describe_value &);
 
-  CORBA::ValueDef::FullValueDescription * _result;
+  CORBA_ValueDef::FullValueDescription * _result;
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::TAO_ClientRequestInfo_CORBA_ValueDef_describe_value (
@@ -5441,7 +5029,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (CORBA::Environment
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (CORBA::ValueDef::FullValueDescription * result)
+TAO_ClientRequestInfo_CORBA_ValueDef_describe_value::result (CORBA_ValueDef::FullValueDescription * result)
 {
   // update the result 
   this->_result = result;
@@ -5456,7 +5044,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       const CORBA::Visibility & access,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -5480,7 +5068,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::ValueMemberDef_ptr result);
+  void result (CORBA_ValueMemberDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member (const TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member &);
@@ -5489,9 +5077,9 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr type_;
+  CORBA_IDLType_ptr type_;
   const CORBA::Visibility & access_;
-  CORBA::ValueMemberDef_ptr _result;
+  CORBA_ValueMemberDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member (
@@ -5500,7 +5088,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::TAO_ClientRequestInfo_
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     const CORBA::Visibility & access,
     CORBA::Environment &    
   )
@@ -5582,7 +5170,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA::Environ
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA::ValueMemberDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA_ValueMemberDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -5597,7 +5185,7 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode & mode,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -5621,7 +5209,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::AttributeDef_ptr result);
+  void result (CORBA_AttributeDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute (const TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute &);
@@ -5630,9 +5218,9 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr type_;
+  CORBA_IDLType_ptr type_;
   const CORBA::AttributeMode & mode_;
-  CORBA::AttributeDef_ptr _result;
+  CORBA_AttributeDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute (
@@ -5641,7 +5229,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::TAO_ClientRequestInfo_COR
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode & mode,
     CORBA::Environment &    
   )
@@ -5724,7 +5312,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA::Environmen
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA::AttributeDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA_AttributeDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -5739,11 +5327,11 @@ public:
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode & mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -5766,7 +5354,7 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::OperationDef_ptr result);
+  void result (CORBA_OperationDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_ValueDef_create_operation (const TAO_ClientRequestInfo_CORBA_ValueDef_create_operation &);
@@ -5775,12 +5363,12 @@ private:
   const char * id_;
   const char * name_;
   const char * version_;
-  CORBA::IDLType_ptr result_;
+  CORBA_IDLType_ptr result_;
   const CORBA::OperationMode & mode_;
-  const CORBA::ParDescriptionSeq & params_;
-  const CORBA::ExceptionDefSeq & exceptions_;
-  const CORBA::ContextIdSeq & contexts_;
-  CORBA::OperationDef_ptr _result;
+  const CORBA_ParDescriptionSeq & params_;
+  const CORBA_ExceptionDefSeq & exceptions_;
+  const CORBA_ContextIdSeq & contexts_;
+  CORBA_OperationDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::TAO_ClientRequestInfo_CORBA_ValueDef_create_operation (
@@ -5789,11 +5377,11 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::TAO_ClientRequestInfo_COR
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode & mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -5896,7 +5484,7 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (CORBA::Environmen
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (CORBA::OperationDef_ptr result)
+TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (CORBA_OperationDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -5908,15 +5496,15 @@ TAO_ClientRequestInfo_CORBA_ValueDef_create_operation::result (CORBA::OperationD
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_ValueDef_Proxy_Impl::_TAO_ValueDef_Proxy_Impl (void)
+_TAO_CORBA_ValueDef_Proxy_Impl::_TAO_CORBA_ValueDef_Proxy_Impl (void)
 {}
 
-_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_ValueDef_Remote_Proxy_Impl::_TAO_CORBA_ValueDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::InterfaceDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
+CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -5925,7 +5513,7 @@ CORBA::InterfaceDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
   ))
 {
   
-  CORBA::InterfaceDefSeq *_tao_retval = 0;
+  CORBA_InterfaceDefSeq *_tao_retval = 0;
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -5933,8 +5521,8 @@ CORBA::InterfaceDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::InterfaceDefSeq, _tao_retval);
-  CORBA::InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_InterfaceDefSeq, _tao_retval);
+  CORBA_InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_supported_interfaces",
@@ -6011,7 +5599,7 @@ CORBA::InterfaceDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -6077,9 +5665,9 @@ CORBA::InterfaceDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
+void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::InterfaceDefSeq & supported_interfaces,
+    const CORBA_InterfaceDefSeq & supported_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6229,7 +5817,7 @@ void _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
   
 }
 
-CORBA::InitializerSeq * _TAO_ValueDef_Remote_Proxy_Impl::initializers (
+CORBA_InitializerSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6238,7 +5826,7 @@ CORBA::InitializerSeq * _TAO_ValueDef_Remote_Proxy_Impl::initializers (
   ))
 {
   
-  CORBA::InitializerSeq *_tao_retval = 0;
+  CORBA_InitializerSeq *_tao_retval = 0;
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -6246,8 +5834,8 @@ CORBA::InitializerSeq * _TAO_ValueDef_Remote_Proxy_Impl::initializers (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::InitializerSeq, _tao_retval);
-  CORBA::InitializerSeq_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_InitializerSeq, _tao_retval);
+  CORBA_InitializerSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_initializers",
@@ -6324,7 +5912,7 @@ CORBA::InitializerSeq * _TAO_ValueDef_Remote_Proxy_Impl::initializers (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::InitializerSeq * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_InitializerSeq * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -6390,9 +5978,9 @@ CORBA::InitializerSeq * _TAO_ValueDef_Remote_Proxy_Impl::initializers (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_ValueDef_Remote_Proxy_Impl::initializers (
+void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::initializers (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::InitializerSeq & initializers,
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6542,7 +6130,7 @@ void _TAO_ValueDef_Remote_Proxy_Impl::initializers (
   
 }
 
-CORBA::ValueDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::base_value (
+CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6551,8 +6139,8 @@ CORBA::ValueDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::base_value (
   ))
 {
   
-  CORBA::ValueDef_ptr _tao_retval = CORBA::ValueDef::_nil ();
-  CORBA::ValueDef_var _tao_safe_retval (_tao_retval);
+  CORBA_ValueDef_ptr _tao_retval = CORBA_ValueDef::_nil ();
+  CORBA_ValueDef_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -6636,7 +6224,7 @@ CORBA::ValueDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::base_value (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -6702,9 +6290,9 @@ CORBA::ValueDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::base_value (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_ValueDef_Remote_Proxy_Impl::base_value (
+void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::base_value (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::ValueDef_ptr base_value,
+    CORBA_ValueDef_ptr base_value,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -6854,7 +6442,7 @@ void _TAO_ValueDef_Remote_Proxy_Impl::base_value (
   
 }
 
-CORBA::ValueDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
+CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -6863,7 +6451,7 @@ CORBA::ValueDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
   ))
 {
   
-  CORBA::ValueDefSeq *_tao_retval = 0;
+  CORBA_ValueDefSeq *_tao_retval = 0;
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -6871,8 +6459,8 @@ CORBA::ValueDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::ValueDefSeq, _tao_retval);
-  CORBA::ValueDefSeq_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_ValueDefSeq, _tao_retval);
+  CORBA_ValueDefSeq_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "_get_abstract_base_values",
@@ -6949,7 +6537,7 @@ CORBA::ValueDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::ValueDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_ValueDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -7015,9 +6603,9 @@ CORBA::ValueDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
+void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::abstract_base_values (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::ValueDefSeq & abstract_base_values,
+    const CORBA_ValueDefSeq & abstract_base_values,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -7167,7 +6755,7 @@ void _TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
   
 }
 
-CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
+CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7325,7 +6913,7 @@ CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
   return _tao_retval;
 }
 
-void _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
+void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_abstract (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Boolean is_abstract,
     CORBA::Environment &ACE_TRY_ENV
@@ -7477,7 +7065,7 @@ void _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
   
 }
 
-CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
+CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7635,7 +7223,7 @@ CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
   return _tao_retval;
 }
 
-void _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
+void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_custom (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Boolean is_custom,
     CORBA::Environment &ACE_TRY_ENV
@@ -7787,7 +7375,7 @@ void _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
   
 }
 
-CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
+CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -7945,7 +7533,7 @@ CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
   return _tao_retval;
 }
 
-void _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
+void _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_truncatable (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Boolean is_truncatable,
     CORBA::Environment &ACE_TRY_ENV
@@ -8097,7 +7685,7 @@ void _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
   
 }
 
-CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_a (
+CORBA::Boolean _TAO_CORBA_ValueDef_Remote_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
@@ -8267,7 +7855,7 @@ CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_a (
   return _tao_retval;
 }
 
-CORBA::ValueDef::FullValueDescription * _TAO_ValueDef_Remote_Proxy_Impl::describe_value (
+CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_Remote_Proxy_Impl::describe_value (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8276,15 +7864,15 @@ CORBA::ValueDef::FullValueDescription * _TAO_ValueDef_Remote_Proxy_Impl::describ
   ))
 {
   
-  CORBA::ValueDef::FullValueDescription *_tao_retval = 0;
+  CORBA_ValueDef::FullValueDescription *_tao_retval = 0;
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
   
-  ACE_NEW_RETURN (_tao_retval, CORBA::ValueDef::FullValueDescription, _tao_retval);
-  CORBA::ValueDef::FullValueDescription_var _tao_safe_retval (_tao_retval);
+  ACE_NEW_RETURN (_tao_retval, CORBA_ValueDef::FullValueDescription, _tao_retval);
+  CORBA_ValueDef::FullValueDescription_var _tao_safe_retval (_tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "describe_value",
@@ -8361,7 +7949,7 @@ CORBA::ValueDef::FullValueDescription * _TAO_ValueDef_Remote_Proxy_Impl::describ
             }
           
           TAO_INTERCEPTOR (
-              CORBA::ValueDef::FullValueDescription * _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_ValueDef::FullValueDescription * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -8427,12 +8015,12 @@ CORBA::ValueDef::FullValueDescription * _TAO_ValueDef_Remote_Proxy_Impl::describ
   return _tao_safe_retval._retn ();
 }
 
-CORBA::ValueMemberDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_value_member (
+CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_value_member (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::Visibility access,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8441,8 +8029,8 @@ CORBA::ValueMemberDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_value_member (
   ))
 {
   
-  CORBA::ValueMemberDef_ptr _tao_retval = CORBA::ValueMemberDef::_nil ();
-  CORBA::ValueMemberDef_var _tao_safe_retval (_tao_retval);
+  CORBA_ValueMemberDef_ptr _tao_retval = CORBA_ValueMemberDef::_nil ();
+  CORBA_ValueMemberDef_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -8545,7 +8133,7 @@ CORBA::ValueMemberDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_value_member (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::ValueMemberDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_ValueMemberDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -8611,12 +8199,12 @@ CORBA::ValueMemberDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_value_member (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::AttributeDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_attribute (
+CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_attribute (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -8625,8 +8213,8 @@ CORBA::AttributeDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_attribute (
   ))
 {
   
-  CORBA::AttributeDef_ptr _tao_retval = CORBA::AttributeDef::_nil ();
-  CORBA::AttributeDef_var _tao_safe_retval (_tao_retval);
+  CORBA_AttributeDef_ptr _tao_retval = CORBA_AttributeDef::_nil ();
+  CORBA_AttributeDef_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -8729,7 +8317,7 @@ CORBA::AttributeDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_attribute (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -8795,16 +8383,16 @@ CORBA::AttributeDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_attribute (
   return _tao_safe_retval._retn ();
 }
 
-CORBA::OperationDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_operation (
+CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_Remote_Proxy_Impl::create_operation (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -8812,8 +8400,8 @@ CORBA::OperationDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_operation (
   ))
 {
   
-  CORBA::OperationDef_ptr _tao_retval = CORBA::OperationDef::_nil ();
-  CORBA::OperationDef_var _tao_safe_retval (_tao_retval);
+  CORBA_OperationDef_ptr _tao_retval = CORBA_OperationDef::_nil ();
+  CORBA_OperationDef_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -8922,7 +8510,7 @@ CORBA::OperationDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_operation (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -8998,36 +8586,36 @@ CORBA::OperationDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_operation (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_ValueDef_Proxy_Broker::_TAO_ValueDef_Proxy_Broker (void)
+_TAO_CORBA_ValueDef_Proxy_Broker::_TAO_CORBA_ValueDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ValueDef_Proxy_Broker::~_TAO_ValueDef_Proxy_Broker (void)
+_TAO_CORBA_ValueDef_Proxy_Broker::~_TAO_CORBA_ValueDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ValueDef_Proxy_Broker * (*CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_ValueDef_Proxy_Broker * (*_TAO_CORBA_ValueDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_ValueDef_Remote_Proxy_Broker *
-_TAO_ValueDef_Remote_Proxy_Broker::the_TAO_ValueDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ValueDef_Remote_Proxy_Broker *
+_TAO_CORBA_ValueDef_Remote_Proxy_Broker::the_TAO_CORBA_ValueDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_ValueDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_ValueDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_ValueDef_Remote_Proxy_Broker::_TAO_ValueDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ValueDef_Remote_Proxy_Broker::_TAO_CORBA_ValueDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_ValueDef_Remote_Proxy_Broker::~_TAO_ValueDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ValueDef_Remote_Proxy_Broker::~_TAO_CORBA_ValueDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_ValueDef_Proxy_Impl&
-_TAO_ValueDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_ValueDef_Proxy_Impl&
+_TAO_CORBA_ValueDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_ValueDef *,
   CORBA::Environment &
 )
@@ -9052,14 +8640,14 @@ CORBA_ValueDef::~CORBA_ValueDef (void)
 {}
 
 void
-CORBA::ValueDef::CORBA_ValueDef_setup_collocation (int collocated)
+CORBA_ValueDef::CORBA_ValueDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_ValueDef_Proxy_Broker_ =
-      ::CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_ =
+      ::_TAO_CORBA_ValueDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_ValueDef_Proxy_Broker_ =
-      ::_TAO_ValueDef_Remote_Proxy_Broker::the_TAO_ValueDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_ =
+      ::_TAO_CORBA_ValueDef_Remote_Proxy_Broker::the_TAO_CORBA_ValueDef_Remote_Proxy_Broker ();
   
   this->CORBA_Container_setup_collocation (collocated);
   
@@ -9068,60 +8656,60 @@ CORBA::ValueDef::CORBA_ValueDef_setup_collocation (int collocated)
   this->CORBA_IDLType_setup_collocation (collocated);
 }
 
-void CORBA::ValueDef::_tao_any_destructor (void *x)
+void CORBA_ValueDef::_tao_any_destructor (void *x)
 {
   CORBA_ValueDef *tmp = ACE_static_cast (CORBA_ValueDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::ValueDef_ptr CORBA::ValueDef::_narrow (
+CORBA_ValueDef_ptr CORBA_ValueDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::ValueDef::_nil ();
+    return CORBA_ValueDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::ValueDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_ValueDef::_nil ());
       if (is_a == 0)
-        return CORBA::ValueDef::_nil ();
+        return CORBA_ValueDef::_nil ();
     }
-  return CORBA::ValueDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_ValueDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::ValueDef_ptr CORBA::ValueDef::_unchecked_narrow (
+CORBA_ValueDef_ptr CORBA_ValueDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::ValueDef::_nil ();
+    return CORBA_ValueDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::ValueDef_ptr default_proxy = CORBA::ValueDef::_nil ();
+      CORBA_ValueDef_ptr default_proxy = CORBA_ValueDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_ValueDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::ValueDef (
+          ::CORBA_ValueDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::ValueDef::_nil ());
+          CORBA_ValueDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::ValueDef (stub, 0, obj->_servant ()), CORBA::ValueDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_ValueDef (stub, 0, obj->_servant ()), CORBA_ValueDef::_nil ());
         return default_proxy;
       }
     else 
@@ -9140,15 +8728,15 @@ CORBA::ValueDef_ptr CORBA::ValueDef::_unchecked_narrow (
           );
 }
 
-CORBA::ValueDef_ptr
-CORBA::ValueDef::_duplicate (CORBA::ValueDef_ptr obj)
+CORBA_ValueDef_ptr
+CORBA_ValueDef::_duplicate (CORBA_ValueDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::ValueDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_ValueDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueDef:1.0")) ||
@@ -9162,58 +8750,58 @@ CORBA::Boolean CORBA::ValueDef::_is_a (const CORBA::Char *value, CORBA::Environm
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::ValueDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_ValueDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_ValueDef::_narrow))
+      &CORBA_ValueDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Container::_narrow))
+      &CORBA_Container::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Container_ptr,
+            CORBA_Container_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -9226,20 +8814,20 @@ void *CORBA::ValueDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::ValueDef::_interface_repository_id (void) const
+const char* CORBA_ValueDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/ValueDef:1.0";
 }
 
-CORBA::InterfaceDefSeq * CORBA::ValueDef::supported_interfaces (
+CORBA_InterfaceDefSeq * CORBA_ValueDef::supported_interfaces (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.supported_interfaces (
@@ -9248,16 +8836,16 @@ CORBA::InterfaceDefSeq * CORBA::ValueDef::supported_interfaces (
     );
 }
 
-void CORBA::ValueDef::supported_interfaces (
-    const CORBA::InterfaceDefSeq & supported_interfaces,
+void CORBA_ValueDef::supported_interfaces (
+    const CORBA_InterfaceDefSeq & supported_interfaces,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.supported_interfaces (
@@ -9267,15 +8855,15 @@ void CORBA::ValueDef::supported_interfaces (
     );
 }
 
-CORBA::InitializerSeq * CORBA::ValueDef::initializers (
+CORBA_InitializerSeq * CORBA_ValueDef::initializers (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.initializers (
@@ -9284,16 +8872,16 @@ CORBA::InitializerSeq * CORBA::ValueDef::initializers (
     );
 }
 
-void CORBA::ValueDef::initializers (
-    const CORBA::InitializerSeq & initializers,
+void CORBA_ValueDef::initializers (
+    const CORBA_InitializerSeq & initializers,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.initializers (
@@ -9303,15 +8891,15 @@ void CORBA::ValueDef::initializers (
     );
 }
 
-CORBA::ValueDef_ptr CORBA::ValueDef::base_value (
+CORBA_ValueDef_ptr CORBA_ValueDef::base_value (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.base_value (
@@ -9320,16 +8908,16 @@ CORBA::ValueDef_ptr CORBA::ValueDef::base_value (
     );
 }
 
-void CORBA::ValueDef::base_value (
-    CORBA::ValueDef_ptr base_value,
+void CORBA_ValueDef::base_value (
+    CORBA_ValueDef_ptr base_value,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.base_value (
@@ -9339,15 +8927,15 @@ void CORBA::ValueDef::base_value (
     );
 }
 
-CORBA::ValueDefSeq * CORBA::ValueDef::abstract_base_values (
+CORBA_ValueDefSeq * CORBA_ValueDef::abstract_base_values (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.abstract_base_values (
@@ -9356,16 +8944,16 @@ CORBA::ValueDefSeq * CORBA::ValueDef::abstract_base_values (
     );
 }
 
-void CORBA::ValueDef::abstract_base_values (
-    const CORBA::ValueDefSeq & abstract_base_values,
+void CORBA_ValueDef::abstract_base_values (
+    const CORBA_ValueDefSeq & abstract_base_values,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.abstract_base_values (
@@ -9375,15 +8963,15 @@ void CORBA::ValueDef::abstract_base_values (
     );
 }
 
-CORBA::Boolean CORBA::ValueDef::is_abstract (
+CORBA::Boolean CORBA_ValueDef::is_abstract (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.is_abstract (
@@ -9392,7 +8980,7 @@ CORBA::Boolean CORBA::ValueDef::is_abstract (
     );
 }
 
-void CORBA::ValueDef::is_abstract (
+void CORBA_ValueDef::is_abstract (
     CORBA::Boolean is_abstract,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -9400,8 +8988,8 @@ void CORBA::ValueDef::is_abstract (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.is_abstract (
@@ -9411,15 +8999,15 @@ void CORBA::ValueDef::is_abstract (
     );
 }
 
-CORBA::Boolean CORBA::ValueDef::is_custom (
+CORBA::Boolean CORBA_ValueDef::is_custom (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.is_custom (
@@ -9428,7 +9016,7 @@ CORBA::Boolean CORBA::ValueDef::is_custom (
     );
 }
 
-void CORBA::ValueDef::is_custom (
+void CORBA_ValueDef::is_custom (
     CORBA::Boolean is_custom,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -9436,8 +9024,8 @@ void CORBA::ValueDef::is_custom (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.is_custom (
@@ -9447,15 +9035,15 @@ void CORBA::ValueDef::is_custom (
     );
 }
 
-CORBA::Boolean CORBA::ValueDef::is_truncatable (
+CORBA::Boolean CORBA_ValueDef::is_truncatable (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.is_truncatable (
@@ -9464,7 +9052,7 @@ CORBA::Boolean CORBA::ValueDef::is_truncatable (
     );
 }
 
-void CORBA::ValueDef::is_truncatable (
+void CORBA_ValueDef::is_truncatable (
     CORBA::Boolean is_truncatable,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -9472,8 +9060,8 @@ void CORBA::ValueDef::is_truncatable (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.is_truncatable (
@@ -9483,7 +9071,7 @@ void CORBA::ValueDef::is_truncatable (
     );
 }
 
-CORBA::Boolean CORBA::ValueDef::is_a (
+CORBA::Boolean CORBA_ValueDef::is_a (
     const char * id,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -9491,8 +9079,8 @@ CORBA::Boolean CORBA::ValueDef::is_a (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.is_a (
@@ -10869,27 +10457,27 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDef_FullValueDescription (
     sizeof (_oc_CORBA_ValueDef_FullValueDescription),
     (char *) &_oc_CORBA_ValueDef_FullValueDescription,
     0,
-    sizeof (CORBA::ValueDef::FullValueDescription)
+    sizeof (CORBA_ValueDef::FullValueDescription)
   );
 
-CORBA::TypeCode_ptr CORBA::ValueDef::_tc_FullValueDescription =
+CORBA::TypeCode_ptr CORBA_ValueDef::_tc_FullValueDescription =
   &_tc_TAO_tc_CORBA_ValueDef_FullValueDescription;
 
-void CORBA::ValueDef::FullValueDescription::_tao_any_destructor (void *x)
+void CORBA_ValueDef::FullValueDescription::_tao_any_destructor (void *x)
 {
   FullValueDescription *tmp = ACE_static_cast (FullValueDescription*,x);
   delete tmp;
 }
 
-CORBA::ValueDef::FullValueDescription * CORBA::ValueDef::describe_value (
+CORBA_ValueDef::FullValueDescription * CORBA_ValueDef::describe_value (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.describe_value (
@@ -10898,11 +10486,11 @@ CORBA::ValueDef::FullValueDescription * CORBA::ValueDef::describe_value (
     );
 }
 
-CORBA::ValueMemberDef_ptr CORBA::ValueDef::create_value_member (
+CORBA_ValueMemberDef_ptr CORBA_ValueDef::create_value_member (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::Visibility access,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -10910,8 +10498,8 @@ CORBA::ValueMemberDef_ptr CORBA::ValueDef::create_value_member (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_value_member (
@@ -10925,11 +10513,11 @@ CORBA::ValueMemberDef_ptr CORBA::ValueDef::create_value_member (
     );
 }
 
-CORBA::AttributeDef_ptr CORBA::ValueDef::create_attribute (
+CORBA_AttributeDef_ptr CORBA_ValueDef::create_attribute (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr type,
+    CORBA_IDLType_ptr type,
     CORBA::AttributeMode mode,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -10937,8 +10525,8 @@ CORBA::AttributeDef_ptr CORBA::ValueDef::create_attribute (
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_attribute (
@@ -10952,23 +10540,23 @@ CORBA::AttributeDef_ptr CORBA::ValueDef::create_attribute (
     );
 }
 
-CORBA::OperationDef_ptr CORBA::ValueDef::create_operation (
+CORBA_OperationDef_ptr CORBA_ValueDef::create_operation (
     const char * id,
     const char * name,
     const char * version,
-    CORBA::IDLType_ptr result,
+    CORBA_IDLType_ptr result,
     CORBA::OperationMode mode,
-    const CORBA::ParDescriptionSeq & params,
-    const CORBA::ExceptionDefSeq & exceptions,
-    const CORBA::ContextIdSeq & contexts,
+    const CORBA_ParDescriptionSeq & params,
+    const CORBA_ExceptionDefSeq & exceptions,
+    const CORBA_ContextIdSeq & contexts,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.create_operation (
@@ -10985,13 +10573,194 @@ CORBA::OperationDef_ptr CORBA::ValueDef::create_operation (
     );
 }
 
-
-void CORBA::ValueDescription::_tao_any_destructor (void *x)
+void CORBA_ValueDescription::_tao_any_destructor (void *x)
 {
   CORBA_ValueDescription *tmp = ACE_static_cast (CORBA_ValueDescription*,x);
   delete tmp;
 }
 
+// *************************************************************
+// Operations for class CORBA_ValueBoxDef_var
+// *************************************************************
+
+CORBA_ValueBoxDef_var::CORBA_ValueBoxDef_var (void) // default constructor
+  : ptr_ (CORBA_ValueBoxDef::_nil ())
+{}
+
+::CORBA_ValueBoxDef_ptr
+CORBA_ValueBoxDef_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_ValueBoxDef_var::CORBA_ValueBoxDef_var (const ::CORBA_ValueBoxDef_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_ValueBoxDef::_duplicate (p.ptr ()))
+{}
+
+CORBA_ValueBoxDef_var::~CORBA_ValueBoxDef_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_ValueBoxDef_var &
+CORBA_ValueBoxDef_var::operator= (CORBA_ValueBoxDef_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_ValueBoxDef_var &
+CORBA_ValueBoxDef_var::operator= (const ::CORBA_ValueBoxDef_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_ValueBoxDef::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_ValueBoxDef_var::operator const ::CORBA_ValueBoxDef_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_ValueBoxDef_var::operator ::CORBA_ValueBoxDef_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueBoxDef_ptr
+CORBA_ValueBoxDef_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueBoxDef_ptr
+CORBA_ValueBoxDef_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueBoxDef_ptr &
+CORBA_ValueBoxDef_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueBoxDef_ptr &
+CORBA_ValueBoxDef_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_ValueBoxDef::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_ValueBoxDef_ptr
+CORBA_ValueBoxDef_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_ValueBoxDef_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_ValueBoxDef::_nil ();
+  return val;
+}
+
+::CORBA_ValueBoxDef_ptr
+CORBA_ValueBoxDef_var::duplicate (CORBA_ValueBoxDef_ptr p)
+{
+  return ::CORBA_ValueBoxDef::_duplicate (p);
+}
+
+void
+CORBA_ValueBoxDef_var::release (CORBA_ValueBoxDef_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_ValueBoxDef_ptr
+CORBA_ValueBoxDef_var::nil (void)
+{
+  return ::CORBA_ValueBoxDef::_nil ();
+}
+
+::CORBA_ValueBoxDef_ptr
+CORBA_ValueBoxDef_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_ValueBoxDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_ValueBoxDef_var::upcast (void *src)
+{
+  CORBA_ValueBoxDef **tmp =
+    ACE_static_cast (CORBA_ValueBoxDef **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_ValueBoxDef_out
+// *************************************************************
+
+CORBA_ValueBoxDef_out::CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_ValueBoxDef::_nil ();
+}
+
+CORBA_ValueBoxDef_out::CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_ValueBoxDef::_nil ();
+}
+
+CORBA_ValueBoxDef_out::CORBA_ValueBoxDef_out (const ::CORBA_ValueBoxDef_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_ValueBoxDef_out &, p).ptr_)
+{}
+
+::CORBA_ValueBoxDef_out &
+CORBA_ValueBoxDef_out::operator= (const ::CORBA_ValueBoxDef_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_ValueBoxDef_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_ValueBoxDef_out &
+CORBA_ValueBoxDef_out::operator= (const ::CORBA_ValueBoxDef_var &p)
+{
+  this->ptr_ = ::CORBA_ValueBoxDef::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_ValueBoxDef_out &
+CORBA_ValueBoxDef_out::operator= (CORBA_ValueBoxDef_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_ValueBoxDef_out::operator ::CORBA_ValueBoxDef_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueBoxDef_ptr &
+CORBA_ValueBoxDef_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_ValueBoxDef_ptr
+CORBA_ValueBoxDef_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get : public TAO_ClientRequestInfo
@@ -11022,13 +10791,13 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::IDLType_ptr result);
+  void result (CORBA_IDLType_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get (const TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get &);
 
-  CORBA::IDLType_ptr _result;
+  CORBA_IDLType_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
@@ -11081,7 +10850,7 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA::En
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA::IDLType_ptr result)
+TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA_IDLType_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -11093,7 +10862,7 @@ public:
   TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set (
       TAO_GIOP_Invocation *_tao_invocation,
       CORBA::Object_ptr _tao_target,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
@@ -11120,14 +10889,14 @@ private:
   TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set (const TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set &);
   void operator= (const TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set &);
 
-  CORBA::IDLType_ptr original_type_def_;
+  CORBA_IDLType_ptr original_type_def_;
   
 };
 
 TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
@@ -11186,15 +10955,15 @@ TAO_ClientRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (CORBA::En
 //                Base & Remote Proxy  Implementation. 
 //
 
-_TAO_ValueBoxDef_Proxy_Impl::_TAO_ValueBoxDef_Proxy_Impl (void)
+_TAO_CORBA_ValueBoxDef_Proxy_Impl::_TAO_CORBA_ValueBoxDef_Proxy_Impl (void)
 {}
 
-_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (void)
+_TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::_TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl (void)
 {}
 
 // Remote Implementation of the IDL interface methods
 
-CORBA::IDLType_ptr _TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
+CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -11203,8 +10972,8 @@ CORBA::IDLType_ptr _TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
   ))
 {
   
-  CORBA::IDLType_ptr _tao_retval = CORBA::IDLType::_nil ();
-  CORBA::IDLType_var _tao_safe_retval (_tao_retval);
+  CORBA_IDLType_ptr _tao_retval = CORBA_IDLType::_nil ();
+  CORBA_IDLType_var _tao_safe_retval (_tao_retval);
   
   
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
@@ -11288,7 +11057,7 @@ CORBA::IDLType_ptr _TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -11354,9 +11123,9 @@ CORBA::IDLType_ptr _TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
   return _tao_safe_retval._retn ();
 }
 
-void _TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
+void _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::IDLType_ptr original_type_def,
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
@@ -11516,36 +11285,36 @@ void _TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
 //           Remote & Base  Proxy Broker Implementation
 //
 
-_TAO_ValueBoxDef_Proxy_Broker::_TAO_ValueBoxDef_Proxy_Broker (void)
+_TAO_CORBA_ValueBoxDef_Proxy_Broker::_TAO_CORBA_ValueBoxDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ValueBoxDef_Proxy_Broker::~_TAO_ValueBoxDef_Proxy_Broker (void)
+_TAO_CORBA_ValueBoxDef_Proxy_Broker::~_TAO_CORBA_ValueBoxDef_Proxy_Broker (void)
 {
 }
 
-_TAO_ValueBoxDef_Proxy_Broker * (*CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
+_TAO_CORBA_ValueBoxDef_Proxy_Broker * (*_TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
 
 // Factory Member function Implementation.
-_TAO_ValueBoxDef_Remote_Proxy_Broker *
-_TAO_ValueBoxDef_Remote_Proxy_Broker::the_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker *
+_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker::the_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker (void)
 {
-  static ::_TAO_ValueBoxDef_Remote_Proxy_Broker remote_proxy_broker;
+  static ::_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker remote_proxy_broker;
   return &remote_proxy_broker;
 }
 
-_TAO_ValueBoxDef_Remote_Proxy_Broker::_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker::_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_ValueBoxDef_Remote_Proxy_Broker::~_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
+_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker::~_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker (void)
 {
 }
 
-_TAO_ValueBoxDef_Proxy_Impl&
-_TAO_ValueBoxDef_Remote_Proxy_Broker::select_proxy (
+_TAO_CORBA_ValueBoxDef_Proxy_Impl&
+_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker::select_proxy (
   ::CORBA_ValueBoxDef *,
   CORBA::Environment &
 )
@@ -11570,72 +11339,72 @@ CORBA_ValueBoxDef::~CORBA_ValueBoxDef (void)
 {}
 
 void
-CORBA::ValueBoxDef::CORBA_ValueBoxDef_setup_collocation (int collocated)
+CORBA_ValueBoxDef::CORBA_ValueBoxDef_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_ValueBoxDef_Proxy_Broker_ =
-      ::CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer (this);
+    this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_ =
+      ::_TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_function_pointer (this);
   else
-    this->the_TAO_ValueBoxDef_Proxy_Broker_ =
-      ::_TAO_ValueBoxDef_Remote_Proxy_Broker::the_TAO_ValueBoxDef_Remote_Proxy_Broker ();
+    this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_ =
+      ::_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker::the_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker ();
   
   this->CORBA_TypedefDef_setup_collocation (collocated);
 }
 
-void CORBA::ValueBoxDef::_tao_any_destructor (void *x)
+void CORBA_ValueBoxDef::_tao_any_destructor (void *x)
 {
   CORBA_ValueBoxDef *tmp = ACE_static_cast (CORBA_ValueBoxDef*,x);
   CORBA::release (tmp);
 }
 
-CORBA::ValueBoxDef_ptr CORBA::ValueBoxDef::_narrow (
+CORBA_ValueBoxDef_ptr CORBA_ValueBoxDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::ValueBoxDef::_nil ();
+    return CORBA_ValueBoxDef::_nil ();
   if (! obj->_is_local ())
     {
       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueBoxDef:1.0", ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::ValueBoxDef::_nil ());
+      ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
       if (is_a == 0)
-        return CORBA::ValueBoxDef::_nil ();
+        return CORBA_ValueBoxDef::_nil ();
     }
-  return CORBA::ValueBoxDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_ValueBoxDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::ValueBoxDef_ptr CORBA::ValueBoxDef::_unchecked_narrow (
+CORBA_ValueBoxDef_ptr CORBA_ValueBoxDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::ValueBoxDef::_nil ();
+    return CORBA_ValueBoxDef::_nil ();
   if (! obj->_is_local ())
     {
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::ValueBoxDef_ptr default_proxy = CORBA::ValueBoxDef::_nil ();
+      CORBA_ValueBoxDef_ptr default_proxy = CORBA_ValueBoxDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer != 0
+          obj->_is_collocated () &&_TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_function_pointer != 0
         )
       {
         ACE_NEW_RETURN (
           default_proxy,
-          ::CORBA::ValueBoxDef (
+          ::CORBA_ValueBoxDef (
             stub,
             1,
             obj->_servant ()),
             
-          CORBA::ValueBoxDef::_nil ());
+          CORBA_ValueBoxDef::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
-        ACE_NEW_RETURN (default_proxy, ::CORBA::ValueBoxDef (stub, 0, obj->_servant ()), CORBA::ValueBoxDef::_nil ());
+        ACE_NEW_RETURN (default_proxy, ::CORBA_ValueBoxDef (stub, 0, obj->_servant ()), CORBA_ValueBoxDef::_nil ());
         return default_proxy;
       }
     else 
@@ -11654,15 +11423,15 @@ CORBA::ValueBoxDef_ptr CORBA::ValueBoxDef::_unchecked_narrow (
           );
 }
 
-CORBA::ValueBoxDef_ptr
-CORBA::ValueBoxDef::_duplicate (CORBA::ValueBoxDef_ptr obj)
+CORBA_ValueBoxDef_ptr
+CORBA_ValueBoxDef::_duplicate (CORBA_ValueBoxDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-CORBA::Boolean CORBA::ValueBoxDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean CORBA_ValueBoxDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
 {
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueBoxDef:1.0")) ||
@@ -11676,58 +11445,58 @@ CORBA::Boolean CORBA::ValueBoxDef::_is_a (const CORBA::Char *value, CORBA::Envir
     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
 }
 
-void *CORBA::ValueBoxDef::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_ValueBoxDef::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      CORBA_ValueBoxDef::_narrow))
+      &CORBA_ValueBoxDef::_narrow))
     retv = ACE_reinterpret_cast (void*, this);
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::TypedefDef::_narrow))
+      &CORBA_TypedefDef::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::TypedefDef_ptr,
+            CORBA_TypedefDef_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::Contained::_narrow))
+      &CORBA_Contained::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::Contained_ptr,
+            CORBA_Contained_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IDLType::_narrow))
+      &CORBA_IDLType::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IDLType_ptr,
+            CORBA_IDLType_ptr,
             this
           )
       );
   else if (type == ACE_reinterpret_cast
     (ptr_arith_t,
-      &::CORBA::IRObject::_narrow))
+      &CORBA_IRObject::_narrow))
     retv = ACE_reinterpret_cast
       (
         void *,
         ACE_static_cast
           (
-            CORBA::IRObject_ptr,
+            CORBA_IRObject_ptr,
             this
           )
       );
@@ -11740,20 +11509,20 @@ void *CORBA::ValueBoxDef::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char* CORBA::ValueBoxDef::_interface_repository_id (void) const
+const char* CORBA_ValueBoxDef::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/ValueBoxDef:1.0";
 }
 
-CORBA::IDLType_ptr CORBA::ValueBoxDef::original_type_def (
+CORBA_IDLType_ptr CORBA_ValueBoxDef::original_type_def (
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueBoxDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueBoxDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueBoxDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
   
   return proxy.original_type_def (
@@ -11762,16 +11531,16 @@ CORBA::IDLType_ptr CORBA::ValueBoxDef::original_type_def (
     );
 }
 
-void CORBA::ValueBoxDef::original_type_def (
-    CORBA::IDLType_ptr original_type_def,
+void CORBA_ValueBoxDef::original_type_def (
+    CORBA_IDLType_ptr original_type_def,
     CORBA::Environment &ACE_TRY_ENV
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  _TAO_ValueBoxDef_Proxy_Impl &proxy = 
-    this->the_TAO_ValueBoxDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+  _TAO_CORBA_ValueBoxDef_Proxy_Impl &proxy = 
+    this->the_TAO_CORBA_ValueBoxDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
   
   proxy.original_type_def (
@@ -11781,104 +11550,7 @@ void CORBA::ValueBoxDef::original_type_def (
     );
 }
 
-
-// ***************************************************************
-// Any operators for sequence class moved from IFR_BaseC.cpp
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueDefSeq &_tao_elem
-  ) // copying
-{
-  TAO_OutputCDR stream;
-  if (stream << _tao_elem)
-  {
-    _tao_any._tao_replace (
-        CORBA::_tc_ValueDefSeq,
-        TAO_ENCAP_BYTE_ORDER,
-        stream.begin ()
-      );
-  }
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::ValueDefSeq *_tao_elem) // non copying
-{
-  TAO_OutputCDR stream;
-  stream << *_tao_elem;
-  _tao_any._tao_replace (
-      CORBA::_tc_ValueDefSeq,
-      TAO_ENCAP_BYTE_ORDER,
-      stream.begin (),
-      1,
-      _tao_elem,
-      CORBA::ValueDefSeq::_tao_any_destructor
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueDefSeq *&_tao_elem)
-{
-  return _tao_any >>= ACE_const_cast(
-      const CORBA::ValueDefSeq*&,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueDefSeq *&_tao_elem)
-{
-  _tao_elem = 0;
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    
-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDefSeq, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-    
-    if (!result)
-      return 0; // not equivalent
-    
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = ACE_static_cast(
-          const CORBA::ValueDefSeq*,
-          _tao_any.value ()
-        );
-      return 1;
-    }
-    else
-    {
-      CORBA::ValueDefSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::ValueDefSeq, 0);
-      TAO_InputCDR stream (
-          _tao_any._tao_get_cdr (),
-          _tao_any._tao_byte_order ()
-        );
-      if (stream >> *tmp)
-      {
-        ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::_tc_ValueDefSeq,
-            1,
-            ACE_static_cast (void *, tmp),
-            CORBA::ValueDefSeq::_tao_any_destructor
-          );
-        _tao_elem = tmp;
-        return 1;
-      }
-      else
-      {
-        delete tmp;
-      }
-    }
-  }
-  ACE_CATCHANY
-  {
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ******************************************************************
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::FixedDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_FixedDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -11888,17 +11560,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::FixedDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::FixedDef::_duplicate (_tao_elem),
-        CORBA::FixedDef::_tao_any_destructor
+        CORBA_FixedDef::_duplicate (_tao_elem),
+        CORBA_FixedDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::FixedDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_FixedDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::FixedDef::_nil ();
+    _tao_elem = CORBA_FixedDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_FixedDef, ACE_TRY_ENV);
@@ -11917,29 +11589,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::FixedDef_ptr &_ta
           CORBA::_tc_FixedDef,
           1,
           _tao_elem,
-          CORBA::FixedDef::_tao_any_destructor
+          CORBA_FixedDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::FixedDef::_nil ();
+    _tao_elem = CORBA_FixedDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::FixedDef::_nil ();
+  _tao_elem = CORBA_FixedDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::FixedDef,CORBA::FixedDef_var>;
+    template class TAO_Object_Manager<CORBA_FixedDef,CORBA_FixedDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::FixedDef,CORBA::FixedDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_FixedDef,CORBA_FixedDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ValueMember &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA_ValueMember &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
@@ -11950,7 +11622,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA::ValueMember &_tao_elem) //
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ValueMember *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_ValueMember *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -11960,16 +11632,16 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ValueMember *_tao_elem) // non co
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::ValueMember::_tao_any_destructor
+      CORBA_ValueMember::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueMember *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueMember *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::ValueMember*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_ValueMember*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueMember *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueMember *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -11985,15 +11657,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueMember
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::ValueMember*,
+          const CORBA_ValueMember*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::ValueMember *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::ValueMember, 0);
+      CORBA_ValueMember *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_ValueMember, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -12004,7 +11676,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueMember
             CORBA::_tc_ValueMember,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::ValueMember::_tao_any_destructor
+            CORBA_ValueMember::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -12024,7 +11696,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueMember
 
 void operator<<= (
     CORBA::Any &_tao_any,
-    const CORBA::ValueMemberSeq &_tao_elem
+    const CORBA_ValueMemberSeq &_tao_elem
   ) // copying
 {
   TAO_OutputCDR stream;
@@ -12038,7 +11710,7 @@ void operator<<= (
   }
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ValueMemberSeq *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_ValueMemberSeq *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -12048,19 +11720,19 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ValueMemberSeq *_tao_elem) // non
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::ValueMemberSeq::_tao_any_destructor
+      CORBA_ValueMemberSeq::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueMemberSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueMemberSeq *&_tao_elem)
 {
   return _tao_any >>= ACE_const_cast(
-      const CORBA::ValueMemberSeq*&,
+      const CORBA_ValueMemberSeq*&,
       _tao_elem
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueMemberSeq *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueMemberSeq *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -12076,15 +11748,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueMember
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::ValueMemberSeq*,
+          const CORBA_ValueMemberSeq*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::ValueMemberSeq *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::ValueMemberSeq, 0);
+      CORBA_ValueMemberSeq *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_ValueMemberSeq, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -12095,7 +11767,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueMember
             CORBA::_tc_ValueMemberSeq,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::ValueMemberSeq::_tao_any_destructor
+            CORBA_ValueMemberSeq::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -12113,7 +11785,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueMember
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ValueMemberDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_ValueMemberDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -12123,17 +11795,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ValueMemberDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::ValueMemberDef::_duplicate (_tao_elem),
-        CORBA::ValueMemberDef::_tao_any_destructor
+        CORBA_ValueMemberDef::_duplicate (_tao_elem),
+        CORBA_ValueMemberDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueMemberDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueMemberDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::ValueMemberDef::_nil ();
+    _tao_elem = CORBA_ValueMemberDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberDef, ACE_TRY_ENV);
@@ -12152,29 +11824,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueMemberDef_pt
           CORBA::_tc_ValueMemberDef,
           1,
           _tao_elem,
-          CORBA::ValueMemberDef::_tao_any_destructor
+          CORBA_ValueMemberDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::ValueMemberDef::_nil ();
+    _tao_elem = CORBA_ValueMemberDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::ValueMemberDef::_nil ();
+  _tao_elem = CORBA_ValueMemberDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::ValueMemberDef,CORBA::ValueMemberDef_var>;
+    template class TAO_Object_Manager<CORBA_ValueMemberDef,CORBA_ValueMemberDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::ValueMemberDef,CORBA::ValueMemberDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_ValueMemberDef,CORBA_ValueMemberDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ValueDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_ValueDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -12184,17 +11856,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ValueDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::ValueDef::_duplicate (_tao_elem),
-        CORBA::ValueDef::_tao_any_destructor
+        CORBA_ValueDef::_duplicate (_tao_elem),
+        CORBA_ValueDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::ValueDef::_nil ();
+    _tao_elem = CORBA_ValueDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDef, ACE_TRY_ENV);
@@ -12213,66 +11885,66 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueDef_ptr &_ta
           CORBA::_tc_ValueDef,
           1,
           _tao_elem,
-          CORBA::ValueDef::_tao_any_destructor
+          CORBA_ValueDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::ValueDef::_nil ();
+    _tao_elem = CORBA_ValueDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::ValueDef::_nil ();
+  _tao_elem = CORBA_ValueDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var>;
+    template class TAO_Object_Manager<CORBA_ValueDef,CORBA_ValueDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_ValueDef,CORBA_ValueDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ValueDef::FullValueDescription &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA_ValueDef::FullValueDescription &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
   _tao_any._tao_replace (
-      CORBA::ValueDef::_tc_FullValueDescription,
+      CORBA_ValueDef::_tc_FullValueDescription,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin ()
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ValueDef::FullValueDescription *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_ValueDef::FullValueDescription *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
   _tao_any._tao_replace (
-      CORBA::ValueDef::_tc_FullValueDescription,
+      CORBA_ValueDef::_tc_FullValueDescription,
       TAO_ENCAP_BYTE_ORDER,
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::ValueDef::FullValueDescription::_tao_any_destructor
+      CORBA_ValueDef::FullValueDescription::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueDef::FullValueDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueDef::FullValueDescription *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::ValueDef::FullValueDescription*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_ValueDef::FullValueDescription*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueDef::FullValueDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueDef::FullValueDescription *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
     
-    CORBA::Boolean result = type->equivalent (CORBA::ValueDef::_tc_FullValueDescription, ACE_TRY_ENV);
+    CORBA::Boolean result = type->equivalent (CORBA_ValueDef::_tc_FullValueDescription, ACE_TRY_ENV);
     ACE_TRY_CHECK;
     
     if (!result)
@@ -12281,15 +11953,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueDef::F
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::ValueDef::FullValueDescription*,
+          const CORBA_ValueDef::FullValueDescription*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::ValueDef::FullValueDescription *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::ValueDef::FullValueDescription, 0);
+      CORBA_ValueDef::FullValueDescription *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_ValueDef::FullValueDescription, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -12297,10 +11969,10 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueDef::F
       if (stream >> *tmp)
       {
         ((CORBA::Any *)&_tao_any)->_tao_replace (
-            CORBA::ValueDef::_tc_FullValueDescription,
+            CORBA_ValueDef::_tc_FullValueDescription,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::ValueDef::FullValueDescription::_tao_any_destructor
+            CORBA_ValueDef::FullValueDescription::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -12318,7 +11990,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueDef::F
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ValueDescription &_tao_elem) // copying
+void operator<<= (CORBA::Any &_tao_any, const CORBA_ValueDescription &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
   stream << _tao_elem;
@@ -12329,7 +12001,7 @@ void operator<<= (CORBA::Any &_tao_any, const CORBA::ValueDescription &_tao_elem
     );
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ValueDescription *_tao_elem) // non copying
+void operator<<= (CORBA::Any &_tao_any, CORBA_ValueDescription *_tao_elem) // non copying
 {
   TAO_OutputCDR stream;
   stream << *_tao_elem;
@@ -12339,16 +12011,16 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ValueDescription *_tao_elem) // n
       stream.begin (),
       1,
       _tao_elem,
-      CORBA::ValueDescription::_tao_any_destructor
+      CORBA_ValueDescription::_tao_any_destructor
     );
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueDescription *&_tao_elem)
 {
-  return _tao_any >>= ACE_const_cast(const CORBA::ValueDescription*&,_tao_elem);
+  return _tao_any >>= ACE_const_cast(const CORBA_ValueDescription*&,_tao_elem);
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueDescription *&_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA_ValueDescription *&_tao_elem)
 {
   _tao_elem = 0;
   ACE_TRY_NEW_ENV
@@ -12364,15 +12036,15 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueDescri
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
-          const CORBA::ValueDescription*,
+          const CORBA_ValueDescription*,
           _tao_any.value ()
         );
       return 1;
     }
     else
     {
-      CORBA::ValueDescription *tmp;
-      ACE_NEW_RETURN (tmp, CORBA::ValueDescription, 0);
+      CORBA_ValueDescription *tmp;
+      ACE_NEW_RETURN (tmp, CORBA_ValueDescription, 0);
       TAO_InputCDR stream (
           _tao_any._tao_get_cdr (),
           _tao_any._tao_byte_order ()
@@ -12383,7 +12055,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueDescri
             CORBA::_tc_ValueDescription,
             1,
             ACE_static_cast (void *, tmp),
-            CORBA::ValueDescription::_tao_any_destructor
+            CORBA_ValueDescription::_tao_any_destructor
           );
         _tao_elem = tmp;
         return 1;
@@ -12401,7 +12073,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const CORBA::ValueDescri
   return 0;
 }
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::ValueBoxDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_ValueBoxDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -12411,17 +12083,17 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::ValueBoxDef_ptr _tao_elem)
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
-        CORBA::ValueBoxDef::_duplicate (_tao_elem),
-        CORBA::ValueBoxDef::_tao_any_destructor
+        CORBA_ValueBoxDef::_duplicate (_tao_elem),
+        CORBA_ValueBoxDef::_tao_any_destructor
       );
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueBoxDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ValueBoxDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
-    _tao_elem = CORBA::ValueBoxDef::_nil ();
+    _tao_elem = CORBA_ValueBoxDef::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
     
     CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueBoxDef, ACE_TRY_ENV);
@@ -12440,34 +12112,67 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ValueBoxDef_ptr &
           CORBA::_tc_ValueBoxDef,
           1,
           _tao_elem,
-          CORBA::ValueBoxDef::_tao_any_destructor
+          CORBA_ValueBoxDef::_tao_any_destructor
         );
       return 1;
     }
   }
   ACE_CATCHANY
   {
-    _tao_elem = CORBA::ValueBoxDef::_nil ();
+    _tao_elem = CORBA_ValueBoxDef::_nil ();
     return 0;
   }
   ACE_ENDTRY;
-  _tao_elem = CORBA::ValueBoxDef::_nil ();
+  _tao_elem = CORBA_ValueBoxDef::_nil ();
   return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::ValueBoxDef,CORBA::ValueBoxDef_var>;
+    template class TAO_Object_Manager<CORBA_ValueBoxDef,CORBA_ValueBoxDef_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::ValueBoxDef,CORBA::ValueBoxDef_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_ValueBoxDef,CORBA_ValueBoxDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-// *********************************************************************
-// CDR operators from sequence class moved from IFR_BaseC.cpp
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_FixedDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_FixedDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_FixedDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::ValueDefSeq &_tao_sequence
+    const CORBA_ValueMemberSeq &_tao_sequence
   )
 {
   if (strm << _tao_sequence.length ())
@@ -12476,7 +12181,7 @@ CORBA::Boolean operator<< (
     CORBA::Boolean _tao_marshal_flag = 1;
     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm << _tao_sequence[i].in ());
+      _tao_marshal_flag = (strm << _tao_sequence[i]);
     }
     return _tao_marshal_flag;
   }
@@ -12485,7 +12190,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::ValueDefSeq &_tao_sequence
+    CORBA_ValueMemberSeq &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len;
@@ -12500,54 +12205,118 @@ CORBA::Boolean operator>> (
     CORBA::Boolean _tao_marshal_flag = 1;
     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
     {
-      _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
+      _tao_marshal_flag = (strm >> _tao_sequence[i]);
     }
     return _tao_marshal_flag;
   }
   return 0; // error
 }
 
-// *************************************************************
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_ValueMemberDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_ValueMemberDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_ValueMemberDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::ValueMemberSeq &_tao_sequence
+    const CORBA_ValueDef_ptr _tao_objref
   )
 {
-  if (strm << _tao_sequence.length ())
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_ValueDef_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
   {
-    // encode all elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-    {
-      _tao_marshal_flag = (strm << _tao_sequence[i]);
-    }
-    return _tao_marshal_flag;
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_ValueDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
   }
-  return 0; // error
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const CORBA_ValueBoxDef_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
 }
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::ValueMemberSeq &_tao_sequence
+    CORBA_ValueBoxDef_ptr &_tao_objref
   )
 {
-  CORBA::ULong _tao_seq_len;
-  if (strm >> _tao_seq_len)
+  ACE_TRY_NEW_ENV
   {
-    // set the length of the sequence
-    _tao_sequence.length (_tao_seq_len);
-    // If length is 0 we return true.
-    if (0 >= _tao_seq_len) 
-      return 1;
-    // retrieve all the elements
-    CORBA::Boolean _tao_marshal_flag = 1;
-    for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-    {
-      _tao_marshal_flag = (strm >> _tao_sequence[i]);
-    }
-    return _tao_marshal_flag;
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_ValueBoxDef::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
   }
-  return 0; // error
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
 }
 
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h
index 0c67a944c5a..b7a05aac5f7 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.h
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_IDL_IFR_EXTENDEDC_H
-#define TAO_IDL_IFR_EXTENDEDC_H
+#ifndef _TAO_IDL_IFR_EXTENDEDC_H_
+#define _TAO_IDL_IFR_EXTENDEDC_H_
 
 #include "ace/pre.h"
 #include "IFR_BasicC.h"
@@ -52,323 +52,186 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// **********************************************************
-// Sequence classes moved from IFR_BaseC.h
+#if !defined (_CORBA_FIXEDDEF___PTR_CH_)
+#define _CORBA_FIXEDDEF___PTR_CH_
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CH_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CH_
-
-  class _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq : public TAO_Unbounded_Base_Sequence
-  {
-  public:
-    // = Initialization and termination methods.
-    
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum);
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum,
-      CORBA::ULong length,
-      CORBA_ValueDef* *value,
-      CORBA::Boolean release = 0);
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs);
-    virtual ~_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void);
-    _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs);
-    TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var> operator[] (CORBA::ULong index) const;
-    static CORBA_ValueDef **allocbuf (CORBA::ULong nelems);
-    static void freebuf (CORBA_ValueDef **buffer);
-    // The Base_Sequence functions, please see tao/Sequence.h
-    virtual void _allocate_buffer (CORBA::ULong length);
-    virtual void _deallocate_buffer (void);
-    CORBA_ValueDef* *get_buffer (CORBA::Boolean orphan = 0);
-    const CORBA_ValueDef* *get_buffer (void) const;
-    virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-    virtual void _downcast (
-        void* target,
-        CORBA_Object *src,
-        CORBA_Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    virtual CORBA_Object* _upcast (void *src) const;
-    
-  };
+class CORBA_FixedDef;
+typedef CORBA_FixedDef *CORBA_FixedDef_ptr;
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_VALUEDEFSEQ_CH_)
-#define _CORBA_VALUEDEFSEQ_CH_
-
-class CORBA_ValueDefSeq;
-class CORBA_ValueDefSeq_var;
-
-// *************************************************************
-// CORBA_ValueDefSeq
-// *************************************************************
-
-class TAO_IFR_Client_Export CORBA_ValueDefSeq : public 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Object_Sequence<CORBA_ValueDef,CORBA_ValueDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-{
-public:
-  CORBA_ValueDefSeq (void); // default ctor
-  CORBA_ValueDefSeq (CORBA::ULong max); // uses max size
-  CORBA_ValueDefSeq (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_ValueDef_ptr *buffer, 
-    CORBA::Boolean release = 0
-  );
-  CORBA_ValueDefSeq (const CORBA_ValueDefSeq &); // copy ctor
-  ~CORBA_ValueDefSeq (void);
-  static void _tao_any_destructor (void*);
-
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef CORBA_ValueDefSeq_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEDEFSEQ___VAR_CH_)
-#define _CORBA_VALUEDEFSEQ___VAR_CH_
-
-// *************************************************************
-// class CORBA_ValueDefSeq_var
-// *************************************************************
+#if !defined (_CORBA_FIXEDDEF___VAR_CH_)
+#define _CORBA_FIXEDDEF___VAR_CH_
 
-class TAO_IFR_Client_Export CORBA_ValueDefSeq_var
+class TAO_IFR_Client_Export CORBA_FixedDef_var : public TAO_Base_var
 {
 public:
-  CORBA_ValueDefSeq_var (void); // default constructor
-  CORBA_ValueDefSeq_var (CORBA_ValueDefSeq *);
-  CORBA_ValueDefSeq_var (const CORBA_ValueDefSeq_var &); // copy constructor
-  ~CORBA_ValueDefSeq_var (void); // destructor
-  
-  CORBA_ValueDefSeq_var &operator= (CORBA_ValueDefSeq *);
-  CORBA_ValueDefSeq_var &operator= (const CORBA_ValueDefSeq_var &);
-  CORBA_ValueDefSeq *operator-> (void);
-  const CORBA_ValueDefSeq *operator-> (void) const;
+  CORBA_FixedDef_var (void); // default constructor
+  CORBA_FixedDef_var (CORBA_FixedDef_ptr p) : ptr_ (p) {} 
+  CORBA_FixedDef_var (const CORBA_FixedDef_var &); // copy constructor
+  ~CORBA_FixedDef_var (void); // destructor
   
-  operator const CORBA_ValueDefSeq &() const;
-  operator CORBA_ValueDefSeq &();
-  operator CORBA_ValueDefSeq &() const;
-  operator CORBA_ValueDefSeq *&(); // variable-size base types only
-  
-  TAO_Object_Manager<CORBA::ValueDef, CORBA::ValueDef_var> operator[] (CORBA::ULong index);
+  CORBA_FixedDef_var &operator= (CORBA_FixedDef_ptr);
+  CORBA_FixedDef_var &operator= (const CORBA_FixedDef_var &);
+  CORBA_FixedDef_ptr operator-> (void) const;
   
+  operator const CORBA_FixedDef_ptr &() const;
+  operator CORBA_FixedDef_ptr &();
   // in, inout, out, _retn 
-  const CORBA_ValueDefSeq &in (void) const;
-  CORBA_ValueDefSeq &inout (void);
-  CORBA_ValueDefSeq *&out (void);
-  CORBA_ValueDefSeq *_retn (void);
-  CORBA_ValueDefSeq *ptr (void) const;
+  CORBA_FixedDef_ptr in (void) const;
+  CORBA_FixedDef_ptr &inout (void);
+  CORBA_FixedDef_ptr &out (void);
+  CORBA_FixedDef_ptr _retn (void);
+  CORBA_FixedDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_FixedDef_ptr duplicate (CORBA_FixedDef_ptr);
+  static void release (CORBA_FixedDef_ptr);
+  static CORBA_FixedDef_ptr nil (void);
+  static CORBA_FixedDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
-  CORBA_ValueDefSeq *ptr_;
+  CORBA_FixedDef_ptr ptr_;
+  // Unimplemented - prevents widening assignment.
+  CORBA_FixedDef_var (const TAO_Base_var &rhs);
+  CORBA_FixedDef_var &operator= (const TAO_Base_var &rhs);
 };
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_VALUEDEFSEQ___OUT_CH_)
-#define _CORBA_VALUEDEFSEQ___OUT_CH_
+#if !defined (_CORBA_FIXEDDEF___OUT_CH_)
+#define _CORBA_FIXEDDEF___OUT_CH_
 
-class TAO_IFR_Client_Export CORBA_ValueDefSeq_out
+class TAO_IFR_Client_Export CORBA_FixedDef_out
 {
 public:
-  CORBA_ValueDefSeq_out (CORBA_ValueDefSeq *&);
-  CORBA_ValueDefSeq_out (CORBA_ValueDefSeq_var &);
-  CORBA_ValueDefSeq_out (const CORBA_ValueDefSeq_out &);
-  CORBA_ValueDefSeq_out &operator= (const CORBA_ValueDefSeq_out &);
-  CORBA_ValueDefSeq_out &operator= (CORBA_ValueDefSeq *);
-  operator CORBA_ValueDefSeq *&();
-  CORBA_ValueDefSeq *&ptr (void);
-  CORBA_ValueDefSeq *operator-> (void);
-  TAO_Object_Manager<CORBA::ValueDef, CORBA::ValueDef_var> operator[] (CORBA::ULong index);
-  
+  CORBA_FixedDef_out (CORBA_FixedDef_ptr &);
+  CORBA_FixedDef_out (CORBA_FixedDef_var &);
+  CORBA_FixedDef_out (const CORBA_FixedDef_out &);
+  CORBA_FixedDef_out &operator= (const CORBA_FixedDef_out &);
+  CORBA_FixedDef_out &operator= (const CORBA_FixedDef_var &);
+  CORBA_FixedDef_out &operator= (CORBA_FixedDef_ptr);
+  operator CORBA_FixedDef_ptr &();
+  CORBA_FixedDef_ptr &ptr (void);
+  CORBA_FixedDef_ptr operator-> (void);
+
 private:
-  CORBA_ValueDefSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ValueDefSeq_var &);
+  CORBA_FixedDef_ptr &ptr_;
 };
 
 
 #endif /* end #if !defined */
 
-// ***************************************************************
-
-#if !defined (_CORBA_FIXEDDEF___VAR_CH_)
-#define _CORBA_FIXEDDEF___VAR_CH_
-
-  class TAO_IFR_Client_Export CORBA_FixedDef_var : public TAO_Base_var
-  {
-  public:
-    CORBA_FixedDef_var (void); // default constructor
-    CORBA_FixedDef_var (CORBA_FixedDef_ptr p) : ptr_ (p) {} 
-    CORBA_FixedDef_var (const CORBA_FixedDef_var &); // copy constructor
-    ~CORBA_FixedDef_var (void); // destructor
-    
-    CORBA_FixedDef_var &operator= (CORBA_FixedDef_ptr);
-    CORBA_FixedDef_var &operator= (const CORBA_FixedDef_var &);
-    CORBA_FixedDef_ptr operator-> (void) const;
-    
-    operator const CORBA_FixedDef_ptr &() const;
-    operator CORBA_FixedDef_ptr &();
-    // in, inout, out, _retn 
-    CORBA_FixedDef_ptr in (void) const;
-    CORBA_FixedDef_ptr &inout (void);
-    CORBA_FixedDef_ptr &out (void);
-    CORBA_FixedDef_ptr _retn (void);
-    CORBA_FixedDef_ptr ptr (void) const;
-
-  private:
-    CORBA_FixedDef_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    CORBA_FixedDef_var (const TAO_Base_var &rhs);
-    CORBA_FixedDef_var &operator= (const TAO_Base_var &rhs);
-  };
 
+#if !defined (_CORBA_FIXEDDEF_CH_)
+#define _CORBA_FIXEDDEF_CH_
 
-#endif /* end #if !defined */
+// Forward Classes Declaration
+class _TAO_CORBA_FixedDef_Proxy_Impl;
+class _TAO_CORBA_FixedDef_Remote_Proxy_Impl;
+class _TAO_CORBA_FixedDef_Proxy_Broker;
+class _TAO_CORBA_FixedDef_Remote_Proxy_Broker;
 
+class TAO_IFR_Client_Export CORBA_FixedDef: public virtual CORBA_IDLType
+{
+public:
+#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+  typedef CORBA_FixedDef_ptr _ptr_type;
+  typedef CORBA_FixedDef_var _var_type;
+#endif /* ! __GNUC__ || g++ >= 2.8 */
 
-#if !defined (_CORBA_FIXEDDEF___OUT_CH_)
-#define _CORBA_FIXEDDEF___OUT_CH_
+  // the static operations
+  static CORBA_FixedDef_ptr _duplicate (CORBA_FixedDef_ptr obj);
+  static CORBA_FixedDef_ptr _narrow (
+      CORBA::Object_ptr obj,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  static CORBA_FixedDef_ptr _unchecked_narrow (
+      CORBA::Object_ptr obj,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  static CORBA_FixedDef_ptr _nil (void)
+    {
+      return (CORBA_FixedDef_ptr)0;
+    }
 
-  class TAO_IFR_Client_Export CORBA_FixedDef_out
-  {
-  public:
-    CORBA_FixedDef_out (CORBA_FixedDef_ptr &);
-    CORBA_FixedDef_out (CORBA_FixedDef_var &);
-    CORBA_FixedDef_out (const CORBA_FixedDef_out &);
-    CORBA_FixedDef_out &operator= (const CORBA_FixedDef_out &);
-    CORBA_FixedDef_out &operator= (const CORBA_FixedDef_var &);
-    CORBA_FixedDef_out &operator= (CORBA_FixedDef_ptr);
-    operator CORBA_FixedDef_ptr &();
-    CORBA_FixedDef_ptr &ptr (void);
-    CORBA_FixedDef_ptr operator-> (void);
-    
-  private:
-    CORBA_FixedDef_ptr &ptr_;
-  };
+  static void _tao_any_destructor (void*);
 
+  virtual CORBA::UShort digits (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
 
-#endif /* end #if !defined */
+  virtual void digits (
+      CORBA::UShort digits,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
 
+  virtual CORBA::Short scale (
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
 
-#if !defined (_CORBA_FIXEDDEF_CH_)
-#define _CORBA_FIXEDDEF_CH_
+  virtual void scale (
+      CORBA::Short scale,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
 
-// Forward Classes Declaration
-  class _TAO_FixedDef_Proxy_Impl;
-  class _TAO_FixedDef_Remote_Proxy_Impl;
-  class _TAO_FixedDef_Proxy_Broker;
-  class _TAO_FixedDef_Remote_Proxy_Broker;
+  virtual CORBA::Boolean _is_a (
+      const CORBA::Char *type_id, 
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  virtual void *_tao_QueryInterface (ptr_arith_t type);
   
-  class TAO_IFR_Client_Export CORBA_FixedDef: public virtual CORBA_IDLType
-  {
-  public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef CORBA_FixedDef_ptr _ptr_type;
-    typedef CORBA_FixedDef_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    // the static operations
-    static CORBA_FixedDef_ptr _duplicate (CORBA_FixedDef_ptr obj);
-    static CORBA_FixedDef_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    static CORBA_FixedDef_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    static CORBA_FixedDef_ptr _nil (void)
-      {
-        return (CORBA_FixedDef_ptr)0;
-      }
-
-    static void _tao_any_destructor (void*);
-
-    virtual CORBA::UShort digits (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void digits (
-        CORBA::UShort digits,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Short scale (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void scale (
-        CORBA::Short scale,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
-    virtual const char* _interface_repository_id (void) const;
+  virtual const char* _interface_repository_id (void) const;
 
-  private:
-    _TAO_FixedDef_Proxy_Broker *the_TAO_FixedDef_Proxy_Broker_;
-    
+private:
+  _TAO_CORBA_FixedDef_Proxy_Broker *the_TAO_CORBA_FixedDef_Proxy_Broker_;
+  
+protected:
+  CORBA_FixedDef (int collocated = 0);
+  
   protected:
-    CORBA_FixedDef (int collocated = 0);
+    // This methods travese the inheritance tree and set the
+    // parents piece of the given class in the right mode
+    virtual void CORBA_FixedDef_setup_collocation (int collocated);
     
-    protected:
-      // This methods travese the inheritance tree and set the
-      // parents piece of the given class in the right mode
-      virtual void CORBA_FixedDef_setup_collocation (int collocated);
-      
-      CORBA_FixedDef (
-        TAO_Stub *objref, 
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0
-        );
-      
-      friend class _TAO_FixedDef_Remote_Proxy_Impl;
-      friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
-      friend class _TAO_FixedDef_Direct_Proxy_Impl;
+    CORBA_FixedDef (
+      TAO_Stub *objref, 
+      CORBA::Boolean _tao_collocated = 0,
+      TAO_Abstract_ServantBase *servant = 0
+      );
     
-    virtual ~CORBA_FixedDef (void);
-  private:
-    CORBA_FixedDef (const CORBA_FixedDef &);
-    void operator= (const CORBA_FixedDef &);    
+    friend class _TAO_CORBA_FixedDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_FixedDef_Direct_Proxy_Impl;
+  
+  virtual ~CORBA_FixedDef (void);
+private:
+  CORBA_FixedDef (const CORBA_FixedDef &);
+  void operator= (const CORBA_FixedDef &);
 };
 
 
@@ -381,11 +244,11 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_FixedDef_Proxy_Impl : 
-  public virtual _TAO_IDLType_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_FixedDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_IDLType_Proxy_Impl
 {
 public:
-  virtual ~_TAO_FixedDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_FixedDef_Proxy_Impl (void) { }
   
     virtual CORBA::UShort digits (
       CORBA_Object *_collocated_tao_target_,
@@ -422,7 +285,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_FixedDef_Proxy_Impl (void);
+  _TAO_CORBA_FixedDef_Proxy_Impl (void);
 
 };
 //
@@ -434,16 +297,16 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_FixedDef_Remote_Proxy_Impl : 
-  public virtual _TAO_FixedDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_FixedDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_FixedDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_IDLType_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_FixedDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_FixedDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_FixedDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_FixedDef_Remote_Proxy_Impl (void) { }
   
     virtual CORBA::UShort digits (
       CORBA_Object *_collocated_tao_target_,
@@ -497,17 +360,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_FixedDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_FixedDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_FixedDef_Proxy_Broker (void);
-  virtual _TAO_FixedDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_FixedDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_FixedDef_Proxy_Impl &select_proxy (
     CORBA_FixedDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_FixedDef_Proxy_Broker (void);
+  _TAO_CORBA_FixedDef_Proxy_Broker (void);
   
 };
 
@@ -520,26 +383,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_FixedDef_Remote_Proxy_Broker : public virtual _TAO_FixedDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_FixedDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_FixedDef_Proxy_Broker
 {
 public: 
-  _TAO_FixedDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_FixedDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_FixedDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_FixedDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_FixedDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_FixedDef_Proxy_Impl &select_proxy (
     CORBA_FixedDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_FixedDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_FixedDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_FixedDef_Remote_Proxy_Broker *the_TAO_FixedDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_FixedDef_Remote_Proxy_Broker *the_TAO_CORBA_FixedDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -567,7 +430,7 @@ struct TAO_IFR_Client_Export CORBA_ValueMember
   TAO_String_Manager defined_in;
   TAO_String_Manager version;
   CORBA::TypeCode_var type;
-  CORBA::IDLType_var type_def;
+  CORBA_IDLType_var type_def;
   CORBA::Visibility access;
 };
 
@@ -684,7 +547,7 @@ public:
   CORBA_ValueMemberSeq (
     CORBA::ULong max, 
     CORBA::ULong length, 
-    CORBA::ValueMember *buffer, 
+    CORBA_ValueMember *buffer, 
     CORBA::Boolean release = 0
   );
   CORBA_ValueMemberSeq (const CORBA_ValueMemberSeq &); // copy ctor
@@ -725,8 +588,8 @@ public:
   operator CORBA_ValueMemberSeq &() const;
   operator CORBA_ValueMemberSeq *&(); // variable-size base types only
   
-  CORBA::ValueMember & operator[] (CORBA::ULong index);
-  const CORBA::ValueMember & operator[] (CORBA::ULong index) const;
+  CORBA_ValueMember & operator[] (CORBA::ULong index);
+  const CORBA_ValueMember & operator[] (CORBA::ULong index) const;
   
   // in, inout, out, _retn 
   const CORBA_ValueMemberSeq &in (void) const;
@@ -757,7 +620,7 @@ public:
   operator CORBA_ValueMemberSeq *&();
   CORBA_ValueMemberSeq *&ptr (void);
   CORBA_ValueMemberSeq *operator-> (void);
-  CORBA::ValueMember & operator[] (CORBA::ULong index);
+  CORBA_ValueMember & operator[] (CORBA::ULong index);
   
 private:
   CORBA_ValueMemberSeq *&ptr_;
@@ -769,6 +632,15 @@ private:
 #endif /* end #if !defined */
 
 
+#if !defined (_CORBA_VALUEMEMBERDEF___PTR_CH_)
+#define _CORBA_VALUEMEMBERDEF___PTR_CH_
+
+class CORBA_ValueMemberDef;
+typedef CORBA_ValueMemberDef *CORBA_ValueMemberDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_VALUEMEMBERDEF___VAR_CH_)
 #define _CORBA_VALUEMEMBERDEF___VAR_CH_
 
@@ -792,6 +664,14 @@ public:
   CORBA_ValueMemberDef_ptr &out (void);
   CORBA_ValueMemberDef_ptr _retn (void);
   CORBA_ValueMemberDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_ValueMemberDef_ptr duplicate (CORBA_ValueMemberDef_ptr);
+  static void release (CORBA_ValueMemberDef_ptr);
+  static CORBA_ValueMemberDef_ptr nil (void);
+  static CORBA_ValueMemberDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_ValueMemberDef_ptr ptr_;
@@ -819,7 +699,7 @@ public:
   operator CORBA_ValueMemberDef_ptr &();
   CORBA_ValueMemberDef_ptr &ptr (void);
   CORBA_ValueMemberDef_ptr operator-> (void);
-  
+
 private:
   CORBA_ValueMemberDef_ptr &ptr_;
 };
@@ -832,10 +712,10 @@ private:
 #define _CORBA_VALUEMEMBERDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_ValueMemberDef_Proxy_Impl;
-class _TAO_ValueMemberDef_Remote_Proxy_Impl;
-class _TAO_ValueMemberDef_Proxy_Broker;
-class _TAO_ValueMemberDef_Remote_Proxy_Broker;
+class _TAO_CORBA_ValueMemberDef_Proxy_Impl;
+class _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl;
+class _TAO_CORBA_ValueMemberDef_Proxy_Broker;
+class _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_ValueMemberDef: public virtual CORBA_Contained
 {
@@ -872,7 +752,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr type_def (
+  virtual CORBA_IDLType_ptr type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -881,7 +761,7 @@ public:
     ));
 
   virtual void type_def (
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -916,7 +796,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_ValueMemberDef_Proxy_Broker *the_TAO_ValueMemberDef_Proxy_Broker_;
+  _TAO_CORBA_ValueMemberDef_Proxy_Broker *the_TAO_CORBA_ValueMemberDef_Proxy_Broker_;
   
 protected:
   CORBA_ValueMemberDef (int collocated = 0);
@@ -932,14 +812,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_ValueMemberDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_ValueMemberDef (void);
 private:
   CORBA_ValueMemberDef (const CORBA_ValueMemberDef &);
-  void operator= (const CORBA_ValueMemberDef &);  
+  void operator= (const CORBA_ValueMemberDef &);
 };
 
 
@@ -952,11 +832,11 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_ValueMemberDef_Proxy_Impl : 
-  public virtual _TAO_Contained_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_ValueMemberDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_Contained_Proxy_Impl
 {
 public:
-  virtual ~_TAO_ValueMemberDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ValueMemberDef_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
@@ -966,7 +846,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::IDLType_ptr type_def (
+  virtual CORBA_IDLType_ptr type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -976,7 +856,7 @@ public:
 
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -1001,7 +881,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_ValueMemberDef_Proxy_Impl (void);
+  _TAO_CORBA_ValueMemberDef_Proxy_Impl (void);
 
 };
 //
@@ -1013,16 +893,16 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_ValueMemberDef_Remote_Proxy_Impl : 
-  public virtual _TAO_ValueMemberDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_ValueMemberDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_Contained_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_ValueMemberDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_ValueMemberDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl (void) { }
   
     virtual CORBA::TypeCode_ptr type (
       CORBA_Object *_collocated_tao_target_,
@@ -1032,7 +912,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::IDLType_ptr type_def (
+  virtual CORBA_IDLType_ptr type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1042,7 +922,7 @@ public:
 
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr type_def,
+      CORBA_IDLType_ptr type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -1084,17 +964,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_ValueMemberDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_ValueMemberDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_ValueMemberDef_Proxy_Broker (void);
-  virtual _TAO_ValueMemberDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_ValueMemberDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy (
     CORBA_ValueMemberDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_ValueMemberDef_Proxy_Broker (void);
+  _TAO_CORBA_ValueMemberDef_Proxy_Broker (void);
   
 };
 
@@ -1107,26 +987,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_ValueMemberDef_Remote_Proxy_Broker : public virtual _TAO_ValueMemberDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_ValueMemberDef_Proxy_Broker
 {
 public: 
-  _TAO_ValueMemberDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_ValueMemberDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_ValueMemberDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy (
     CORBA_ValueMemberDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_ValueMemberDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_ValueMemberDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_ValueMemberDef_Remote_Proxy_Broker *the_TAO_ValueMemberDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker *the_TAO_CORBA_ValueMemberDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -1138,6 +1018,15 @@ public:
 #endif /* end #if !defined */
 
 
+#if !defined (_CORBA_VALUEDEF___PTR_CH_)
+#define _CORBA_VALUEDEF___PTR_CH_
+
+class CORBA_ValueDef;
+typedef CORBA_ValueDef *CORBA_ValueDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_VALUEDEF___VAR_CH_)
 #define _CORBA_VALUEDEF___VAR_CH_
 
@@ -1161,6 +1050,14 @@ public:
   CORBA_ValueDef_ptr &out (void);
   CORBA_ValueDef_ptr _retn (void);
   CORBA_ValueDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_ValueDef_ptr duplicate (CORBA_ValueDef_ptr);
+  static void release (CORBA_ValueDef_ptr);
+  static CORBA_ValueDef_ptr nil (void);
+  static CORBA_ValueDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_ValueDef_ptr ptr_;
@@ -1188,7 +1085,7 @@ public:
   operator CORBA_ValueDef_ptr &();
   CORBA_ValueDef_ptr &ptr (void);
   CORBA_ValueDef_ptr operator-> (void);
-  
+
 private:
   CORBA_ValueDef_ptr &ptr_;
 };
@@ -1201,10 +1098,10 @@ private:
 #define _CORBA_VALUEDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_ValueDef_Proxy_Impl;
-class _TAO_ValueDef_Remote_Proxy_Impl;
-class _TAO_ValueDef_Proxy_Broker;
-class _TAO_ValueDef_Remote_Proxy_Broker;
+class _TAO_CORBA_ValueDef_Proxy_Impl;
+class _TAO_CORBA_ValueDef_Remote_Proxy_Impl;
+class _TAO_CORBA_ValueDef_Proxy_Broker;
+class _TAO_CORBA_ValueDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_ValueDef: public virtual CORBA_Container, public virtual CORBA_Contained, public virtual CORBA_IDLType
 {
@@ -1233,7 +1130,7 @@ public:
 
   static void _tao_any_destructor (void*);
 
-  virtual CORBA::InterfaceDefSeq * supported_interfaces (
+  virtual CORBA_InterfaceDefSeq * supported_interfaces (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1242,7 +1139,7 @@ public:
     ));
 
   virtual void supported_interfaces (
-      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1250,7 +1147,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::InitializerSeq * initializers (
+  virtual CORBA_InitializerSeq * initializers (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1259,7 +1156,7 @@ public:
     ));
 
   virtual void initializers (
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1267,7 +1164,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDef_ptr base_value (
+  virtual CORBA_ValueDef_ptr base_value (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1276,7 +1173,7 @@ public:
     ));
 
   virtual void base_value (
-      CORBA::ValueDef_ptr base_value,
+      CORBA_ValueDef_ptr base_value,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1284,7 +1181,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDefSeq * abstract_base_values (
+  virtual CORBA_ValueDefSeq * abstract_base_values (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1293,7 +1190,7 @@ public:
     ));
 
   virtual void abstract_base_values (
-      const CORBA::ValueDefSeq & abstract_base_values,
+      const CORBA_ValueDefSeq & abstract_base_values,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1379,12 +1276,12 @@ public:
     CORBA::Boolean is_custom;
     TAO_String_Manager defined_in;
     TAO_String_Manager version;
-    CORBA::OpDescriptionSeq operations;
-    CORBA::AttrDescriptionSeq attributes;
-    CORBA::ValueMemberSeq members;
-    CORBA::InitializerSeq initializers;
-    CORBA::RepositoryIdSeq supported_interfaces;
-    CORBA::RepositoryIdSeq abstract_base_values;
+    CORBA_OpDescriptionSeq operations;
+    CORBA_AttrDescriptionSeq attributes;
+    CORBA_ValueMemberSeq members;
+    CORBA_InitializerSeq initializers;
+    CORBA_RepositoryIdSeq supported_interfaces;
+    CORBA_RepositoryIdSeq abstract_base_values;
     CORBA::Boolean is_truncatable;
     TAO_String_Manager base_value;
     CORBA::TypeCode_var type;
@@ -1439,7 +1336,7 @@ public:
 
   static CORBA::TypeCode_ptr _tc_FullValueDescription;
 
-  virtual CORBA::ValueDef::FullValueDescription * describe_value (
+  virtual CORBA_ValueDef::FullValueDescription * describe_value (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1447,11 +1344,11 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueMemberDef_ptr create_value_member (
+  virtual CORBA_ValueMemberDef_ptr create_value_member (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::Visibility access,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -1460,11 +1357,11 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::AttributeDef_ptr create_attribute (
+  virtual CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
@@ -1473,15 +1370,15 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::OperationDef_ptr create_operation (
+  virtual CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -1499,7 +1396,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_ValueDef_Proxy_Broker *the_TAO_ValueDef_Proxy_Broker_;
+  _TAO_CORBA_ValueDef_Proxy_Broker *the_TAO_CORBA_ValueDef_Proxy_Broker_;
   
 protected:
   CORBA_ValueDef (int collocated = 0);
@@ -1515,14 +1412,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_ValueDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_ValueDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_ValueDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_ValueDef (void);
 private:
   CORBA_ValueDef (const CORBA_ValueDef &);
-  void operator= (const CORBA_ValueDef &);  
+  void operator= (const CORBA_ValueDef &);
 };
 
 
@@ -1535,15 +1432,15 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_ValueDef_Proxy_Impl : 
-  public virtual _TAO_Container_Proxy_Impl, 
-  public virtual _TAO_Contained_Proxy_Impl, 
-  public virtual _TAO_IDLType_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_ValueDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_Container_Proxy_Impl, 
+  public virtual _TAO_CORBA_Contained_Proxy_Impl, 
+  public virtual _TAO_CORBA_IDLType_Proxy_Impl
 {
 public:
-  virtual ~_TAO_ValueDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ValueDef_Proxy_Impl (void) { }
   
-    virtual CORBA::InterfaceDefSeq * supported_interfaces (
+    virtual CORBA_InterfaceDefSeq * supported_interfaces (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1553,14 +1450,14 @@ public:
 
   virtual void supported_interfaces (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::InitializerSeq * initializers (
+  virtual CORBA_InitializerSeq * initializers (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1570,14 +1467,14 @@ public:
 
   virtual void initializers (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ValueDef_ptr base_value (
+  virtual CORBA_ValueDef_ptr base_value (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1587,14 +1484,14 @@ public:
 
   virtual void base_value (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::ValueDef_ptr base_value,
+      CORBA_ValueDef_ptr base_value,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ValueDefSeq * abstract_base_values (
+  virtual CORBA_ValueDefSeq * abstract_base_values (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1604,7 +1501,7 @@ public:
 
   virtual void abstract_base_values (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::ValueDefSeq & abstract_base_values,
+      const CORBA_ValueDefSeq & abstract_base_values,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -1671,7 +1568,7 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ValueDef::FullValueDescription * describe_value (
+  virtual CORBA_ValueDef::FullValueDescription * describe_value (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1679,12 +1576,12 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::ValueMemberDef_ptr create_value_member (
+  virtual CORBA_ValueMemberDef_ptr create_value_member (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::Visibility access,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1692,12 +1589,12 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::AttributeDef_ptr create_attribute (
+  virtual CORBA_AttributeDef_ptr create_attribute (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1705,16 +1602,16 @@ public:
       CORBA::SystemException
     )) = 0;
 
-  virtual CORBA::OperationDef_ptr create_operation (
+  virtual CORBA_OperationDef_ptr create_operation (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -1722,7 +1619,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_ValueDef_Proxy_Impl (void);
+  _TAO_CORBA_ValueDef_Proxy_Impl (void);
 
 };
 //
@@ -1734,20 +1631,20 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_ValueDef_Remote_Proxy_Impl : 
-  public virtual _TAO_ValueDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_ValueDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_ValueDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_Container_Remote_Proxy_Impl, 
-  public virtual _TAO_Contained_Remote_Proxy_Impl, 
-  public virtual _TAO_IDLType_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_Container_Remote_Proxy_Impl, 
+  public virtual _TAO_CORBA_Contained_Remote_Proxy_Impl, 
+  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_ValueDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_ValueDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_ValueDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ValueDef_Remote_Proxy_Impl (void) { }
   
-    virtual CORBA::InterfaceDefSeq * supported_interfaces (
+    virtual CORBA_InterfaceDefSeq * supported_interfaces (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1757,14 +1654,14 @@ public:
 
   virtual void supported_interfaces (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::InterfaceDefSeq & supported_interfaces,
+      const CORBA_InterfaceDefSeq & supported_interfaces,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::InitializerSeq * initializers (
+  virtual CORBA_InitializerSeq * initializers (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1774,14 +1671,14 @@ public:
 
   virtual void initializers (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::InitializerSeq & initializers,
+      const CORBA_InitializerSeq & initializers,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDef_ptr base_value (
+  virtual CORBA_ValueDef_ptr base_value (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1791,14 +1688,14 @@ public:
 
   virtual void base_value (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::ValueDef_ptr base_value,
+      CORBA_ValueDef_ptr base_value,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDefSeq * abstract_base_values (
+  virtual CORBA_ValueDefSeq * abstract_base_values (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1808,7 +1705,7 @@ public:
 
   virtual void abstract_base_values (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::ValueDefSeq & abstract_base_values,
+      const CORBA_ValueDefSeq & abstract_base_values,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -1875,7 +1772,7 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueDef::FullValueDescription * describe_value (
+  virtual CORBA_ValueDef::FullValueDescription * describe_value (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1883,12 +1780,12 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::ValueMemberDef_ptr create_value_member (
+  virtual CORBA_ValueMemberDef_ptr create_value_member (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::Visibility access,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1896,12 +1793,12 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::AttributeDef_ptr create_attribute (
+  virtual CORBA_AttributeDef_ptr create_attribute (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr type,
+      CORBA_IDLType_ptr type,
       CORBA::AttributeMode mode,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -1909,16 +1806,16 @@ public:
       CORBA::SystemException
     ));
 
-  virtual CORBA::OperationDef_ptr create_operation (
+  virtual CORBA_OperationDef_ptr create_operation (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA::IDLType_ptr result,
+      CORBA_IDLType_ptr result,
       CORBA::OperationMode mode,
-      const CORBA::ParDescriptionSeq & params,
-      const CORBA::ExceptionDefSeq & exceptions,
-      const CORBA::ContextIdSeq & contexts,
+      const CORBA_ParDescriptionSeq & params,
+      const CORBA_ExceptionDefSeq & exceptions,
+      const CORBA_ContextIdSeq & contexts,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -1943,17 +1840,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_ValueDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_ValueDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_ValueDef_Proxy_Broker (void);
-  virtual _TAO_ValueDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_ValueDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_ValueDef_Proxy_Impl &select_proxy (
     CORBA_ValueDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_ValueDef_Proxy_Broker (void);
+  _TAO_CORBA_ValueDef_Proxy_Broker (void);
   
 };
 
@@ -1966,26 +1863,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_ValueDef_Remote_Proxy_Broker : public virtual _TAO_ValueDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_ValueDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_ValueDef_Proxy_Broker
 {
 public: 
-  _TAO_ValueDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_ValueDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_ValueDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_ValueDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_ValueDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_ValueDef_Proxy_Impl &select_proxy (
     CORBA_ValueDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_ValueDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_ValueDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_ValueDef_Remote_Proxy_Broker *the_TAO_ValueDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_ValueDef_Remote_Proxy_Broker *the_TAO_CORBA_ValueDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -2014,8 +1911,8 @@ struct TAO_IFR_Client_Export CORBA_ValueDescription
   CORBA::Boolean is_custom;
   TAO_String_Manager defined_in;
   TAO_String_Manager version;
-  CORBA::RepositoryIdSeq supported_interfaces;
-  CORBA::RepositoryIdSeq abstract_base_values;
+  CORBA_RepositoryIdSeq supported_interfaces;
+  CORBA_RepositoryIdSeq abstract_base_values;
   CORBA::Boolean is_truncatable;
   TAO_String_Manager base_value;
 };
@@ -2068,6 +1965,15 @@ private:
 };
 
 
+#if !defined (_CORBA_VALUEBOXDEF___PTR_CH_)
+#define _CORBA_VALUEBOXDEF___PTR_CH_
+
+class CORBA_ValueBoxDef;
+typedef CORBA_ValueBoxDef *CORBA_ValueBoxDef_ptr;
+
+#endif /* end #if !defined */
+
+
 #if !defined (_CORBA_VALUEBOXDEF___VAR_CH_)
 #define _CORBA_VALUEBOXDEF___VAR_CH_
 
@@ -2091,6 +1997,14 @@ public:
   CORBA_ValueBoxDef_ptr &out (void);
   CORBA_ValueBoxDef_ptr _retn (void);
   CORBA_ValueBoxDef_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_ValueBoxDef_ptr duplicate (CORBA_ValueBoxDef_ptr);
+  static void release (CORBA_ValueBoxDef_ptr);
+  static CORBA_ValueBoxDef_ptr nil (void);
+  static CORBA_ValueBoxDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_ValueBoxDef_ptr ptr_;
@@ -2118,7 +2032,7 @@ public:
   operator CORBA_ValueBoxDef_ptr &();
   CORBA_ValueBoxDef_ptr &ptr (void);
   CORBA_ValueBoxDef_ptr operator-> (void);
-  
+
 private:
   CORBA_ValueBoxDef_ptr &ptr_;
 };
@@ -2131,10 +2045,10 @@ private:
 #define _CORBA_VALUEBOXDEF_CH_
 
 // Forward Classes Declaration
-class _TAO_ValueBoxDef_Proxy_Impl;
-class _TAO_ValueBoxDef_Remote_Proxy_Impl;
-class _TAO_ValueBoxDef_Proxy_Broker;
-class _TAO_ValueBoxDef_Remote_Proxy_Broker;
+class _TAO_CORBA_ValueBoxDef_Proxy_Impl;
+class _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl;
+class _TAO_CORBA_ValueBoxDef_Proxy_Broker;
+class _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker;
 
 class TAO_IFR_Client_Export CORBA_ValueBoxDef: public virtual CORBA_TypedefDef
 {
@@ -2163,7 +2077,7 @@ public:
 
   static void _tao_any_destructor (void*);
 
-  virtual CORBA::IDLType_ptr original_type_def (
+  virtual CORBA_IDLType_ptr original_type_def (
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2172,7 +2086,7 @@ public:
     ));
 
   virtual void original_type_def (
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
@@ -2190,7 +2104,7 @@ public:
   virtual const char* _interface_repository_id (void) const;
 
 private:
-  _TAO_ValueBoxDef_Proxy_Broker *the_TAO_ValueBoxDef_Proxy_Broker_;
+  _TAO_CORBA_ValueBoxDef_Proxy_Broker *the_TAO_CORBA_ValueBoxDef_Proxy_Broker_;
   
 protected:
   CORBA_ValueBoxDef (int collocated = 0);
@@ -2206,14 +2120,14 @@ protected:
       TAO_Abstract_ServantBase *servant = 0
       );
     
-    friend class _TAO_ValueBoxDef_Remote_Proxy_Impl;
-    friend class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
-    friend class _TAO_ValueBoxDef_Direct_Proxy_Impl;
+    friend class _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl;
+    friend class _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl;
+    friend class _TAO_CORBA_ValueBoxDef_Direct_Proxy_Impl;
   
   virtual ~CORBA_ValueBoxDef (void);
 private:
   CORBA_ValueBoxDef (const CORBA_ValueBoxDef &);
-  void operator= (const CORBA_ValueBoxDef &);  
+  void operator= (const CORBA_ValueBoxDef &);
 };
 
 
@@ -2226,13 +2140,13 @@ private:
 //                    Base  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_ValueBoxDef_Proxy_Impl : 
-  public virtual _TAO_TypedefDef_Proxy_Impl
+class TAO_IFR_Client_Export _TAO_CORBA_ValueBoxDef_Proxy_Impl : 
+  public virtual _TAO_CORBA_TypedefDef_Proxy_Impl
 {
 public:
-  virtual ~_TAO_ValueBoxDef_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ValueBoxDef_Proxy_Impl (void) { }
   
-    virtual CORBA::IDLType_ptr original_type_def (
+    virtual CORBA_IDLType_ptr original_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -2242,7 +2156,7 @@ public:
 
   virtual void original_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -2250,7 +2164,7 @@ public:
     )) = 0;
 
 protected:
-  _TAO_ValueBoxDef_Proxy_Impl (void);
+  _TAO_CORBA_ValueBoxDef_Proxy_Impl (void);
 
 };
 //
@@ -2262,18 +2176,18 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_IFR_Client_Export _TAO_ValueBoxDef_Remote_Proxy_Impl : 
-  public virtual _TAO_ValueBoxDef_Proxy_Impl,
+class TAO_IFR_Client_Export _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl : 
+  public virtual _TAO_CORBA_ValueBoxDef_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl,
-  public virtual _TAO_TypedefDef_Remote_Proxy_Impl
+  public virtual _TAO_CORBA_TypedefDef_Remote_Proxy_Impl
   
 {
 public:
-  _TAO_ValueBoxDef_Remote_Proxy_Impl (void);
+  _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl (void);
   
-  virtual ~_TAO_ValueBoxDef_Remote_Proxy_Impl (void) { }
+  virtual ~_TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl (void) { }
   
-    virtual CORBA::IDLType_ptr original_type_def (
+    virtual CORBA_IDLType_ptr original_type_def (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
     )
@@ -2283,7 +2197,7 @@ public:
 
   virtual void original_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::IDLType_ptr original_type_def,
+      CORBA_IDLType_ptr original_type_def,
       CORBA::Environment &ACE_TRY_ENV
     )
     ACE_THROW_SPEC ((
@@ -2308,17 +2222,17 @@ public:
 //                 Base Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_ValueBoxDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_ValueBoxDef_Proxy_Broker
 {
 public:
-  virtual ~_TAO_ValueBoxDef_Proxy_Broker (void);
-  virtual _TAO_ValueBoxDef_Proxy_Impl &select_proxy (
+  virtual ~_TAO_CORBA_ValueBoxDef_Proxy_Broker (void);
+  virtual _TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy (
     CORBA_ValueBoxDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   ) = 0;
 
 protected:
-  _TAO_ValueBoxDef_Proxy_Broker (void);
+  _TAO_CORBA_ValueBoxDef_Proxy_Broker (void);
   
 };
 
@@ -2331,26 +2245,26 @@ protected:
 //                 Remote Proxy Broker Declaration 
 //
 
-class TAO_IFR_Client_Export _TAO_ValueBoxDef_Remote_Proxy_Broker : public virtual _TAO_ValueBoxDef_Proxy_Broker
+class TAO_IFR_Client_Export _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker : public virtual _TAO_CORBA_ValueBoxDef_Proxy_Broker
 {
 public: 
-  _TAO_ValueBoxDef_Remote_Proxy_Broker (void);
+  _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker (void);
   
-  virtual ~_TAO_ValueBoxDef_Remote_Proxy_Broker (void);
+  virtual ~_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker (void);
   
-  virtual _TAO_ValueBoxDef_Proxy_Impl &select_proxy (
+  virtual _TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy (
     CORBA_ValueBoxDef *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
   );
 
 private:
-  _TAO_ValueBoxDef_Remote_Proxy_Impl remote_proxy_impl_;
+  _TAO_CORBA_ValueBoxDef_Remote_Proxy_Impl remote_proxy_impl_;
 // This member function is used to get an handle to the unique instance
 // of the Remote Proxy Broker that is available for a given
 // interface.
 
 public:
-  static _TAO_ValueBoxDef_Remote_Proxy_Broker *the_TAO_ValueBoxDef_Remote_Proxy_Broker (void);
+  static _TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker *the_TAO_CORBA_ValueBoxDef_Remote_Proxy_Broker (void);
 };
 
 
@@ -2363,111 +2277,90 @@ public:
 
 // Proxy Broker Factory function pointer declarations.
 
-extern TAO_IFR_Client_Export _TAO_FixedDef_Proxy_Broker * (*CORBA__TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_FixedDef_Proxy_Broker *
+(*_TAO_CORBA_FixedDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_ValueMemberDef_Proxy_Broker * (*CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_ValueMemberDef_Proxy_Broker *
+(*_TAO_CORBA_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_ValueDef_Proxy_Broker * (*CORBA__TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_ValueDef_Proxy_Broker *
+(*_TAO_CORBA_ValueDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_IFR_Client_Export _TAO_ValueBoxDef_Proxy_Broker * (*CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
+extern TAO_IFR_Client_Export
+_TAO_CORBA_ValueBoxDef_Proxy_Broker *
+(*_TAO_CORBA_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-// *************************************************************
-// Any operators for class moved from IFR_BaseC.h
-
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueDefSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDefSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueDefSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueDefSeq *&);
-
-// *************************************************************
-
-// Any operators for interface CORBA::FixedDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::FixedDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::FixedDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueMember &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueMember*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueMember *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueMember *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueMemberSeq &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueMemberSeq*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueMemberSeq *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueMemberSeq *&);
-// Any operators for interface CORBA::ValueMemberDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueMemberDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueMemberDef *&);
-// Any operators for interface CORBA::ValueDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueDef *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueDef::FullValueDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef::FullValueDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueDef::FullValueDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueDef::FullValueDescription *&);
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueDescription &); // copying version
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDescription*); // noncopying version
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueDescription *&); // deprecated
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueDescription *&);
-// Any operators for interface CORBA::ValueBoxDef
-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueBoxDef_ptr);
-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueBoxDef *&);
-
-// **************************************************************
-// CDR operators for class moved from IFR_BaseC.h
-
-#if !defined _TAO_CDR_OP_CORBA_ValueDefSeq_H_
-#define _TAO_CDR_OP_CORBA_ValueDefSeq_H_
-
-TAO_IFR_Client_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::ValueDefSeq &
-  );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::ValueDefSeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_ValueDefSeq_H_ */
-
-// **************************************************************
+// Any operators for interface CORBA_FixedDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_FixedDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_FixedDef *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ValueMember &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueMember*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueMember *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ValueMember *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ValueMemberSeq &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueMemberSeq*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueMemberSeq *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ValueMemberSeq *&);
+// Any operators for interface CORBA_ValueMemberDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueMemberDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueMemberDef *&);
+// Any operators for interface CORBA_ValueDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueDef *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ValueDef::FullValueDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueDef::FullValueDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueDef::FullValueDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ValueDef::FullValueDescription *&);
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ValueDescription &); // copying version
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueDescription*); // noncopying version
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueDescription *&); // deprecated
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ValueDescription *&);
+// Any operators for interface CORBA_ValueBoxDef
+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ValueBoxDef_ptr);
+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ValueBoxDef *&);
 
 #ifndef __ACE_INLINE__
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::FixedDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::FixedDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueMember &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueMember &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_FixedDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_FixedDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueMember &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueMember &);
 
 #if !defined _TAO_CDR_OP_CORBA_ValueMemberSeq_H_
 #define _TAO_CDR_OP_CORBA_ValueMemberSeq_H_
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::ValueMemberSeq &
+    const CORBA_ValueMemberSeq &
   );
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::ValueMemberSeq &
+    CORBA_ValueMemberSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_ValueMemberSeq_H_ */
 
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueMemberDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueMemberDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueDef_ptr &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueDef::FullValueDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueDef::FullValueDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueDescription &);
-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ValueBoxDef_ptr );
-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBoxDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueMemberDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueMemberDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueDef_ptr &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueDef::FullValueDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueDef::FullValueDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueDescription &);
+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ValueBoxDef_ptr );
+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ValueBoxDef_ptr &);
 
 #endif /* __ACE_INLINE__ */
 
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.i b/TAO/tao/IFR_Client/IFR_ExtendedC.i
index 0a05122927c..416c1ae435a 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.i
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.i
@@ -19,381 +19,53 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// ************************************************************
-// Methods for classes moved from IFR_BaseC.i
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CI_
-
-  ACE_INLINE CORBA::ValueDef **
- _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (CORBA::ULong nelems)
-  {
-    CORBA::ValueDef **buf = 0;
-    
-    ACE_NEW_RETURN (buf, CORBA::ValueDef*[nelems], 0);
-    
-    for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = CORBA::ValueDef::_nil ();
-    
-    return buf;
-  }
-  
-  ACE_INLINE void 
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (CORBA::ValueDef **buffer)
-  {
-    if (buffer == 0)
-      return;
-    delete[] buffer;
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (void)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum)
-    : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ValueDef* *value,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-  {
-  }
-  
-  ACE_INLINE
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::_TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs)
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    if (rhs.buffer_ != 0)
-    {
-      CORBA::ValueDef **tmp1 = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (this->maximum_);
-      CORBA::ValueDef ** const tmp2 = ACE_reinterpret_cast (CORBA::ValueDef ** ACE_CAST_CONST, rhs.buffer_);
-      
-      for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = CORBA::ValueDef::_duplicate (tmp2[i]);
-      
-      this->buffer_ = tmp1;
-    }
-    else
-    {
-      this->buffer_ = 0;
-    }
-  }
-  
-  ACE_INLINE _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq &rhs)
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      CORBA::ValueDef **tmp = ACE_reinterpret_cast (CORBA::ValueDef **, this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-      {
-        CORBA::release (tmp[i]);
-        tmp[i] = CORBA::ValueDef::_nil ();
-      }
-      if (this->maximum_ < rhs.maximum_)
-      {
-        _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::freebuf (tmp);
-        this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::ValueDef **tmp1 = ACE_reinterpret_cast (CORBA::ValueDef **, this->buffer_);
-    CORBA::ValueDef ** const tmp2 = ACE_reinterpret_cast (CORBA::ValueDef ** ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA::ValueDef::_duplicate (tmp2[i]);
-    
-    return *this;
-  }
-  
-  ACE_INLINE TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var>
-  _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::operator[] (CORBA::ULong index) const
-  // read-write accessor
-  {
-    ACE_ASSERT (index < this->maximum_);
-    CORBA::ValueDef ** const tmp = ACE_reinterpret_cast (CORBA::ValueDef ** ACE_CAST_CONST, this->buffer_);
-    return TAO_Object_Manager<CORBA::ValueDef,CORBA::ValueDef_var> (tmp + index, this->release_);
-  }
-  
-  ACE_INLINE CORBA::ValueDef* *
- _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::ValueDef **result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::allocbuf (this->maximum_);
-        this->buffer_ = result;
-        this->release_ = 1;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::ValueDef**, this->buffer_);
-      }
-    }
-    else // if (orphan == 1)
-    {
-      if (this->release_ != 0)
-      {
-        // We set the state back to default and relinquish
-        // ownership.
-        result = ACE_reinterpret_cast(CORBA::ValueDef**,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::ValueDef* *
- _TAO_Unbounded_Object_Sequence_CORBA_ValueDefSeq::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::ValueDef ** ACE_CAST_CONST, this->buffer_);
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_VALUEDEFSEQ_CI_)
-#define _CORBA_VALUEDEFSEQ_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ValueDefSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ValueDefSeq_var::CORBA_ValueDefSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ValueDefSeq_var::CORBA_ValueDefSeq_var (CORBA_ValueDefSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_ValueDefSeq_var::CORBA_ValueDefSeq_var (const ::CORBA_ValueDefSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA_ValueDefSeq (*p.ptr_));
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ValueDefSeq_var::~CORBA_ValueDefSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_ValueDefSeq_var &
-CORBA_ValueDefSeq_var::operator= (CORBA_ValueDefSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE ::CORBA_ValueDefSeq_var &
-CORBA_ValueDefSeq_var::operator= (const ::CORBA_ValueDefSeq_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          CORBA_ValueDefSeq *deep_copy =
-            new CORBA_ValueDefSeq (*p.ptr_);
-          
-          if (deep_copy != 0)
-            {
-              CORBA_ValueDefSeq *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::CORBA_ValueDefSeq *
-CORBA_ValueDefSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueDefSeq *
-CORBA_ValueDefSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ValueDefSeq_var::operator const ::CORBA_ValueDefSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ValueDefSeq_var::operator ::CORBA_ValueDefSeq &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ValueDefSeq_var::operator ::CORBA_ValueDefSeq &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// variable-size types only
-ACE_INLINE
-CORBA_ValueDefSeq_var::operator ::CORBA_ValueDefSeq *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA::ValueDef, CORBA::ValueDef_var>
-CORBA_ValueDefSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const ::CORBA_ValueDefSeq &
-CORBA_ValueDefSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueDefSeq &
-CORBA_ValueDefSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE ::CORBA_ValueDefSeq *&
-CORBA_ValueDefSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueDefSeq *
-CORBA_ValueDefSeq_var::_retn (void)
-{
-  ::CORBA_ValueDefSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::CORBA_ValueDefSeq *
-CORBA_ValueDefSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ValueDefSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ValueDefSeq_out::CORBA_ValueDefSeq_out (CORBA_ValueDefSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ValueDefSeq_out::CORBA_ValueDefSeq_out (CORBA_ValueDefSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ValueDefSeq_out::CORBA_ValueDefSeq_out (const ::CORBA_ValueDefSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ValueDefSeq_out&, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_ValueDefSeq_out &
-CORBA_ValueDefSeq_out::operator= (const ::CORBA_ValueDefSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ValueDefSeq_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_CORBA_FIXEDDEF___CI_)
+#define _CORBA_FIXEDDEF___CI_
 
-ACE_INLINE ::CORBA_ValueDefSeq_out &
-CORBA_ValueDefSeq_out::operator= (CORBA_ValueDefSeq *p)
+ACE_INLINE CORBA_FixedDef_ptr
+tao_CORBA_FixedDef_duplicate (
+    CORBA_FixedDef_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  return CORBA_FixedDef::_duplicate (p);
 }
 
-ACE_INLINE 
-CORBA_ValueDefSeq_out::operator ::CORBA_ValueDefSeq *&() // cast
+ACE_INLINE void
+tao_CORBA_FixedDef_release (
+    CORBA_FixedDef_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_ValueDefSeq *&
-CORBA_ValueDefSeq_out::ptr (void) // ptr
+ACE_INLINE CORBA_FixedDef_ptr
+tao_CORBA_FixedDef_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_FixedDef::_nil ();
 }
 
-ACE_INLINE ::CORBA_ValueDefSeq *
-CORBA_ValueDefSeq_out::operator-> (void)
+ACE_INLINE CORBA_FixedDef_ptr
+tao_CORBA_FixedDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_FixedDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::ValueDef, CORBA::ValueDef_var>
-CORBA_ValueDefSeq_out::operator[] (CORBA::ULong index)
+ACE_INLINE CORBA::Object *
+tao_CORBA_FixedDef_upcast (
+    void *src
+  )
 {
-  return this->ptr_->operator[] (index);
+  CORBA_FixedDef **tmp =
+    ACE_static_cast (CORBA_FixedDef **, src);
+  return *tmp;
 }
 
-
-#endif /* end #if !defined */
-
-// ******************************************************************
-
-#if !defined (_CORBA_FIXEDDEF___CI_)
-#define _CORBA_FIXEDDEF___CI_
-
 ACE_INLINE
 CORBA_FixedDef::CORBA_FixedDef (
     TAO_Stub *objref,
@@ -405,175 +77,6 @@ CORBA_FixedDef::CORBA_FixedDef (
   this->CORBA_FixedDef_setup_collocation (_tao_collocated);
 }
 
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_FIXEDDEF___VAR_CI_)
-#define _CORBA_FIXEDDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_FixedDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_FixedDef_var::CORBA_FixedDef_var (void) // default constructor
-  : ptr_ (CORBA_FixedDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_FixedDef_ptr
-CORBA_FixedDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_FixedDef_var::CORBA_FixedDef_var (const ::CORBA_FixedDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_FixedDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_FixedDef_var::~CORBA_FixedDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_FixedDef_var &
-CORBA_FixedDef_var::operator= (CORBA_FixedDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_FixedDef_var &
-CORBA_FixedDef_var::operator= (const ::CORBA_FixedDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_FixedDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_FixedDef_var::operator const ::CORBA_FixedDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_FixedDef_var::operator ::CORBA_FixedDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_FixedDef_ptr
-CORBA_FixedDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_FixedDef_ptr
-CORBA_FixedDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_FixedDef_ptr &
-CORBA_FixedDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_FixedDef_ptr &
-CORBA_FixedDef_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_FixedDef::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_FixedDef_ptr
-CORBA_FixedDef_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA_FixedDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_FixedDef::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_FIXEDDEF___OUT_CI_)
-#define _CORBA_FIXEDDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_FixedDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_FixedDef_out::CORBA_FixedDef_out (CORBA_FixedDef_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_FixedDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_FixedDef_out::CORBA_FixedDef_out (CORBA_FixedDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_FixedDef::_nil ();
-}
-
-ACE_INLINE
-CORBA_FixedDef_out::CORBA_FixedDef_out (const ::CORBA_FixedDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_FixedDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_FixedDef_out &
-CORBA_FixedDef_out::operator= (const ::CORBA_FixedDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_FixedDef_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_FixedDef_out &
-CORBA_FixedDef_out::operator= (const ::CORBA_FixedDef_var &p)
-{
-  this->ptr_ = ::CORBA_FixedDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_FixedDef_out &
-CORBA_FixedDef_out::operator= (CORBA_FixedDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_FixedDef_out::operator ::CORBA_FixedDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_FixedDef_ptr &
-CORBA_FixedDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_FixedDef_ptr
-CORBA_FixedDef_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
 
 #endif /* end #if !defined */
 
@@ -777,16 +280,16 @@ CORBA_ValueMember_out::operator-> (void)
 #define __TAO_UNBOUNDED_SEQUENCE_CORBA_VALUEMEMBERSEQ_CI_
 
   // = Static operations.
-  ACE_INLINE CORBA::ValueMember *
+  ACE_INLINE CORBA_ValueMember *
   _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (CORBA::ULong size)
   // Allocate storage for the sequence.
   {
-    CORBA::ValueMember *retval = 0;
-    ACE_NEW_RETURN (retval, CORBA::ValueMember[size], 0);
+    CORBA_ValueMember *retval = 0;
+    ACE_NEW_RETURN (retval, CORBA_ValueMember[size], 0);
     return retval;
   }
   
-  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (CORBA::ValueMember *buffer)
+  ACE_INLINE void _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (CORBA_ValueMember *buffer)
   // Free the sequence.
   {
     delete [] buffer;
@@ -806,7 +309,7 @@ CORBA_ValueMember_out::operator-> (void)
   ACE_INLINE
   _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::_TAO_Unbounded_Sequence_CORBA_ValueMemberSeq (CORBA::ULong maximum,
     CORBA::ULong length,
-    CORBA::ValueMember *data,
+    CORBA_ValueMember *data,
     CORBA::Boolean release)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
@@ -819,8 +322,8 @@ CORBA_ValueMember_out::operator-> (void)
   {
     if (rhs.buffer_ != 0)
     {
-      CORBA::ValueMember *tmp1 = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (this->maximum_);
-      CORBA::ValueMember * const tmp2 = ACE_reinterpret_cast (CORBA::ValueMember * ACE_CAST_CONST, rhs.buffer_);
+      CORBA_ValueMember *tmp1 = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (this->maximum_);
+      CORBA_ValueMember * const tmp2 = ACE_reinterpret_cast (CORBA_ValueMember * ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
@@ -845,7 +348,7 @@ CORBA_ValueMember_out::operator-> (void)
       if (this->maximum_ < rhs.maximum_)
       {
         // free the old buffer
-        CORBA::ValueMember *tmp = ACE_reinterpret_cast (CORBA::ValueMember *, this->buffer_);
+        CORBA_ValueMember *tmp = ACE_reinterpret_cast (CORBA_ValueMember *, this->buffer_);
         _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (tmp);
         this->buffer_ = _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::allocbuf (rhs.maximum_);
       }
@@ -855,8 +358,8 @@ CORBA_ValueMember_out::operator-> (void)
     
     TAO_Unbounded_Base_Sequence::operator= (rhs);
     
-    CORBA::ValueMember *tmp1 = ACE_reinterpret_cast (CORBA::ValueMember *, this->buffer_);
-    CORBA::ValueMember * const tmp2 = ACE_reinterpret_cast (CORBA::ValueMember * ACE_CAST_CONST, rhs.buffer_);
+    CORBA_ValueMember *tmp1 = ACE_reinterpret_cast (CORBA_ValueMember *, this->buffer_);
+    CORBA_ValueMember * const tmp2 = ACE_reinterpret_cast (CORBA_ValueMember * ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
@@ -865,30 +368,30 @@ CORBA_ValueMember_out::operator-> (void)
   }
   
   // = Accessors.
-  ACE_INLINE CORBA::ValueMember &
+  ACE_INLINE CORBA_ValueMember &
   _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::operator[] (CORBA::ULong i)
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    CORBA::ValueMember* tmp = ACE_reinterpret_cast(CORBA::ValueMember*,this->buffer_);
+    CORBA_ValueMember* tmp = ACE_reinterpret_cast(CORBA_ValueMember*,this->buffer_);
     return tmp[i];
   }
   
-  ACE_INLINE const CORBA::ValueMember &
+  ACE_INLINE const CORBA_ValueMember &
   _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::operator[] (CORBA::ULong i) const
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    CORBA::ValueMember * const tmp = ACE_reinterpret_cast (CORBA::ValueMember* ACE_CAST_CONST, this->buffer_);
+    CORBA_ValueMember * const tmp = ACE_reinterpret_cast (CORBA_ValueMember* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
   
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
   
-  ACE_INLINE CORBA::ValueMember *
+  ACE_INLINE CORBA_ValueMember *
   _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::get_buffer (CORBA::Boolean orphan)
   {
-    CORBA::ValueMember *result = 0;
+    CORBA_ValueMember *result = 0;
     if (orphan == 0)
     {
       // We retain ownership.
@@ -900,7 +403,7 @@ CORBA_ValueMember_out::operator-> (void)
       }
       else
       {
-        result = ACE_reinterpret_cast (CORBA::ValueMember*, this->buffer_);
+        result = ACE_reinterpret_cast (CORBA_ValueMember*, this->buffer_);
       }
     }
     else // if (orphan == 1)
@@ -909,7 +412,7 @@ CORBA_ValueMember_out::operator-> (void)
       {
         // We set the state back to default and relinquish
         // ownership.
-        result = ACE_reinterpret_cast(CORBA::ValueMember*,this->buffer_);
+        result = ACE_reinterpret_cast(CORBA_ValueMember*,this->buffer_);
         this->maximum_ = 0;
         this->length_ = 0;
         this->buffer_ = 0;
@@ -919,23 +422,23 @@ CORBA_ValueMember_out::operator-> (void)
     return result;
   }
   
-  ACE_INLINE const CORBA::ValueMember *
+  ACE_INLINE const CORBA_ValueMember *
   _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::get_buffer (void) const
   {
-    return ACE_reinterpret_cast(const CORBA::ValueMember * ACE_CAST_CONST, this->buffer_);
+    return ACE_reinterpret_cast(const CORBA_ValueMember * ACE_CAST_CONST, this->buffer_);
   }
   
   ACE_INLINE void
   _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::replace (CORBA::ULong max,
   CORBA::ULong length,
-  CORBA::ValueMember *data,
+  CORBA_ValueMember *data,
   CORBA::Boolean release)
   {
     this->maximum_ = max;
     this->length_ = length;
     if (this->buffer_ && this->release_ == 1)
     {
-      CORBA::ValueMember *tmp = ACE_reinterpret_cast(CORBA::ValueMember*,this->buffer_);
+      CORBA_ValueMember *tmp = ACE_reinterpret_cast(CORBA_ValueMember*,this->buffer_);
       _TAO_Unbounded_Sequence_CORBA_ValueMemberSeq::freebuf (tmp);
     }
     this->buffer_ = data;
@@ -1052,16 +555,16 @@ CORBA_ValueMemberSeq_var::operator ::CORBA_ValueMemberSeq *&() // cast
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::ValueMember &
+ACE_INLINE CORBA_ValueMember &
 CORBA_ValueMemberSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA::ValueMember &
+ACE_INLINE const CORBA_ValueMember &
 CORBA_ValueMemberSeq_var::operator[] (CORBA::ULong index) const
 {
-  return ACE_const_cast (const CORBA::ValueMember &, this->ptr_->operator[] (index));
+  return ACE_const_cast (const CORBA_ValueMember &, this->ptr_->operator[] (index));
 }
 
 ACE_INLINE const ::CORBA_ValueMemberSeq &
@@ -1155,7 +658,7 @@ CORBA_ValueMemberSeq_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::ValueMember &
+ACE_INLINE CORBA_ValueMember &
 CORBA_ValueMemberSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -1168,228 +671,102 @@ CORBA_ValueMemberSeq_out::operator[] (CORBA::ULong index)
 #if !defined (_CORBA_VALUEMEMBERDEF___CI_)
 #define _CORBA_VALUEMEMBERDEF___CI_
 
-ACE_INLINE
-CORBA_ValueMemberDef::CORBA_ValueMemberDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE CORBA_ValueMemberDef_ptr
+tao_CORBA_ValueMemberDef_duplicate (
+    CORBA_ValueMemberDef_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->CORBA_ValueMemberDef_setup_collocation (_tao_collocated);
+  return CORBA_ValueMemberDef::_duplicate (p);
 }
 
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEMEMBERDEF___VAR_CI_)
-#define _CORBA_VALUEMEMBERDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ValueMemberDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ValueMemberDef_var::CORBA_ValueMemberDef_var (void) // default constructor
-  : ptr_ (CORBA_ValueMemberDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_ValueMemberDef_ptr
-CORBA_ValueMemberDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ValueMemberDef_var::CORBA_ValueMemberDef_var (const ::CORBA_ValueMemberDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_ValueMemberDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_ValueMemberDef_var::~CORBA_ValueMemberDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_ValueMemberDef_var &
-CORBA_ValueMemberDef_var::operator= (CORBA_ValueMemberDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ValueMemberDef_var &
-CORBA_ValueMemberDef_var::operator= (const ::CORBA_ValueMemberDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_ValueMemberDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ValueMemberDef_var::operator const ::CORBA_ValueMemberDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ValueMemberDef_var::operator ::CORBA_ValueMemberDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueMemberDef_ptr
-CORBA_ValueMemberDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueMemberDef_ptr
-CORBA_ValueMemberDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueMemberDef_ptr &
-CORBA_ValueMemberDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueMemberDef_ptr &
-CORBA_ValueMemberDef_var::out (void)
+ACE_INLINE void
+tao_CORBA_ValueMemberDef_release (
+    CORBA_ValueMemberDef_ptr p
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_ValueMemberDef::_nil ();
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_ValueMemberDef_ptr
-CORBA_ValueMemberDef_var::_retn (void)
+ACE_INLINE CORBA_ValueMemberDef_ptr
+tao_CORBA_ValueMemberDef_nil (
+    void
+  )
 {
-  // yield ownership of managed obj reference
-  ::CORBA_ValueMemberDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_ValueMemberDef::_nil ();
-  return val;
+  return CORBA_ValueMemberDef::_nil ();
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEMEMBERDEF___OUT_CI_)
-#define _CORBA_VALUEMEMBERDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ValueMemberDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ValueMemberDef_out::CORBA_ValueMemberDef_out (CORBA_ValueMemberDef_ptr &p)
-  : ptr_ (p)
+ACE_INLINE CORBA_ValueMemberDef_ptr
+tao_CORBA_ValueMemberDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  this->ptr_ = ::CORBA_ValueMemberDef::_nil ();
+  return CORBA_ValueMemberDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE
-CORBA_ValueMemberDef_out::CORBA_ValueMemberDef_out (CORBA_ValueMemberDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
+ACE_INLINE CORBA::Object *
+tao_CORBA_ValueMemberDef_upcast (
+    void *src
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_ValueMemberDef::_nil ();
+  CORBA_ValueMemberDef **tmp =
+    ACE_static_cast (CORBA_ValueMemberDef **, src);
+  return *tmp;
 }
 
 ACE_INLINE
-CORBA_ValueMemberDef_out::CORBA_ValueMemberDef_out (const ::CORBA_ValueMemberDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ValueMemberDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_ValueMemberDef_out &
-CORBA_ValueMemberDef_out::operator= (const ::CORBA_ValueMemberDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ValueMemberDef_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ValueMemberDef_out &
-CORBA_ValueMemberDef_out::operator= (const ::CORBA_ValueMemberDef_var &p)
-{
-  this->ptr_ = ::CORBA_ValueMemberDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_ValueMemberDef_out &
-CORBA_ValueMemberDef_out::operator= (CORBA_ValueMemberDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ValueMemberDef_out::operator ::CORBA_ValueMemberDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueMemberDef_ptr &
-CORBA_ValueMemberDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueMemberDef_ptr
-CORBA_ValueMemberDef_out::operator-> (void)
+CORBA_ValueMemberDef::CORBA_ValueMemberDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->CORBA_ValueMemberDef_setup_collocation (_tao_collocated);
 }
 
 
 #endif /* end #if !defined */
 
 // *************************************************************
-// Inline operations for class CORBA::ValueDef::FullValueDescription_var
+// Inline operations for class CORBA_ValueDef::FullValueDescription_var
 // *************************************************************
 
 ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::FullValueDescription_var (void) // default constructor
+CORBA_ValueDef::FullValueDescription_var::FullValueDescription_var (void) // default constructor
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::FullValueDescription_var (FullValueDescription *p)
+CORBA_ValueDef::FullValueDescription_var::FullValueDescription_var (FullValueDescription *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::FullValueDescription_var (const ::CORBA::ValueDef::FullValueDescription_var &p) // copy constructor
+CORBA_ValueDef::FullValueDescription_var::FullValueDescription_var (const ::CORBA_ValueDef::FullValueDescription_var &p) // copy constructor
 {
   if (p.ptr_)
-    ACE_NEW (this->ptr_, ::CORBA::ValueDef::FullValueDescription (*p.ptr_));
+    ACE_NEW (this->ptr_, ::CORBA_ValueDef::FullValueDescription (*p.ptr_));
   else
     this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::~FullValueDescription_var (void) // destructor
+CORBA_ValueDef::FullValueDescription_var::~FullValueDescription_var (void) // destructor
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA::ValueDef::FullValueDescription_var &
-CORBA::ValueDef::FullValueDescription_var::operator= (FullValueDescription *p)
+ACE_INLINE CORBA_ValueDef::FullValueDescription_var &
+CORBA_ValueDef::FullValueDescription_var::operator= (FullValueDescription *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE ::CORBA::ValueDef::FullValueDescription_var &
-CORBA::ValueDef::FullValueDescription_var::operator= (const ::CORBA::ValueDef::FullValueDescription_var &p)
+ACE_INLINE ::CORBA_ValueDef::FullValueDescription_var &
+CORBA_ValueDef::FullValueDescription_var::operator= (const ::CORBA_ValueDef::FullValueDescription_var &p)
 {
   if (this != &p)
     {
@@ -1416,91 +793,91 @@ CORBA::ValueDef::FullValueDescription_var::operator= (const ::CORBA::ValueDef::F
   return *this;
 }
 
-ACE_INLINE const ::CORBA::ValueDef::FullValueDescription *
-CORBA::ValueDef::FullValueDescription_var::operator-> (void) const
+ACE_INLINE const ::CORBA_ValueDef::FullValueDescription *
+CORBA_ValueDef::FullValueDescription_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::ValueDef::FullValueDescription *
-CORBA::ValueDef::FullValueDescription_var::operator-> (void)
+ACE_INLINE ::CORBA_ValueDef::FullValueDescription *
+CORBA_ValueDef::FullValueDescription_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::operator const ::CORBA::ValueDef::FullValueDescription &() const // cast
+CORBA_ValueDef::FullValueDescription_var::operator const ::CORBA_ValueDef::FullValueDescription &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::operator ::CORBA::ValueDef::FullValueDescription &() // cast 
+CORBA_ValueDef::FullValueDescription_var::operator ::CORBA_ValueDef::FullValueDescription &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::operator ::CORBA::ValueDef::FullValueDescription &() const // cast 
+CORBA_ValueDef::FullValueDescription_var::operator ::CORBA_ValueDef::FullValueDescription &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-CORBA::ValueDef::FullValueDescription_var::operator ::CORBA::ValueDef::FullValueDescription *&() // cast 
+CORBA_ValueDef::FullValueDescription_var::operator ::CORBA_ValueDef::FullValueDescription *&() // cast 
 {
   return this->ptr_;
 }
 
-ACE_INLINE const ::CORBA::ValueDef::FullValueDescription &
-CORBA::ValueDef::FullValueDescription_var::in (void) const
+ACE_INLINE const ::CORBA_ValueDef::FullValueDescription &
+CORBA_ValueDef::FullValueDescription_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE ::CORBA::ValueDef::FullValueDescription &
-CORBA::ValueDef::FullValueDescription_var::inout (void)
+ACE_INLINE ::CORBA_ValueDef::FullValueDescription &
+CORBA_ValueDef::FullValueDescription_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // mapping for variable size 
-ACE_INLINE ::CORBA::ValueDef::FullValueDescription *&
-CORBA::ValueDef::FullValueDescription_var::out (void)
+ACE_INLINE ::CORBA_ValueDef::FullValueDescription *&
+CORBA_ValueDef::FullValueDescription_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::ValueDef::FullValueDescription *
-CORBA::ValueDef::FullValueDescription_var::_retn (void)
+ACE_INLINE ::CORBA_ValueDef::FullValueDescription *
+CORBA_ValueDef::FullValueDescription_var::_retn (void)
 {
-  ::CORBA::ValueDef::FullValueDescription *tmp = this->ptr_;
+  ::CORBA_ValueDef::FullValueDescription *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE ::CORBA::ValueDef::FullValueDescription *
-CORBA::ValueDef::FullValueDescription_var::ptr (void) const
+ACE_INLINE ::CORBA_ValueDef::FullValueDescription *
+CORBA_ValueDef::FullValueDescription_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // *************************************************************
-// Inline operations for class CORBA::ValueDef::FullValueDescription_out
+// Inline operations for class CORBA_ValueDef::FullValueDescription_out
 // *************************************************************
 
 ACE_INLINE
-CORBA::ValueDef::FullValueDescription_out::FullValueDescription_out (::CORBA::ValueDef::FullValueDescription *&p)
+CORBA_ValueDef::FullValueDescription_out::FullValueDescription_out (::CORBA_ValueDef::FullValueDescription *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA::ValueDef::FullValueDescription_out::FullValueDescription_out (FullValueDescription_var &p) // constructor from _var
+CORBA_ValueDef::FullValueDescription_out::FullValueDescription_out (FullValueDescription_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1508,38 +885,38 @@ CORBA::ValueDef::FullValueDescription_out::FullValueDescription_out (FullValueDe
 }
 
 ACE_INLINE
-CORBA::ValueDef::FullValueDescription_out::FullValueDescription_out (const ::CORBA::ValueDef::FullValueDescription_out &p) // copy constructor
+CORBA_ValueDef::FullValueDescription_out::FullValueDescription_out (const ::CORBA_ValueDef::FullValueDescription_out &p) // copy constructor
   : ptr_ (ACE_const_cast (FullValueDescription_out&, p).ptr_)
 {}
 
-ACE_INLINE CORBA::ValueDef::FullValueDescription_out &
-CORBA::ValueDef::FullValueDescription_out::operator= (const ::CORBA::ValueDef::FullValueDescription_out &p)
+ACE_INLINE CORBA_ValueDef::FullValueDescription_out &
+CORBA_ValueDef::FullValueDescription_out::operator= (const ::CORBA_ValueDef::FullValueDescription_out &p)
 {
   this->ptr_ = ACE_const_cast (FullValueDescription_out&, p).ptr_;
   return *this;
 }
 
-ACE_INLINE CORBA::ValueDef::FullValueDescription_out &
-CORBA::ValueDef::FullValueDescription_out::operator= (FullValueDescription *p)
+ACE_INLINE CORBA_ValueDef::FullValueDescription_out &
+CORBA_ValueDef::FullValueDescription_out::operator= (FullValueDescription *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE 
-CORBA::ValueDef::FullValueDescription_out::operator ::CORBA::ValueDef::FullValueDescription *&() // cast
+CORBA_ValueDef::FullValueDescription_out::operator ::CORBA_ValueDef::FullValueDescription *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::ValueDef::FullValueDescription *&
-CORBA::ValueDef::FullValueDescription_out::ptr (void) // ptr
+ACE_INLINE ::CORBA_ValueDef::FullValueDescription *&
+CORBA_ValueDef::FullValueDescription_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE ::CORBA::ValueDef::FullValueDescription *
-CORBA::ValueDef::FullValueDescription_out::operator-> (void)
+ACE_INLINE ::CORBA_ValueDef::FullValueDescription *
+CORBA_ValueDef::FullValueDescription_out::operator-> (void)
 {
   return this->ptr_;
 }
@@ -1548,184 +925,58 @@ CORBA::ValueDef::FullValueDescription_out::operator-> (void)
 #if !defined (_CORBA_VALUEDEF___CI_)
 #define _CORBA_VALUEDEF___CI_
 
-ACE_INLINE
-CORBA_ValueDef::CORBA_ValueDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE CORBA_ValueDef_ptr
+tao_CORBA_ValueDef_duplicate (
+    CORBA_ValueDef_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->CORBA_ValueDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEDEF___VAR_CI_)
-#define _CORBA_VALUEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ValueDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ValueDef_var::CORBA_ValueDef_var (void) // default constructor
-  : ptr_ (CORBA_ValueDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_ValueDef_ptr
-CORBA_ValueDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ValueDef_var::CORBA_ValueDef_var (const ::CORBA_ValueDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_ValueDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_ValueDef_var::~CORBA_ValueDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_ValueDef_var &
-CORBA_ValueDef_var::operator= (CORBA_ValueDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ValueDef_var &
-CORBA_ValueDef_var::operator= (const ::CORBA_ValueDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_ValueDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ValueDef_var::operator const ::CORBA_ValueDef_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ValueDef_var::operator ::CORBA_ValueDef_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueDef_ptr
-CORBA_ValueDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueDef_ptr
-CORBA_ValueDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueDef_ptr &
-CORBA_ValueDef_var::inout (void)
 {
-  return this->ptr_;
+  return CORBA_ValueDef::_duplicate (p);
 }
 
-ACE_INLINE ::CORBA_ValueDef_ptr &
-CORBA_ValueDef_var::out (void)
+ACE_INLINE void
+tao_CORBA_ValueDef_release (
+    CORBA_ValueDef_ptr p
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_ValueDef::_nil ();
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_ValueDef_ptr
-CORBA_ValueDef_var::_retn (void)
+ACE_INLINE CORBA_ValueDef_ptr
+tao_CORBA_ValueDef_nil (
+    void
+  )
 {
-  // yield ownership of managed obj reference
-  ::CORBA_ValueDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_ValueDef::_nil ();
-  return val;
+  return CORBA_ValueDef::_nil ();
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEDEF___OUT_CI_)
-#define _CORBA_VALUEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ValueDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ValueDef_out::CORBA_ValueDef_out (CORBA_ValueDef_ptr &p)
-  : ptr_ (p)
+ACE_INLINE CORBA_ValueDef_ptr
+tao_CORBA_ValueDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  this->ptr_ = ::CORBA_ValueDef::_nil ();
+  return CORBA_ValueDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE
-CORBA_ValueDef_out::CORBA_ValueDef_out (CORBA_ValueDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
+ACE_INLINE CORBA::Object *
+tao_CORBA_ValueDef_upcast (
+    void *src
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_ValueDef::_nil ();
+  CORBA_ValueDef **tmp =
+    ACE_static_cast (CORBA_ValueDef **, src);
+  return *tmp;
 }
 
 ACE_INLINE
-CORBA_ValueDef_out::CORBA_ValueDef_out (const ::CORBA_ValueDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ValueDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_ValueDef_out &
-CORBA_ValueDef_out::operator= (const ::CORBA_ValueDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ValueDef_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ValueDef_out &
-CORBA_ValueDef_out::operator= (const ::CORBA_ValueDef_var &p)
-{
-  this->ptr_ = ::CORBA_ValueDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_ValueDef_out &
-CORBA_ValueDef_out::operator= (CORBA_ValueDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ValueDef_out::operator ::CORBA_ValueDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueDef_ptr &
-CORBA_ValueDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueDef_ptr
-CORBA_ValueDef_out::operator-> (void)
+CORBA_ValueDef::CORBA_ValueDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->CORBA_ValueDef_setup_collocation (_tao_collocated);
 }
 
 
@@ -1928,239 +1179,74 @@ CORBA_ValueDescription_out::operator-> (void)
 #if !defined (_CORBA_VALUEBOXDEF___CI_)
 #define _CORBA_VALUEBOXDEF___CI_
 
-ACE_INLINE
-CORBA_ValueBoxDef::CORBA_ValueBoxDef (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE CORBA_ValueBoxDef_ptr
+tao_CORBA_ValueBoxDef_duplicate (
+    CORBA_ValueBoxDef_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->CORBA_ValueBoxDef_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEBOXDEF___VAR_CI_)
-#define _CORBA_VALUEBOXDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ValueBoxDef_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ValueBoxDef_var::CORBA_ValueBoxDef_var (void) // default constructor
-  : ptr_ (CORBA_ValueBoxDef::_nil ())
-{}
-
-ACE_INLINE ::CORBA_ValueBoxDef_ptr
-CORBA_ValueBoxDef_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ValueBoxDef_var::CORBA_ValueBoxDef_var (const ::CORBA_ValueBoxDef_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_ValueBoxDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_ValueBoxDef_var::~CORBA_ValueBoxDef_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_ValueBoxDef_var &
-CORBA_ValueBoxDef_var::operator= (CORBA_ValueBoxDef_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ValueBoxDef_var &
-CORBA_ValueBoxDef_var::operator= (const ::CORBA_ValueBoxDef_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_ValueBoxDef::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ValueBoxDef_var::operator const ::CORBA_ValueBoxDef_ptr &() const // cast
 {
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ValueBoxDef_var::operator ::CORBA_ValueBoxDef_ptr &() // cast 
-{
-  return this->ptr_;
+  return CORBA_ValueBoxDef::_duplicate (p);
 }
 
-ACE_INLINE ::CORBA_ValueBoxDef_ptr
-CORBA_ValueBoxDef_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueBoxDef_ptr
-CORBA_ValueBoxDef_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueBoxDef_ptr &
-CORBA_ValueBoxDef_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueBoxDef_ptr &
-CORBA_ValueBoxDef_var::out (void)
+ACE_INLINE void
+tao_CORBA_ValueBoxDef_release (
+    CORBA_ValueBoxDef_ptr p
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_ValueBoxDef::_nil ();
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_ValueBoxDef_ptr
-CORBA_ValueBoxDef_var::_retn (void)
+ACE_INLINE CORBA_ValueBoxDef_ptr
+tao_CORBA_ValueBoxDef_nil (
+    void
+  )
 {
-  // yield ownership of managed obj reference
-  ::CORBA_ValueBoxDef_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_ValueBoxDef::_nil ();
-  return val;
+  return CORBA_ValueBoxDef::_nil ();
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_VALUEBOXDEF___OUT_CI_)
-#define _CORBA_VALUEBOXDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ValueBoxDef_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ValueBoxDef_out::CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_ptr &p)
-  : ptr_ (p)
+ACE_INLINE CORBA_ValueBoxDef_ptr
+tao_CORBA_ValueBoxDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  this->ptr_ = ::CORBA_ValueBoxDef::_nil ();
+  return CORBA_ValueBoxDef::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE
-CORBA_ValueBoxDef_out::CORBA_ValueBoxDef_out (CORBA_ValueBoxDef_var &p) // constructor from _var
-  : ptr_ (p.out ())
+ACE_INLINE CORBA::Object *
+tao_CORBA_ValueBoxDef_upcast (
+    void *src
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_ValueBoxDef::_nil ();
+  CORBA_ValueBoxDef **tmp =
+    ACE_static_cast (CORBA_ValueBoxDef **, src);
+  return *tmp;
 }
 
 ACE_INLINE
-CORBA_ValueBoxDef_out::CORBA_ValueBoxDef_out (const ::CORBA_ValueBoxDef_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ValueBoxDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_ValueBoxDef_out &
-CORBA_ValueBoxDef_out::operator= (const ::CORBA_ValueBoxDef_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ValueBoxDef_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ValueBoxDef_out &
-CORBA_ValueBoxDef_out::operator= (const ::CORBA_ValueBoxDef_var &p)
-{
-  this->ptr_ = ::CORBA_ValueBoxDef::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_ValueBoxDef_out &
-CORBA_ValueBoxDef_out::operator= (CORBA_ValueBoxDef_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ValueBoxDef_out::operator ::CORBA_ValueBoxDef_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueBoxDef_ptr &
-CORBA_ValueBoxDef_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_ValueBoxDef_ptr
-CORBA_ValueBoxDef_out::operator-> (void)
+CORBA_ValueBoxDef::CORBA_ValueBoxDef (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->CORBA_ValueBoxDef_setup_collocation (_tao_collocated);
 }
 
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::FixedDef_ptr
+    const CORBA_FixedDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::FixedDef_ptr &
+    CORBA_FixedDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::FixedDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::FixedDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::FixedDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ValueMember &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_ValueMember &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.name.in ()) &&
@@ -2177,7 +1263,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ValueMem
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ValueMember &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ValueMember &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.name.out ()) &&
@@ -2200,76 +1286,36 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ValueMember &_t
 
 CORBA::Boolean TAO_IFR_Client_Export operator<< (
     TAO_OutputCDR &,
-    const CORBA::ValueMemberSeq &
+    const CORBA_ValueMemberSeq &
   );
 CORBA::Boolean TAO_IFR_Client_Export operator>> (
     TAO_InputCDR &,
-    CORBA::ValueMemberSeq &
+    CORBA_ValueMemberSeq &
   );
 
 #endif /* _TAO_CDR_OP_CORBA_ValueMemberSeq_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::ValueMemberDef_ptr
+    const CORBA_ValueMemberDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::ValueMemberDef_ptr &
+    CORBA_ValueMemberDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ValueMemberDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ValueMemberDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::ValueMemberDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::ValueDef_ptr
+    const CORBA_ValueDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::ValueDef_ptr &
+    CORBA_ValueDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ValueDef::FullValueDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_ValueDef::FullValueDescription &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.name.in ()) &&
@@ -2294,7 +1340,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ValueDef
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ValueDef::FullValueDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ValueDef::FullValueDescription &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.name.out ()) &&
@@ -2319,45 +1365,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ValueDef::FullV
   
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ValueDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ValueDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::ValueDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ValueDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_ValueDescription &_tao_aggregate)
 {
   if (
     (strm << _tao_aggregate.name.in ()) &&
@@ -2377,7 +1385,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ValueDes
   
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ValueDescription &_tao_aggregate)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ValueDescription &_tao_aggregate)
 {
   if (
     (strm >> _tao_aggregate.name.out ()) &&
@@ -2397,52 +1405,13 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ValueDescriptio
   
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::ValueBoxDef_ptr
+    const CORBA_ValueBoxDef_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::ValueBoxDef_ptr &
+    CORBA_ValueBoxDef_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::ValueBoxDef_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA::ValueBoxDef_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA::ValueBoxDef::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
diff --git a/TAO/tao/IFR_Client/diffs/IFR_Base.pidl.diff b/TAO/tao/IFR_Client/diffs/IFR_Base.pidl.diff
new file mode 100644
index 00000000000..346c1cba939
--- /dev/null
+++ b/TAO/tao/IFR_Client/diffs/IFR_Base.pidl.diff
@@ -0,0 +1,395 @@
+--- orig/IFR_Base.pidl	Mon Apr 23 20:19:25 2001
++++ IFR_Base.pidl	Thu Apr 19 00:40:20 2001
+@@ -66,12 +66,14 @@
+ #ifndef _IFR_BASE_IDL_
+ #define _IFR_BASE_IDL_
+ 
+-#include <orb.idl>
+-
+ #pragma prefix "omg.org"
+ 
+ module CORBA
+ {
++  typedef string Identifier;
++  typedef string ScopedName;
++  typedef string RepositoryId;
++
+   enum DefinitionKind 
+   {
+     dk_none, 
+@@ -101,34 +103,36 @@
+     dk_AbstractInterface,
+     dk_LocalInterface
+   };
+-};
+ 
+-  interface CORBA_IRObject 
++  interface IRObject 
+   {
+     // read interface
+-    readonly attribute CORBA::DefinitionKind def_kind;
++    readonly attribute DefinitionKind def_kind;
+     // write interface
+     void destroy ();
+   };
+ 
+-  interface CORBA_Repository;
+-  interface CORBA_Container;
++  typedef string VersionSpec;
+ 
+-  interface CORBA_Contained : CORBA_IRObject 
++  interface Contained;
++  interface Repository;
++  interface Container;
++
++  interface Contained : IRObject 
+   {
+     // read/write interface
+-    attribute string id;
+-    attribute string name;
+-    attribute string version;
++    attribute RepositoryId id;
++    attribute Identifier name;
++    attribute VersionSpec version;
+ 
+     // read interface
+-    readonly attribute CORBA_Container defined_in;
+-    readonly attribute string absolute_name;
+-    readonly attribute CORBA_Repository containing_repository;
++    readonly attribute Container defined_in;
++    readonly attribute ScopedName absolute_name;
++    readonly attribute Repository containing_repository;
+     
+     struct Description 
+     {
+-      CORBA::DefinitionKind kind;
++      DefinitionKind kind;
+       any value;
+     };
+ 
+@@ -136,194 +140,195 @@
+ 
+     // write interface
+     void move (
+-        in CORBA_Container new_container,
+-        in string new_name,
+-        in string new_version
++        in Container new_container,
++        in Identifier new_name,
++        in VersionSpec new_version
+       );
+   };
+ 
+-  typedef sequence <CORBA_Contained> CORBA_ContainedSeq;
++  typedef sequence <Contained> ContainedSeq;
+ 
+-  interface CORBA_ModuleDef;
+-  interface CORBA_ConstantDef;
+-  interface CORBA_IDLType;
+-  interface CORBA_StructDef;
+-  interface CORBA_UnionDef;
+-  interface CORBA_EnumDef;
+-  interface CORBA_AliasDef;
+-  interface CORBA_InterfaceDef;
+-  typedef sequence<CORBA_InterfaceDef> CORBA_InterfaceDefSeq;
+-  interface CORBA_ExceptionDef;
+-  interface CORBA_NativeDef;
+-  interface CORBA_ValueDef;
+-  typedef sequence<CORBA_ValueDef> CORBA_ValueDefSeq;
+-  interface CORBA_ValueBoxDef;
+-  interface CORBA_AbstractInterfaceDef;
+-  typedef sequence<CORBA_AbstractInterfaceDef> CORBA_AbstractInterfaceDefSeq;
+-  interface CORBA_LocalInterfaceDef;
+-  typedef sequence<CORBA_LocalInterfaceDef> CORBA_LocalInterfaceDefSeq;
++  interface ModuleDef;
++  interface ConstantDef;
++  interface IDLType;
++  interface StructDef;
++  interface UnionDef;
++  interface EnumDef;
++  interface AliasDef;
++  interface InterfaceDef;
++  typedef sequence<InterfaceDef> InterfaceDefSeq;
++  interface ExceptionDef;
++  interface NativeDef;
++  interface ValueDef;
++  typedef sequence<ValueDef> ValueDefSeq;
++  interface ValueBoxDef;
++  interface AbstractInterfaceDef;
++  typedef sequence<AbstractInterfaceDef> AbstractInterfaceDefSeq;
++  interface LocalInterfaceDef;
++  typedef sequence<LocalInterfaceDef> LocalInterfaceDefSeq;
+ 
+-  struct CORBA_StructMember 
++  struct StructMember 
+   {
+-    string name;
+-    CORBA::TypeCode type;
+-    CORBA_IDLType type_def;
++    Identifier name;
++    TypeCode type;
++    IDLType type_def;
+   };
+ 
+-  typedef sequence <CORBA_StructMember> CORBA_StructMemberSeq;
++  typedef sequence <StructMember> StructMemberSeq;
+ 
+-  struct CORBA_Initializer 
++  struct Initializer 
+   {
+-    CORBA_StructMemberSeq members;
+-    string name;
++    StructMemberSeq members;
++    Identifier name;
+   };
+ 
+-  typedef sequence <CORBA_Initializer> CORBA_InitializerSeq;
++  typedef sequence <Initializer> InitializerSeq;
+ 
+-  struct CORBA_UnionMember 
++  struct UnionMember 
+   {
+-    string name;
++    Identifier name;
+     any label;
+-    CORBA::TypeCode type;
+-    CORBA_IDLType type_def;
++    TypeCode type;
++    IDLType type_def;
+   };
+ 
+-  typedef sequence <CORBA_UnionMember> CORBA_UnionMemberSeq;
+-  typedef sequence <string> CORBA_EnumMemberSeq;
++  typedef sequence <UnionMember> UnionMemberSeq;
++  typedef sequence <Identifier> EnumMemberSeq;
+ 
+-  interface CORBA_Container : CORBA_IRObject 
++  interface Container : IRObject 
+   {
+     // read interface
+-    CORBA_Contained lookup (
+-        in string search_name
++    Contained lookup (
++        in ScopedName search_name
+       );
+-    CORBA_ContainedSeq contents (
+-        in CORBA::DefinitionKind limit_type,
++    ContainedSeq contents (
++        in DefinitionKind limit_type,
+         in boolean exclude_inherited
+       );
+-    CORBA_ContainedSeq lookup_name (
+-        in string search_name,
++    ContainedSeq lookup_name (
++        in Identifier search_name,
+         in long levels_to_search,
+-        in CORBA::DefinitionKind limit_type,
++        in DefinitionKind limit_type,
+         in boolean exclude_inherited
+       );
+     struct Description 
+     {
+-      CORBA_Contained contained_object;
+-      CORBA::DefinitionKind kind;
++      Contained contained_object;
++      DefinitionKind kind;
+       any value;
+     };
+ 
+     typedef sequence<Description> DescriptionSeq;
+ 
+     DescriptionSeq describe_contents (
+-        in CORBA::DefinitionKind limit_type,
++        in DefinitionKind limit_type,
+         in boolean exclude_inherited,
+         in long max_returned_objs
+       );
+     // write interface
+-    CORBA_ModuleDef create_module (
+-        in string id,
+-        in string name,
+-        in string version
+-      );
+-    CORBA_ConstantDef create_constant (
+-        in string id,
+-        in string name,
+-        in string version,
+-        in CORBA_IDLType type,
++    ModuleDef create_module (
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version
++      );
++    ConstantDef create_constant (
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version,
++        in IDLType type,
+         in any value
+       );
+-    CORBA_StructDef create_struct (
+-        in string id,
+-        in string name,
+-        in string version,
+-        in CORBA_StructMemberSeq members
+-      );
+-    CORBA_UnionDef create_union (
+-        in string id,
+-        in string name,
+-        in string version,
+-        in CORBA_IDLType discriminator_type,
+-        in CORBA_UnionMemberSeq members
+-      );
+-    CORBA_EnumDef create_enum (
+-        in string id,
+-        in string name,
+-        in string version,
+-        in CORBA_EnumMemberSeq members
+-      );
+-    CORBA_AliasDef create_alias (
+-        in string id,
+-        in string name,
+-        in string version,
+-        in CORBA_IDLType original_type
+-      );
+-    CORBA_InterfaceDef create_interface (
+-        in string id,
+-        in string name,
+-        in string version,
+-        in CORBA_InterfaceDefSeq base_interfaces
+-      );
+-    CORBA_ValueDef create_value(
+-        in string id,
+-        in string name,
+-        in string version,
++    StructDef create_struct (
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version,
++        in StructMemberSeq members
++      );
++    UnionDef create_union (
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version,
++        in IDLType discriminator_type,
++        in UnionMemberSeq members
++      );
++    EnumDef create_enum (
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version,
++        in EnumMemberSeq members
++      );
++    AliasDef create_alias (
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version,
++        in IDLType original_type
++      );
++    InterfaceDef create_interface (
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version,
++        in InterfaceDefSeq base_interfaces
++      );
++    ValueDef create_value(
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version,
+         in boolean is_custom,
+         in boolean is_abstract,
+-        in CORBA_ValueDef base_value,
++        in ValueDef base_value,
+         in boolean is_truncatable,
+-        in CORBA_ValueDefSeq abstract_base_values,
+-        in CORBA_InterfaceDefSeq supported_interfaces,
+-        in CORBA_InitializerSeq initializers
++        in ValueDefSeq abstract_base_values,
++        in InterfaceDefSeq supported_interfaces,
++        in InitializerSeq initializers
+       );
+-    CORBA_ValueBoxDef create_value_box(
+-        in string id,
+-        in string name,
+-        in string version,
+-        in CORBA_IDLType original_type_def
++    ValueBoxDef create_value_box(
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version,
++        in IDLType original_type_def
+       );
+-    CORBA_ExceptionDef create_exception(
+-        in string id,
+-        in string name,
+-        in string version,
+-        in CORBA_StructMemberSeq members
++    ExceptionDef create_exception(
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version,
++        in StructMemberSeq members
+       );
+-    CORBA_NativeDef create_native(
+-        in string id,
+-        in string name,
+-        in string version
++    NativeDef create_native(
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version
+       );
+-    CORBA_AbstractInterfaceDef create_abstract_interface (
+-        in string id,
+-        in string name,
+-        in string version,
+-        in CORBA_AbstractInterfaceDefSeq base_interfaces
++    AbstractInterfaceDef create_abstract_interface (
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version,
++        in AbstractInterfaceDefSeq base_interfaces
+       );
+-    CORBA_LocalInterfaceDef create_local_interface (
+-        in string id,
+-        in string name,
+-        in string version,
+-        in CORBA_InterfaceDefSeq base_interfaces
++    LocalInterfaceDef create_local_interface (
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version,
++        in InterfaceDefSeq base_interfaces
+       );
+   };
+ 
+-  interface CORBA_IDLType : CORBA_IRObject 
++  interface IDLType : IRObject 
+   {
+-    readonly attribute CORBA::TypeCode type;
++    readonly attribute TypeCode type;
+   };
+ 
+-  interface CORBA_TypedefDef : CORBA_Contained, CORBA_IDLType 
++  interface TypedefDef : Contained, IDLType 
+   {
+   };
+ 
+-  struct CORBA_TypeDescription 
++  struct TypeDescription 
+   {
+-    string name;
+-    string id;
+-    string defined_in;
+-    string version;
+-    CORBA::TypeCode type;
++    Identifier name;
++    RepositoryId id;
++    RepositoryId defined_in;
++    VersionSpec version;
++    TypeCode type;
++  };
+   };
+ 
+ #pragma prefix ""
diff --git a/TAO/tao/IFR_Client/diffs/IFR_BaseC.cpp.diff b/TAO/tao/IFR_Client/diffs/IFR_BaseC.cpp.diff
new file mode 100644
index 00000000000..3ccd7f7e4e2
--- /dev/null
+++ b/TAO/tao/IFR_Client/diffs/IFR_BaseC.cpp.diff
@@ -0,0 +1,2328 @@
+--- orig/IFR_BaseC.cpp	Mon Apr 23 20:19:29 2001
++++ IFR_BaseC.cpp	Mon Apr 23 19:56:56 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:
+@@ -20,10 +20,9 @@
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+ #include "IFR_BaseC.h"
+-
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
++#include "tao/corbafwd.h"
+ #include "tao/ClientRequestInfo.h"
++
+ #if TAO_HAS_INTERCEPTORS == 1
+ #include "tao/RequestInfo_Util.h"
+ #endif  /* TAO_HAS_INTERCEPTORS == 1 */
+@@ -36,154 +35,6 @@
+ #include "IFR_BaseC.i"
+ #endif /* !defined INLINE */
+ 
+-static const CORBA::Long _oc_CORBA_DefinitionKind[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  37,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x412f4465), 
+-  ACE_NTOHL (0x66696e69), 
+-  ACE_NTOHL (0x74696f6e), 
+-  ACE_NTOHL (0x4b696e64), 
+-  ACE_NTOHL (0x3a312e30), 
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/DefinitionKind:1.0
+-  15,
+-  ACE_NTOHL (0x44656669), 
+-  ACE_NTOHL (0x6e697469), 
+-  ACE_NTOHL (0x6f6e4b69), 
+-  ACE_NTOHL (0x6e640000),  // name = DefinitionKind
+-  26, // member count
+-  8,
+-  ACE_NTOHL (0x646b5f6e), 
+-  ACE_NTOHL (0x6f6e6500),  // name = dk_none
+-  7,
+-  ACE_NTOHL (0x646b5f61), 
+-  ACE_NTOHL (0x6c6c0000),  // name = dk_all
+-  13,
+-  ACE_NTOHL (0x646b5f41), 
+-  ACE_NTOHL (0x74747269), 
+-  ACE_NTOHL (0x62757465), 
+-  ACE_NTOHL (0x0),  // name = dk_Attribute
+-  12,
+-  ACE_NTOHL (0x646b5f43), 
+-  ACE_NTOHL (0x6f6e7374), 
+-  ACE_NTOHL (0x616e7400),  // name = dk_Constant
+-  13,
+-  ACE_NTOHL (0x646b5f45), 
+-  ACE_NTOHL (0x78636570), 
+-  ACE_NTOHL (0x74696f6e), 
+-  ACE_NTOHL (0x0),  // name = dk_Exception
+-  13,
+-  ACE_NTOHL (0x646b5f49), 
+-  ACE_NTOHL (0x6e746572), 
+-  ACE_NTOHL (0x66616365), 
+-  ACE_NTOHL (0x0),  // name = dk_Interface
+-  10,
+-  ACE_NTOHL (0x646b5f4d), 
+-  ACE_NTOHL (0x6f64756c), 
+-  ACE_NTOHL (0x65000000),  // name = dk_Module
+-  13,
+-  ACE_NTOHL (0x646b5f4f), 
+-  ACE_NTOHL (0x70657261), 
+-  ACE_NTOHL (0x74696f6e), 
+-  ACE_NTOHL (0x0),  // name = dk_Operation
+-  11,
+-  ACE_NTOHL (0x646b5f54), 
+-  ACE_NTOHL (0x79706564), 
+-  ACE_NTOHL (0x65660000),  // name = dk_Typedef
+-  9,
+-  ACE_NTOHL (0x646b5f41), 
+-  ACE_NTOHL (0x6c696173), 
+-  ACE_NTOHL (0x0),  // name = dk_Alias
+-  10,
+-  ACE_NTOHL (0x646b5f53), 
+-  ACE_NTOHL (0x74727563), 
+-  ACE_NTOHL (0x74000000),  // name = dk_Struct
+-  9,
+-  ACE_NTOHL (0x646b5f55), 
+-  ACE_NTOHL (0x6e696f6e), 
+-  ACE_NTOHL (0x0),  // name = dk_Union
+-  8,
+-  ACE_NTOHL (0x646b5f45), 
+-  ACE_NTOHL (0x6e756d00),  // name = dk_Enum
+-  13,
+-  ACE_NTOHL (0x646b5f50), 
+-  ACE_NTOHL (0x72696d69), 
+-  ACE_NTOHL (0x74697665), 
+-  ACE_NTOHL (0x0),  // name = dk_Primitive
+-  10,
+-  ACE_NTOHL (0x646b5f53), 
+-  ACE_NTOHL (0x7472696e), 
+-  ACE_NTOHL (0x67000000),  // name = dk_String
+-  12,
+-  ACE_NTOHL (0x646b5f53), 
+-  ACE_NTOHL (0x65717565), 
+-  ACE_NTOHL (0x6e636500),  // name = dk_Sequence
+-  9,
+-  ACE_NTOHL (0x646b5f41), 
+-  ACE_NTOHL (0x72726179), 
+-  ACE_NTOHL (0x0),  // name = dk_Array
+-  14,
+-  ACE_NTOHL (0x646b5f52), 
+-  ACE_NTOHL (0x65706f73), 
+-  ACE_NTOHL (0x69746f72), 
+-  ACE_NTOHL (0x79000000),  // name = dk_Repository
+-  11,
+-  ACE_NTOHL (0x646b5f57), 
+-  ACE_NTOHL (0x73747269), 
+-  ACE_NTOHL (0x6e670000),  // name = dk_Wstring
+-  9,
+-  ACE_NTOHL (0x646b5f46), 
+-  ACE_NTOHL (0x69786564), 
+-  ACE_NTOHL (0x0),  // name = dk_Fixed
+-  9,
+-  ACE_NTOHL (0x646b5f56), 
+-  ACE_NTOHL (0x616c7565), 
+-  ACE_NTOHL (0x0),  // name = dk_Value
+-  12,
+-  ACE_NTOHL (0x646b5f56), 
+-  ACE_NTOHL (0x616c7565), 
+-  ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
+-  15,
+-  ACE_NTOHL (0x646b5f56), 
+-  ACE_NTOHL (0x616c7565), 
+-  ACE_NTOHL (0x4d656d62), 
+-  ACE_NTOHL (0x65720000),  // name = dk_ValueMember
+-  10,
+-  ACE_NTOHL (0x646b5f4e), 
+-  ACE_NTOHL (0x61746976), 
+-  ACE_NTOHL (0x65000000),  // name = dk_Native
+-  21,
+-  ACE_NTOHL (0x646b5f41), 
+-  ACE_NTOHL (0x62737472), 
+-  ACE_NTOHL (0x61637449), 
+-  ACE_NTOHL (0x6e746572), 
+-  ACE_NTOHL (0x66616365), 
+-  ACE_NTOHL (0x0),  // name = dk_AbstractInterface
+-  18,
+-  ACE_NTOHL (0x646b5f4c), 
+-  ACE_NTOHL (0x6f63616c), 
+-  ACE_NTOHL (0x496e7465), 
+-  ACE_NTOHL (0x72666163), 
+-  ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_DefinitionKind (
+-    CORBA::tk_enum,
+-    sizeof (_oc_CORBA_DefinitionKind),
+-    (char *) &_oc_CORBA_DefinitionKind,
+-    0,
+-    sizeof (CORBA::DefinitionKind)
+-  );
+-
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_DefinitionKind, &_tc_TAO_tc_CORBA_DefinitionKind)
+-TAO_NAMESPACE_END
+-
+ // *************************************************************
+ // Operations for class CORBA_IRObject_var
+ // *************************************************************
+@@ -944,7 +795,7 @@
+     return CORBA_IRObject::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_IRObject:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IRObject:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_IRObject::_nil ());
+       if (is_a == 0)
+         return CORBA_IRObject::_nil ();
+@@ -1012,7 +863,7 @@
+ CORBA::Boolean CORBA_IRObject::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -1037,7 +888,7 @@
+ 
+ const char* CORBA_IRObject::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_IRObject:1.0";
++  return "IDL:omg.org/CORBA/IRObject:1.0";
+ }
+ 
+ CORBA::DefinitionKind CORBA_IRObject::def_kind (
+@@ -1074,36 +925,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_IRObject[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  31,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4952), 
+-  ACE_NTOHL (0x4f626a65), 
+-  ACE_NTOHL (0x63743a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_IRObject:1.0
+-  15,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4952), 
+-  ACE_NTOHL (0x4f626a65), 
+-  ACE_NTOHL (0x63740000),  // name = CORBA_IRObject
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_IRObject (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_IRObject),
+-    (char *) &_oc_CORBA_IRObject,
+-    0,
+-    sizeof (CORBA_IRObject)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_IRObject =
+-  &_tc_TAO_tc_CORBA_IRObject;
+-
+ // *************************************************************
+ // Operations for class CORBA_Contained_var
+ // *************************************************************
+@@ -4161,7 +3982,7 @@
+     return CORBA_Contained::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_Contained:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Contained:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_Contained::_nil ());
+       if (is_a == 0)
+         return CORBA_Contained::_nil ();
+@@ -4229,8 +4050,8 @@
+ CORBA::Boolean CORBA_Contained::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -4267,7 +4088,7 @@
+ 
+ const char* CORBA_Contained::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_Contained:1.0";
++  return "IDL:omg.org/CORBA/Contained:1.0";
+ }
+ 
+ char * CORBA_Contained::id (
+@@ -4437,13 +4258,13 @@
+   ACE_NTOHL (0x6f6d672e), 
+   ACE_NTOHL (0x6f72672f), 
+   ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f436f), 
++  ACE_NTOHL (0x412f436f), 
+   ACE_NTOHL (0x6e746169), 
+   ACE_NTOHL (0x6e65642f), 
+   ACE_NTOHL (0x44657363), 
+   ACE_NTOHL (0x72697074), 
+   ACE_NTOHL (0x696f6e3a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_Contained/Description:1.0
++  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained/Description:1.0
+   12,
+   ACE_NTOHL (0x44657363), 
+   ACE_NTOHL (0x72697074), 
+@@ -4650,37 +4471,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_Contained[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  32,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f436f), 
+-  ACE_NTOHL (0x6e746169), 
+-  ACE_NTOHL (0x6e65643a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_Contained:1.0
+-  16,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f436f), 
+-  ACE_NTOHL (0x6e746169), 
+-  ACE_NTOHL (0x6e656400),  // name = CORBA_Contained
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_Contained (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_Contained),
+-    (char *) &_oc_CORBA_Contained,
+-    0,
+-    sizeof (CORBA_Contained)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_Contained =
+-  &_tc_TAO_tc_CORBA_Contained;
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+ #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CS_)
+@@ -4821,62 +4611,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_CORBA_ContainedSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  35,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f436f), 
+-  ACE_NTOHL (0x6e746169), 
+-  ACE_NTOHL (0x6e656453), 
+-  ACE_NTOHL (0x65713a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ContainedSeq:1.0
+-  19,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f436f), 
+-  ACE_NTOHL (0x6e746169), 
+-  ACE_NTOHL (0x6e656453), 
+-  ACE_NTOHL (0x65710000),  // name = CORBA_ContainedSeq
+-  CORBA::tk_sequence, // typecode kind
+-  76, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_objref, // typecode kind
+-    60, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      32,
+-      ACE_NTOHL (0x49444c3a), 
+-      ACE_NTOHL (0x6f6d672e), 
+-      ACE_NTOHL (0x6f72672f), 
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f436f), 
+-      ACE_NTOHL (0x6e746169), 
+-      ACE_NTOHL (0x6e65643a), 
+-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_Contained:1.0
+-      16,
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f436f), 
+-      ACE_NTOHL (0x6e746169), 
+-      ACE_NTOHL (0x6e656400),  // name = CORBA_Contained
+-
+-    0U,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ContainedSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_ContainedSeq),
+-    (char *) &_oc_CORBA_ContainedSeq,
+-    0,
+-    sizeof (CORBA_ContainedSeq)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ContainedSeq =
+-  &_tc_TAO_tc_CORBA_ContainedSeq;
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+ #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CS_)
+@@ -5016,66 +4750,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_CORBA_InterfaceDefSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  38,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f496e), 
+-  ACE_NTOHL (0x74657266), 
+-  ACE_NTOHL (0x61636544), 
+-  ACE_NTOHL (0x65665365), 
+-  ACE_NTOHL (0x713a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_InterfaceDefSeq:1.0
+-  22,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f496e), 
+-  ACE_NTOHL (0x74657266), 
+-  ACE_NTOHL (0x61636544), 
+-  ACE_NTOHL (0x65665365), 
+-  ACE_NTOHL (0x71000000),  // name = CORBA_InterfaceDefSeq
+-  CORBA::tk_sequence, // typecode kind
+-  84, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_objref, // typecode kind
+-    68, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      35,
+-      ACE_NTOHL (0x49444c3a), 
+-      ACE_NTOHL (0x6f6d672e), 
+-      ACE_NTOHL (0x6f72672f), 
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f496e), 
+-      ACE_NTOHL (0x74657266), 
+-      ACE_NTOHL (0x61636544), 
+-      ACE_NTOHL (0x65663a31), 
+-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_InterfaceDef:1.0
+-      19,
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f496e), 
+-      ACE_NTOHL (0x74657266), 
+-      ACE_NTOHL (0x61636544), 
+-      ACE_NTOHL (0x65660000),  // name = CORBA_InterfaceDef
+-
+-    0U,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDefSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_InterfaceDefSeq),
+-    (char *) &_oc_CORBA_InterfaceDefSeq,
+-    0,
+-    sizeof (CORBA_InterfaceDefSeq)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_InterfaceDefSeq =
+-  &_tc_TAO_tc_CORBA_InterfaceDefSeq;
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+ #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CS_)
+@@ -5215,62 +4889,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_CORBA_ValueDefSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  34,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5661), 
+-  ACE_NTOHL (0x6c756544), 
+-  ACE_NTOHL (0x65665365), 
+-  ACE_NTOHL (0x713a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_ValueDefSeq:1.0
+-  18,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5661), 
+-  ACE_NTOHL (0x6c756544), 
+-  ACE_NTOHL (0x65665365), 
+-  ACE_NTOHL (0x71000000),  // name = CORBA_ValueDefSeq
+-  CORBA::tk_sequence, // typecode kind
+-  76, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_objref, // typecode kind
+-    60, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      31,
+-      ACE_NTOHL (0x49444c3a), 
+-      ACE_NTOHL (0x6f6d672e), 
+-      ACE_NTOHL (0x6f72672f), 
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f5661), 
+-      ACE_NTOHL (0x6c756544), 
+-      ACE_NTOHL (0x65663a31), 
+-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ValueDef:1.0
+-      15,
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f5661), 
+-      ACE_NTOHL (0x6c756544), 
+-      ACE_NTOHL (0x65660000),  // name = CORBA_ValueDef
+-
+-    0U,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDefSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_ValueDefSeq),
+-    (char *) &_oc_CORBA_ValueDefSeq,
+-    0,
+-    sizeof (CORBA_ValueDefSeq)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ValueDefSeq =
+-  &_tc_TAO_tc_CORBA_ValueDefSeq;
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+ #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_)
+@@ -5410,74 +5028,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_CORBA_AbstractInterfaceDefSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  46,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4162), 
+-  ACE_NTOHL (0x73747261), 
+-  ACE_NTOHL (0x6374496e), 
+-  ACE_NTOHL (0x74657266), 
+-  ACE_NTOHL (0x61636544), 
+-  ACE_NTOHL (0x65665365), 
+-  ACE_NTOHL (0x713a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_AbstractInterfaceDefSeq:1.0
+-  30,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4162), 
+-  ACE_NTOHL (0x73747261), 
+-  ACE_NTOHL (0x6374496e), 
+-  ACE_NTOHL (0x74657266), 
+-  ACE_NTOHL (0x61636544), 
+-  ACE_NTOHL (0x65665365), 
+-  ACE_NTOHL (0x71000000),  // name = CORBA_AbstractInterfaceDefSeq
+-  CORBA::tk_sequence, // typecode kind
+-  100, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_objref, // typecode kind
+-    84, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      43,
+-      ACE_NTOHL (0x49444c3a), 
+-      ACE_NTOHL (0x6f6d672e), 
+-      ACE_NTOHL (0x6f72672f), 
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f4162), 
+-      ACE_NTOHL (0x73747261), 
+-      ACE_NTOHL (0x6374496e), 
+-      ACE_NTOHL (0x74657266), 
+-      ACE_NTOHL (0x61636544), 
+-      ACE_NTOHL (0x65663a31), 
+-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_AbstractInterfaceDef:1.0
+-      27,
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f4162), 
+-      ACE_NTOHL (0x73747261), 
+-      ACE_NTOHL (0x6374496e), 
+-      ACE_NTOHL (0x74657266), 
+-      ACE_NTOHL (0x61636544), 
+-      ACE_NTOHL (0x65660000),  // name = CORBA_AbstractInterfaceDef
+-
+-    0U,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_AbstractInterfaceDefSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_AbstractInterfaceDefSeq),
+-    (char *) &_oc_CORBA_AbstractInterfaceDefSeq,
+-    0,
+-    sizeof (CORBA_AbstractInterfaceDefSeq)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_AbstractInterfaceDefSeq =
+-  &_tc_TAO_tc_CORBA_AbstractInterfaceDefSeq;
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+ #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CS_)
+@@ -5617,134 +5167,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_CORBA_LocalInterfaceDefSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  43,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4c6f), 
+-  ACE_NTOHL (0x63616c49), 
+-  ACE_NTOHL (0x6e746572), 
+-  ACE_NTOHL (0x66616365), 
+-  ACE_NTOHL (0x44656653), 
+-  ACE_NTOHL (0x65713a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_LocalInterfaceDefSeq:1.0
+-  27,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4c6f), 
+-  ACE_NTOHL (0x63616c49), 
+-  ACE_NTOHL (0x6e746572), 
+-  ACE_NTOHL (0x66616365), 
+-  ACE_NTOHL (0x44656653), 
+-  ACE_NTOHL (0x65710000),  // name = CORBA_LocalInterfaceDefSeq
+-  CORBA::tk_sequence, // typecode kind
+-  92, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_objref, // typecode kind
+-    76, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      40,
+-      ACE_NTOHL (0x49444c3a), 
+-      ACE_NTOHL (0x6f6d672e), 
+-      ACE_NTOHL (0x6f72672f), 
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f4c6f), 
+-      ACE_NTOHL (0x63616c49), 
+-      ACE_NTOHL (0x6e746572), 
+-      ACE_NTOHL (0x66616365), 
+-      ACE_NTOHL (0x4465663a), 
+-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_LocalInterfaceDef:1.0
+-      24,
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f4c6f), 
+-      ACE_NTOHL (0x63616c49), 
+-      ACE_NTOHL (0x6e746572), 
+-      ACE_NTOHL (0x66616365), 
+-      ACE_NTOHL (0x44656600),  // name = CORBA_LocalInterfaceDef
+-
+-    0U,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_LocalInterfaceDefSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_LocalInterfaceDefSeq),
+-    (char *) &_oc_CORBA_LocalInterfaceDefSeq,
+-    0,
+-    sizeof (CORBA_LocalInterfaceDefSeq)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_LocalInterfaceDefSeq =
+-  &_tc_TAO_tc_CORBA_LocalInterfaceDefSeq;
+-
+-static const CORBA::Long _oc_CORBA_StructMember[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  35,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5374), 
+-  ACE_NTOHL (0x72756374), 
+-  ACE_NTOHL (0x4d656d62), 
+-  ACE_NTOHL (0x65723a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_StructMember:1.0
+-  19,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5374), 
+-  ACE_NTOHL (0x72756374), 
+-  ACE_NTOHL (0x4d656d62), 
+-  ACE_NTOHL (0x65720000),  // name = CORBA_StructMember
+-  3, // member count
+-  5,
+-  ACE_NTOHL (0x6e616d65), 
+-  ACE_NTOHL (0x0),  // name = name
+-  CORBA::tk_string, 
+-  0U, // string length
+-  5,
+-  ACE_NTOHL (0x74797065), 
+-  ACE_NTOHL (0x0),  // name = type
+-  CORBA::tk_TypeCode,
+-
+-  9,
+-  ACE_NTOHL (0x74797065), 
+-  ACE_NTOHL (0x5f646566), 
+-  ACE_NTOHL (0x0),  // name = type_def
+-  CORBA::tk_objref, // typecode kind
+-  60, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    30,
+-    ACE_NTOHL (0x49444c3a), 
+-    ACE_NTOHL (0x6f6d672e), 
+-    ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4944), 
+-    ACE_NTOHL (0x4c547970), 
+-    ACE_NTOHL (0x653a312e), 
+-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-    14,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4944), 
+-    ACE_NTOHL (0x4c547970), 
+-    ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_StructMember (
+-    CORBA::tk_struct,
+-    sizeof (_oc_CORBA_StructMember),
+-    (char *) &_oc_CORBA_StructMember,
+-    0,
+-    sizeof (CORBA_StructMember)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_StructMember =
+-  &_tc_TAO_tc_CORBA_StructMember;
+-
+ void CORBA_StructMember::_tao_any_destructor (void *x)
+ {
+   CORBA_StructMember *tmp = ACE_static_cast (CORBA_StructMember*,x);
+@@ -5834,231 +5256,18 @@
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+   TAO_Unbounded_Sequence<CORBA_StructMember>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+- (seq)
+-{}
+-CORBA_StructMemberSeq::~CORBA_StructMemberSeq (void) // dtor
+-{}
+-void CORBA_StructMemberSeq::_tao_any_destructor (void *x)
+-{
+-  CORBA_StructMemberSeq *tmp = ACE_static_cast (CORBA_StructMemberSeq*,x);
+-  delete tmp;
+-}
+-
+-
+-#endif /* end #if !defined */
+-
+-static const CORBA::Long _oc_CORBA_StructMemberSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  38,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5374), 
+-  ACE_NTOHL (0x72756374), 
+-  ACE_NTOHL (0x4d656d62), 
+-  ACE_NTOHL (0x65725365), 
+-  ACE_NTOHL (0x713a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_StructMemberSeq:1.0
+-  22,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5374), 
+-  ACE_NTOHL (0x72756374), 
+-  ACE_NTOHL (0x4d656d62), 
+-  ACE_NTOHL (0x65725365), 
+-  ACE_NTOHL (0x71000000),  // name = CORBA_StructMemberSeq
+-  CORBA::tk_sequence, // typecode kind
+-  208, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_struct, // typecode kind
+-    192, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      35,
+-      ACE_NTOHL (0x49444c3a), 
+-      ACE_NTOHL (0x6f6d672e), 
+-      ACE_NTOHL (0x6f72672f), 
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f5374), 
+-      ACE_NTOHL (0x72756374), 
+-      ACE_NTOHL (0x4d656d62), 
+-      ACE_NTOHL (0x65723a31), 
+-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_StructMember:1.0
+-      19,
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f5374), 
+-      ACE_NTOHL (0x72756374), 
+-      ACE_NTOHL (0x4d656d62), 
+-      ACE_NTOHL (0x65720000),  // name = CORBA_StructMember
+-      3, // member count
+-      5,
+-      ACE_NTOHL (0x6e616d65), 
+-      ACE_NTOHL (0x0),  // name = name
+-      CORBA::tk_string, 
+-      0U, // string length
+-      5,
+-      ACE_NTOHL (0x74797065), 
+-      ACE_NTOHL (0x0),  // name = type
+-      CORBA::tk_TypeCode,
+-
+-      9,
+-      ACE_NTOHL (0x74797065), 
+-      ACE_NTOHL (0x5f646566), 
+-      ACE_NTOHL (0x0),  // name = type_def
+-      CORBA::tk_objref, // typecode kind
+-      60, // encapsulation length
+-        TAO_ENCAP_BYTE_ORDER, // byte order
+-        30,
+-        ACE_NTOHL (0x49444c3a), 
+-        ACE_NTOHL (0x6f6d672e), 
+-        ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4944), 
+-        ACE_NTOHL (0x4c547970), 
+-        ACE_NTOHL (0x653a312e), 
+-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-        14,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4944), 
+-        ACE_NTOHL (0x4c547970), 
+-        ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
+-
+-
+-    0U,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_StructMemberSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_StructMemberSeq),
+-    (char *) &_oc_CORBA_StructMemberSeq,
+-    0,
+-    sizeof (CORBA_StructMemberSeq)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_StructMemberSeq =
+-  &_tc_TAO_tc_CORBA_StructMemberSeq;
+-
+-static const CORBA::Long _oc_CORBA_Initializer[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  34,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f496e), 
+-  ACE_NTOHL (0x69746961), 
+-  ACE_NTOHL (0x6c697a65), 
+-  ACE_NTOHL (0x723a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_Initializer:1.0
+-  18,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f496e), 
+-  ACE_NTOHL (0x69746961), 
+-  ACE_NTOHL (0x6c697a65), 
+-  ACE_NTOHL (0x72000000),  // name = CORBA_Initializer
+-  2, // member count
+-  8,
+-  ACE_NTOHL (0x6d656d62), 
+-  ACE_NTOHL (0x65727300),  // name = members
+-  CORBA::tk_alias, // typecode kind for typedefs
+-  292, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    38,
+-    ACE_NTOHL (0x49444c3a), 
+-    ACE_NTOHL (0x6f6d672e), 
+-    ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5374), 
+-    ACE_NTOHL (0x72756374), 
+-    ACE_NTOHL (0x4d656d62), 
+-    ACE_NTOHL (0x65725365), 
+-    ACE_NTOHL (0x713a312e), 
+-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_StructMemberSeq:1.0
+-    22,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5374), 
+-    ACE_NTOHL (0x72756374), 
+-    ACE_NTOHL (0x4d656d62), 
+-    ACE_NTOHL (0x65725365), 
+-    ACE_NTOHL (0x71000000),  // name = CORBA_StructMemberSeq
+-    CORBA::tk_sequence, // typecode kind
+-    208, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      CORBA::tk_struct, // typecode kind
+-      192, // encapsulation length
+-        TAO_ENCAP_BYTE_ORDER, // byte order
+-        35,
+-        ACE_NTOHL (0x49444c3a), 
+-        ACE_NTOHL (0x6f6d672e), 
+-        ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f5374), 
+-        ACE_NTOHL (0x72756374), 
+-        ACE_NTOHL (0x4d656d62), 
+-        ACE_NTOHL (0x65723a31), 
+-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_StructMember:1.0
+-        19,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f5374), 
+-        ACE_NTOHL (0x72756374), 
+-        ACE_NTOHL (0x4d656d62), 
+-        ACE_NTOHL (0x65720000),  // name = CORBA_StructMember
+-        3, // member count
+-        5,
+-        ACE_NTOHL (0x6e616d65), 
+-        ACE_NTOHL (0x0),  // name = name
+-        CORBA::tk_string, 
+-        0U, // string length
+-        5,
+-        ACE_NTOHL (0x74797065), 
+-        ACE_NTOHL (0x0),  // name = type
+-        CORBA::tk_TypeCode,
+-
+-        9,
+-        ACE_NTOHL (0x74797065), 
+-        ACE_NTOHL (0x5f646566), 
+-        ACE_NTOHL (0x0),  // name = type_def
+-        CORBA::tk_objref, // typecode kind
+-        60, // encapsulation length
+-          TAO_ENCAP_BYTE_ORDER, // byte order
+-          30,
+-          ACE_NTOHL (0x49444c3a), 
+-          ACE_NTOHL (0x6f6d672e), 
+-          ACE_NTOHL (0x6f72672f), 
+-          ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f4944), 
+-          ACE_NTOHL (0x4c547970), 
+-          ACE_NTOHL (0x653a312e), 
+-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-          14,
+-          ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f4944), 
+-          ACE_NTOHL (0x4c547970), 
+-          ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
+-
+-
+-      0U,
+-
+-
+-  5,
+-  ACE_NTOHL (0x6e616d65), 
+-  ACE_NTOHL (0x0),  // name = name
+-  CORBA::tk_string, 
+-  0U, // string length
+-};
++ (seq)
++{}
++CORBA_StructMemberSeq::~CORBA_StructMemberSeq (void) // dtor
++{}
++void CORBA_StructMemberSeq::_tao_any_destructor (void *x)
++{
++  CORBA_StructMemberSeq *tmp = ACE_static_cast (CORBA_StructMemberSeq*,x);
++  delete tmp;
++}
+ 
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_Initializer (
+-    CORBA::tk_struct,
+-    sizeof (_oc_CORBA_Initializer),
+-    (char *) &_oc_CORBA_Initializer,
+-    0,
+-    sizeof (CORBA_Initializer)
+-  );
+ 
+-CORBA::TypeCode_ptr _tc_CORBA_Initializer =
+-  &_tc_TAO_tc_CORBA_Initializer;
++#endif /* end #if !defined */
+ 
+ void CORBA_Initializer::_tao_any_destructor (void *x)
+ {
+@@ -6162,224 +5371,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_CORBA_InitializerSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  37,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f496e), 
+-  ACE_NTOHL (0x69746961), 
+-  ACE_NTOHL (0x6c697a65), 
+-  ACE_NTOHL (0x72536571), 
+-  ACE_NTOHL (0x3a312e30), 
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_InitializerSeq:1.0
+-  21,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f496e), 
+-  ACE_NTOHL (0x69746961), 
+-  ACE_NTOHL (0x6c697a65), 
+-  ACE_NTOHL (0x72536571), 
+-  ACE_NTOHL (0x0),  // name = CORBA_InitializerSeq
+-  CORBA::tk_sequence, // typecode kind
+-  420, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_struct, // typecode kind
+-    404, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      34,
+-      ACE_NTOHL (0x49444c3a), 
+-      ACE_NTOHL (0x6f6d672e), 
+-      ACE_NTOHL (0x6f72672f), 
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f496e), 
+-      ACE_NTOHL (0x69746961), 
+-      ACE_NTOHL (0x6c697a65), 
+-      ACE_NTOHL (0x723a312e), 
+-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_Initializer:1.0
+-      18,
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f496e), 
+-      ACE_NTOHL (0x69746961), 
+-      ACE_NTOHL (0x6c697a65), 
+-      ACE_NTOHL (0x72000000),  // name = CORBA_Initializer
+-      2, // member count
+-      8,
+-      ACE_NTOHL (0x6d656d62), 
+-      ACE_NTOHL (0x65727300),  // name = members
+-      CORBA::tk_alias, // typecode kind for typedefs
+-      292, // encapsulation length
+-        TAO_ENCAP_BYTE_ORDER, // byte order
+-        38,
+-        ACE_NTOHL (0x49444c3a), 
+-        ACE_NTOHL (0x6f6d672e), 
+-        ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f5374), 
+-        ACE_NTOHL (0x72756374), 
+-        ACE_NTOHL (0x4d656d62), 
+-        ACE_NTOHL (0x65725365), 
+-        ACE_NTOHL (0x713a312e), 
+-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_StructMemberSeq:1.0
+-        22,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f5374), 
+-        ACE_NTOHL (0x72756374), 
+-        ACE_NTOHL (0x4d656d62), 
+-        ACE_NTOHL (0x65725365), 
+-        ACE_NTOHL (0x71000000),  // name = CORBA_StructMemberSeq
+-        CORBA::tk_sequence, // typecode kind
+-        208, // encapsulation length
+-          TAO_ENCAP_BYTE_ORDER, // byte order
+-          CORBA::tk_struct, // typecode kind
+-          192, // encapsulation length
+-            TAO_ENCAP_BYTE_ORDER, // byte order
+-            35,
+-            ACE_NTOHL (0x49444c3a), 
+-            ACE_NTOHL (0x6f6d672e), 
+-            ACE_NTOHL (0x6f72672f), 
+-            ACE_NTOHL (0x434f5242), 
+-            ACE_NTOHL (0x415f5374), 
+-            ACE_NTOHL (0x72756374), 
+-            ACE_NTOHL (0x4d656d62), 
+-            ACE_NTOHL (0x65723a31), 
+-            ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_StructMember:1.0
+-            19,
+-            ACE_NTOHL (0x434f5242), 
+-            ACE_NTOHL (0x415f5374), 
+-            ACE_NTOHL (0x72756374), 
+-            ACE_NTOHL (0x4d656d62), 
+-            ACE_NTOHL (0x65720000),  // name = CORBA_StructMember
+-            3, // member count
+-            5,
+-            ACE_NTOHL (0x6e616d65), 
+-            ACE_NTOHL (0x0),  // name = name
+-            CORBA::tk_string, 
+-            0U, // string length
+-            5,
+-            ACE_NTOHL (0x74797065), 
+-            ACE_NTOHL (0x0),  // name = type
+-            CORBA::tk_TypeCode,
+-
+-            9,
+-            ACE_NTOHL (0x74797065), 
+-            ACE_NTOHL (0x5f646566), 
+-            ACE_NTOHL (0x0),  // name = type_def
+-            CORBA::tk_objref, // typecode kind
+-            60, // encapsulation length
+-              TAO_ENCAP_BYTE_ORDER, // byte order
+-              30,
+-              ACE_NTOHL (0x49444c3a), 
+-              ACE_NTOHL (0x6f6d672e), 
+-              ACE_NTOHL (0x6f72672f), 
+-              ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f4944), 
+-              ACE_NTOHL (0x4c547970), 
+-              ACE_NTOHL (0x653a312e), 
+-              ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-              14,
+-              ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f4944), 
+-              ACE_NTOHL (0x4c547970), 
+-              ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
+-
+-
+-          0U,
+-
+-
+-      5,
+-      ACE_NTOHL (0x6e616d65), 
+-      ACE_NTOHL (0x0),  // name = name
+-      CORBA::tk_string, 
+-      0U, // string length
+-
+-    0U,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_InitializerSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_InitializerSeq),
+-    (char *) &_oc_CORBA_InitializerSeq,
+-    0,
+-    sizeof (CORBA_InitializerSeq)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_InitializerSeq =
+-  &_tc_TAO_tc_CORBA_InitializerSeq;
+-
+-static const CORBA::Long _oc_CORBA_UnionMember[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  34,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f556e), 
+-  ACE_NTOHL (0x696f6e4d), 
+-  ACE_NTOHL (0x656d6265), 
+-  ACE_NTOHL (0x723a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_UnionMember:1.0
+-  18,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f556e), 
+-  ACE_NTOHL (0x696f6e4d), 
+-  ACE_NTOHL (0x656d6265), 
+-  ACE_NTOHL (0x72000000),  // name = CORBA_UnionMember
+-  4, // member count
+-  5,
+-  ACE_NTOHL (0x6e616d65), 
+-  ACE_NTOHL (0x0),  // name = name
+-  CORBA::tk_string, 
+-  0U, // string length
+-  6,
+-  ACE_NTOHL (0x6c616265), 
+-  ACE_NTOHL (0x6c000000),  // name = label
+-  CORBA::tk_any,
+-
+-  5,
+-  ACE_NTOHL (0x74797065), 
+-  ACE_NTOHL (0x0),  // name = type
+-  CORBA::tk_TypeCode,
+-
+-  9,
+-  ACE_NTOHL (0x74797065), 
+-  ACE_NTOHL (0x5f646566), 
+-  ACE_NTOHL (0x0),  // name = type_def
+-  CORBA::tk_objref, // typecode kind
+-  60, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    30,
+-    ACE_NTOHL (0x49444c3a), 
+-    ACE_NTOHL (0x6f6d672e), 
+-    ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4944), 
+-    ACE_NTOHL (0x4c547970), 
+-    ACE_NTOHL (0x653a312e), 
+-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-    14,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4944), 
+-    ACE_NTOHL (0x4c547970), 
+-    ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionMember (
+-    CORBA::tk_struct,
+-    sizeof (_oc_CORBA_UnionMember),
+-    (char *) &_oc_CORBA_UnionMember,
+-    0,
+-    sizeof (CORBA_UnionMember)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_UnionMember =
+-  &_tc_TAO_tc_CORBA_UnionMember;
+-
+ void CORBA_UnionMember::_tao_any_destructor (void *x)
+ {
+   CORBA_UnionMember *tmp = ACE_static_cast (CORBA_UnionMember*,x);
+@@ -6482,104 +5473,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_CORBA_UnionMemberSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  37,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f556e), 
+-  ACE_NTOHL (0x696f6e4d), 
+-  ACE_NTOHL (0x656d6265), 
+-  ACE_NTOHL (0x72536571), 
+-  ACE_NTOHL (0x3a312e30), 
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_UnionMemberSeq:1.0
+-  21,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f556e), 
+-  ACE_NTOHL (0x696f6e4d), 
+-  ACE_NTOHL (0x656d6265), 
+-  ACE_NTOHL (0x72536571), 
+-  ACE_NTOHL (0x0),  // name = CORBA_UnionMemberSeq
+-  CORBA::tk_sequence, // typecode kind
+-  224, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_struct, // typecode kind
+-    208, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      34,
+-      ACE_NTOHL (0x49444c3a), 
+-      ACE_NTOHL (0x6f6d672e), 
+-      ACE_NTOHL (0x6f72672f), 
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f556e), 
+-      ACE_NTOHL (0x696f6e4d), 
+-      ACE_NTOHL (0x656d6265), 
+-      ACE_NTOHL (0x723a312e), 
+-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_UnionMember:1.0
+-      18,
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f556e), 
+-      ACE_NTOHL (0x696f6e4d), 
+-      ACE_NTOHL (0x656d6265), 
+-      ACE_NTOHL (0x72000000),  // name = CORBA_UnionMember
+-      4, // member count
+-      5,
+-      ACE_NTOHL (0x6e616d65), 
+-      ACE_NTOHL (0x0),  // name = name
+-      CORBA::tk_string, 
+-      0U, // string length
+-      6,
+-      ACE_NTOHL (0x6c616265), 
+-      ACE_NTOHL (0x6c000000),  // name = label
+-      CORBA::tk_any,
+-
+-      5,
+-      ACE_NTOHL (0x74797065), 
+-      ACE_NTOHL (0x0),  // name = type
+-      CORBA::tk_TypeCode,
+-
+-      9,
+-      ACE_NTOHL (0x74797065), 
+-      ACE_NTOHL (0x5f646566), 
+-      ACE_NTOHL (0x0),  // name = type_def
+-      CORBA::tk_objref, // typecode kind
+-      60, // encapsulation length
+-        TAO_ENCAP_BYTE_ORDER, // byte order
+-        30,
+-        ACE_NTOHL (0x49444c3a), 
+-        ACE_NTOHL (0x6f6d672e), 
+-        ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4944), 
+-        ACE_NTOHL (0x4c547970), 
+-        ACE_NTOHL (0x653a312e), 
+-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-        14,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4944), 
+-        ACE_NTOHL (0x4c547970), 
+-        ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
+-
+-
+-    0U,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionMemberSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_UnionMemberSeq),
+-    (char *) &_oc_CORBA_UnionMemberSeq,
+-    0,
+-    sizeof (CORBA_UnionMemberSeq)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_UnionMemberSeq =
+-  &_tc_TAO_tc_CORBA_UnionMemberSeq;
+-
+-
+ #if !defined (_CORBA_ENUMMEMBERSEQ_CS_)
+ #define _CORBA_ENUMMEMBERSEQ_CS_
+ 
+@@ -6627,45 +5520,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_CORBA_EnumMemberSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  36,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f456e), 
+-  ACE_NTOHL (0x756d4d65), 
+-  ACE_NTOHL (0x6d626572), 
+-  ACE_NTOHL (0x5365713a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_EnumMemberSeq:1.0
+-  20,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f456e), 
+-  ACE_NTOHL (0x756d4d65), 
+-  ACE_NTOHL (0x6d626572), 
+-  ACE_NTOHL (0x53657100),  // name = CORBA_EnumMemberSeq
+-  CORBA::tk_sequence, // typecode kind
+-  16, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_string, 
+-    0U, // string length
+-    0U,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_EnumMemberSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_EnumMemberSeq),
+-    (char *) &_oc_CORBA_EnumMemberSeq,
+-    0,
+-    sizeof (CORBA_EnumMemberSeq)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_EnumMemberSeq =
+-  &_tc_TAO_tc_CORBA_EnumMemberSeq;
+-
+ // *************************************************************
+ // Operations for class CORBA_Container_var
+ // *************************************************************
+@@ -12280,7 +11134,7 @@
+     return CORBA_Container::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_Container:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Container:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_Container::_nil ());
+       if (is_a == 0)
+         return CORBA_Container::_nil ();
+@@ -12348,8 +11202,8 @@
+ CORBA::Boolean CORBA_Container::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -12386,7 +11240,7 @@
+ 
+ const char* CORBA_Container::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_Container:1.0";
++  return "IDL:omg.org/CORBA/Container:1.0";
+ }
+ 
+ CORBA_Contained_ptr CORBA_Container::lookup (
+@@ -12462,13 +11316,13 @@
+   ACE_NTOHL (0x6f6d672e), 
+   ACE_NTOHL (0x6f72672f), 
+   ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f436f), 
++  ACE_NTOHL (0x412f436f), 
+   ACE_NTOHL (0x6e746169), 
+   ACE_NTOHL (0x6e65722f), 
+   ACE_NTOHL (0x44657363), 
+   ACE_NTOHL (0x72697074), 
+   ACE_NTOHL (0x696f6e3a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_Container/Description:1.0
++  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container/Description:1.0
+   12,
+   ACE_NTOHL (0x44657363), 
+   ACE_NTOHL (0x72697074), 
+@@ -12481,22 +11335,21 @@
+   ACE_NTOHL (0x6a656374), 
+   ACE_NTOHL (0x0),  // name = contained_object
+   CORBA::tk_objref, // typecode kind
+-  60, // encapsulation length
++  56, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     32,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f436f), 
++    ACE_NTOHL (0x412f436f), 
+     ACE_NTOHL (0x6e746169), 
+     ACE_NTOHL (0x6e65643a), 
+-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_Contained:1.0
+-    16,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f436f), 
+-    ACE_NTOHL (0x6e746169), 
+-    ACE_NTOHL (0x6e656400),  // name = CORBA_Contained
++    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
++    10,
++    ACE_NTOHL (0x436f6e74), 
++    ACE_NTOHL (0x61696e65), 
++    ACE_NTOHL (0x64000000),  // name = Contained
+ 
+   5,
+   ACE_NTOHL (0x6b696e64), 
+@@ -12763,37 +11616,37 @@
+   ACE_NTOHL (0x6f6d672e), 
+   ACE_NTOHL (0x6f72672f), 
+   ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f436f), 
++  ACE_NTOHL (0x412f436f), 
+   ACE_NTOHL (0x6e746169), 
+   ACE_NTOHL (0x6e65722f), 
+   ACE_NTOHL (0x44657363), 
+   ACE_NTOHL (0x72697074), 
+   ACE_NTOHL (0x696f6e53), 
+   ACE_NTOHL (0x65713a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_Container/DescriptionSeq:1.0
++  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/Container/DescriptionSeq:1.0
+   15,
+   ACE_NTOHL (0x44657363), 
+   ACE_NTOHL (0x72697074), 
+   ACE_NTOHL (0x696f6e53), 
+   ACE_NTOHL (0x65710000),  // name = DescriptionSeq
+   CORBA::tk_sequence, // typecode kind
+-  740, // encapsulation length
++  736, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     CORBA::tk_struct, // typecode kind
+-    724, // encapsulation length
++    720, // encapsulation length
+       TAO_ENCAP_BYTE_ORDER, // byte order
+       44,
+       ACE_NTOHL (0x49444c3a), 
+       ACE_NTOHL (0x6f6d672e), 
+       ACE_NTOHL (0x6f72672f), 
+       ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f436f), 
++      ACE_NTOHL (0x412f436f), 
+       ACE_NTOHL (0x6e746169), 
+       ACE_NTOHL (0x6e65722f), 
+       ACE_NTOHL (0x44657363), 
+       ACE_NTOHL (0x72697074), 
+       ACE_NTOHL (0x696f6e3a), 
+-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_Container/Description:1.0
++      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Container/Description:1.0
+       12,
+       ACE_NTOHL (0x44657363), 
+       ACE_NTOHL (0x72697074), 
+@@ -12806,22 +11659,21 @@
+       ACE_NTOHL (0x6a656374), 
+       ACE_NTOHL (0x0),  // name = contained_object
+       CORBA::tk_objref, // typecode kind
+-      60, // encapsulation length
++      56, // encapsulation length
+         TAO_ENCAP_BYTE_ORDER, // byte order
+         32,
+         ACE_NTOHL (0x49444c3a), 
+         ACE_NTOHL (0x6f6d672e), 
+         ACE_NTOHL (0x6f72672f), 
+         ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f436f), 
++        ACE_NTOHL (0x412f436f), 
+         ACE_NTOHL (0x6e746169), 
+         ACE_NTOHL (0x6e65643a), 
+-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_Contained:1.0
+-        16,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f436f), 
+-        ACE_NTOHL (0x6e746169), 
+-        ACE_NTOHL (0x6e656400),  // name = CORBA_Contained
++        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Contained:1.0
++        10,
++        ACE_NTOHL (0x436f6e74), 
++        ACE_NTOHL (0x61696e65), 
++        ACE_NTOHL (0x64000000),  // name = Contained
+ 
+       5,
+       ACE_NTOHL (0x6b696e64), 
+@@ -13341,36 +12193,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_Container[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  32,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f436f), 
+-  ACE_NTOHL (0x6e746169), 
+-  ACE_NTOHL (0x6e65723a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_Container:1.0
+-  16,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f436f), 
+-  ACE_NTOHL (0x6e746169), 
+-  ACE_NTOHL (0x6e657200),  // name = CORBA_Container
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_Container (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_Container),
+-    (char *) &_oc_CORBA_Container,
+-    0,
+-    sizeof (CORBA_Container)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_Container =
+-  &_tc_TAO_tc_CORBA_Container;
+-
+ // *************************************************************
+ // Operations for class CORBA_IDLType_var
+ // *************************************************************
+@@ -13913,7 +12735,7 @@
+     return CORBA_IDLType::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_IDLType:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IDLType:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
+       if (is_a == 0)
+         return CORBA_IDLType::_nil ();
+@@ -13981,8 +12803,8 @@
+ CORBA::Boolean CORBA_IDLType::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -14019,7 +12841,7 @@
+ 
+ const char* CORBA_IDLType::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_IDLType:1.0";
++  return "IDL:omg.org/CORBA/IDLType:1.0";
+ }
+ 
+ CORBA::TypeCode_ptr CORBA_IDLType::type (
+@@ -14039,36 +12861,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_IDLType[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  30,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4944), 
+-  ACE_NTOHL (0x4c547970), 
+-  ACE_NTOHL (0x653a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-  14,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4944), 
+-  ACE_NTOHL (0x4c547970), 
+-  ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_IDLType (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_IDLType),
+-    (char *) &_oc_CORBA_IDLType,
+-    0,
+-    sizeof (CORBA_IDLType)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_IDLType =
+-  &_tc_TAO_tc_CORBA_IDLType;
+-
+ // *************************************************************
+ // Operations for class CORBA_TypedefDef_var
+ // *************************************************************
+@@ -14360,7 +13152,7 @@
+     return CORBA_TypedefDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_TypedefDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/TypedefDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_TypedefDef::_nil ());
+       if (is_a == 0)
+         return CORBA_TypedefDef::_nil ();
+@@ -14428,10 +13220,10 @@
+ CORBA::Boolean CORBA_TypedefDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -14492,101 +13284,9 @@
+ 
+ const char* CORBA_TypedefDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_TypedefDef:1.0";
++  return "IDL:omg.org/CORBA/TypedefDef:1.0";
+ }
+ 
+-static const CORBA::Long _oc_CORBA_TypedefDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  33,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5479), 
+-  ACE_NTOHL (0x70656465), 
+-  ACE_NTOHL (0x66446566), 
+-  ACE_NTOHL (0x3a312e30), 
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_TypedefDef:1.0
+-  17,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5479), 
+-  ACE_NTOHL (0x70656465), 
+-  ACE_NTOHL (0x66446566), 
+-  ACE_NTOHL (0x0),  // name = CORBA_TypedefDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_TypedefDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_TypedefDef),
+-    (char *) &_oc_CORBA_TypedefDef,
+-    0,
+-    sizeof (CORBA_TypedefDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_TypedefDef =
+-  &_tc_TAO_tc_CORBA_TypedefDef;
+-
+-static const CORBA::Long _oc_CORBA_TypeDescription[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  38,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5479), 
+-  ACE_NTOHL (0x70654465), 
+-  ACE_NTOHL (0x73637269), 
+-  ACE_NTOHL (0x7074696f), 
+-  ACE_NTOHL (0x6e3a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_TypeDescription:1.0
+-  22,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5479), 
+-  ACE_NTOHL (0x70654465), 
+-  ACE_NTOHL (0x73637269), 
+-  ACE_NTOHL (0x7074696f), 
+-  ACE_NTOHL (0x6e000000),  // name = CORBA_TypeDescription
+-  5, // member count
+-  5,
+-  ACE_NTOHL (0x6e616d65), 
+-  ACE_NTOHL (0x0),  // name = name
+-  CORBA::tk_string, 
+-  0U, // string length
+-  3,
+-  ACE_NTOHL (0x69640000),  // name = id
+-  CORBA::tk_string, 
+-  0U, // string length
+-  11,
+-  ACE_NTOHL (0x64656669), 
+-  ACE_NTOHL (0x6e65645f), 
+-  ACE_NTOHL (0x696e0000),  // name = defined_in
+-  CORBA::tk_string, 
+-  0U, // string length
+-  8,
+-  ACE_NTOHL (0x76657273), 
+-  ACE_NTOHL (0x696f6e00),  // name = version
+-  CORBA::tk_string, 
+-  0U, // string length
+-  5,
+-  ACE_NTOHL (0x74797065), 
+-  ACE_NTOHL (0x0),  // name = type
+-  CORBA::tk_TypeCode,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_TypeDescription (
+-    CORBA::tk_struct,
+-    sizeof (_oc_CORBA_TypeDescription),
+-    (char *) &_oc_CORBA_TypeDescription,
+-    0,
+-    sizeof (CORBA_TypeDescription)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_TypeDescription =
+-  &_tc_TAO_tc_CORBA_TypeDescription;
+-
+ void CORBA_TypeDescription::_tao_any_destructor (void *x)
+ {
+   CORBA_TypeDescription *tmp = ACE_static_cast (CORBA_TypeDescription*,x);
+@@ -14639,7 +13339,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_IRObject, 
++        CORBA::_tc_IRObject, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -14656,7 +13356,7 @@
+     _tao_elem = CORBA_IRObject::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_IRObject, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_IRObject, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -14669,7 +13369,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_IRObject,
++          CORBA::_tc_IRObject,
+           1,
+           _tao_elem,
+           CORBA_IRObject::_tao_any_destructor
+@@ -14700,7 +13400,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_Contained, 
++        CORBA::_tc_Contained, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -14717,7 +13417,7 @@
+     _tao_elem = CORBA_Contained::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_Contained, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_Contained, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -14730,7 +13430,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_Contained,
++          CORBA::_tc_Contained,
+           1,
+           _tao_elem,
+           CORBA_Contained::_tao_any_destructor
+@@ -14847,7 +13547,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_ContainedSeq,
++        CORBA::_tc_ContainedSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -14859,7 +13559,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ContainedSeq,
++      CORBA::_tc_ContainedSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -14883,7 +13583,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ContainedSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ContainedSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -14908,7 +13608,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_ContainedSeq,
++            CORBA::_tc_ContainedSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_ContainedSeq::_tao_any_destructor
+@@ -14938,7 +13638,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_InterfaceDefSeq,
++        CORBA::_tc_InterfaceDefSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -14950,7 +13650,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_InterfaceDefSeq,
++      CORBA::_tc_InterfaceDefSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -14974,7 +13674,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_InterfaceDefSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDefSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -14999,7 +13699,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_InterfaceDefSeq,
++            CORBA::_tc_InterfaceDefSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_InterfaceDefSeq::_tao_any_destructor
+@@ -15029,7 +13729,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_ValueDefSeq,
++        CORBA::_tc_ValueDefSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -15041,7 +13741,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ValueDefSeq,
++      CORBA::_tc_ValueDefSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -15065,7 +13765,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ValueDefSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDefSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -15090,7 +13790,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_ValueDefSeq,
++            CORBA::_tc_ValueDefSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_ValueDefSeq::_tao_any_destructor
+@@ -15120,7 +13820,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_AbstractInterfaceDefSeq,
++        CORBA::_tc_AbstractInterfaceDefSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -15132,7 +13832,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_AbstractInterfaceDefSeq,
++      CORBA::_tc_AbstractInterfaceDefSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -15156,7 +13856,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_AbstractInterfaceDefSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDefSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -15181,7 +13881,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_AbstractInterfaceDefSeq,
++            CORBA::_tc_AbstractInterfaceDefSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_AbstractInterfaceDefSeq::_tao_any_destructor
+@@ -15211,7 +13911,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_LocalInterfaceDefSeq,
++        CORBA::_tc_LocalInterfaceDefSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -15223,7 +13923,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_LocalInterfaceDefSeq,
++      CORBA::_tc_LocalInterfaceDefSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -15247,7 +13947,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_LocalInterfaceDefSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDefSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -15272,7 +13972,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_LocalInterfaceDefSeq,
++            CORBA::_tc_LocalInterfaceDefSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_LocalInterfaceDefSeq::_tao_any_destructor
+@@ -15298,7 +13998,7 @@
+   TAO_OutputCDR stream;
+   stream << _tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_StructMember,
++      CORBA::_tc_StructMember,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin ()
+     );
+@@ -15309,7 +14009,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_StructMember,
++      CORBA::_tc_StructMember,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -15330,7 +14030,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_StructMember, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructMember, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -15355,7 +14055,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_StructMember,
++            CORBA::_tc_StructMember,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_StructMember::_tao_any_destructor
+@@ -15385,7 +14085,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_StructMemberSeq,
++        CORBA::_tc_StructMemberSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -15397,7 +14097,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_StructMemberSeq,
++      CORBA::_tc_StructMemberSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -15421,7 +14121,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_StructMemberSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructMemberSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -15446,7 +14146,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_StructMemberSeq,
++            CORBA::_tc_StructMemberSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_StructMemberSeq::_tao_any_destructor
+@@ -15472,7 +14172,7 @@
+   TAO_OutputCDR stream;
+   stream << _tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_Initializer,
++      CORBA::_tc_Initializer,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin ()
+     );
+@@ -15483,7 +14183,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_Initializer,
++      CORBA::_tc_Initializer,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -15504,7 +14204,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_Initializer, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_Initializer, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -15529,7 +14229,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_Initializer,
++            CORBA::_tc_Initializer,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_Initializer::_tao_any_destructor
+@@ -15559,7 +14259,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_InitializerSeq,
++        CORBA::_tc_InitializerSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -15571,7 +14271,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_InitializerSeq,
++      CORBA::_tc_InitializerSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -15595,7 +14295,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_InitializerSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_InitializerSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -15620,7 +14320,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_InitializerSeq,
++            CORBA::_tc_InitializerSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_InitializerSeq::_tao_any_destructor
+@@ -15646,7 +14346,7 @@
+   TAO_OutputCDR stream;
+   stream << _tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_UnionMember,
++      CORBA::_tc_UnionMember,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin ()
+     );
+@@ -15657,7 +14357,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_UnionMember,
++      CORBA::_tc_UnionMember,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -15678,7 +14378,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_UnionMember, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionMember, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -15703,7 +14403,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_UnionMember,
++            CORBA::_tc_UnionMember,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_UnionMember::_tao_any_destructor
+@@ -15733,7 +14433,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_UnionMemberSeq,
++        CORBA::_tc_UnionMemberSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -15745,7 +14445,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_UnionMemberSeq,
++      CORBA::_tc_UnionMemberSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -15769,7 +14469,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_UnionMemberSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionMemberSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -15794,7 +14494,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_UnionMemberSeq,
++            CORBA::_tc_UnionMemberSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_UnionMemberSeq::_tao_any_destructor
+@@ -15824,7 +14524,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_EnumMemberSeq,
++        CORBA::_tc_EnumMemberSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -15836,7 +14536,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_EnumMemberSeq,
++      CORBA::_tc_EnumMemberSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -15860,7 +14560,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_EnumMemberSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumMemberSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -15885,7 +14585,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_EnumMemberSeq,
++            CORBA::_tc_EnumMemberSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_EnumMemberSeq::_tao_any_destructor
+@@ -15912,7 +14612,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_Container, 
++        CORBA::_tc_Container, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -15929,7 +14629,7 @@
+     _tao_elem = CORBA_Container::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_Container, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_Container, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -15942,7 +14642,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_Container,
++          CORBA::_tc_Container,
+           1,
+           _tao_elem,
+           CORBA_Container::_tao_any_destructor
+@@ -16147,7 +14847,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_IDLType, 
++        CORBA::_tc_IDLType, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -16164,7 +14864,7 @@
+     _tao_elem = CORBA_IDLType::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_IDLType, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_IDLType, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -16177,7 +14877,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_IDLType,
++          CORBA::_tc_IDLType,
+           1,
+           _tao_elem,
+           CORBA_IDLType::_tao_any_destructor
+@@ -16208,7 +14908,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_TypedefDef, 
++        CORBA::_tc_TypedefDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -16225,7 +14925,7 @@
+     _tao_elem = CORBA_TypedefDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_TypedefDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_TypedefDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -16238,7 +14938,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_TypedefDef,
++          CORBA::_tc_TypedefDef,
+           1,
+           _tao_elem,
+           CORBA_TypedefDef::_tao_any_destructor
+@@ -16268,7 +14968,7 @@
+   TAO_OutputCDR stream;
+   stream << _tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_TypeDescription,
++      CORBA::_tc_TypeDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin ()
+     );
+@@ -16279,7 +14979,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_TypeDescription,
++      CORBA::_tc_TypeDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -16300,7 +15000,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_TypeDescription, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_TypeDescription, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -16325,7 +15025,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_TypeDescription,
++            CORBA::_tc_TypeDescription,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_TypeDescription::_tao_any_destructor
diff --git a/TAO/tao/IFR_Client/diffs/IFR_BaseC.h.diff b/TAO/tao/IFR_Client/diffs/IFR_BaseC.h.diff
new file mode 100644
index 00000000000..ad1e108becd
--- /dev/null
+++ b/TAO/tao/IFR_Client/diffs/IFR_BaseC.h.diff
@@ -0,0 +1,214 @@
+--- orig/IFR_BaseC.h	Mon Apr 23 20:19:29 2001
++++ IFR_BaseC.h	Mon Apr 23 19:56: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:
+@@ -23,13 +23,14 @@
+ #define _TAO_IDL_IFR_BASEC_H_
+ 
+ #include "ace/pre.h"
+-#include "tao/corba.h"
++#include "ifr_client_export.h"
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
+-#include "ifr_client_export.h"
++#include "tao/Invocation.h"
++#include "tao/PortableInterceptor.h"
+ 
+ #if defined (TAO_EXPORT_MACRO)
+ #undef TAO_EXPORT_MACRO
+@@ -54,50 +55,10 @@
+ #pragma option push -w-rvl -w-rch -w-ccc -w-inl
+ #endif /* __BORLANDC__ */
+ 
+-TAO_NAMESPACE  CORBA
+-{
+-  enum DefinitionKind
+-  {
+-        dk_none,
+-        dk_all,
+-        dk_Attribute,
+-        dk_Constant,
+-        dk_Exception,
+-        dk_Interface,
+-        dk_Module,
+-        dk_Operation,
+-        dk_Typedef,
+-        dk_Alias,
+-        dk_Struct,
+-        dk_Union,
+-        dk_Enum,
+-        dk_Primitive,
+-        dk_String,
+-        dk_Sequence,
+-        dk_Array,
+-        dk_Repository,
+-        dk_Wstring,
+-        dk_Fixed,
+-        dk_Value,
+-        dk_ValueBox,
+-        dk_ValueMember,
+-        dk_Native,
+-        dk_AbstractInterface,
+-        dk_LocalInterface    
+-  };
+-  typedef DefinitionKind &DefinitionKind_out;
+-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_DefinitionKind;
+-
+-
+-}
+-TAO_NAMESPACE_CLOSE // module CORBA
+-
+-
+ #if !defined (_CORBA_IROBJECT___PTR_CH_)
+ #define _CORBA_IROBJECT___PTR_CH_
+ 
+ class CORBA_IRObject;
+-typedef CORBA_IRObject *CORBA_IRObject_ptr;
+ 
+ #endif /* end #if !defined */
+ 
+@@ -397,18 +358,8 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_IRObject;
+-
+ class CORBA_Repository;
+ 
+-#if !defined (_CORBA_REPOSITORY___PTR_CH_)
+-#define _CORBA_REPOSITORY___PTR_CH_
+-
+-typedef CORBA_Repository *CORBA_Repository_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (_CORBA_REPOSITORY___VAR_CH_)
+ #define _CORBA_REPOSITORY___VAR_CH_
+ 
+@@ -1158,8 +1109,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_Contained;
+-
+ 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+@@ -1310,8 +1259,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ContainedSeq;
+-
+ class CORBA_ModuleDef;
+ 
+ #if !defined (_CORBA_MODULEDEF___PTR_CH_)
+@@ -3048,8 +2995,6 @@
+   void operator= (const CORBA_StructMember_var &);
+ };
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_StructMember;
+-
+ 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+@@ -3200,8 +3145,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_StructMemberSeq;
+-
+ struct CORBA_Initializer;
+ class CORBA_Initializer_var;
+ 
+@@ -3265,8 +3208,6 @@
+   void operator= (const CORBA_Initializer_var &);
+ };
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_Initializer;
+-
+ 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+@@ -3417,8 +3358,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_InitializerSeq;
+-
+ struct CORBA_UnionMember;
+ class CORBA_UnionMember_var;
+ 
+@@ -3484,8 +3423,6 @@
+   void operator= (const CORBA_UnionMember_var &);
+ };
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_UnionMember;
+-
+ 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+@@ -3636,8 +3573,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_UnionMemberSeq;
+-
+ 
+ #if !defined (_CORBA_ENUMMEMBERSEQ_CH_)
+ #define _CORBA_ENUMMEMBERSEQ_CH_
+@@ -3745,8 +3680,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_EnumMemberSeq;
+-
+ 
+ #if !defined (_CORBA_CONTAINER_CH_)
+ #define _CORBA_CONTAINER_CH_
+@@ -4761,8 +4694,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_Container;
+-
+ 
+ #if !defined (_CORBA_IDLTYPE_CH_)
+ #define _CORBA_IDLTYPE_CH_
+@@ -4971,8 +4902,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_IDLType;
+-
+ 
+ #if !defined (_CORBA_TYPEDEFDEF___PTR_CH_)
+ #define _CORBA_TYPEDEFDEF___PTR_CH_
+@@ -5235,8 +5164,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_TypedefDef;
+-
+ struct CORBA_TypeDescription;
+ class CORBA_TypeDescription_var;
+ 
+@@ -5302,8 +5229,6 @@
+   // assignment from T_var not allowed
+   void operator= (const CORBA_TypeDescription_var &);
+ };
+-
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_TypeDescription;
+ 
+ // Proxy Broker Factory function pointer declarations.
+ 
diff --git a/TAO/tao/IFR_Client/diffs/IFR_BaseC.i.diff b/TAO/tao/IFR_Client/diffs/IFR_BaseC.i.diff
new file mode 100644
index 00000000000..ad52809c647
--- /dev/null
+++ b/TAO/tao/IFR_Client/diffs/IFR_BaseC.i.diff
@@ -0,0 +1,10 @@
+--- orig/IFR_BaseC.i	Mon Apr 23 20:19:29 2001
++++ IFR_BaseC.i	Mon Apr 23 19:58:19 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/IFR_Client/diffs/IFR_Basic.pidl.diff b/TAO/tao/IFR_Client/diffs/IFR_Basic.pidl.diff
new file mode 100644
index 00000000000..e230cf75219
--- /dev/null
+++ b/TAO/tao/IFR_Client/diffs/IFR_Basic.pidl.diff
@@ -0,0 +1,453 @@
+--- orig/IFR_Basic.pidl	Mon Apr 23 20:54:29 2001
++++ IFR_Basic.pidl	Thu Apr 19 15:41:50 2001
+@@ -71,6 +71,13 @@
+ 
+ module CORBA
+ {
++  interface PrimitiveDef;
++  interface StringDef;
++  interface SequenceDef;
++  interface ArrayDef;
++  interface WstringDef;
++  interface FixedDef;
++
+   enum PrimitiveKind 
+   {
+     pk_null, 
+@@ -97,282 +104,276 @@
+     pk_value_base
+   };
+ 
+-  enum AttributeMode 
+-  {
+-    ATTR_NORMAL, 
+-    ATTR_READONLY
+-  };
+-
+-  enum OperationMode 
+-  {
+-    OP_NORMAL, 
+-    OP_ONEWAY
+-  };
+-
+-  enum ParameterMode 
+-  {
+-    PARAM_IN, 
+-    PARAM_OUT, 
+-    PARAM_INOUT
+-  };
+-};
+-
+-  interface CORBA_PrimitiveDef;
+-  interface CORBA_StringDef;
+-  interface CORBA_SequenceDef;
+-  interface CORBA_ArrayDef;
+-  interface CORBA_WstringDef;
+-  interface CORBA_FixedDef;
+-
+-  interface CORBA_Repository : CORBA_Container 
++  interface Repository : Container 
+   {
+     // read interface
+-    CORBA_Contained lookup_id (
+-        in string search_id
++    Contained lookup_id (
++        in RepositoryId search_id
+       );
+-    CORBA::TypeCode get_canonical_typecode (
+-        in CORBA::TypeCode tc
++    TypeCode get_canonical_typecode (
++        in TypeCode tc
+       );
+-    CORBA_PrimitiveDef get_primitive (
+-        in CORBA::PrimitiveKind kind
++    PrimitiveDef get_primitive (
++        in PrimitiveKind kind
+       );
+     // write interface
+-    CORBA_StringDef create_string (
++    StringDef create_string (
+         in unsigned long bound
+       );
+-    CORBA_WstringDef create_wstring (
++    WstringDef create_wstring (
+         in unsigned long bound
+       );
+-    CORBA_SequenceDef create_sequence (
++    SequenceDef create_sequence (
+         in unsigned long bound,
+-        in CORBA_IDLType element_type
++        in IDLType element_type
+       );
+-    CORBA_ArrayDef create_array (
++    ArrayDef create_array (
+         in unsigned long length,
+-        in CORBA_IDLType element_type
++        in IDLType element_type
+       );
+-    CORBA_FixedDef create_fixed (
++    FixedDef create_fixed (
+         in unsigned short digits,
+         in short scale
+       );
+   };
+ 
+-  interface CORBA_ModuleDef : CORBA_Container, CORBA_Contained 
++  interface ModuleDef : Container, Contained 
+   {
+   };
+ 
+-  struct CORBA_ModuleDescription 
++  struct ModuleDescription 
+   {
+-    string name;
+-    string id;
+-    string defined_in;
+-    string version;
++    Identifier name;
++    RepositoryId id;
++    RepositoryId defined_in;
++    VersionSpec version;
+   };
+ 
+-  interface CORBA_ConstantDef : CORBA_Contained 
++  interface ConstantDef : Contained 
+   {
+-    readonly attribute CORBA::TypeCode type;
+-    attribute CORBA_IDLType type_def;
++    readonly attribute TypeCode type;
++    attribute IDLType type_def;
+     attribute any value;
+   };
+ 
+-  struct CORBA_ConstantDescription 
++  struct ConstantDescription 
+   {
+-    string name;
+-    string id;
+-    string defined_in;
+-    string version;
+-    CORBA::TypeCode type;
++    Identifier name;
++    RepositoryId id;
++    RepositoryId defined_in;
++    VersionSpec version;
++    TypeCode type;
+     any value;
+   };
+ 
+-  interface CORBA_StructDef : CORBA_TypedefDef, CORBA_Container 
++  interface StructDef : TypedefDef, Container 
+   {
+-    attribute CORBA_StructMemberSeq members;
++    attribute StructMemberSeq members;
+   };
+ 
+-  interface CORBA_UnionDef : CORBA_TypedefDef, CORBA_Container 
++  interface UnionDef : TypedefDef, Container 
+   {
+-    readonly attribute CORBA::TypeCode discriminator_type;
+-    attribute CORBA_IDLType discriminator_type_def;
+-    attribute CORBA_UnionMemberSeq members;
++    readonly attribute TypeCode discriminator_type;
++    attribute IDLType discriminator_type_def;
++    attribute UnionMemberSeq members;
+   };
+ 
+-  interface CORBA_EnumDef : CORBA_TypedefDef 
++  interface EnumDef : TypedefDef 
+   {
+-    attribute CORBA_EnumMemberSeq members;
++    attribute EnumMemberSeq members;
+   };
+ 
+-  interface CORBA_AliasDef : CORBA_TypedefDef 
++  interface AliasDef : TypedefDef 
+   {
+-    attribute CORBA_IDLType original_type_def;
++    attribute IDLType original_type_def;
+   };
+ 
+-  interface CORBA_NativeDef : CORBA_TypedefDef 
++  interface NativeDef : TypedefDef 
+   {
+   };
+ 
+-  interface CORBA_PrimitiveDef: CORBA_IDLType 
++  interface PrimitiveDef: IDLType 
+   {
+-    readonly attribute CORBA::PrimitiveKind kind;
++    readonly attribute PrimitiveKind kind;
+   };
+ 
+-  interface CORBA_StringDef : CORBA_IDLType 
++  interface StringDef : IDLType 
+   {
+     attribute unsigned long bound;
+   };
+ 
+-  interface CORBA_WstringDef : CORBA_IDLType 
++  interface WstringDef : IDLType 
+   {
+     attribute unsigned long bound;
+   };
+ 
+-  interface CORBA_SequenceDef : CORBA_IDLType 
++  interface SequenceDef : IDLType 
+   {
+     attribute unsigned long bound;
+-    readonly attribute CORBA::TypeCode element_type;
+-    attribute CORBA_IDLType element_type_def;
++    readonly attribute TypeCode element_type;
++    attribute IDLType element_type_def;
+   };
+ 
+-  interface CORBA_ArrayDef : CORBA_IDLType 
++  interface ArrayDef : IDLType 
+   {
+     attribute unsigned long length;
+-    readonly attribute CORBA::TypeCode element_type;
+-    attribute CORBA_IDLType element_type_def;
++  readonly attribute TypeCode element_type;
++  attribute IDLType element_type_def;
+   };
+ 
+-  interface CORBA_ExceptionDef : CORBA_Contained, CORBA_Container 
++  interface ExceptionDef : Contained, Container 
+   {
+-    readonly attribute CORBA::TypeCode type;
+-    attribute CORBA_StructMemberSeq members;
++    readonly attribute TypeCode type;
++    attribute StructMemberSeq members;
+   };
+ 
+-  struct CORBA_ExceptionDescription 
++  struct ExceptionDescription 
+   {
+-    string name;
+-    string id;
+-    string defined_in;
+-    string version;
+-    CORBA::TypeCode type;
++    Identifier name;
++    RepositoryId id;
++    RepositoryId defined_in;
++    VersionSpec version;
++    TypeCode type;
+   };
+ 
+-  typedef sequence <CORBA_ExceptionDef> CORBA_ExceptionDefSeq;
+-  typedef sequence <CORBA_ExceptionDescription> CORBA_ExcDescriptionSeq;
++  typedef sequence <ExceptionDef> ExceptionDefSeq;
++  typedef sequence <ExceptionDescription> ExcDescriptionSeq;
+ 
+-  interface CORBA_AttributeDef : CORBA_Contained 
++  enum AttributeMode 
+   {
+-    readonly attribute CORBA::TypeCode type;
+-    attribute CORBA_IDLType type_def;
+-    attribute CORBA::AttributeMode mode;
++    ATTR_NORMAL, 
++    ATTR_READONLY
+   };
+ 
+-  struct CORBA_AttributeDescription 
++  interface AttributeDef : Contained 
+   {
+-    string name;
+-    string id;
+-    string defined_in;
+-    string version;
+-    CORBA::TypeCode type;
+-    CORBA::AttributeMode mode;
++    readonly attribute TypeCode type;
++    attribute IDLType type_def;
++    attribute AttributeMode mode;
+   };
+ 
+-  struct CORBA_ParameterDescription 
++  struct AttributeDescription 
+   {
+-    string name;
+-    CORBA::TypeCode type;
+-    CORBA_IDLType type_def;
+-    CORBA::ParameterMode mode;
++    Identifier name;
++    RepositoryId id;
++    RepositoryId defined_in;
++    VersionSpec version;
++    TypeCode type;
++    AttributeMode mode;
+   };
+ 
+-  typedef sequence <CORBA_ParameterDescription> CORBA_ParDescriptionSeq;
+-  typedef sequence <string> CORBA_ContextIdSeq;
++  enum OperationMode 
++  {
++    OP_NORMAL, 
++    OP_ONEWAY
++  };
+ 
+-  interface CORBA_OperationDef : CORBA_Contained 
++  enum ParameterMode 
+   {
+-    readonly attribute CORBA::TypeCode result;
+-    attribute CORBA_IDLType result_def;
+-    attribute CORBA_ParDescriptionSeq params;
+-    attribute CORBA::OperationMode mode;
+-    attribute CORBA_ContextIdSeq contexts;
+-    attribute CORBA_ExceptionDefSeq exceptions;
++    PARAM_IN, 
++    PARAM_OUT, 
++    PARAM_INOUT
++  };
++
++  struct ParameterDescription 
++  {
++    Identifier name;
++    TypeCode type;
++    IDLType type_def;
++    ParameterMode mode;
+   };
+ 
+-  struct CORBA_OperationDescription 
++  typedef sequence <ParameterDescription> ParDescriptionSeq;
++  typedef Identifier ContextIdentifier;
++  typedef sequence <ContextIdentifier> ContextIdSeq;
++
++  interface OperationDef : Contained 
+   {
+-    string name;
+-    string id;
+-    string defined_in;
+-    string version;
+-    CORBA::TypeCode result;
+-    CORBA::OperationMode mode;
+-    CORBA_ContextIdSeq contexts;
+-    CORBA_ParDescriptionSeq parameters;
+-    CORBA_ExcDescriptionSeq exceptions;
++    readonly attribute TypeCode result;
++    attribute IDLType result_def;
++    attribute ParDescriptionSeq params;
++    attribute OperationMode mode;
++    attribute ContextIdSeq contexts;
++    attribute ExceptionDefSeq exceptions;
+   };
+ 
+-  typedef sequence <string> CORBA_RepositoryIdSeq;
+-  typedef sequence <CORBA_OperationDescription> CORBA_OpDescriptionSeq;
+-  typedef sequence <CORBA_AttributeDescription> CORBA_AttrDescriptionSeq;
++  struct OperationDescription 
++  {
++    Identifier name;
++    RepositoryId id;
++    RepositoryId defined_in;
++    VersionSpec version;
++    TypeCode result;
++    OperationMode mode;
++    ContextIdSeq contexts;
++    ParDescriptionSeq parameters;
++    ExcDescriptionSeq exceptions;
++  };
+ 
+-  interface CORBA_InterfaceDef : CORBA_Container, CORBA_Contained, CORBA_IDLType 
++  typedef sequence <RepositoryId> RepositoryIdSeq;
++  typedef sequence <OperationDescription> OpDescriptionSeq;
++  typedef sequence <AttributeDescription> AttrDescriptionSeq;
++
++  interface InterfaceDef : Container, Contained, IDLType 
+   {
+     // read/write interface
+-    attribute CORBA_InterfaceDefSeq base_interfaces;
++    attribute InterfaceDefSeq base_interfaces;
+     // read interface
+     boolean is_a (
+-        in string interface_id
++        in RepositoryId interface_id
+       );
+ 
+     struct FullInterfaceDescription 
+     {
+-      string name;
+-      string id;
+-      string defined_in;
+-      string version;
+-      CORBA_OpDescriptionSeq operations;
+-      CORBA_AttrDescriptionSeq attributes;
+-      CORBA_RepositoryIdSeq base_interfaces;
+-      CORBA::TypeCode type;
++      Identifier name;
++      RepositoryId id;
++      RepositoryId defined_in;
++      VersionSpec version;
++      OpDescriptionSeq operations;
++      AttrDescriptionSeq attributes;
++      RepositoryIdSeq base_interfaces;
++      TypeCode type;
+     };
+ 
+     FullInterfaceDescription describe_interface ();
+ 
+     // write interface
+-    CORBA_AttributeDef create_attribute (
+-        in string id,
+-        in string name,
+-        in string version,
+-        in CORBA_IDLType type,
+-        in CORBA::AttributeMode mode
++    AttributeDef create_attribute (
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version,
++        in IDLType type,
++        in AttributeMode mode
+       );
+-    CORBA_OperationDef create_operation (
+-        in string id,
+-        in string name,
+-        in string version,
+-        in CORBA_IDLType result,
+-        in CORBA::OperationMode mode,
+-        in CORBA_ParDescriptionSeq params,
+-        in CORBA_ExceptionDefSeq exceptions,
+-        in CORBA_ContextIdSeq contexts
++    OperationDef create_operation (
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version,
++        in IDLType result,
++        in OperationMode mode,
++        in ParDescriptionSeq params,
++        in ExceptionDefSeq exceptions,
++        in ContextIdSeq contexts
+       );
+   };
+ 
+-  struct CORBA_InterfaceDescription 
++  struct InterfaceDescription 
+   {
+-    string name;
+-    string id;
+-    string defined_in;
+-    string version;
+-    CORBA_RepositoryIdSeq base_interfaces;
++    Identifier name;
++    RepositoryId id;
++    RepositoryId defined_in;
++    VersionSpec version;
++    RepositoryIdSeq base_interfaces;
+   };
+ 
+-  interface CORBA_AbstractInterfaceDef : CORBA_InterfaceDef 
++  interface AbstractInterfaceDef : InterfaceDef 
+   {
+   };
+ 
+-  interface CORBA_LocalInterfaceDef : CORBA_InterfaceDef 
++  interface LocalInterfaceDef : InterfaceDef 
+   {
+   };
++};
+ 
+ #pragma prefix ""
+ 
diff --git a/TAO/tao/IFR_Client/diffs/IFR_BasicC.cpp.diff b/TAO/tao/IFR_Client/diffs/IFR_BasicC.cpp.diff
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/TAO/tao/IFR_Client/diffs/IFR_BasicC.cpp.diff
diff --git a/TAO/tao/IFR_Client/diffs/IFR_BasicC.h.diff b/TAO/tao/IFR_Client/diffs/IFR_BasicC.h.diff
new file mode 100644
index 00000000000..cac4e337f1b
--- /dev/null
+++ b/TAO/tao/IFR_Client/diffs/IFR_BasicC.h.diff
@@ -0,0 +1,648 @@
+--- orig/IFR_BasicC.h	Mon Apr 23 20:55:30 2001
++++ IFR_BasicC.h	Mon Apr 23 20:54:05 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,15 +23,12 @@
+ #define _TAO_IDL_IFR_BASICC_H_
+ 
+ #include "ace/pre.h"
+-#include "tao/corba.h"
++#include "IFR_BaseC.h"
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
+-#include "ifr_client_export.h"
+-#include "IFR_BaseC.h"
+-
+ #if defined (TAO_EXPORT_MACRO)
+ #undef TAO_EXPORT_MACRO
+ #endif
+@@ -55,65 +52,6 @@
+ #pragma option push -w-rvl -w-rch -w-ccc -w-inl
+ #endif /* __BORLANDC__ */
+ 
+-TAO_NAMESPACE  CORBA
+-{
+-  enum PrimitiveKind
+-  {
+-        pk_null,
+-        pk_void,
+-        pk_short,
+-        pk_long,
+-        pk_ushort,
+-        pk_ulong,
+-        pk_float,
+-        pk_double,
+-        pk_boolean,
+-        pk_char,
+-        pk_octet,
+-        pk_any,
+-        pk_TypeCode,
+-        pk_Principal,
+-        pk_string,
+-        pk_objref,
+-        pk_longlong,
+-        pk_ulonglong,
+-        pk_longdouble,
+-        pk_wchar,
+-        pk_wstring,
+-        pk_value_base    
+-  };
+-  typedef PrimitiveKind &PrimitiveKind_out;
+-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimitiveKind;
+-
+-  enum AttributeMode
+-  {
+-        ATTR_NORMAL,
+-        ATTR_READONLY    
+-  };
+-  typedef AttributeMode &AttributeMode_out;
+-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeMode;
+-
+-  enum OperationMode
+-  {
+-        OP_NORMAL,
+-        OP_ONEWAY    
+-  };
+-  typedef OperationMode &OperationMode_out;
+-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationMode;
+-
+-  enum ParameterMode
+-  {
+-        PARAM_IN,
+-        PARAM_OUT,
+-        PARAM_INOUT    
+-  };
+-  typedef ParameterMode &ParameterMode_out;
+-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParameterMode;
+-
+-
+-}
+-TAO_NAMESPACE_CLOSE // module CORBA
+-
+ class CORBA_PrimitiveDef;
+ 
+ #if !defined (_CORBA_PRIMITIVEDEF___PTR_CH_)
+@@ -131,33 +69,33 @@
+ {
+ public:
+   CORBA_PrimitiveDef_var (void); // default constructor
+-  CORBA_PrimitiveDef_var (CORBA_PrimitiveDef_ptr p) : ptr_ (p) {} 
++  CORBA_PrimitiveDef_var (CORBA::PrimitiveDef_ptr p) : ptr_ (p) {} 
+   CORBA_PrimitiveDef_var (const CORBA_PrimitiveDef_var &); // copy constructor
+   ~CORBA_PrimitiveDef_var (void); // destructor
+   
+-  CORBA_PrimitiveDef_var &operator= (CORBA_PrimitiveDef_ptr);
++  CORBA_PrimitiveDef_var &operator= (CORBA::PrimitiveDef_ptr);
+   CORBA_PrimitiveDef_var &operator= (const CORBA_PrimitiveDef_var &);
+-  CORBA_PrimitiveDef_ptr operator-> (void) const;
++  CORBA::PrimitiveDef_ptr operator-> (void) const;
+   
+-  operator const CORBA_PrimitiveDef_ptr &() const;
+-  operator CORBA_PrimitiveDef_ptr &();
++  operator const CORBA::PrimitiveDef_ptr &() const;
++  operator CORBA::PrimitiveDef_ptr &();
+   // in, inout, out, _retn 
+-  CORBA_PrimitiveDef_ptr in (void) const;
+-  CORBA_PrimitiveDef_ptr &inout (void);
+-  CORBA_PrimitiveDef_ptr &out (void);
+-  CORBA_PrimitiveDef_ptr _retn (void);
+-  CORBA_PrimitiveDef_ptr ptr (void) const;
++  CORBA::PrimitiveDef_ptr in (void) const;
++  CORBA::PrimitiveDef_ptr &inout (void);
++  CORBA::PrimitiveDef_ptr &out (void);
++  CORBA::PrimitiveDef_ptr _retn (void);
++  CORBA::PrimitiveDef_ptr ptr (void) const;
+   
+   // Hooks used by template sequence and object manager classes
+   // for non-defined forward declared interfaces.
+-  static CORBA_PrimitiveDef_ptr duplicate (CORBA_PrimitiveDef_ptr);
+-  static void release (CORBA_PrimitiveDef_ptr);
+-  static CORBA_PrimitiveDef_ptr nil (void);
+-  static CORBA_PrimitiveDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
++  static CORBA::PrimitiveDef_ptr duplicate (CORBA::PrimitiveDef_ptr);
++  static void release (CORBA::PrimitiveDef_ptr);
++  static CORBA::PrimitiveDef_ptr nil (void);
++  static CORBA::PrimitiveDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+   static CORBA::Object * upcast (void *);
+ 
+ private:
+-  CORBA_PrimitiveDef_ptr ptr_;
++  CORBA::PrimitiveDef_ptr ptr_;
+   // Unimplemented - prevents widening assignment.
+   CORBA_PrimitiveDef_var (const TAO_Base_var &rhs);
+   CORBA_PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
+@@ -173,18 +111,18 @@
+ class TAO_IFR_Client_Export CORBA_PrimitiveDef_out
+ {
+ public:
+-  CORBA_PrimitiveDef_out (CORBA_PrimitiveDef_ptr &);
++  CORBA_PrimitiveDef_out (CORBA::PrimitiveDef_ptr &);
+   CORBA_PrimitiveDef_out (CORBA_PrimitiveDef_var &);
+   CORBA_PrimitiveDef_out (const CORBA_PrimitiveDef_out &);
+   CORBA_PrimitiveDef_out &operator= (const CORBA_PrimitiveDef_out &);
+   CORBA_PrimitiveDef_out &operator= (const CORBA_PrimitiveDef_var &);
+-  CORBA_PrimitiveDef_out &operator= (CORBA_PrimitiveDef_ptr);
+-  operator CORBA_PrimitiveDef_ptr &();
+-  CORBA_PrimitiveDef_ptr &ptr (void);
+-  CORBA_PrimitiveDef_ptr operator-> (void);
++  CORBA_PrimitiveDef_out &operator= (CORBA::PrimitiveDef_ptr);
++  operator CORBA::PrimitiveDef_ptr &();
++  CORBA::PrimitiveDef_ptr &ptr (void);
++  CORBA::PrimitiveDef_ptr operator-> (void);
+ 
+ private:
+-  CORBA_PrimitiveDef_ptr &ptr_;
++  CORBA::PrimitiveDef_ptr &ptr_;
+ };
+ 
+ 
+@@ -570,7 +508,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-
+ #if !defined (_CORBA_REPOSITORY___PTR_CH_)
+ #define _CORBA_REPOSITORY___PTR_CH_
+ 
+@@ -701,7 +638,7 @@
+       CORBA::SystemException
+     ));
+ 
+-  virtual CORBA_PrimitiveDef_ptr get_primitive (
++  virtual CORBA::PrimitiveDef_ptr get_primitive (
+       CORBA::PrimitiveKind kind,
+       CORBA::Environment &ACE_TRY_ENV = 
+         TAO_default_environment ()
+@@ -828,7 +765,7 @@
+       CORBA::SystemException
+     )) = 0;
+ 
+-  virtual CORBA_PrimitiveDef_ptr get_primitive (
++  virtual CORBA::PrimitiveDef_ptr get_primitive (
+       CORBA_Object *_collocated_tao_target_,
+       CORBA::PrimitiveKind kind,
+       CORBA::Environment &ACE_TRY_ENV
+@@ -927,7 +864,7 @@
+       CORBA::SystemException
+     ));
+ 
+-  virtual CORBA_PrimitiveDef_ptr get_primitive (
++  virtual CORBA::PrimitiveDef_ptr get_primitive (
+       CORBA_Object *_collocated_tao_target_,
+       CORBA::PrimitiveKind kind,
+       CORBA::Environment &ACE_TRY_ENV
+@@ -1055,8 +992,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_Repository;
+-
+ 
+ #if !defined (_CORBA_MODULEDEF___PTR_CH_)
+ #define _CORBA_MODULEDEF___PTR_CH_
+@@ -1319,8 +1254,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ModuleDef;
+-
+ struct CORBA_ModuleDescription;
+ class CORBA_ModuleDescription_var;
+ 
+@@ -1386,8 +1319,6 @@
+   void operator= (const CORBA_ModuleDescription_var &);
+ };
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ModuleDescription;
+-
+ 
+ #if !defined (_CORBA_CONSTANTDEF___PTR_CH_)
+ #define _CORBA_CONSTANTDEF___PTR_CH_
+@@ -1774,8 +1705,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ConstantDef;
+-
+ struct CORBA_ConstantDescription;
+ class CORBA_ConstantDescription_var;
+ 
+@@ -1843,8 +1772,6 @@
+   void operator= (const CORBA_ConstantDescription_var &);
+ };
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ConstantDescription;
+-
+ 
+ #if !defined (_CORBA_STRUCTDEF___PTR_CH_)
+ #define _CORBA_STRUCTDEF___PTR_CH_
+@@ -2158,8 +2085,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_StructDef;
+-
+ 
+ #if !defined (_CORBA_UNIONDEF___PTR_CH_)
+ #define _CORBA_UNIONDEF___PTR_CH_
+@@ -2548,8 +2473,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_UnionDef;
+-
+ 
+ #if !defined (_CORBA_ENUMDEF___PTR_CH_)
+ #define _CORBA_ENUMDEF___PTR_CH_
+@@ -2861,8 +2784,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_EnumDef;
+-
+ 
+ #if !defined (_CORBA_ALIASDEF___PTR_CH_)
+ #define _CORBA_ALIASDEF___PTR_CH_
+@@ -3174,8 +3095,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_AliasDef;
+-
+ 
+ #if !defined (_CORBA_NATIVEDEF___PTR_CH_)
+ #define _CORBA_NATIVEDEF___PTR_CH_
+@@ -3436,8 +3355,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_NativeDef;
+-
+ 
+ #if !defined (_CORBA_PRIMITIVEDEF_CH_)
+ #define _CORBA_PRIMITIVEDEF_CH_
+@@ -3452,25 +3369,25 @@
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+-  typedef CORBA_PrimitiveDef_ptr _ptr_type;
++  typedef CORBA::PrimitiveDef_ptr _ptr_type;
+   typedef CORBA_PrimitiveDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+ 
+   // the static operations
+-  static CORBA_PrimitiveDef_ptr _duplicate (CORBA_PrimitiveDef_ptr obj);
+-  static CORBA_PrimitiveDef_ptr _narrow (
++  static CORBA::PrimitiveDef_ptr _duplicate (CORBA::PrimitiveDef_ptr obj);
++  static CORBA::PrimitiveDef_ptr _narrow (
+       CORBA::Object_ptr obj,
+       CORBA::Environment &ACE_TRY_ENV = 
+         TAO_default_environment ()
+     );
+-  static CORBA_PrimitiveDef_ptr _unchecked_narrow (
++  static CORBA::PrimitiveDef_ptr _unchecked_narrow (
+       CORBA::Object_ptr obj,
+       CORBA::Environment &ACE_TRY_ENV = 
+         TAO_default_environment ()
+     );
+-  static CORBA_PrimitiveDef_ptr _nil (void)
++  static CORBA::PrimitiveDef_ptr _nil (void)
+     {
+-      return (CORBA_PrimitiveDef_ptr)0;
++      return (CORBA::PrimitiveDef_ptr)0;
+     }
+ 
+   static void _tao_any_destructor (void*);
+@@ -3646,8 +3563,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_PrimitiveDef;
+-
+ 
+ #if !defined (_CORBA_STRINGDEF_CH_)
+ #define _CORBA_STRINGDEF_CH_
+@@ -3883,8 +3798,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_StringDef;
+-
+ 
+ #if !defined (_CORBA_WSTRINGDEF_CH_)
+ #define _CORBA_WSTRINGDEF_CH_
+@@ -4120,8 +4033,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_WstringDef;
+-
+ 
+ #if !defined (_CORBA_SEQUENCEDEF_CH_)
+ #define _CORBA_SEQUENCEDEF_CH_
+@@ -4247,8 +4158,7 @@
+ //                    Base  Impl. Declaration
+ //
+ 
+-class TAO_IFR_Client_Export _TAO_CORBA_SequenceDef_Proxy_Impl : 
+-  public virtual _TAO_CORBA_IDLType_Proxy_Impl
++class TAO_IFR_Client_Export _TAO_CORBA_SequenceDef_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
+ {
+ public:
+   virtual ~_TAO_CORBA_SequenceDef_Proxy_Impl (void) { }
+@@ -4310,9 +4220,7 @@
+ 
+ class TAO_IFR_Client_Export _TAO_CORBA_SequenceDef_Remote_Proxy_Impl : 
+   public virtual _TAO_CORBA_SequenceDef_Proxy_Impl,
+-  public virtual TAO_Remote_Object_Proxy_Impl,
+-  public virtual _TAO_CORBA_IDLType_Remote_Proxy_Impl
+-  
++  public virtual TAO_Remote_Object_Proxy_Impl
+ {
+ public:
+   _TAO_CORBA_SequenceDef_Remote_Proxy_Impl (void);
+@@ -4432,8 +4340,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_SequenceDef;
+-
+ 
+ #if !defined (_CORBA_ARRAYDEF_CH_)
+ #define _CORBA_ARRAYDEF_CH_
+@@ -4744,8 +4650,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ArrayDef;
+-
+ 
+ #if !defined (_CORBA_EXCEPTIONDEF___PTR_CH_)
+ #define _CORBA_EXCEPTIONDEF___PTR_CH_
+@@ -5083,8 +4987,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ExceptionDef;
+-
+ struct CORBA_ExceptionDescription;
+ class CORBA_ExceptionDescription_var;
+ 
+@@ -5151,8 +5053,6 @@
+   void operator= (const CORBA_ExceptionDescription_var &);
+ };
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ExceptionDescription;
+-
+ 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+@@ -5303,8 +5203,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ExceptionDefSeq;
+-
+ 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+@@ -5455,8 +5353,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ExcDescriptionSeq;
+-
+ 
+ #if !defined (_CORBA_ATTRIBUTEDEF___PTR_CH_)
+ #define _CORBA_ATTRIBUTEDEF___PTR_CH_
+@@ -5843,8 +5739,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_AttributeDef;
+-
+ struct CORBA_AttributeDescription;
+ class CORBA_AttributeDescription_var;
+ 
+@@ -5912,8 +5806,6 @@
+   void operator= (const CORBA_AttributeDescription_var &);
+ };
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_AttributeDescription;
+-
+ struct CORBA_ParameterDescription;
+ class CORBA_ParameterDescription_var;
+ 
+@@ -5979,8 +5871,6 @@
+   void operator= (const CORBA_ParameterDescription_var &);
+ };
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ParameterDescription;
+-
+ 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+@@ -6131,8 +6021,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ParDescriptionSeq;
+-
+ 
+ #if !defined (_CORBA_CONTEXTIDSEQ_CH_)
+ #define _CORBA_CONTEXTIDSEQ_CH_
+@@ -6240,8 +6128,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ContextIdSeq;
+-
+ 
+ #if !defined (_CORBA_OPERATIONDEF___PTR_CH_)
+ #define _CORBA_OPERATIONDEF___PTR_CH_
+@@ -6781,8 +6667,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_OperationDef;
+-
+ struct CORBA_OperationDescription;
+ class CORBA_OperationDescription_var;
+ 
+@@ -6853,8 +6737,6 @@
+   void operator= (const CORBA_OperationDescription_var &);
+ };
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_OperationDescription;
+-
+ 
+ #if !defined (_CORBA_REPOSITORYIDSEQ_CH_)
+ #define _CORBA_REPOSITORYIDSEQ_CH_
+@@ -6962,8 +6844,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_RepositoryIdSeq;
+-
+ 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+@@ -7114,8 +6994,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_OpDescriptionSeq;
+-
+ 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+@@ -7266,8 +7144,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_AttrDescriptionSeq;
+-
+ 
+ #if !defined (_CORBA_INTERFACEDEF___PTR_CH_)
+ #define _CORBA_INTERFACEDEF___PTR_CH_
+@@ -7792,8 +7668,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_InterfaceDef;
+-
+ struct CORBA_InterfaceDescription;
+ class CORBA_InterfaceDescription_var;
+ 
+@@ -7860,8 +7734,6 @@
+   void operator= (const CORBA_InterfaceDescription_var &);
+ };
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_InterfaceDescription;
+-
+ 
+ #if !defined (_CORBA_ABSTRACTINTERFACEDEF___PTR_CH_)
+ #define _CORBA_ABSTRACTINTERFACEDEF___PTR_CH_
+@@ -8122,8 +7994,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_AbstractInterfaceDef;
+-
+ 
+ #if !defined (_CORBA_LOCALINTERFACEDEF___PTR_CH_)
+ #define _CORBA_LOCALINTERFACEDEF___PTR_CH_
+@@ -8384,8 +8254,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_LocalInterfaceDef;
+-
+ // Proxy Broker Factory function pointer declarations.
+ 
+ extern TAO_IFR_Client_Export
+@@ -8531,17 +8399,11 @@
+     void *
+   );
+ 
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveKind);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PrimitiveKind &);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeMode);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AttributeMode &);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationMode);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OperationMode &);
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ParameterMode);
+-TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ParameterMode &);
+ // Any operators for interface CORBA_FixedDef
+ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_FixedDef_ptr);
+ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_FixedDef *&);
++TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveKind);
++TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PrimitiveKind &);
+ // Any operators for interface CORBA_Repository
+ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_Repository_ptr);
+ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_Repository *&);
+@@ -8575,7 +8437,7 @@
+ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_NativeDef_ptr);
+ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_NativeDef *&);
+ // Any operators for interface CORBA_PrimitiveDef
+-TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_PrimitiveDef_ptr);
++TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveDef_ptr);
+ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_PrimitiveDef *&);
+ // Any operators for interface CORBA_StringDef
+ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_StringDef_ptr);
+@@ -8604,6 +8466,8 @@
+ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ExcDescriptionSeq*); // noncopying version
+ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ExcDescriptionSeq *&); // deprecated
+ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_ExcDescriptionSeq *&);
++TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeMode);
++TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AttributeMode &);
+ // Any operators for interface CORBA_AttributeDef
+ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AttributeDef_ptr);
+ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AttributeDef *&);
+@@ -8611,6 +8475,10 @@
+ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_AttributeDescription*); // noncopying version
+ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_AttributeDescription *&); // deprecated
+ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA_AttributeDescription *&);
++TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationMode);
++TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OperationMode &);
++TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ParameterMode);
++TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ParameterMode &);
+ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA_ParameterDescription &); // copying version
+ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_ParameterDescription*); // noncopying version
+ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_ParameterDescription *&); // deprecated
+@@ -8662,16 +8530,10 @@
+ 
+ #ifndef __ACE_INLINE__
+ 
+-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PrimitiveKind &); // 
+-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PrimitiveKind &);
+-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AttributeMode &); // 
+-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AttributeMode &);
+-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::OperationMode &); // 
+-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::OperationMode &);
+-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ParameterMode &); // 
+-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ParameterMode &);
+ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_FixedDef_ptr );
+ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_FixedDef_ptr &);
++TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PrimitiveKind &); // 
++TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PrimitiveKind &);
+ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_Repository_ptr );
+ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_Repository_ptr &);
+ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ModuleDef_ptr );
+@@ -8692,8 +8554,8 @@
+ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AliasDef_ptr &);
+ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_NativeDef_ptr );
+ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_NativeDef_ptr &);
+-TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_PrimitiveDef_ptr );
+-TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_PrimitiveDef_ptr &);
++TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PrimitiveDef_ptr );
++TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::PrimitiveDef_ptr &);
+ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_StringDef_ptr );
+ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_StringDef_ptr &);
+ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_WstringDef_ptr );
+@@ -8736,10 +8598,16 @@
+ 
+ #endif /* _TAO_CDR_OP_CORBA_ExcDescriptionSeq_H_ */
+ 
++TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::AttributeMode &); // 
++TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::AttributeMode &);
+ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AttributeDef_ptr );
+ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AttributeDef_ptr &);
+ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_AttributeDescription &);
+ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_AttributeDescription &);
++TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::OperationMode &); // 
++TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::OperationMode &);
++TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ParameterMode &); // 
++TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ParameterMode &);
+ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ParameterDescription &);
+ TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_ParameterDescription &);
+ 
diff --git a/TAO/tao/IFR_Client/diffs/IFR_BasicC.i.diff b/TAO/tao/IFR_Client/diffs/IFR_BasicC.i.diff
new file mode 100644
index 00000000000..54da720b153
--- /dev/null
+++ b/TAO/tao/IFR_Client/diffs/IFR_BasicC.i.diff
@@ -0,0 +1,237 @@
+--- orig/IFR_BasicC.i	Mon Apr 23 20:55:30 2001
++++ IFR_BasicC.i	Mon Apr 23 20:05:29 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:
+@@ -897,9 +897,9 @@
+ #if !defined (_CORBA_PRIMITIVEDEF___CI_)
+ #define _CORBA_PRIMITIVEDEF___CI_
+ 
+-ACE_INLINE CORBA_PrimitiveDef_ptr
++ACE_INLINE CORBA::PrimitiveDef_ptr
+ tao_CORBA_PrimitiveDef_duplicate (
+-    CORBA_PrimitiveDef_ptr p
++    CORBA::PrimitiveDef_ptr p
+   )
+ {
+   return CORBA_PrimitiveDef::_duplicate (p);
+@@ -907,13 +907,13 @@
+ 
+ ACE_INLINE void
+ tao_CORBA_PrimitiveDef_release (
+-    CORBA_PrimitiveDef_ptr p
++    CORBA::PrimitiveDef_ptr p
+   )
+ {
+   CORBA::release (p);
+ }
+ 
+-ACE_INLINE CORBA_PrimitiveDef_ptr
++ACE_INLINE CORBA::PrimitiveDef_ptr
+ tao_CORBA_PrimitiveDef_nil (
+     void
+   )
+@@ -921,7 +921,7 @@
+   return CORBA_PrimitiveDef::_nil ();
+ }
+ 
+-ACE_INLINE CORBA_PrimitiveDef_ptr
++ACE_INLINE CORBA::PrimitiveDef_ptr
+ tao_CORBA_PrimitiveDef_narrow (
+     CORBA::Object *p,
+     CORBA::Environment &ACE_TRY_ENV
+@@ -5096,90 +5096,14 @@
+ 
+ #endif /* end #if !defined */
+ 
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::PrimitiveKind &_tao_enumval)
+-{
+-  CORBA::ULong _tao_temp = _tao_enumval;
+-  return strm << _tao_temp;
+-}
+-
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::PrimitiveKind &_tao_enumval)
+-{
+-  CORBA::ULong _tao_temp = 0;
+-  CORBA::Boolean _tao_result = strm >> _tao_temp;
+-  
+-  if (_tao_result == 1)
+-    {
+-      _tao_enumval = ACE_static_cast (CORBA::PrimitiveKind, _tao_temp);
+-    }
+-  
+-  return _tao_result;
+-}
+-
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::AttributeMode &_tao_enumval)
+-{
+-  CORBA::ULong _tao_temp = _tao_enumval;
+-  return strm << _tao_temp;
+-}
+-
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::AttributeMode &_tao_enumval)
+-{
+-  CORBA::ULong _tao_temp = 0;
+-  CORBA::Boolean _tao_result = strm >> _tao_temp;
+-  
+-  if (_tao_result == 1)
+-    {
+-      _tao_enumval = ACE_static_cast (CORBA::AttributeMode, _tao_temp);
+-    }
+-  
+-  return _tao_result;
+-}
+-
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::OperationMode &_tao_enumval)
+-{
+-  CORBA::ULong _tao_temp = _tao_enumval;
+-  return strm << _tao_temp;
+-}
+-
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::OperationMode &_tao_enumval)
+-{
+-  CORBA::ULong _tao_temp = 0;
+-  CORBA::Boolean _tao_result = strm >> _tao_temp;
+-  
+-  if (_tao_result == 1)
+-    {
+-      _tao_enumval = ACE_static_cast (CORBA::OperationMode, _tao_temp);
+-    }
+-  
+-  return _tao_result;
+-}
+-
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ParameterMode &_tao_enumval)
+-{
+-  CORBA::ULong _tao_temp = _tao_enumval;
+-  return strm << _tao_temp;
+-}
+-
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ParameterMode &_tao_enumval)
+-{
+-  CORBA::ULong _tao_temp = 0;
+-  CORBA::Boolean _tao_result = strm >> _tao_temp;
+-  
+-  if (_tao_result == 1)
+-    {
+-      _tao_enumval = ACE_static_cast (CORBA::ParameterMode, _tao_temp);
+-    }
+-  
+-  return _tao_result;
+-}
+-
+ TAO_IFR_Client_Export CORBA::Boolean operator<< (
+     TAO_OutputCDR &,
+-    const CORBA_PrimitiveDef_ptr
++    const CORBA::PrimitiveDef_ptr
+   );
+ 
+ TAO_IFR_Client_Export CORBA::Boolean operator>> (
+     TAO_InputCDR &,
+-    CORBA_PrimitiveDef_ptr &
++    CORBA::PrimitiveDef_ptr &
+   );
+ 
+ TAO_IFR_Client_Export CORBA::Boolean operator<< (
+@@ -5232,6 +5156,25 @@
+     CORBA_FixedDef_ptr &
+   );
+ 
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::PrimitiveKind &_tao_enumval)
++{
++  CORBA::ULong _tao_temp = _tao_enumval;
++  return strm << _tao_temp;
++}
++
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::PrimitiveKind &_tao_enumval)
++{
++  CORBA::ULong _tao_temp = 0;
++  CORBA::Boolean _tao_result = strm >> _tao_temp;
++  
++  if (_tao_result == 1)
++    {
++      _tao_enumval = ACE_static_cast (CORBA::PrimitiveKind, _tao_temp);
++    }
++  
++  return _tao_result;
++}
++
+ TAO_IFR_Client_Export CORBA::Boolean operator<< (
+     TAO_OutputCDR &,
+     const CORBA_Repository_ptr
+@@ -5442,6 +5385,25 @@
+ 
+ #endif /* _TAO_CDR_OP_CORBA_ExcDescriptionSeq_I_ */
+ 
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::AttributeMode &_tao_enumval)
++{
++  CORBA::ULong _tao_temp = _tao_enumval;
++  return strm << _tao_temp;
++}
++
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::AttributeMode &_tao_enumval)
++{
++  CORBA::ULong _tao_temp = 0;
++  CORBA::Boolean _tao_result = strm >> _tao_temp;
++  
++  if (_tao_result == 1)
++    {
++      _tao_enumval = ACE_static_cast (CORBA::AttributeMode, _tao_temp);
++    }
++  
++  return _tao_result;
++}
++
+ TAO_IFR_Client_Export CORBA::Boolean operator<< (
+     TAO_OutputCDR &,
+     const CORBA_AttributeDef_ptr
+@@ -5482,6 +5444,44 @@
+   else
+     return 0;
+   
++}
++
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::OperationMode &_tao_enumval)
++{
++  CORBA::ULong _tao_temp = _tao_enumval;
++  return strm << _tao_temp;
++}
++
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::OperationMode &_tao_enumval)
++{
++  CORBA::ULong _tao_temp = 0;
++  CORBA::Boolean _tao_result = strm >> _tao_temp;
++  
++  if (_tao_result == 1)
++    {
++      _tao_enumval = ACE_static_cast (CORBA::OperationMode, _tao_temp);
++    }
++  
++  return _tao_result;
++}
++
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::ParameterMode &_tao_enumval)
++{
++  CORBA::ULong _tao_temp = _tao_enumval;
++  return strm << _tao_temp;
++}
++
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ParameterMode &_tao_enumval)
++{
++  CORBA::ULong _tao_temp = 0;
++  CORBA::Boolean _tao_result = strm >> _tao_temp;
++  
++  if (_tao_result == 1)
++    {
++      _tao_enumval = ACE_static_cast (CORBA::ParameterMode, _tao_temp);
++    }
++  
++  return _tao_result;
+ }
+ 
+ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_ParameterDescription &_tao_aggregate)
diff --git a/TAO/tao/IFR_Client/diffs/IFR_Components.pidl.diff b/TAO/tao/IFR_Client/diffs/IFR_Components.pidl.diff
new file mode 100644
index 00000000000..65dcf794b95
--- /dev/null
+++ b/TAO/tao/IFR_Client/diffs/IFR_Components.pidl.diff
@@ -0,0 +1,264 @@
+--- orig/IFR_Components.pidl	Fri Apr 20 03:46:56 2001
++++ IFR_Components.pidl	Fri Apr 20 03:39:21 2001
+@@ -71,6 +71,44 @@
+ 
+ module IR
+ {
++  enum DefinitionKind 
++  {
++    dk_none, 
++    dk_all,
++    dk_Attribute, 
++    dk_Constant, 
++    dk_Exception, 
++    dk_Interface,
++    dk_Module, 
++    dk_Operation, 
++    dk_Typedef,
++    dk_Alias, 
++    dk_Struct, 
++    dk_Union, 
++    dk_Enum,
++    dk_Primitive, 
++    dk_String, 
++    dk_Sequence, 
++    dk_Array,
++    dk_Repository,
++    dk_Wstring, 
++    dk_Fixed,
++    dk_Value, 
++    dk_ValueBox, 
++    dk_ValueMember,
++    dk_Native,
++    dk_Component,
++    dk_Home,
++    dk_Factory,
++    dk_Finder,
++    dk_PrimaryKey,
++    dk_Emits,
++    dk_Publishes,
++    dk_Consumes,
++    dk_Provides,
++    dk_Uses
++  };
++
+   typedef string Identifier;
+   typedef string ScopedName;
+   typedef string RepositoryId;
+@@ -98,14 +136,14 @@
+   typedef sequence <FinderDef> FinderDefSeq;
+   interface PrimaryKeyDef;
+ 
+-  interface ComponentRepository : CORBA_Repository
++  interface ComponentRepository : CORBA::Repository
+   {
+     ComponentDef create_component (
+         in RepositoryId id,
+         in Identifier name,
+         in VersionSpec version,
+         in ComponentDef base_component,
+-        in CORBA_InterfaceDefSeq supports_interfaces
++        in CORBA::InterfaceDefSeq supports_interfaces
+       );
+     HomeDef create_home (
+         in RepositoryId id,
+@@ -113,14 +151,14 @@
+         in VersionSpec version,
+         in HomeDef base_home,
+         in ComponentDef managed_component,
+-        in CORBA_ValueDef primary_key
++        in CORBA::ValueDef primary_key
+       );
+   };
+ 
+-  interface ProvidesDef : CORBA_Contained 
++  interface ProvidesDef : CORBA::Contained 
+   {
+     // read interface
+-    readonly attribute CORBA_InterfaceDef interface_type;
++    readonly attribute CORBA::InterfaceDef interface_type;
+   };
+ 
+   struct ProvidesDescription 
+@@ -129,13 +167,13 @@
+     RepositoryId id;
+     RepositoryId defined_in;
+     VersionSpec version;
+-    CORBA_InterfaceDef interface_type;
++    CORBA::InterfaceDef interface_type;
+   };
+ 
+-  interface UsesDef : CORBA_Contained 
++  interface UsesDef : CORBA::Contained 
+   {
+     // read interface
+-    readonly attribute CORBA_InterfaceDef interface_type;
++    readonly attribute CORBA::InterfaceDef interface_type;
+     readonly attribute boolean is_multiple;
+   };
+ 
+@@ -145,18 +183,18 @@
+     RepositoryId id;
+     RepositoryId defined_in;
+     VersionSpec version;
+-    CORBA_InterfaceDef interface_type;
++    CORBA::InterfaceDef interface_type;
+     boolean is_multiple;
+   };
+ 
+   typedef sequence <ProvidesDescription> ProvidesDescSeq;
+   typedef sequence <UsesDescription> UsesDescSeq;
+ 
+-  interface EventDef : CORBA_Contained 
++  interface EventDef : CORBA::Contained 
+   { // abstract - never instantiated
+     // read interface
+     boolean is_a (in RepositoryId event_id);
+-    readonly attribute CORBA_ValueDef event;
++    readonly attribute CORBA::ValueDef event;
+   };
+ 
+   struct EventDescription 
+@@ -165,7 +203,7 @@
+     RepositoryId id;
+     RepositoryId defined_in;
+     VersionSpec version;
+-    CORBA_ValueDef value;
++    CORBA::ValueDef value;
+   };
+ 
+   interface EmitsDef : EventDef 
+@@ -180,10 +218,10 @@
+   {
+   };
+ 
+-  interface ComponentDef : CORBA_InterfaceDef 
++  interface ComponentDef : CORBA::InterfaceDef 
+   {
+     // read/write interface
+-    attribute CORBA_InterfaceDefSeq supported_interfaces;
++    attribute CORBA::InterfaceDefSeq supported_interfaces;
+     // read interface
+     readonly attribute ComponentDef base_component;
+     readonly attribute ProvidesDefSeq provides_interfaces;
+@@ -197,32 +235,32 @@
+         in RepositoryId id,
+         in Identifier name,
+         in VersionSpec version,
+-        in CORBA_InterfaceDef interface_type
++        in CORBA::InterfaceDef interface_type
+       );
+     UsesDef create_uses (
+         in RepositoryId id,
+         in Identifier name,
+         in VersionSpec version,
+-        in CORBA_InterfaceDef interface_type,
++        in CORBA::InterfaceDef interface_type,
+         in boolean is_multiple
+       );
+     EmitsDef create_emits (
+         in RepositoryId id,
+         in Identifier name,
+         in VersionSpec version,
+-        in CORBA_ValueDef value
++        in CORBA::ValueDef value
+       );
+     PublishesDef create_publishes (
+         in RepositoryId id,
+         in Identifier name,
+         in VersionSpec version,
+-        in CORBA_ValueDef value
++        in CORBA::ValueDef value
+       );
+     ConsumesDef create_consumes (
+         in RepositoryId id,
+         in Identifier name,
+         in VersionSpec version,
+-        in CORBA_ValueDef value
++        in CORBA::ValueDef value
+       );
+   };
+ 
+@@ -236,18 +274,18 @@
+     RepositoryIdSeq supports_interfaces;
+     ProvidesDefSeq provides_interfaces;
+     UsesDefSeq uses_interfaces;
+-    CORBA_AttrDescriptionSeq attributes;
++    CORBA::AttrDescriptionSeq attributes;
+     EmitsDefSeq emits_events;
+     PublishesDefSeq publishes_events;
+     ConsumesDefSeq consumes_events;
+     boolean is_basic;
+   };
+ 
+-  interface PrimaryKeyDef : CORBA_Contained 
++  interface PrimaryKeyDef : CORBA::Contained 
+   {
+     // read interface
+     boolean is_a (in RepositoryId primary_key_id);
+-    readonly attribute CORBA_ValueDef primary_key;
++    readonly attribute CORBA::ValueDef primary_key;
+   };
+ 
+   struct PrimaryKeyDescription 
+@@ -256,18 +294,18 @@
+     RepositoryId id;
+     RepositoryId defined_in;
+     VersionSpec version;
+-    CORBA_ValueDef primary_key;
++    CORBA::ValueDef primary_key;
+   };
+ 
+-  interface FactoryDef : CORBA_OperationDef 
++  interface FactoryDef : CORBA::OperationDef 
+   { // only PARAM_IN parameters
+   };
+ 
+-  interface FinderDef : CORBA_OperationDef 
++  interface FinderDef : CORBA::OperationDef 
+   { // only PARAM_IN parameters
+   };
+ 
+-  interface HomeDef : CORBA_InterfaceDef 
++  interface HomeDef : CORBA::InterfaceDef 
+   {
+     // read operations
+     readonly attribute HomeDef base_home;
+@@ -281,21 +319,21 @@
+         in RepositoryId id,
+         in Identifier name,
+         in VersionSpec version,
+-        in CORBA_ValueDef primary_key
++        in CORBA::ValueDef primary_key
+       );
+     FactoryDef create_factory (
+         in RepositoryId id,
+         in Identifier name,
+         in VersionSpec version,
+-        in CORBA_ParDescriptionSeq params, // only PARAM_INs
+-        in CORBA_ExceptionDefSeq exceptions
++        in CORBA::ParDescriptionSeq params, // only PARAM_INs
++        in CORBA::ExceptionDefSeq exceptions
+       );
+     FinderDef create_finder (
+         in RepositoryId id,
+         in Identifier name,
+         in VersionSpec version,
+-        in CORBA_ParDescriptionSeq params, // only PARAM_INs
+-        in CORBA_ExceptionDefSeq exceptions
++        in CORBA::ParDescriptionSeq params, // only PARAM_INs
++        in CORBA::ExceptionDefSeq exceptions
+       );
+   };
+ 
+@@ -310,8 +348,8 @@
+     PrimaryKeyDef primary_key_def;
+     FactoryDefSeq factories;
+     FinderDefSeq finders;
+-    CORBA_OpDescriptionSeq operations;
+-    CORBA_AttrDescriptionSeq attributes;
++    CORBA::OpDescriptionSeq operations;
++    CORBA::AttrDescriptionSeq attributes;
+     boolean is_basic;
+   };
+ };
diff --git a/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.cpp.diff b/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.cpp.diff
new file mode 100644
index 00000000000..c2474dd590e
--- /dev/null
+++ b/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.cpp.diff
@@ -0,0 +1,239 @@
+--- orig/IFR_ComponentsC.cpp	Mon Apr 23 20:20:22 2001
++++ IFR_ComponentsC.cpp	Fri Apr 20 03:52: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:
+@@ -21,8 +21,6 @@
+ 
+ #include "IFR_ComponentsC.h"
+ 
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+ #include "tao/ClientRequestInfo.h"
+ #if TAO_HAS_INTERCEPTORS == 1
+ #include "tao/RequestInfo_Util.h"
+@@ -13177,7 +13175,7 @@
+   ACE_NTOHL (0x69627574), 
+   ACE_NTOHL (0x65730000),  // name = attributes
+   CORBA::tk_alias, // typecode kind for typedefs
+-  416, // encapsulation length
++  420, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     41,
+     ACE_NTOHL (0x49444c3a), 
+@@ -13200,10 +13198,10 @@
+     ACE_NTOHL (0x6e536571), 
+     ACE_NTOHL (0x0),  // name = CORBA_AttrDescriptionSeq
+     CORBA::tk_sequence, // typecode kind
+-    324, // encapsulation length
++    328, // encapsulation length
+       TAO_ENCAP_BYTE_ORDER, // byte order
+       CORBA::tk_struct, // typecode kind
+-      308, // encapsulation length
++      312, // encapsulation length
+         TAO_ENCAP_BYTE_ORDER, // byte order
+         43,
+         ACE_NTOHL (0x49444c3a), 
+@@ -13255,23 +13253,24 @@
+         ACE_NTOHL (0x6d6f6465), 
+         ACE_NTOHL (0x0),  // name = mode
+         CORBA::tk_enum, // typecode kind
+-        104, // encapsulation length
++        108, // encapsulation length
+           TAO_ENCAP_BYTE_ORDER, // byte order
+           36,
+           ACE_NTOHL (0x49444c3a), 
+           ACE_NTOHL (0x6f6d672e), 
+           ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x412f4174), 
++          ACE_NTOHL (0x415f4174), 
+           ACE_NTOHL (0x74726962), 
+           ACE_NTOHL (0x7574654d), 
+           ACE_NTOHL (0x6f64653a), 
+-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
+-          14,
+-          ACE_NTOHL (0x41747472), 
+-          ACE_NTOHL (0x69627574), 
+-          ACE_NTOHL (0x654d6f64), 
+-          ACE_NTOHL (0x65000000),  // name = AttributeMode
++          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_AttributeMode:1.0
++          20,
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x415f4174), 
++          ACE_NTOHL (0x74726962), 
++          ACE_NTOHL (0x7574654d), 
++          ACE_NTOHL (0x6f646500),  // name = CORBA_AttributeMode
+           2, // member count
+           12,
+           ACE_NTOHL (0x41545452), 
+@@ -18943,7 +18942,7 @@
+   ACE_NTOHL (0x6174696f), 
+   ACE_NTOHL (0x6e730000),  // name = operations
+   CORBA::tk_alias, // typecode kind for typedefs
+-  1296, // encapsulation length
++  1304, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     39,
+     ACE_NTOHL (0x49444c3a), 
+@@ -18964,10 +18963,10 @@
+     ACE_NTOHL (0x696f6e53), 
+     ACE_NTOHL (0x65710000),  // name = CORBA_OpDescriptionSeq
+     CORBA::tk_sequence, // typecode kind
+-    1212, // encapsulation length
++    1220, // encapsulation length
+       TAO_ENCAP_BYTE_ORDER, // byte order
+       CORBA::tk_struct, // typecode kind
+-      1196, // encapsulation length
++      1204, // encapsulation length
+         TAO_ENCAP_BYTE_ORDER, // byte order
+         43,
+         ACE_NTOHL (0x49444c3a), 
+@@ -19019,23 +19018,24 @@
+         ACE_NTOHL (0x6d6f6465), 
+         ACE_NTOHL (0x0),  // name = mode
+         CORBA::tk_enum, // typecode kind
+-        100, // encapsulation length
++        104, // encapsulation length
+           TAO_ENCAP_BYTE_ORDER, // byte order
+           36,
+           ACE_NTOHL (0x49444c3a), 
+           ACE_NTOHL (0x6f6d672e), 
+           ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x412f4f70), 
++          ACE_NTOHL (0x415f4f70), 
+           ACE_NTOHL (0x65726174), 
+           ACE_NTOHL (0x696f6e4d), 
+           ACE_NTOHL (0x6f64653a), 
+-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
+-          14,
+-          ACE_NTOHL (0x4f706572), 
+-          ACE_NTOHL (0x6174696f), 
+-          ACE_NTOHL (0x6e4d6f64), 
+-          ACE_NTOHL (0x65000000),  // name = OperationMode
++          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_OperationMode:1.0
++          20,
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x415f4f70), 
++          ACE_NTOHL (0x65726174), 
++          ACE_NTOHL (0x696f6e4d), 
++          ACE_NTOHL (0x6f646500),  // name = CORBA_OperationMode
+           2, // member count
+           10,
+           ACE_NTOHL (0x4f505f4e), 
+@@ -19082,7 +19082,7 @@
+         ACE_NTOHL (0x6d657465), 
+         ACE_NTOHL (0x72730000),  // name = parameters
+         CORBA::tk_alias, // typecode kind for typedefs
+-        444, // encapsulation length
++        448, // encapsulation length
+           TAO_ENCAP_BYTE_ORDER, // byte order
+           40,
+           ACE_NTOHL (0x49444c3a), 
+@@ -19103,10 +19103,10 @@
+           ACE_NTOHL (0x74696f6e), 
+           ACE_NTOHL (0x53657100),  // name = CORBA_ParDescriptionSeq
+           CORBA::tk_sequence, // typecode kind
+-          360, // encapsulation length
++          364, // encapsulation length
+             TAO_ENCAP_BYTE_ORDER, // byte order
+             CORBA::tk_struct, // typecode kind
+-            344, // encapsulation length
++            348, // encapsulation length
+               TAO_ENCAP_BYTE_ORDER, // byte order
+               43,
+               ACE_NTOHL (0x49444c3a), 
+@@ -19165,23 +19165,24 @@
+               ACE_NTOHL (0x6d6f6465), 
+               ACE_NTOHL (0x0),  // name = mode
+               CORBA::tk_enum, // typecode kind
+-              116, // encapsulation length
++              120, // encapsulation length
+                 TAO_ENCAP_BYTE_ORDER, // byte order
+                 36,
+                 ACE_NTOHL (0x49444c3a), 
+                 ACE_NTOHL (0x6f6d672e), 
+                 ACE_NTOHL (0x6f72672f), 
+                 ACE_NTOHL (0x434f5242), 
+-                ACE_NTOHL (0x412f5061), 
++                ACE_NTOHL (0x415f5061), 
+                 ACE_NTOHL (0x72616d65), 
+                 ACE_NTOHL (0x7465724d), 
+                 ACE_NTOHL (0x6f64653a), 
+-                ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
+-                14,
+-                ACE_NTOHL (0x50617261), 
+-                ACE_NTOHL (0x6d657465), 
+-                ACE_NTOHL (0x724d6f64), 
+-                ACE_NTOHL (0x65000000),  // name = ParameterMode
++                ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ParameterMode:1.0
++                20,
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x415f5061), 
++                ACE_NTOHL (0x72616d65), 
++                ACE_NTOHL (0x7465724d), 
++                ACE_NTOHL (0x6f646500),  // name = CORBA_ParameterMode
+                 3, // member count
+                 9,
+                 ACE_NTOHL (0x50415241), 
+@@ -19290,7 +19291,7 @@
+   ACE_NTOHL (0x69627574), 
+   ACE_NTOHL (0x65730000),  // name = attributes
+   CORBA::tk_alias, // typecode kind for typedefs
+-  416, // encapsulation length
++  420, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     41,
+     ACE_NTOHL (0x49444c3a), 
+@@ -19313,10 +19314,10 @@
+     ACE_NTOHL (0x6e536571), 
+     ACE_NTOHL (0x0),  // name = CORBA_AttrDescriptionSeq
+     CORBA::tk_sequence, // typecode kind
+-    324, // encapsulation length
++    328, // encapsulation length
+       TAO_ENCAP_BYTE_ORDER, // byte order
+       CORBA::tk_struct, // typecode kind
+-      308, // encapsulation length
++      312, // encapsulation length
+         TAO_ENCAP_BYTE_ORDER, // byte order
+         43,
+         ACE_NTOHL (0x49444c3a), 
+@@ -19368,23 +19369,24 @@
+         ACE_NTOHL (0x6d6f6465), 
+         ACE_NTOHL (0x0),  // name = mode
+         CORBA::tk_enum, // typecode kind
+-        104, // encapsulation length
++        108, // encapsulation length
+           TAO_ENCAP_BYTE_ORDER, // byte order
+           36,
+           ACE_NTOHL (0x49444c3a), 
+           ACE_NTOHL (0x6f6d672e), 
+           ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x412f4174), 
++          ACE_NTOHL (0x415f4174), 
+           ACE_NTOHL (0x74726962), 
+           ACE_NTOHL (0x7574654d), 
+           ACE_NTOHL (0x6f64653a), 
+-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
+-          14,
+-          ACE_NTOHL (0x41747472), 
+-          ACE_NTOHL (0x69627574), 
+-          ACE_NTOHL (0x654d6f64), 
+-          ACE_NTOHL (0x65000000),  // name = AttributeMode
++          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_AttributeMode:1.0
++          20,
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x415f4174), 
++          ACE_NTOHL (0x74726962), 
++          ACE_NTOHL (0x7574654d), 
++          ACE_NTOHL (0x6f646500),  // name = CORBA_AttributeMode
+           2, // member count
+           12,
+           ACE_NTOHL (0x41545452), 
diff --git a/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.h.diff b/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.h.diff
new file mode 100644
index 00000000000..4b66aa74e01
--- /dev/null
+++ b/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.h.diff
@@ -0,0 +1,25 @@
+--- orig/IFR_ComponentsC.h	Mon Apr 23 20:20:21 2001
++++ IFR_ComponentsC.h	Fri Apr 20 03:51: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,13 +23,12 @@
+ #define _TAO_IDL_IFR_COMPONENTSC_H_
+ 
+ #include "ace/pre.h"
+-#include "tao/corba.h"
++#include "ifr_client_export.h"
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
+-#include "ifr_client_export.h"
+ #include "IFR_ExtendedC.h"
+ 
+ #if defined (TAO_EXPORT_MACRO)
diff --git a/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.i.diff b/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.i.diff
new file mode 100644
index 00000000000..d917da2a475
--- /dev/null
+++ b/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.i.diff
@@ -0,0 +1,10 @@
+--- orig/IFR_ComponentsC.i	Mon Apr 23 20:20:22 2001
++++ IFR_ComponentsC.i	Fri Apr 20 03:51:28 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/IFR_Client/diffs/IFR_Extended.pidl.diff b/TAO/tao/IFR_Client/diffs/IFR_Extended.pidl.diff
new file mode 100644
index 00000000000..2da32bf4fb1
--- /dev/null
+++ b/TAO/tao/IFR_Client/diffs/IFR_Extended.pidl.diff
@@ -0,0 +1,189 @@
+--- orig/IFR_Extended.pidl	Mon Apr 23 20:20:09 2001
++++ IFR_Extended.pidl	Fri Apr 20 03:06:40 2001
+@@ -71,114 +71,122 @@
+ 
+ module CORBA
+ {
++  typedef short ValueModifier; // PIDL
++  const ValueModifier VM_NONE = 0;
++  const ValueModifier VM_CUSTOM = 1;
++  const ValueModifier VM_ABSTRACT = 2;
++  const ValueModifier VM_TRUNCATABLE = 3;
++
+   typedef short Visibility;
+-};
++  const Visibility PRIVATE_MEMBER = 0;
++  const Visibility PUBLIC_MEMBER = 1;
+ 
+-  interface CORBA_FixedDef : CORBA_IDLType 
++  interface FixedDef : IDLType 
+   {
+     attribute unsigned short digits;
+     attribute short scale;
+   };
+ 
+-  struct CORBA_ValueMember 
++  struct ValueMember 
+   {
+-    string name;
+-    string id;
+-    string defined_in;
+-    string version;
+-    CORBA::TypeCode type;
+-    CORBA_IDLType type_def;
+-    CORBA::Visibility access;
++    Identifier name;
++    RepositoryId id;
++    RepositoryId defined_in;
++    VersionSpec version;
++    TypeCode type;
++    IDLType type_def;
++    Visibility access;
+   };
+ 
+-  typedef sequence <CORBA_ValueMember> CORBA_ValueMemberSeq;
++  typedef sequence <ValueMember> ValueMemberSeq;
+ 
+-  interface CORBA_ValueMemberDef : CORBA_Contained 
++  interface ValueMemberDef : Contained 
+   {
+-    readonly attribute CORBA::TypeCode type;
+-    attribute CORBA_IDLType type_def;
+-    attribute CORBA::Visibility access;
++    readonly attribute TypeCode type;
++    attribute IDLType type_def;
++    attribute Visibility access;
+   };
+ 
+-  interface CORBA_ValueDef : CORBA_Container, CORBA_Contained, CORBA_IDLType 
++  interface ValueDef : Container, Contained, IDLType 
+   {
+     // read/write interface
+-    attribute CORBA_InterfaceDefSeq supported_interfaces;
+-    attribute CORBA_InitializerSeq initializers;
+-    attribute CORBA_ValueDef base_value;
+-    attribute CORBA_ValueDefSeq abstract_base_values;
++    attribute InterfaceDefSeq supported_interfaces;
++    attribute InitializerSeq initializers;
++    attribute ValueDef base_value;
++    attribute ValueDefSeq abstract_base_values;
+     // read interface
+     attribute boolean is_abstract;
+     attribute boolean is_custom;
+     attribute boolean is_truncatable;
+     boolean is_a (
+-        in string id
++        in RepositoryId id
+       );
+ 
+     struct FullValueDescription 
+     {
+-      string name;
+-      string id;
++      Identifier name;
++      RepositoryId id;
+       boolean is_abstract;
+       boolean is_custom;
+-      string defined_in;
+-      string version;
+-      CORBA_OpDescriptionSeq operations;
+-      CORBA_AttrDescriptionSeq attributes;
+-      CORBA_ValueMemberSeq members;
+-      CORBA_InitializerSeq initializers;
+-      CORBA_RepositoryIdSeq supported_interfaces;
+-      CORBA_RepositoryIdSeq abstract_base_values;
++      RepositoryId defined_in;
++      VersionSpec version;
++      OpDescriptionSeq operations;
++      AttrDescriptionSeq attributes;
++      ValueMemberSeq members;
++      InitializerSeq initializers;
++      RepositoryIdSeq supported_interfaces;
++      RepositoryIdSeq abstract_base_values;
+       boolean is_truncatable;
+-      string base_value;
+-      CORBA::TypeCode type;
++      RepositoryId base_value;
++      TypeCode type;
+     };
+ 
+     FullValueDescription describe_value ();
+       
+-    CORBA_ValueMemberDef create_value_member  (
+-        in string id,
+-        in string name,
+-        in string version,
+-        in CORBA_IDLType type,
+-        in CORBA::Visibility access
++    ValueMemberDef create_value_member  (
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version,
++        in IDLType type,
++        in Visibility access
+       );
+-    CORBA_AttributeDef create_attribute (
+-        in string id,
+-        in string name,
+-        in string version,
+-        in CORBA_IDLType type,
+-        in CORBA::AttributeMode mode
++    AttributeDef create_attribute (
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version,
++        in IDLType type,
++        in AttributeMode mode
+       );
+-    CORBA_OperationDef create_operation (
+-        in string id,
+-        in string name,
+-        in string version,
+-        in CORBA_IDLType result,
+-        in CORBA::OperationMode mode,
+-        in CORBA_ParDescriptionSeq params,
+-        in CORBA_ExceptionDefSeq exceptions,
+-        in CORBA_ContextIdSeq contexts
++    OperationDef create_operation (
++        in RepositoryId id,
++        in Identifier name,
++        in VersionSpec version,
++        in IDLType result,
++        in OperationMode mode,
++        in ParDescriptionSeq params,
++        in ExceptionDefSeq exceptions,
++        in ContextIdSeq contexts
+       );
+   };
+ 
+-  struct CORBA_ValueDescription 
++  struct ValueDescription 
+   {
+-    string name;
+-    string id;
++    Identifier name;
++    RepositoryId id;
+     boolean is_abstract;
+     boolean is_custom;
+-    string defined_in;
+-    string version;
+-    CORBA_RepositoryIdSeq supported_interfaces;
+-    CORBA_RepositoryIdSeq abstract_base_values;
++    RepositoryId defined_in;
++    VersionSpec version;
++    RepositoryIdSeq supported_interfaces;
++    RepositoryIdSeq abstract_base_values;
+     boolean is_truncatable;
+-    string base_value;
++    RepositoryId base_value;
+   };
+ 
+-  interface CORBA_ValueBoxDef : CORBA_TypedefDef 
++  interface ValueBoxDef : TypedefDef 
+   {
+-    attribute CORBA_IDLType original_type_def;
++    attribute IDLType original_type_def;
++  };
+   };
+ 
+ #pragma prefix ""
diff --git a/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.cpp.diff b/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.cpp.diff
new file mode 100644
index 00000000000..2de6399d7a3
--- /dev/null
+++ b/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.cpp.diff
@@ -0,0 +1,2329 @@
+--- orig/IFR_ExtendedC.cpp	Mon Apr 23 20:20:13 2001
++++ IFR_ExtendedC.cpp	Mon Apr 23 20:07:22 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:
+@@ -20,10 +20,8 @@
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+ #include "IFR_ExtendedC.h"
+-
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+ #include "tao/ClientRequestInfo.h"
++
+ #if TAO_HAS_INTERCEPTORS == 1
+ #include "tao/RequestInfo_Util.h"
+ #endif  /* TAO_HAS_INTERCEPTORS == 1 */
+@@ -36,40 +34,6 @@
+ #include "IFR_ExtendedC.i"
+ #endif /* !defined INLINE */
+ 
+-static const CORBA::Long _oc_CORBA_Visibility[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  33,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x412f5669), 
+-  ACE_NTOHL (0x73696269), 
+-  ACE_NTOHL (0x6c697479), 
+-  ACE_NTOHL (0x3a312e30), 
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
+-  11,
+-  ACE_NTOHL (0x56697369), 
+-  ACE_NTOHL (0x62696c69), 
+-  ACE_NTOHL (0x74790000),  // name = Visibility
+-  CORBA::tk_short,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_Visibility (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_Visibility),
+-    (char *) &_oc_CORBA_Visibility,
+-    0,
+-    sizeof (CORBA::Visibility)
+-  );
+-
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Visibility, &_tc_TAO_tc_CORBA_Visibility)
+-TAO_NAMESPACE_END
+-
+ // *************************************************************
+ // Operations for class CORBA_FixedDef_var
+ // *************************************************************
+@@ -1349,7 +1313,7 @@
+     return CORBA_FixedDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_FixedDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/FixedDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_FixedDef::_nil ());
+       if (is_a == 0)
+         return CORBA_FixedDef::_nil ();
+@@ -1417,9 +1381,9 @@
+ CORBA::Boolean CORBA_FixedDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_FixedDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/FixedDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -1468,7 +1432,7 @@
+ 
+ const char* CORBA_FixedDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_FixedDef:1.0";
++  return "IDL:omg.org/CORBA/FixedDef:1.0";
+ }
+ 
+ CORBA::UShort CORBA_FixedDef::digits (
+@@ -1543,139 +1507,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_FixedDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  31,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4669), 
+-  ACE_NTOHL (0x78656444), 
+-  ACE_NTOHL (0x65663a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_FixedDef:1.0
+-  15,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4669), 
+-  ACE_NTOHL (0x78656444), 
+-  ACE_NTOHL (0x65660000),  // name = CORBA_FixedDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_FixedDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_FixedDef),
+-    (char *) &_oc_CORBA_FixedDef,
+-    0,
+-    sizeof (CORBA_FixedDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_FixedDef =
+-  &_tc_TAO_tc_CORBA_FixedDef;
+-
+-static const CORBA::Long _oc_CORBA_ValueMember[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  34,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5661), 
+-  ACE_NTOHL (0x6c75654d), 
+-  ACE_NTOHL (0x656d6265), 
+-  ACE_NTOHL (0x723a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_ValueMember:1.0
+-  18,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5661), 
+-  ACE_NTOHL (0x6c75654d), 
+-  ACE_NTOHL (0x656d6265), 
+-  ACE_NTOHL (0x72000000),  // name = CORBA_ValueMember
+-  7, // member count
+-  5,
+-  ACE_NTOHL (0x6e616d65), 
+-  ACE_NTOHL (0x0),  // name = name
+-  CORBA::tk_string, 
+-  0U, // string length
+-  3,
+-  ACE_NTOHL (0x69640000),  // name = id
+-  CORBA::tk_string, 
+-  0U, // string length
+-  11,
+-  ACE_NTOHL (0x64656669), 
+-  ACE_NTOHL (0x6e65645f), 
+-  ACE_NTOHL (0x696e0000),  // name = defined_in
+-  CORBA::tk_string, 
+-  0U, // string length
+-  8,
+-  ACE_NTOHL (0x76657273), 
+-  ACE_NTOHL (0x696f6e00),  // name = version
+-  CORBA::tk_string, 
+-  0U, // string length
+-  5,
+-  ACE_NTOHL (0x74797065), 
+-  ACE_NTOHL (0x0),  // name = type
+-  CORBA::tk_TypeCode,
+-
+-  9,
+-  ACE_NTOHL (0x74797065), 
+-  ACE_NTOHL (0x5f646566), 
+-  ACE_NTOHL (0x0),  // name = type_def
+-  CORBA::tk_objref, // typecode kind
+-  60, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    30,
+-    ACE_NTOHL (0x49444c3a), 
+-    ACE_NTOHL (0x6f6d672e), 
+-    ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4944), 
+-    ACE_NTOHL (0x4c547970), 
+-    ACE_NTOHL (0x653a312e), 
+-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-    14,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4944), 
+-    ACE_NTOHL (0x4c547970), 
+-    ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
+-
+-  7,
+-  ACE_NTOHL (0x61636365), 
+-  ACE_NTOHL (0x73730000),  // name = access
+-  CORBA::tk_alias, // typecode kind for typedefs
+-  64, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    33,
+-    ACE_NTOHL (0x49444c3a), 
+-    ACE_NTOHL (0x6f6d672e), 
+-    ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x412f5669), 
+-    ACE_NTOHL (0x73696269), 
+-    ACE_NTOHL (0x6c697479), 
+-    ACE_NTOHL (0x3a312e30), 
+-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
+-    11,
+-    ACE_NTOHL (0x56697369), 
+-    ACE_NTOHL (0x62696c69), 
+-    ACE_NTOHL (0x74790000),  // name = Visibility
+-    CORBA::tk_short,
+-
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueMember (
+-    CORBA::tk_struct,
+-    sizeof (_oc_CORBA_ValueMember),
+-    (char *) &_oc_CORBA_ValueMember,
+-    0,
+-    sizeof (CORBA_ValueMember)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ValueMember =
+-  &_tc_TAO_tc_CORBA_ValueMember;
+-
+ void CORBA_ValueMember::_tao_any_destructor (void *x)
+ {
+   CORBA_ValueMember *tmp = ACE_static_cast (CORBA_ValueMember*,x);
+@@ -1778,136 +1609,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_CORBA_ValueMemberSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  37,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5661), 
+-  ACE_NTOHL (0x6c75654d), 
+-  ACE_NTOHL (0x656d6265), 
+-  ACE_NTOHL (0x72536571), 
+-  ACE_NTOHL (0x3a312e30), 
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_ValueMemberSeq:1.0
+-  21,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5661), 
+-  ACE_NTOHL (0x6c75654d), 
+-  ACE_NTOHL (0x656d6265), 
+-  ACE_NTOHL (0x72536571), 
+-  ACE_NTOHL (0x0),  // name = CORBA_ValueMemberSeq
+-  CORBA::tk_sequence, // typecode kind
+-  352, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_struct, // typecode kind
+-    336, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      34,
+-      ACE_NTOHL (0x49444c3a), 
+-      ACE_NTOHL (0x6f6d672e), 
+-      ACE_NTOHL (0x6f72672f), 
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f5661), 
+-      ACE_NTOHL (0x6c75654d), 
+-      ACE_NTOHL (0x656d6265), 
+-      ACE_NTOHL (0x723a312e), 
+-      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_ValueMember:1.0
+-      18,
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f5661), 
+-      ACE_NTOHL (0x6c75654d), 
+-      ACE_NTOHL (0x656d6265), 
+-      ACE_NTOHL (0x72000000),  // name = CORBA_ValueMember
+-      7, // member count
+-      5,
+-      ACE_NTOHL (0x6e616d65), 
+-      ACE_NTOHL (0x0),  // name = name
+-      CORBA::tk_string, 
+-      0U, // string length
+-      3,
+-      ACE_NTOHL (0x69640000),  // name = id
+-      CORBA::tk_string, 
+-      0U, // string length
+-      11,
+-      ACE_NTOHL (0x64656669), 
+-      ACE_NTOHL (0x6e65645f), 
+-      ACE_NTOHL (0x696e0000),  // name = defined_in
+-      CORBA::tk_string, 
+-      0U, // string length
+-      8,
+-      ACE_NTOHL (0x76657273), 
+-      ACE_NTOHL (0x696f6e00),  // name = version
+-      CORBA::tk_string, 
+-      0U, // string length
+-      5,
+-      ACE_NTOHL (0x74797065), 
+-      ACE_NTOHL (0x0),  // name = type
+-      CORBA::tk_TypeCode,
+-
+-      9,
+-      ACE_NTOHL (0x74797065), 
+-      ACE_NTOHL (0x5f646566), 
+-      ACE_NTOHL (0x0),  // name = type_def
+-      CORBA::tk_objref, // typecode kind
+-      60, // encapsulation length
+-        TAO_ENCAP_BYTE_ORDER, // byte order
+-        30,
+-        ACE_NTOHL (0x49444c3a), 
+-        ACE_NTOHL (0x6f6d672e), 
+-        ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4944), 
+-        ACE_NTOHL (0x4c547970), 
+-        ACE_NTOHL (0x653a312e), 
+-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-        14,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4944), 
+-        ACE_NTOHL (0x4c547970), 
+-        ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
+-
+-      7,
+-      ACE_NTOHL (0x61636365), 
+-      ACE_NTOHL (0x73730000),  // name = access
+-      CORBA::tk_alias, // typecode kind for typedefs
+-      64, // encapsulation length
+-        TAO_ENCAP_BYTE_ORDER, // byte order
+-        33,
+-        ACE_NTOHL (0x49444c3a), 
+-        ACE_NTOHL (0x6f6d672e), 
+-        ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x412f5669), 
+-        ACE_NTOHL (0x73696269), 
+-        ACE_NTOHL (0x6c697479), 
+-        ACE_NTOHL (0x3a312e30), 
+-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
+-        11,
+-        ACE_NTOHL (0x56697369), 
+-        ACE_NTOHL (0x62696c69), 
+-        ACE_NTOHL (0x74790000),  // name = Visibility
+-        CORBA::tk_short,
+-
+-
+-
+-    0U,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueMemberSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_ValueMemberSeq),
+-    (char *) &_oc_CORBA_ValueMemberSeq,
+-    0,
+-    sizeof (CORBA_ValueMemberSeq)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ValueMemberSeq =
+-  &_tc_TAO_tc_CORBA_ValueMemberSeq;
+-
+ // *************************************************************
+ // Operations for class CORBA_ValueMemberDef_var
+ // *************************************************************
+@@ -3443,7 +3144,7 @@
+     return CORBA_ValueMemberDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_ValueMemberDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueMemberDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_ValueMemberDef::_nil ());
+       if (is_a == 0)
+         return CORBA_ValueMemberDef::_nil ();
+@@ -3511,9 +3212,9 @@
+ CORBA::Boolean CORBA_ValueMemberDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueMemberDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueMemberDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -3562,7 +3263,7 @@
+ 
+ const char* CORBA_ValueMemberDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_ValueMemberDef:1.0";
++  return "IDL:omg.org/CORBA/ValueMemberDef:1.0";
+ }
+ 
+ CORBA::TypeCode_ptr CORBA_ValueMemberDef::type (
+@@ -3654,40 +3355,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_ValueMemberDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  37,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5661), 
+-  ACE_NTOHL (0x6c75654d), 
+-  ACE_NTOHL (0x656d6265), 
+-  ACE_NTOHL (0x72446566), 
+-  ACE_NTOHL (0x3a312e30), 
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_ValueMemberDef:1.0
+-  21,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5661), 
+-  ACE_NTOHL (0x6c75654d), 
+-  ACE_NTOHL (0x656d6265), 
+-  ACE_NTOHL (0x72446566), 
+-  ACE_NTOHL (0x0),  // name = CORBA_ValueMemberDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueMemberDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_ValueMemberDef),
+-    (char *) &_oc_CORBA_ValueMemberDef,
+-    0,
+-    sizeof (CORBA_ValueMemberDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ValueMemberDef =
+-  &_tc_TAO_tc_CORBA_ValueMemberDef;
+-
+ // *************************************************************
+ // Operations for class CORBA_ValueDef_var
+ // *************************************************************
+@@ -9004,7 +8671,7 @@
+     return CORBA_ValueDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_ValueDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_ValueDef::_nil ());
+       if (is_a == 0)
+         return CORBA_ValueDef::_nil ();
+@@ -9072,11 +8739,11 @@
+ CORBA::Boolean CORBA_ValueDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -9149,7 +8816,7 @@
+ 
+ const char* CORBA_ValueDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_ValueDef:1.0";
++  return "IDL:omg.org/CORBA/ValueDef:1.0";
+ }
+ 
+ CORBA_InterfaceDefSeq * CORBA_ValueDef::supported_interfaces (
+@@ -9431,7 +9098,7 @@
+   ACE_NTOHL (0x6f6d672e), 
+   ACE_NTOHL (0x6f72672f), 
+   ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5661), 
++  ACE_NTOHL (0x412f5661), 
+   ACE_NTOHL (0x6c756544), 
+   ACE_NTOHL (0x65662f46), 
+   ACE_NTOHL (0x756c6c56), 
+@@ -9439,7 +9106,7 @@
+   ACE_NTOHL (0x44657363), 
+   ACE_NTOHL (0x72697074), 
+   ACE_NTOHL (0x696f6e3a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ValueDef/FullValueDescription:1.0
++  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ValueDef/FullValueDescription:1.0
+   21,
+   ACE_NTOHL (0x46756c6c), 
+   ACE_NTOHL (0x56616c75), 
+@@ -9451,12 +9118,49 @@
+   5,
+   ACE_NTOHL (0x6e616d65), 
+   ACE_NTOHL (0x0),  // name = name
+-  CORBA::tk_string, 
+-  0U, // string length
++  CORBA::tk_alias, // typecode kind for typedefs
++  68, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    33,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x434f5242), 
++    ACE_NTOHL (0x412f4964), 
++    ACE_NTOHL (0x656e7469), 
++    ACE_NTOHL (0x66696572), 
++    ACE_NTOHL (0x3a312e30), 
++    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
++    11,
++    ACE_NTOHL (0x4964656e), 
++    ACE_NTOHL (0x74696669), 
++    ACE_NTOHL (0x65720000),  // name = Identifier
++    CORBA::tk_string, 
++    0U, // string length
++
+   3,
+   ACE_NTOHL (0x69640000),  // name = id
++  CORBA::tk_alias, // typecode kind for typedefs
++  72, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    35,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x434f5242), 
++    ACE_NTOHL (0x412f5265), 
++    ACE_NTOHL (0x706f7369), 
++    ACE_NTOHL (0x746f7279), 
++    ACE_NTOHL (0x49643a31), 
++    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++    13,
++    ACE_NTOHL (0x5265706f), 
++    ACE_NTOHL (0x7369746f), 
++    ACE_NTOHL (0x72794964), 
++    ACE_NTOHL (0x0),  // name = RepositoryId
+   CORBA::tk_string, 
+   0U, // string length
++
+   12,
+   ACE_NTOHL (0x69735f61), 
+   ACE_NTOHL (0x62737472), 
+@@ -9473,85 +9177,194 @@
+   ACE_NTOHL (0x64656669), 
+   ACE_NTOHL (0x6e65645f), 
+   ACE_NTOHL (0x696e0000),  // name = defined_in
++  CORBA::tk_alias, // typecode kind for typedefs
++  72, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    35,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x434f5242), 
++    ACE_NTOHL (0x412f5265), 
++    ACE_NTOHL (0x706f7369), 
++    ACE_NTOHL (0x746f7279), 
++    ACE_NTOHL (0x49643a31), 
++    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++    13,
++    ACE_NTOHL (0x5265706f), 
++    ACE_NTOHL (0x7369746f), 
++    ACE_NTOHL (0x72794964), 
++    ACE_NTOHL (0x0),  // name = RepositoryId
+   CORBA::tk_string, 
+   0U, // string length
++
+   8,
+   ACE_NTOHL (0x76657273), 
+   ACE_NTOHL (0x696f6e00),  // name = version
++  CORBA::tk_alias, // typecode kind for typedefs
++  68, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    34,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x434f5242), 
++    ACE_NTOHL (0x412f5665), 
++    ACE_NTOHL (0x7273696f), 
++    ACE_NTOHL (0x6e537065), 
++    ACE_NTOHL (0x633a312e), 
++    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
++    12,
++    ACE_NTOHL (0x56657273), 
++    ACE_NTOHL (0x696f6e53), 
++    ACE_NTOHL (0x70656300),  // name = VersionSpec
+   CORBA::tk_string, 
+   0U, // string length
++
+   11,
+   ACE_NTOHL (0x6f706572), 
+   ACE_NTOHL (0x6174696f), 
+   ACE_NTOHL (0x6e730000),  // name = operations
+   CORBA::tk_alias, // typecode kind for typedefs
+-  1296, // encapsulation length
++  2036, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     39,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4f70), 
++    ACE_NTOHL (0x412f4f70), 
+     ACE_NTOHL (0x44657363), 
+     ACE_NTOHL (0x72697074), 
+     ACE_NTOHL (0x696f6e53), 
+     ACE_NTOHL (0x65713a31), 
+-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_OpDescriptionSeq:1.0
+-    23,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4f70), 
+-    ACE_NTOHL (0x44657363), 
+-    ACE_NTOHL (0x72697074), 
+-    ACE_NTOHL (0x696f6e53), 
+-    ACE_NTOHL (0x65710000),  // name = CORBA_OpDescriptionSeq
++    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
++    17,
++    ACE_NTOHL (0x4f704465), 
++    ACE_NTOHL (0x73637269), 
++    ACE_NTOHL (0x7074696f), 
++    ACE_NTOHL (0x6e536571), 
++    ACE_NTOHL (0x0),  // name = OpDescriptionSeq
+     CORBA::tk_sequence, // typecode kind
+-    1212, // encapsulation length
++    1956, // encapsulation length
+       TAO_ENCAP_BYTE_ORDER, // byte order
+       CORBA::tk_struct, // typecode kind
+-      1196, // encapsulation length
++      1940, // encapsulation length
+         TAO_ENCAP_BYTE_ORDER, // byte order
+         43,
+         ACE_NTOHL (0x49444c3a), 
+         ACE_NTOHL (0x6f6d672e), 
+         ACE_NTOHL (0x6f72672f), 
+         ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4f70), 
++        ACE_NTOHL (0x412f4f70), 
+         ACE_NTOHL (0x65726174), 
+         ACE_NTOHL (0x696f6e44), 
+         ACE_NTOHL (0x65736372), 
+         ACE_NTOHL (0x69707469), 
+         ACE_NTOHL (0x6f6e3a31), 
+-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_OperationDescription:1.0
+-        27,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4f70), 
+-        ACE_NTOHL (0x65726174), 
+-        ACE_NTOHL (0x696f6e44), 
+-        ACE_NTOHL (0x65736372), 
+-        ACE_NTOHL (0x69707469), 
+-        ACE_NTOHL (0x6f6e0000),  // name = CORBA_OperationDescription
++        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
++        21,
++        ACE_NTOHL (0x4f706572), 
++        ACE_NTOHL (0x6174696f), 
++        ACE_NTOHL (0x6e446573), 
++        ACE_NTOHL (0x63726970), 
++        ACE_NTOHL (0x74696f6e), 
++        ACE_NTOHL (0x0),  // name = OperationDescription
+         9, // member count
+         5,
+         ACE_NTOHL (0x6e616d65), 
+         ACE_NTOHL (0x0),  // name = name
++        CORBA::tk_alias, // typecode kind for typedefs
++        68, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          33,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f4964), 
++          ACE_NTOHL (0x656e7469), 
++          ACE_NTOHL (0x66696572), 
++          ACE_NTOHL (0x3a312e30), 
++          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
++          11,
++          ACE_NTOHL (0x4964656e), 
++          ACE_NTOHL (0x74696669), 
++          ACE_NTOHL (0x65720000),  // name = Identifier
+         CORBA::tk_string, 
+         0U, // string length
++
+         3,
+         ACE_NTOHL (0x69640000),  // name = id
++        CORBA::tk_alias, // typecode kind for typedefs
++        72, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          35,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5265), 
++          ACE_NTOHL (0x706f7369), 
++          ACE_NTOHL (0x746f7279), 
++          ACE_NTOHL (0x49643a31), 
++          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++          13,
++          ACE_NTOHL (0x5265706f), 
++          ACE_NTOHL (0x7369746f), 
++          ACE_NTOHL (0x72794964), 
++          ACE_NTOHL (0x0),  // name = RepositoryId
+         CORBA::tk_string, 
+         0U, // string length
++
+         11,
+         ACE_NTOHL (0x64656669), 
+         ACE_NTOHL (0x6e65645f), 
+         ACE_NTOHL (0x696e0000),  // name = defined_in
++        CORBA::tk_alias, // typecode kind for typedefs
++        72, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          35,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5265), 
++          ACE_NTOHL (0x706f7369), 
++          ACE_NTOHL (0x746f7279), 
++          ACE_NTOHL (0x49643a31), 
++          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++          13,
++          ACE_NTOHL (0x5265706f), 
++          ACE_NTOHL (0x7369746f), 
++          ACE_NTOHL (0x72794964), 
++          ACE_NTOHL (0x0),  // name = RepositoryId
+         CORBA::tk_string, 
+         0U, // string length
++
+         8,
+         ACE_NTOHL (0x76657273), 
+         ACE_NTOHL (0x696f6e00),  // name = version
++        CORBA::tk_alias, // typecode kind for typedefs
++        68, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          34,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5665), 
++          ACE_NTOHL (0x7273696f), 
++          ACE_NTOHL (0x6e537065), 
++          ACE_NTOHL (0x633a312e), 
++          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
++          12,
++          ACE_NTOHL (0x56657273), 
++          ACE_NTOHL (0x696f6e53), 
++          ACE_NTOHL (0x70656300),  // name = VersionSpec
+         CORBA::tk_string, 
+         0U, // string length
++
+         7,
+         ACE_NTOHL (0x72657375), 
+         ACE_NTOHL (0x6c740000),  // name = result
+@@ -9593,29 +9406,67 @@
+         ACE_NTOHL (0x65787473), 
+         ACE_NTOHL (0x0),  // name = contexts
+         CORBA::tk_alias, // typecode kind for typedefs
+-        92, // encapsulation length
++        236, // encapsulation length
+           TAO_ENCAP_BYTE_ORDER, // byte order
+           35,
+           ACE_NTOHL (0x49444c3a), 
+           ACE_NTOHL (0x6f6d672e), 
+           ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f436f), 
++          ACE_NTOHL (0x412f436f), 
+           ACE_NTOHL (0x6e746578), 
+           ACE_NTOHL (0x74496453), 
+           ACE_NTOHL (0x65713a31), 
+-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ContextIdSeq:1.0
+-          19,
++          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
++          13,
++          ACE_NTOHL (0x436f6e74), 
++          ACE_NTOHL (0x65787449), 
++          ACE_NTOHL (0x64536571), 
++          ACE_NTOHL (0x0),  // name = ContextIdSeq
++          CORBA::tk_sequence, // typecode kind
++          164, // encapsulation length
++            TAO_ENCAP_BYTE_ORDER, // byte order
++            CORBA::tk_alias, // typecode kind for typedefs
++            148, // encapsulation length
++              TAO_ENCAP_BYTE_ORDER, // byte order
++              40,
++              ACE_NTOHL (0x49444c3a), 
++              ACE_NTOHL (0x6f6d672e), 
++              ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f436f), 
++              ACE_NTOHL (0x412f436f), 
+           ACE_NTOHL (0x6e746578), 
+-          ACE_NTOHL (0x74496453), 
+-          ACE_NTOHL (0x65710000),  // name = CORBA_ContextIdSeq
+-          CORBA::tk_sequence, // typecode kind
+-          16, // encapsulation length
++              ACE_NTOHL (0x74496465), 
++              ACE_NTOHL (0x6e746966), 
++              ACE_NTOHL (0x6965723a), 
++              ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
++              18,
++              ACE_NTOHL (0x436f6e74), 
++              ACE_NTOHL (0x65787449), 
++              ACE_NTOHL (0x64656e74), 
++              ACE_NTOHL (0x69666965), 
++              ACE_NTOHL (0x72000000),  // name = ContextIdentifier
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
+             TAO_ENCAP_BYTE_ORDER, // byte order
++                33,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f4964), 
++                ACE_NTOHL (0x656e7469), 
++                ACE_NTOHL (0x66696572), 
++                ACE_NTOHL (0x3a312e30), 
++                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
++                11,
++                ACE_NTOHL (0x4964656e), 
++                ACE_NTOHL (0x74696669), 
++                ACE_NTOHL (0x65720000),  // name = Identifier
+             CORBA::tk_string, 
+             0U, // string length
++
++
+             0U,
+ 
+ 
+@@ -9624,58 +9475,74 @@
+         ACE_NTOHL (0x6d657465), 
+         ACE_NTOHL (0x72730000),  // name = parameters
+         CORBA::tk_alias, // typecode kind for typedefs
+-        444, // encapsulation length
++        496, // encapsulation length
+           TAO_ENCAP_BYTE_ORDER, // byte order
+           40,
+           ACE_NTOHL (0x49444c3a), 
+           ACE_NTOHL (0x6f6d672e), 
+           ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f5061), 
++          ACE_NTOHL (0x412f5061), 
+           ACE_NTOHL (0x72446573), 
+           ACE_NTOHL (0x63726970), 
+           ACE_NTOHL (0x74696f6e), 
+           ACE_NTOHL (0x5365713a), 
+-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ParDescriptionSeq:1.0
+-          24,
+-          ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f5061), 
+-          ACE_NTOHL (0x72446573), 
+-          ACE_NTOHL (0x63726970), 
+-          ACE_NTOHL (0x74696f6e), 
+-          ACE_NTOHL (0x53657100),  // name = CORBA_ParDescriptionSeq
++          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
++          18,
++          ACE_NTOHL (0x50617244), 
++          ACE_NTOHL (0x65736372), 
++          ACE_NTOHL (0x69707469), 
++          ACE_NTOHL (0x6f6e5365), 
++          ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
+           CORBA::tk_sequence, // typecode kind
+-          360, // encapsulation length
++          416, // encapsulation length
+             TAO_ENCAP_BYTE_ORDER, // byte order
+             CORBA::tk_struct, // typecode kind
+-            344, // encapsulation length
++            400, // encapsulation length
+               TAO_ENCAP_BYTE_ORDER, // byte order
+               43,
+               ACE_NTOHL (0x49444c3a), 
+               ACE_NTOHL (0x6f6d672e), 
+               ACE_NTOHL (0x6f72672f), 
+               ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f5061), 
++              ACE_NTOHL (0x412f5061), 
+               ACE_NTOHL (0x72616d65), 
+               ACE_NTOHL (0x74657244), 
+               ACE_NTOHL (0x65736372), 
+               ACE_NTOHL (0x69707469), 
+               ACE_NTOHL (0x6f6e3a31), 
+-              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ParameterDescription:1.0
+-              27,
+-              ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f5061), 
+-              ACE_NTOHL (0x72616d65), 
+-              ACE_NTOHL (0x74657244), 
+-              ACE_NTOHL (0x65736372), 
+-              ACE_NTOHL (0x69707469), 
+-              ACE_NTOHL (0x6f6e0000),  // name = CORBA_ParameterDescription
++              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
++              21,
++              ACE_NTOHL (0x50617261), 
++              ACE_NTOHL (0x6d657465), 
++              ACE_NTOHL (0x72446573), 
++              ACE_NTOHL (0x63726970), 
++              ACE_NTOHL (0x74696f6e), 
++              ACE_NTOHL (0x0),  // name = ParameterDescription
+               4, // member count
+               5,
+               ACE_NTOHL (0x6e616d65), 
+               ACE_NTOHL (0x0),  // name = name
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
++                TAO_ENCAP_BYTE_ORDER, // byte order
++                33,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f4964), 
++                ACE_NTOHL (0x656e7469), 
++                ACE_NTOHL (0x66696572), 
++                ACE_NTOHL (0x3a312e30), 
++                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
++                11,
++                ACE_NTOHL (0x4964656e), 
++                ACE_NTOHL (0x74696669), 
++                ACE_NTOHL (0x65720000),  // name = Identifier
+               CORBA::tk_string, 
+               0U, // string length
++
+               5,
+               ACE_NTOHL (0x74797065), 
+               ACE_NTOHL (0x0),  // name = type
+@@ -9686,22 +9553,20 @@
+               ACE_NTOHL (0x5f646566), 
+               ACE_NTOHL (0x0),  // name = type_def
+               CORBA::tk_objref, // typecode kind
+-              60, // encapsulation length
++              52, // encapsulation length
+                 TAO_ENCAP_BYTE_ORDER, // byte order
+                 30,
+                 ACE_NTOHL (0x49444c3a), 
+                 ACE_NTOHL (0x6f6d672e), 
+                 ACE_NTOHL (0x6f72672f), 
+                 ACE_NTOHL (0x434f5242), 
+-                ACE_NTOHL (0x415f4944), 
++                ACE_NTOHL (0x412f4944), 
+                 ACE_NTOHL (0x4c547970), 
+                 ACE_NTOHL (0x653a312e), 
+-                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-                14,
+-                ACE_NTOHL (0x434f5242), 
+-                ACE_NTOHL (0x415f4944), 
+-                ACE_NTOHL (0x4c547970), 
+-                ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
++                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
++                8,
++                ACE_NTOHL (0x49444c54), 
++                ACE_NTOHL (0x79706500),  // name = IDLType
+ 
+               5,
+               ACE_NTOHL (0x6d6f6465), 
+@@ -9747,73 +9612,145 @@
+         ACE_NTOHL (0x7074696f), 
+         ACE_NTOHL (0x6e730000),  // name = exceptions
+         CORBA::tk_alias, // typecode kind for typedefs
+-        284, // encapsulation length
++        556, // encapsulation length
+           TAO_ENCAP_BYTE_ORDER, // byte order
+           40,
+           ACE_NTOHL (0x49444c3a), 
+           ACE_NTOHL (0x6f6d672e), 
+           ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f4578), 
++          ACE_NTOHL (0x412f4578), 
+           ACE_NTOHL (0x63446573), 
+           ACE_NTOHL (0x63726970), 
+           ACE_NTOHL (0x74696f6e), 
+           ACE_NTOHL (0x5365713a), 
+-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ExcDescriptionSeq:1.0
+-          24,
+-          ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f4578), 
+-          ACE_NTOHL (0x63446573), 
+-          ACE_NTOHL (0x63726970), 
+-          ACE_NTOHL (0x74696f6e), 
+-          ACE_NTOHL (0x53657100),  // name = CORBA_ExcDescriptionSeq
++          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
++          18,
++          ACE_NTOHL (0x45786344), 
++          ACE_NTOHL (0x65736372), 
++          ACE_NTOHL (0x69707469), 
++          ACE_NTOHL (0x6f6e5365), 
++          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+           CORBA::tk_sequence, // typecode kind
+-          200, // encapsulation length
++          476, // encapsulation length
+             TAO_ENCAP_BYTE_ORDER, // byte order
+             CORBA::tk_struct, // typecode kind
+-            184, // encapsulation length
++            460, // encapsulation length
+               TAO_ENCAP_BYTE_ORDER, // byte order
+               43,
+               ACE_NTOHL (0x49444c3a), 
+               ACE_NTOHL (0x6f6d672e), 
+               ACE_NTOHL (0x6f72672f), 
+               ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f4578), 
++              ACE_NTOHL (0x412f4578), 
+               ACE_NTOHL (0x63657074), 
+               ACE_NTOHL (0x696f6e44), 
+               ACE_NTOHL (0x65736372), 
+               ACE_NTOHL (0x69707469), 
+               ACE_NTOHL (0x6f6e3a31), 
+-              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ExceptionDescription:1.0
+-              27,
+-              ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f4578), 
+-              ACE_NTOHL (0x63657074), 
+-              ACE_NTOHL (0x696f6e44), 
+-              ACE_NTOHL (0x65736372), 
+-              ACE_NTOHL (0x69707469), 
+-              ACE_NTOHL (0x6f6e0000),  // name = CORBA_ExceptionDescription
++              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
++              21,
++              ACE_NTOHL (0x45786365), 
++              ACE_NTOHL (0x7074696f), 
++              ACE_NTOHL (0x6e446573), 
++              ACE_NTOHL (0x63726970), 
++              ACE_NTOHL (0x74696f6e), 
++              ACE_NTOHL (0x0),  // name = ExceptionDescription
+               5, // member count
+               5,
+               ACE_NTOHL (0x6e616d65), 
+               ACE_NTOHL (0x0),  // name = name
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
++                TAO_ENCAP_BYTE_ORDER, // byte order
++                33,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f4964), 
++                ACE_NTOHL (0x656e7469), 
++                ACE_NTOHL (0x66696572), 
++                ACE_NTOHL (0x3a312e30), 
++                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
++                11,
++                ACE_NTOHL (0x4964656e), 
++                ACE_NTOHL (0x74696669), 
++                ACE_NTOHL (0x65720000),  // name = Identifier
+               CORBA::tk_string, 
+               0U, // string length
++
+               3,
+               ACE_NTOHL (0x69640000),  // name = id
++              CORBA::tk_alias, // typecode kind for typedefs
++              72, // encapsulation length
++                TAO_ENCAP_BYTE_ORDER, // byte order
++                35,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f5265), 
++                ACE_NTOHL (0x706f7369), 
++                ACE_NTOHL (0x746f7279), 
++                ACE_NTOHL (0x49643a31), 
++                ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++                13,
++                ACE_NTOHL (0x5265706f), 
++                ACE_NTOHL (0x7369746f), 
++                ACE_NTOHL (0x72794964), 
++                ACE_NTOHL (0x0),  // name = RepositoryId
+               CORBA::tk_string, 
+               0U, // string length
++
+               11,
+               ACE_NTOHL (0x64656669), 
+               ACE_NTOHL (0x6e65645f), 
+               ACE_NTOHL (0x696e0000),  // name = defined_in
++              CORBA::tk_alias, // typecode kind for typedefs
++              72, // encapsulation length
++                TAO_ENCAP_BYTE_ORDER, // byte order
++                35,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f5265), 
++                ACE_NTOHL (0x706f7369), 
++                ACE_NTOHL (0x746f7279), 
++                ACE_NTOHL (0x49643a31), 
++                ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++                13,
++                ACE_NTOHL (0x5265706f), 
++                ACE_NTOHL (0x7369746f), 
++                ACE_NTOHL (0x72794964), 
++                ACE_NTOHL (0x0),  // name = RepositoryId
+               CORBA::tk_string, 
+               0U, // string length
++
+               8,
+               ACE_NTOHL (0x76657273), 
+               ACE_NTOHL (0x696f6e00),  // name = version
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
++                TAO_ENCAP_BYTE_ORDER, // byte order
++                34,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f5665), 
++                ACE_NTOHL (0x7273696f), 
++                ACE_NTOHL (0x6e537065), 
++                ACE_NTOHL (0x633a312e), 
++                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
++                12,
++                ACE_NTOHL (0x56657273), 
++                ACE_NTOHL (0x696f6e53), 
++                ACE_NTOHL (0x70656300),  // name = VersionSpec
+               CORBA::tk_string, 
+               0U, // string length
++
+               5,
+               ACE_NTOHL (0x74797065), 
+               ACE_NTOHL (0x0),  // name = type
+@@ -9832,75 +9769,146 @@
+   ACE_NTOHL (0x69627574), 
+   ACE_NTOHL (0x65730000),  // name = attributes
+   CORBA::tk_alias, // typecode kind for typedefs
+-  416, // encapsulation length
++  684, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     41,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4174), 
++    ACE_NTOHL (0x412f4174), 
+     ACE_NTOHL (0x74724465), 
+     ACE_NTOHL (0x73637269), 
+     ACE_NTOHL (0x7074696f), 
+     ACE_NTOHL (0x6e536571), 
+     ACE_NTOHL (0x3a312e30), 
+-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_AttrDescriptionSeq:1.0
+-    25,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4174), 
+-    ACE_NTOHL (0x74724465), 
+-    ACE_NTOHL (0x73637269), 
+-    ACE_NTOHL (0x7074696f), 
+-    ACE_NTOHL (0x6e536571), 
+-    ACE_NTOHL (0x0),  // name = CORBA_AttrDescriptionSeq
++    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
++    19,
++    ACE_NTOHL (0x41747472), 
++    ACE_NTOHL (0x44657363), 
++    ACE_NTOHL (0x72697074), 
++    ACE_NTOHL (0x696f6e53), 
++    ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
+     CORBA::tk_sequence, // typecode kind
+-    324, // encapsulation length
++    600, // encapsulation length
+       TAO_ENCAP_BYTE_ORDER, // byte order
+       CORBA::tk_struct, // typecode kind
+-      308, // encapsulation length
++      584, // encapsulation length
+         TAO_ENCAP_BYTE_ORDER, // byte order
+         43,
+         ACE_NTOHL (0x49444c3a), 
+         ACE_NTOHL (0x6f6d672e), 
+         ACE_NTOHL (0x6f72672f), 
+         ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4174), 
++        ACE_NTOHL (0x412f4174), 
+         ACE_NTOHL (0x74726962), 
+         ACE_NTOHL (0x75746544), 
+         ACE_NTOHL (0x65736372), 
+         ACE_NTOHL (0x69707469), 
+         ACE_NTOHL (0x6f6e3a31), 
+-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_AttributeDescription:1.0
+-        27,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4174), 
+-        ACE_NTOHL (0x74726962), 
+-        ACE_NTOHL (0x75746544), 
+-        ACE_NTOHL (0x65736372), 
+-        ACE_NTOHL (0x69707469), 
+-        ACE_NTOHL (0x6f6e0000),  // name = CORBA_AttributeDescription
++        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
++        21,
++        ACE_NTOHL (0x41747472), 
++        ACE_NTOHL (0x69627574), 
++        ACE_NTOHL (0x65446573), 
++        ACE_NTOHL (0x63726970), 
++        ACE_NTOHL (0x74696f6e), 
++        ACE_NTOHL (0x0),  // name = AttributeDescription
+         6, // member count
+         5,
+         ACE_NTOHL (0x6e616d65), 
+         ACE_NTOHL (0x0),  // name = name
++        CORBA::tk_alias, // typecode kind for typedefs
++        68, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          33,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f4964), 
++          ACE_NTOHL (0x656e7469), 
++          ACE_NTOHL (0x66696572), 
++          ACE_NTOHL (0x3a312e30), 
++          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
++          11,
++          ACE_NTOHL (0x4964656e), 
++          ACE_NTOHL (0x74696669), 
++          ACE_NTOHL (0x65720000),  // name = Identifier
+         CORBA::tk_string, 
+         0U, // string length
++
+         3,
+         ACE_NTOHL (0x69640000),  // name = id
++        CORBA::tk_alias, // typecode kind for typedefs
++        72, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          35,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5265), 
++          ACE_NTOHL (0x706f7369), 
++          ACE_NTOHL (0x746f7279), 
++          ACE_NTOHL (0x49643a31), 
++          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++          13,
++          ACE_NTOHL (0x5265706f), 
++          ACE_NTOHL (0x7369746f), 
++          ACE_NTOHL (0x72794964), 
++          ACE_NTOHL (0x0),  // name = RepositoryId
+         CORBA::tk_string, 
+         0U, // string length
++
+         11,
+         ACE_NTOHL (0x64656669), 
+         ACE_NTOHL (0x6e65645f), 
+         ACE_NTOHL (0x696e0000),  // name = defined_in
++        CORBA::tk_alias, // typecode kind for typedefs
++        72, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          35,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5265), 
++          ACE_NTOHL (0x706f7369), 
++          ACE_NTOHL (0x746f7279), 
++          ACE_NTOHL (0x49643a31), 
++          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++          13,
++          ACE_NTOHL (0x5265706f), 
++          ACE_NTOHL (0x7369746f), 
++          ACE_NTOHL (0x72794964), 
++          ACE_NTOHL (0x0),  // name = RepositoryId
+         CORBA::tk_string, 
+         0U, // string length
++
+         8,
+         ACE_NTOHL (0x76657273), 
+         ACE_NTOHL (0x696f6e00),  // name = version
++        CORBA::tk_alias, // typecode kind for typedefs
++        68, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          34,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5665), 
++          ACE_NTOHL (0x7273696f), 
++          ACE_NTOHL (0x6e537065), 
++          ACE_NTOHL (0x633a312e), 
++          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
++          12,
++          ACE_NTOHL (0x56657273), 
++          ACE_NTOHL (0x696f6e53), 
++          ACE_NTOHL (0x70656300),  // name = VersionSpec
+         CORBA::tk_string, 
+         0U, // string length
++
+         5,
+         ACE_NTOHL (0x74797065), 
+         ACE_NTOHL (0x0),  // name = type
+@@ -9946,69 +9954,139 @@
+   ACE_NTOHL (0x6d656d62), 
+   ACE_NTOHL (0x65727300),  // name = members
+   CORBA::tk_alias, // typecode kind for typedefs
+-  436, // encapsulation length
++  692, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     37,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5661), 
++    ACE_NTOHL (0x412f5661), 
+     ACE_NTOHL (0x6c75654d), 
+     ACE_NTOHL (0x656d6265), 
+     ACE_NTOHL (0x72536571), 
+     ACE_NTOHL (0x3a312e30), 
+-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_ValueMemberSeq:1.0
+-    21,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5661), 
+-    ACE_NTOHL (0x6c75654d), 
+-    ACE_NTOHL (0x656d6265), 
+-    ACE_NTOHL (0x72536571), 
+-    ACE_NTOHL (0x0),  // name = CORBA_ValueMemberSeq
++    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ValueMemberSeq:1.0
++    15,
++    ACE_NTOHL (0x56616c75), 
++    ACE_NTOHL (0x654d656d), 
++    ACE_NTOHL (0x62657253), 
++    ACE_NTOHL (0x65710000),  // name = ValueMemberSeq
+     CORBA::tk_sequence, // typecode kind
+-    352, // encapsulation length
++    616, // encapsulation length
+       TAO_ENCAP_BYTE_ORDER, // byte order
+       CORBA::tk_struct, // typecode kind
+-      336, // encapsulation length
++      600, // encapsulation length
+         TAO_ENCAP_BYTE_ORDER, // byte order
+         34,
+         ACE_NTOHL (0x49444c3a), 
+         ACE_NTOHL (0x6f6d672e), 
+         ACE_NTOHL (0x6f72672f), 
+         ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f5661), 
++        ACE_NTOHL (0x412f5661), 
+         ACE_NTOHL (0x6c75654d), 
+         ACE_NTOHL (0x656d6265), 
+         ACE_NTOHL (0x723a312e), 
+-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_ValueMember:1.0
+-        18,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f5661), 
+-        ACE_NTOHL (0x6c75654d), 
+-        ACE_NTOHL (0x656d6265), 
+-        ACE_NTOHL (0x72000000),  // name = CORBA_ValueMember
++        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/ValueMember:1.0
++        12,
++        ACE_NTOHL (0x56616c75), 
++        ACE_NTOHL (0x654d656d), 
++        ACE_NTOHL (0x62657200),  // name = ValueMember
+         7, // member count
+         5,
+         ACE_NTOHL (0x6e616d65), 
+         ACE_NTOHL (0x0),  // name = name
++        CORBA::tk_alias, // typecode kind for typedefs
++        68, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          33,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f4964), 
++          ACE_NTOHL (0x656e7469), 
++          ACE_NTOHL (0x66696572), 
++          ACE_NTOHL (0x3a312e30), 
++          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
++          11,
++          ACE_NTOHL (0x4964656e), 
++          ACE_NTOHL (0x74696669), 
++          ACE_NTOHL (0x65720000),  // name = Identifier
+         CORBA::tk_string, 
+         0U, // string length
++
+         3,
+         ACE_NTOHL (0x69640000),  // name = id
++        CORBA::tk_alias, // typecode kind for typedefs
++        72, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          35,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5265), 
++          ACE_NTOHL (0x706f7369), 
++          ACE_NTOHL (0x746f7279), 
++          ACE_NTOHL (0x49643a31), 
++          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++          13,
++          ACE_NTOHL (0x5265706f), 
++          ACE_NTOHL (0x7369746f), 
++          ACE_NTOHL (0x72794964), 
++          ACE_NTOHL (0x0),  // name = RepositoryId
+         CORBA::tk_string, 
+         0U, // string length
++
+         11,
+         ACE_NTOHL (0x64656669), 
+         ACE_NTOHL (0x6e65645f), 
+         ACE_NTOHL (0x696e0000),  // name = defined_in
++        CORBA::tk_alias, // typecode kind for typedefs
++        72, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          35,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5265), 
++          ACE_NTOHL (0x706f7369), 
++          ACE_NTOHL (0x746f7279), 
++          ACE_NTOHL (0x49643a31), 
++          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++          13,
++          ACE_NTOHL (0x5265706f), 
++          ACE_NTOHL (0x7369746f), 
++          ACE_NTOHL (0x72794964), 
++          ACE_NTOHL (0x0),  // name = RepositoryId
+         CORBA::tk_string, 
+         0U, // string length
++
+         8,
+         ACE_NTOHL (0x76657273), 
+         ACE_NTOHL (0x696f6e00),  // name = version
++        CORBA::tk_alias, // typecode kind for typedefs
++        68, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          34,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5665), 
++          ACE_NTOHL (0x7273696f), 
++          ACE_NTOHL (0x6e537065), 
++          ACE_NTOHL (0x633a312e), 
++          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
++          12,
++          ACE_NTOHL (0x56657273), 
++          ACE_NTOHL (0x696f6e53), 
++          ACE_NTOHL (0x70656300),  // name = VersionSpec
+         CORBA::tk_string, 
+         0U, // string length
++
+         5,
+         ACE_NTOHL (0x74797065), 
+         ACE_NTOHL (0x0),  // name = type
+@@ -10019,22 +10097,20 @@
+         ACE_NTOHL (0x5f646566), 
+         ACE_NTOHL (0x0),  // name = type_def
+         CORBA::tk_objref, // typecode kind
+-        60, // encapsulation length
++        52, // encapsulation length
+           TAO_ENCAP_BYTE_ORDER, // byte order
+           30,
+           ACE_NTOHL (0x49444c3a), 
+           ACE_NTOHL (0x6f6d672e), 
+           ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f4944), 
++          ACE_NTOHL (0x412f4944), 
+           ACE_NTOHL (0x4c547970), 
+           ACE_NTOHL (0x653a312e), 
+-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-          14,
+-          ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f4944), 
+-          ACE_NTOHL (0x4c547970), 
+-          ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
++          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
++          8,
++          ACE_NTOHL (0x49444c54), 
++          ACE_NTOHL (0x79706500),  // name = IDLType
+ 
+         7,
+         ACE_NTOHL (0x61636365), 
+@@ -10069,101 +10145,112 @@
+   ACE_NTOHL (0x7a657273), 
+   ACE_NTOHL (0x0),  // name = initializers
+   CORBA::tk_alias, // typecode kind for typedefs
+-  504, // encapsulation length
++  604, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     37,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f496e), 
++    ACE_NTOHL (0x412f496e), 
+     ACE_NTOHL (0x69746961), 
+     ACE_NTOHL (0x6c697a65), 
+     ACE_NTOHL (0x72536571), 
+     ACE_NTOHL (0x3a312e30), 
+-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_InitializerSeq:1.0
+-    21,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f496e), 
+-    ACE_NTOHL (0x69746961), 
+-    ACE_NTOHL (0x6c697a65), 
+-    ACE_NTOHL (0x72536571), 
+-    ACE_NTOHL (0x0),  // name = CORBA_InitializerSeq
++    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/InitializerSeq:1.0
++    15,
++    ACE_NTOHL (0x496e6974), 
++    ACE_NTOHL (0x69616c69), 
++    ACE_NTOHL (0x7a657253), 
++    ACE_NTOHL (0x65710000),  // name = InitializerSeq
+     CORBA::tk_sequence, // typecode kind
+-    420, // encapsulation length
++    528, // encapsulation length
+       TAO_ENCAP_BYTE_ORDER, // byte order
+       CORBA::tk_struct, // typecode kind
+-      404, // encapsulation length
++      512, // encapsulation length
+         TAO_ENCAP_BYTE_ORDER, // byte order
+         34,
+         ACE_NTOHL (0x49444c3a), 
+         ACE_NTOHL (0x6f6d672e), 
+         ACE_NTOHL (0x6f72672f), 
+         ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f496e), 
++        ACE_NTOHL (0x412f496e), 
+         ACE_NTOHL (0x69746961), 
+         ACE_NTOHL (0x6c697a65), 
+         ACE_NTOHL (0x723a312e), 
+-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_Initializer:1.0
+-        18,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f496e), 
+-        ACE_NTOHL (0x69746961), 
+-        ACE_NTOHL (0x6c697a65), 
+-        ACE_NTOHL (0x72000000),  // name = CORBA_Initializer
++        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/Initializer:1.0
++        12,
++        ACE_NTOHL (0x496e6974), 
++        ACE_NTOHL (0x69616c69), 
++        ACE_NTOHL (0x7a657200),  // name = Initializer
+         2, // member count
+         8,
+         ACE_NTOHL (0x6d656d62), 
+         ACE_NTOHL (0x65727300),  // name = members
+         CORBA::tk_alias, // typecode kind for typedefs
+-        292, // encapsulation length
++        340, // encapsulation length
+           TAO_ENCAP_BYTE_ORDER, // byte order
+           38,
+           ACE_NTOHL (0x49444c3a), 
+           ACE_NTOHL (0x6f6d672e), 
+           ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f5374), 
++          ACE_NTOHL (0x412f5374), 
+           ACE_NTOHL (0x72756374), 
+           ACE_NTOHL (0x4d656d62), 
+           ACE_NTOHL (0x65725365), 
+           ACE_NTOHL (0x713a312e), 
+-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_StructMemberSeq:1.0
+-          22,
+-          ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f5374), 
+-          ACE_NTOHL (0x72756374), 
+-          ACE_NTOHL (0x4d656d62), 
+-          ACE_NTOHL (0x65725365), 
+-          ACE_NTOHL (0x71000000),  // name = CORBA_StructMemberSeq
++          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/StructMemberSeq:1.0
++          16,
++          ACE_NTOHL (0x53747275), 
++          ACE_NTOHL (0x63744d65), 
++          ACE_NTOHL (0x6d626572), 
++          ACE_NTOHL (0x53657100),  // name = StructMemberSeq
+           CORBA::tk_sequence, // typecode kind
+-          208, // encapsulation length
++          264, // encapsulation length
+             TAO_ENCAP_BYTE_ORDER, // byte order
+             CORBA::tk_struct, // typecode kind
+-            192, // encapsulation length
++            248, // encapsulation length
+               TAO_ENCAP_BYTE_ORDER, // byte order
+               35,
+               ACE_NTOHL (0x49444c3a), 
+               ACE_NTOHL (0x6f6d672e), 
+               ACE_NTOHL (0x6f72672f), 
+               ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f5374), 
++              ACE_NTOHL (0x412f5374), 
+               ACE_NTOHL (0x72756374), 
+               ACE_NTOHL (0x4d656d62), 
+               ACE_NTOHL (0x65723a31), 
+-              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_StructMember:1.0
+-              19,
+-              ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f5374), 
+-              ACE_NTOHL (0x72756374), 
+-              ACE_NTOHL (0x4d656d62), 
+-              ACE_NTOHL (0x65720000),  // name = CORBA_StructMember
++              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/StructMember:1.0
++              13,
++              ACE_NTOHL (0x53747275), 
++              ACE_NTOHL (0x63744d65), 
++              ACE_NTOHL (0x6d626572), 
++              ACE_NTOHL (0x0),  // name = StructMember
+               3, // member count
+               5,
+               ACE_NTOHL (0x6e616d65), 
+               ACE_NTOHL (0x0),  // name = name
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
++                TAO_ENCAP_BYTE_ORDER, // byte order
++                33,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f4964), 
++                ACE_NTOHL (0x656e7469), 
++                ACE_NTOHL (0x66696572), 
++                ACE_NTOHL (0x3a312e30), 
++                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
++                11,
++                ACE_NTOHL (0x4964656e), 
++                ACE_NTOHL (0x74696669), 
++                ACE_NTOHL (0x65720000),  // name = Identifier
+               CORBA::tk_string, 
+               0U, // string length
++
+               5,
+               ACE_NTOHL (0x74797065), 
+               ACE_NTOHL (0x0),  // name = type
+@@ -10174,22 +10261,20 @@
+               ACE_NTOHL (0x5f646566), 
+               ACE_NTOHL (0x0),  // name = type_def
+               CORBA::tk_objref, // typecode kind
+-              60, // encapsulation length
++              52, // encapsulation length
+                 TAO_ENCAP_BYTE_ORDER, // byte order
+                 30,
+                 ACE_NTOHL (0x49444c3a), 
+                 ACE_NTOHL (0x6f6d672e), 
+                 ACE_NTOHL (0x6f72672f), 
+                 ACE_NTOHL (0x434f5242), 
+-                ACE_NTOHL (0x415f4944), 
++                ACE_NTOHL (0x412f4944), 
+                 ACE_NTOHL (0x4c547970), 
+                 ACE_NTOHL (0x653a312e), 
+-                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-                14,
+-                ACE_NTOHL (0x434f5242), 
+-                ACE_NTOHL (0x415f4944), 
+-                ACE_NTOHL (0x4c547970), 
+-                ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
++                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
++                8,
++                ACE_NTOHL (0x49444c54), 
++                ACE_NTOHL (0x79706500),  // name = IDLType
+ 
+ 
+             0U,
+@@ -10198,9 +10283,27 @@
+         5,
+         ACE_NTOHL (0x6e616d65), 
+         ACE_NTOHL (0x0),  // name = name
++        CORBA::tk_alias, // typecode kind for typedefs
++        68, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          33,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f4964), 
++          ACE_NTOHL (0x656e7469), 
++          ACE_NTOHL (0x66696572), 
++          ACE_NTOHL (0x3a312e30), 
++          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
++          11,
++          ACE_NTOHL (0x4964656e), 
++          ACE_NTOHL (0x74696669), 
++          ACE_NTOHL (0x65720000),  // name = Identifier
+         CORBA::tk_string, 
+         0U, // string length
+ 
++
+       0U,
+ 
+ 
+@@ -10212,31 +10315,48 @@
+   ACE_NTOHL (0x61636573), 
+   ACE_NTOHL (0x0),  // name = supported_interfaces
+   CORBA::tk_alias, // typecode kind for typedefs
+-  100, // encapsulation length
++  164, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     38,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5265), 
++    ACE_NTOHL (0x412f5265), 
+     ACE_NTOHL (0x706f7369), 
+     ACE_NTOHL (0x746f7279), 
+     ACE_NTOHL (0x49645365), 
+     ACE_NTOHL (0x713a312e), 
+-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_RepositoryIdSeq:1.0
+-    22,
++    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
++    16,
++    ACE_NTOHL (0x5265706f), 
++    ACE_NTOHL (0x7369746f), 
++    ACE_NTOHL (0x72794964), 
++    ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
++    CORBA::tk_sequence, // typecode kind
++    88, // encapsulation length
++      TAO_ENCAP_BYTE_ORDER, // byte order
++      CORBA::tk_alias, // typecode kind for typedefs
++      72, // encapsulation length
++        TAO_ENCAP_BYTE_ORDER, // byte order
++        35,
++        ACE_NTOHL (0x49444c3a), 
++        ACE_NTOHL (0x6f6d672e), 
++        ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5265), 
++        ACE_NTOHL (0x412f5265), 
+     ACE_NTOHL (0x706f7369), 
+     ACE_NTOHL (0x746f7279), 
+-    ACE_NTOHL (0x49645365), 
+-    ACE_NTOHL (0x71000000),  // name = CORBA_RepositoryIdSeq
+-    CORBA::tk_sequence, // typecode kind
+-    16, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
++        ACE_NTOHL (0x49643a31), 
++        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++        13,
++        ACE_NTOHL (0x5265706f), 
++        ACE_NTOHL (0x7369746f), 
++        ACE_NTOHL (0x72794964), 
++        ACE_NTOHL (0x0),  // name = RepositoryId
+       CORBA::tk_string, 
+       0U, // string length
++
+       0U,
+ 
+ 
+@@ -10248,31 +10368,48 @@
+   ACE_NTOHL (0x6c756573), 
+   ACE_NTOHL (0x0),  // name = abstract_base_values
+   CORBA::tk_alias, // typecode kind for typedefs
+-  100, // encapsulation length
++  164, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     38,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5265), 
++    ACE_NTOHL (0x412f5265), 
+     ACE_NTOHL (0x706f7369), 
+     ACE_NTOHL (0x746f7279), 
+     ACE_NTOHL (0x49645365), 
+     ACE_NTOHL (0x713a312e), 
+-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_RepositoryIdSeq:1.0
+-    22,
++    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
++    16,
++    ACE_NTOHL (0x5265706f), 
++    ACE_NTOHL (0x7369746f), 
++    ACE_NTOHL (0x72794964), 
++    ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
++    CORBA::tk_sequence, // typecode kind
++    88, // encapsulation length
++      TAO_ENCAP_BYTE_ORDER, // byte order
++      CORBA::tk_alias, // typecode kind for typedefs
++      72, // encapsulation length
++        TAO_ENCAP_BYTE_ORDER, // byte order
++        35,
++        ACE_NTOHL (0x49444c3a), 
++        ACE_NTOHL (0x6f6d672e), 
++        ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5265), 
++        ACE_NTOHL (0x412f5265), 
+     ACE_NTOHL (0x706f7369), 
+     ACE_NTOHL (0x746f7279), 
+-    ACE_NTOHL (0x49645365), 
+-    ACE_NTOHL (0x71000000),  // name = CORBA_RepositoryIdSeq
+-    CORBA::tk_sequence, // typecode kind
+-    16, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
++        ACE_NTOHL (0x49643a31), 
++        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++        13,
++        ACE_NTOHL (0x5265706f), 
++        ACE_NTOHL (0x7369746f), 
++        ACE_NTOHL (0x72794964), 
++        ACE_NTOHL (0x0),  // name = RepositoryId
+       CORBA::tk_string, 
+       0U, // string length
++
+       0U,
+ 
+ 
+@@ -10287,8 +10424,27 @@
+   ACE_NTOHL (0x62617365), 
+   ACE_NTOHL (0x5f76616c), 
+   ACE_NTOHL (0x75650000),  // name = base_value
++  CORBA::tk_alias, // typecode kind for typedefs
++  72, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    35,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x434f5242), 
++    ACE_NTOHL (0x412f5265), 
++    ACE_NTOHL (0x706f7369), 
++    ACE_NTOHL (0x746f7279), 
++    ACE_NTOHL (0x49643a31), 
++    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++    13,
++    ACE_NTOHL (0x5265706f), 
++    ACE_NTOHL (0x7369746f), 
++    ACE_NTOHL (0x72794964), 
++    ACE_NTOHL (0x0),  // name = RepositoryId
+   CORBA::tk_string, 
+   0U, // string length
++
+   5,
+   ACE_NTOHL (0x74797065), 
+   ACE_NTOHL (0x0),  // name = type
+@@ -10417,188 +10573,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_ValueDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  31,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5661), 
+-  ACE_NTOHL (0x6c756544), 
+-  ACE_NTOHL (0x65663a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ValueDef:1.0
+-  15,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5661), 
+-  ACE_NTOHL (0x6c756544), 
+-  ACE_NTOHL (0x65660000),  // name = CORBA_ValueDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_ValueDef),
+-    (char *) &_oc_CORBA_ValueDef,
+-    0,
+-    sizeof (CORBA_ValueDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ValueDef =
+-  &_tc_TAO_tc_CORBA_ValueDef;
+-
+-static const CORBA::Long _oc_CORBA_ValueDescription[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  39,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5661), 
+-  ACE_NTOHL (0x6c756544), 
+-  ACE_NTOHL (0x65736372), 
+-  ACE_NTOHL (0x69707469), 
+-  ACE_NTOHL (0x6f6e3a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ValueDescription:1.0
+-  23,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5661), 
+-  ACE_NTOHL (0x6c756544), 
+-  ACE_NTOHL (0x65736372), 
+-  ACE_NTOHL (0x69707469), 
+-  ACE_NTOHL (0x6f6e0000),  // name = CORBA_ValueDescription
+-  10, // member count
+-  5,
+-  ACE_NTOHL (0x6e616d65), 
+-  ACE_NTOHL (0x0),  // name = name
+-  CORBA::tk_string, 
+-  0U, // string length
+-  3,
+-  ACE_NTOHL (0x69640000),  // name = id
+-  CORBA::tk_string, 
+-  0U, // string length
+-  12,
+-  ACE_NTOHL (0x69735f61), 
+-  ACE_NTOHL (0x62737472), 
+-  ACE_NTOHL (0x61637400),  // name = is_abstract
+-  CORBA::tk_boolean,
+-
+-  10,
+-  ACE_NTOHL (0x69735f63), 
+-  ACE_NTOHL (0x7573746f), 
+-  ACE_NTOHL (0x6d000000),  // name = is_custom
+-  CORBA::tk_boolean,
+-
+-  11,
+-  ACE_NTOHL (0x64656669), 
+-  ACE_NTOHL (0x6e65645f), 
+-  ACE_NTOHL (0x696e0000),  // name = defined_in
+-  CORBA::tk_string, 
+-  0U, // string length
+-  8,
+-  ACE_NTOHL (0x76657273), 
+-  ACE_NTOHL (0x696f6e00),  // name = version
+-  CORBA::tk_string, 
+-  0U, // string length
+-  21,
+-  ACE_NTOHL (0x73757070), 
+-  ACE_NTOHL (0x6f727465), 
+-  ACE_NTOHL (0x645f696e), 
+-  ACE_NTOHL (0x74657266), 
+-  ACE_NTOHL (0x61636573), 
+-  ACE_NTOHL (0x0),  // name = supported_interfaces
+-  CORBA::tk_alias, // typecode kind for typedefs
+-  100, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    38,
+-    ACE_NTOHL (0x49444c3a), 
+-    ACE_NTOHL (0x6f6d672e), 
+-    ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5265), 
+-    ACE_NTOHL (0x706f7369), 
+-    ACE_NTOHL (0x746f7279), 
+-    ACE_NTOHL (0x49645365), 
+-    ACE_NTOHL (0x713a312e), 
+-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_RepositoryIdSeq:1.0
+-    22,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5265), 
+-    ACE_NTOHL (0x706f7369), 
+-    ACE_NTOHL (0x746f7279), 
+-    ACE_NTOHL (0x49645365), 
+-    ACE_NTOHL (0x71000000),  // name = CORBA_RepositoryIdSeq
+-    CORBA::tk_sequence, // typecode kind
+-    16, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      CORBA::tk_string, 
+-      0U, // string length
+-      0U,
+-
+-
+-  21,
+-  ACE_NTOHL (0x61627374), 
+-  ACE_NTOHL (0x72616374), 
+-  ACE_NTOHL (0x5f626173), 
+-  ACE_NTOHL (0x655f7661), 
+-  ACE_NTOHL (0x6c756573), 
+-  ACE_NTOHL (0x0),  // name = abstract_base_values
+-  CORBA::tk_alias, // typecode kind for typedefs
+-  100, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    38,
+-    ACE_NTOHL (0x49444c3a), 
+-    ACE_NTOHL (0x6f6d672e), 
+-    ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5265), 
+-    ACE_NTOHL (0x706f7369), 
+-    ACE_NTOHL (0x746f7279), 
+-    ACE_NTOHL (0x49645365), 
+-    ACE_NTOHL (0x713a312e), 
+-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_RepositoryIdSeq:1.0
+-    22,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5265), 
+-    ACE_NTOHL (0x706f7369), 
+-    ACE_NTOHL (0x746f7279), 
+-    ACE_NTOHL (0x49645365), 
+-    ACE_NTOHL (0x71000000),  // name = CORBA_RepositoryIdSeq
+-    CORBA::tk_sequence, // typecode kind
+-    16, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      CORBA::tk_string, 
+-      0U, // string length
+-      0U,
+-
+-
+-  15,
+-  ACE_NTOHL (0x69735f74), 
+-  ACE_NTOHL (0x72756e63), 
+-  ACE_NTOHL (0x61746162), 
+-  ACE_NTOHL (0x6c650000),  // name = is_truncatable
+-  CORBA::tk_boolean,
+-
+-  11,
+-  ACE_NTOHL (0x62617365), 
+-  ACE_NTOHL (0x5f76616c), 
+-  ACE_NTOHL (0x75650000),  // name = base_value
+-  CORBA::tk_string, 
+-  0U, // string length
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueDescription (
+-    CORBA::tk_struct,
+-    sizeof (_oc_CORBA_ValueDescription),
+-    (char *) &_oc_CORBA_ValueDescription,
+-    0,
+-    sizeof (CORBA_ValueDescription)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ValueDescription =
+-  &_tc_TAO_tc_CORBA_ValueDescription;
+-
+ void CORBA_ValueDescription::_tao_any_destructor (void *x)
+ {
+   CORBA_ValueDescription *tmp = ACE_static_cast (CORBA_ValueDescription*,x);
+@@ -11392,7 +11366,7 @@
+     return CORBA_ValueBoxDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_ValueBoxDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ValueBoxDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
+       if (is_a == 0)
+         return CORBA_ValueBoxDef::_nil ();
+@@ -11460,11 +11434,11 @@
+ CORBA::Boolean CORBA_ValueBoxDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueBoxDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueBoxDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -11537,7 +11511,7 @@
+ 
+ const char* CORBA_ValueBoxDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_ValueBoxDef:1.0";
++  return "IDL:omg.org/CORBA/ValueBoxDef:1.0";
+ }
+ 
+ CORBA_IDLType_ptr CORBA_ValueBoxDef::original_type_def (
+@@ -11576,45 +11550,13 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_ValueBoxDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  34,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5661), 
+-  ACE_NTOHL (0x6c756542), 
+-  ACE_NTOHL (0x6f784465), 
+-  ACE_NTOHL (0x663a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_ValueBoxDef:1.0
+-  18,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5661), 
+-  ACE_NTOHL (0x6c756542), 
+-  ACE_NTOHL (0x6f784465), 
+-  ACE_NTOHL (0x66000000),  // name = CORBA_ValueBoxDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueBoxDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_ValueBoxDef),
+-    (char *) &_oc_CORBA_ValueBoxDef,
+-    0,
+-    sizeof (CORBA_ValueBoxDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ValueBoxDef =
+-  &_tc_TAO_tc_CORBA_ValueBoxDef;
+-
+ void operator<<= (CORBA::Any &_tao_any, CORBA_FixedDef_ptr _tao_elem)
+ {
+   TAO_OutputCDR stream;
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_FixedDef, 
++        CORBA::_tc_FixedDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -11631,7 +11573,7 @@
+     _tao_elem = CORBA_FixedDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_FixedDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_FixedDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -11644,7 +11586,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_FixedDef,
++          CORBA::_tc_FixedDef,
+           1,
+           _tao_elem,
+           CORBA_FixedDef::_tao_any_destructor
+@@ -11674,7 +11616,7 @@
+   TAO_OutputCDR stream;
+   stream << _tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ValueMember,
++      CORBA::_tc_ValueMember,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin ()
+     );
+@@ -11685,7 +11627,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ValueMember,
++      CORBA::_tc_ValueMember,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -11706,7 +11648,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ValueMember, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMember, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -11731,7 +11673,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_ValueMember,
++            CORBA::_tc_ValueMember,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_ValueMember::_tao_any_destructor
+@@ -11761,7 +11703,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_ValueMemberSeq,
++        CORBA::_tc_ValueMemberSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -11773,7 +11715,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ValueMemberSeq,
++      CORBA::_tc_ValueMemberSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -11797,7 +11739,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ValueMemberSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -11822,7 +11764,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_ValueMemberSeq,
++            CORBA::_tc_ValueMemberSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_ValueMemberSeq::_tao_any_destructor
+@@ -11849,7 +11791,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_ValueMemberDef, 
++        CORBA::_tc_ValueMemberDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -11866,7 +11808,7 @@
+     _tao_elem = CORBA_ValueMemberDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ValueMemberDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueMemberDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -11879,7 +11821,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_ValueMemberDef,
++          CORBA::_tc_ValueMemberDef,
+           1,
+           _tao_elem,
+           CORBA_ValueMemberDef::_tao_any_destructor
+@@ -11910,7 +11852,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_ValueDef, 
++        CORBA::_tc_ValueDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -11927,7 +11869,7 @@
+     _tao_elem = CORBA_ValueDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ValueDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -11940,7 +11882,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_ValueDef,
++          CORBA::_tc_ValueDef,
+           1,
+           _tao_elem,
+           CORBA_ValueDef::_tao_any_destructor
+@@ -12053,7 +11995,7 @@
+   TAO_OutputCDR stream;
+   stream << _tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ValueDescription,
++      CORBA::_tc_ValueDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin ()
+     );
+@@ -12064,7 +12006,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ValueDescription,
++      CORBA::_tc_ValueDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -12085,7 +12027,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ValueDescription, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueDescription, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -12110,7 +12052,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_ValueDescription,
++            CORBA::_tc_ValueDescription,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_ValueDescription::_tao_any_destructor
+@@ -12137,7 +12079,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_ValueBoxDef, 
++        CORBA::_tc_ValueBoxDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -12154,7 +12096,7 @@
+     _tao_elem = CORBA_ValueBoxDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ValueBoxDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ValueBoxDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -12167,7 +12109,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_ValueBoxDef,
++          CORBA::_tc_ValueBoxDef,
+           1,
+           _tao_elem,
+           CORBA_ValueBoxDef::_tao_any_destructor
diff --git a/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.h.diff b/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.h.diff
new file mode 100644
index 00000000000..bdeb2537ea0
--- /dev/null
+++ b/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.h.diff
@@ -0,0 +1,108 @@
+--- orig/IFR_ExtendedC.h	Mon Apr 23 20:20:13 2001
++++ IFR_ExtendedC.h	Mon Apr 23 20:07: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:
+@@ -23,15 +23,12 @@
+ #define _TAO_IDL_IFR_EXTENDEDC_H_
+ 
+ #include "ace/pre.h"
+-#include "tao/corba.h"
++#include "IFR_BasicC.h"
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
+-#include "ifr_client_export.h"
+-#include "IFR_BasicC.h"
+-
+ #if defined (TAO_EXPORT_MACRO)
+ #undef TAO_EXPORT_MACRO
+ #endif
+@@ -55,17 +52,6 @@
+ #pragma option push -w-rvl -w-rch -w-ccc -w-inl
+ #endif /* __BORLANDC__ */
+ 
+-TAO_NAMESPACE  CORBA
+-{
+-  typedef CORBA::Short Visibility;
+-  typedef CORBA::Short_out Visibility_out;
+-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Visibility;
+-
+-
+-}
+-TAO_NAMESPACE_CLOSE // module CORBA
+-
+-
+ #if !defined (_CORBA_FIXEDDEF___PTR_CH_)
+ #define _CORBA_FIXEDDEF___PTR_CH_
+ 
+@@ -427,8 +413,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_FixedDef;
+-
+ struct CORBA_ValueMember;
+ class CORBA_ValueMember_var;
+ 
+@@ -497,8 +481,6 @@
+   void operator= (const CORBA_ValueMember_var &);
+ };
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ValueMember;
+-
+ 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+@@ -649,8 +631,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ValueMemberSeq;
+-
+ 
+ #if !defined (_CORBA_VALUEMEMBERDEF___PTR_CH_)
+ #define _CORBA_VALUEMEMBERDEF___PTR_CH_
+@@ -1037,8 +1017,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ValueMemberDef;
+-
+ 
+ #if !defined (_CORBA_VALUEDEF___PTR_CH_)
+ #define _CORBA_VALUEDEF___PTR_CH_
+@@ -1915,8 +1893,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ValueDef;
+-
+ struct CORBA_ValueDescription;
+ class CORBA_ValueDescription_var;
+ 
+@@ -1988,8 +1964,6 @@
+   void operator= (const CORBA_ValueDescription_var &);
+ };
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ValueDescription;
+-
+ 
+ #if !defined (_CORBA_VALUEBOXDEF___PTR_CH_)
+ #define _CORBA_VALUEBOXDEF___PTR_CH_
+@@ -2300,8 +2274,6 @@
+ 
+ 
+ #endif /* end #if !defined */
+-
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ValueBoxDef;
+ 
+ // Proxy Broker Factory function pointer declarations.
+ 
diff --git a/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.i.diff b/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.i.diff
new file mode 100644
index 00000000000..b43185312f2
--- /dev/null
+++ b/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.i.diff
@@ -0,0 +1,10 @@
+--- orig/IFR_ExtendedC.i	Mon Apr 23 20:20:13 2001
++++ IFR_ExtendedC.i	Fri Apr 20 03:16:47 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/IFR_Client/diffs/InterfaceC.cpp.diff b/TAO/tao/IFR_Client/diffs/InterfaceC.cpp.diff
deleted file mode 100644
index 15233fa5776..00000000000
--- a/TAO/tao/IFR_Client/diffs/InterfaceC.cpp.diff
+++ /dev/null
@@ -1,36819 +0,0 @@
---- orig/InterfaceC.cpp	Fri Mar 09 00:47:29 2001
-+++ InterfaceC.cpp	Thu Mar 08 20:22:55 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:
-@@ -20,6 +20,14 @@
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
- #include "InterfaceC.h"
-+#include "tao/Stub.h"
-+#include "tao/Invocation.h"
-+
-+// The Following header must remain visible since it contains the
-+// "TAO_INTERCEPTOR" macros.  Note that this won't cause problems when
-+// portable interceptor support is disabled since those macros are
-+// always visible, too.
-+#include "tao/PortableInterceptor.h"
- 
- #if TAO_HAS_INTERCEPTORS == 1
- #include "tao/RequestInfo_Util.h"
-@@ -74,64 +82,25 @@
-   12, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657300),  // name = dk_Provides
-   8, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x73657300),  // name = dk_Uses
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_DefinitionKind (CORBA::tk_enum, sizeof (_oc_IR_DefinitionKind), (char *) &_oc_IR_DefinitionKind, 0, sizeof (IR::DefinitionKind));
-+static CORBA::TypeCode _tc_TAO_tc_IR_DefinitionKind (CORBA::tk_enum, sizeof (_oc_IR_DefinitionKind), (char *) &_oc_IR_DefinitionKind, 0, sizeof (IR_DefinitionKind));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_DefinitionKind, &_tc_TAO_tc_IR_DefinitionKind)
- TAO_NAMESPACE_END
--static const CORBA::Long _oc_CORBA_Identifier[] =
--{
--  TAO_ENCAP_BYTE_ORDER, // byte order
--  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
--  11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
--  CORBA::tk_string, 
--  0U, // string length
--};
--static CORBA::TypeCode _tc_TAO_tc_CORBA_Identifier (CORBA::tk_alias, sizeof (_oc_CORBA_Identifier), (char *) &_oc_CORBA_Identifier, 0, sizeof (CORBA::Identifier));
--TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Identifier, &_tc_TAO_tc_CORBA_Identifier)
--TAO_NAMESPACE_END
--static const CORBA::Long _oc_CORBA_ScopedName[] =
--{
--  TAO_ENCAP_BYTE_ORDER, // byte order
--  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5363), ACE_NTOHL (0x6f706564), ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ScopedName:1.0
--  11, ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65644e61), ACE_NTOHL (0x6d650000),  // name = ScopedName
--  CORBA::tk_string, 
--  0U, // string length
--};
--static CORBA::TypeCode _tc_TAO_tc_CORBA_ScopedName (CORBA::tk_alias, sizeof (_oc_CORBA_ScopedName), (char *) &_oc_CORBA_ScopedName, 0, sizeof (CORBA::ScopedName));
--TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ScopedName, &_tc_TAO_tc_CORBA_ScopedName)
--TAO_NAMESPACE_END
--static const CORBA::Long _oc_CORBA_RepositoryId[] =
--{
--  TAO_ENCAP_BYTE_ORDER, // byte order
--  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
--  13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
--  CORBA::tk_string, 
--  0U, // string length
--};
--static CORBA::TypeCode _tc_TAO_tc_CORBA_RepositoryId (CORBA::tk_alias, sizeof (_oc_CORBA_RepositoryId), (char *) &_oc_CORBA_RepositoryId, 0, sizeof (CORBA::RepositoryId));
--TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryId, &_tc_TAO_tc_CORBA_RepositoryId)
--TAO_NAMESPACE_END
- 
- ///////////////////////////////////////////////////////////////////////
- //                Base & Remote Proxy  Implementation. 
- //
- 
--CORBA::_TAO_IRObject_Proxy_Impl::_TAO_IRObject_Proxy_Impl (void)
-+_TAO_IRObject_Proxy_Impl::_TAO_IRObject_Proxy_Impl (void)
- {}
- 
--CORBA::_TAO_IRObject_Remote_Proxy_Impl::_TAO_IRObject_Remote_Proxy_Impl (void)
-+_TAO_IRObject_Remote_Proxy_Impl::_TAO_IRObject_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--IR::DefinitionKind CORBA::_TAO_IRObject_Remote_Proxy_Impl::def_kind (
-+IR_DefinitionKind _TAO_IRObject_Remote_Proxy_Impl::def_kind (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -140,7 +109,7 @@
-   ))
- {
-   
--  IR::DefinitionKind _tao_retval = (IR::DefinitionKind)0;
-+  IR_DefinitionKind _tao_retval = (IR_DefinitionKind)0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -168,7 +137,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get ri (
-+      CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -224,7 +193,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::DefinitionKind  _tao_retval_info = _tao_retval;
-+              IR_DefinitionKind  _tao_retval_info = _tao_retval;
-                ri.result (_tao_retval_info);
-             );
-           
-@@ -289,7 +258,7 @@
-   return _tao_retval;
- }
- 
--void CORBA::_TAO_IRObject_Remote_Proxy_Impl::destroy (
-+void _TAO_IRObject_Remote_Proxy_Impl::destroy (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -297,10 +266,6 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -326,7 +291,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy ri (
-+      CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -440,37 +405,36 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--CORBA::_TAO_IRObject_Proxy_Broker::_TAO_IRObject_Proxy_Broker (void)
-+_TAO_IRObject_Proxy_Broker::_TAO_IRObject_Proxy_Broker (void)
- {
- }
- 
--CORBA::_TAO_IRObject_Proxy_Broker::~_TAO_IRObject_Proxy_Broker (void)
-+_TAO_IRObject_Proxy_Broker::~_TAO_IRObject_Proxy_Broker (void)
- {
- }
- 
--CORBA::_TAO_IRObject_Proxy_Broker * (*CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
-+_TAO_IRObject_Proxy_Broker * (*_TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--CORBA::_TAO_IRObject_Remote_Proxy_Broker *
--CORBA::_TAO_IRObject_Remote_Proxy_Broker::the_TAO_IRObject_Remote_Proxy_Broker (void)
-+_TAO_IRObject_Remote_Proxy_Broker *
-+_TAO_IRObject_Remote_Proxy_Broker::the_TAO_IRObject_Remote_Proxy_Broker (void)
- {
--  static ::CORBA::_TAO_IRObject_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_IRObject_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
--
--CORBA::_TAO_IRObject_Remote_Proxy_Broker::_TAO_IRObject_Remote_Proxy_Broker (void)
-+_TAO_IRObject_Remote_Proxy_Broker::_TAO_IRObject_Remote_Proxy_Broker (void)
- {
- }
- 
--CORBA::_TAO_IRObject_Remote_Proxy_Broker::~_TAO_IRObject_Remote_Proxy_Broker (void)
-+_TAO_IRObject_Remote_Proxy_Broker::~_TAO_IRObject_Remote_Proxy_Broker (void)
- {
- }
- 
--CORBA::_TAO_IRObject_Proxy_Impl&
--CORBA::_TAO_IRObject_Remote_Proxy_Broker::select_proxy (
--  ::CORBA::IRObject *object,
-+_TAO_IRObject_Proxy_Impl&
-+_TAO_IRObject_Remote_Proxy_Broker::select_proxy (
-+  CORBA_IRObject *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -486,107 +450,107 @@
- 
- 
- // default constructor
--CORBA::IRObject::IRObject (int collocated)
-+CORBA_IRObject::CORBA_IRObject (int collocated)
- {
-   this->CORBA_IRObject_setup_collocation (collocated);
- }
- 
- // destructor
--CORBA::IRObject::~IRObject (void)
-+CORBA_IRObject::~CORBA_IRObject (void)
- {}
- 
- void
--CORBA::IRObject::CORBA_IRObject_setup_collocation (int collocated)
-+CORBA_IRObject::CORBA_IRObject_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_IRObject_Proxy_Broker_ =
--      ::CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_IRObject_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_IRObject_Proxy_Broker_ =
--      ::CORBA::_TAO_IRObject_Remote_Proxy_Broker::the_TAO_IRObject_Remote_Proxy_Broker ();
-+      _TAO_IRObject_Remote_Proxy_Broker::the_TAO_IRObject_Remote_Proxy_Broker ();    
- }
- 
--void CORBA::IRObject::_tao_any_destructor (void *x)
-+void CORBA_IRObject::_tao_any_destructor (void *x)
- {
--  IRObject *tmp = ACE_static_cast (IRObject*,x);
-+  CORBA_IRObject *tmp = ACE_static_cast (CORBA_IRObject*,x);
-   CORBA::release (tmp);
- }
- 
--CORBA::IRObject_ptr CORBA::IRObject::_narrow (
-+CORBA_IRObject_ptr CORBA_IRObject::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return IRObject::_nil ();
-+    return CORBA_IRObject::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IRObject:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (IRObject::_nil ());
-+      ACE_CHECK_RETURN (CORBA_IRObject::_nil ());
-       if (is_a == 0)
--        return IRObject::_nil ();
-+        return CORBA_IRObject::_nil ();
-     }
--  return IRObject::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return CORBA_IRObject::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--CORBA::IRObject_ptr CORBA::IRObject::_unchecked_narrow (
-+CORBA_IRObject_ptr CORBA_IRObject::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return IRObject::_nil ();
-+    return CORBA_IRObject::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      IRObject_ptr default_proxy = IRObject::_nil ();
-+      CORBA_IRObject_ptr default_proxy = CORBA_IRObject::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () && _TAO_IRObject_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::CORBA::IRObject (
-+          CORBA_IRObject (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          IRObject::_nil ());
-+          CORBA_IRObject::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::CORBA::IRObject (stub, 0, obj->_servant ()), IRObject::_nil ());
-+        ACE_NEW_RETURN (default_proxy, CORBA_IRObject (stub, 0, obj->_servant ()), CORBA_IRObject::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            IRObject_ptr,
-+            CORBA_IRObject_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &IRObject::_narrow
-+                      &CORBA_IRObject::_narrow
-                     )
-                 )
-           );
- }
- 
--CORBA::IRObject_ptr
--CORBA::IRObject::_duplicate (IRObject_ptr obj)
-+CORBA_IRObject_ptr
-+CORBA_IRObject::_duplicate (CORBA_IRObject_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean CORBA::IRObject::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean CORBA_IRObject::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
-@@ -596,12 +560,12 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *CORBA::IRObject::_tao_QueryInterface (ptr_arith_t type)
-+void *CORBA_IRObject::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::CORBA, IRObject)::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-@@ -612,12 +576,12 @@
-   return retv;
- }
- 
--const char* CORBA::IRObject::_interface_repository_id (void) const
-+const char* CORBA_IRObject::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/CORBA/IRObject:1.0";
- }
- 
--IR::DefinitionKind CORBA::IRObject::def_kind (
-+IR_DefinitionKind CORBA_IRObject::def_kind (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -626,7 +590,7 @@
- {
-   _TAO_IRObject_Proxy_Impl &proxy = 
-     this->the_TAO_IRObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
--  ACE_CHECK_RETURN ((IR::DefinitionKind)0);
-+  ACE_CHECK_RETURN ((IR_DefinitionKind)0);
-   
-   return proxy.def_kind (
-       this,
-@@ -634,7 +598,7 @@
-     );
- }
- 
--void CORBA::IRObject::destroy (
-+void CORBA_IRObject::destroy (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -651,9 +615,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (
-+CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -662,7 +625,7 @@
- {}
- 
- Dynamic::ParameterList *
--CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -674,7 +637,7 @@
- }
- 
- Dynamic::ExceptionList *
--CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -687,7 +650,7 @@
- 
- 
- CORBA::Any * 
--CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
-+CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -703,13 +666,13 @@
- }
- 
- void 
--CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (IR::DefinitionKind result)
-+CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (IR_DefinitionKind result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::TAO_ClientRequestInfo_CORBA_IRObject_destroy (
-+CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::TAO_ClientRequestInfo_CORBA_IRObject_destroy (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -718,7 +681,7 @@
- {}
- 
- Dynamic::ParameterList *
--CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
-+CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -730,7 +693,7 @@
- }
- 
- Dynamic::ExceptionList *
--CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -743,7 +706,7 @@
- 
- 
- CORBA::Any * 
--CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TRY_ENV)
-+CORBA_IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -756,106 +719,68 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
--static const CORBA::Long _oc_CORBA_IRObject[] =
--{
--  TAO_ENCAP_BYTE_ORDER, // byte order
--  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4952), ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/IRObject:1.0
--  9, ACE_NTOHL (0x49524f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x0),  // name = IRObject
--};
--static CORBA::TypeCode _tc_TAO_tc_CORBA_IRObject (CORBA::tk_objref, sizeof (_oc_CORBA_IRObject), (char *) &_oc_CORBA_IRObject, 0, sizeof (CORBA::IRObject));
--TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IRObject, &_tc_TAO_tc_CORBA_IRObject)
--TAO_NAMESPACE_END
--static const CORBA::Long _oc_CORBA_ValueModifier[] =
--{
--  TAO_ENCAP_BYTE_ORDER, // byte order
--  36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5661), ACE_NTOHL (0x6c75654d), ACE_NTOHL (0x6f646966), ACE_NTOHL (0x6965723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ValueModifier:1.0
--  14, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000),  // name = ValueModifier
--  CORBA::tk_short,
--
--};
--static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueModifier (CORBA::tk_alias, sizeof (_oc_CORBA_ValueModifier), (char *) &_oc_CORBA_ValueModifier, 0, sizeof (CORBA::ValueModifier));
--TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueModifier, &_tc_TAO_tc_CORBA_ValueModifier)
--TAO_NAMESPACE_END
--TAO_NAMESPACE_TYPE (const CORBA::Short)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (const CORBA::Short, VM_NONE, 0)
--TAO_NAMESPACE_END
--TAO_NAMESPACE_TYPE (const CORBA::Short)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (const CORBA::Short, VM_CUSTOM, 1)
--TAO_NAMESPACE_END
--TAO_NAMESPACE_TYPE (const CORBA::Short)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (const CORBA::Short, VM_ABSTRACT, 2)
--TAO_NAMESPACE_END
--TAO_NAMESPACE_TYPE (const CORBA::Short)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (const CORBA::Short, VM_TRUNCATABLE, 3)
--TAO_NAMESPACE_END
--static const CORBA::Long _oc_CORBA_Visibility[] =
--{
--  TAO_ENCAP_BYTE_ORDER, // byte order
--  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5669), ACE_NTOHL (0x73696269), ACE_NTOHL (0x6c697479), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Visibility:1.0
--  11, ACE_NTOHL (0x56697369), ACE_NTOHL (0x62696c69), ACE_NTOHL (0x74790000),  // name = Visibility
--  CORBA::tk_short,
- 
--};
--static CORBA::TypeCode _tc_TAO_tc_CORBA_Visibility (CORBA::tk_alias, sizeof (_oc_CORBA_Visibility), (char *) &_oc_CORBA_Visibility, 0, sizeof (CORBA::Visibility));
--TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Visibility, &_tc_TAO_tc_CORBA_Visibility)
--TAO_NAMESPACE_END
--TAO_NAMESPACE_TYPE (const CORBA::Short)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (const CORBA::Short, PRIVATE_MEMBER, 0)
--TAO_NAMESPACE_END
--TAO_NAMESPACE_TYPE (const CORBA::Short)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (const CORBA::Short, PUBLIC_MEMBER, 1)
--TAO_NAMESPACE_END
- static const CORBA::Long _oc_IR_Identifier[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
-   11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-+  CORBA::tk_alias, // typecode kind for typedefs
-+  68, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
-+    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
-   CORBA::tk_string, 
-   0U, // string length
-+
- };
- static CORBA::TypeCode _tc_TAO_tc_IR_Identifier (CORBA::tk_alias, sizeof (_oc_IR_Identifier), (char *) &_oc_IR_Identifier, 0, sizeof (IR::Identifier));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Identifier, &_tc_TAO_tc_IR_Identifier)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_ScopedName[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x636f7065), ACE_NTOHL (0x644e616d), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/ScopedName:1.0
-   11, ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65644e61), ACE_NTOHL (0x6d650000),  // name = ScopedName
-+  CORBA::tk_alias, // typecode kind for typedefs
-+  68, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5363), ACE_NTOHL (0x6f706564), ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ScopedName:1.0
-+    11, ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65644e61), ACE_NTOHL (0x6d650000),  // name = ScopedName
-   CORBA::tk_string, 
-   0U, // string length
-+
- };
-+
- static CORBA::TypeCode _tc_TAO_tc_IR_ScopedName (CORBA::tk_alias, sizeof (_oc_IR_ScopedName), (char *) &_oc_IR_ScopedName, 0, sizeof (IR::ScopedName));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ScopedName, &_tc_TAO_tc_IR_ScopedName)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_RepositoryId[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
--  13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
-+  13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = IR_RepositoryId
-+  CORBA::tk_alias, // typecode kind for typedefs
-+  72, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
-+    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = IR_RepositoryId
-   CORBA::tk_string, 
-   0U, // string length
-+
- };
- static CORBA::TypeCode _tc_TAO_tc_IR_RepositoryId (CORBA::tk_alias, sizeof (_oc_IR_RepositoryId), (char *) &_oc_IR_RepositoryId, 0, sizeof (IR::RepositoryId));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryId, &_tc_TAO_tc_IR_RepositoryId)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_VersionSpec[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -874,15 +799,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_Contained_Proxy_Impl::_TAO_Contained_Proxy_Impl (void)
-+_TAO_Contained_Proxy_Impl::_TAO_Contained_Proxy_Impl (void)
- {}
- 
--IR::_TAO_Contained_Remote_Proxy_Impl::_TAO_Contained_Remote_Proxy_Impl (void)
-+_TAO_Contained_Remote_Proxy_Impl::_TAO_Contained_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--char * IR::_TAO_Contained_Remote_Proxy_Impl::id (
-+char * _TAO_Contained_Remote_Proxy_Impl::id (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -919,7 +844,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get ri (
-+      IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -1041,7 +966,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_Contained_Remote_Proxy_Impl::id (
-+void _TAO_Contained_Remote_Proxy_Impl::id (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -1050,10 +975,6 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -1079,7 +1000,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_set ri (
-+      IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -1193,7 +1114,7 @@
-   
- }
- 
--char * IR::_TAO_Contained_Remote_Proxy_Impl::name (
-+char * _TAO_Contained_Remote_Proxy_Impl::name (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -1201,10 +1122,8 @@
-     CORBA::SystemException
-   ))
- {
--  
-   CORBA::String_var _tao_safe_retval;
-   
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-@@ -1230,7 +1149,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get ri (
-+      IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -1352,7 +1271,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_Contained_Remote_Proxy_Impl::name (
-+void _TAO_Contained_Remote_Proxy_Impl::name (
-     CORBA_Object *_collocated_tao_target_,
-     const char * name,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -1361,10 +1280,6 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -1390,7 +1305,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_set ri (
-+      IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         name,
-@@ -1504,7 +1419,7 @@
-   
- }
- 
--char * IR::_TAO_Contained_Remote_Proxy_Impl::version (
-+char * _TAO_Contained_Remote_Proxy_Impl::version (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -1541,7 +1456,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get ri (
-+      IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -1663,7 +1578,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_Contained_Remote_Proxy_Impl::version (
-+void _TAO_Contained_Remote_Proxy_Impl::version (
-     CORBA_Object *_collocated_tao_target_,
-     const char * version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -1672,15 +1587,10 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_version",
-@@ -1701,7 +1611,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_set ri (
-+      IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         version,
-@@ -1815,7 +1725,7 @@
-   
- }
- 
--IR::Container_ptr IR::_TAO_Contained_Remote_Proxy_Impl::defined_in (
-+IR_Container_ptr _TAO_Contained_Remote_Proxy_Impl::defined_in (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -1823,16 +1733,14 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::Container_ptr _tao_retval = IR::Container::_nil ();
--  IR::Container_var _tao_safe_retval (_tao_retval);
-+  IR_Container_ptr _tao_retval = IR_Container::_nil ();
-+  IR_Container_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_defined_in",
-@@ -1853,7 +1761,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get ri (
-+      IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -1909,7 +1817,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::Container_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_Container_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -1975,7 +1883,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--char * IR::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
-+char * _TAO_Contained_Remote_Proxy_Impl::absolute_name (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -1983,15 +1891,12 @@
-     CORBA::SystemException
-   ))
- {
--  
-   CORBA::String_var _tao_safe_retval;
-   
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_absolute_name",
-@@ -2012,7 +1917,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get ri (
-+      IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -2134,7 +2039,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::Repository_ptr IR::_TAO_Contained_Remote_Proxy_Impl::containing_repository (
-+IR_Repository_ptr _TAO_Contained_Remote_Proxy_Impl::containing_repository (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -2142,16 +2047,13 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::Repository_ptr _tao_retval = IR::Repository::_nil ();
--  IR::Repository_var _tao_safe_retval (_tao_retval);
--  
-+  IR_Repository_ptr _tao_retval = IR_Repository::_nil ();
-+  IR_Repository_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_containing_repository",
-@@ -2172,7 +2074,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get ri (
-+      IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -2228,7 +2130,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::Repository_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_Repository_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -2294,7 +2196,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::Contained::Description * IR::_TAO_Contained_Remote_Proxy_Impl::describe (
-+IR_Contained::Description * _TAO_Contained_Remote_Proxy_Impl::describe (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -2302,16 +2204,14 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::Contained::Description *_tao_retval = 0;
-+  IR_Contained::Description *_tao_retval = 0;
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
--  ACE_NEW_RETURN (_tao_retval, IR::Contained::Description, _tao_retval);
--  IR::Contained::Description_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_Contained::Description, _tao_retval);
-+  IR_Contained::Description_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "describe",
-@@ -2332,7 +2232,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Contained::TAO_ClientRequestInfo_IR_Contained_describe ri (
-+      IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -2388,7 +2288,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::Contained::Description * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_Contained::Description * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -2454,9 +2354,9 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_Contained_Remote_Proxy_Impl::move (
-+void _TAO_Contained_Remote_Proxy_Impl::move (
-     CORBA_Object *_collocated_tao_target_,
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -2465,15 +2365,10 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "move",
-@@ -2494,7 +2389,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Contained::TAO_ClientRequestInfo_IR_Contained_move ri (
-+      IR_Contained::TAO_ClientRequestInfo_IR_Contained_move ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         new_container,
-@@ -2622,37 +2517,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_Contained_Proxy_Broker::_TAO_Contained_Proxy_Broker (void)
-+_TAO_Contained_Proxy_Broker::_TAO_Contained_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_Contained_Proxy_Broker::~_TAO_Contained_Proxy_Broker (void)
-+_TAO_Contained_Proxy_Broker::~_TAO_Contained_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_Contained_Proxy_Broker * (*IR__TAO_Contained_Proxy_Broker_Factory_function_pointer) (
-+_TAO_Contained_Proxy_Broker * (*_TAO_Contained_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_Contained_Remote_Proxy_Broker *
--IR::_TAO_Contained_Remote_Proxy_Broker::the_TAO_Contained_Remote_Proxy_Broker (void)
-+_TAO_Contained_Remote_Proxy_Broker *
-+_TAO_Contained_Remote_Proxy_Broker::the_TAO_Contained_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_Contained_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_Contained_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_Contained_Remote_Proxy_Broker::_TAO_Contained_Remote_Proxy_Broker (void)
-+_TAO_Contained_Remote_Proxy_Broker::_TAO_Contained_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_Contained_Remote_Proxy_Broker::~_TAO_Contained_Remote_Proxy_Broker (void)
-+_TAO_Contained_Remote_Proxy_Broker::~_TAO_Contained_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_Contained_Proxy_Impl&
--IR::_TAO_Contained_Remote_Proxy_Broker::select_proxy (
--  ::IR::Contained *object,
-+_TAO_Contained_Proxy_Impl&
-+_TAO_Contained_Remote_Proxy_Broker::select_proxy (
-+  IR_Contained *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -2668,109 +2563,109 @@
- 
- 
- // default constructor
--IR::Contained::Contained (int collocated)
-+IR_Contained::IR_Contained (int collocated)
- {
-   this->IR_Contained_setup_collocation (collocated);
- }
- 
- // destructor
--IR::Contained::~Contained (void)
-+IR_Contained::~IR_Contained (void)
- {}
- 
- void
--IR::Contained::IR_Contained_setup_collocation (int collocated)
-+IR_Contained::IR_Contained_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_Contained_Proxy_Broker_ =
--      ::IR__TAO_Contained_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_Contained_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_Contained_Proxy_Broker_ =
--      ::IR::_TAO_Contained_Remote_Proxy_Broker::the_TAO_Contained_Remote_Proxy_Broker ();
-+      _TAO_Contained_Remote_Proxy_Broker::the_TAO_Contained_Remote_Proxy_Broker ();
-   
-   this->CORBA_IRObject_setup_collocation (collocated);
- }
- 
--void IR::Contained::_tao_any_destructor (void *x)
-+void IR_Contained::_tao_any_destructor (void *x)
- {
--  Contained *tmp = ACE_static_cast (Contained*,x);
-+  IR_Contained *tmp = ACE_static_cast (IR_Contained*,x);
-   CORBA::release (tmp);
- }
- 
--IR::Contained_ptr IR::Contained::_narrow (
-+IR_Contained_ptr IR_Contained::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return Contained::_nil ();
-+    return IR_Contained::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/Contained:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (Contained::_nil ());
-+      ACE_CHECK_RETURN (IR_Contained::_nil ());
-       if (is_a == 0)
--        return Contained::_nil ();
-+        return IR_Contained::_nil ();
-     }
--  return Contained::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_Contained::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::Contained_ptr IR::Contained::_unchecked_narrow (
-+IR_Contained_ptr IR_Contained::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return Contained::_nil ();
-+    return IR_Contained::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      Contained_ptr default_proxy = Contained::_nil ();
-+      IR_Contained_ptr default_proxy = IR_Contained::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_Contained_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_Contained_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::Contained (
-+          IR_Contained (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          Contained::_nil ());
-+          IR_Contained::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::Contained (stub, 0, obj->_servant ()), Contained::_nil ());
-+        ACE_NEW_RETURN (default_proxy, IR_Contained (stub, 0, obj->_servant ()), IR_Contained::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            Contained_ptr,
-+            IR_Contained_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &Contained::_narrow
-+                      &IR_Contained::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::Contained_ptr
--IR::Contained::_duplicate (Contained_ptr obj)
-+IR_Contained_ptr
-+IR_Contained::_duplicate (IR_Contained_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::Contained::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_Contained::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
-@@ -2781,22 +2676,22 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::Contained::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_Contained::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -2809,12 +2704,12 @@
-   return retv;
- }
- 
--const char* IR::Contained::_interface_repository_id (void) const
-+const char* IR_Contained::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/Contained:1.0";
- }
- 
--char * IR::Contained::id (
-+char * IR_Contained::id (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -2831,7 +2726,7 @@
-     );
- }
- 
--void IR::Contained::id (
-+void IR_Contained::id (
-     const char * id,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -2850,7 +2745,7 @@
-     );
- }
- 
--char * IR::Contained::name (
-+char * IR_Contained::name (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -2867,7 +2762,7 @@
-     );
- }
- 
--void IR::Contained::name (
-+void IR_Contained::name (
-     const char * name,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -2886,7 +2781,7 @@
-     );
- }
- 
--char * IR::Contained::version (
-+char * IR_Contained::version (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -2903,7 +2798,7 @@
-     );
- }
- 
--void IR::Contained::version (
-+void IR_Contained::version (
-     const char * version,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -2922,7 +2817,7 @@
-     );
- }
- 
--IR::Container_ptr IR::Contained::defined_in (
-+IR_Container_ptr IR_Contained::defined_in (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -2939,7 +2834,7 @@
-     );
- }
- 
--char * IR::Contained::absolute_name (
-+char * IR_Contained::absolute_name (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -2956,7 +2851,7 @@
-     );
- }
- 
--IR::Repository_ptr IR::Contained::containing_repository (
-+IR_Repository_ptr IR_Contained::containing_repository (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -3025,16 +2920,16 @@
-   CORBA::tk_any,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_Contained_Description (CORBA::tk_struct, sizeof (_oc_IR_Contained_Description), (char *) &_oc_IR_Contained_Description, 0, sizeof (IR::Contained::Description));
--CORBA::TypeCode_ptr IR::Contained::_tc_Description = &_tc_TAO_tc_IR_Contained_Description;
-+static CORBA::TypeCode _tc_TAO_tc_IR_Contained_Description (CORBA::tk_struct, sizeof (_oc_IR_Contained_Description), (char *) &_oc_IR_Contained_Description, 0, sizeof (IR_Contained::Description));
-+CORBA::TypeCode_ptr IR_Contained::_tc_Description = &_tc_TAO_tc_IR_Contained_Description;
- 
--void IR::Contained::Description::_tao_any_destructor (void *x)
-+void IR_Contained::Description::_tao_any_destructor (void *x)
- {
-   Description *tmp = ACE_static_cast (Description*,x);
-   delete tmp;
- }
- 
--IR::Contained::Description * IR::Contained::describe (
-+IR_Contained::Description * IR_Contained::describe (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -3051,8 +2946,8 @@
-     );
- }
- 
--void IR::Contained::move (
--    IR::Container_ptr new_container,
-+void IR_Contained::move (
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -3074,9 +2969,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get::TAO_ClientRequestInfo_IR_Contained_id_get (
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get::TAO_ClientRequestInfo_IR_Contained_id_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -3085,7 +2979,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -3097,7 +2991,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -3110,7 +3004,7 @@
- 
- 
- CORBA::Any * 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -3126,13 +3020,13 @@
- }
- 
- void 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get::result (char * result)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_get::result (char * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_set::TAO_ClientRequestInfo_IR_Contained_id_set (
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_set::TAO_ClientRequestInfo_IR_Contained_id_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-@@ -3143,7 +3037,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -3162,7 +3056,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -3175,7 +3069,7 @@
- 
- 
- CORBA::Any * 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_id_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -3187,7 +3081,7 @@
-   return result_any;
- }
- 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get::TAO_ClientRequestInfo_IR_Contained_name_get (
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get::TAO_ClientRequestInfo_IR_Contained_name_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -3196,7 +3090,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -3208,7 +3102,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -3221,7 +3115,7 @@
- 
- 
- CORBA::Any * 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -3237,13 +3131,13 @@
- }
- 
- void 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get::result (char * result)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_get::result (char * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_set::TAO_ClientRequestInfo_IR_Contained_name_set (
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_set::TAO_ClientRequestInfo_IR_Contained_name_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * name,
-@@ -3254,7 +3148,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -3273,7 +3167,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -3286,7 +3180,7 @@
- 
- 
- CORBA::Any * 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_name_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -3298,7 +3192,7 @@
-   return result_any;
- }
- 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get::TAO_ClientRequestInfo_IR_Contained_version_get (
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get::TAO_ClientRequestInfo_IR_Contained_version_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -3307,7 +3201,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -3319,7 +3213,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -3332,7 +3226,7 @@
- 
- 
- CORBA::Any * 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -3348,13 +3242,13 @@
- }
- 
- void 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get::result (char * result)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_get::result (char * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_set::TAO_ClientRequestInfo_IR_Contained_version_set (
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_set::TAO_ClientRequestInfo_IR_Contained_version_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * version,
-@@ -3365,7 +3259,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -3384,7 +3278,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -3397,7 +3291,7 @@
- 
- 
- CORBA::Any * 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_version_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -3409,7 +3303,7 @@
-   return result_any;
- }
- 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::TAO_ClientRequestInfo_IR_Contained_defined_in_get (
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::TAO_ClientRequestInfo_IR_Contained_defined_in_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -3418,7 +3312,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -3430,7 +3324,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -3443,7 +3337,7 @@
- 
- 
- CORBA::Any * 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -3459,13 +3353,13 @@
- }
- 
- void 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::result (IR::Container_ptr result)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::result (IR_Container_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::TAO_ClientRequestInfo_IR_Contained_absolute_name_get (
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::TAO_ClientRequestInfo_IR_Contained_absolute_name_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -3474,7 +3368,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -3486,7 +3380,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -3499,7 +3393,7 @@
- 
- 
- CORBA::Any * 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -3515,13 +3409,13 @@
- }
- 
- void 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::result (char * result)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::result (char * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::TAO_ClientRequestInfo_IR_Contained_containing_repository_get (
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::TAO_ClientRequestInfo_IR_Contained_containing_repository_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -3530,7 +3424,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -3542,7 +3436,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -3555,7 +3449,7 @@
- 
- 
- CORBA::Any * 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -3571,13 +3465,13 @@
- }
- 
- void 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::result (IR::Repository_ptr result)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::result (IR_Repository_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_describe::TAO_ClientRequestInfo_IR_Contained_describe (
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe::TAO_ClientRequestInfo_IR_Contained_describe (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -3586,7 +3480,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_describe::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -3598,7 +3492,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_describe::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -3611,7 +3505,7 @@
- 
- 
- CORBA::Any * 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_describe::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -3627,16 +3521,16 @@
- }
- 
- void 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_describe::result (ACE_NESTED_CLASS (IR::Contained,Description) * result)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_describe::result (ACE_NESTED_CLASS (IR_Contained,Description) * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_move::TAO_ClientRequestInfo_IR_Contained_move (
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_move::TAO_ClientRequestInfo_IR_Contained_move (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::Container_ptr new_container,
-+    IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &    
-@@ -3648,7 +3542,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_move::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_move::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -3678,7 +3572,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_move::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_move::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -3691,7 +3585,7 @@
- 
- 
- CORBA::Any * 
--IR::Contained::TAO_ClientRequestInfo_IR_Contained_move::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Contained::TAO_ClientRequestInfo_IR_Contained_move::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -3704,13 +3598,14 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_Contained[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/Contained:1.0
--  10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000),  // name = Contained
-+  10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000),  // name = IR_Contained
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_Contained (CORBA::tk_objref, sizeof (_oc_IR_Contained), (char *) &_oc_IR_Contained, 0, sizeof (IR::Contained));
-+static CORBA::TypeCode _tc_TAO_tc_IR_Contained (CORBA::tk_objref, sizeof (_oc_IR_Contained), (char *) &_oc_IR_Contained, 0, sizeof (IR_Contained));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Contained, &_tc_TAO_tc_IR_Contained)
-@@ -3718,22 +3613,19 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CS_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CS_
--
-   // The Base_Sequence functions, please see tao/Sequence.h
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::InterfaceDef **tmp = 0;
-+    IR_InterfaceDef **tmp = 0;
-     tmp = _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::InterfaceDef **old = ACE_reinterpret_cast (IR::InterfaceDef**, this->buffer_);
-+      IR_InterfaceDef **old = ACE_reinterpret_cast (IR_InterfaceDef**, this->buffer_);
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         if (!this->release_)
--          tmp[i] = IR::InterfaceDef::_duplicate (old[i]);
-+          tmp[i] = IR_InterfaceDef::_duplicate (old[i]);
-         else
-           tmp[i] = old[i];
-         
-@@ -3745,111 +3637,102 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
--    IR::InterfaceDef **tmp = ACE_reinterpret_cast (IR::InterfaceDef**, this->buffer_);
-+    IR_InterfaceDef **tmp = ACE_reinterpret_cast (IR_InterfaceDef**, this->buffer_);
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::InterfaceDef::_nil ();
-+      tmp[i] = IR_InterfaceDef::_nil ();
-     }
-     _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   }
-   
--  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (void)
-   {
-     this->_deallocate_buffer ();
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-+  _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-   {
--    IR::InterfaceDef **tmp = ACE_reinterpret_cast (IR::InterfaceDef**, this->buffer_);
-+    IR_InterfaceDef **tmp = ACE_reinterpret_cast (IR_InterfaceDef**, this->buffer_);
-     
-     for (CORBA::ULong i = nl; i < ol; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::InterfaceDef::_nil ();
-+      tmp[i] = IR_InterfaceDef::_nil ();
-     }
-   }
-   void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_downcast (
-+  _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_downcast (
-       void* target,
-       CORBA_Object *src,
-       CORBA_Environment &ACE_TRY_ENV
-     )
-   {
--    IR::InterfaceDef **tmp = ACE_static_cast (IR::InterfaceDef**, target);
--    *tmp = IR::InterfaceDef::_narrow (src, ACE_TRY_ENV);
-+    IR_InterfaceDef **tmp = ACE_static_cast (IR_InterfaceDef**, target);
-+    *tmp = IR_InterfaceDef::_narrow (src, ACE_TRY_ENV);
-   }
- 
-   CORBA_Object*
--  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_upcast (void *src) const
-+  _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_upcast (void *src) const
-   {
--    IR::InterfaceDef **tmp = ACE_static_cast (IR::InterfaceDef**, src);
-+    IR_InterfaceDef **tmp = ACE_static_cast (IR_InterfaceDef**, src);
-     return *tmp;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_INTERFACEDEFSEQ_CS_)
--#define _IR_INTERFACEDEFSEQ_CS_
--
- // *************************************************************
--// IR::InterfaceDefSeq
-+// IR_InterfaceDefSeq
- // *************************************************************
- 
--IR::InterfaceDefSeq::InterfaceDefSeq (void)
-+IR_InterfaceDefSeq::IR_InterfaceDefSeq (void)
- {}
--IR::InterfaceDefSeq::InterfaceDefSeq (CORBA::ULong max) // uses max size
-+IR_InterfaceDefSeq::IR_InterfaceDefSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::InterfaceDef,IR::InterfaceDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_InterfaceDef,IR_InterfaceDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::InterfaceDefSeq::InterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, IR::InterfaceDef_ptr *buffer, CORBA::Boolean release)
-+IR_InterfaceDefSeq::IR_InterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, IR_InterfaceDef_ptr *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::InterfaceDef,IR::InterfaceDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_InterfaceDef,IR_InterfaceDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::InterfaceDefSeq::InterfaceDefSeq (const InterfaceDefSeq &seq) // copy ctor
-+IR_InterfaceDefSeq::IR_InterfaceDefSeq (const IR_InterfaceDefSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::InterfaceDef,IR::InterfaceDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_InterfaceDef,IR_InterfaceDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::InterfaceDefSeq::~InterfaceDefSeq (void) // dtor
-+IR_InterfaceDefSeq::~IR_InterfaceDefSeq (void) // dtor
- {}
--void IR::InterfaceDefSeq::_tao_any_destructor (void *x)
-+void IR_InterfaceDefSeq::_tao_any_destructor (void *x)
- {
--  InterfaceDefSeq *tmp = ACE_static_cast (InterfaceDefSeq*,x);
-+  IR_InterfaceDefSeq *tmp = ACE_static_cast (IR_InterfaceDefSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_InterfaceDefSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/InterfaceDefSeq:1.0
--  16, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x53657100),  // name = InterfaceDefSeq
-+  16, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x53657100),  // name = IR_InterfaceDefSeq
-   CORBA::tk_sequence, // typecode kind
-   76, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -3857,12 +3740,12 @@
-     60, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/InterfaceDef:1.0
--      13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = InterfaceDef
-+      13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = IR_InterfaceDef
- 
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_InterfaceDefSeq (CORBA::tk_alias, sizeof (_oc_IR_InterfaceDefSeq), (char *) &_oc_IR_InterfaceDefSeq, 0, sizeof (IR::InterfaceDefSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_InterfaceDefSeq (CORBA::tk_alias, sizeof (_oc_IR_InterfaceDefSeq), (char *) &_oc_IR_InterfaceDefSeq, 0, sizeof (IR_InterfaceDefSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDefSeq, &_tc_TAO_tc_IR_InterfaceDefSeq)
-@@ -3870,22 +3753,19 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CS_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CS_
--
-   // The Base_Sequence functions, please see tao/Sequence.h
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::ValueDef **tmp = 0;
-+    IR_ValueDef **tmp = 0;
-     tmp = _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::ValueDef **old = ACE_reinterpret_cast (IR::ValueDef**, this->buffer_);
-+      IR_ValueDef **old = ACE_reinterpret_cast (IR_ValueDef**, this->buffer_);
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         if (!this->release_)
--          tmp[i] = IR::ValueDef::_duplicate (old[i]);
-+          tmp[i] = IR_ValueDef::_duplicate (old[i]);
-         else
-           tmp[i] = old[i];
-         
-@@ -3897,111 +3777,102 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
--    IR::ValueDef **tmp = ACE_reinterpret_cast (IR::ValueDef**, this->buffer_);
-+    IR_ValueDef **tmp = ACE_reinterpret_cast (IR_ValueDef**, this->buffer_);
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::ValueDef::_nil ();
-+      tmp[i] = IR_ValueDef::_nil ();
-     }
-     _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   }
-   
--  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (void)
-   {
-     this->_deallocate_buffer ();
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-+  _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-   {
--    IR::ValueDef **tmp = ACE_reinterpret_cast (IR::ValueDef**, this->buffer_);
-+    IR_ValueDef **tmp = ACE_reinterpret_cast (IR_ValueDef**, this->buffer_);
-     
-     for (CORBA::ULong i = nl; i < ol; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::ValueDef::_nil ();
-+      tmp[i] = IR_ValueDef::_nil ();
-     }
-   }
-   void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_downcast (
-+  _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_downcast (
-       void* target,
-       CORBA_Object *src,
-       CORBA_Environment &ACE_TRY_ENV
-     )
-   {
--    IR::ValueDef **tmp = ACE_static_cast (IR::ValueDef**, target);
--    *tmp = IR::ValueDef::_narrow (src, ACE_TRY_ENV);
-+    IR_ValueDef **tmp = ACE_static_cast (IR_ValueDef**, target);
-+    *tmp = IR_ValueDef::_narrow (src, ACE_TRY_ENV);
-   }
- 
-   CORBA_Object*
--  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_upcast (void *src) const
-+  _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_upcast (void *src) const
-   {
--    IR::ValueDef **tmp = ACE_static_cast (IR::ValueDef**, src);
-+    IR_ValueDef **tmp = ACE_static_cast (IR_ValueDef**, src);
-     return *tmp;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_VALUEDEFSEQ_CS_)
--#define _IR_VALUEDEFSEQ_CS_
--
- // *************************************************************
--// IR::ValueDefSeq
-+// IR_ValueDefSeq
- // *************************************************************
- 
--IR::ValueDefSeq::ValueDefSeq (void)
-+IR_ValueDefSeq::IR_ValueDefSeq (void)
- {}
--IR::ValueDefSeq::ValueDefSeq (CORBA::ULong max) // uses max size
-+IR_ValueDefSeq::IR_ValueDefSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::ValueDef,IR::ValueDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ValueDef,IR_ValueDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::ValueDefSeq::ValueDefSeq (CORBA::ULong max, CORBA::ULong length, IR::ValueDef_ptr *buffer, CORBA::Boolean release)
-+IR_ValueDefSeq::IR_ValueDefSeq (CORBA::ULong max, CORBA::ULong length, IR_ValueDef_ptr *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::ValueDef,IR::ValueDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ValueDef,IR_ValueDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::ValueDefSeq::ValueDefSeq (const ValueDefSeq &seq) // copy ctor
-+IR_ValueDefSeq::IR_ValueDefSeq (const IR_ValueDefSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::ValueDef,IR::ValueDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ValueDef,IR_ValueDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::ValueDefSeq::~ValueDefSeq (void) // dtor
-+IR_ValueDefSeq::~IR_ValueDefSeq (void) // dtor
- {}
--void IR::ValueDefSeq::_tao_any_destructor (void *x)
-+void IR_ValueDefSeq::_tao_any_destructor (void *x)
- {
--  ValueDefSeq *tmp = ACE_static_cast (ValueDefSeq*,x);
-+  IR_ValueDefSeq *tmp = ACE_static_cast (IR_ValueDefSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_ValueDefSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ValueDefSeq:1.0
--  12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x53657100),  // name = ValueDefSeq
-+  12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x53657100),  // name = IR_ValueDefSeq
-   CORBA::tk_sequence, // typecode kind
-   68, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -4009,12 +3880,12 @@
-     52, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/ValueDef:1.0
--      9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = ValueDef
-+      9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = IR_ValueDef
- 
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ValueDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ValueDefSeq), (char *) &_oc_IR_ValueDefSeq, 0, sizeof (IR::ValueDefSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ValueDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ValueDefSeq), (char *) &_oc_IR_ValueDefSeq, 0, sizeof (IR_ValueDefSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDefSeq, &_tc_TAO_tc_IR_ValueDefSeq)
-@@ -4022,22 +3893,19 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CS_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CS_
--
-   // The Base_Sequence functions, please see tao/Sequence.h
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::ComponentDef **tmp = 0;
-+    IR_ComponentDef **tmp = 0;
-     tmp = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::ComponentDef **old = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
-+      IR_ComponentDef **old = ACE_reinterpret_cast (IR_ComponentDef**, this->buffer_);
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         if (!this->release_)
--          tmp[i] = IR::ComponentDef::_duplicate (old[i]);
-+          tmp[i] = IR_ComponentDef::_duplicate (old[i]);
-         else
-           tmp[i] = old[i];
-         
-@@ -4049,111 +3917,102 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
--    IR::ComponentDef **tmp = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
-+    IR_ComponentDef **tmp = ACE_reinterpret_cast (IR_ComponentDef**, this->buffer_);
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::ComponentDef::_nil ();
-+      tmp[i] = IR_ComponentDef::_nil ();
-     }
-     _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   }
-   
--  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
-   {
-     this->_deallocate_buffer ();
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-   {
--    IR::ComponentDef **tmp = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
-+    IR_ComponentDef **tmp = ACE_reinterpret_cast (IR_ComponentDef**, this->buffer_);
-     
-     for (CORBA::ULong i = nl; i < ol; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::ComponentDef::_nil ();
-+      tmp[i] = IR_ComponentDef::_nil ();
-     }
-   }
-   void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_downcast (
-+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_downcast (
-       void* target,
-       CORBA_Object *src,
-       CORBA_Environment &ACE_TRY_ENV
-     )
-   {
--    IR::ComponentDef **tmp = ACE_static_cast (IR::ComponentDef**, target);
--    *tmp = IR::ComponentDef::_narrow (src, ACE_TRY_ENV);
-+    IR_ComponentDef **tmp = ACE_static_cast (IR_ComponentDef**, target);
-+    *tmp = IR_ComponentDef::_narrow (src, ACE_TRY_ENV);
-   }
- 
-   CORBA_Object*
--  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_upcast (void *src) const
-+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_upcast (void *src) const
-   {
--    IR::ComponentDef **tmp = ACE_static_cast (IR::ComponentDef**, src);
-+    IR_ComponentDef **tmp = ACE_static_cast (IR_ComponentDef**, src);
-     return *tmp;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_COMPONENTDEFSEQ_CS_)
--#define _IR_COMPONENTDEFSEQ_CS_
--
- // *************************************************************
--// IR::ComponentDefSeq
-+// IR_ComponentDefSeq
- // *************************************************************
- 
--IR::ComponentDefSeq::ComponentDefSeq (void)
-+IR_ComponentDefSeq::IR_ComponentDefSeq (void)
- {}
--IR::ComponentDefSeq::ComponentDefSeq (CORBA::ULong max) // uses max size
-+IR_ComponentDefSeq::IR_ComponentDefSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::ComponentDef,IR::ComponentDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ComponentDef,IR_ComponentDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::ComponentDefSeq::ComponentDefSeq (CORBA::ULong max, CORBA::ULong length, IR::ComponentDef_ptr *buffer, CORBA::Boolean release)
-+IR_ComponentDefSeq::IR_ComponentDefSeq (CORBA::ULong max, CORBA::ULong length, IR_ComponentDef_ptr *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::ComponentDef,IR::ComponentDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ComponentDef,IR_ComponentDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::ComponentDefSeq::ComponentDefSeq (const ComponentDefSeq &seq) // copy ctor
-+IR_ComponentDefSeq::IR_ComponentDefSeq (const IR_ComponentDefSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::ComponentDef,IR::ComponentDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ComponentDef,IR_ComponentDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::ComponentDefSeq::~ComponentDefSeq (void) // dtor
-+IR_ComponentDefSeq::~IR_ComponentDefSeq (void) // dtor
- {}
--void IR::ComponentDefSeq::_tao_any_destructor (void *x)
-+void IR_ComponentDefSeq::_tao_any_destructor (void *x)
- {
--  ComponentDefSeq *tmp = ACE_static_cast (ComponentDefSeq*,x);
-+  IR_ComponentDefSeq *tmp = ACE_static_cast (IR_ComponentDefSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_ComponentDefSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ComponentDefSeq:1.0
--  16, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74446566), ACE_NTOHL (0x53657100),  // name = ComponentDefSeq
-+  16, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74446566), ACE_NTOHL (0x53657100),  // name = IR_ComponentDefSeq
-   CORBA::tk_sequence, // typecode kind
-   76, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -4161,12 +4020,12 @@
-     60, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/ComponentDef:1.0
--      13, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74446566), ACE_NTOHL (0x0),  // name = ComponentDef
-+      13, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74446566), ACE_NTOHL (0x0),  // name = IR_ComponentDef
- 
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ComponentDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ComponentDefSeq), (char *) &_oc_IR_ComponentDefSeq, 0, sizeof (IR::ComponentDefSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ComponentDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ComponentDefSeq), (char *) &_oc_IR_ComponentDefSeq, 0, sizeof (IR_ComponentDefSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentDefSeq, &_tc_TAO_tc_IR_ComponentDefSeq)
-@@ -4174,22 +4033,19 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CS_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CS_
--
-   // The Base_Sequence functions, please see tao/Sequence.h
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::ProvidesDef **tmp = 0;
-+    IR_ProvidesDef **tmp = 0;
-     tmp = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::ProvidesDef **old = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
-+      IR_ProvidesDef **old = ACE_reinterpret_cast (IR_ProvidesDef**, this->buffer_);
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         if (!this->release_)
--          tmp[i] = IR::ProvidesDef::_duplicate (old[i]);
-+          tmp[i] = IR_ProvidesDef::_duplicate (old[i]);
-         else
-           tmp[i] = old[i];
-         
-@@ -4201,111 +4057,102 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
--    IR::ProvidesDef **tmp = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
-+    IR_ProvidesDef **tmp = ACE_reinterpret_cast (IR_ProvidesDef**, this->buffer_);
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::ProvidesDef::_nil ();
-+      tmp[i] = IR_ProvidesDef::_nil ();
-     }
-     _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   }
-   
--  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
-   {
-     this->_deallocate_buffer ();
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-   {
--    IR::ProvidesDef **tmp = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
-+    IR_ProvidesDef **tmp = ACE_reinterpret_cast (IR_ProvidesDef**, this->buffer_);
-     
-     for (CORBA::ULong i = nl; i < ol; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::ProvidesDef::_nil ();
-+      tmp[i] = IR_ProvidesDef::_nil ();
-     }
-   }
-   void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_downcast (
-+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_downcast (
-       void* target,
-       CORBA_Object *src,
-       CORBA_Environment &ACE_TRY_ENV
-     )
-   {
--    IR::ProvidesDef **tmp = ACE_static_cast (IR::ProvidesDef**, target);
--    *tmp = IR::ProvidesDef::_narrow (src, ACE_TRY_ENV);
-+    IR_ProvidesDef **tmp = ACE_static_cast (IR_ProvidesDef**, target);
-+    *tmp = IR_ProvidesDef::_narrow (src, ACE_TRY_ENV);
-   }
- 
-   CORBA_Object*
--  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_upcast (void *src) const
-+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_upcast (void *src) const
-   {
--    IR::ProvidesDef **tmp = ACE_static_cast (IR::ProvidesDef**, src);
-+    IR_ProvidesDef **tmp = ACE_static_cast (IR_ProvidesDef**, src);
-     return *tmp;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_PROVIDESDEFSEQ_CS_)
--#define _IR_PROVIDESDEFSEQ_CS_
--
- // *************************************************************
--// IR::ProvidesDefSeq
-+// IR_ProvidesDefSeq
- // *************************************************************
- 
--IR::ProvidesDefSeq::ProvidesDefSeq (void)
-+IR_ProvidesDefSeq::IR_ProvidesDefSeq (void)
- {}
--IR::ProvidesDefSeq::ProvidesDefSeq (CORBA::ULong max) // uses max size
-+IR_ProvidesDefSeq::IR_ProvidesDefSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::ProvidesDef,IR::ProvidesDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ProvidesDef,IR_ProvidesDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::ProvidesDefSeq::ProvidesDefSeq (CORBA::ULong max, CORBA::ULong length, IR::ProvidesDef_ptr *buffer, CORBA::Boolean release)
-+IR_ProvidesDefSeq::IR_ProvidesDefSeq (CORBA::ULong max, CORBA::ULong length, IR_ProvidesDef_ptr *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::ProvidesDef,IR::ProvidesDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ProvidesDef,IR_ProvidesDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::ProvidesDefSeq::ProvidesDefSeq (const ProvidesDefSeq &seq) // copy ctor
-+IR_ProvidesDefSeq::IR_ProvidesDefSeq (const IR_ProvidesDefSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::ProvidesDef,IR::ProvidesDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ProvidesDef,IR_ProvidesDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::ProvidesDefSeq::~ProvidesDefSeq (void) // dtor
-+IR_ProvidesDefSeq::~IR_ProvidesDefSeq (void) // dtor
- {}
--void IR::ProvidesDefSeq::_tao_any_destructor (void *x)
-+void IR_ProvidesDefSeq::_tao_any_destructor (void *x)
- {
--  ProvidesDefSeq *tmp = ACE_static_cast (ProvidesDefSeq*,x);
-+  IR_ProvidesDefSeq *tmp = ACE_static_cast (IR_ProvidesDefSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_ProvidesDefSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657344), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/ProvidesDefSeq:1.0
--  15, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000),  // name = ProvidesDefSeq
-+  15, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000),  // name = IR_ProvidesDefSeq
-   CORBA::tk_sequence, // typecode kind
-   72, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -4313,12 +4160,12 @@
-     56, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ProvidesDef:1.0
--      12, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656600),  // name = ProvidesDef
-+      12, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656600),  // name = IR_ProvidesDef
- 
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ProvidesDefSeq), (char *) &_oc_IR_ProvidesDefSeq, 0, sizeof (IR::ProvidesDefSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ProvidesDefSeq), (char *) &_oc_IR_ProvidesDefSeq, 0, sizeof (IR_ProvidesDefSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDefSeq, &_tc_TAO_tc_IR_ProvidesDefSeq)
-@@ -4326,22 +4173,19 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CS_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CS_
--
-   // The Base_Sequence functions, please see tao/Sequence.h
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::UsesDef **tmp = 0;
-+    IR_UsesDef **tmp = 0;
-     tmp = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::UsesDef **old = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
-+      IR_UsesDef **old = ACE_reinterpret_cast (IR_UsesDef**, this->buffer_);
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         if (!this->release_)
--          tmp[i] = IR::UsesDef::_duplicate (old[i]);
-+          tmp[i] = IR_UsesDef::_duplicate (old[i]);
-         else
-           tmp[i] = old[i];
-         
-@@ -4353,111 +4197,102 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
--    IR::UsesDef **tmp = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
-+    IR_UsesDef **tmp = ACE_reinterpret_cast (IR_UsesDef**, this->buffer_);
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::UsesDef::_nil ();
-+      tmp[i] = IR_UsesDef::_nil ();
-     }
-     _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   }
-   
--  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
-   {
-     this->_deallocate_buffer ();
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-   {
--    IR::UsesDef **tmp = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
-+    IR_UsesDef **tmp = ACE_reinterpret_cast (IR_UsesDef**, this->buffer_);
-     
-     for (CORBA::ULong i = nl; i < ol; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::UsesDef::_nil ();
-+      tmp[i] = IR_UsesDef::_nil ();
-     }
-   }
-   void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_downcast (
-+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_downcast (
-       void* target,
-       CORBA_Object *src,
-       CORBA_Environment &ACE_TRY_ENV
-     )
-   {
--    IR::UsesDef **tmp = ACE_static_cast (IR::UsesDef**, target);
--    *tmp = IR::UsesDef::_narrow (src, ACE_TRY_ENV);
-+    IR_UsesDef **tmp = ACE_static_cast (IR_UsesDef**, target);
-+    *tmp = IR_UsesDef::_narrow (src, ACE_TRY_ENV);
-   }
- 
-   CORBA_Object*
--  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_upcast (void *src) const
-+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_upcast (void *src) const
-   {
--    IR::UsesDef **tmp = ACE_static_cast (IR::UsesDef**, src);
-+    IR_UsesDef **tmp = ACE_static_cast (IR_UsesDef**, src);
-     return *tmp;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_USESDEFSEQ_CS_)
--#define _IR_USESDEFSEQ_CS_
--
- // *************************************************************
--// IR::UsesDefSeq
-+// IR_UsesDefSeq
- // *************************************************************
- 
--IR::UsesDefSeq::UsesDefSeq (void)
-+IR_UsesDefSeq::IR_UsesDefSeq (void)
- {}
--IR::UsesDefSeq::UsesDefSeq (CORBA::ULong max) // uses max size
-+IR_UsesDefSeq::IR_UsesDefSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::UsesDef,IR::UsesDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_UsesDef,IR_UsesDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::UsesDefSeq::UsesDefSeq (CORBA::ULong max, CORBA::ULong length, IR::UsesDef_ptr *buffer, CORBA::Boolean release)
-+IR_UsesDefSeq::IR_UsesDefSeq (CORBA::ULong max, CORBA::ULong length, IR_UsesDef_ptr *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::UsesDef,IR::UsesDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_UsesDef,IR_UsesDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::UsesDefSeq::UsesDefSeq (const UsesDefSeq &seq) // copy ctor
-+IR_UsesDefSeq::IR_UsesDefSeq (const IR_UsesDefSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::UsesDef,IR::UsesDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_UsesDef,IR_UsesDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::UsesDefSeq::~UsesDefSeq (void) // dtor
-+IR_UsesDefSeq::~IR_UsesDefSeq (void) // dtor
- {}
--void IR::UsesDefSeq::_tao_any_destructor (void *x)
-+void IR_UsesDefSeq::_tao_any_destructor (void *x)
- {
--  UsesDefSeq *tmp = ACE_static_cast (UsesDefSeq*,x);
-+  IR_UsesDefSeq *tmp = ACE_static_cast (IR_UsesDefSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_UsesDefSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x73657344), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/UsesDefSeq:1.0
--  11, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000),  // name = UsesDefSeq
-+  11, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000),  // name = IR_UsesDefSeq
-   CORBA::tk_sequence, // typecode kind
-   64, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -4465,12 +4300,12 @@
-     48, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x73657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UsesDef:1.0
--      8, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656600),  // name = UsesDef
-+      8, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656600),  // name = IR_UsesDef
- 
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_UsesDefSeq (CORBA::tk_alias, sizeof (_oc_IR_UsesDefSeq), (char *) &_oc_IR_UsesDefSeq, 0, sizeof (IR::UsesDefSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_UsesDefSeq (CORBA::tk_alias, sizeof (_oc_IR_UsesDefSeq), (char *) &_oc_IR_UsesDefSeq, 0, sizeof (IR_UsesDefSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDefSeq, &_tc_TAO_tc_IR_UsesDefSeq)
-@@ -4478,22 +4313,19 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CS_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CS_
--
-   // The Base_Sequence functions, please see tao/Sequence.h
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::HomeDef **tmp = 0;
-+    IR_HomeDef **tmp = 0;
-     tmp = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::HomeDef **old = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
-+      IR_HomeDef **old = ACE_reinterpret_cast (IR_HomeDef**, this->buffer_);
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         if (!this->release_)
--          tmp[i] = IR::HomeDef::_duplicate (old[i]);
-+          tmp[i] = IR_HomeDef::_duplicate (old[i]);
-         else
-           tmp[i] = old[i];
-         
-@@ -4505,111 +4337,102 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
--    IR::HomeDef **tmp = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
-+    IR_HomeDef **tmp = ACE_reinterpret_cast (IR_HomeDef**, this->buffer_);
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::HomeDef::_nil ();
-+      tmp[i] = IR_HomeDef::_nil ();
-     }
-     _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   }
-   
--  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::~_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::~_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
-   {
-     this->_deallocate_buffer ();
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-   {
--    IR::HomeDef **tmp = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
-+    IR_HomeDef **tmp = ACE_reinterpret_cast (IR_HomeDef**, this->buffer_);
-     
-     for (CORBA::ULong i = nl; i < ol; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::HomeDef::_nil ();
-+      tmp[i] = IR_HomeDef::_nil ();
-     }
-   }
-   void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_downcast (
-+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_downcast (
-       void* target,
-       CORBA_Object *src,
-       CORBA_Environment &ACE_TRY_ENV
-     )
-   {
--    IR::HomeDef **tmp = ACE_static_cast (IR::HomeDef**, target);
--    *tmp = IR::HomeDef::_narrow (src, ACE_TRY_ENV);
-+    IR_HomeDef **tmp = ACE_static_cast (IR_HomeDef**, target);
-+    *tmp = IR_HomeDef::_narrow (src, ACE_TRY_ENV);
-   }
- 
-   CORBA_Object*
--  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_upcast (void *src) const
-+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_upcast (void *src) const
-   {
--    IR::HomeDef **tmp = ACE_static_cast (IR::HomeDef**, src);
-+    IR_HomeDef **tmp = ACE_static_cast (IR_HomeDef**, src);
-     return *tmp;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_HOMEDEFSEQ_CS_)
--#define _IR_HOMEDEFSEQ_CS_
--
- // *************************************************************
--// IR::HomeDefSeq
-+// IR_HomeDefSeq
- // *************************************************************
- 
--IR::HomeDefSeq::HomeDefSeq (void)
-+IR_HomeDefSeq::IR_HomeDefSeq (void)
- {}
--IR::HomeDefSeq::HomeDefSeq (CORBA::ULong max) // uses max size
-+IR_HomeDefSeq::IR_HomeDefSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::HomeDef,IR::HomeDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_HomeDef,IR_HomeDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::HomeDefSeq::HomeDefSeq (CORBA::ULong max, CORBA::ULong length, IR::HomeDef_ptr *buffer, CORBA::Boolean release)
-+IR_HomeDefSeq::IR_HomeDefSeq (CORBA::ULong max, CORBA::ULong length, IR_HomeDef_ptr *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::HomeDef,IR::HomeDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_HomeDef,IR_HomeDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::HomeDefSeq::HomeDefSeq (const HomeDefSeq &seq) // copy ctor
-+IR_HomeDefSeq::IR_HomeDefSeq (const IR_HomeDefSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::HomeDef,IR::HomeDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_HomeDef,IR_HomeDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::HomeDefSeq::~HomeDefSeq (void) // dtor
-+IR_HomeDefSeq::~IR_HomeDefSeq (void) // dtor
- {}
--void IR::HomeDefSeq::_tao_any_destructor (void *x)
-+void IR_HomeDefSeq::_tao_any_destructor (void *x)
- {
--  HomeDefSeq *tmp = ACE_static_cast (HomeDefSeq*,x);
-+  IR_HomeDefSeq *tmp = ACE_static_cast (IR_HomeDefSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_HomeDefSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f48), ACE_NTOHL (0x6f6d6544), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/HomeDefSeq:1.0
--  11, ACE_NTOHL (0x486f6d65), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000),  // name = HomeDefSeq
-+  11, ACE_NTOHL (0x486f6d65), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000),  // name = IR_HomeDefSeq
-   CORBA::tk_sequence, // typecode kind
-   64, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -4617,12 +4440,12 @@
-     48, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f48), ACE_NTOHL (0x6f6d6544), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/HomeDef:1.0
--      8, ACE_NTOHL (0x486f6d65), ACE_NTOHL (0x44656600),  // name = HomeDef
-+      8, ACE_NTOHL (0x486f6d65), ACE_NTOHL (0x44656600),  // name = IR_HomeDef
- 
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_HomeDefSeq (CORBA::tk_alias, sizeof (_oc_IR_HomeDefSeq), (char *) &_oc_IR_HomeDefSeq, 0, sizeof (IR::HomeDefSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_HomeDefSeq (CORBA::tk_alias, sizeof (_oc_IR_HomeDefSeq), (char *) &_oc_IR_HomeDefSeq, 0, sizeof (IR_HomeDefSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_HomeDefSeq, &_tc_TAO_tc_IR_HomeDefSeq)
-@@ -4630,22 +4453,19 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CS_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CS_
--
-   // The Base_Sequence functions, please see tao/Sequence.h
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::EmitsDef **tmp = 0;
-+    IR_EmitsDef **tmp = 0;
-     tmp = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::EmitsDef **old = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
-+      IR_EmitsDef **old = ACE_reinterpret_cast (IR_EmitsDef**, this->buffer_);
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         if (!this->release_)
--          tmp[i] = IR::EmitsDef::_duplicate (old[i]);
-+          tmp[i] = IR_EmitsDef::_duplicate (old[i]);
-         else
-           tmp[i] = old[i];
-         
-@@ -4657,111 +4477,102 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
--    IR::EmitsDef **tmp = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
-+    IR_EmitsDef **tmp = ACE_reinterpret_cast (IR_EmitsDef**, this->buffer_);
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::EmitsDef::_nil ();
-+      tmp[i] = IR_EmitsDef::_nil ();
-     }
-     _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   }
-   
--  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::~_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::~_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
-   {
-     this->_deallocate_buffer ();
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-   {
--    IR::EmitsDef **tmp = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
-+    IR_EmitsDef **tmp = ACE_reinterpret_cast (IR_EmitsDef**, this->buffer_);
-     
-     for (CORBA::ULong i = nl; i < ol; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::EmitsDef::_nil ();
-+      tmp[i] = IR_EmitsDef::_nil ();
-     }
-   }
-   void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_downcast (
-+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_downcast (
-       void* target,
-       CORBA_Object *src,
-       CORBA_Environment &ACE_TRY_ENV
-     )
-   {
--    IR::EmitsDef **tmp = ACE_static_cast (IR::EmitsDef**, target);
--    *tmp = IR::EmitsDef::_narrow (src, ACE_TRY_ENV);
-+    IR_EmitsDef **tmp = ACE_static_cast (IR_EmitsDef**, target);
-+    *tmp = IR_EmitsDef::_narrow (src, ACE_TRY_ENV);
-   }
- 
-   CORBA_Object*
--  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_upcast (void *src) const
-+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_upcast (void *src) const
-   {
--    IR::EmitsDef **tmp = ACE_static_cast (IR::EmitsDef**, src);
-+    IR_EmitsDef **tmp = ACE_static_cast (IR_EmitsDef**, src);
-     return *tmp;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_EMITSDEFSEQ_CS_)
--#define _IR_EMITSDEFSEQ_CS_
--
- // *************************************************************
--// IR::EmitsDefSeq
-+// IR_EmitsDefSeq
- // *************************************************************
- 
--IR::EmitsDefSeq::EmitsDefSeq (void)
-+IR_EmitsDefSeq::IR_EmitsDefSeq (void)
- {}
--IR::EmitsDefSeq::EmitsDefSeq (CORBA::ULong max) // uses max size
-+IR_EmitsDefSeq::IR_EmitsDefSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::EmitsDef,IR::EmitsDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_EmitsDef,IR_EmitsDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::EmitsDefSeq::EmitsDefSeq (CORBA::ULong max, CORBA::ULong length, IR::EmitsDef_ptr *buffer, CORBA::Boolean release)
-+IR_EmitsDefSeq::IR_EmitsDefSeq (CORBA::ULong max, CORBA::ULong length, IR_EmitsDef_ptr *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::EmitsDef,IR::EmitsDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_EmitsDef,IR_EmitsDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::EmitsDefSeq::EmitsDefSeq (const EmitsDefSeq &seq) // copy ctor
-+IR_EmitsDefSeq::IR_EmitsDefSeq (const IR_EmitsDefSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::EmitsDef,IR::EmitsDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_EmitsDef,IR_EmitsDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::EmitsDefSeq::~EmitsDefSeq (void) // dtor
-+IR_EmitsDefSeq::~IR_EmitsDefSeq (void) // dtor
- {}
--void IR::EmitsDefSeq::_tao_any_destructor (void *x)
-+void IR_EmitsDefSeq::_tao_any_destructor (void *x)
- {
--  EmitsDefSeq *tmp = ACE_static_cast (EmitsDefSeq*,x);
-+  IR_EmitsDefSeq *tmp = ACE_static_cast (IR_EmitsDefSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_EmitsDefSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/EmitsDefSeq:1.0
--  12, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x53657100),  // name = EmitsDefSeq
-+  12, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x53657100),  // name = IR_EmitsDefSeq
-   CORBA::tk_sequence, // typecode kind
-   68, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -4769,12 +4580,12 @@
-     52, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/EmitsDef:1.0
--      9, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0),  // name = EmitsDef
-+      9, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0),  // name = IR_EmitsDef
- 
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_EmitsDefSeq (CORBA::tk_alias, sizeof (_oc_IR_EmitsDefSeq), (char *) &_oc_IR_EmitsDefSeq, 0, sizeof (IR::EmitsDefSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_EmitsDefSeq (CORBA::tk_alias, sizeof (_oc_IR_EmitsDefSeq), (char *) &_oc_IR_EmitsDefSeq, 0, sizeof (IR_EmitsDefSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EmitsDefSeq, &_tc_TAO_tc_IR_EmitsDefSeq)
-@@ -4782,22 +4593,19 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CS_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CS_
--
-   // The Base_Sequence functions, please see tao/Sequence.h
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::PublishesDef **tmp = 0;
-+    IR_PublishesDef **tmp = 0;
-     tmp = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::PublishesDef **old = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
-+      IR_PublishesDef **old = ACE_reinterpret_cast (IR_PublishesDef**, this->buffer_);
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         if (!this->release_)
--          tmp[i] = IR::PublishesDef::_duplicate (old[i]);
-+          tmp[i] = IR_PublishesDef::_duplicate (old[i]);
-         else
-           tmp[i] = old[i];
-         
-@@ -4809,111 +4617,102 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
--    IR::PublishesDef **tmp = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
-+    IR_PublishesDef **tmp = ACE_reinterpret_cast (IR_PublishesDef**, this->buffer_);
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::PublishesDef::_nil ();
-+      tmp[i] = IR_PublishesDef::_nil ();
-     }
-     _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   }
-   
--  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
-   {
-     this->_deallocate_buffer ();
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-   {
--    IR::PublishesDef **tmp = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
-+    IR_PublishesDef **tmp = ACE_reinterpret_cast (IR_PublishesDef**, this->buffer_);
-     
-     for (CORBA::ULong i = nl; i < ol; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::PublishesDef::_nil ();
-+      tmp[i] = IR_PublishesDef::_nil ();
-     }
-   }
-   void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_downcast (
-+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_downcast (
-       void* target,
-       CORBA_Object *src,
-       CORBA_Environment &ACE_TRY_ENV
-     )
-   {
--    IR::PublishesDef **tmp = ACE_static_cast (IR::PublishesDef**, target);
--    *tmp = IR::PublishesDef::_narrow (src, ACE_TRY_ENV);
-+    IR_PublishesDef **tmp = ACE_static_cast (IR_PublishesDef**, target);
-+    *tmp = IR_PublishesDef::_narrow (src, ACE_TRY_ENV);
-   }
- 
-   CORBA_Object*
--  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_upcast (void *src) const
-+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_upcast (void *src) const
-   {
--    IR::PublishesDef **tmp = ACE_static_cast (IR::PublishesDef**, src);
-+    IR_PublishesDef **tmp = ACE_static_cast (IR_PublishesDef**, src);
-     return *tmp;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_PUBLISHESDEFSEQ_CS_)
--#define _IR_PUBLISHESDEFSEQ_CS_
--
- // *************************************************************
--// IR::PublishesDefSeq
-+// IR_PublishesDefSeq
- // *************************************************************
- 
--IR::PublishesDefSeq::PublishesDefSeq (void)
-+IR_PublishesDefSeq::IR_PublishesDefSeq (void)
- {}
--IR::PublishesDefSeq::PublishesDefSeq (CORBA::ULong max) // uses max size
-+IR_PublishesDefSeq::IR_PublishesDefSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::PublishesDef,IR::PublishesDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_PublishesDef,IR_PublishesDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::PublishesDefSeq::PublishesDefSeq (CORBA::ULong max, CORBA::ULong length, IR::PublishesDef_ptr *buffer, CORBA::Boolean release)
-+IR_PublishesDefSeq::IR_PublishesDefSeq (CORBA::ULong max, CORBA::ULong length, IR_PublishesDef_ptr *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::PublishesDef,IR::PublishesDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_PublishesDef,IR_PublishesDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::PublishesDefSeq::PublishesDefSeq (const PublishesDefSeq &seq) // copy ctor
-+IR_PublishesDefSeq::IR_PublishesDefSeq (const IR_PublishesDefSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::PublishesDef,IR::PublishesDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_PublishesDef,IR_PublishesDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::PublishesDefSeq::~PublishesDefSeq (void) // dtor
-+IR_PublishesDefSeq::~IR_PublishesDefSeq (void) // dtor
- {}
--void IR::PublishesDefSeq::_tao_any_destructor (void *x)
-+void IR_PublishesDefSeq::_tao_any_destructor (void *x)
- {
--  PublishesDefSeq *tmp = ACE_static_cast (PublishesDefSeq*,x);
-+  IR_PublishesDefSeq *tmp = ACE_static_cast (IR_PublishesDefSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_PublishesDefSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/PublishesDefSeq:1.0
--  16, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x53657100),  // name = PublishesDefSeq
-+  16, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x53657100),  // name = IR_PublishesDefSeq
-   CORBA::tk_sequence, // typecode kind
-   76, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -4921,12 +4720,12 @@
-     60, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/PublishesDef:1.0
--      13, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0),  // name = PublishesDef
-+      13, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0),  // name = IR_PublishesDef
- 
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_PublishesDefSeq (CORBA::tk_alias, sizeof (_oc_IR_PublishesDefSeq), (char *) &_oc_IR_PublishesDefSeq, 0, sizeof (IR::PublishesDefSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_PublishesDefSeq (CORBA::tk_alias, sizeof (_oc_IR_PublishesDefSeq), (char *) &_oc_IR_PublishesDefSeq, 0, sizeof (IR_PublishesDefSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PublishesDefSeq, &_tc_TAO_tc_IR_PublishesDefSeq)
-@@ -4934,22 +4733,19 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CS_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CS_
--
-   // The Base_Sequence functions, please see tao/Sequence.h
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::ConsumesDef **tmp = 0;
-+    IR_ConsumesDef **tmp = 0;
-     tmp = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::ConsumesDef **old = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
-+      IR_ConsumesDef **old = ACE_reinterpret_cast (IR_ConsumesDef**, this->buffer_);
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         if (!this->release_)
--          tmp[i] = IR::ConsumesDef::_duplicate (old[i]);
-+          tmp[i] = IR_ConsumesDef::_duplicate (old[i]);
-         else
-           tmp[i] = old[i];
-         
-@@ -4961,111 +4757,102 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
--    IR::ConsumesDef **tmp = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
-+    IR_ConsumesDef **tmp = ACE_reinterpret_cast (IR_ConsumesDef**, this->buffer_);
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::ConsumesDef::_nil ();
-+      tmp[i] = IR_ConsumesDef::_nil ();
-     }
-     _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   }
-   
--  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
-   {
-     this->_deallocate_buffer ();
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-   {
--    IR::ConsumesDef **tmp = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
-+    IR_ConsumesDef **tmp = ACE_reinterpret_cast (IR_ConsumesDef**, this->buffer_);
-     
-     for (CORBA::ULong i = nl; i < ol; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::ConsumesDef::_nil ();
-+      tmp[i] = IR_ConsumesDef::_nil ();
-     }
-   }
-   void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_downcast (
-+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_downcast (
-       void* target,
-       CORBA_Object *src,
-       CORBA_Environment &ACE_TRY_ENV
-     )
-   {
--    IR::ConsumesDef **tmp = ACE_static_cast (IR::ConsumesDef**, target);
--    *tmp = IR::ConsumesDef::_narrow (src, ACE_TRY_ENV);
-+    IR_ConsumesDef **tmp = ACE_static_cast (IR_ConsumesDef**, target);
-+    *tmp = IR_ConsumesDef::_narrow (src, ACE_TRY_ENV);
-   }
- 
-   CORBA_Object*
--  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_upcast (void *src) const
-+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_upcast (void *src) const
-   {
--    IR::ConsumesDef **tmp = ACE_static_cast (IR::ConsumesDef**, src);
-+    IR_ConsumesDef **tmp = ACE_static_cast (IR_ConsumesDef**, src);
-     return *tmp;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_CONSUMESDEFSEQ_CS_)
--#define _IR_CONSUMESDEFSEQ_CS_
--
- // *************************************************************
--// IR::ConsumesDefSeq
-+// IR_ConsumesDefSeq
- // *************************************************************
- 
--IR::ConsumesDefSeq::ConsumesDefSeq (void)
-+IR_ConsumesDefSeq::IR_ConsumesDefSeq (void)
- {}
--IR::ConsumesDefSeq::ConsumesDefSeq (CORBA::ULong max) // uses max size
-+IR_ConsumesDefSeq::IR_ConsumesDefSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::ConsumesDef,IR::ConsumesDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ConsumesDef,IR_ConsumesDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::ConsumesDefSeq::ConsumesDefSeq (CORBA::ULong max, CORBA::ULong length, IR::ConsumesDef_ptr *buffer, CORBA::Boolean release)
-+IR_ConsumesDefSeq::IR_ConsumesDefSeq (CORBA::ULong max, CORBA::ULong length, IR_ConsumesDef_ptr *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::ConsumesDef,IR::ConsumesDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ConsumesDef,IR_ConsumesDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::ConsumesDefSeq::ConsumesDefSeq (const ConsumesDefSeq &seq) // copy ctor
-+IR_ConsumesDefSeq::IR_ConsumesDefSeq (const IR_ConsumesDefSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::ConsumesDef,IR::ConsumesDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ConsumesDef,IR_ConsumesDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::ConsumesDefSeq::~ConsumesDefSeq (void) // dtor
-+IR_ConsumesDefSeq::~IR_ConsumesDefSeq (void) // dtor
- {}
--void IR::ConsumesDefSeq::_tao_any_destructor (void *x)
-+void IR_ConsumesDefSeq::_tao_any_destructor (void *x)
- {
--  ConsumesDefSeq *tmp = ACE_static_cast (ConsumesDefSeq*,x);
-+  IR_ConsumesDefSeq *tmp = ACE_static_cast (IR_ConsumesDefSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_ConsumesDefSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7375), ACE_NTOHL (0x6d657344), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/ConsumesDefSeq:1.0
--  15, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000),  // name = ConsumesDefSeq
-+  15, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000),  // name = IR_ConsumesDefSeq
-   CORBA::tk_sequence, // typecode kind
-   72, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -5073,12 +4860,12 @@
-     56, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7375), ACE_NTOHL (0x6d657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ConsumesDef:1.0
--      12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656600),  // name = ConsumesDef
-+      12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656600),  // name = IR_ConsumesDef
- 
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ConsumesDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ConsumesDefSeq), (char *) &_oc_IR_ConsumesDefSeq, 0, sizeof (IR::ConsumesDefSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ConsumesDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ConsumesDefSeq), (char *) &_oc_IR_ConsumesDefSeq, 0, sizeof (IR_ConsumesDefSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConsumesDefSeq, &_tc_TAO_tc_IR_ConsumesDefSeq)
-@@ -5086,22 +4873,19 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CS_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CS_
--
-   // The Base_Sequence functions, please see tao/Sequence.h
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::FactoryDef **tmp = 0;
-+    IR_FactoryDef **tmp = 0;
-     tmp = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::FactoryDef **old = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
-+      IR_FactoryDef **old = ACE_reinterpret_cast (IR_FactoryDef**, this->buffer_);
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         if (!this->release_)
--          tmp[i] = IR::FactoryDef::_duplicate (old[i]);
-+          tmp[i] = IR_FactoryDef::_duplicate (old[i]);
-         else
-           tmp[i] = old[i];
-         
-@@ -5113,111 +4897,102 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
--    IR::FactoryDef **tmp = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
-+    IR_FactoryDef **tmp = ACE_reinterpret_cast (IR_FactoryDef**, this->buffer_);
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::FactoryDef::_nil ();
-+      tmp[i] = IR_FactoryDef::_nil ();
-     }
-     _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   }
-   
--  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::~_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::~_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
-   {
-     this->_deallocate_buffer ();
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-   {
--    IR::FactoryDef **tmp = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
-+    IR_FactoryDef **tmp = ACE_reinterpret_cast (IR_FactoryDef**, this->buffer_);
-     
-     for (CORBA::ULong i = nl; i < ol; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::FactoryDef::_nil ();
-+      tmp[i] = IR_FactoryDef::_nil ();
-     }
-   }
-   void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_downcast (
-+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_downcast (
-       void* target,
-       CORBA_Object *src,
-       CORBA_Environment &ACE_TRY_ENV
-     )
-   {
--    IR::FactoryDef **tmp = ACE_static_cast (IR::FactoryDef**, target);
--    *tmp = IR::FactoryDef::_narrow (src, ACE_TRY_ENV);
-+    IR_FactoryDef **tmp = ACE_static_cast (IR_FactoryDef**, target);
-+    *tmp = IR_FactoryDef::_narrow (src, ACE_TRY_ENV);
-   }
- 
-   CORBA_Object*
--  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_upcast (void *src) const
-+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_upcast (void *src) const
-   {
--    IR::FactoryDef **tmp = ACE_static_cast (IR::FactoryDef**, src);
-+    IR_FactoryDef **tmp = ACE_static_cast (IR_FactoryDef**, src);
-     return *tmp;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_FACTORYDEFSEQ_CS_)
--#define _IR_FACTORYDEFSEQ_CS_
--
- // *************************************************************
--// IR::FactoryDefSeq
-+// IR_FactoryDefSeq
- // *************************************************************
- 
--IR::FactoryDefSeq::FactoryDefSeq (void)
-+IR_FactoryDefSeq::IR_FactoryDefSeq (void)
- {}
--IR::FactoryDefSeq::FactoryDefSeq (CORBA::ULong max) // uses max size
-+IR_FactoryDefSeq::IR_FactoryDefSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::FactoryDef,IR::FactoryDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_FactoryDef,IR_FactoryDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::FactoryDefSeq::FactoryDefSeq (CORBA::ULong max, CORBA::ULong length, IR::FactoryDef_ptr *buffer, CORBA::Boolean release)
-+IR_FactoryDefSeq::IR_FactoryDefSeq (CORBA::ULong max, CORBA::ULong length, IR_FactoryDef_ptr *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::FactoryDef,IR::FactoryDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_FactoryDef,IR_FactoryDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::FactoryDefSeq::FactoryDefSeq (const FactoryDefSeq &seq) // copy ctor
-+IR_FactoryDefSeq::IR_FactoryDefSeq (const IR_FactoryDefSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::FactoryDef,IR::FactoryDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_FactoryDef,IR_FactoryDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::FactoryDefSeq::~FactoryDefSeq (void) // dtor
-+IR_FactoryDefSeq::~IR_FactoryDefSeq (void) // dtor
- {}
--void IR::FactoryDefSeq::_tao_any_destructor (void *x)
-+void IR_FactoryDefSeq::_tao_any_destructor (void *x)
- {
--  FactoryDefSeq *tmp = ACE_static_cast (FactoryDefSeq*,x);
-+  IR_FactoryDefSeq *tmp = ACE_static_cast (IR_FactoryDefSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_FactoryDefSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72794465), ACE_NTOHL (0x66536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FactoryDefSeq:1.0
--  14, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65665365), ACE_NTOHL (0x71000000),  // name = FactoryDefSeq
-+  14, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65665365), ACE_NTOHL (0x71000000),  // name = IR_FactoryDefSeq
-   CORBA::tk_sequence, // typecode kind
-   72, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -5225,12 +5000,12 @@
-     56, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72794465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/FactoryDef:1.0
--      11, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65660000),  // name = FactoryDef
-+      11, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65660000),  // name = IR_FactoryDef
- 
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_FactoryDefSeq (CORBA::tk_alias, sizeof (_oc_IR_FactoryDefSeq), (char *) &_oc_IR_FactoryDefSeq, 0, sizeof (IR::FactoryDefSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_FactoryDefSeq (CORBA::tk_alias, sizeof (_oc_IR_FactoryDefSeq), (char *) &_oc_IR_FactoryDefSeq, 0, sizeof (IR_FactoryDefSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FactoryDefSeq, &_tc_TAO_tc_IR_FactoryDefSeq)
-@@ -5238,22 +5013,19 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CS_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CS_
--
-   // The Base_Sequence functions, please see tao/Sequence.h
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::FinderDef **tmp = 0;
-+    IR_FinderDef **tmp = 0;
-     tmp = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::FinderDef **old = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
-+      IR_FinderDef **old = ACE_reinterpret_cast (IR_FinderDef**, this->buffer_);
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         if (!this->release_)
--          tmp[i] = IR::FinderDef::_duplicate (old[i]);
-+          tmp[i] = IR_FinderDef::_duplicate (old[i]);
-         else
-           tmp[i] = old[i];
-         
-@@ -5265,111 +5037,102 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
--    IR::FinderDef **tmp = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
-+    IR_FinderDef **tmp = ACE_reinterpret_cast (IR_FinderDef**, this->buffer_);
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::FinderDef::_nil ();
-+      tmp[i] = IR_FinderDef::_nil ();
-     }
-     _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   }
-   
--  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::~_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::~_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
-   {
-     this->_deallocate_buffer ();
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-   {
--    IR::FinderDef **tmp = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
-+    IR_FinderDef **tmp = ACE_reinterpret_cast (IR_FinderDef**, this->buffer_);
-     
-     for (CORBA::ULong i = nl; i < ol; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::FinderDef::_nil ();
-+      tmp[i] = IR_FinderDef::_nil ();
-     }
-   }
-   void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_downcast (
-+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_downcast (
-       void* target,
-       CORBA_Object *src,
-       CORBA_Environment &ACE_TRY_ENV
-     )
-   {
--    IR::FinderDef **tmp = ACE_static_cast (IR::FinderDef**, target);
--    *tmp = IR::FinderDef::_narrow (src, ACE_TRY_ENV);
-+    IR_FinderDef **tmp = ACE_static_cast (IR_FinderDef**, target);
-+    *tmp = IR_FinderDef::_narrow (src, ACE_TRY_ENV);
-   }
- 
-   CORBA_Object*
--  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_upcast (void *src) const
-+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_upcast (void *src) const
-   {
--    IR::FinderDef **tmp = ACE_static_cast (IR::FinderDef**, src);
-+    IR_FinderDef **tmp = ACE_static_cast (IR_FinderDef**, src);
-     return *tmp;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_FINDERDEFSEQ_CS_)
--#define _IR_FINDERDEFSEQ_CS_
--
- // *************************************************************
--// IR::FinderDefSeq
-+// IR_FinderDefSeq
- // *************************************************************
- 
--IR::FinderDefSeq::FinderDefSeq (void)
-+IR_FinderDefSeq::IR_FinderDefSeq (void)
- {}
--IR::FinderDefSeq::FinderDefSeq (CORBA::ULong max) // uses max size
-+IR_FinderDefSeq::IR_FinderDefSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::FinderDef,IR::FinderDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_FinderDef,IR_FinderDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::FinderDefSeq::FinderDefSeq (CORBA::ULong max, CORBA::ULong length, IR::FinderDef_ptr *buffer, CORBA::Boolean release)
-+IR_FinderDefSeq::IR_FinderDefSeq (CORBA::ULong max, CORBA::ULong length, IR_FinderDef_ptr *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::FinderDef,IR::FinderDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_FinderDef,IR_FinderDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::FinderDefSeq::FinderDefSeq (const FinderDefSeq &seq) // copy ctor
-+IR_FinderDefSeq::IR_FinderDefSeq (const IR_FinderDefSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::FinderDef,IR::FinderDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_FinderDef,IR_FinderDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::FinderDefSeq::~FinderDefSeq (void) // dtor
-+IR_FinderDefSeq::~IR_FinderDefSeq (void) // dtor
- {}
--void IR::FinderDefSeq::_tao_any_destructor (void *x)
-+void IR_FinderDefSeq::_tao_any_destructor (void *x)
- {
--  FinderDefSeq *tmp = ACE_static_cast (FinderDefSeq*,x);
-+  IR_FinderDefSeq *tmp = ACE_static_cast (IR_FinderDefSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_FinderDefSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x696e6465), ACE_NTOHL (0x72446566), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/FinderDefSeq:1.0
--  13, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66536571), ACE_NTOHL (0x0),  // name = FinderDefSeq
-+  13, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66536571), ACE_NTOHL (0x0),  // name = IR_FinderDefSeq
-   CORBA::tk_sequence, // typecode kind
-   72, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -5377,12 +5140,12 @@
-     56, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x696e6465), ACE_NTOHL (0x72446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FinderDef:1.0
--      10, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66000000),  // name = FinderDef
-+      10, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66000000),  // name = IR_FinderDef
- 
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_FinderDefSeq (CORBA::tk_alias, sizeof (_oc_IR_FinderDefSeq), (char *) &_oc_IR_FinderDefSeq, 0, sizeof (IR::FinderDefSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_FinderDefSeq (CORBA::tk_alias, sizeof (_oc_IR_FinderDefSeq), (char *) &_oc_IR_FinderDefSeq, 0, sizeof (IR_FinderDefSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FinderDefSeq, &_tc_TAO_tc_IR_FinderDefSeq)
-@@ -5390,22 +5153,19 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CS_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CS_
--
-   // The Base_Sequence functions, please see tao/Sequence.h
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::Contained **tmp = 0;
-+    IR_Contained **tmp = 0;
-     tmp = _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::Contained **old = ACE_reinterpret_cast (IR::Contained**, this->buffer_);
-+      IR_Contained **old = ACE_reinterpret_cast (IR_Contained**, this->buffer_);
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         if (!this->release_)
--          tmp[i] = IR::Contained::_duplicate (old[i]);
-+          tmp[i] = IR_Contained::_duplicate (old[i]);
-         else
-           tmp[i] = old[i];
-         
-@@ -5417,111 +5177,102 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
--    IR::Contained **tmp = ACE_reinterpret_cast (IR::Contained**, this->buffer_);
-+    IR_Contained **tmp = ACE_reinterpret_cast (IR_Contained**, this->buffer_);
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::Contained::_nil ();
-+      tmp[i] = IR_Contained::_nil ();
-     }
-     _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   }
-   
--  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::~_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::~_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (void)
-   {
-     this->_deallocate_buffer ();
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-+  _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-   {
--    IR::Contained **tmp = ACE_reinterpret_cast (IR::Contained**, this->buffer_);
-+    IR_Contained **tmp = ACE_reinterpret_cast (IR_Contained**, this->buffer_);
-     
-     for (CORBA::ULong i = nl; i < ol; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::Contained::_nil ();
-+      tmp[i] = IR_Contained::_nil ();
-     }
-   }
-   void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_downcast (
-+  _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_downcast (
-       void* target,
-       CORBA_Object *src,
-       CORBA_Environment &ACE_TRY_ENV
-     )
-   {
--    IR::Contained **tmp = ACE_static_cast (IR::Contained**, target);
--    *tmp = IR::Contained::_narrow (src, ACE_TRY_ENV);
-+    IR_Contained **tmp = ACE_static_cast (IR_Contained**, target);
-+    *tmp = IR_Contained::_narrow (src, ACE_TRY_ENV);
-   }
- 
-   CORBA_Object*
--  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_upcast (void *src) const
-+  _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_upcast (void *src) const
-   {
--    IR::Contained **tmp = ACE_static_cast (IR::Contained**, src);
-+    IR_Contained **tmp = ACE_static_cast (IR_Contained**, src);
-     return *tmp;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_CONTAINEDSEQ_CS_)
--#define _IR_CONTAINEDSEQ_CS_
--
- // *************************************************************
--// IR::ContainedSeq
-+// IR_ContainedSeq
- // *************************************************************
- 
--IR::ContainedSeq::ContainedSeq (void)
-+IR_ContainedSeq::IR_ContainedSeq (void)
- {}
--IR::ContainedSeq::ContainedSeq (CORBA::ULong max) // uses max size
-+IR_ContainedSeq::IR_ContainedSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ContainedSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::Contained,IR::Contained_var>
-+  TAO_Unbounded_Object_Sequence<IR_Contained,IR_Contained_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::ContainedSeq::ContainedSeq (CORBA::ULong max, CORBA::ULong length, IR::Contained_ptr *buffer, CORBA::Boolean release)
-+IR_ContainedSeq::IR_ContainedSeq (CORBA::ULong max, CORBA::ULong length, IR_Contained_ptr *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ContainedSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::Contained,IR::Contained_var>
-+  TAO_Unbounded_Object_Sequence<IR_Contained,IR_Contained_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::ContainedSeq::ContainedSeq (const ContainedSeq &seq) // copy ctor
-+IR_ContainedSeq::IR_ContainedSeq (const IR_ContainedSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ContainedSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::Contained,IR::Contained_var>
-+  TAO_Unbounded_Object_Sequence<IR_Contained,IR_Contained_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::ContainedSeq::~ContainedSeq (void) // dtor
-+IR_ContainedSeq::~IR_ContainedSeq (void) // dtor
- {}
--void IR::ContainedSeq::_tao_any_destructor (void *x)
-+void IR_ContainedSeq::_tao_any_destructor (void *x)
- {
--  ContainedSeq *tmp = ACE_static_cast (ContainedSeq*,x);
-+  IR_ContainedSeq *tmp = ACE_static_cast (IR_ContainedSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_ContainedSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/ContainedSeq:1.0
--  13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0),  // name = ContainedSeq
-+  13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0),  // name = IR_ContainedSeq
-   CORBA::tk_sequence, // typecode kind
-   72, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -5529,21 +5280,22 @@
-     56, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/Contained:1.0
--      10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000),  // name = Contained
-+      10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000),  // name = IR_Contained
- 
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ContainedSeq (CORBA::tk_alias, sizeof (_oc_IR_ContainedSeq), (char *) &_oc_IR_ContainedSeq, 0, sizeof (IR::ContainedSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ContainedSeq (CORBA::tk_alias, sizeof (_oc_IR_ContainedSeq), (char *) &_oc_IR_ContainedSeq, 0, sizeof (IR_ContainedSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContainedSeq, &_tc_TAO_tc_IR_ContainedSeq)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_StructMember[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x6265723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/StructMember:1.0
--  13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0),  // name = StructMember
-+  13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0),  // name = IR_StructMember
-   3, // member count
-   5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-   CORBA::tk_alias, // typecode kind for typedefs
-@@ -5562,35 +5314,32 @@
-   48, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--    8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+    8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_StructMember (CORBA::tk_struct, sizeof (_oc_IR_StructMember), (char *) &_oc_IR_StructMember, 0, sizeof (IR::StructMember));
-+static CORBA::TypeCode _tc_TAO_tc_IR_StructMember (CORBA::tk_struct, sizeof (_oc_IR_StructMember), (char *) &_oc_IR_StructMember, 0, sizeof (IR_StructMember));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StructMember, &_tc_TAO_tc_IR_StructMember)
- TAO_NAMESPACE_END
--void IR::StructMember::_tao_any_destructor (void *x)
-+
-+void IR_StructMember::_tao_any_destructor (void *x)
- {
--  StructMember *tmp = ACE_static_cast (StructMember*,x);
-+  IR_StructMember *tmp = ACE_static_cast (IR_StructMember*,x);
-   delete tmp;
- }
- 
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CS_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CS_
--
-   void
--  IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Sequence_IR_StructMemberSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::StructMember* tmp = 0;
-+    IR_StructMember* tmp = 0;
-     tmp = _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::StructMember *old = ACE_reinterpret_cast (IR::StructMember *,this->buffer_);
-+      IR_StructMember *old = ACE_reinterpret_cast (IR_StructMember *,this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp[i] = old[i];
-@@ -5603,80 +5352,70 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Sequence_IR_StructMemberSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
-     
--    IR::StructMember *tmp = ACE_reinterpret_cast (IR::StructMember *,this->buffer_);
-+    IR_StructMember *tmp = ACE_reinterpret_cast (IR_StructMember *,this->buffer_);
-     
-     _TAO_Unbounded_Sequence_IR_StructMemberSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   } 
-   
--  IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::~_TAO_Unbounded_Sequence_IR_StructMemberSeq (void) // Dtor.
-+  _TAO_Unbounded_Sequence_IR_StructMemberSeq::~_TAO_Unbounded_Sequence_IR_StructMemberSeq (void) // Dtor.
-   {
-     this->_deallocate_buffer ();
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_STRUCTMEMBERSEQ_CS_)
--#define _IR_STRUCTMEMBERSEQ_CS_
--
- // *************************************************************
--// IR::StructMemberSeq
-+// IR_StructMemberSeq
- // *************************************************************
- 
--IR::StructMemberSeq::StructMemberSeq (void)
-+IR_StructMemberSeq::IR_StructMemberSeq (void)
- {}
--IR::StructMemberSeq::StructMemberSeq (CORBA::ULong max) // uses max size
-+IR_StructMemberSeq::IR_StructMemberSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_StructMemberSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::StructMember>
-+  TAO_Unbounded_Sequence<IR_StructMember>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::StructMemberSeq::StructMemberSeq (CORBA::ULong max, CORBA::ULong length, IR::StructMember *buffer, CORBA::Boolean release)
-+IR_StructMemberSeq::IR_StructMemberSeq (CORBA::ULong max, CORBA::ULong length, IR_StructMember *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_StructMemberSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::StructMember>
-+  TAO_Unbounded_Sequence<IR_StructMember>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::StructMemberSeq::StructMemberSeq (const StructMemberSeq &seq) // copy ctor
-+IR_StructMemberSeq::IR_StructMemberSeq (const IR_StructMemberSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_StructMemberSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::StructMember>
-+  TAO_Unbounded_Sequence<IR_StructMember>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::StructMemberSeq::~StructMemberSeq (void) // dtor
-+IR_StructMemberSeq::~IR_StructMemberSeq (void) // dtor
- {}
--void IR::StructMemberSeq::_tao_any_destructor (void *x)
-+void IR_StructMemberSeq::_tao_any_destructor (void *x)
- {
--  StructMemberSeq *tmp = ACE_static_cast (StructMemberSeq*,x);
-+  IR_StructMemberSeq *tmp = ACE_static_cast (IR_StructMemberSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_StructMemberSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/StructMemberSeq:1.0
--  16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-+  16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100),  // name = IR_StructMemberSeq
-   CORBA::tk_sequence, // typecode kind
-   252, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -5684,7 +5423,7 @@
-     236, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x6265723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/StructMember:1.0
--      13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0),  // name = StructMember
-+      13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0),  // name = IR_StructMember
-       3, // member count
-       5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-       CORBA::tk_alias, // typecode kind for typedefs
-@@ -5703,29 +5442,30 @@
-       48, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--        8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+        8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
- 
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_StructMemberSeq (CORBA::tk_alias, sizeof (_oc_IR_StructMemberSeq), (char *) &_oc_IR_StructMemberSeq, 0, sizeof (IR::StructMemberSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_StructMemberSeq (CORBA::tk_alias, sizeof (_oc_IR_StructMemberSeq), (char *) &_oc_IR_StructMemberSeq, 0, sizeof (IR_StructMemberSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StructMemberSeq, &_tc_TAO_tc_IR_StructMemberSeq)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_Initializer[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x616c697a), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/Initializer:1.0
--  12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200),  // name = Initializer
-+  12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200),  // name = IR_Initializer
-   2, // member count
-   8, ACE_NTOHL (0x6d656d62), ACE_NTOHL (0x65727300),  // name = members
-   CORBA::tk_alias, // typecode kind for typedefs
-   324, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/StructMemberSeq:1.0
--    16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-+    16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100),  // name = IR_StructMemberSeq
-     CORBA::tk_sequence, // typecode kind
-     252, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -5733,7 +5473,7 @@
-       236, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x6265723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/StructMember:1.0
--        13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0),  // name = StructMember
-+        13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0),  // name = IR_StructMember
-         3, // member count
-         5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-         CORBA::tk_alias, // typecode kind for typedefs
-@@ -5752,7 +5492,7 @@
-         48, // encapsulation length
-           TAO_ENCAP_BYTE_ORDER, // byte order
-           27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--          8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+          8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
- 
-       0U,
-@@ -5768,32 +5508,29 @@
-     0U, // string length
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_Initializer (CORBA::tk_struct, sizeof (_oc_IR_Initializer), (char *) &_oc_IR_Initializer, 0, sizeof (IR::Initializer));
-+static CORBA::TypeCode _tc_TAO_tc_IR_Initializer (CORBA::tk_struct, sizeof (_oc_IR_Initializer), (char *) &_oc_IR_Initializer, 0, sizeof (IR_Initializer));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Initializer, &_tc_TAO_tc_IR_Initializer)
- TAO_NAMESPACE_END
--void IR::Initializer::_tao_any_destructor (void *x)
-+
-+void IR_Initializer::_tao_any_destructor (void *x)
- {
--  Initializer *tmp = ACE_static_cast (Initializer*,x);
-+  IR_Initializer *tmp = ACE_static_cast (IR_Initializer*,x);
-   delete tmp;
- }
- 
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CS_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CS_
--
-   void
--  IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Sequence_IR_InitializerSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::Initializer* tmp = 0;
-+    IR_Initializer* tmp = 0;
-     tmp = _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::Initializer *old = ACE_reinterpret_cast (IR::Initializer *,this->buffer_);
-+      IR_Initializer *old = ACE_reinterpret_cast (IR_Initializer *,this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp[i] = old[i];
-@@ -5806,80 +5543,70 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Sequence_IR_InitializerSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
-     
--    IR::Initializer *tmp = ACE_reinterpret_cast (IR::Initializer *,this->buffer_);
-+    IR_Initializer *tmp = ACE_reinterpret_cast (IR_Initializer *,this->buffer_);
-     
-     _TAO_Unbounded_Sequence_IR_InitializerSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   } 
-   
--  IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::~_TAO_Unbounded_Sequence_IR_InitializerSeq (void) // Dtor.
-+  _TAO_Unbounded_Sequence_IR_InitializerSeq::~_TAO_Unbounded_Sequence_IR_InitializerSeq (void) // Dtor.
-   {
-     this->_deallocate_buffer ();
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_INITIALIZERSEQ_CS_)
--#define _IR_INITIALIZERSEQ_CS_
--
- // *************************************************************
--// IR::InitializerSeq
-+// IR_InitializerSeq
- // *************************************************************
- 
--IR::InitializerSeq::InitializerSeq (void)
-+IR_InitializerSeq::IR_InitializerSeq (void)
- {}
--IR::InitializerSeq::InitializerSeq (CORBA::ULong max) // uses max size
-+IR_InitializerSeq::IR_InitializerSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_InitializerSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::Initializer>
-+  TAO_Unbounded_Sequence<IR_Initializer>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::InitializerSeq::InitializerSeq (CORBA::ULong max, CORBA::ULong length, IR::Initializer *buffer, CORBA::Boolean release)
-+IR_InitializerSeq::IR_InitializerSeq (CORBA::ULong max, CORBA::ULong length, IR_Initializer *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_InitializerSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::Initializer>
-+  TAO_Unbounded_Sequence<IR_Initializer>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::InitializerSeq::InitializerSeq (const InitializerSeq &seq) // copy ctor
-+IR_InitializerSeq::IR_InitializerSeq (const IR_InitializerSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_InitializerSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::Initializer>
-+  TAO_Unbounded_Sequence<IR_Initializer>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::InitializerSeq::~InitializerSeq (void) // dtor
-+IR_InitializerSeq::~IR_InitializerSeq (void) // dtor
- {}
--void IR::InitializerSeq::_tao_any_destructor (void *x)
-+void IR_InitializerSeq::_tao_any_destructor (void *x)
- {
--  InitializerSeq *tmp = ACE_static_cast (InitializerSeq*,x);
-+  IR_InitializerSeq *tmp = ACE_static_cast (IR_InitializerSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_InitializerSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x616c697a), ACE_NTOHL (0x65725365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/InitializerSeq:1.0
--  15, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657253), ACE_NTOHL (0x65710000),  // name = InitializerSeq
-+  15, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657253), ACE_NTOHL (0x65710000),  // name = IR_InitializerSeq
-   CORBA::tk_sequence, // typecode kind
-   504, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -5887,14 +5614,14 @@
-     488, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x616c697a), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/Initializer:1.0
--      12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200),  // name = Initializer
-+      12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200),  // name = IR_Initializer
-       2, // member count
-       8, ACE_NTOHL (0x6d656d62), ACE_NTOHL (0x65727300),  // name = members
-       CORBA::tk_alias, // typecode kind for typedefs
-       324, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/StructMemberSeq:1.0
--        16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-+        16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100),  // name = IR_StructMemberSeq
-         CORBA::tk_sequence, // typecode kind
-         252, // encapsulation length
-           TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -5902,7 +5629,7 @@
-           236, // encapsulation length
-             TAO_ENCAP_BYTE_ORDER, // byte order
-             32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x6265723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/StructMember:1.0
--            13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0),  // name = StructMember
-+            13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0),  // name = IR_StructMember
-             3, // member count
-             5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-             CORBA::tk_alias, // typecode kind for typedefs
-@@ -5921,7 +5648,7 @@
-             48, // encapsulation length
-               TAO_ENCAP_BYTE_ORDER, // byte order
-               27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--              8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+              8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
- 
-           0U,
-@@ -5940,16 +5667,17 @@
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_InitializerSeq (CORBA::tk_alias, sizeof (_oc_IR_InitializerSeq), (char *) &_oc_IR_InitializerSeq, 0, sizeof (IR::InitializerSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_InitializerSeq (CORBA::tk_alias, sizeof (_oc_IR_InitializerSeq), (char *) &_oc_IR_InitializerSeq, 0, sizeof (IR_InitializerSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InitializerSeq, &_tc_TAO_tc_IR_InitializerSeq)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_UnionMember[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UnionMember:1.0
--  12, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657200),  // name = UnionMember
-+  12, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657200),  // name = IR_UnionMember
-   4, // member count
-   5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-   CORBA::tk_alias, // typecode kind for typedefs
-@@ -5971,35 +5699,32 @@
-   48, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--    8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+    8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_UnionMember (CORBA::tk_struct, sizeof (_oc_IR_UnionMember), (char *) &_oc_IR_UnionMember, 0, sizeof (IR::UnionMember));
-+static CORBA::TypeCode _tc_TAO_tc_IR_UnionMember (CORBA::tk_struct, sizeof (_oc_IR_UnionMember), (char *) &_oc_IR_UnionMember, 0, sizeof (IR_UnionMember));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnionMember, &_tc_TAO_tc_IR_UnionMember)
- TAO_NAMESPACE_END
--void IR::UnionMember::_tao_any_destructor (void *x)
-+
-+void IR_UnionMember::_tao_any_destructor (void *x)
- {
--  UnionMember *tmp = ACE_static_cast (UnionMember*,x);
-+  IR_UnionMember *tmp = ACE_static_cast (IR_UnionMember*,x);
-   delete tmp;
- }
- 
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CS_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CS_
--
-   void
--  IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Sequence_IR_UnionMemberSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::UnionMember* tmp = 0;
-+    IR_UnionMember* tmp = 0;
-     tmp = _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::UnionMember *old = ACE_reinterpret_cast (IR::UnionMember *,this->buffer_);
-+      IR_UnionMember *old = ACE_reinterpret_cast (IR_UnionMember *,this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp[i] = old[i];
-@@ -6012,80 +5737,70 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Sequence_IR_UnionMemberSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
-     
--    IR::UnionMember *tmp = ACE_reinterpret_cast (IR::UnionMember *,this->buffer_);
-+    IR_UnionMember *tmp = ACE_reinterpret_cast (IR_UnionMember *,this->buffer_);
-     
-     _TAO_Unbounded_Sequence_IR_UnionMemberSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   } 
-   
--  IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::~_TAO_Unbounded_Sequence_IR_UnionMemberSeq (void) // Dtor.
-+  _TAO_Unbounded_Sequence_IR_UnionMemberSeq::~_TAO_Unbounded_Sequence_IR_UnionMemberSeq (void) // Dtor.
-   {
-     this->_deallocate_buffer ();
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_UNIONMEMBERSEQ_CS_)
--#define _IR_UNIONMEMBERSEQ_CS_
--
- // *************************************************************
--// IR::UnionMemberSeq
-+// IR_UnionMemberSeq
- // *************************************************************
- 
--IR::UnionMemberSeq::UnionMemberSeq (void)
-+IR_UnionMemberSeq::IR_UnionMemberSeq (void)
- {}
--IR::UnionMemberSeq::UnionMemberSeq (CORBA::ULong max) // uses max size
-+IR_UnionMemberSeq::IR_UnionMemberSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_UnionMemberSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::UnionMember>
-+  TAO_Unbounded_Sequence<IR_UnionMember>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::UnionMemberSeq::UnionMemberSeq (CORBA::ULong max, CORBA::ULong length, IR::UnionMember *buffer, CORBA::Boolean release)
-+IR_UnionMemberSeq::IR_UnionMemberSeq (CORBA::ULong max, CORBA::ULong length, IR_UnionMember *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_UnionMemberSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::UnionMember>
-+  TAO_Unbounded_Sequence<IR_UnionMember>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::UnionMemberSeq::UnionMemberSeq (const UnionMemberSeq &seq) // copy ctor
-+IR_UnionMemberSeq::IR_UnionMemberSeq (const IR_UnionMemberSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_UnionMemberSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::UnionMember>
-+  TAO_Unbounded_Sequence<IR_UnionMember>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::UnionMemberSeq::~UnionMemberSeq (void) // dtor
-+IR_UnionMemberSeq::~IR_UnionMemberSeq (void) // dtor
- {}
--void IR::UnionMemberSeq::_tao_any_destructor (void *x)
-+void IR_UnionMemberSeq::_tao_any_destructor (void *x)
- {
--  UnionMemberSeq *tmp = ACE_static_cast (UnionMemberSeq*,x);
-+  IR_UnionMemberSeq *tmp = ACE_static_cast (IR_UnionMemberSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_UnionMemberSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65725365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/UnionMemberSeq:1.0
--  15, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65710000),  // name = UnionMemberSeq
-+  15, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65710000),  // name = IR_UnionMemberSeq
-   CORBA::tk_sequence, // typecode kind
-   264, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -6093,7 +5808,7 @@
-     248, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UnionMember:1.0
--      12, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657200),  // name = UnionMember
-+      12, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657200),  // name = IR_UnionMember
-       4, // member count
-       5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-       CORBA::tk_alias, // typecode kind for typedefs
-@@ -6115,28 +5830,25 @@
-       48, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--        8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+        8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
- 
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_UnionMemberSeq (CORBA::tk_alias, sizeof (_oc_IR_UnionMemberSeq), (char *) &_oc_IR_UnionMemberSeq, 0, sizeof (IR::UnionMemberSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_UnionMemberSeq (CORBA::tk_alias, sizeof (_oc_IR_UnionMemberSeq), (char *) &_oc_IR_UnionMemberSeq, 0, sizeof (IR_UnionMemberSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnionMemberSeq, &_tc_TAO_tc_IR_UnionMemberSeq)
- TAO_NAMESPACE_END
- 
--#if !defined (_IR_ENUMMEMBERSEQ_CS_)
--#define _IR_ENUMMEMBERSEQ_CS_
--
- // *************************************************************
--// IR::EnumMemberSeq
-+// IR_EnumMemberSeq
- // *************************************************************
- 
--IR::EnumMemberSeq::EnumMemberSeq (void)
-+IR_EnumMemberSeq::IR_EnumMemberSeq (void)
- {}
--IR::EnumMemberSeq::EnumMemberSeq (CORBA::ULong max) // uses max size
-+IR_EnumMemberSeq::IR_EnumMemberSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_String_Sequence
-@@ -6145,7 +5857,7 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::EnumMemberSeq::EnumMemberSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-+IR_EnumMemberSeq::IR_EnumMemberSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_String_Sequence
-@@ -6154,7 +5866,7 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::EnumMemberSeq::EnumMemberSeq (const EnumMemberSeq &seq) // copy ctor
-+IR_EnumMemberSeq::IR_EnumMemberSeq (const IR_EnumMemberSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_String_Sequence
-@@ -6163,22 +5875,19 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::EnumMemberSeq::~EnumMemberSeq (void) // dtor
-+IR_EnumMemberSeq::~IR_EnumMemberSeq (void) // dtor
- {}
--void IR::EnumMemberSeq::_tao_any_destructor (void *x)
-+void IR_EnumMemberSeq::_tao_any_destructor (void *x)
- {
--  EnumMemberSeq *tmp = ACE_static_cast (EnumMemberSeq*,x);
-+  IR_EnumMemberSeq *tmp = ACE_static_cast (IR_EnumMemberSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_EnumMemberSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6e756d4d), ACE_NTOHL (0x656d6265), ACE_NTOHL (0x72536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/EnumMemberSeq:1.0
--  14, ACE_NTOHL (0x456e756d), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65725365), ACE_NTOHL (0x71000000),  // name = EnumMemberSeq
-+  14, ACE_NTOHL (0x456e756d), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65725365), ACE_NTOHL (0x71000000),  // name = IR_EnumMemberSeq
-   CORBA::tk_sequence, // typecode kind
-   80, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -6193,7 +5902,7 @@
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_EnumMemberSeq (CORBA::tk_alias, sizeof (_oc_IR_EnumMemberSeq), (char *) &_oc_IR_EnumMemberSeq, 0, sizeof (IR::EnumMemberSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_EnumMemberSeq (CORBA::tk_alias, sizeof (_oc_IR_EnumMemberSeq), (char *) &_oc_IR_EnumMemberSeq, 0, sizeof (IR_EnumMemberSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnumMemberSeq, &_tc_TAO_tc_IR_EnumMemberSeq)
-@@ -6203,15 +5912,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_Container_Proxy_Impl::_TAO_Container_Proxy_Impl (void)
-+_TAO_Container_Proxy_Impl::_TAO_Container_Proxy_Impl (void)
- {}
- 
--IR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
-+_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--IR::Contained_ptr IR::_TAO_Container_Remote_Proxy_Impl::lookup (
-+IR_Contained_ptr _TAO_Container_Remote_Proxy_Impl::lookup (
-     CORBA_Object *_collocated_tao_target_,
-     const char * search_name,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -6220,9 +5929,8 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::Contained_ptr _tao_retval = IR::Contained::_nil ();
--  IR::Contained_var _tao_safe_retval (_tao_retval);
-+  IR_Contained_ptr _tao_retval = IR_Contained::_nil ();
-+  IR_Contained_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -6250,7 +5958,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Container::TAO_ClientRequestInfo_IR_Container_lookup ri (
-+      IR_Container::TAO_ClientRequestInfo_IR_Container_lookup ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         search_name,
-@@ -6317,7 +6025,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -6383,9 +6091,9 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::ContainedSeq * IR::_TAO_Container_Remote_Proxy_Impl::contents (
-+IR_ContainedSeq * _TAO_Container_Remote_Proxy_Impl::contents (
-     CORBA_Object *_collocated_tao_target_,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -6393,17 +6101,14 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::ContainedSeq *_tao_retval = 0;
--  
-+  IR_ContainedSeq *_tao_retval = 0;
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
--  ACE_NEW_RETURN (_tao_retval, IR::ContainedSeq, _tao_retval);
--  IR::ContainedSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_ContainedSeq, _tao_retval);
-+  IR_ContainedSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "contents",
-@@ -6424,7 +6129,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Container::TAO_ClientRequestInfo_IR_Container_contents ri (
-+      IR_Container::TAO_ClientRequestInfo_IR_Container_contents ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         limit_type,
-@@ -6493,7 +6198,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -6559,11 +6264,11 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::ContainedSeq * IR::_TAO_Container_Remote_Proxy_Impl::lookup_name (
-+IR_ContainedSeq * _TAO_Container_Remote_Proxy_Impl::lookup_name (
-     CORBA_Object *_collocated_tao_target_,
-     const char * search_name,
-     CORBA::Long levels_to_search,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -6571,17 +6276,14 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::ContainedSeq *_tao_retval = 0;
--  
-+  IR_ContainedSeq *_tao_retval = 0;
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
--  ACE_NEW_RETURN (_tao_retval, IR::ContainedSeq, _tao_retval);
--  IR::ContainedSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_ContainedSeq, _tao_retval);
-+  IR_ContainedSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "lookup_name",
-@@ -6602,7 +6304,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name ri (
-+      IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         search_name,
-@@ -6675,7 +6377,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -6741,9 +6443,9 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::Container::DescriptionSeq * IR::_TAO_Container_Remote_Proxy_Impl::describe_contents (
-+IR_Container::DescriptionSeq * _TAO_Container_Remote_Proxy_Impl::describe_contents (
-     CORBA_Object *_collocated_tao_target_,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Long max_returned_objs,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -6752,17 +6454,14 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::Container::DescriptionSeq *_tao_retval = 0;
--  
-+  IR_Container::DescriptionSeq *_tao_retval = 0;
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
--  ACE_NEW_RETURN (_tao_retval, IR::Container::DescriptionSeq, _tao_retval);
--  IR::Container::DescriptionSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_Container::DescriptionSeq, _tao_retval);
-+  IR_Container::DescriptionSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "describe_contents",
-@@ -6783,7 +6482,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents ri (
-+      IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         limit_type,
-@@ -6854,7 +6553,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::Container::DescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_Container::DescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -6920,7 +6619,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::ModuleDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_module (
-+IR_ModuleDef_ptr _TAO_Container_Remote_Proxy_Impl::create_module (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-@@ -6931,16 +6630,13 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::ModuleDef_ptr _tao_retval = IR::ModuleDef::_nil ();
--  IR::ModuleDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_ModuleDef_ptr _tao_retval = IR_ModuleDef::_nil ();
-+  IR_ModuleDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_module",
-@@ -6961,7 +6657,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Container::TAO_ClientRequestInfo_IR_Container_create_module ri (
-+      IR_Container::TAO_ClientRequestInfo_IR_Container_create_module ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -7032,7 +6728,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ModuleDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ModuleDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -7098,12 +6794,12 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::ConstantDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_constant (
-+IR_ConstantDef_ptr _TAO_Container_Remote_Proxy_Impl::create_constant (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -7111,16 +6807,13 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::ConstantDef_ptr _tao_retval = IR::ConstantDef::_nil ();
--  IR::ConstantDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_ConstantDef_ptr _tao_retval = IR_ConstantDef::_nil ();
-+  IR_ConstantDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_constant",
-@@ -7141,7 +6834,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant ri (
-+      IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -7216,7 +6909,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ConstantDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ConstantDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -7282,28 +6975,25 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::StructDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_struct (
-+IR_StructDef_ptr _TAO_Container_Remote_Proxy_Impl::create_struct (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--  IR::StructDef_ptr _tao_retval = IR::StructDef::_nil ();
--  IR::StructDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_StructDef_ptr _tao_retval = IR_StructDef::_nil ();
-+  IR_StructDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_struct",
-@@ -7324,7 +7014,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct ri (
-+      IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -7397,7 +7087,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::StructDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_StructDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -7463,29 +7153,26 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::UnionDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_union (
-+IR_UnionDef_ptr _TAO_Container_Remote_Proxy_Impl::create_union (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+    IR_IDLType_ptr discriminator_type,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--  IR::UnionDef_ptr _tao_retval = IR::UnionDef::_nil ();
--  IR::UnionDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_UnionDef_ptr _tao_retval = IR_UnionDef::_nil ();
-+  IR_UnionDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_union",
-@@ -7506,7 +7193,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Container::TAO_ClientRequestInfo_IR_Container_create_union ri (
-+      IR_Container::TAO_ClientRequestInfo_IR_Container_create_union ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -7581,7 +7268,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::UnionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_UnionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -7647,28 +7334,25 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::EnumDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_enum (
-+IR_EnumDef_ptr _TAO_Container_Remote_Proxy_Impl::create_enum (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--  IR::EnumDef_ptr _tao_retval = IR::EnumDef::_nil ();
--  IR::EnumDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_EnumDef_ptr _tao_retval = IR_EnumDef::_nil ();
-+  IR_EnumDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_enum",
-@@ -7689,7 +7373,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum ri (
-+      IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -7762,7 +7446,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::EnumDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_EnumDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -7828,28 +7512,25 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::AliasDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_alias (
-+IR_AliasDef_ptr _TAO_Container_Remote_Proxy_Impl::create_alias (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+    IR_IDLType_ptr original_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--  IR::AliasDef_ptr _tao_retval = IR::AliasDef::_nil ();
--  IR::AliasDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_AliasDef_ptr _tao_retval = IR_AliasDef::_nil ();
-+  IR_AliasDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_alias",
-@@ -7870,7 +7551,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias ri (
-+      IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -7943,7 +7624,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::AliasDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_AliasDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -8009,12 +7690,12 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::InterfaceDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_interface (
-+IR_InterfaceDef_ptr _TAO_Container_Remote_Proxy_Impl::create_interface (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Boolean is_abstract,
-     CORBA::Boolean is_local,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -8023,16 +7704,14 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::InterfaceDef_ptr _tao_retval = IR::InterfaceDef::_nil ();
--  IR::InterfaceDef_var _tao_safe_retval (_tao_retval);
-+  IR_InterfaceDef_ptr _tao_retval = IR_InterfaceDef::_nil ();
-+  IR_InterfaceDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_interface",
-@@ -8053,7 +7732,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface ri (
-+      IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -8130,7 +7809,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -8196,34 +7875,31 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::ValueDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_value (
-+IR_ValueDef_ptr _TAO_Container_Remote_Proxy_Impl::create_value (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
-     CORBA::Boolean is_custom,
-     CORBA::Boolean is_abstract,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Boolean is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+    const IR_ValueDefSeq & abstract_base_values,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--  IR::ValueDef_ptr _tao_retval = IR::ValueDef::_nil ();
--  IR::ValueDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_ValueDef_ptr _tao_retval = IR_ValueDef::_nil ();
-+  IR_ValueDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_value",
-@@ -8244,7 +7920,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Container::TAO_ClientRequestInfo_IR_Container_create_value ri (
-+      IR_Container::TAO_ClientRequestInfo_IR_Container_create_value ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -8329,7 +8005,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -8395,28 +8071,25 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::ValueBoxDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_value_box (
-+IR_ValueBoxDef_ptr _TAO_Container_Remote_Proxy_Impl::create_value_box (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--  IR::ValueBoxDef_ptr _tao_retval = IR::ValueBoxDef::_nil ();
--  IR::ValueBoxDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_ValueBoxDef_ptr _tao_retval = IR_ValueBoxDef::_nil ();
-+  IR_ValueBoxDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_value_box",
-@@ -8437,7 +8110,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box ri (
-+      IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -8510,7 +8183,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ValueBoxDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ValueBoxDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -8576,28 +8249,25 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::ExceptionDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_exception (
-+IR_ExceptionDef_ptr _TAO_Container_Remote_Proxy_Impl::create_exception (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--  IR::ExceptionDef_ptr _tao_retval = IR::ExceptionDef::_nil ();
--  IR::ExceptionDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_ExceptionDef_ptr _tao_retval = IR_ExceptionDef::_nil ();
-+  IR_ExceptionDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_exception",
-@@ -8618,7 +8288,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception ri (
-+      IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -8691,7 +8361,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ExceptionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ExceptionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -8757,7 +8427,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::NativeDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_native (
-+IR_NativeDef_ptr _TAO_Container_Remote_Proxy_Impl::create_native (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-@@ -8768,16 +8438,13 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::NativeDef_ptr _tao_retval = IR::NativeDef::_nil ();
--  IR::NativeDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_NativeDef_ptr _tao_retval = IR_NativeDef::_nil ();
-+  IR_NativeDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_native",
-@@ -8798,7 +8465,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Container::TAO_ClientRequestInfo_IR_Container_create_native ri (
-+      IR_Container::TAO_ClientRequestInfo_IR_Container_create_native ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -8869,7 +8536,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::NativeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_NativeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -8945,37 +8612,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_Container_Proxy_Broker::_TAO_Container_Proxy_Broker (void)
-+_TAO_Container_Proxy_Broker::_TAO_Container_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_Container_Proxy_Broker::~_TAO_Container_Proxy_Broker (void)
-+_TAO_Container_Proxy_Broker::~_TAO_Container_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_Container_Proxy_Broker * (*IR__TAO_Container_Proxy_Broker_Factory_function_pointer) (
-+_TAO_Container_Proxy_Broker * (*_TAO_Container_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_Container_Remote_Proxy_Broker *
--IR::_TAO_Container_Remote_Proxy_Broker::the_TAO_Container_Remote_Proxy_Broker (void)
-+_TAO_Container_Remote_Proxy_Broker *
-+_TAO_Container_Remote_Proxy_Broker::the_TAO_Container_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_Container_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_Container_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_Container_Remote_Proxy_Broker::_TAO_Container_Remote_Proxy_Broker (void)
-+_TAO_Container_Remote_Proxy_Broker::_TAO_Container_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_Container_Remote_Proxy_Broker::~_TAO_Container_Remote_Proxy_Broker (void)
-+_TAO_Container_Remote_Proxy_Broker::~_TAO_Container_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_Container_Proxy_Impl&
--IR::_TAO_Container_Remote_Proxy_Broker::select_proxy (
--  ::IR::Container *object,
-+_TAO_Container_Proxy_Impl&
-+_TAO_Container_Remote_Proxy_Broker::select_proxy (
-+  ::IR_Container *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -8991,109 +8658,109 @@
- 
- 
- // default constructor
--IR::Container::Container (int collocated)
-+IR_Container::IR_Container (int collocated)
- {
-   this->IR_Container_setup_collocation (collocated);
- }
- 
- // destructor
--IR::Container::~Container (void)
-+IR_Container::~IR_Container (void)
- {}
- 
- void
--IR::Container::IR_Container_setup_collocation (int collocated)
-+IR_Container::IR_Container_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_Container_Proxy_Broker_ =
--      ::IR__TAO_Container_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_Container_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_Container_Proxy_Broker_ =
--      ::IR::_TAO_Container_Remote_Proxy_Broker::the_TAO_Container_Remote_Proxy_Broker ();
-+      _TAO_Container_Remote_Proxy_Broker::the_TAO_Container_Remote_Proxy_Broker ();
-   
-   this->CORBA_IRObject_setup_collocation (collocated);
- }
- 
--void IR::Container::_tao_any_destructor (void *x)
-+void IR_Container::_tao_any_destructor (void *x)
- {
--  Container *tmp = ACE_static_cast (Container*,x);
-+  IR_Container *tmp = ACE_static_cast (IR_Container*,x);
-   CORBA::release (tmp);
- }
- 
--IR::Container_ptr IR::Container::_narrow (
-+IR_Container_ptr IR_Container::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return Container::_nil ();
-+    return IR_Container::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/Container:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (Container::_nil ());
-+      ACE_CHECK_RETURN (IR_Container::_nil ());
-       if (is_a == 0)
--        return Container::_nil ();
-+        return IR_Container::_nil ();
-     }
--  return Container::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_Container::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::Container_ptr IR::Container::_unchecked_narrow (
-+IR_Container_ptr IR_Container::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return Container::_nil ();
-+    return IR_Container::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      Container_ptr default_proxy = Container::_nil ();
-+      IR_Container_ptr default_proxy = IR_Container::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_Container_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_Container_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::Container (
-+          ::IR_Container (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          Container::_nil ());
-+          IR_Container::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::Container (stub, 0, obj->_servant ()), Container::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_Container (stub, 0, obj->_servant ()), IR_Container::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            Container_ptr,
-+            IR_Container_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &Container::_narrow
-+                      &IR_Container::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::Container_ptr
--IR::Container::_duplicate (Container_ptr obj)
-+IR_Container_ptr
-+IR_Container::_duplicate (IR_Container_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::Container::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_Container::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
-@@ -9104,22 +8771,22 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::Container::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_Container::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-+      &IR_Container::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -9132,12 +8799,12 @@
-   return retv;
- }
- 
--const char* IR::Container::_interface_repository_id (void) const
-+const char* IR_Container::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/Container:1.0";
- }
- 
--IR::Contained_ptr IR::Container::lookup (
-+IR_Contained_ptr IR_Container::lookup (
-     const char * search_name,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -9156,8 +8823,8 @@
-     );
- }
- 
--IR::ContainedSeq * IR::Container::contents (
--    IR::DefinitionKind limit_type,
-+IR_ContainedSeq * IR_Container::contents (
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -9177,10 +8844,10 @@
-     );
- }
- 
--IR::ContainedSeq * IR::Container::lookup_name (
-+IR_ContainedSeq * IR_Container::lookup_name (
-     const char * search_name,
-     CORBA::Long levels_to_search,
--    IR::DefinitionKind limit_type,
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -9213,7 +8880,7 @@
-   56, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/Contained:1.0
--    10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000),  // name = Contained
-+    10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000),  // name = IR_Contained
- 
-   5, ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0),  // name = kind
-   CORBA::tk_enum, // typecode kind
-@@ -9261,30 +8928,26 @@
-   CORBA::tk_any,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_Container_Description (CORBA::tk_struct, sizeof (_oc_IR_Container_Description), (char *) &_oc_IR_Container_Description, 0, sizeof (IR::Container::Description));
--CORBA::TypeCode_ptr IR::Container::_tc_Description = &_tc_TAO_tc_IR_Container_Description;
-+static CORBA::TypeCode _tc_TAO_tc_IR_Container_Description (CORBA::tk_struct, sizeof (_oc_IR_Container_Description), (char *) &_oc_IR_Container_Description, 0, sizeof (IR_Container::Description));
-+CORBA::TypeCode_ptr IR_Container::_tc_Description = &_tc_TAO_tc_IR_Container_Description;
- 
--void IR::Container::Description::_tao_any_destructor (void *x)
-+void IR_Container::Description::_tao_any_destructor (void *x)
- {
-   Description *tmp = ACE_static_cast (Description*,x);
-   delete tmp;
- }
- 
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CS_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CS_
--
-   void
--  IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_allocate_buffer (CORBA::ULong length)
-+  IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::Container::Description* tmp = 0;
-+    IR_Container::Description* tmp = 0;
-     tmp = _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::Container::Description *old = ACE_reinterpret_cast (IR::Container::Description *,this->buffer_);
-+      IR_Container::Description *old = ACE_reinterpret_cast (IR_Container::Description *,this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp[i] = old[i];
-@@ -9297,75 +8960,66 @@
-   }
-   
-   void
--  IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_deallocate_buffer (void)
-+  IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
-     
--    IR::Container::Description *tmp = ACE_reinterpret_cast (IR::Container::Description *,this->buffer_);
-+    IR_Container::Description *tmp = ACE_reinterpret_cast (IR_Container::Description *,this->buffer_);
-     
-     _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   } 
-   
--  IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::~_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (void) // Dtor.
-+  IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::~_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (void) // Dtor.
-   {
-     this->_deallocate_buffer ();
-   }
-   
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_CONTAINER_DESCRIPTIONSEQ_CS_)
--#define _IR_CONTAINER_DESCRIPTIONSEQ_CS_
--
- // *************************************************************
--// IR::Container::DescriptionSeq
-+// IR_Container::DescriptionSeq
- // *************************************************************
- 
--IR::Container::DescriptionSeq::DescriptionSeq (void)
-+IR_Container::DescriptionSeq::DescriptionSeq (void)
- {}
--IR::Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max) // uses max size
-+IR_Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::Container::Description>
-+  TAO_Unbounded_Sequence<IR_Container::Description>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR::Container::Description *buffer, CORBA::Boolean release)
-+IR_Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_Container::Description *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::Container::Description>
-+  TAO_Unbounded_Sequence<IR_Container::Description>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::Container::DescriptionSeq::DescriptionSeq (const DescriptionSeq &seq) // copy ctor
-+IR_Container::DescriptionSeq::DescriptionSeq (const DescriptionSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::Container::Description>
-+  TAO_Unbounded_Sequence<IR_Container::Description>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::Container::DescriptionSeq::~DescriptionSeq (void) // dtor
-+IR_Container::DescriptionSeq::~DescriptionSeq (void) // dtor
- {}
--void IR::Container::DescriptionSeq::_tao_any_destructor (void *x)
-+void IR_Container::DescriptionSeq::_tao_any_destructor (void *x)
- {
-   DescriptionSeq *tmp = ACE_static_cast (DescriptionSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_Container_DescriptionSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -9385,7 +9039,7 @@
-       56, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/Contained:1.0
--        10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000),  // name = Contained
-+        10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000),  // name = IR_Contained
- 
-       5, ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0),  // name = kind
-       CORBA::tk_enum, // typecode kind
-@@ -9436,11 +9090,11 @@
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_Container_DescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_Container_DescriptionSeq), (char *) &_oc_IR_Container_DescriptionSeq, 0, sizeof (IR::Container::DescriptionSeq));
--CORBA::TypeCode_ptr IR::Container::_tc_DescriptionSeq = &_tc_TAO_tc_IR_Container_DescriptionSeq;
-+static CORBA::TypeCode _tc_TAO_tc_IR_Container_DescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_Container_DescriptionSeq), (char *) &_oc_IR_Container_DescriptionSeq, 0, sizeof (IR_Container::DescriptionSeq));
-+CORBA::TypeCode_ptr IR_Container::_tc_DescriptionSeq = &_tc_TAO_tc_IR_Container_DescriptionSeq;
- 
--IR::Container::DescriptionSeq * IR::Container::describe_contents (
--    IR::DefinitionKind limit_type,
-+IR_Container::DescriptionSeq * IR_Container::describe_contents (
-+    IR_DefinitionKind limit_type,
-     CORBA::Boolean exclude_inherited,
-     CORBA::Long max_returned_objs,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -9462,7 +9116,7 @@
-     );
- }
- 
--IR::ModuleDef_ptr IR::Container::create_module (
-+IR_ModuleDef_ptr IR_Container::create_module (
-     const char * id,
-     const char * name,
-     const char * version,
-@@ -9485,11 +9139,11 @@
-     );
- }
- 
--IR::ConstantDef_ptr IR::Container::create_constant (
-+IR_ConstantDef_ptr IR_Container::create_constant (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -9512,11 +9166,11 @@
-     );
- }
- 
--IR::StructDef_ptr IR::Container::create_struct (
-+IR_StructDef_ptr IR_Container::create_struct (
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9537,12 +9191,12 @@
-     );
- }
- 
--IR::UnionDef_ptr IR::Container::create_union (
-+IR_UnionDef_ptr IR_Container::create_union (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+    IR_IDLType_ptr discriminator_type,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9564,11 +9218,11 @@
-     );
- }
- 
--IR::EnumDef_ptr IR::Container::create_enum (
-+IR_EnumDef_ptr IR_Container::create_enum (
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9589,11 +9243,11 @@
-     );
- }
- 
--IR::AliasDef_ptr IR::Container::create_alias (
-+IR_AliasDef_ptr IR_Container::create_alias (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+    IR_IDLType_ptr original_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9614,11 +9268,11 @@
-     );
- }
- 
--IR::InterfaceDef_ptr IR::Container::create_interface (
-+IR_InterfaceDef_ptr IR_Container::create_interface (
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Boolean is_abstract,
-     CORBA::Boolean is_local,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -9643,17 +9297,17 @@
-     );
- }
- 
--IR::ValueDef_ptr IR::Container::create_value (
-+IR_ValueDef_ptr IR_Container::create_value (
-     const char * id,
-     const char * name,
-     const char * version,
-     CORBA::Boolean is_custom,
-     CORBA::Boolean is_abstract,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Boolean is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+    const IR_ValueDefSeq & abstract_base_values,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9680,11 +9334,11 @@
-     );
- }
- 
--IR::ValueBoxDef_ptr IR::Container::create_value_box (
-+IR_ValueBoxDef_ptr IR_Container::create_value_box (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9705,11 +9359,11 @@
-     );
- }
- 
--IR::ExceptionDef_ptr IR::Container::create_exception (
-+IR_ExceptionDef_ptr IR_Container::create_exception (
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -9730,7 +9384,7 @@
-     );
- }
- 
--IR::NativeDef_ptr IR::Container::create_native (
-+IR_NativeDef_ptr IR_Container::create_native (
-     const char * id,
-     const char * name,
-     const char * version,
-@@ -9753,9 +9407,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::Container::TAO_ClientRequestInfo_IR_Container_lookup::TAO_ClientRequestInfo_IR_Container_lookup (
-+IR_Container::TAO_ClientRequestInfo_IR_Container_lookup::TAO_ClientRequestInfo_IR_Container_lookup (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * search_name,
-@@ -9766,7 +9419,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_lookup::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_lookup::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -9785,7 +9438,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_lookup::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_lookup::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -9798,7 +9451,7 @@
- 
- 
- CORBA::Any * 
--IR::Container::TAO_ClientRequestInfo_IR_Container_lookup::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_lookup::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -9814,16 +9467,16 @@
- }
- 
- void 
--IR::Container::TAO_ClientRequestInfo_IR_Container_lookup::result (IR::Contained_ptr result)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_lookup::result (IR_Contained_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Container::TAO_ClientRequestInfo_IR_Container_contents::TAO_ClientRequestInfo_IR_Container_contents (
-+IR_Container::TAO_ClientRequestInfo_IR_Container_contents::TAO_ClientRequestInfo_IR_Container_contents (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::DefinitionKind & limit_type,
-+    IR_DefinitionKind & limit_type,
-     const CORBA::Boolean & exclude_inherited,
-     CORBA::Environment &    
-   )
-@@ -9833,7 +9486,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -9858,7 +9511,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -9871,7 +9524,7 @@
- 
- 
- CORBA::Any * 
--IR::Container::TAO_ClientRequestInfo_IR_Container_contents::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_contents::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -9887,18 +9540,18 @@
- }
- 
- void 
--IR::Container::TAO_ClientRequestInfo_IR_Container_contents::result (IR::ContainedSeq * result)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_contents::result (IR_ContainedSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name::TAO_ClientRequestInfo_IR_Container_lookup_name (
-+IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name::TAO_ClientRequestInfo_IR_Container_lookup_name (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * search_name,
-     const CORBA::Long & levels_to_search,
--    IR::DefinitionKind & limit_type,
-+    IR_DefinitionKind & limit_type,
-     const CORBA::Boolean & exclude_inherited,
-     CORBA::Environment &    
-   )
-@@ -9910,7 +9563,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -9945,7 +9598,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -9958,7 +9611,7 @@
- 
- 
- CORBA::Any * 
--IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -9974,16 +9627,16 @@
- }
- 
- void 
--IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name::result (IR::ContainedSeq * result)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_lookup_name::result (IR_ContainedSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents::TAO_ClientRequestInfo_IR_Container_describe_contents (
-+IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents::TAO_ClientRequestInfo_IR_Container_describe_contents (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::DefinitionKind & limit_type,
-+    IR_DefinitionKind & limit_type,
-     const CORBA::Boolean & exclude_inherited,
-     const CORBA::Long & max_returned_objs,
-     CORBA::Environment &    
-@@ -9995,7 +9648,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -10025,7 +9678,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -10038,7 +9691,7 @@
- 
- 
- CORBA::Any * 
--IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -10054,13 +9707,13 @@
- }
- 
- void 
--IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents::result (ACE_NESTED_CLASS (IR::Container,DescriptionSeq) * result)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_describe_contents::result (ACE_NESTED_CLASS (IR_Container,DescriptionSeq) * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_module::TAO_ClientRequestInfo_IR_Container_create_module (
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_module::TAO_ClientRequestInfo_IR_Container_create_module (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-@@ -10075,7 +9728,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_module::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_module::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -10104,7 +9757,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_module::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_module::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -10117,7 +9770,7 @@
- 
- 
- CORBA::Any * 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_module::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_module::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -10133,19 +9786,19 @@
- }
- 
- void 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_module::result (IR::ModuleDef_ptr result)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_module::result (IR_ModuleDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant::TAO_ClientRequestInfo_IR_Container_create_constant (
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant::TAO_ClientRequestInfo_IR_Container_create_constant (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &    
-   )
-@@ -10158,7 +9811,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -10198,7 +9851,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -10211,7 +9864,7 @@
- 
- 
- CORBA::Any * 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -10227,19 +9880,19 @@
- }
- 
- void 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant::result (IR::ConstantDef_ptr result)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_constant::result (IR_ConstantDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct::TAO_ClientRequestInfo_IR_Container_create_struct (
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct::TAO_ClientRequestInfo_IR_Container_create_struct (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -10250,7 +9903,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -10285,7 +9938,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -10298,7 +9951,7 @@
- 
- 
- CORBA::Any * 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -10314,20 +9967,20 @@
- }
- 
- void 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct::result (IR::StructDef_ptr result)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_struct::result (IR_StructDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_union::TAO_ClientRequestInfo_IR_Container_create_union (
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_union::TAO_ClientRequestInfo_IR_Container_create_union (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+    IR_IDLType_ptr discriminator_type,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -10339,7 +9992,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_union::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_union::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -10380,7 +10033,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_union::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_union::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -10393,7 +10046,7 @@
- 
- 
- CORBA::Any * 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_union::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_union::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -10409,19 +10062,19 @@
- }
- 
- void 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_union::result (IR::UnionDef_ptr result)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_union::result (IR_UnionDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum::TAO_ClientRequestInfo_IR_Container_create_enum (
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum::TAO_ClientRequestInfo_IR_Container_create_enum (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -10432,7 +10085,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -10467,7 +10120,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -10480,7 +10133,7 @@
- 
- 
- CORBA::Any * 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -10496,19 +10149,19 @@
- }
- 
- void 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum::result (IR::EnumDef_ptr result)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_enum::result (IR_EnumDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias::TAO_ClientRequestInfo_IR_Container_create_alias (
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias::TAO_ClientRequestInfo_IR_Container_create_alias (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+    IR_IDLType_ptr original_type,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -10519,7 +10172,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -10554,7 +10207,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -10567,7 +10220,7 @@
- 
- 
- CORBA::Any * 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -10583,19 +10236,19 @@
- }
- 
- void 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias::result (IR::AliasDef_ptr result)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_alias::result (IR_AliasDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface::TAO_ClientRequestInfo_IR_Container_create_interface (
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface::TAO_ClientRequestInfo_IR_Container_create_interface (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     const CORBA::Boolean & is_abstract,
-     const CORBA::Boolean & is_local,
-     CORBA::Environment &    
-@@ -10610,7 +10263,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -10655,7 +10308,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -10668,7 +10321,7 @@
- 
- 
- CORBA::Any * 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -10684,13 +10337,13 @@
- }
- 
- void 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface::result (IR::InterfaceDef_ptr result)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_interface::result (IR_InterfaceDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_value::TAO_ClientRequestInfo_IR_Container_create_value (
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_value::TAO_ClientRequestInfo_IR_Container_create_value (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-@@ -10698,11 +10351,11 @@
-     const char * version,
-     const CORBA::Boolean & is_custom,
-     const CORBA::Boolean & is_abstract,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     const CORBA::Boolean & is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+    const IR_ValueDefSeq & abstract_base_values,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -10719,7 +10372,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_value::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_value::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -10787,7 +10440,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_value::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_value::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -10800,7 +10453,7 @@
- 
- 
- CORBA::Any * 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_value::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_value::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -10816,19 +10469,19 @@
- }
- 
- void 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_value::result (IR::ValueDef_ptr result)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_value::result (IR_ValueDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box::TAO_ClientRequestInfo_IR_Container_create_value_box (
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box::TAO_ClientRequestInfo_IR_Container_create_value_box (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -10839,7 +10492,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -10874,7 +10527,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -10887,7 +10540,7 @@
- 
- 
- CORBA::Any * 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -10903,19 +10556,19 @@
- }
- 
- void 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box::result (IR::ValueBoxDef_ptr result)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_value_box::result (IR_ValueBoxDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception::TAO_ClientRequestInfo_IR_Container_create_exception (
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception::TAO_ClientRequestInfo_IR_Container_create_exception (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -10926,7 +10579,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -10961,7 +10614,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -10974,7 +10627,7 @@
- 
- 
- CORBA::Any * 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -10990,13 +10643,13 @@
- }
- 
- void 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception::result (IR::ExceptionDef_ptr result)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_exception::result (IR_ExceptionDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_native::TAO_ClientRequestInfo_IR_Container_create_native (
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_native::TAO_ClientRequestInfo_IR_Container_create_native (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-@@ -11011,7 +10664,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_native::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_native::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -11040,7 +10693,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_native::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_native::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -11053,7 +10706,7 @@
- 
- 
- CORBA::Any * 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_native::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_native::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -11069,20 +10722,21 @@
- }
- 
- void 
--IR::Container::TAO_ClientRequestInfo_IR_Container_create_native::result (IR::NativeDef_ptr result)
-+IR_Container::TAO_ClientRequestInfo_IR_Container_create_native::result (IR_NativeDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_Container[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/Container:1.0
--  10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x72000000),  // name = Container
-+  10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x72000000),  // name = IR_Container
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_Container (CORBA::tk_objref, sizeof (_oc_IR_Container), (char *) &_oc_IR_Container, 0, sizeof (IR::Container));
-+static CORBA::TypeCode _tc_TAO_tc_IR_Container (CORBA::tk_objref, sizeof (_oc_IR_Container), (char *) &_oc_IR_Container, 0, sizeof (IR_Container));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Container, &_tc_TAO_tc_IR_Container)
-@@ -11092,15 +10746,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_IDLType_Proxy_Impl::_TAO_IDLType_Proxy_Impl (void)
-+_TAO_IDLType_Proxy_Impl::_TAO_IDLType_Proxy_Impl (void)
- {}
- 
--IR::_TAO_IDLType_Remote_Proxy_Impl::_TAO_IDLType_Remote_Proxy_Impl (void)
-+_TAO_IDLType_Remote_Proxy_Impl::_TAO_IDLType_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--CORBA::TypeCode_ptr IR::_TAO_IDLType_Remote_Proxy_Impl::type (
-+CORBA::TypeCode_ptr _TAO_IDLType_Remote_Proxy_Impl::type (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -11108,16 +10762,13 @@
-     CORBA::SystemException
-   ))
- {
--  
-   CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
-   CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-   
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_type",
-@@ -11138,7 +10789,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get ri (
-+      IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -11270,37 +10921,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_IDLType_Proxy_Broker::_TAO_IDLType_Proxy_Broker (void)
-+_TAO_IDLType_Proxy_Broker::_TAO_IDLType_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_IDLType_Proxy_Broker::~_TAO_IDLType_Proxy_Broker (void)
-+_TAO_IDLType_Proxy_Broker::~_TAO_IDLType_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_IDLType_Proxy_Broker * (*IR__TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
-+_TAO_IDLType_Proxy_Broker * (*_TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_IDLType_Remote_Proxy_Broker *
--IR::_TAO_IDLType_Remote_Proxy_Broker::the_TAO_IDLType_Remote_Proxy_Broker (void)
-+_TAO_IDLType_Remote_Proxy_Broker *
-+_TAO_IDLType_Remote_Proxy_Broker::the_TAO_IDLType_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_IDLType_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_IDLType_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_IDLType_Remote_Proxy_Broker::_TAO_IDLType_Remote_Proxy_Broker (void)
-+_TAO_IDLType_Remote_Proxy_Broker::_TAO_IDLType_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_IDLType_Remote_Proxy_Broker::~_TAO_IDLType_Remote_Proxy_Broker (void)
-+_TAO_IDLType_Remote_Proxy_Broker::~_TAO_IDLType_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_IDLType_Proxy_Impl&
--IR::_TAO_IDLType_Remote_Proxy_Broker::select_proxy (
--  ::IR::IDLType *object,
-+_TAO_IDLType_Proxy_Impl&
-+_TAO_IDLType_Remote_Proxy_Broker::select_proxy (
-+  ::IR_IDLType *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -11316,109 +10967,109 @@
- 
- 
- // default constructor
--IR::IDLType::IDLType (int collocated)
-+IR_IDLType::IR_IDLType (int collocated)
- {
-   this->IR_IDLType_setup_collocation (collocated);
- }
- 
- // destructor
--IR::IDLType::~IDLType (void)
-+IR_IDLType::~IR_IDLType (void)
- {}
- 
- void
--IR::IDLType::IR_IDLType_setup_collocation (int collocated)
-+IR_IDLType::IR_IDLType_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_IDLType_Proxy_Broker_ =
--      ::IR__TAO_IDLType_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_IDLType_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_IDLType_Proxy_Broker_ =
--      ::IR::_TAO_IDLType_Remote_Proxy_Broker::the_TAO_IDLType_Remote_Proxy_Broker ();
-+      ::_TAO_IDLType_Remote_Proxy_Broker::the_TAO_IDLType_Remote_Proxy_Broker ();
-   
-   this->CORBA_IRObject_setup_collocation (collocated);
- }
- 
--void IR::IDLType::_tao_any_destructor (void *x)
-+void IR_IDLType::_tao_any_destructor (void *x)
- {
--  IDLType *tmp = ACE_static_cast (IDLType*,x);
-+  IR_IDLType *tmp = ACE_static_cast (IR_IDLType*,x);
-   CORBA::release (tmp);
- }
- 
--IR::IDLType_ptr IR::IDLType::_narrow (
-+IR_IDLType_ptr IR_IDLType::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return IDLType::_nil ();
-+    return IR_IDLType::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/IDLType:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (IDLType::_nil ());
-+      ACE_CHECK_RETURN (IR_IDLType::_nil ());
-       if (is_a == 0)
--        return IDLType::_nil ();
-+        return IR_IDLType::_nil ();
-     }
--  return IDLType::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_IDLType::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::IDLType_ptr IR::IDLType::_unchecked_narrow (
-+IR_IDLType_ptr IR_IDLType::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return IDLType::_nil ();
-+    return IR_IDLType::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      IDLType_ptr default_proxy = IDLType::_nil ();
-+      IR_IDLType_ptr default_proxy = IR_IDLType::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_IDLType_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_IDLType_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::IDLType (
-+          ::IR_IDLType (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          IDLType::_nil ());
-+          IR_IDLType::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::IDLType (stub, 0, obj->_servant ()), IDLType::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_IDLType (stub, 0, obj->_servant ()), IR_IDLType::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            IDLType_ptr,
-+            IR_IDLType_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &IDLType::_narrow
-+                      &IR_IDLType::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::IDLType_ptr
--IR::IDLType::_duplicate (IDLType_ptr obj)
-+IR_IDLType_ptr
-+IR_IDLType::_duplicate (IR_IDLType_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::IDLType::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_IDLType::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
-@@ -11429,22 +11080,22 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::IDLType::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_IDLType::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -11457,12 +11108,12 @@
-   return retv;
- }
- 
--const char* IR::IDLType::_interface_repository_id (void) const
-+const char* IR_IDLType::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/IDLType:1.0";
- }
- 
--CORBA::TypeCode_ptr IR::IDLType::type (
-+CORBA::TypeCode_ptr IR_IDLType::type (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -11479,9 +11130,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::TAO_ClientRequestInfo_IR_IDLType_type_get (
-+IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::TAO_ClientRequestInfo_IR_IDLType_type_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -11490,7 +11140,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -11502,7 +11152,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -11515,7 +11165,7 @@
- 
- 
- CORBA::Any * 
--IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -11531,20 +11181,21 @@
- }
- 
- void 
--IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::result (CORBA::TypeCode_ptr result)
-+IR_IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::result (CORBA::TypeCode_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_IDLType[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--  8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+  8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_IDLType (CORBA::tk_objref, sizeof (_oc_IR_IDLType), (char *) &_oc_IR_IDLType, 0, sizeof (IR::IDLType));
-+static CORBA::TypeCode _tc_TAO_tc_IR_IDLType (CORBA::tk_objref, sizeof (_oc_IR_IDLType), (char *) &_oc_IR_IDLType, 0, sizeof (IR_IDLType));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IDLType, &_tc_TAO_tc_IR_IDLType)
-@@ -11578,7 +11229,7 @@
-   11, ACE_NTOHL (0x706b5f77), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e670000),  // name = pk_wstring
-   14, ACE_NTOHL (0x706b5f76), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x5f626173), ACE_NTOHL (0x65000000),  // name = pk_value_base
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_PrimitiveKind (CORBA::tk_enum, sizeof (_oc_IR_PrimitiveKind), (char *) &_oc_IR_PrimitiveKind, 0, sizeof (IR::PrimitiveKind));
-+static CORBA::TypeCode _tc_TAO_tc_IR_PrimitiveKind (CORBA::tk_enum, sizeof (_oc_IR_PrimitiveKind), (char *) &_oc_IR_PrimitiveKind, 0, sizeof (IR_PrimitiveKind));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimitiveKind, &_tc_TAO_tc_IR_PrimitiveKind)
-@@ -11588,15 +11239,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_Repository_Proxy_Impl::_TAO_Repository_Proxy_Impl (void)
-+_TAO_Repository_Proxy_Impl::_TAO_Repository_Proxy_Impl (void)
- {}
- 
--IR::_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (void)
-+_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--IR::Contained_ptr IR::_TAO_Repository_Remote_Proxy_Impl::lookup_id (
-+IR_Contained_ptr _TAO_Repository_Remote_Proxy_Impl::lookup_id (
-     CORBA_Object *_collocated_tao_target_,
-     const char * search_id,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -11605,16 +11256,13 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::Contained_ptr _tao_retval = IR::Contained::_nil ();
--  IR::Contained_var _tao_safe_retval (_tao_retval);
--  
-+  IR_Contained_ptr _tao_retval = IR_Contained::_nil ();
-+  IR_Contained_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "lookup_id",
-@@ -11635,7 +11283,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id ri (
-+      IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         search_id,
-@@ -11702,7 +11350,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -11768,7 +11416,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--CORBA::TypeCode_ptr IR::_TAO_Repository_Remote_Proxy_Impl::get_canonical_typecode (
-+CORBA::TypeCode_ptr _TAO_Repository_Remote_Proxy_Impl::get_canonical_typecode (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::TypeCode_ptr tc,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -11777,16 +11425,13 @@
-     CORBA::SystemException
-   ))
- {
--  
-   CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
-   CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-   
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "get_canonical_typecode",
-@@ -11807,7 +11452,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode ri (
-+      IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         tc,
-@@ -11940,25 +11585,22 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::PrimitiveDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::get_primitive (
-+IR_PrimitiveDef_ptr _TAO_Repository_Remote_Proxy_Impl::get_primitive (
-     CORBA_Object *_collocated_tao_target_,
--    IR::PrimitiveKind kind,
-+    IR_PrimitiveKind kind,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--  IR::PrimitiveDef_ptr _tao_retval = IR::PrimitiveDef::_nil ();
--  IR::PrimitiveDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_PrimitiveDef_ptr _tao_retval = IR_PrimitiveDef::_nil ();
-+  IR_PrimitiveDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "get_primitive",
-@@ -11979,7 +11621,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive ri (
-+      IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         kind,
-@@ -12046,7 +11688,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::PrimitiveDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_PrimitiveDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -12112,7 +11754,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::StringDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::create_string (
-+IR_StringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_string (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::ULong bound,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -12121,16 +11763,13 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::StringDef_ptr _tao_retval = IR::StringDef::_nil ();
--  IR::StringDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_StringDef_ptr _tao_retval = IR_StringDef::_nil ();
-+  IR_StringDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_string",
-@@ -12151,7 +11790,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string ri (
-+      IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         bound,
-@@ -12218,7 +11857,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::StringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_StringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -12284,7 +11923,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::WstringDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::create_wstring (
-+IR_WstringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_wstring (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::ULong bound,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -12293,16 +11932,13 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::WstringDef_ptr _tao_retval = IR::WstringDef::_nil ();
--  IR::WstringDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_WstringDef_ptr _tao_retval = IR_WstringDef::_nil ();
-+  IR_WstringDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_wstring",
-@@ -12323,7 +11959,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring ri (
-+      IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         bound,
-@@ -12390,7 +12026,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::WstringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_WstringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -12456,26 +12092,23 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::SequenceDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::create_sequence (
-+IR_SequenceDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_sequence (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::ULong bound,
--    IR::IDLType_ptr element_type,
-+    IR_IDLType_ptr element_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--  IR::SequenceDef_ptr _tao_retval = IR::SequenceDef::_nil ();
--  IR::SequenceDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_SequenceDef_ptr _tao_retval = IR_SequenceDef::_nil ();
-+  IR_SequenceDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_sequence",
-@@ -12496,7 +12129,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence ri (
-+      IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         bound,
-@@ -12565,7 +12198,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::SequenceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_SequenceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -12631,26 +12264,23 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::ArrayDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::create_array (
-+IR_ArrayDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_array (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::ULong length,
--    IR::IDLType_ptr element_type,
-+    IR_IDLType_ptr element_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--  IR::ArrayDef_ptr _tao_retval = IR::ArrayDef::_nil ();
--  IR::ArrayDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_ArrayDef_ptr _tao_retval = IR_ArrayDef::_nil ();
-+  IR_ArrayDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_array",
-@@ -12671,7 +12301,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array ri (
-+      IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         length,
-@@ -12740,7 +12370,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ArrayDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ArrayDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -12806,7 +12436,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::FixedDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::create_fixed (
-+IR_FixedDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_fixed (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::UShort digits,
-     CORBA::Short scale,
-@@ -12816,16 +12446,13 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::FixedDef_ptr _tao_retval = IR::FixedDef::_nil ();
--  IR::FixedDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_FixedDef_ptr _tao_retval = IR_FixedDef::_nil ();
-+  IR_FixedDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_fixed",
-@@ -12846,7 +12473,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed ri (
-+      IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         digits,
-@@ -12915,7 +12542,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::FixedDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_FixedDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -12991,37 +12618,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_Repository_Proxy_Broker::_TAO_Repository_Proxy_Broker (void)
-+_TAO_Repository_Proxy_Broker::_TAO_Repository_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_Repository_Proxy_Broker::~_TAO_Repository_Proxy_Broker (void)
-+_TAO_Repository_Proxy_Broker::~_TAO_Repository_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_Repository_Proxy_Broker * (*IR__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
-+_TAO_Repository_Proxy_Broker * (*_TAO_Repository_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_Repository_Remote_Proxy_Broker *
--IR::_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker (void)
-+_TAO_Repository_Remote_Proxy_Broker *
-+_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_Repository_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_Repository_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_Repository_Remote_Proxy_Broker::_TAO_Repository_Remote_Proxy_Broker (void)
-+_TAO_Repository_Remote_Proxy_Broker::_TAO_Repository_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_Repository_Remote_Proxy_Broker::~_TAO_Repository_Remote_Proxy_Broker (void)
-+_TAO_Repository_Remote_Proxy_Broker::~_TAO_Repository_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_Repository_Proxy_Impl&
--IR::_TAO_Repository_Remote_Proxy_Broker::select_proxy (
--  ::IR::Repository *object,
-+_TAO_Repository_Proxy_Impl&
-+_TAO_Repository_Remote_Proxy_Broker::select_proxy (
-+  ::IR_Repository *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -13037,109 +12664,109 @@
- 
- 
- // default constructor
--IR::Repository::Repository (int collocated)
-+IR_Repository::IR_Repository (int collocated)
- {
-   this->IR_Repository_setup_collocation (collocated);
- }
- 
- // destructor
--IR::Repository::~Repository (void)
-+IR_Repository::~IR_Repository (void)
- {}
- 
- void
--IR::Repository::IR_Repository_setup_collocation (int collocated)
-+IR_Repository::IR_Repository_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_Repository_Proxy_Broker_ =
--      ::IR__TAO_Repository_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_Repository_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_Repository_Proxy_Broker_ =
--      ::IR::_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker ();
-+      ::_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker ();
-   
-   this->IR_Container_setup_collocation (collocated);
- }
- 
--void IR::Repository::_tao_any_destructor (void *x)
-+void IR_Repository::_tao_any_destructor (void *x)
- {
--  Repository *tmp = ACE_static_cast (Repository*,x);
-+  IR_Repository *tmp = ACE_static_cast (IR_Repository*,x);
-   CORBA::release (tmp);
- }
- 
--IR::Repository_ptr IR::Repository::_narrow (
-+IR_Repository_ptr IR_Repository::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return Repository::_nil ();
-+    return IR_Repository::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/Repository:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (Repository::_nil ());
-+      ACE_CHECK_RETURN (IR_Repository::_nil ());
-       if (is_a == 0)
--        return Repository::_nil ();
-+        return IR_Repository::_nil ();
-     }
--  return Repository::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_Repository::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::Repository_ptr IR::Repository::_unchecked_narrow (
-+IR_Repository_ptr IR_Repository::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return Repository::_nil ();
-+    return IR_Repository::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      Repository_ptr default_proxy = Repository::_nil ();
-+      IR_Repository_ptr default_proxy = IR_Repository::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_Repository_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_Repository_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::Repository (
-+          ::IR_Repository (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          Repository::_nil ());
-+          IR_Repository::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::Repository (stub, 0, obj->_servant ()), Repository::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_Repository (stub, 0, obj->_servant ()), IR_Repository::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            Repository_ptr,
-+            IR_Repository_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &Repository::_narrow
-+                      &IR_Repository::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::Repository_ptr
--IR::Repository::_duplicate (Repository_ptr obj)
-+IR_Repository_ptr
-+IR_Repository::_duplicate (IR_Repository_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::Repository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_Repository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Repository:1.0")) ||
-@@ -13151,34 +12778,34 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::Repository::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_Repository::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Repository)::_narrow))
-+      &IR_Repository::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-+      &IR_Container::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Container_ptr,
-+            IR_Container_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -13191,12 +12818,12 @@
-   return retv;
- }
- 
--const char* IR::Repository::_interface_repository_id (void) const
-+const char* IR_Repository::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/Repository:1.0";
- }
- 
--IR::Contained_ptr IR::Repository::lookup_id (
-+IR_Contained_ptr IR_Repository::lookup_id (
-     const char * search_id,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -13215,7 +12842,7 @@
-     );
- }
- 
--CORBA::TypeCode_ptr IR::Repository::get_canonical_typecode (
-+CORBA::TypeCode_ptr IR_Repository::get_canonical_typecode (
-     CORBA::TypeCode_ptr tc,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -13234,8 +12861,8 @@
-     );
- }
- 
--IR::PrimitiveDef_ptr IR::Repository::get_primitive (
--    IR::PrimitiveKind kind,
-+IR_PrimitiveDef_ptr IR_Repository::get_primitive (
-+    IR_PrimitiveKind kind,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -13253,7 +12880,7 @@
-     );
- }
- 
--IR::StringDef_ptr IR::Repository::create_string (
-+IR_StringDef_ptr IR_Repository::create_string (
-     CORBA::ULong bound,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -13272,7 +12899,7 @@
-     );
- }
- 
--IR::WstringDef_ptr IR::Repository::create_wstring (
-+IR_WstringDef_ptr IR_Repository::create_wstring (
-     CORBA::ULong bound,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -13291,9 +12918,9 @@
-     );
- }
- 
--IR::SequenceDef_ptr IR::Repository::create_sequence (
-+IR_SequenceDef_ptr IR_Repository::create_sequence (
-     CORBA::ULong bound,
--    IR::IDLType_ptr element_type,
-+    IR_IDLType_ptr element_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -13312,9 +12939,9 @@
-     );
- }
- 
--IR::ArrayDef_ptr IR::Repository::create_array (
-+IR_ArrayDef_ptr IR_Repository::create_array (
-     CORBA::ULong length,
--    IR::IDLType_ptr element_type,
-+    IR_IDLType_ptr element_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -13333,7 +12960,7 @@
-     );
- }
- 
--IR::FixedDef_ptr IR::Repository::create_fixed (
-+IR_FixedDef_ptr IR_Repository::create_fixed (
-     CORBA::UShort digits,
-     CORBA::Short scale,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -13354,9 +12981,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::TAO_ClientRequestInfo_IR_Repository_lookup_id (
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::TAO_ClientRequestInfo_IR_Repository_lookup_id (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * search_id,
-@@ -13367,7 +12993,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -13386,7 +13012,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -13399,7 +13025,7 @@
- 
- 
- CORBA::Any * 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -13415,13 +13041,13 @@
- }
- 
- void 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::result (IR::Contained_ptr result)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::result (IR_Contained_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode (
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::TypeCode_ptr tc,
-@@ -13432,7 +13058,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -13451,7 +13077,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -13464,7 +13090,7 @@
- 
- 
- CORBA::Any * 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -13480,16 +13106,16 @@
- }
- 
- void 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::TypeCode_ptr result)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::TypeCode_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::TAO_ClientRequestInfo_IR_Repository_get_primitive (
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::TAO_ClientRequestInfo_IR_Repository_get_primitive (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::PrimitiveKind & kind,
-+    IR_PrimitiveKind & kind,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -13497,7 +13123,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -13517,7 +13143,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -13530,7 +13156,7 @@
- 
- 
- CORBA::Any * 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -13546,13 +13172,13 @@
- }
- 
- void 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::result (IR::PrimitiveDef_ptr result)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::result (IR_PrimitiveDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string::TAO_ClientRequestInfo_IR_Repository_create_string (
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string::TAO_ClientRequestInfo_IR_Repository_create_string (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::ULong & bound,
-@@ -13563,7 +13189,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -13582,7 +13208,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -13595,7 +13221,7 @@
- 
- 
- CORBA::Any * 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -13611,13 +13237,13 @@
- }
- 
- void 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string::result (IR::StringDef_ptr result)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_string::result (IR_StringDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::TAO_ClientRequestInfo_IR_Repository_create_wstring (
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::TAO_ClientRequestInfo_IR_Repository_create_wstring (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::ULong & bound,
-@@ -13628,7 +13254,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -13647,7 +13273,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -13660,7 +13286,7 @@
- 
- 
- CORBA::Any * 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -13676,17 +13302,17 @@
- }
- 
- void 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::result (IR::WstringDef_ptr result)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::result (IR_WstringDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::TAO_ClientRequestInfo_IR_Repository_create_sequence (
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::TAO_ClientRequestInfo_IR_Repository_create_sequence (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::ULong & bound,
--    IR::IDLType_ptr element_type,
-+    IR_IDLType_ptr element_type,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -13695,7 +13321,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -13720,7 +13346,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -13733,7 +13359,7 @@
- 
- 
- CORBA::Any * 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -13749,17 +13375,17 @@
- }
- 
- void 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::result (IR::SequenceDef_ptr result)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::result (IR_SequenceDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array::TAO_ClientRequestInfo_IR_Repository_create_array (
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array::TAO_ClientRequestInfo_IR_Repository_create_array (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::ULong & length,
--    IR::IDLType_ptr element_type,
-+    IR_IDLType_ptr element_type,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -13768,7 +13394,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -13793,7 +13419,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -13806,7 +13432,7 @@
- 
- 
- CORBA::Any * 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -13822,13 +13448,13 @@
- }
- 
- void 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array::result (IR::ArrayDef_ptr result)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_array::result (IR_ArrayDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::TAO_ClientRequestInfo_IR_Repository_create_fixed (
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::TAO_ClientRequestInfo_IR_Repository_create_fixed (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::UShort & digits,
-@@ -13841,7 +13467,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -13865,7 +13491,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -13878,7 +13504,7 @@
- 
- 
- CORBA::Any * 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -13894,20 +13520,21 @@
- }
- 
- void 
--IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::result (IR::FixedDef_ptr result)
-+IR_Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::result (IR_FixedDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_Repository[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Repository:1.0
--  11, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72790000),  // name = Repository
-+  11, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72790000),  // name = IR_Repository
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_Repository (CORBA::tk_objref, sizeof (_oc_IR_Repository), (char *) &_oc_IR_Repository, 0, sizeof (IR::Repository));
-+static CORBA::TypeCode _tc_TAO_tc_IR_Repository (CORBA::tk_objref, sizeof (_oc_IR_Repository), (char *) &_oc_IR_Repository, 0, sizeof (IR_Repository));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Repository, &_tc_TAO_tc_IR_Repository)
-@@ -13917,37 +13544,34 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_ComponentRepository_Proxy_Impl::_TAO_ComponentRepository_Proxy_Impl (void)
-+_TAO_ComponentRepository_Proxy_Impl::_TAO_ComponentRepository_Proxy_Impl (void)
- {}
- 
--IR::_TAO_ComponentRepository_Remote_Proxy_Impl::_TAO_ComponentRepository_Remote_Proxy_Impl (void)
-+_TAO_ComponentRepository_Remote_Proxy_Impl::_TAO_ComponentRepository_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_component (
-+IR_ComponentDef_ptr _TAO_ComponentRepository_Remote_Proxy_Impl::create_component (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ComponentDef_ptr base_component,
--    const IR::InterfaceDefSeq & supports_interfaces,
-+    IR_ComponentDef_ptr base_component,
-+    const IR_InterfaceDefSeq & supports_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--  IR::ComponentDef_ptr _tao_retval = IR::ComponentDef::_nil ();
--  IR::ComponentDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_ComponentDef_ptr _tao_retval = IR_ComponentDef::_nil ();
-+  IR_ComponentDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_component",
-@@ -13968,7 +13592,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component ri (
-+      IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -14043,7 +13667,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -14109,30 +13733,27 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
-+IR_HomeDef_ptr _TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::HomeDef_ptr base_home,
--    IR::ComponentDef_ptr managed_component,
--    IR::ValueDef_ptr primary_key,
-+    IR_HomeDef_ptr base_home,
-+    IR_ComponentDef_ptr managed_component,
-+    IR_ValueDef_ptr primary_key,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--  IR::HomeDef_ptr _tao_retval = IR::HomeDef::_nil ();
--  IR::HomeDef_var _tao_safe_retval (_tao_retval);
--  
-+  IR_HomeDef_ptr _tao_retval = IR_HomeDef::_nil ();
-+  IR_HomeDef_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "create_home",
-@@ -14153,7 +13774,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home ri (
-+      IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -14230,7 +13851,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::HomeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_HomeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -14306,37 +13927,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_ComponentRepository_Proxy_Broker::_TAO_ComponentRepository_Proxy_Broker (void)
-+_TAO_ComponentRepository_Proxy_Broker::_TAO_ComponentRepository_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ComponentRepository_Proxy_Broker::~_TAO_ComponentRepository_Proxy_Broker (void)
-+_TAO_ComponentRepository_Proxy_Broker::~_TAO_ComponentRepository_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ComponentRepository_Proxy_Broker * (*IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
-+_TAO_ComponentRepository_Proxy_Broker * (*_TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_ComponentRepository_Remote_Proxy_Broker *
--IR::_TAO_ComponentRepository_Remote_Proxy_Broker::the_TAO_ComponentRepository_Remote_Proxy_Broker (void)
-+_TAO_ComponentRepository_Remote_Proxy_Broker *
-+_TAO_ComponentRepository_Remote_Proxy_Broker::the_TAO_ComponentRepository_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_ComponentRepository_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_ComponentRepository_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_ComponentRepository_Remote_Proxy_Broker::_TAO_ComponentRepository_Remote_Proxy_Broker (void)
-+_TAO_ComponentRepository_Remote_Proxy_Broker::_TAO_ComponentRepository_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ComponentRepository_Remote_Proxy_Broker::~_TAO_ComponentRepository_Remote_Proxy_Broker (void)
-+_TAO_ComponentRepository_Remote_Proxy_Broker::~_TAO_ComponentRepository_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ComponentRepository_Proxy_Impl&
--IR::_TAO_ComponentRepository_Remote_Proxy_Broker::select_proxy (
--  ::IR::ComponentRepository *object,
-+_TAO_ComponentRepository_Proxy_Impl&
-+_TAO_ComponentRepository_Remote_Proxy_Broker::select_proxy (
-+  ::IR_ComponentRepository *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -14352,109 +13973,109 @@
- 
- 
- // default constructor
--IR::ComponentRepository::ComponentRepository (int collocated)
-+IR_ComponentRepository::IR_ComponentRepository (int collocated)
- {
-   this->IR_ComponentRepository_setup_collocation (collocated);
- }
- 
- // destructor
--IR::ComponentRepository::~ComponentRepository (void)
-+IR_ComponentRepository::~IR_ComponentRepository (void)
- {}
- 
- void
--IR::ComponentRepository::IR_ComponentRepository_setup_collocation (int collocated)
-+IR_ComponentRepository::IR_ComponentRepository_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_ComponentRepository_Proxy_Broker_ =
--      ::IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_ComponentRepository_Proxy_Broker_ =
--      ::IR::_TAO_ComponentRepository_Remote_Proxy_Broker::the_TAO_ComponentRepository_Remote_Proxy_Broker ();
-+      _TAO_ComponentRepository_Remote_Proxy_Broker::the_TAO_ComponentRepository_Remote_Proxy_Broker ();
-   
-   this->IR_Repository_setup_collocation (collocated);
- }
- 
--void IR::ComponentRepository::_tao_any_destructor (void *x)
-+void IR_ComponentRepository::_tao_any_destructor (void *x)
- {
--  ComponentRepository *tmp = ACE_static_cast (ComponentRepository*,x);
-+  IR_ComponentRepository *tmp = ACE_static_cast (IR_ComponentRepository*,x);
-   CORBA::release (tmp);
- }
- 
--IR::ComponentRepository_ptr IR::ComponentRepository::_narrow (
-+IR_ComponentRepository_ptr IR_ComponentRepository::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ComponentRepository::_nil ();
-+    return IR_ComponentRepository::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentRepository:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (ComponentRepository::_nil ());
-+      ACE_CHECK_RETURN (IR_ComponentRepository::_nil ());
-       if (is_a == 0)
--        return ComponentRepository::_nil ();
-+        return IR_ComponentRepository::_nil ();
-     }
--  return ComponentRepository::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_ComponentRepository::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::ComponentRepository_ptr IR::ComponentRepository::_unchecked_narrow (
-+IR_ComponentRepository_ptr IR_ComponentRepository::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ComponentRepository::_nil ();
-+    return IR_ComponentRepository::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      ComponentRepository_ptr default_proxy = ComponentRepository::_nil ();
-+      IR_ComponentRepository_ptr default_proxy = IR_ComponentRepository::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::ComponentRepository (
-+          ::IR_ComponentRepository (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          ComponentRepository::_nil ());
-+          IR_ComponentRepository::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::ComponentRepository (stub, 0, obj->_servant ()), ComponentRepository::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_ComponentRepository (stub, 0, obj->_servant ()), IR_ComponentRepository::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            ComponentRepository_ptr,
-+            IR_ComponentRepository_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &ComponentRepository::_narrow
-+                      &IR_ComponentRepository::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::ComponentRepository_ptr
--IR::ComponentRepository::_duplicate (ComponentRepository_ptr obj)
-+IR_ComponentRepository_ptr
-+IR_ComponentRepository::_duplicate (IR_ComponentRepository_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::ComponentRepository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_ComponentRepository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentRepository:1.0")) ||
-@@ -14467,46 +14088,46 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::ComponentRepository::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ComponentRepository::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, ComponentRepository)::_narrow))
-+      &IR_ComponentRepository::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Repository)::_narrow))
-+      &IR_Repository::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Repository_ptr,
-+            IR_Repository_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-+      &IR_Container::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Container_ptr,
-+            IR_Container_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -14519,17 +14140,17 @@
-   return retv;
- }
- 
--const char* IR::ComponentRepository::_interface_repository_id (void) const
-+const char* IR_ComponentRepository::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/ComponentRepository:1.0";
- }
- 
--IR::ComponentDef_ptr IR::ComponentRepository::create_component (
-+IR_ComponentDef_ptr IR_ComponentRepository::create_component (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ComponentDef_ptr base_component,
--    const IR::InterfaceDefSeq & supports_interfaces,
-+    IR_ComponentDef_ptr base_component,
-+    const IR_InterfaceDefSeq & supports_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14551,13 +14172,13 @@
-     );
- }
- 
--IR::HomeDef_ptr IR::ComponentRepository::create_home (
-+IR_HomeDef_ptr IR_ComponentRepository::create_home (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::HomeDef_ptr base_home,
--    IR::ComponentDef_ptr managed_component,
--    IR::ValueDef_ptr primary_key,
-+    IR_HomeDef_ptr base_home,
-+    IR_ComponentDef_ptr managed_component,
-+    IR_ValueDef_ptr primary_key,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -14580,16 +14201,15 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::TAO_ClientRequestInfo_IR_ComponentRepository_create_component (
-+IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::TAO_ClientRequestInfo_IR_ComponentRepository_create_component (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ComponentDef_ptr base_component,
--    const IR::InterfaceDefSeq & supports_interfaces,
-+    IR_ComponentDef_ptr base_component,
-+    const IR_InterfaceDefSeq & supports_interfaces,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -14601,7 +14221,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -14642,7 +14262,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -14655,7 +14275,7 @@
- 
- 
- CORBA::Any * 
--IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -14671,21 +14291,21 @@
- }
- 
- void 
--IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (IR::ComponentDef_ptr result)
-+IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (IR_ComponentDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::TAO_ClientRequestInfo_IR_ComponentRepository_create_home (
-+IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::TAO_ClientRequestInfo_IR_ComponentRepository_create_home (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::HomeDef_ptr base_home,
--    IR::ComponentDef_ptr managed_component,
--    IR::ValueDef_ptr primary_key,
-+    IR_HomeDef_ptr base_home,
-+    IR_ComponentDef_ptr managed_component,
-+    IR_ValueDef_ptr primary_key,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -14698,7 +14318,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -14745,7 +14365,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -14758,7 +14378,7 @@
- 
- 
- CORBA::Any * 
--IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -14774,20 +14394,21 @@
- }
- 
- void 
--IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (IR::HomeDef_ptr result)
-+IR_ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (IR_HomeDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_ComponentRepository[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ComponentRepository:1.0
--  20, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74526570), ACE_NTOHL (0x6f736974), ACE_NTOHL (0x6f727900),  // name = ComponentRepository
-+  20, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74526570), ACE_NTOHL (0x6f736974), ACE_NTOHL (0x6f727900),  // name = IR_ComponentRepository
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ComponentRepository (CORBA::tk_objref, sizeof (_oc_IR_ComponentRepository), (char *) &_oc_IR_ComponentRepository, 0, sizeof (IR::ComponentRepository));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ComponentRepository (CORBA::tk_objref, sizeof (_oc_IR_ComponentRepository), (char *) &_oc_IR_ComponentRepository, 0, sizeof (IR_ComponentRepository));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentRepository, &_tc_TAO_tc_IR_ComponentRepository)
-@@ -14797,10 +14418,10 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_ModuleDef_Proxy_Impl::_TAO_ModuleDef_Proxy_Impl (void)
-+_TAO_ModuleDef_Proxy_Impl::_TAO_ModuleDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_ModuleDef_Remote_Proxy_Impl::_TAO_ModuleDef_Remote_Proxy_Impl (void)
-+_TAO_ModuleDef_Remote_Proxy_Impl::_TAO_ModuleDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
-@@ -14815,37 +14436,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_ModuleDef_Proxy_Broker::_TAO_ModuleDef_Proxy_Broker (void)
-+_TAO_ModuleDef_Proxy_Broker::_TAO_ModuleDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ModuleDef_Proxy_Broker::~_TAO_ModuleDef_Proxy_Broker (void)
-+_TAO_ModuleDef_Proxy_Broker::~_TAO_ModuleDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ModuleDef_Proxy_Broker * (*IR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_ModuleDef_Proxy_Broker * (*_TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_ModuleDef_Remote_Proxy_Broker *
--IR::_TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker (void)
-+_TAO_ModuleDef_Remote_Proxy_Broker *
-+_TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_ModuleDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_ModuleDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_ModuleDef_Remote_Proxy_Broker::_TAO_ModuleDef_Remote_Proxy_Broker (void)
-+_TAO_ModuleDef_Remote_Proxy_Broker::_TAO_ModuleDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ModuleDef_Remote_Proxy_Broker::~_TAO_ModuleDef_Remote_Proxy_Broker (void)
-+_TAO_ModuleDef_Remote_Proxy_Broker::~_TAO_ModuleDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ModuleDef_Proxy_Impl&
--IR::_TAO_ModuleDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::ModuleDef *object,
-+_TAO_ModuleDef_Proxy_Impl&
-+_TAO_ModuleDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_ModuleDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -14861,111 +14482,110 @@
- 
- 
- // default constructor
--IR::ModuleDef::ModuleDef (int collocated)
-+IR_ModuleDef::IR_ModuleDef (int collocated)
- {
-   this->IR_ModuleDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::ModuleDef::~ModuleDef (void)
-+IR_ModuleDef::~IR_ModuleDef (void)
- {}
- 
- void
--IR::ModuleDef::IR_ModuleDef_setup_collocation (int collocated)
-+IR_ModuleDef::IR_ModuleDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_ModuleDef_Proxy_Broker_ =
--      ::IR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_ModuleDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_ModuleDef_Proxy_Broker_ =
--      ::IR::_TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker ();
-+      _TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker ();
-   
-   this->IR_Container_setup_collocation (collocated);
--  
-   this->IR_Contained_setup_collocation (collocated);
- }
- 
--void IR::ModuleDef::_tao_any_destructor (void *x)
-+void IR_ModuleDef::_tao_any_destructor (void *x)
- {
--  ModuleDef *tmp = ACE_static_cast (ModuleDef*,x);
-+  IR_ModuleDef *tmp = ACE_static_cast (IR_ModuleDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::ModuleDef_ptr IR::ModuleDef::_narrow (
-+IR_ModuleDef_ptr IR_ModuleDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ModuleDef::_nil ();
-+    return IR_ModuleDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ModuleDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (ModuleDef::_nil ());
-+      ACE_CHECK_RETURN (IR_ModuleDef::_nil ());
-       if (is_a == 0)
--        return ModuleDef::_nil ();
-+        return IR_ModuleDef::_nil ();
-     }
--  return ModuleDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_ModuleDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::ModuleDef_ptr IR::ModuleDef::_unchecked_narrow (
-+IR_ModuleDef_ptr IR_ModuleDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ModuleDef::_nil ();
-+    return IR_ModuleDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      ModuleDef_ptr default_proxy = ModuleDef::_nil ();
-+      IR_ModuleDef_ptr default_proxy = IR_ModuleDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_ModuleDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::ModuleDef (
-+          ::IR_ModuleDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          ModuleDef::_nil ());
-+          IR_ModuleDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::ModuleDef (stub, 0, obj->_servant ()), ModuleDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_ModuleDef (stub, 0, obj->_servant ()), IR_ModuleDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            ModuleDef_ptr,
-+            IR_ModuleDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &ModuleDef::_narrow
-+                      &IR_ModuleDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::ModuleDef_ptr
--IR::ModuleDef::_duplicate (ModuleDef_ptr obj)
-+IR_ModuleDef_ptr
-+IR_ModuleDef::_duplicate (IR_ModuleDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::ModuleDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_ModuleDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ModuleDef:1.0")) ||
-@@ -14978,46 +14598,46 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::ModuleDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ModuleDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, ModuleDef)::_narrow))
-+      &IR_ModuleDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-+      &IR_Container::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Container_ptr,
-+            IR_Container_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -15030,25 +14650,23 @@
-   return retv;
- }
- 
--const char* IR::ModuleDef::_interface_repository_id (void) const
-+const char* IR_ModuleDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/ModuleDef:1.0";
- }
- 
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
- static const CORBA::Long _oc_IR_ModuleDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4d), ACE_NTOHL (0x6f64756c), ACE_NTOHL (0x65446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/ModuleDef:1.0
--  10, ACE_NTOHL (0x4d6f6475), ACE_NTOHL (0x6c654465), ACE_NTOHL (0x66000000),  // name = ModuleDef
-+  10, ACE_NTOHL (0x4d6f6475), ACE_NTOHL (0x6c654465), ACE_NTOHL (0x66000000),  // name = IR_ModuleDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ModuleDef (CORBA::tk_objref, sizeof (_oc_IR_ModuleDef), (char *) &_oc_IR_ModuleDef, 0, sizeof (IR::ModuleDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ModuleDef (CORBA::tk_objref, sizeof (_oc_IR_ModuleDef), (char *) &_oc_IR_ModuleDef, 0, sizeof (IR_ModuleDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ModuleDef, &_tc_TAO_tc_IR_ModuleDef)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_ModuleDescription[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -15092,31 +14710,31 @@
-     0U, // string length
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ModuleDescription (CORBA::tk_struct, sizeof (_oc_IR_ModuleDescription), (char *) &_oc_IR_ModuleDescription, 0, sizeof (IR::ModuleDescription));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ModuleDescription (CORBA::tk_struct, sizeof (_oc_IR_ModuleDescription), (char *) &_oc_IR_ModuleDescription, 0, sizeof (IR_ModuleDescription));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ModuleDescription, &_tc_TAO_tc_IR_ModuleDescription)
- TAO_NAMESPACE_END
--void IR::ModuleDescription::_tao_any_destructor (void *x)
-+
-+void IR_ModuleDescription::_tao_any_destructor (void *x)
- {
--  ModuleDescription *tmp = ACE_static_cast (ModuleDescription*,x);
-+  IR_ModuleDescription *tmp = ACE_static_cast (IR_ModuleDescription*,x);
-   delete tmp;
- }
- 
--
- ///////////////////////////////////////////////////////////////////////
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_ConstantDef_Proxy_Impl::_TAO_ConstantDef_Proxy_Impl (void)
-+_TAO_ConstantDef_Proxy_Impl::_TAO_ConstantDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_ConstantDef_Remote_Proxy_Impl::_TAO_ConstantDef_Remote_Proxy_Impl (void)
-+_TAO_ConstantDef_Remote_Proxy_Impl::_TAO_ConstantDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--CORBA::TypeCode_ptr IR::_TAO_ConstantDef_Remote_Proxy_Impl::type (
-+CORBA::TypeCode_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -15124,16 +14742,13 @@
-     CORBA::SystemException
-   ))
- {
--  
-   CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
-   CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-   
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_type",
-@@ -15154,7 +14769,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get ri (
-+      IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -15276,7 +14891,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::IDLType_ptr IR::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
-+IR_IDLType_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -15284,16 +14899,13 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
--  IR::IDLType_var _tao_safe_retval (_tao_retval);
--  
-+  IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
-+  IR_IDLType_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_type_def",
-@@ -15314,7 +14926,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get ri (
-+      IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -15370,7 +14982,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -15436,19 +15048,15 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
-+void _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr type_def,
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -15474,7 +15082,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set ri (
-+      IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         type_def,
-@@ -15588,7 +15196,7 @@
-   
- }
- 
--CORBA::Any * IR::_TAO_ConstantDef_Remote_Proxy_Impl::value (
-+CORBA::Any * _TAO_ConstantDef_Remote_Proxy_Impl::value (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -15596,15 +15204,12 @@
-     CORBA::SystemException
-   ))
- {
--  
-   CORBA::Any *_tao_retval = 0;
-   
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   ACE_NEW_RETURN (_tao_retval, CORBA::Any, _tao_retval);
-   CORBA::Any_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-@@ -15627,7 +15232,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get ri (
-+      IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -15749,7 +15354,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_ConstantDef_Remote_Proxy_Impl::value (
-+void _TAO_ConstantDef_Remote_Proxy_Impl::value (
-     CORBA_Object *_collocated_tao_target_,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -15758,10 +15363,6 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -15787,7 +15388,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set ri (
-+      IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         value,
-@@ -15901,7 +15502,6 @@
-   
- }
- 
--
- //
- //            End  Base & Remote  Proxy Implemeentation. 
- ///////////////////////////////////////////////////////////////////////
-@@ -15911,37 +15511,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_ConstantDef_Proxy_Broker::_TAO_ConstantDef_Proxy_Broker (void)
-+_TAO_ConstantDef_Proxy_Broker::_TAO_ConstantDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ConstantDef_Proxy_Broker::~_TAO_ConstantDef_Proxy_Broker (void)
-+_TAO_ConstantDef_Proxy_Broker::~_TAO_ConstantDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ConstantDef_Proxy_Broker * (*IR__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_ConstantDef_Proxy_Broker * (*_TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_ConstantDef_Remote_Proxy_Broker *
--IR::_TAO_ConstantDef_Remote_Proxy_Broker::the_TAO_ConstantDef_Remote_Proxy_Broker (void)
-+_TAO_ConstantDef_Remote_Proxy_Broker *
-+_TAO_ConstantDef_Remote_Proxy_Broker::the_TAO_ConstantDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_ConstantDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_ConstantDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_ConstantDef_Remote_Proxy_Broker::_TAO_ConstantDef_Remote_Proxy_Broker (void)
-+_TAO_ConstantDef_Remote_Proxy_Broker::_TAO_ConstantDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ConstantDef_Remote_Proxy_Broker::~_TAO_ConstantDef_Remote_Proxy_Broker (void)
-+_TAO_ConstantDef_Remote_Proxy_Broker::~_TAO_ConstantDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ConstantDef_Proxy_Impl&
--IR::_TAO_ConstantDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::ConstantDef *object,
-+_TAO_ConstantDef_Proxy_Impl&
-+_TAO_ConstantDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_ConstantDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -15957,109 +15557,109 @@
- 
- 
- // default constructor
--IR::ConstantDef::ConstantDef (int collocated)
-+IR_ConstantDef::IR_ConstantDef (int collocated)
- {
-   this->IR_ConstantDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::ConstantDef::~ConstantDef (void)
-+IR_ConstantDef::~IR_ConstantDef (void)
- {}
- 
- void
--IR::ConstantDef::IR_ConstantDef_setup_collocation (int collocated)
-+IR_ConstantDef::IR_ConstantDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_ConstantDef_Proxy_Broker_ =
--      ::IR__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_ConstantDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_ConstantDef_Proxy_Broker_ =
--      ::IR::_TAO_ConstantDef_Remote_Proxy_Broker::the_TAO_ConstantDef_Remote_Proxy_Broker ();
-+      _TAO_ConstantDef_Remote_Proxy_Broker::the_TAO_ConstantDef_Remote_Proxy_Broker ();
-   
-   this->IR_Contained_setup_collocation (collocated);
- }
- 
--void IR::ConstantDef::_tao_any_destructor (void *x)
-+void IR_ConstantDef::_tao_any_destructor (void *x)
- {
--  ConstantDef *tmp = ACE_static_cast (ConstantDef*,x);
-+  IR_ConstantDef *tmp = ACE_static_cast (IR_ConstantDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::ConstantDef_ptr IR::ConstantDef::_narrow (
-+IR_ConstantDef_ptr IR_ConstantDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ConstantDef::_nil ();
-+    return IR_ConstantDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConstantDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (ConstantDef::_nil ());
-+      ACE_CHECK_RETURN (IR_ConstantDef::_nil ());
-       if (is_a == 0)
--        return ConstantDef::_nil ();
-+        return IR_ConstantDef::_nil ();
-     }
--  return ConstantDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_ConstantDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::ConstantDef_ptr IR::ConstantDef::_unchecked_narrow (
-+IR_ConstantDef_ptr IR_ConstantDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ConstantDef::_nil ();
-+    return IR_ConstantDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      ConstantDef_ptr default_proxy = ConstantDef::_nil ();
-+      IR_ConstantDef_ptr default_proxy = IR_ConstantDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_ConstantDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::ConstantDef (
-+          ::IR_ConstantDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          ConstantDef::_nil ());
-+          IR_ConstantDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::ConstantDef (stub, 0, obj->_servant ()), ConstantDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_ConstantDef (stub, 0, obj->_servant ()), IR_ConstantDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            ConstantDef_ptr,
-+            IR_ConstantDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &ConstantDef::_narrow
-+                      &IR_ConstantDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::ConstantDef_ptr
--IR::ConstantDef::_duplicate (ConstantDef_ptr obj)
-+IR_ConstantDef_ptr
-+IR_ConstantDef::_duplicate (IR_ConstantDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::ConstantDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_ConstantDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConstantDef:1.0")) ||
-@@ -16071,34 +15671,34 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::ConstantDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ConstantDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, ConstantDef)::_narrow))
-+      &IR_ConstantDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -16111,12 +15711,12 @@
-   return retv;
- }
- 
--const char* IR::ConstantDef::_interface_repository_id (void) const
-+const char* IR_ConstantDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/ConstantDef:1.0";
- }
- 
--CORBA::TypeCode_ptr IR::ConstantDef::type (
-+CORBA::TypeCode_ptr IR_ConstantDef::type (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -16133,7 +15733,7 @@
-     );
- }
- 
--IR::IDLType_ptr IR::ConstantDef::type_def (
-+IR_IDLType_ptr IR_ConstantDef::type_def (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -16150,8 +15750,8 @@
-     );
- }
- 
--void IR::ConstantDef::type_def (
--    IR::IDLType_ptr type_def,
-+void IR_ConstantDef::type_def (
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -16169,7 +15769,7 @@
-     );
- }
- 
--CORBA::Any * IR::ConstantDef::value (
-+CORBA::Any * IR_ConstantDef::value (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -16186,7 +15786,7 @@
-     );
- }
- 
--void IR::ConstantDef::value (
-+void IR_ConstantDef::value (
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -16205,9 +15805,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::TAO_ClientRequestInfo_IR_ConstantDef_type_get (
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::TAO_ClientRequestInfo_IR_ConstantDef_type_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -16216,7 +15815,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -16228,7 +15827,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -16241,7 +15840,7 @@
- 
- 
- CORBA::Any * 
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -16257,13 +15856,13 @@
- }
- 
- void 
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::result (CORBA::TypeCode_ptr result)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::result (CORBA::TypeCode_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get (
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -16272,7 +15871,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -16284,7 +15883,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -16297,7 +15896,7 @@
- 
- 
- CORBA::Any * 
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -16313,16 +15912,16 @@
- }
- 
- void 
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::result (IR::IDLType_ptr result)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::result (IR_IDLType_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set (
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr type_def,
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -16330,7 +15929,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -16350,7 +15949,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -16363,7 +15962,7 @@
- 
- 
- CORBA::Any * 
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -16375,7 +15974,7 @@
-   return result_any;
- }
- 
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::TAO_ClientRequestInfo_IR_ConstantDef_value_get (
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::TAO_ClientRequestInfo_IR_ConstantDef_value_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -16384,7 +15983,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -16396,7 +15995,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -16409,7 +16008,7 @@
- 
- 
- CORBA::Any * 
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -16425,13 +16024,13 @@
- }
- 
- void 
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::result (CORBA::Any * result)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::result (CORBA::Any * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::TAO_ClientRequestInfo_IR_ConstantDef_value_set (
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::TAO_ClientRequestInfo_IR_ConstantDef_value_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::Any & value,
-@@ -16442,7 +16041,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -16461,7 +16060,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -16474,7 +16073,7 @@
- 
- 
- CORBA::Any * 
--IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -16487,17 +16086,19 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_ConstantDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7374), ACE_NTOHL (0x616e7444), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ConstantDef:1.0
--  12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x74616e74), ACE_NTOHL (0x44656600),  // name = ConstantDef
-+  12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x74616e74), ACE_NTOHL (0x44656600),  // name = IR_ConstantDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ConstantDef (CORBA::tk_objref, sizeof (_oc_IR_ConstantDef), (char *) &_oc_IR_ConstantDef, 0, sizeof (IR::ConstantDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ConstantDef (CORBA::tk_objref, sizeof (_oc_IR_ConstantDef), (char *) &_oc_IR_ConstantDef, 0, sizeof (IR_ConstantDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConstantDef, &_tc_TAO_tc_IR_ConstantDef)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_ConstantDescription[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -16547,14 +16148,15 @@
-   CORBA::tk_any,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ConstantDescription (CORBA::tk_struct, sizeof (_oc_IR_ConstantDescription), (char *) &_oc_IR_ConstantDescription, 0, sizeof (IR::ConstantDescription));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ConstantDescription (CORBA::tk_struct, sizeof (_oc_IR_ConstantDescription), (char *) &_oc_IR_ConstantDescription, 0, sizeof (IR_ConstantDescription));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConstantDescription, &_tc_TAO_tc_IR_ConstantDescription)
- TAO_NAMESPACE_END
--void IR::ConstantDescription::_tao_any_destructor (void *x)
-+
-+void IR_ConstantDescription::_tao_any_destructor (void *x)
- {
--  ConstantDescription *tmp = ACE_static_cast (ConstantDescription*,x);
-+  IR_ConstantDescription *tmp = ACE_static_cast (IR_ConstantDescription*,x);
-   delete tmp;
- }
- 
-@@ -16563,10 +16165,10 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_TypedefDef_Proxy_Impl::_TAO_TypedefDef_Proxy_Impl (void)
-+_TAO_TypedefDef_Proxy_Impl::_TAO_TypedefDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_TypedefDef_Remote_Proxy_Impl::_TAO_TypedefDef_Remote_Proxy_Impl (void)
-+_TAO_TypedefDef_Remote_Proxy_Impl::_TAO_TypedefDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
-@@ -16581,37 +16183,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_TypedefDef_Proxy_Broker::_TAO_TypedefDef_Proxy_Broker (void)
-+_TAO_TypedefDef_Proxy_Broker::_TAO_TypedefDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_TypedefDef_Proxy_Broker::~_TAO_TypedefDef_Proxy_Broker (void)
-+_TAO_TypedefDef_Proxy_Broker::~_TAO_TypedefDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_TypedefDef_Proxy_Broker * (*IR__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_TypedefDef_Proxy_Broker * (*_TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_TypedefDef_Remote_Proxy_Broker *
--IR::_TAO_TypedefDef_Remote_Proxy_Broker::the_TAO_TypedefDef_Remote_Proxy_Broker (void)
-+_TAO_TypedefDef_Remote_Proxy_Broker *
-+_TAO_TypedefDef_Remote_Proxy_Broker::the_TAO_TypedefDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_TypedefDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_TypedefDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_TypedefDef_Remote_Proxy_Broker::_TAO_TypedefDef_Remote_Proxy_Broker (void)
-+_TAO_TypedefDef_Remote_Proxy_Broker::_TAO_TypedefDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_TypedefDef_Remote_Proxy_Broker::~_TAO_TypedefDef_Remote_Proxy_Broker (void)
-+_TAO_TypedefDef_Remote_Proxy_Broker::~_TAO_TypedefDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_TypedefDef_Proxy_Impl&
--IR::_TAO_TypedefDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::TypedefDef *object,
-+_TAO_TypedefDef_Proxy_Impl&
-+_TAO_TypedefDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_TypedefDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -16627,111 +16229,110 @@
- 
- 
- // default constructor
--IR::TypedefDef::TypedefDef (int collocated)
-+IR_TypedefDef::IR_TypedefDef (int collocated)
- {
-   this->IR_TypedefDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::TypedefDef::~TypedefDef (void)
-+IR_TypedefDef::~IR_TypedefDef (void)
- {}
- 
- void
--IR::TypedefDef::IR_TypedefDef_setup_collocation (int collocated)
-+IR_TypedefDef::IR_TypedefDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_TypedefDef_Proxy_Broker_ =
--      ::IR__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_TypedefDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_TypedefDef_Proxy_Broker_ =
--      ::IR::_TAO_TypedefDef_Remote_Proxy_Broker::the_TAO_TypedefDef_Remote_Proxy_Broker ();
-+      _TAO_TypedefDef_Remote_Proxy_Broker::the_TAO_TypedefDef_Remote_Proxy_Broker ();
-   
-   this->IR_Contained_setup_collocation (collocated);
--  
-   this->IR_IDLType_setup_collocation (collocated);
- }
- 
--void IR::TypedefDef::_tao_any_destructor (void *x)
-+void IR_TypedefDef::_tao_any_destructor (void *x)
- {
--  TypedefDef *tmp = ACE_static_cast (TypedefDef*,x);
-+  IR_TypedefDef *tmp = ACE_static_cast (IR_TypedefDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::TypedefDef_ptr IR::TypedefDef::_narrow (
-+IR_TypedefDef_ptr IR_TypedefDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return TypedefDef::_nil ();
-+    return IR_TypedefDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/TypedefDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (TypedefDef::_nil ());
-+      ACE_CHECK_RETURN (IR_TypedefDef::_nil ());
-       if (is_a == 0)
--        return TypedefDef::_nil ();
-+        return IR_TypedefDef::_nil ();
-     }
--  return TypedefDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_TypedefDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::TypedefDef_ptr IR::TypedefDef::_unchecked_narrow (
-+IR_TypedefDef_ptr IR_TypedefDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return TypedefDef::_nil ();
-+    return IR_TypedefDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      TypedefDef_ptr default_proxy = TypedefDef::_nil ();
-+      IR_TypedefDef_ptr default_proxy = IR_TypedefDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_TypedefDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::TypedefDef (
-+          ::IR_TypedefDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          TypedefDef::_nil ());
-+          IR_TypedefDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::TypedefDef (stub, 0, obj->_servant ()), TypedefDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_TypedefDef (stub, 0, obj->_servant ()), IR_TypedefDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            TypedefDef_ptr,
-+            IR_TypedefDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &TypedefDef::_narrow
-+                      &IR_TypedefDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::TypedefDef_ptr
--IR::TypedefDef::_duplicate (TypedefDef_ptr obj)
-+IR_TypedefDef_ptr
-+IR_TypedefDef::_duplicate (IR_TypedefDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::TypedefDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_TypedefDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/TypedefDef:1.0")) ||
-@@ -16744,46 +16345,46 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::TypedefDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_TypedefDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, TypedefDef)::_narrow))
-+      &IR_TypedefDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -16796,25 +16397,23 @@
-   return retv;
- }
- 
--const char* IR::TypedefDef::_interface_repository_id (void) const
-+const char* IR_TypedefDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/TypedefDef:1.0";
- }
- 
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
- static const CORBA::Long _oc_IR_TypedefDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f54), ACE_NTOHL (0x79706564), ACE_NTOHL (0x65664465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/TypedefDef:1.0
--  11, ACE_NTOHL (0x54797065), ACE_NTOHL (0x64656644), ACE_NTOHL (0x65660000),  // name = TypedefDef
-+  11, ACE_NTOHL (0x54797065), ACE_NTOHL (0x64656644), ACE_NTOHL (0x65660000),  // name = IR_TypedefDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_TypedefDef (CORBA::tk_objref, sizeof (_oc_IR_TypedefDef), (char *) &_oc_IR_TypedefDef, 0, sizeof (IR::TypedefDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_TypedefDef (CORBA::tk_objref, sizeof (_oc_IR_TypedefDef), (char *) &_oc_IR_TypedefDef, 0, sizeof (IR_TypedefDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TypedefDef, &_tc_TAO_tc_IR_TypedefDef)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_TypeDescription[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -16861,31 +16460,31 @@
-   CORBA::tk_TypeCode,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_TypeDescription (CORBA::tk_struct, sizeof (_oc_IR_TypeDescription), (char *) &_oc_IR_TypeDescription, 0, sizeof (IR::TypeDescription));
-+static CORBA::TypeCode _tc_TAO_tc_IR_TypeDescription (CORBA::tk_struct, sizeof (_oc_IR_TypeDescription), (char *) &_oc_IR_TypeDescription, 0, sizeof (IR_TypeDescription));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TypeDescription, &_tc_TAO_tc_IR_TypeDescription)
- TAO_NAMESPACE_END
--void IR::TypeDescription::_tao_any_destructor (void *x)
-+
-+void IR_TypeDescription::_tao_any_destructor (void *x)
- {
--  TypeDescription *tmp = ACE_static_cast (TypeDescription*,x);
-+  IR_TypeDescription *tmp = ACE_static_cast (IR_TypeDescription*,x);
-   delete tmp;
- }
- 
--
- ///////////////////////////////////////////////////////////////////////
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_StructDef_Proxy_Impl::_TAO_StructDef_Proxy_Impl (void)
-+_TAO_StructDef_Proxy_Impl::_TAO_StructDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_StructDef_Remote_Proxy_Impl::_TAO_StructDef_Remote_Proxy_Impl (void)
-+_TAO_StructDef_Remote_Proxy_Impl::_TAO_StructDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--IR::StructMemberSeq * IR::_TAO_StructDef_Remote_Proxy_Impl::members (
-+IR_StructMemberSeq * _TAO_StructDef_Remote_Proxy_Impl::members (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -16893,17 +16492,14 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::StructMemberSeq *_tao_retval = 0;
--  
-+  IR_StructMemberSeq *_tao_retval = 0;
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
--  ACE_NEW_RETURN (_tao_retval, IR::StructMemberSeq, _tao_retval);
--  IR::StructMemberSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_StructMemberSeq, _tao_retval);
-+  IR_StructMemberSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_members",
-@@ -16924,7 +16520,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get ri (
-+      IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -16980,7 +16576,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -17046,19 +16642,15 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_StructDef_Remote_Proxy_Impl::members (
-+void _TAO_StructDef_Remote_Proxy_Impl::members (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -17084,7 +16676,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set ri (
-+      IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         members,
-@@ -17208,37 +16800,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_StructDef_Proxy_Broker::_TAO_StructDef_Proxy_Broker (void)
-+_TAO_StructDef_Proxy_Broker::_TAO_StructDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_StructDef_Proxy_Broker::~_TAO_StructDef_Proxy_Broker (void)
-+_TAO_StructDef_Proxy_Broker::~_TAO_StructDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_StructDef_Proxy_Broker * (*IR__TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_StructDef_Proxy_Broker * (*_TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_StructDef_Remote_Proxy_Broker *
--IR::_TAO_StructDef_Remote_Proxy_Broker::the_TAO_StructDef_Remote_Proxy_Broker (void)
-+_TAO_StructDef_Remote_Proxy_Broker *
-+_TAO_StructDef_Remote_Proxy_Broker::the_TAO_StructDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_StructDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_StructDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_StructDef_Remote_Proxy_Broker::_TAO_StructDef_Remote_Proxy_Broker (void)
-+_TAO_StructDef_Remote_Proxy_Broker::_TAO_StructDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_StructDef_Remote_Proxy_Broker::~_TAO_StructDef_Remote_Proxy_Broker (void)
-+_TAO_StructDef_Remote_Proxy_Broker::~_TAO_StructDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_StructDef_Proxy_Impl&
--IR::_TAO_StructDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::StructDef *object,
-+_TAO_StructDef_Proxy_Impl&
-+_TAO_StructDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_StructDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -17254,111 +16846,110 @@
- 
- 
- // default constructor
--IR::StructDef::StructDef (int collocated)
-+IR_StructDef::IR_StructDef (int collocated)
- {
-   this->IR_StructDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::StructDef::~StructDef (void)
-+IR_StructDef::~IR_StructDef (void)
- {}
- 
- void
--IR::StructDef::IR_StructDef_setup_collocation (int collocated)
-+IR_StructDef::IR_StructDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_StructDef_Proxy_Broker_ =
--      ::IR__TAO_StructDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_StructDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_StructDef_Proxy_Broker_ =
--      ::IR::_TAO_StructDef_Remote_Proxy_Broker::the_TAO_StructDef_Remote_Proxy_Broker ();
-+      _TAO_StructDef_Remote_Proxy_Broker::the_TAO_StructDef_Remote_Proxy_Broker ();
-   
-   this->IR_TypedefDef_setup_collocation (collocated);
--  
-   this->IR_Container_setup_collocation (collocated);
- }
- 
--void IR::StructDef::_tao_any_destructor (void *x)
-+void IR_StructDef::_tao_any_destructor (void *x)
- {
--  StructDef *tmp = ACE_static_cast (StructDef*,x);
-+  IR_StructDef *tmp = ACE_static_cast (IR_StructDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::StructDef_ptr IR::StructDef::_narrow (
-+IR_StructDef_ptr IR_StructDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return StructDef::_nil ();
-+    return IR_StructDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/StructDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (StructDef::_nil ());
-+      ACE_CHECK_RETURN (IR_StructDef::_nil ());
-       if (is_a == 0)
--        return StructDef::_nil ();
-+        return IR_StructDef::_nil ();
-     }
--  return StructDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_StructDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::StructDef_ptr IR::StructDef::_unchecked_narrow (
-+IR_StructDef_ptr IR_StructDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return StructDef::_nil ();
-+    return IR_StructDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      StructDef_ptr default_proxy = StructDef::_nil ();
-+      IR_StructDef_ptr default_proxy = IR_StructDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_StructDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_StructDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::StructDef (
-+          ::IR_StructDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          StructDef::_nil ());
-+          IR_StructDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::StructDef (stub, 0, obj->_servant ()), StructDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_StructDef (stub, 0, obj->_servant ()), IR_StructDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            StructDef_ptr,
-+            IR_StructDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &StructDef::_narrow
-+                      &IR_StructDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::StructDef_ptr
--IR::StructDef::_duplicate (StructDef_ptr obj)
-+IR_StructDef_ptr
-+IR_StructDef::_duplicate (IR_StructDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::StructDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_StructDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/StructDef:1.0")) ||
-@@ -17373,70 +16964,70 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::StructDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_StructDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, StructDef)::_narrow))
-+      &IR_StructDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, TypedefDef)::_narrow))
-+      &IR_TypedefDef::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::TypedefDef_ptr,
-+            IR_TypedefDef_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-+      &IR_Container::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Container_ptr,
-+            IR_Container_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -17449,12 +17040,12 @@
-   return retv;
- }
- 
--const char* IR::StructDef::_interface_repository_id (void) const
-+const char* IR_StructDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/StructDef:1.0";
- }
- 
--IR::StructMemberSeq * IR::StructDef::members (
-+IR_StructMemberSeq * IR_StructDef::members (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -17471,8 +17062,8 @@
-     );
- }
- 
--void IR::StructDef::members (
--    const IR::StructMemberSeq & members,
-+void IR_StructDef::members (
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -17490,9 +17081,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::TAO_ClientRequestInfo_IR_StructDef_members_get (
-+IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::TAO_ClientRequestInfo_IR_StructDef_members_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -17501,7 +17091,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -17513,7 +17103,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -17526,7 +17116,7 @@
- 
- 
- CORBA::Any * 
--IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -17542,16 +17132,16 @@
- }
- 
- void 
--IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::result (IR::StructMemberSeq * result)
-+IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::result (IR_StructMemberSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::TAO_ClientRequestInfo_IR_StructDef_members_set (
-+IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::TAO_ClientRequestInfo_IR_StructDef_members_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -17559,7 +17149,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -17579,7 +17169,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -17592,7 +17182,7 @@
- 
- 
- CORBA::Any * 
--IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -17605,13 +17195,14 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_StructDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x74446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/StructDef:1.0
--  10, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744465), ACE_NTOHL (0x66000000),  // name = StructDef
-+  10, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744465), ACE_NTOHL (0x66000000),  // name = IR_StructDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_StructDef (CORBA::tk_objref, sizeof (_oc_IR_StructDef), (char *) &_oc_IR_StructDef, 0, sizeof (IR::StructDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_StructDef (CORBA::tk_objref, sizeof (_oc_IR_StructDef), (char *) &_oc_IR_StructDef, 0, sizeof (IR_StructDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StructDef, &_tc_TAO_tc_IR_StructDef)
-@@ -17621,15 +17212,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_UnionDef_Proxy_Impl::_TAO_UnionDef_Proxy_Impl (void)
-+_TAO_UnionDef_Proxy_Impl::_TAO_UnionDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_UnionDef_Remote_Proxy_Impl::_TAO_UnionDef_Remote_Proxy_Impl (void)
-+_TAO_UnionDef_Remote_Proxy_Impl::_TAO_UnionDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--CORBA::TypeCode_ptr IR::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
-+CORBA::TypeCode_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -17637,16 +17228,13 @@
-     CORBA::SystemException
-   ))
- {
--  
-   CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
-   CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-   
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_discriminator_type",
-@@ -17667,7 +17255,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get ri (
-+      IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -17789,7 +17377,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::IDLType_ptr IR::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
-+IR_IDLType_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -17797,16 +17385,13 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
--  IR::IDLType_var _tao_safe_retval (_tao_retval);
--  
-+  IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
-+  IR_IDLType_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_discriminator_type_def",
-@@ -17827,7 +17412,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get ri (
-+      IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -17883,7 +17468,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -17949,19 +17534,15 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
-+void _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr discriminator_type_def,
-+    IR_IDLType_ptr discriminator_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -17987,7 +17568,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set ri (
-+      IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         discriminator_type_def,
-@@ -18101,7 +17682,7 @@
-   
- }
- 
--IR::UnionMemberSeq * IR::_TAO_UnionDef_Remote_Proxy_Impl::members (
-+IR_UnionMemberSeq * _TAO_UnionDef_Remote_Proxy_Impl::members (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -18109,17 +17690,14 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::UnionMemberSeq *_tao_retval = 0;
--  
-+  IR_UnionMemberSeq *_tao_retval = 0;
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
--  ACE_NEW_RETURN (_tao_retval, IR::UnionMemberSeq, _tao_retval);
--  IR::UnionMemberSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_UnionMemberSeq, _tao_retval);
-+  IR_UnionMemberSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_members",
-@@ -18140,7 +17718,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get ri (
-+      IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -18196,7 +17774,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::UnionMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_UnionMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -18262,19 +17840,15 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_UnionDef_Remote_Proxy_Impl::members (
-+void _TAO_UnionDef_Remote_Proxy_Impl::members (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::UnionMemberSeq & members,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -18300,7 +17874,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set ri (
-+      IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         members,
-@@ -18424,37 +17998,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_UnionDef_Proxy_Broker::_TAO_UnionDef_Proxy_Broker (void)
-+_TAO_UnionDef_Proxy_Broker::_TAO_UnionDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_UnionDef_Proxy_Broker::~_TAO_UnionDef_Proxy_Broker (void)
-+_TAO_UnionDef_Proxy_Broker::~_TAO_UnionDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_UnionDef_Proxy_Broker * (*IR__TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_UnionDef_Proxy_Broker * (*_TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_UnionDef_Remote_Proxy_Broker *
--IR::_TAO_UnionDef_Remote_Proxy_Broker::the_TAO_UnionDef_Remote_Proxy_Broker (void)
-+_TAO_UnionDef_Remote_Proxy_Broker *
-+_TAO_UnionDef_Remote_Proxy_Broker::the_TAO_UnionDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_UnionDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_UnionDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_UnionDef_Remote_Proxy_Broker::_TAO_UnionDef_Remote_Proxy_Broker (void)
-+_TAO_UnionDef_Remote_Proxy_Broker::_TAO_UnionDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_UnionDef_Remote_Proxy_Broker::~_TAO_UnionDef_Remote_Proxy_Broker (void)
-+_TAO_UnionDef_Remote_Proxy_Broker::~_TAO_UnionDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_UnionDef_Proxy_Impl&
--IR::_TAO_UnionDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::UnionDef *object,
-+_TAO_UnionDef_Proxy_Impl&
-+_TAO_UnionDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_UnionDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -18470,111 +18044,110 @@
- 
- 
- // default constructor
--IR::UnionDef::UnionDef (int collocated)
-+IR_UnionDef::IR_UnionDef (int collocated)
- {
-   this->IR_UnionDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::UnionDef::~UnionDef (void)
-+IR_UnionDef::~IR_UnionDef (void)
- {}
- 
- void
--IR::UnionDef::IR_UnionDef_setup_collocation (int collocated)
-+IR_UnionDef::IR_UnionDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_UnionDef_Proxy_Broker_ =
--      ::IR__TAO_UnionDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_UnionDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_UnionDef_Proxy_Broker_ =
--      ::IR::_TAO_UnionDef_Remote_Proxy_Broker::the_TAO_UnionDef_Remote_Proxy_Broker ();
-+      _TAO_UnionDef_Remote_Proxy_Broker::the_TAO_UnionDef_Remote_Proxy_Broker ();
-   
-   this->IR_TypedefDef_setup_collocation (collocated);
--  
-   this->IR_Container_setup_collocation (collocated);
- }
- 
--void IR::UnionDef::_tao_any_destructor (void *x)
-+void IR_UnionDef::_tao_any_destructor (void *x)
- {
--  UnionDef *tmp = ACE_static_cast (UnionDef*,x);
-+  IR_UnionDef *tmp = ACE_static_cast (IR_UnionDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::UnionDef_ptr IR::UnionDef::_narrow (
-+IR_UnionDef_ptr IR_UnionDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return UnionDef::_nil ();
-+    return IR_UnionDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UnionDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (UnionDef::_nil ());
-+      ACE_CHECK_RETURN (IR_UnionDef::_nil ());
-       if (is_a == 0)
--        return UnionDef::_nil ();
-+        return IR_UnionDef::_nil ();
-     }
--  return UnionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_UnionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::UnionDef_ptr IR::UnionDef::_unchecked_narrow (
-+IR_UnionDef_ptr IR_UnionDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return UnionDef::_nil ();
-+    return IR_UnionDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      UnionDef_ptr default_proxy = UnionDef::_nil ();
-+      IR_UnionDef_ptr default_proxy = IR_UnionDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_UnionDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_UnionDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::UnionDef (
-+          ::IR_UnionDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          UnionDef::_nil ());
-+          IR_UnionDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::UnionDef (stub, 0, obj->_servant ()), UnionDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_UnionDef (stub, 0, obj->_servant ()), IR_UnionDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            UnionDef_ptr,
-+            IR_UnionDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &UnionDef::_narrow
-+                      &IR_UnionDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::UnionDef_ptr
--IR::UnionDef::_duplicate (UnionDef_ptr obj)
-+IR_UnionDef_ptr
-+IR_UnionDef::_duplicate (IR_UnionDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::UnionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_UnionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UnionDef:1.0")) ||
-@@ -18589,70 +18162,70 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::UnionDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_UnionDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, UnionDef)::_narrow))
-+      &IR_UnionDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, TypedefDef)::_narrow))
-+      &IR_TypedefDef::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::TypedefDef_ptr,
-+            IR_TypedefDef_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-+      &IR_Container::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Container_ptr,
-+            IR_Container_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -18665,12 +18238,12 @@
-   return retv;
- }
- 
--const char* IR::UnionDef::_interface_repository_id (void) const
-+const char* IR_UnionDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/UnionDef:1.0";
- }
- 
--CORBA::TypeCode_ptr IR::UnionDef::discriminator_type (
-+CORBA::TypeCode_ptr IR_UnionDef::discriminator_type (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -18687,7 +18260,7 @@
-     );
- }
- 
--IR::IDLType_ptr IR::UnionDef::discriminator_type_def (
-+IR_IDLType_ptr IR_UnionDef::discriminator_type_def (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -18704,8 +18277,8 @@
-     );
- }
- 
--void IR::UnionDef::discriminator_type_def (
--    IR::IDLType_ptr discriminator_type_def,
-+void IR_UnionDef::discriminator_type_def (
-+    IR_IDLType_ptr discriminator_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -18723,7 +18296,7 @@
-     );
- }
- 
--IR::UnionMemberSeq * IR::UnionDef::members (
-+IR_UnionMemberSeq * IR_UnionDef::members (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -18740,8 +18313,8 @@
-     );
- }
- 
--void IR::UnionDef::members (
--    const IR::UnionMemberSeq & members,
-+void IR_UnionDef::members (
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -18759,9 +18332,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get (
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -18770,7 +18342,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -18782,7 +18354,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -18795,7 +18367,7 @@
- 
- 
- CORBA::Any * 
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -18811,13 +18383,13 @@
- }
- 
- void 
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::TypeCode_ptr result)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::TypeCode_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get (
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -18826,7 +18398,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -18838,7 +18410,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -18851,7 +18423,7 @@
- 
- 
- CORBA::Any * 
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -18867,16 +18439,16 @@
- }
- 
- void 
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::result (IR::IDLType_ptr result)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::result (IR_IDLType_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set (
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr discriminator_type_def,
-+    IR_IDLType_ptr discriminator_type_def,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -18884,7 +18456,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -18904,7 +18476,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -18917,7 +18489,7 @@
- 
- 
- CORBA::Any * 
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -18929,7 +18501,7 @@
-   return result_any;
- }
- 
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::TAO_ClientRequestInfo_IR_UnionDef_members_get (
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::TAO_ClientRequestInfo_IR_UnionDef_members_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -18938,7 +18510,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -18950,7 +18522,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -18963,7 +18535,7 @@
- 
- 
- CORBA::Any * 
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -18979,16 +18551,16 @@
- }
- 
- void 
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::result (IR::UnionMemberSeq * result)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::result (IR_UnionMemberSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::TAO_ClientRequestInfo_IR_UnionDef_members_set (
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::TAO_ClientRequestInfo_IR_UnionDef_members_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::UnionMemberSeq & members,
-+    const IR_UnionMemberSeq & members,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -18996,7 +18568,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -19016,7 +18588,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -19029,7 +18601,7 @@
- 
- 
- CORBA::Any * 
--IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -19042,13 +18614,14 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_UnionDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/UnionDef:1.0
--  9, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0),  // name = UnionDef
-+  9, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0),  // name = IR_UnionDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_UnionDef (CORBA::tk_objref, sizeof (_oc_IR_UnionDef), (char *) &_oc_IR_UnionDef, 0, sizeof (IR::UnionDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_UnionDef (CORBA::tk_objref, sizeof (_oc_IR_UnionDef), (char *) &_oc_IR_UnionDef, 0, sizeof (IR_UnionDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnionDef, &_tc_TAO_tc_IR_UnionDef)
-@@ -19058,15 +18631,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_EnumDef_Proxy_Impl::_TAO_EnumDef_Proxy_Impl (void)
-+_TAO_EnumDef_Proxy_Impl::_TAO_EnumDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_Remote_Proxy_Impl (void)
-+_TAO_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--IR::EnumMemberSeq * IR::_TAO_EnumDef_Remote_Proxy_Impl::members (
-+IR_EnumMemberSeq * _TAO_EnumDef_Remote_Proxy_Impl::members (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -19074,17 +18647,14 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::EnumMemberSeq *_tao_retval = 0;
--  
-+  IR_EnumMemberSeq *_tao_retval = 0;
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
--  ACE_NEW_RETURN (_tao_retval, IR::EnumMemberSeq, _tao_retval);
--  IR::EnumMemberSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_EnumMemberSeq, _tao_retval);
-+  IR_EnumMemberSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_members",
-@@ -19105,7 +18675,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get ri (
-+      IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -19161,7 +18731,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::EnumMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_EnumMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -19227,24 +18797,19 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_EnumDef_Remote_Proxy_Impl::members (
-+void _TAO_EnumDef_Remote_Proxy_Impl::members (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_members",
-@@ -19265,7 +18830,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set ri (
-+      IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         members,
-@@ -19389,37 +18954,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_EnumDef_Proxy_Broker::_TAO_EnumDef_Proxy_Broker (void)
-+_TAO_EnumDef_Proxy_Broker::_TAO_EnumDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_EnumDef_Proxy_Broker::~_TAO_EnumDef_Proxy_Broker (void)
-+_TAO_EnumDef_Proxy_Broker::~_TAO_EnumDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_EnumDef_Proxy_Broker * (*IR__TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_EnumDef_Proxy_Broker * (*_TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_EnumDef_Remote_Proxy_Broker *
--IR::_TAO_EnumDef_Remote_Proxy_Broker::the_TAO_EnumDef_Remote_Proxy_Broker (void)
-+_TAO_EnumDef_Remote_Proxy_Broker *
-+_TAO_EnumDef_Remote_Proxy_Broker::the_TAO_EnumDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_EnumDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_EnumDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_EnumDef_Remote_Proxy_Broker::_TAO_EnumDef_Remote_Proxy_Broker (void)
-+_TAO_EnumDef_Remote_Proxy_Broker::_TAO_EnumDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_EnumDef_Remote_Proxy_Broker::~_TAO_EnumDef_Remote_Proxy_Broker (void)
-+_TAO_EnumDef_Remote_Proxy_Broker::~_TAO_EnumDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_EnumDef_Proxy_Impl&
--IR::_TAO_EnumDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::EnumDef *object,
-+_TAO_EnumDef_Proxy_Impl&
-+_TAO_EnumDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_EnumDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -19435,109 +19000,109 @@
- 
- 
- // default constructor
--IR::EnumDef::EnumDef (int collocated)
-+IR_EnumDef::IR_EnumDef (int collocated)
- {
-   this->IR_EnumDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::EnumDef::~EnumDef (void)
-+IR_EnumDef::~IR_EnumDef (void)
- {}
- 
- void
--IR::EnumDef::IR_EnumDef_setup_collocation (int collocated)
-+IR_EnumDef::IR_EnumDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_EnumDef_Proxy_Broker_ =
--      ::IR__TAO_EnumDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_EnumDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_EnumDef_Proxy_Broker_ =
--      ::IR::_TAO_EnumDef_Remote_Proxy_Broker::the_TAO_EnumDef_Remote_Proxy_Broker ();
-+      _TAO_EnumDef_Remote_Proxy_Broker::the_TAO_EnumDef_Remote_Proxy_Broker ();
-   
-   this->IR_TypedefDef_setup_collocation (collocated);
- }
- 
--void IR::EnumDef::_tao_any_destructor (void *x)
-+void IR_EnumDef::_tao_any_destructor (void *x)
- {
--  EnumDef *tmp = ACE_static_cast (EnumDef*,x);
-+  IR_EnumDef *tmp = ACE_static_cast (IR_EnumDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::EnumDef_ptr IR::EnumDef::_narrow (
-+IR_EnumDef_ptr IR_EnumDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return EnumDef::_nil ();
-+    return IR_EnumDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EnumDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (EnumDef::_nil ());
-+      ACE_CHECK_RETURN (IR_EnumDef::_nil ());
-       if (is_a == 0)
--        return EnumDef::_nil ();
-+        return IR_EnumDef::_nil ();
-     }
--  return EnumDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_EnumDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::EnumDef_ptr IR::EnumDef::_unchecked_narrow (
-+IR_EnumDef_ptr IR_EnumDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return EnumDef::_nil ();
-+    return IR_EnumDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      EnumDef_ptr default_proxy = EnumDef::_nil ();
-+      IR_EnumDef_ptr default_proxy = IR_EnumDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_EnumDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_EnumDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::EnumDef (
-+          ::IR_EnumDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          EnumDef::_nil ());
-+          IR_EnumDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::EnumDef (stub, 0, obj->_servant ()), EnumDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_EnumDef (stub, 0, obj->_servant ()), IR_EnumDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            EnumDef_ptr,
-+            IR_EnumDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &EnumDef::_narrow
-+                      &IR_EnumDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::EnumDef_ptr
--IR::EnumDef::_duplicate (EnumDef_ptr obj)
-+IR_EnumDef_ptr
-+IR_EnumDef::_duplicate (IR_EnumDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::EnumDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_EnumDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EnumDef:1.0")) ||
-@@ -19551,58 +19116,58 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::EnumDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_EnumDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, EnumDef)::_narrow))
-+      &IR_EnumDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, TypedefDef)::_narrow))
-+      &IR_TypedefDef::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::TypedefDef_ptr,
-+            IR_TypedefDef_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -19615,12 +19180,12 @@
-   return retv;
- }
- 
--const char* IR::EnumDef::_interface_repository_id (void) const
-+const char* IR_EnumDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/EnumDef:1.0";
- }
- 
--IR::EnumMemberSeq * IR::EnumDef::members (
-+IR_EnumMemberSeq * IR_EnumDef::members (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -19637,8 +19202,8 @@
-     );
- }
- 
--void IR::EnumDef::members (
--    const IR::EnumMemberSeq & members,
-+void IR_EnumDef::members (
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -19656,9 +19221,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::TAO_ClientRequestInfo_IR_EnumDef_members_get (
-+IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::TAO_ClientRequestInfo_IR_EnumDef_members_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -19667,7 +19231,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -19679,7 +19243,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -19692,7 +19256,7 @@
- 
- 
- CORBA::Any * 
--IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -19708,16 +19272,16 @@
- }
- 
- void 
--IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::result (IR::EnumMemberSeq * result)
-+IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::result (IR_EnumMemberSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::TAO_ClientRequestInfo_IR_EnumDef_members_set (
-+IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::TAO_ClientRequestInfo_IR_EnumDef_members_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::EnumMemberSeq & members,
-+    const IR_EnumMemberSeq & members,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -19725,7 +19289,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -19745,7 +19309,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -19758,7 +19322,7 @@
- 
- 
- CORBA::Any * 
--IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -19771,13 +19335,14 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_EnumDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6e756d44), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/EnumDef:1.0
--  8, ACE_NTOHL (0x456e756d), ACE_NTOHL (0x44656600),  // name = EnumDef
-+  8, ACE_NTOHL (0x456e756d), ACE_NTOHL (0x44656600),  // name = IR_EnumDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_EnumDef (CORBA::tk_objref, sizeof (_oc_IR_EnumDef), (char *) &_oc_IR_EnumDef, 0, sizeof (IR::EnumDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_EnumDef (CORBA::tk_objref, sizeof (_oc_IR_EnumDef), (char *) &_oc_IR_EnumDef, 0, sizeof (IR_EnumDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnumDef, &_tc_TAO_tc_IR_EnumDef)
-@@ -19787,15 +19352,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_AliasDef_Proxy_Impl::_TAO_AliasDef_Proxy_Impl (void)
-+_TAO_AliasDef_Proxy_Impl::_TAO_AliasDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_Remote_Proxy_Impl (void)
-+_TAO_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--IR::IDLType_ptr IR::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
-+IR_IDLType_ptr _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -19803,16 +19368,13 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
--  IR::IDLType_var _tao_safe_retval (_tao_retval);
--  
-+  IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
-+  IR_IDLType_var _tao_safe_retval (_tao_retval);
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_original_type_def",
-@@ -19833,7 +19395,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get ri (
-+      IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -19889,7 +19451,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -19955,24 +19517,19 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
-+void _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_original_type_def",
-@@ -19993,7 +19550,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set ri (
-+      IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         original_type_def,
-@@ -20117,37 +19674,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_AliasDef_Proxy_Broker::_TAO_AliasDef_Proxy_Broker (void)
-+_TAO_AliasDef_Proxy_Broker::_TAO_AliasDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_AliasDef_Proxy_Broker::~_TAO_AliasDef_Proxy_Broker (void)
-+_TAO_AliasDef_Proxy_Broker::~_TAO_AliasDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_AliasDef_Proxy_Broker * (*IR__TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_AliasDef_Proxy_Broker * (*_TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_AliasDef_Remote_Proxy_Broker *
--IR::_TAO_AliasDef_Remote_Proxy_Broker::the_TAO_AliasDef_Remote_Proxy_Broker (void)
-+_TAO_AliasDef_Remote_Proxy_Broker *
-+_TAO_AliasDef_Remote_Proxy_Broker::the_TAO_AliasDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_AliasDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_AliasDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_AliasDef_Remote_Proxy_Broker::_TAO_AliasDef_Remote_Proxy_Broker (void)
-+_TAO_AliasDef_Remote_Proxy_Broker::_TAO_AliasDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_AliasDef_Remote_Proxy_Broker::~_TAO_AliasDef_Remote_Proxy_Broker (void)
-+_TAO_AliasDef_Remote_Proxy_Broker::~_TAO_AliasDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_AliasDef_Proxy_Impl&
--IR::_TAO_AliasDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::AliasDef *object,
-+_TAO_AliasDef_Proxy_Impl&
-+_TAO_AliasDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_AliasDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -20163,109 +19720,109 @@
- 
- 
- // default constructor
--IR::AliasDef::AliasDef (int collocated)
-+IR_AliasDef::IR_AliasDef (int collocated)
- {
-   this->IR_AliasDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::AliasDef::~AliasDef (void)
-+IR_AliasDef::~IR_AliasDef (void)
- {}
- 
- void
--IR::AliasDef::IR_AliasDef_setup_collocation (int collocated)
-+IR_AliasDef::IR_AliasDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_AliasDef_Proxy_Broker_ =
--      ::IR__TAO_AliasDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_AliasDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_AliasDef_Proxy_Broker_ =
--      ::IR::_TAO_AliasDef_Remote_Proxy_Broker::the_TAO_AliasDef_Remote_Proxy_Broker ();
-+      _TAO_AliasDef_Remote_Proxy_Broker::the_TAO_AliasDef_Remote_Proxy_Broker ();
-   
-   this->IR_TypedefDef_setup_collocation (collocated);
- }
- 
--void IR::AliasDef::_tao_any_destructor (void *x)
-+void IR_AliasDef::_tao_any_destructor (void *x)
- {
--  AliasDef *tmp = ACE_static_cast (AliasDef*,x);
-+  IR_AliasDef *tmp = ACE_static_cast (IR_AliasDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::AliasDef_ptr IR::AliasDef::_narrow (
-+IR_AliasDef_ptr IR_AliasDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return AliasDef::_nil ();
-+    return IR_AliasDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/AliasDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (AliasDef::_nil ());
-+      ACE_CHECK_RETURN (IR_AliasDef::_nil ());
-       if (is_a == 0)
--        return AliasDef::_nil ();
-+        return IR_AliasDef::_nil ();
-     }
--  return AliasDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_AliasDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::AliasDef_ptr IR::AliasDef::_unchecked_narrow (
-+IR_AliasDef_ptr IR_AliasDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return AliasDef::_nil ();
-+    return IR_AliasDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      AliasDef_ptr default_proxy = AliasDef::_nil ();
-+      IR_AliasDef_ptr default_proxy = IR_AliasDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_AliasDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_AliasDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::AliasDef (
-+          ::IR_AliasDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          AliasDef::_nil ());
-+          IR_AliasDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::AliasDef (stub, 0, obj->_servant ()), AliasDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_AliasDef (stub, 0, obj->_servant ()), IR_AliasDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            AliasDef_ptr,
-+            IR_AliasDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &AliasDef::_narrow
-+                      &IR_AliasDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::AliasDef_ptr
--IR::AliasDef::_duplicate (AliasDef_ptr obj)
-+IR_AliasDef_ptr
-+IR_AliasDef::_duplicate (IR_AliasDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::AliasDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_AliasDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/AliasDef:1.0")) ||
-@@ -20279,58 +19836,58 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::AliasDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_AliasDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, AliasDef)::_narrow))
-+      &IR_AliasDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, TypedefDef)::_narrow))
-+      &IR_TypedefDef::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::TypedefDef_ptr,
-+            IR_TypedefDef_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -20343,12 +19900,12 @@
-   return retv;
- }
- 
--const char* IR::AliasDef::_interface_repository_id (void) const
-+const char* IR_AliasDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/AliasDef:1.0";
- }
- 
--IR::IDLType_ptr IR::AliasDef::original_type_def (
-+IR_IDLType_ptr IR_AliasDef::original_type_def (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -20365,8 +19922,8 @@
-     );
- }
- 
--void IR::AliasDef::original_type_def (
--    IR::IDLType_ptr original_type_def,
-+void IR_AliasDef::original_type_def (
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -20384,9 +19941,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get (
-+IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -20395,7 +19951,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -20407,7 +19963,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -20420,7 +19976,7 @@
- 
- 
- CORBA::Any * 
--IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -20436,16 +19992,16 @@
- }
- 
- void 
--IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::result (IR::IDLType_ptr result)
-+IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::result (IR_IDLType_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set (
-+IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -20453,7 +20009,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -20473,7 +20029,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -20486,7 +20042,7 @@
- 
- 
- CORBA::Any * 
--IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -20499,13 +20055,14 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_AliasDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x6c696173), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/AliasDef:1.0
--  9, ACE_NTOHL (0x416c6961), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0),  // name = AliasDef
-+  9, ACE_NTOHL (0x416c6961), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0),  // name = IR_AliasDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_AliasDef (CORBA::tk_objref, sizeof (_oc_IR_AliasDef), (char *) &_oc_IR_AliasDef, 0, sizeof (IR::AliasDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_AliasDef (CORBA::tk_objref, sizeof (_oc_IR_AliasDef), (char *) &_oc_IR_AliasDef, 0, sizeof (IR_AliasDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AliasDef, &_tc_TAO_tc_IR_AliasDef)
-@@ -20515,10 +20072,10 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_NativeDef_Proxy_Impl::_TAO_NativeDef_Proxy_Impl (void)
-+_TAO_NativeDef_Proxy_Impl::_TAO_NativeDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_NativeDef_Remote_Proxy_Impl::_TAO_NativeDef_Remote_Proxy_Impl (void)
-+_TAO_NativeDef_Remote_Proxy_Impl::_TAO_NativeDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
-@@ -20533,37 +20090,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_NativeDef_Proxy_Broker::_TAO_NativeDef_Proxy_Broker (void)
-+_TAO_NativeDef_Proxy_Broker::_TAO_NativeDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_NativeDef_Proxy_Broker::~_TAO_NativeDef_Proxy_Broker (void)
-+_TAO_NativeDef_Proxy_Broker::~_TAO_NativeDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_NativeDef_Proxy_Broker * (*IR__TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_NativeDef_Proxy_Broker * (*_TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_NativeDef_Remote_Proxy_Broker *
--IR::_TAO_NativeDef_Remote_Proxy_Broker::the_TAO_NativeDef_Remote_Proxy_Broker (void)
-+_TAO_NativeDef_Remote_Proxy_Broker *
-+_TAO_NativeDef_Remote_Proxy_Broker::the_TAO_NativeDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_NativeDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_NativeDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_NativeDef_Remote_Proxy_Broker::_TAO_NativeDef_Remote_Proxy_Broker (void)
-+_TAO_NativeDef_Remote_Proxy_Broker::_TAO_NativeDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_NativeDef_Remote_Proxy_Broker::~_TAO_NativeDef_Remote_Proxy_Broker (void)
-+_TAO_NativeDef_Remote_Proxy_Broker::~_TAO_NativeDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_NativeDef_Proxy_Impl&
--IR::_TAO_NativeDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::NativeDef *object,
-+_TAO_NativeDef_Proxy_Impl&
-+_TAO_NativeDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_NativeDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -20579,109 +20136,109 @@
- 
- 
- // default constructor
--IR::NativeDef::NativeDef (int collocated)
-+IR_NativeDef::IR_NativeDef (int collocated)
- {
-   this->IR_NativeDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::NativeDef::~NativeDef (void)
-+IR_NativeDef::~IR_NativeDef (void)
- {}
- 
- void
--IR::NativeDef::IR_NativeDef_setup_collocation (int collocated)
-+IR_NativeDef::IR_NativeDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_NativeDef_Proxy_Broker_ =
--      ::IR__TAO_NativeDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_NativeDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_NativeDef_Proxy_Broker_ =
--      ::IR::_TAO_NativeDef_Remote_Proxy_Broker::the_TAO_NativeDef_Remote_Proxy_Broker ();
-+      _TAO_NativeDef_Remote_Proxy_Broker::the_TAO_NativeDef_Remote_Proxy_Broker ();
-   
-   this->IR_TypedefDef_setup_collocation (collocated);
- }
- 
--void IR::NativeDef::_tao_any_destructor (void *x)
-+void IR_NativeDef::_tao_any_destructor (void *x)
- {
--  NativeDef *tmp = ACE_static_cast (NativeDef*,x);
-+  IR_NativeDef *tmp = ACE_static_cast (IR_NativeDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::NativeDef_ptr IR::NativeDef::_narrow (
-+IR_NativeDef_ptr IR_NativeDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return NativeDef::_nil ();
-+    return IR_NativeDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/NativeDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (NativeDef::_nil ());
-+      ACE_CHECK_RETURN (IR_NativeDef::_nil ());
-       if (is_a == 0)
--        return NativeDef::_nil ();
-+        return IR_NativeDef::_nil ();
-     }
--  return NativeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_NativeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::NativeDef_ptr IR::NativeDef::_unchecked_narrow (
-+IR_NativeDef_ptr IR_NativeDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return NativeDef::_nil ();
-+    return IR_NativeDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      NativeDef_ptr default_proxy = NativeDef::_nil ();
-+      IR_NativeDef_ptr default_proxy = IR_NativeDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_NativeDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_NativeDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::NativeDef (
-+          ::IR_NativeDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          NativeDef::_nil ());
-+          IR_NativeDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::NativeDef (stub, 0, obj->_servant ()), NativeDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_NativeDef (stub, 0, obj->_servant ()), IR_NativeDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            NativeDef_ptr,
-+            IR_NativeDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &NativeDef::_narrow
-+                      &IR_NativeDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::NativeDef_ptr
--IR::NativeDef::_duplicate (NativeDef_ptr obj)
-+IR_NativeDef_ptr
-+IR_NativeDef::_duplicate (IR_NativeDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::NativeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_NativeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/NativeDef:1.0")) ||
-@@ -20695,58 +20252,58 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::NativeDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_NativeDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, NativeDef)::_narrow))
-+      &IR_NativeDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, TypedefDef)::_narrow))
-+      &IR_TypedefDef::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::TypedefDef_ptr,
-+            IR_TypedefDef_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -20759,21 +20316,18 @@
-   return retv;
- }
- 
--const char* IR::NativeDef::_interface_repository_id (void) const
-+const char* IR_NativeDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/NativeDef:1.0";
- }
- 
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
- static const CORBA::Long _oc_IR_NativeDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4e), ACE_NTOHL (0x61746976), ACE_NTOHL (0x65446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/NativeDef:1.0
--  10, ACE_NTOHL (0x4e617469), ACE_NTOHL (0x76654465), ACE_NTOHL (0x66000000),  // name = NativeDef
-+  10, ACE_NTOHL (0x4e617469), ACE_NTOHL (0x76654465), ACE_NTOHL (0x66000000),  // name = IR_NativeDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_NativeDef (CORBA::tk_objref, sizeof (_oc_IR_NativeDef), (char *) &_oc_IR_NativeDef, 0, sizeof (IR::NativeDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_NativeDef (CORBA::tk_objref, sizeof (_oc_IR_NativeDef), (char *) &_oc_IR_NativeDef, 0, sizeof (IR_NativeDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NativeDef, &_tc_TAO_tc_IR_NativeDef)
-@@ -20783,15 +20337,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_PrimitiveDef_Proxy_Impl::_TAO_PrimitiveDef_Proxy_Impl (void)
-+_TAO_PrimitiveDef_Proxy_Impl::_TAO_PrimitiveDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_Remote_Proxy_Impl (void)
-+_TAO_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--IR::PrimitiveKind IR::_TAO_PrimitiveDef_Remote_Proxy_Impl::kind (
-+IR_PrimitiveKind _TAO_PrimitiveDef_Remote_Proxy_Impl::kind (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -20799,15 +20353,12 @@
-     CORBA::SystemException
-   ))
- {
--  
--  IR::PrimitiveKind _tao_retval = (IR::PrimitiveKind)0;
--  
-+  IR_PrimitiveKind _tao_retval = (IR_PrimitiveKind)0;
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_kind",
-@@ -20828,7 +20379,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get ri (
-+      IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -20884,7 +20435,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::PrimitiveKind  _tao_retval_info = _tao_retval;
-+              IR_PrimitiveKind  _tao_retval_info = _tao_retval;
-                ri.result (_tao_retval_info);
-             );
-           
-@@ -20959,37 +20510,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_PrimitiveDef_Proxy_Broker::_TAO_PrimitiveDef_Proxy_Broker (void)
-+_TAO_PrimitiveDef_Proxy_Broker::_TAO_PrimitiveDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_PrimitiveDef_Proxy_Broker::~_TAO_PrimitiveDef_Proxy_Broker (void)
-+_TAO_PrimitiveDef_Proxy_Broker::~_TAO_PrimitiveDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_PrimitiveDef_Proxy_Broker * (*IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_PrimitiveDef_Proxy_Broker * (*_TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_PrimitiveDef_Remote_Proxy_Broker *
--IR::_TAO_PrimitiveDef_Remote_Proxy_Broker::the_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
-+_TAO_PrimitiveDef_Remote_Proxy_Broker *
-+_TAO_PrimitiveDef_Remote_Proxy_Broker::the_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_PrimitiveDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_PrimitiveDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_PrimitiveDef_Remote_Proxy_Broker::_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
-+_TAO_PrimitiveDef_Remote_Proxy_Broker::_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_PrimitiveDef_Remote_Proxy_Broker::~_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
-+_TAO_PrimitiveDef_Remote_Proxy_Broker::~_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_PrimitiveDef_Proxy_Impl&
--IR::_TAO_PrimitiveDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::PrimitiveDef *object,
-+_TAO_PrimitiveDef_Proxy_Impl&
-+_TAO_PrimitiveDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_PrimitiveDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -21005,109 +20556,109 @@
- 
- 
- // default constructor
--IR::PrimitiveDef::PrimitiveDef (int collocated)
-+IR_PrimitiveDef::IR_PrimitiveDef (int collocated)
- {
-   this->IR_PrimitiveDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::PrimitiveDef::~PrimitiveDef (void)
-+IR_PrimitiveDef::~IR_PrimitiveDef (void)
- {}
- 
- void
--IR::PrimitiveDef::IR_PrimitiveDef_setup_collocation (int collocated)
-+IR_PrimitiveDef::IR_PrimitiveDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_PrimitiveDef_Proxy_Broker_ =
--      ::IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_PrimitiveDef_Proxy_Broker_ =
--      ::IR::_TAO_PrimitiveDef_Remote_Proxy_Broker::the_TAO_PrimitiveDef_Remote_Proxy_Broker ();
-+      _TAO_PrimitiveDef_Remote_Proxy_Broker::the_TAO_PrimitiveDef_Remote_Proxy_Broker ();
-   
-   this->IR_IDLType_setup_collocation (collocated);
- }
- 
--void IR::PrimitiveDef::_tao_any_destructor (void *x)
-+void IR_PrimitiveDef::_tao_any_destructor (void *x)
- {
--  PrimitiveDef *tmp = ACE_static_cast (PrimitiveDef*,x);
-+  IR_PrimitiveDef *tmp = ACE_static_cast (IR_PrimitiveDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::PrimitiveDef_ptr IR::PrimitiveDef::_narrow (
-+IR_PrimitiveDef_ptr IR_PrimitiveDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return PrimitiveDef::_nil ();
-+    return IR_PrimitiveDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PrimitiveDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (PrimitiveDef::_nil ());
-+      ACE_CHECK_RETURN (IR_PrimitiveDef::_nil ());
-       if (is_a == 0)
--        return PrimitiveDef::_nil ();
-+        return IR_PrimitiveDef::_nil ();
-     }
--  return PrimitiveDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_PrimitiveDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::PrimitiveDef_ptr IR::PrimitiveDef::_unchecked_narrow (
-+IR_PrimitiveDef_ptr IR_PrimitiveDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return PrimitiveDef::_nil ();
-+    return IR_PrimitiveDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      PrimitiveDef_ptr default_proxy = PrimitiveDef::_nil ();
-+      IR_PrimitiveDef_ptr default_proxy = IR_PrimitiveDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::PrimitiveDef (
-+          ::IR_PrimitiveDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          PrimitiveDef::_nil ());
-+          IR_PrimitiveDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::PrimitiveDef (stub, 0, obj->_servant ()), PrimitiveDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_PrimitiveDef (stub, 0, obj->_servant ()), IR_PrimitiveDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            PrimitiveDef_ptr,
-+            IR_PrimitiveDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &PrimitiveDef::_narrow
-+                      &IR_PrimitiveDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::PrimitiveDef_ptr
--IR::PrimitiveDef::_duplicate (PrimitiveDef_ptr obj)
-+IR_PrimitiveDef_ptr
-+IR_PrimitiveDef::_duplicate (IR_PrimitiveDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::PrimitiveDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_PrimitiveDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimitiveDef:1.0")) ||
-@@ -21119,34 +20670,34 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::PrimitiveDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_PrimitiveDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, PrimitiveDef)::_narrow))
-+      &IR_PrimitiveDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -21159,12 +20710,12 @@
-   return retv;
- }
- 
--const char* IR::PrimitiveDef::_interface_repository_id (void) const
-+const char* IR_PrimitiveDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/PrimitiveDef:1.0";
- }
- 
--IR::PrimitiveKind IR::PrimitiveDef::kind (
-+IR_PrimitiveKind IR_PrimitiveDef::kind (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -21181,9 +20732,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get (
-+IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -21192,7 +20742,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -21204,7 +20754,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -21217,7 +20767,7 @@
- 
- 
- CORBA::Any * 
--IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -21233,20 +20783,21 @@
- }
- 
- void 
--IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::result (IR::PrimitiveKind result)
-+IR_PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::result (IR_PrimitiveKind result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_PrimitiveDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x72696d69), ACE_NTOHL (0x74697665), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/PrimitiveDef:1.0
--  13, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x69746976), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = PrimitiveDef
-+  13, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x69746976), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = IR_PrimitiveDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_PrimitiveDef (CORBA::tk_objref, sizeof (_oc_IR_PrimitiveDef), (char *) &_oc_IR_PrimitiveDef, 0, sizeof (IR::PrimitiveDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_PrimitiveDef (CORBA::tk_objref, sizeof (_oc_IR_PrimitiveDef), (char *) &_oc_IR_PrimitiveDef, 0, sizeof (IR_PrimitiveDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimitiveDef, &_tc_TAO_tc_IR_PrimitiveDef)
-@@ -21256,15 +20807,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_StringDef_Proxy_Impl::_TAO_StringDef_Proxy_Impl (void)
-+_TAO_StringDef_Proxy_Impl::_TAO_StringDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_StringDef_Remote_Proxy_Impl::_TAO_StringDef_Remote_Proxy_Impl (void)
-+_TAO_StringDef_Remote_Proxy_Impl::_TAO_StringDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--CORBA::ULong IR::_TAO_StringDef_Remote_Proxy_Impl::bound (
-+CORBA::ULong _TAO_StringDef_Remote_Proxy_Impl::bound (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -21272,15 +20823,12 @@
-     CORBA::SystemException
-   ))
- {
--  
-   CORBA::ULong _tao_retval = 0;
-   
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_bound",
-@@ -21301,7 +20849,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get ri (
-+      IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -21422,7 +20970,7 @@
-   return _tao_retval;
- }
- 
--void IR::_TAO_StringDef_Remote_Proxy_Impl::bound (
-+void _TAO_StringDef_Remote_Proxy_Impl::bound (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::ULong bound,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -21431,15 +20979,10 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_bound",
-@@ -21460,7 +21003,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set ri (
-+      IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         bound,
-@@ -21584,37 +21127,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_StringDef_Proxy_Broker::_TAO_StringDef_Proxy_Broker (void)
-+_TAO_StringDef_Proxy_Broker::_TAO_StringDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_StringDef_Proxy_Broker::~_TAO_StringDef_Proxy_Broker (void)
-+_TAO_StringDef_Proxy_Broker::~_TAO_StringDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_StringDef_Proxy_Broker * (*IR__TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_StringDef_Proxy_Broker * (*_TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_StringDef_Remote_Proxy_Broker *
--IR::_TAO_StringDef_Remote_Proxy_Broker::the_TAO_StringDef_Remote_Proxy_Broker (void)
-+_TAO_StringDef_Remote_Proxy_Broker *
-+_TAO_StringDef_Remote_Proxy_Broker::the_TAO_StringDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_StringDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_StringDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_StringDef_Remote_Proxy_Broker::_TAO_StringDef_Remote_Proxy_Broker (void)
-+_TAO_StringDef_Remote_Proxy_Broker::_TAO_StringDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_StringDef_Remote_Proxy_Broker::~_TAO_StringDef_Remote_Proxy_Broker (void)
-+_TAO_StringDef_Remote_Proxy_Broker::~_TAO_StringDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_StringDef_Proxy_Impl&
--IR::_TAO_StringDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::StringDef *object,
-+_TAO_StringDef_Proxy_Impl&
-+_TAO_StringDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_StringDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -21630,109 +21173,109 @@
- 
- 
- // default constructor
--IR::StringDef::StringDef (int collocated)
-+IR_StringDef::IR_StringDef (int collocated)
- {
-   this->IR_StringDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::StringDef::~StringDef (void)
-+IR_StringDef::~IR_StringDef (void)
- {}
- 
- void
--IR::StringDef::IR_StringDef_setup_collocation (int collocated)
-+IR_StringDef::IR_StringDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_StringDef_Proxy_Broker_ =
--      ::IR__TAO_StringDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_StringDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_StringDef_Proxy_Broker_ =
--      ::IR::_TAO_StringDef_Remote_Proxy_Broker::the_TAO_StringDef_Remote_Proxy_Broker ();
-+      _TAO_StringDef_Remote_Proxy_Broker::the_TAO_StringDef_Remote_Proxy_Broker ();
-   
-   this->IR_IDLType_setup_collocation (collocated);
- }
- 
--void IR::StringDef::_tao_any_destructor (void *x)
-+void IR_StringDef::_tao_any_destructor (void *x)
- {
--  StringDef *tmp = ACE_static_cast (StringDef*,x);
-+  IR_StringDef *tmp = ACE_static_cast (IR_StringDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::StringDef_ptr IR::StringDef::_narrow (
-+IR_StringDef_ptr IR_StringDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return StringDef::_nil ();
-+    return IR_StringDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/StringDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (StringDef::_nil ());
-+      ACE_CHECK_RETURN (IR_StringDef::_nil ());
-       if (is_a == 0)
--        return StringDef::_nil ();
-+        return IR_StringDef::_nil ();
-     }
--  return StringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_StringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::StringDef_ptr IR::StringDef::_unchecked_narrow (
-+IR_StringDef_ptr IR_StringDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return StringDef::_nil ();
-+    return IR_StringDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      StringDef_ptr default_proxy = StringDef::_nil ();
-+      IR_StringDef_ptr default_proxy = IR_StringDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_StringDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_StringDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::StringDef (
-+          ::IR_StringDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          StringDef::_nil ());
-+          IR_StringDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::StringDef (stub, 0, obj->_servant ()), StringDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_StringDef (stub, 0, obj->_servant ()), IR_StringDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            StringDef_ptr,
-+            IR_StringDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &StringDef::_narrow
-+                      &IR_StringDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::StringDef_ptr
--IR::StringDef::_duplicate (StringDef_ptr obj)
-+IR_StringDef_ptr
-+IR_StringDef::_duplicate (IR_StringDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::StringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_StringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/StringDef:1.0")) ||
-@@ -21744,34 +21287,34 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::StringDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_StringDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, StringDef)::_narrow))
-+      &IR_StringDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -21784,12 +21327,12 @@
-   return retv;
- }
- 
--const char* IR::StringDef::_interface_repository_id (void) const
-+const char* IR_StringDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/StringDef:1.0";
- }
- 
--CORBA::ULong IR::StringDef::bound (
-+CORBA::ULong IR_StringDef::bound (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -21806,7 +21349,7 @@
-     );
- }
- 
--void IR::StringDef::bound (
-+void IR_StringDef::bound (
-     CORBA::ULong bound,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -21825,9 +21368,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::TAO_ClientRequestInfo_IR_StringDef_bound_get (
-+IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::TAO_ClientRequestInfo_IR_StringDef_bound_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -21836,7 +21378,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -21848,7 +21390,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -21861,7 +21403,7 @@
- 
- 
- CORBA::Any * 
--IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -21877,13 +21419,13 @@
- }
- 
- void 
--IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::result (CORBA::ULong result)
-+IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::result (CORBA::ULong result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::TAO_ClientRequestInfo_IR_StringDef_bound_set (
-+IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::TAO_ClientRequestInfo_IR_StringDef_bound_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::ULong & bound,
-@@ -21894,7 +21436,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -21913,7 +21455,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -21926,7 +21468,7 @@
- 
- 
- CORBA::Any * 
--IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -21939,13 +21481,14 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_StringDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/StringDef:1.0
--  10, ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e674465), ACE_NTOHL (0x66000000),  // name = StringDef
-+  10, ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e674465), ACE_NTOHL (0x66000000),  // name = IR_StringDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_StringDef (CORBA::tk_objref, sizeof (_oc_IR_StringDef), (char *) &_oc_IR_StringDef, 0, sizeof (IR::StringDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_StringDef (CORBA::tk_objref, sizeof (_oc_IR_StringDef), (char *) &_oc_IR_StringDef, 0, sizeof (IR_StringDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StringDef, &_tc_TAO_tc_IR_StringDef)
-@@ -21955,15 +21498,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_WstringDef_Proxy_Impl::_TAO_WstringDef_Proxy_Impl (void)
-+_TAO_WstringDef_Proxy_Impl::_TAO_WstringDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_WstringDef_Remote_Proxy_Impl::_TAO_WstringDef_Remote_Proxy_Impl (void)
-+_TAO_WstringDef_Remote_Proxy_Impl::_TAO_WstringDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--CORBA::ULong IR::_TAO_WstringDef_Remote_Proxy_Impl::bound (
-+CORBA::ULong _TAO_WstringDef_Remote_Proxy_Impl::bound (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -21971,15 +21514,12 @@
-     CORBA::SystemException
-   ))
- {
--  
-   CORBA::ULong _tao_retval = 0;
-   
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_bound",
-@@ -22000,7 +21540,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get ri (
-+      IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -22121,7 +21661,7 @@
-   return _tao_retval;
- }
- 
--void IR::_TAO_WstringDef_Remote_Proxy_Impl::bound (
-+void _TAO_WstringDef_Remote_Proxy_Impl::bound (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::ULong bound,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -22130,15 +21670,10 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_bound",
-@@ -22159,7 +21694,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set ri (
-+      IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         bound,
-@@ -22283,37 +21818,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_WstringDef_Proxy_Broker::_TAO_WstringDef_Proxy_Broker (void)
-+_TAO_WstringDef_Proxy_Broker::_TAO_WstringDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_WstringDef_Proxy_Broker::~_TAO_WstringDef_Proxy_Broker (void)
-+_TAO_WstringDef_Proxy_Broker::~_TAO_WstringDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_WstringDef_Proxy_Broker * (*IR__TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_WstringDef_Proxy_Broker * (*_TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_WstringDef_Remote_Proxy_Broker *
--IR::_TAO_WstringDef_Remote_Proxy_Broker::the_TAO_WstringDef_Remote_Proxy_Broker (void)
-+_TAO_WstringDef_Remote_Proxy_Broker *
-+_TAO_WstringDef_Remote_Proxy_Broker::the_TAO_WstringDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_WstringDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_WstringDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_WstringDef_Remote_Proxy_Broker::_TAO_WstringDef_Remote_Proxy_Broker (void)
-+_TAO_WstringDef_Remote_Proxy_Broker::_TAO_WstringDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_WstringDef_Remote_Proxy_Broker::~_TAO_WstringDef_Remote_Proxy_Broker (void)
-+_TAO_WstringDef_Remote_Proxy_Broker::~_TAO_WstringDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_WstringDef_Proxy_Impl&
--IR::_TAO_WstringDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::WstringDef *object,
-+_TAO_WstringDef_Proxy_Impl&
-+_TAO_WstringDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_WstringDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -22329,109 +21864,109 @@
- 
- 
- // default constructor
--IR::WstringDef::WstringDef (int collocated)
-+IR_WstringDef::IR_WstringDef (int collocated)
- {
-   this->IR_WstringDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::WstringDef::~WstringDef (void)
-+IR_WstringDef::~IR_WstringDef (void)
- {}
- 
- void
--IR::WstringDef::IR_WstringDef_setup_collocation (int collocated)
-+IR_WstringDef::IR_WstringDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_WstringDef_Proxy_Broker_ =
--      ::IR__TAO_WstringDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_WstringDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_WstringDef_Proxy_Broker_ =
--      ::IR::_TAO_WstringDef_Remote_Proxy_Broker::the_TAO_WstringDef_Remote_Proxy_Broker ();
-+      _TAO_WstringDef_Remote_Proxy_Broker::the_TAO_WstringDef_Remote_Proxy_Broker ();
-   
-   this->IR_IDLType_setup_collocation (collocated);
- }
- 
--void IR::WstringDef::_tao_any_destructor (void *x)
-+void IR_WstringDef::_tao_any_destructor (void *x)
- {
--  WstringDef *tmp = ACE_static_cast (WstringDef*,x);
-+  IR_WstringDef *tmp = ACE_static_cast (IR_WstringDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::WstringDef_ptr IR::WstringDef::_narrow (
-+IR_WstringDef_ptr IR_WstringDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return WstringDef::_nil ();
-+    return IR_WstringDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/WstringDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (WstringDef::_nil ());
-+      ACE_CHECK_RETURN (IR_WstringDef::_nil ());
-       if (is_a == 0)
--        return WstringDef::_nil ();
-+        return IR_WstringDef::_nil ();
-     }
--  return WstringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_WstringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::WstringDef_ptr IR::WstringDef::_unchecked_narrow (
-+IR_WstringDef_ptr IR_WstringDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return WstringDef::_nil ();
-+    return IR_WstringDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      WstringDef_ptr default_proxy = WstringDef::_nil ();
-+      IR_WstringDef_ptr default_proxy = IR_WstringDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_WstringDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_WstringDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::WstringDef (
-+          ::IR_WstringDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          WstringDef::_nil ());
-+          IR_WstringDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::WstringDef (stub, 0, obj->_servant ()), WstringDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_WstringDef (stub, 0, obj->_servant ()), IR_WstringDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            WstringDef_ptr,
-+            IR_WstringDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &WstringDef::_narrow
-+                      &IR_WstringDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::WstringDef_ptr
--IR::WstringDef::_duplicate (WstringDef_ptr obj)
-+IR_WstringDef_ptr
-+IR_WstringDef::_duplicate (IR_WstringDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::WstringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_WstringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/WstringDef:1.0")) ||
-@@ -22443,34 +21978,34 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::WstringDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_WstringDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, WstringDef)::_narrow))
-+      &IR_WstringDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -22483,12 +22018,12 @@
-   return retv;
- }
- 
--const char* IR::WstringDef::_interface_repository_id (void) const
-+const char* IR_WstringDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/WstringDef:1.0";
- }
- 
--CORBA::ULong IR::WstringDef::bound (
-+CORBA::ULong IR_WstringDef::bound (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -22505,7 +22040,7 @@
-     );
- }
- 
--void IR::WstringDef::bound (
-+void IR_WstringDef::bound (
-     CORBA::ULong bound,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -22524,9 +22059,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::TAO_ClientRequestInfo_IR_WstringDef_bound_get (
-+IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::TAO_ClientRequestInfo_IR_WstringDef_bound_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -22535,7 +22069,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -22547,7 +22081,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -22560,7 +22094,7 @@
- 
- 
- CORBA::Any * 
--IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -22576,13 +22110,13 @@
- }
- 
- void 
--IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::result (CORBA::ULong result)
-+IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::result (CORBA::ULong result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::TAO_ClientRequestInfo_IR_WstringDef_bound_set (
-+IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::TAO_ClientRequestInfo_IR_WstringDef_bound_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::ULong & bound,
-@@ -22593,7 +22127,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -22612,7 +22146,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -22625,7 +22159,7 @@
- 
- 
- CORBA::Any * 
--IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -22638,13 +22172,14 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_WstringDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f57), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e674465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/WstringDef:1.0
--  11, ACE_NTOHL (0x57737472), ACE_NTOHL (0x696e6744), ACE_NTOHL (0x65660000),  // name = WstringDef
-+  11, ACE_NTOHL (0x57737472), ACE_NTOHL (0x696e6744), ACE_NTOHL (0x65660000),  // name = IR_WstringDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_WstringDef (CORBA::tk_objref, sizeof (_oc_IR_WstringDef), (char *) &_oc_IR_WstringDef, 0, sizeof (IR::WstringDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_WstringDef (CORBA::tk_objref, sizeof (_oc_IR_WstringDef), (char *) &_oc_IR_WstringDef, 0, sizeof (IR_WstringDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WstringDef, &_tc_TAO_tc_IR_WstringDef)
-@@ -22654,15 +22189,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_FixedDef_Proxy_Impl::_TAO_FixedDef_Proxy_Impl (void)
-+_TAO_FixedDef_Proxy_Impl::_TAO_FixedDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_FixedDef_Remote_Proxy_Impl::_TAO_FixedDef_Remote_Proxy_Impl (void)
-+_TAO_FixedDef_Remote_Proxy_Impl::_TAO_FixedDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--CORBA::UShort IR::_TAO_FixedDef_Remote_Proxy_Impl::digits (
-+CORBA::UShort _TAO_FixedDef_Remote_Proxy_Impl::digits (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -22699,7 +22234,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get ri (
-+      IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -22820,7 +22355,7 @@
-   return _tao_retval;
- }
- 
--void IR::_TAO_FixedDef_Remote_Proxy_Impl::digits (
-+void _TAO_FixedDef_Remote_Proxy_Impl::digits (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::UShort digits,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -22829,15 +22364,10 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_digits",
-@@ -22858,7 +22388,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set ri (
-+      IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         digits,
-@@ -22972,7 +22502,7 @@
-   
- }
- 
--CORBA::Short IR::_TAO_FixedDef_Remote_Proxy_Impl::scale (
-+CORBA::Short _TAO_FixedDef_Remote_Proxy_Impl::scale (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -23009,7 +22539,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get ri (
-+      IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -23130,7 +22660,7 @@
-   return _tao_retval;
- }
- 
--void IR::_TAO_FixedDef_Remote_Proxy_Impl::scale (
-+void _TAO_FixedDef_Remote_Proxy_Impl::scale (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Short scale,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -23139,15 +22669,10 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_scale",
-@@ -23168,7 +22693,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set ri (
-+      IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         scale,
-@@ -23292,37 +22817,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_FixedDef_Proxy_Broker::_TAO_FixedDef_Proxy_Broker (void)
-+_TAO_FixedDef_Proxy_Broker::_TAO_FixedDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_FixedDef_Proxy_Broker::~_TAO_FixedDef_Proxy_Broker (void)
-+_TAO_FixedDef_Proxy_Broker::~_TAO_FixedDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_FixedDef_Proxy_Broker * (*IR__TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_FixedDef_Proxy_Broker * (*_TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_FixedDef_Remote_Proxy_Broker *
--IR::_TAO_FixedDef_Remote_Proxy_Broker::the_TAO_FixedDef_Remote_Proxy_Broker (void)
-+_TAO_FixedDef_Remote_Proxy_Broker *
-+_TAO_FixedDef_Remote_Proxy_Broker::the_TAO_FixedDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_FixedDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_FixedDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_FixedDef_Remote_Proxy_Broker::_TAO_FixedDef_Remote_Proxy_Broker (void)
-+_TAO_FixedDef_Remote_Proxy_Broker::_TAO_FixedDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_FixedDef_Remote_Proxy_Broker::~_TAO_FixedDef_Remote_Proxy_Broker (void)
-+_TAO_FixedDef_Remote_Proxy_Broker::~_TAO_FixedDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_FixedDef_Proxy_Impl&
--IR::_TAO_FixedDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::FixedDef *object,
-+_TAO_FixedDef_Proxy_Impl&
-+_TAO_FixedDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_FixedDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -23338,109 +22863,109 @@
- 
- 
- // default constructor
--IR::FixedDef::FixedDef (int collocated)
-+IR_FixedDef::IR_FixedDef (int collocated)
- {
-   this->IR_FixedDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::FixedDef::~FixedDef (void)
-+IR_FixedDef::~IR_FixedDef (void)
- {}
- 
- void
--IR::FixedDef::IR_FixedDef_setup_collocation (int collocated)
-+IR_FixedDef::IR_FixedDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_FixedDef_Proxy_Broker_ =
--      ::IR__TAO_FixedDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_FixedDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_FixedDef_Proxy_Broker_ =
--      ::IR::_TAO_FixedDef_Remote_Proxy_Broker::the_TAO_FixedDef_Remote_Proxy_Broker ();
-+      _TAO_FixedDef_Remote_Proxy_Broker::the_TAO_FixedDef_Remote_Proxy_Broker ();
-   
-   this->IR_IDLType_setup_collocation (collocated);
- }
- 
--void IR::FixedDef::_tao_any_destructor (void *x)
-+void IR_FixedDef::_tao_any_destructor (void *x)
- {
--  FixedDef *tmp = ACE_static_cast (FixedDef*,x);
-+  IR_FixedDef *tmp = ACE_static_cast (IR_FixedDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::FixedDef_ptr IR::FixedDef::_narrow (
-+IR_FixedDef_ptr IR_FixedDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return FixedDef::_nil ();
-+    return IR_FixedDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FixedDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (FixedDef::_nil ());
-+      ACE_CHECK_RETURN (IR_FixedDef::_nil ());
-       if (is_a == 0)
--        return FixedDef::_nil ();
-+        return IR_FixedDef::_nil ();
-     }
--  return FixedDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_FixedDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::FixedDef_ptr IR::FixedDef::_unchecked_narrow (
-+IR_FixedDef_ptr IR_FixedDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return FixedDef::_nil ();
-+    return IR_FixedDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      FixedDef_ptr default_proxy = FixedDef::_nil ();
-+      IR_FixedDef_ptr default_proxy = IR_FixedDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_FixedDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_FixedDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::FixedDef (
-+          ::IR_FixedDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          FixedDef::_nil ());
-+          IR_FixedDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::FixedDef (stub, 0, obj->_servant ()), FixedDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_FixedDef (stub, 0, obj->_servant ()), IR_FixedDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            FixedDef_ptr,
-+            IR_FixedDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &FixedDef::_narrow
-+                      &IR_FixedDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::FixedDef_ptr
--IR::FixedDef::_duplicate (FixedDef_ptr obj)
-+IR_FixedDef_ptr
-+IR_FixedDef::_duplicate (IR_FixedDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::FixedDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_FixedDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FixedDef:1.0")) ||
-@@ -23452,34 +22977,34 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::FixedDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_FixedDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, FixedDef)::_narrow))
-+      &IR_FixedDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -23492,12 +23017,12 @@
-   return retv;
- }
- 
--const char* IR::FixedDef::_interface_repository_id (void) const
-+const char* IR_FixedDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/FixedDef:1.0";
- }
- 
--CORBA::UShort IR::FixedDef::digits (
-+CORBA::UShort IR_FixedDef::digits (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -23514,7 +23039,7 @@
-     );
- }
- 
--void IR::FixedDef::digits (
-+void IR_FixedDef::digits (
-     CORBA::UShort digits,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -23533,7 +23058,7 @@
-     );
- }
- 
--CORBA::Short IR::FixedDef::scale (
-+CORBA::Short IR_FixedDef::scale (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -23550,7 +23075,7 @@
-     );
- }
- 
--void IR::FixedDef::scale (
-+void IR_FixedDef::scale (
-     CORBA::Short scale,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -23569,9 +23094,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::TAO_ClientRequestInfo_IR_FixedDef_digits_get (
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::TAO_ClientRequestInfo_IR_FixedDef_digits_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -23580,7 +23104,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -23592,7 +23116,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -23605,7 +23129,7 @@
- 
- 
- CORBA::Any * 
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -23621,13 +23145,13 @@
- }
- 
- void 
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::result (CORBA::UShort result)
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::result (CORBA::UShort result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::TAO_ClientRequestInfo_IR_FixedDef_digits_set (
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::TAO_ClientRequestInfo_IR_FixedDef_digits_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::UShort & digits,
-@@ -23638,7 +23162,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -23657,7 +23181,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -23670,7 +23194,7 @@
- 
- 
- CORBA::Any * 
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -23682,7 +23206,7 @@
-   return result_any;
- }
- 
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::TAO_ClientRequestInfo_IR_FixedDef_scale_get (
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::TAO_ClientRequestInfo_IR_FixedDef_scale_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -23691,7 +23215,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -23703,7 +23227,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -23716,7 +23240,7 @@
- 
- 
- CORBA::Any * 
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -23732,13 +23256,13 @@
- }
- 
- void 
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::result (CORBA::Short result)
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::result (CORBA::Short result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::TAO_ClientRequestInfo_IR_FixedDef_scale_set (
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::TAO_ClientRequestInfo_IR_FixedDef_scale_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::Short & scale,
-@@ -23749,7 +23273,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -23768,7 +23292,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -23781,7 +23305,7 @@
- 
- 
- CORBA::Any * 
--IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -23794,13 +23318,14 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_FixedDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x69786564), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/FixedDef:1.0
--  9, ACE_NTOHL (0x46697865), ACE_NTOHL (0x64446566), ACE_NTOHL (0x0),  // name = FixedDef
-+  9, ACE_NTOHL (0x46697865), ACE_NTOHL (0x64446566), ACE_NTOHL (0x0),  // name = IR_FixedDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_FixedDef (CORBA::tk_objref, sizeof (_oc_IR_FixedDef), (char *) &_oc_IR_FixedDef, 0, sizeof (IR::FixedDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_FixedDef (CORBA::tk_objref, sizeof (_oc_IR_FixedDef), (char *) &_oc_IR_FixedDef, 0, sizeof (IR_FixedDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FixedDef, &_tc_TAO_tc_IR_FixedDef)
-@@ -23810,15 +23335,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_SequenceDef_Proxy_Impl::_TAO_SequenceDef_Proxy_Impl (void)
-+_TAO_SequenceDef_Proxy_Impl::_TAO_SequenceDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_SequenceDef_Remote_Proxy_Impl::_TAO_SequenceDef_Remote_Proxy_Impl (void)
-+_TAO_SequenceDef_Remote_Proxy_Impl::_TAO_SequenceDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--CORBA::ULong IR::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
-+CORBA::ULong _TAO_SequenceDef_Remote_Proxy_Impl::bound (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -23855,7 +23380,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get ri (
-+      IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -23976,7 +23501,7 @@
-   return _tao_retval;
- }
- 
--void IR::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
-+void _TAO_SequenceDef_Remote_Proxy_Impl::bound (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::ULong bound,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -23985,15 +23510,10 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_bound",
-@@ -24014,7 +23534,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set ri (
-+      IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         bound,
-@@ -24128,7 +23648,7 @@
-   
- }
- 
--CORBA::TypeCode_ptr IR::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
-+CORBA::TypeCode_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -24166,7 +23686,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get ri (
-+      IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -24288,7 +23808,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::IDLType_ptr IR::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
-+IR_IDLType_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -24297,8 +23817,8 @@
-   ))
- {
-   
--  IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
--  IR::IDLType_var _tao_safe_retval (_tao_retval);
-+  IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
-+  IR_IDLType_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -24326,7 +23846,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get ri (
-+      IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -24382,7 +23902,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -24448,24 +23968,19 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
-+void _TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr element_type_def,
-+    IR_IDLType_ptr element_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_element_type_def",
-@@ -24486,7 +24001,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set ri (
-+      IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         element_type_def,
-@@ -24610,37 +24125,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_SequenceDef_Proxy_Broker::_TAO_SequenceDef_Proxy_Broker (void)
-+_TAO_SequenceDef_Proxy_Broker::_TAO_SequenceDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_SequenceDef_Proxy_Broker::~_TAO_SequenceDef_Proxy_Broker (void)
-+_TAO_SequenceDef_Proxy_Broker::~_TAO_SequenceDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_SequenceDef_Proxy_Broker * (*IR__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_SequenceDef_Proxy_Broker * (*_TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_SequenceDef_Remote_Proxy_Broker *
--IR::_TAO_SequenceDef_Remote_Proxy_Broker::the_TAO_SequenceDef_Remote_Proxy_Broker (void)
-+_TAO_SequenceDef_Remote_Proxy_Broker *
-+_TAO_SequenceDef_Remote_Proxy_Broker::the_TAO_SequenceDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_SequenceDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_SequenceDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_SequenceDef_Remote_Proxy_Broker::_TAO_SequenceDef_Remote_Proxy_Broker (void)
-+_TAO_SequenceDef_Remote_Proxy_Broker::_TAO_SequenceDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_SequenceDef_Remote_Proxy_Broker::~_TAO_SequenceDef_Remote_Proxy_Broker (void)
-+_TAO_SequenceDef_Remote_Proxy_Broker::~_TAO_SequenceDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_SequenceDef_Proxy_Impl&
--IR::_TAO_SequenceDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::SequenceDef *object,
-+_TAO_SequenceDef_Proxy_Impl&
-+_TAO_SequenceDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_SequenceDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -24656,109 +24171,109 @@
- 
- 
- // default constructor
--IR::SequenceDef::SequenceDef (int collocated)
-+IR_SequenceDef::IR_SequenceDef (int collocated)
- {
-   this->IR_SequenceDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::SequenceDef::~SequenceDef (void)
-+IR_SequenceDef::~IR_SequenceDef (void)
- {}
- 
- void
--IR::SequenceDef::IR_SequenceDef_setup_collocation (int collocated)
-+IR_SequenceDef::IR_SequenceDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_SequenceDef_Proxy_Broker_ =
--      ::IR__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_SequenceDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_SequenceDef_Proxy_Broker_ =
--      ::IR::_TAO_SequenceDef_Remote_Proxy_Broker::the_TAO_SequenceDef_Remote_Proxy_Broker ();
-+      _TAO_SequenceDef_Remote_Proxy_Broker::the_TAO_SequenceDef_Remote_Proxy_Broker ();
-   
-   this->IR_IDLType_setup_collocation (collocated);
- }
- 
--void IR::SequenceDef::_tao_any_destructor (void *x)
-+void IR_SequenceDef::_tao_any_destructor (void *x)
- {
--  SequenceDef *tmp = ACE_static_cast (SequenceDef*,x);
-+  IR_SequenceDef *tmp = ACE_static_cast (IR_SequenceDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::SequenceDef_ptr IR::SequenceDef::_narrow (
-+IR_SequenceDef_ptr IR_SequenceDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return SequenceDef::_nil ();
-+    return IR_SequenceDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/SequenceDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (SequenceDef::_nil ());
-+      ACE_CHECK_RETURN (IR_SequenceDef::_nil ());
-       if (is_a == 0)
--        return SequenceDef::_nil ();
-+        return IR_SequenceDef::_nil ();
-     }
--  return SequenceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_SequenceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::SequenceDef_ptr IR::SequenceDef::_unchecked_narrow (
-+IR_SequenceDef_ptr IR_SequenceDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return SequenceDef::_nil ();
-+    return IR_SequenceDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      SequenceDef_ptr default_proxy = SequenceDef::_nil ();
-+      IR_SequenceDef_ptr default_proxy = IR_SequenceDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_SequenceDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::SequenceDef (
-+          ::IR_SequenceDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          SequenceDef::_nil ());
-+          IR_SequenceDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::SequenceDef (stub, 0, obj->_servant ()), SequenceDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_SequenceDef (stub, 0, obj->_servant ()), IR_SequenceDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            SequenceDef_ptr,
-+            IR_SequenceDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &SequenceDef::_narrow
-+                      &IR_SequenceDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::SequenceDef_ptr
--IR::SequenceDef::_duplicate (SequenceDef_ptr obj)
-+IR_SequenceDef_ptr
-+IR_SequenceDef::_duplicate (IR_SequenceDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::SequenceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_SequenceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/SequenceDef:1.0")) ||
-@@ -24770,34 +24285,34 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::SequenceDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_SequenceDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, SequenceDef)::_narrow))
-+      &IR_SequenceDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -24810,12 +24325,12 @@
-   return retv;
- }
- 
--const char* IR::SequenceDef::_interface_repository_id (void) const
-+const char* IR_SequenceDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/SequenceDef:1.0";
- }
- 
--CORBA::ULong IR::SequenceDef::bound (
-+CORBA::ULong IR_SequenceDef::bound (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -24832,7 +24347,7 @@
-     );
- }
- 
--void IR::SequenceDef::bound (
-+void IR_SequenceDef::bound (
-     CORBA::ULong bound,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -24851,7 +24366,7 @@
-     );
- }
- 
--CORBA::TypeCode_ptr IR::SequenceDef::element_type (
-+CORBA::TypeCode_ptr IR_SequenceDef::element_type (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -24868,7 +24383,7 @@
-     );
- }
- 
--IR::IDLType_ptr IR::SequenceDef::element_type_def (
-+IR_IDLType_ptr IR_SequenceDef::element_type_def (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -24885,8 +24400,8 @@
-     );
- }
- 
--void IR::SequenceDef::element_type_def (
--    IR::IDLType_ptr element_type_def,
-+void IR_SequenceDef::element_type_def (
-+    IR_IDLType_ptr element_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -24904,9 +24419,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::TAO_ClientRequestInfo_IR_SequenceDef_bound_get (
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::TAO_ClientRequestInfo_IR_SequenceDef_bound_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -24915,7 +24429,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -24927,7 +24441,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -24940,7 +24454,7 @@
- 
- 
- CORBA::Any * 
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -24956,13 +24470,13 @@
- }
- 
- void 
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::result (CORBA::ULong result)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::result (CORBA::ULong result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::TAO_ClientRequestInfo_IR_SequenceDef_bound_set (
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::TAO_ClientRequestInfo_IR_SequenceDef_bound_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::ULong & bound,
-@@ -24973,7 +24487,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -24992,7 +24506,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -25005,7 +24519,7 @@
- 
- 
- CORBA::Any * 
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -25017,7 +24531,7 @@
-   return result_any;
- }
- 
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get (
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -25026,7 +24540,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -25038,7 +24552,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -25051,7 +24565,7 @@
- 
- 
- CORBA::Any * 
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -25067,13 +24581,13 @@
- }
- 
- void 
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::TypeCode_ptr result)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::TypeCode_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get (
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -25082,7 +24596,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -25094,7 +24608,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -25107,7 +24621,7 @@
- 
- 
- CORBA::Any * 
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -25123,16 +24637,16 @@
- }
- 
- void 
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::result (IR::IDLType_ptr result)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::result (IR_IDLType_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set (
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr element_type_def,
-+    IR_IDLType_ptr element_type_def,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -25140,7 +24654,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -25160,7 +24674,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -25173,7 +24687,7 @@
- 
- 
- CORBA::Any * 
--IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -25186,13 +24700,14 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_SequenceDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x65717565), ACE_NTOHL (0x6e636544), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/SequenceDef:1.0
--  12, ACE_NTOHL (0x53657175), ACE_NTOHL (0x656e6365), ACE_NTOHL (0x44656600),  // name = SequenceDef
-+  12, ACE_NTOHL (0x53657175), ACE_NTOHL (0x656e6365), ACE_NTOHL (0x44656600),  // name = IR_SequenceDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_SequenceDef (CORBA::tk_objref, sizeof (_oc_IR_SequenceDef), (char *) &_oc_IR_SequenceDef, 0, sizeof (IR::SequenceDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_SequenceDef (CORBA::tk_objref, sizeof (_oc_IR_SequenceDef), (char *) &_oc_IR_SequenceDef, 0, sizeof (IR_SequenceDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SequenceDef, &_tc_TAO_tc_IR_SequenceDef)
-@@ -25202,15 +24717,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_ArrayDef_Proxy_Impl::_TAO_ArrayDef_Proxy_Impl (void)
-+_TAO_ArrayDef_Proxy_Impl::_TAO_ArrayDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_ArrayDef_Remote_Proxy_Impl::_TAO_ArrayDef_Remote_Proxy_Impl (void)
-+_TAO_ArrayDef_Remote_Proxy_Impl::_TAO_ArrayDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--CORBA::ULong IR::_TAO_ArrayDef_Remote_Proxy_Impl::length (
-+CORBA::ULong _TAO_ArrayDef_Remote_Proxy_Impl::length (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -25247,7 +24762,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get ri (
-+      IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -25368,7 +24883,7 @@
-   return _tao_retval;
- }
- 
--void IR::_TAO_ArrayDef_Remote_Proxy_Impl::length (
-+void _TAO_ArrayDef_Remote_Proxy_Impl::length (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::ULong length,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -25377,15 +24892,10 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_length",
-@@ -25406,7 +24916,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set ri (
-+      IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         length,
-@@ -25520,7 +25030,7 @@
-   
- }
- 
--CORBA::TypeCode_ptr IR::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
-+CORBA::TypeCode_ptr _TAO_ArrayDef_Remote_Proxy_Impl::element_type (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -25558,7 +25068,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get ri (
-+      IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -25680,7 +25190,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::IDLType_ptr IR::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
-+IR_IDLType_ptr _TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -25689,8 +25199,8 @@
-   ))
- {
-   
--  IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
--  IR::IDLType_var _tao_safe_retval (_tao_retval);
-+  IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
-+  IR_IDLType_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -25718,7 +25228,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get ri (
-+      IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -25774,7 +25284,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -25840,24 +25350,19 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
-+void _TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr element_type_def,
-+    IR_IDLType_ptr element_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_element_type_def",
-@@ -25878,7 +25383,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set ri (
-+      IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         element_type_def,
-@@ -26002,37 +25507,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_ArrayDef_Proxy_Broker::_TAO_ArrayDef_Proxy_Broker (void)
-+_TAO_ArrayDef_Proxy_Broker::_TAO_ArrayDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ArrayDef_Proxy_Broker::~_TAO_ArrayDef_Proxy_Broker (void)
-+_TAO_ArrayDef_Proxy_Broker::~_TAO_ArrayDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ArrayDef_Proxy_Broker * (*IR__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_ArrayDef_Proxy_Broker * (*_TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_ArrayDef_Remote_Proxy_Broker *
--IR::_TAO_ArrayDef_Remote_Proxy_Broker::the_TAO_ArrayDef_Remote_Proxy_Broker (void)
-+_TAO_ArrayDef_Remote_Proxy_Broker *
-+_TAO_ArrayDef_Remote_Proxy_Broker::the_TAO_ArrayDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_ArrayDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_ArrayDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_ArrayDef_Remote_Proxy_Broker::_TAO_ArrayDef_Remote_Proxy_Broker (void)
-+_TAO_ArrayDef_Remote_Proxy_Broker::_TAO_ArrayDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ArrayDef_Remote_Proxy_Broker::~_TAO_ArrayDef_Remote_Proxy_Broker (void)
-+_TAO_ArrayDef_Remote_Proxy_Broker::~_TAO_ArrayDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ArrayDef_Proxy_Impl&
--IR::_TAO_ArrayDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::ArrayDef *object,
-+_TAO_ArrayDef_Proxy_Impl&
-+_TAO_ArrayDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_ArrayDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -26048,109 +25553,109 @@
- 
- 
- // default constructor
--IR::ArrayDef::ArrayDef (int collocated)
-+IR_ArrayDef::IR_ArrayDef (int collocated)
- {
-   this->IR_ArrayDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::ArrayDef::~ArrayDef (void)
-+IR_ArrayDef::~IR_ArrayDef (void)
- {}
- 
- void
--IR::ArrayDef::IR_ArrayDef_setup_collocation (int collocated)
-+IR_ArrayDef::IR_ArrayDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_ArrayDef_Proxy_Broker_ =
--      ::IR__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_ArrayDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_ArrayDef_Proxy_Broker_ =
--      ::IR::_TAO_ArrayDef_Remote_Proxy_Broker::the_TAO_ArrayDef_Remote_Proxy_Broker ();
-+      _TAO_ArrayDef_Remote_Proxy_Broker::the_TAO_ArrayDef_Remote_Proxy_Broker ();
-   
-   this->IR_IDLType_setup_collocation (collocated);
- }
- 
--void IR::ArrayDef::_tao_any_destructor (void *x)
-+void IR_ArrayDef::_tao_any_destructor (void *x)
- {
--  ArrayDef *tmp = ACE_static_cast (ArrayDef*,x);
-+  IR_ArrayDef *tmp = ACE_static_cast (IR_ArrayDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::ArrayDef_ptr IR::ArrayDef::_narrow (
-+IR_ArrayDef_ptr IR_ArrayDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ArrayDef::_nil ();
-+    return IR_ArrayDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ArrayDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (ArrayDef::_nil ());
-+      ACE_CHECK_RETURN (IR_ArrayDef::_nil ());
-       if (is_a == 0)
--        return ArrayDef::_nil ();
-+        return IR_ArrayDef::_nil ();
-     }
--  return ArrayDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_ArrayDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::ArrayDef_ptr IR::ArrayDef::_unchecked_narrow (
-+IR_ArrayDef_ptr IR_ArrayDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ArrayDef::_nil ();
-+    return IR_ArrayDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      ArrayDef_ptr default_proxy = ArrayDef::_nil ();
-+      IR_ArrayDef_ptr default_proxy = IR_ArrayDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_ArrayDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::ArrayDef (
-+          ::IR_ArrayDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          ArrayDef::_nil ());
-+          IR_ArrayDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::ArrayDef (stub, 0, obj->_servant ()), ArrayDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_ArrayDef (stub, 0, obj->_servant ()), IR_ArrayDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            ArrayDef_ptr,
-+            IR_ArrayDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &ArrayDef::_narrow
-+                      &IR_ArrayDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::ArrayDef_ptr
--IR::ArrayDef::_duplicate (ArrayDef_ptr obj)
-+IR_ArrayDef_ptr
-+IR_ArrayDef::_duplicate (IR_ArrayDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::ArrayDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_ArrayDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ArrayDef:1.0")) ||
-@@ -26162,34 +25667,34 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::ArrayDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ArrayDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, ArrayDef)::_narrow))
-+      &IR_ArrayDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -26202,12 +25707,12 @@
-   return retv;
- }
- 
--const char* IR::ArrayDef::_interface_repository_id (void) const
-+const char* IR_ArrayDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/ArrayDef:1.0";
- }
- 
--CORBA::ULong IR::ArrayDef::length (
-+CORBA::ULong IR_ArrayDef::length (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -26224,7 +25729,7 @@
-     );
- }
- 
--void IR::ArrayDef::length (
-+void IR_ArrayDef::length (
-     CORBA::ULong length,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -26243,7 +25748,7 @@
-     );
- }
- 
--CORBA::TypeCode_ptr IR::ArrayDef::element_type (
-+CORBA::TypeCode_ptr IR_ArrayDef::element_type (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -26260,7 +25765,7 @@
-     );
- }
- 
--IR::IDLType_ptr IR::ArrayDef::element_type_def (
-+IR_IDLType_ptr IR_ArrayDef::element_type_def (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -26277,8 +25782,8 @@
-     );
- }
- 
--void IR::ArrayDef::element_type_def (
--    IR::IDLType_ptr element_type_def,
-+void IR_ArrayDef::element_type_def (
-+    IR_IDLType_ptr element_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -26296,9 +25801,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::TAO_ClientRequestInfo_IR_ArrayDef_length_get (
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::TAO_ClientRequestInfo_IR_ArrayDef_length_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -26307,7 +25811,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -26319,7 +25823,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -26332,7 +25836,7 @@
- 
- 
- CORBA::Any * 
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -26348,13 +25852,13 @@
- }
- 
- void 
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::result (CORBA::ULong result)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::result (CORBA::ULong result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::TAO_ClientRequestInfo_IR_ArrayDef_length_set (
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::TAO_ClientRequestInfo_IR_ArrayDef_length_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::ULong & length,
-@@ -26365,7 +25869,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -26384,7 +25888,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -26397,7 +25901,7 @@
- 
- 
- CORBA::Any * 
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -26409,7 +25913,7 @@
-   return result_any;
- }
- 
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get (
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -26418,7 +25922,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -26430,7 +25934,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -26443,7 +25947,7 @@
- 
- 
- CORBA::Any * 
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -26459,13 +25963,13 @@
- }
- 
- void 
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::result (CORBA::TypeCode_ptr result)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::result (CORBA::TypeCode_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get (
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -26474,7 +25978,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -26486,7 +25990,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -26499,7 +26003,7 @@
- 
- 
- CORBA::Any * 
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -26515,16 +26019,16 @@
- }
- 
- void 
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::result (IR::IDLType_ptr result)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::result (IR_IDLType_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set (
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr element_type_def,
-+    IR_IDLType_ptr element_type_def,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -26532,7 +26036,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -26552,7 +26056,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -26565,7 +26069,7 @@
- 
- 
- CORBA::Any * 
--IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -26578,13 +26082,14 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_ArrayDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x72726179), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/ArrayDef:1.0
--  9, ACE_NTOHL (0x41727261), ACE_NTOHL (0x79446566), ACE_NTOHL (0x0),  // name = ArrayDef
-+  9, ACE_NTOHL (0x41727261), ACE_NTOHL (0x79446566), ACE_NTOHL (0x0),  // name = IR_ArrayDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ArrayDef (CORBA::tk_objref, sizeof (_oc_IR_ArrayDef), (char *) &_oc_IR_ArrayDef, 0, sizeof (IR::ArrayDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ArrayDef (CORBA::tk_objref, sizeof (_oc_IR_ArrayDef), (char *) &_oc_IR_ArrayDef, 0, sizeof (IR_ArrayDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ArrayDef, &_tc_TAO_tc_IR_ArrayDef)
-@@ -26594,15 +26099,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_ExceptionDef_Proxy_Impl::_TAO_ExceptionDef_Proxy_Impl (void)
-+_TAO_ExceptionDef_Proxy_Impl::_TAO_ExceptionDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_ExceptionDef_Remote_Proxy_Impl::_TAO_ExceptionDef_Remote_Proxy_Impl (void)
-+_TAO_ExceptionDef_Remote_Proxy_Impl::_TAO_ExceptionDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--CORBA::TypeCode_ptr IR::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
-+CORBA::TypeCode_ptr _TAO_ExceptionDef_Remote_Proxy_Impl::type (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -26640,7 +26145,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get ri (
-+      IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -26762,7 +26267,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::StructMemberSeq * IR::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
-+IR_StructMemberSeq * _TAO_ExceptionDef_Remote_Proxy_Impl::members (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -26771,7 +26276,7 @@
-   ))
- {
-   
--  IR::StructMemberSeq *_tao_retval = 0;
-+  IR_StructMemberSeq *_tao_retval = 0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -26779,8 +26284,8 @@
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
-   
--  ACE_NEW_RETURN (_tao_retval, IR::StructMemberSeq, _tao_retval);
--  IR::StructMemberSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_StructMemberSeq, _tao_retval);
-+  IR_StructMemberSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_members",
-@@ -26801,7 +26306,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get ri (
-+      IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -26857,7 +26362,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -26923,24 +26428,19 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
-+void _TAO_ExceptionDef_Remote_Proxy_Impl::members (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_members",
-@@ -26961,7 +26461,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set ri (
-+      IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         members,
-@@ -27085,37 +26585,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_ExceptionDef_Proxy_Broker::_TAO_ExceptionDef_Proxy_Broker (void)
-+_TAO_ExceptionDef_Proxy_Broker::_TAO_ExceptionDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ExceptionDef_Proxy_Broker::~_TAO_ExceptionDef_Proxy_Broker (void)
-+_TAO_ExceptionDef_Proxy_Broker::~_TAO_ExceptionDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ExceptionDef_Proxy_Broker * (*IR__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_ExceptionDef_Proxy_Broker * (*_TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_ExceptionDef_Remote_Proxy_Broker *
--IR::_TAO_ExceptionDef_Remote_Proxy_Broker::the_TAO_ExceptionDef_Remote_Proxy_Broker (void)
-+_TAO_ExceptionDef_Remote_Proxy_Broker *
-+_TAO_ExceptionDef_Remote_Proxy_Broker::the_TAO_ExceptionDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_ExceptionDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_ExceptionDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_ExceptionDef_Remote_Proxy_Broker::_TAO_ExceptionDef_Remote_Proxy_Broker (void)
-+_TAO_ExceptionDef_Remote_Proxy_Broker::_TAO_ExceptionDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ExceptionDef_Remote_Proxy_Broker::~_TAO_ExceptionDef_Remote_Proxy_Broker (void)
-+_TAO_ExceptionDef_Remote_Proxy_Broker::~_TAO_ExceptionDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ExceptionDef_Proxy_Impl&
--IR::_TAO_ExceptionDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::ExceptionDef *object,
-+_TAO_ExceptionDef_Proxy_Impl&
-+_TAO_ExceptionDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_ExceptionDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -27131,111 +26631,110 @@
- 
- 
- // default constructor
--IR::ExceptionDef::ExceptionDef (int collocated)
-+IR_ExceptionDef::IR_ExceptionDef (int collocated)
- {
-   this->IR_ExceptionDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::ExceptionDef::~ExceptionDef (void)
-+IR_ExceptionDef::~IR_ExceptionDef (void)
- {}
- 
- void
--IR::ExceptionDef::IR_ExceptionDef_setup_collocation (int collocated)
-+IR_ExceptionDef::IR_ExceptionDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_ExceptionDef_Proxy_Broker_ =
--      ::IR__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_ExceptionDef_Proxy_Broker_ =
--      ::IR::_TAO_ExceptionDef_Remote_Proxy_Broker::the_TAO_ExceptionDef_Remote_Proxy_Broker ();
-+      _TAO_ExceptionDef_Remote_Proxy_Broker::the_TAO_ExceptionDef_Remote_Proxy_Broker ();
-   
-   this->IR_Contained_setup_collocation (collocated);
--  
-   this->IR_Container_setup_collocation (collocated);
- }
- 
--void IR::ExceptionDef::_tao_any_destructor (void *x)
-+void IR_ExceptionDef::_tao_any_destructor (void *x)
- {
--  ExceptionDef *tmp = ACE_static_cast (ExceptionDef*,x);
-+  IR_ExceptionDef *tmp = ACE_static_cast (IR_ExceptionDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::ExceptionDef_ptr IR::ExceptionDef::_narrow (
-+IR_ExceptionDef_ptr IR_ExceptionDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ExceptionDef::_nil ();
-+    return IR_ExceptionDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ExceptionDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (ExceptionDef::_nil ());
-+      ACE_CHECK_RETURN (IR_ExceptionDef::_nil ());
-       if (is_a == 0)
--        return ExceptionDef::_nil ();
-+        return IR_ExceptionDef::_nil ();
-     }
--  return ExceptionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_ExceptionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::ExceptionDef_ptr IR::ExceptionDef::_unchecked_narrow (
-+IR_ExceptionDef_ptr IR_ExceptionDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ExceptionDef::_nil ();
-+    return IR_ExceptionDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      ExceptionDef_ptr default_proxy = ExceptionDef::_nil ();
-+      IR_ExceptionDef_ptr default_proxy = IR_ExceptionDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::ExceptionDef (
-+          ::IR_ExceptionDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          ExceptionDef::_nil ());
-+          IR_ExceptionDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::ExceptionDef (stub, 0, obj->_servant ()), ExceptionDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_ExceptionDef (stub, 0, obj->_servant ()), IR_ExceptionDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            ExceptionDef_ptr,
-+            IR_ExceptionDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &ExceptionDef::_narrow
-+                      &IR_ExceptionDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::ExceptionDef_ptr
--IR::ExceptionDef::_duplicate (ExceptionDef_ptr obj)
-+IR_ExceptionDef_ptr
-+IR_ExceptionDef::_duplicate (IR_ExceptionDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::ExceptionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_ExceptionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ExceptionDef:1.0")) ||
-@@ -27248,46 +26747,46 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::ExceptionDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ExceptionDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, ExceptionDef)::_narrow))
-+      &IR_ExceptionDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-+      &IR_Container::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Container_ptr,
-+            IR_Container_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -27300,12 +26799,12 @@
-   return retv;
- }
- 
--const char* IR::ExceptionDef::_interface_repository_id (void) const
-+const char* IR_ExceptionDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/ExceptionDef:1.0";
- }
- 
--CORBA::TypeCode_ptr IR::ExceptionDef::type (
-+CORBA::TypeCode_ptr IR_ExceptionDef::type (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -27322,7 +26821,7 @@
-     );
- }
- 
--IR::StructMemberSeq * IR::ExceptionDef::members (
-+IR_StructMemberSeq * IR_ExceptionDef::members (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -27339,8 +26838,8 @@
-     );
- }
- 
--void IR::ExceptionDef::members (
--    const IR::StructMemberSeq & members,
-+void IR_ExceptionDef::members (
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -27358,9 +26857,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::TAO_ClientRequestInfo_IR_ExceptionDef_type_get (
-+IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::TAO_ClientRequestInfo_IR_ExceptionDef_type_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -27369,7 +26867,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -27381,7 +26879,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -27394,7 +26892,7 @@
- 
- 
- CORBA::Any * 
--IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -27410,13 +26908,13 @@
- }
- 
- void 
--IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::result (CORBA::TypeCode_ptr result)
-+IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::result (CORBA::TypeCode_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::TAO_ClientRequestInfo_IR_ExceptionDef_members_get (
-+IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::TAO_ClientRequestInfo_IR_ExceptionDef_members_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -27425,7 +26923,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -27437,7 +26935,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -27450,7 +26948,7 @@
- 
- 
- CORBA::Any * 
--IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -27466,16 +26964,16 @@
- }
- 
- void 
--IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::result (IR::StructMemberSeq * result)
-+IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::result (IR_StructMemberSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::TAO_ClientRequestInfo_IR_ExceptionDef_members_set (
-+IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::TAO_ClientRequestInfo_IR_ExceptionDef_members_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::StructMemberSeq & members,
-+    const IR_StructMemberSeq & members,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -27483,7 +26981,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -27503,7 +27001,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -27516,7 +27014,7 @@
- 
- 
- CORBA::Any * 
--IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -27529,17 +27027,19 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_ExceptionDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/ExceptionDef:1.0
--  13, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0),  // name = ExceptionDef
-+  13, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0),  // name = IR_ExceptionDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ExceptionDef (CORBA::tk_objref, sizeof (_oc_IR_ExceptionDef), (char *) &_oc_IR_ExceptionDef, 0, sizeof (IR::ExceptionDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ExceptionDef (CORBA::tk_objref, sizeof (_oc_IR_ExceptionDef), (char *) &_oc_IR_ExceptionDef, 0, sizeof (IR_ExceptionDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDef, &_tc_TAO_tc_IR_ExceptionDef)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_ExceptionDescription[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -27586,36 +27086,33 @@
-   CORBA::tk_TypeCode,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ExceptionDescription (CORBA::tk_struct, sizeof (_oc_IR_ExceptionDescription), (char *) &_oc_IR_ExceptionDescription, 0, sizeof (IR::ExceptionDescription));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ExceptionDescription (CORBA::tk_struct, sizeof (_oc_IR_ExceptionDescription), (char *) &_oc_IR_ExceptionDescription, 0, sizeof (IR_ExceptionDescription));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDescription, &_tc_TAO_tc_IR_ExceptionDescription)
- TAO_NAMESPACE_END
--void IR::ExceptionDescription::_tao_any_destructor (void *x)
-+
-+void IR_ExceptionDescription::_tao_any_destructor (void *x)
- {
--  ExceptionDescription *tmp = ACE_static_cast (ExceptionDescription*,x);
-+  IR_ExceptionDescription *tmp = ACE_static_cast (IR_ExceptionDescription*,x);
-   delete tmp;
- }
- 
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CS_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CS_
--
-   // The Base_Sequence functions, please see tao/Sequence.h
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::ExceptionDef **tmp = 0;
-+    IR_ExceptionDef **tmp = 0;
-     tmp = _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::ExceptionDef **old = ACE_reinterpret_cast (IR::ExceptionDef**, this->buffer_);
-+      IR_ExceptionDef **old = ACE_reinterpret_cast (IR_ExceptionDef**, this->buffer_);
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         if (!this->release_)
--          tmp[i] = IR::ExceptionDef::_duplicate (old[i]);
-+          tmp[i] = IR_ExceptionDef::_duplicate (old[i]);
-         else
-           tmp[i] = old[i];
-         
-@@ -27627,106 +27124,97 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
--    IR::ExceptionDef **tmp = ACE_reinterpret_cast (IR::ExceptionDef**, this->buffer_);
-+    IR_ExceptionDef **tmp = ACE_reinterpret_cast (IR_ExceptionDef**, this->buffer_);
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::ExceptionDef::_nil ();
-+      tmp[i] = IR_ExceptionDef::_nil ();
-     }
-     _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   }
-   
--  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (void)
-   {
-     this->_deallocate_buffer ();
-   }
-   
-   void
--  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-+  _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
-   {
--    IR::ExceptionDef **tmp = ACE_reinterpret_cast (IR::ExceptionDef**, this->buffer_);
-+    IR_ExceptionDef **tmp = ACE_reinterpret_cast (IR_ExceptionDef**, this->buffer_);
-     
-     for (CORBA::ULong i = nl; i < ol; ++i)
-     {
-       CORBA::release (tmp[i]);
--      tmp[i] = IR::ExceptionDef::_nil ();
-+      tmp[i] = IR_ExceptionDef::_nil ();
-     }
-   }
-   void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_downcast (
-+  _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_downcast (
-       void* target,
-       CORBA_Object *src,
-       CORBA_Environment &ACE_TRY_ENV
-     )
-   {
--    IR::ExceptionDef **tmp = ACE_static_cast (IR::ExceptionDef**, target);
--    *tmp = IR::ExceptionDef::_narrow (src, ACE_TRY_ENV);
-+    IR_ExceptionDef **tmp = ACE_static_cast (IR_ExceptionDef**, target);
-+    *tmp = IR_ExceptionDef::_narrow (src, ACE_TRY_ENV);
-   }
- 
-   CORBA_Object*
--  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_upcast (void *src) const
-+  _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_upcast (void *src) const
-   {
--    IR::ExceptionDef **tmp = ACE_static_cast (IR::ExceptionDef**, src);
-+    IR_ExceptionDef **tmp = ACE_static_cast (IR_ExceptionDef**, src);
-     return *tmp;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_EXCEPTIONDEFSEQ_CS_)
--#define _IR_EXCEPTIONDEFSEQ_CS_
--
- // *************************************************************
--// IR::ExceptionDefSeq
-+// IR_ExceptionDefSeq
- // *************************************************************
- 
--IR::ExceptionDefSeq::ExceptionDefSeq (void)
-+IR_ExceptionDefSeq::IR_ExceptionDefSeq (void)
- {}
--IR::ExceptionDefSeq::ExceptionDefSeq (CORBA::ULong max) // uses max size
-+IR_ExceptionDefSeq::IR_ExceptionDefSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::ExceptionDef,IR::ExceptionDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ExceptionDef,IR_ExceptionDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::ExceptionDefSeq::ExceptionDefSeq (CORBA::ULong max, CORBA::ULong length, IR::ExceptionDef_ptr *buffer, CORBA::Boolean release)
-+IR_ExceptionDefSeq::IR_ExceptionDefSeq (CORBA::ULong max, CORBA::ULong length, IR_ExceptionDef_ptr *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::ExceptionDef,IR::ExceptionDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ExceptionDef,IR_ExceptionDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::ExceptionDefSeq::ExceptionDefSeq (const ExceptionDefSeq &seq) // copy ctor
-+IR_ExceptionDefSeq::IR_ExceptionDefSeq (const IR_ExceptionDefSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<IR::ExceptionDef,IR::ExceptionDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ExceptionDef,IR_ExceptionDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::ExceptionDefSeq::~ExceptionDefSeq (void) // dtor
-+IR_ExceptionDefSeq::~IR_ExceptionDefSeq (void) // dtor
- {}
--void IR::ExceptionDefSeq::_tao_any_destructor (void *x)
-+void IR_ExceptionDefSeq::_tao_any_destructor (void *x)
- {
--  ExceptionDefSeq *tmp = ACE_static_cast (ExceptionDefSeq*,x);
-+  IR_ExceptionDefSeq *tmp = ACE_static_cast (IR_ExceptionDefSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_ExceptionDefSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -27739,12 +27227,12 @@
-     60, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/ExceptionDef:1.0
--      13, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0),  // name = ExceptionDef
-+      13, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0),  // name = IR_ExceptionDef
- 
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ExceptionDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ExceptionDefSeq), (char *) &_oc_IR_ExceptionDefSeq, 0, sizeof (IR::ExceptionDefSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ExceptionDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ExceptionDefSeq), (char *) &_oc_IR_ExceptionDefSeq, 0, sizeof (IR_ExceptionDefSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDefSeq, &_tc_TAO_tc_IR_ExceptionDefSeq)
-@@ -27752,18 +27240,15 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CS_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CS_
--
-   void
--  IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::ExceptionDescription* tmp = 0;
-+    IR_ExceptionDescription* tmp = 0;
-     tmp = _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::ExceptionDescription *old = ACE_reinterpret_cast (IR::ExceptionDescription *,this->buffer_);
-+      IR_ExceptionDescription *old = ACE_reinterpret_cast (IR_ExceptionDescription *,this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp[i] = old[i];
-@@ -27776,75 +27261,65 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
-     
--    IR::ExceptionDescription *tmp = ACE_reinterpret_cast (IR::ExceptionDescription *,this->buffer_);
-+    IR_ExceptionDescription *tmp = ACE_reinterpret_cast (IR_ExceptionDescription *,this->buffer_);
-     
-     _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   } 
-   
--  IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::~_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (void) // Dtor.
-+  _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::~_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (void) // Dtor.
-   {
-     this->_deallocate_buffer ();
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_EXCDESCRIPTIONSEQ_CS_)
--#define _IR_EXCDESCRIPTIONSEQ_CS_
--
- // *************************************************************
--// IR::ExcDescriptionSeq
-+// IR_ExcDescriptionSeq
- // *************************************************************
- 
--IR::ExcDescriptionSeq::ExcDescriptionSeq (void)
-+IR_ExcDescriptionSeq::IR_ExcDescriptionSeq (void)
- {}
--IR::ExcDescriptionSeq::ExcDescriptionSeq (CORBA::ULong max) // uses max size
-+IR_ExcDescriptionSeq::IR_ExcDescriptionSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::ExceptionDescription>
-+  TAO_Unbounded_Sequence<IR_ExceptionDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::ExcDescriptionSeq::ExcDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR::ExceptionDescription *buffer, CORBA::Boolean release)
-+IR_ExcDescriptionSeq::IR_ExcDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_ExceptionDescription *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::ExceptionDescription>
-+  TAO_Unbounded_Sequence<IR_ExceptionDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::ExcDescriptionSeq::ExcDescriptionSeq (const ExcDescriptionSeq &seq) // copy ctor
-+IR_ExcDescriptionSeq::IR_ExcDescriptionSeq (const IR_ExcDescriptionSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::ExceptionDescription>
-+  TAO_Unbounded_Sequence<IR_ExceptionDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::ExcDescriptionSeq::~ExcDescriptionSeq (void) // dtor
-+IR_ExcDescriptionSeq::~IR_ExcDescriptionSeq (void) // dtor
- {}
--void IR::ExcDescriptionSeq::_tao_any_destructor (void *x)
-+void IR_ExcDescriptionSeq::_tao_any_destructor (void *x)
- {
--  ExcDescriptionSeq *tmp = ACE_static_cast (ExcDescriptionSeq*,x);
-+  IR_ExcDescriptionSeq *tmp = ACE_static_cast (IR_ExcDescriptionSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_ExcDescriptionSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -27902,11 +27377,12 @@
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ExcDescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_ExcDescriptionSeq), (char *) &_oc_IR_ExcDescriptionSeq, 0, sizeof (IR::ExcDescriptionSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ExcDescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_ExcDescriptionSeq), (char *) &_oc_IR_ExcDescriptionSeq, 0, sizeof (IR_ExcDescriptionSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExcDescriptionSeq, &_tc_TAO_tc_IR_ExcDescriptionSeq)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_AttributeMode[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -27916,7 +27392,7 @@
-   12, ACE_NTOHL (0x41545452), ACE_NTOHL (0x5f4e4f52), ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
-   14, ACE_NTOHL (0x41545452), ACE_NTOHL (0x5f524541), ACE_NTOHL (0x444f4e4c), ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_AttributeMode (CORBA::tk_enum, sizeof (_oc_IR_AttributeMode), (char *) &_oc_IR_AttributeMode, 0, sizeof (IR::AttributeMode));
-+static CORBA::TypeCode _tc_TAO_tc_IR_AttributeMode (CORBA::tk_enum, sizeof (_oc_IR_AttributeMode), (char *) &_oc_IR_AttributeMode, 0, sizeof (IR_AttributeMode));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeMode, &_tc_TAO_tc_IR_AttributeMode)
-@@ -27926,15 +27402,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_AttributeDef_Proxy_Impl::_TAO_AttributeDef_Proxy_Impl (void)
-+_TAO_AttributeDef_Proxy_Impl::_TAO_AttributeDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_AttributeDef_Remote_Proxy_Impl::_TAO_AttributeDef_Remote_Proxy_Impl (void)
-+_TAO_AttributeDef_Remote_Proxy_Impl::_TAO_AttributeDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--CORBA::TypeCode_ptr IR::_TAO_AttributeDef_Remote_Proxy_Impl::type (
-+CORBA::TypeCode_ptr _TAO_AttributeDef_Remote_Proxy_Impl::type (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -27972,7 +27448,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get ri (
-+      IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -28094,7 +27570,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::IDLType_ptr IR::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
-+IR_IDLType_ptr _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -28103,8 +27579,8 @@
-   ))
- {
-   
--  IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
--  IR::IDLType_var _tao_safe_retval (_tao_retval);
-+  IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
-+  IR_IDLType_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -28132,7 +27608,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get ri (
-+      IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -28188,7 +27664,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -28254,24 +27730,19 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
-+void _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr type_def,
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_type_def",
-@@ -28292,7 +27763,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set ri (
-+      IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         type_def,
-@@ -28406,7 +27877,7 @@
-   
- }
- 
--IR::AttributeMode IR::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
-+IR_AttributeMode _TAO_AttributeDef_Remote_Proxy_Impl::mode (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -28415,7 +27886,7 @@
-   ))
- {
-   
--  IR::AttributeMode _tao_retval = (IR::AttributeMode)0;
-+  IR_AttributeMode _tao_retval = (IR_AttributeMode)0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -28443,7 +27914,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get ri (
-+      IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -28499,7 +27970,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::AttributeMode  _tao_retval_info = _tao_retval;
-+              IR_AttributeMode  _tao_retval_info = _tao_retval;
-                ri.result (_tao_retval_info);
-             );
-           
-@@ -28564,24 +28035,19 @@
-   return _tao_retval;
- }
- 
--void IR::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
-+void _TAO_AttributeDef_Remote_Proxy_Impl::mode (
-     CORBA_Object *_collocated_tao_target_,
--    IR::AttributeMode mode,
-+    IR_AttributeMode mode,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_mode",
-@@ -28602,7 +28068,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set ri (
-+      IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         mode,
-@@ -28726,37 +28192,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_AttributeDef_Proxy_Broker::_TAO_AttributeDef_Proxy_Broker (void)
-+_TAO_AttributeDef_Proxy_Broker::_TAO_AttributeDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_AttributeDef_Proxy_Broker::~_TAO_AttributeDef_Proxy_Broker (void)
-+_TAO_AttributeDef_Proxy_Broker::~_TAO_AttributeDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_AttributeDef_Proxy_Broker * (*IR__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_AttributeDef_Proxy_Broker * (*_TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_AttributeDef_Remote_Proxy_Broker *
--IR::_TAO_AttributeDef_Remote_Proxy_Broker::the_TAO_AttributeDef_Remote_Proxy_Broker (void)
-+_TAO_AttributeDef_Remote_Proxy_Broker *
-+_TAO_AttributeDef_Remote_Proxy_Broker::the_TAO_AttributeDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_AttributeDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_AttributeDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_AttributeDef_Remote_Proxy_Broker::_TAO_AttributeDef_Remote_Proxy_Broker (void)
-+_TAO_AttributeDef_Remote_Proxy_Broker::_TAO_AttributeDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_AttributeDef_Remote_Proxy_Broker::~_TAO_AttributeDef_Remote_Proxy_Broker (void)
-+_TAO_AttributeDef_Remote_Proxy_Broker::~_TAO_AttributeDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_AttributeDef_Proxy_Impl&
--IR::_TAO_AttributeDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::AttributeDef *object,
-+_TAO_AttributeDef_Proxy_Impl&
-+_TAO_AttributeDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_AttributeDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -28772,109 +28238,109 @@
- 
- 
- // default constructor
--IR::AttributeDef::AttributeDef (int collocated)
-+IR_AttributeDef::IR_AttributeDef (int collocated)
- {
-   this->IR_AttributeDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::AttributeDef::~AttributeDef (void)
-+IR_AttributeDef::~IR_AttributeDef (void)
- {}
- 
- void
--IR::AttributeDef::IR_AttributeDef_setup_collocation (int collocated)
-+IR_AttributeDef::IR_AttributeDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_AttributeDef_Proxy_Broker_ =
--      ::IR__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_AttributeDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_AttributeDef_Proxy_Broker_ =
--      ::IR::_TAO_AttributeDef_Remote_Proxy_Broker::the_TAO_AttributeDef_Remote_Proxy_Broker ();
-+      _TAO_AttributeDef_Remote_Proxy_Broker::the_TAO_AttributeDef_Remote_Proxy_Broker ();
-   
-   this->IR_Contained_setup_collocation (collocated);
- }
- 
--void IR::AttributeDef::_tao_any_destructor (void *x)
-+void IR_AttributeDef::_tao_any_destructor (void *x)
- {
--  AttributeDef *tmp = ACE_static_cast (AttributeDef*,x);
-+  IR_AttributeDef *tmp = ACE_static_cast (IR_AttributeDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::AttributeDef_ptr IR::AttributeDef::_narrow (
-+IR_AttributeDef_ptr IR_AttributeDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return AttributeDef::_nil ();
-+    return IR_AttributeDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/AttributeDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (AttributeDef::_nil ());
-+      ACE_CHECK_RETURN (IR_AttributeDef::_nil ());
-       if (is_a == 0)
--        return AttributeDef::_nil ();
-+        return IR_AttributeDef::_nil ();
-     }
--  return AttributeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_AttributeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::AttributeDef_ptr IR::AttributeDef::_unchecked_narrow (
-+IR_AttributeDef_ptr IR_AttributeDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return AttributeDef::_nil ();
-+    return IR_AttributeDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      AttributeDef_ptr default_proxy = AttributeDef::_nil ();
-+      IR_AttributeDef_ptr default_proxy = IR_AttributeDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_AttributeDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::AttributeDef (
-+          ::IR_AttributeDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          AttributeDef::_nil ());
-+          IR_AttributeDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::AttributeDef (stub, 0, obj->_servant ()), AttributeDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_AttributeDef (stub, 0, obj->_servant ()), IR_AttributeDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            AttributeDef_ptr,
-+            IR_AttributeDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &AttributeDef::_narrow
-+                      &IR_AttributeDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::AttributeDef_ptr
--IR::AttributeDef::_duplicate (AttributeDef_ptr obj)
-+IR_AttributeDef_ptr
-+IR_AttributeDef::_duplicate (IR_AttributeDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::AttributeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_AttributeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/AttributeDef:1.0")) ||
-@@ -28886,34 +28352,34 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::AttributeDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_AttributeDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, AttributeDef)::_narrow))
-+      &IR_AttributeDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -28926,12 +28392,12 @@
-   return retv;
- }
- 
--const char* IR::AttributeDef::_interface_repository_id (void) const
-+const char* IR_AttributeDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/AttributeDef:1.0";
- }
- 
--CORBA::TypeCode_ptr IR::AttributeDef::type (
-+CORBA::TypeCode_ptr IR_AttributeDef::type (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -28948,7 +28414,7 @@
-     );
- }
- 
--IR::IDLType_ptr IR::AttributeDef::type_def (
-+IR_IDLType_ptr IR_AttributeDef::type_def (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -28965,8 +28431,8 @@
-     );
- }
- 
--void IR::AttributeDef::type_def (
--    IR::IDLType_ptr type_def,
-+void IR_AttributeDef::type_def (
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -28984,7 +28450,7 @@
-     );
- }
- 
--IR::AttributeMode IR::AttributeDef::mode (
-+IR_AttributeMode IR_AttributeDef::mode (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -28993,7 +28459,7 @@
- {
-   _TAO_AttributeDef_Proxy_Impl &proxy = 
-     this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
--  ACE_CHECK_RETURN ((IR::AttributeMode)0);
-+  ACE_CHECK_RETURN ((IR_AttributeMode)0);
-   
-   return proxy.mode (
-       this,
-@@ -29001,8 +28467,8 @@
-     );
- }
- 
--void IR::AttributeDef::mode (
--    IR::AttributeMode mode,
-+void IR_AttributeDef::mode (
-+    IR_AttributeMode mode,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -29020,9 +28486,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::TAO_ClientRequestInfo_IR_AttributeDef_type_get (
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::TAO_ClientRequestInfo_IR_AttributeDef_type_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -29031,7 +28496,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -29043,7 +28508,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -29056,7 +28521,7 @@
- 
- 
- CORBA::Any * 
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -29072,13 +28537,13 @@
- }
- 
- void 
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::result (CORBA::TypeCode_ptr result)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::result (CORBA::TypeCode_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get (
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -29087,7 +28552,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -29099,7 +28564,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -29112,7 +28577,7 @@
- 
- 
- CORBA::Any * 
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -29128,16 +28593,16 @@
- }
- 
- void 
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::result (IR::IDLType_ptr result)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::result (IR_IDLType_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set (
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr type_def,
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -29145,7 +28610,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -29165,7 +28630,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -29178,7 +28643,7 @@
- 
- 
- CORBA::Any * 
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -29190,7 +28655,7 @@
-   return result_any;
- }
- 
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::TAO_ClientRequestInfo_IR_AttributeDef_mode_get (
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::TAO_ClientRequestInfo_IR_AttributeDef_mode_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -29199,7 +28664,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -29211,7 +28676,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -29224,7 +28689,7 @@
- 
- 
- CORBA::Any * 
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -29240,16 +28705,16 @@
- }
- 
- void 
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::result (IR::AttributeMode result)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::result (IR_AttributeMode result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::TAO_ClientRequestInfo_IR_AttributeDef_mode_set (
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::TAO_ClientRequestInfo_IR_AttributeDef_mode_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::AttributeMode & mode,
-+    IR_AttributeMode & mode,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -29257,7 +28722,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -29277,7 +28742,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -29290,7 +28755,7 @@
- 
- 
- CORBA::Any * 
--IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -29303,17 +28768,19 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_AttributeDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/AttributeDef:1.0
--  13, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = AttributeDef
-+  13, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = IR_AttributeDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_AttributeDef (CORBA::tk_objref, sizeof (_oc_IR_AttributeDef), (char *) &_oc_IR_AttributeDef, 0, sizeof (IR::AttributeDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_AttributeDef (CORBA::tk_objref, sizeof (_oc_IR_AttributeDef), (char *) &_oc_IR_AttributeDef, 0, sizeof (IR_AttributeDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeDef, &_tc_TAO_tc_IR_AttributeDef)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_AttributeDescription[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -29486,14 +28953,15 @@
- 
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_AttributeDescription (CORBA::tk_struct, sizeof (_oc_IR_AttributeDescription), (char *) &_oc_IR_AttributeDescription, 0, sizeof (IR::AttributeDescription));
-+static CORBA::TypeCode _tc_TAO_tc_IR_AttributeDescription (CORBA::tk_struct, sizeof (_oc_IR_AttributeDescription), (char *) &_oc_IR_AttributeDescription, 0, sizeof (IR_AttributeDescription));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeDescription, &_tc_TAO_tc_IR_AttributeDescription)
- TAO_NAMESPACE_END
--void IR::AttributeDescription::_tao_any_destructor (void *x)
-+
-+void IR_AttributeDescription::_tao_any_destructor (void *x)
- {
--  AttributeDescription *tmp = ACE_static_cast (AttributeDescription*,x);
-+  IR_AttributeDescription *tmp = ACE_static_cast (IR_AttributeDescription*,x);
-   delete tmp;
- }
- 
-@@ -29506,11 +28974,12 @@
-   10, ACE_NTOHL (0x4f505f4e), ACE_NTOHL (0x4f524d41), ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
-   10, ACE_NTOHL (0x4f505f4f), ACE_NTOHL (0x4e455741), ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_OperationMode (CORBA::tk_enum, sizeof (_oc_IR_OperationMode), (char *) &_oc_IR_OperationMode, 0, sizeof (IR::OperationMode));
-+static CORBA::TypeCode _tc_TAO_tc_IR_OperationMode (CORBA::tk_enum, sizeof (_oc_IR_OperationMode), (char *) &_oc_IR_OperationMode, 0, sizeof (IR_OperationMode));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationMode, &_tc_TAO_tc_IR_OperationMode)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_ParameterMode[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -29521,11 +28990,12 @@
-   10, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f4f55), ACE_NTOHL (0x54000000),  // name = PARAM_OUT
-   12, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ParameterMode (CORBA::tk_enum, sizeof (_oc_IR_ParameterMode), (char *) &_oc_IR_ParameterMode, 0, sizeof (IR::ParameterMode));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ParameterMode (CORBA::tk_enum, sizeof (_oc_IR_ParameterMode), (char *) &_oc_IR_ParameterMode, 0, sizeof (IR_ParameterMode));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParameterMode, &_tc_TAO_tc_IR_ParameterMode)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_ParameterDescription[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -29549,7 +29019,7 @@
-   48, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--    8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+    8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
-   5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-   CORBA::tk_enum, // typecode kind
-@@ -29563,32 +29033,30 @@
-     12, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ParameterDescription (CORBA::tk_struct, sizeof (_oc_IR_ParameterDescription), (char *) &_oc_IR_ParameterDescription, 0, sizeof (IR::ParameterDescription));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ParameterDescription (CORBA::tk_struct, sizeof (_oc_IR_ParameterDescription), (char *) &_oc_IR_ParameterDescription, 0, sizeof (IR_ParameterDescription));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParameterDescription, &_tc_TAO_tc_IR_ParameterDescription)
- TAO_NAMESPACE_END
--void IR::ParameterDescription::_tao_any_destructor (void *x)
-+
-+void IR_ParameterDescription::_tao_any_destructor (void *x)
- {
--  ParameterDescription *tmp = ACE_static_cast (ParameterDescription*,x);
-+  IR_ParameterDescription *tmp = ACE_static_cast (IR_ParameterDescription*,x);
-   delete tmp;
- }
- 
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CS_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CS_
--
-   void
--  IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::ParameterDescription* tmp = 0;
-+    IR_ParameterDescription* tmp = 0;
-     tmp = _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::ParameterDescription *old = ACE_reinterpret_cast (IR::ParameterDescription *,this->buffer_);
-+      IR_ParameterDescription *old = ACE_reinterpret_cast (IR_ParameterDescription *,this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp[i] = old[i];
-@@ -29601,75 +29069,65 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
-     
--    IR::ParameterDescription *tmp = ACE_reinterpret_cast (IR::ParameterDescription *,this->buffer_);
-+    IR_ParameterDescription *tmp = ACE_reinterpret_cast (IR_ParameterDescription *,this->buffer_);
-     
-     _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   } 
-   
--  IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::~_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void) // Dtor.
-+  _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::~_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void) // Dtor.
-   {
-     this->_deallocate_buffer ();
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_PARDESCRIPTIONSEQ_CS_)
--#define _IR_PARDESCRIPTIONSEQ_CS_
--
- // *************************************************************
--// IR::ParDescriptionSeq
-+// IR_ParDescriptionSeq
- // *************************************************************
- 
--IR::ParDescriptionSeq::ParDescriptionSeq (void)
-+IR_ParDescriptionSeq::IR_ParDescriptionSeq (void)
- {}
--IR::ParDescriptionSeq::ParDescriptionSeq (CORBA::ULong max) // uses max size
-+IR_ParDescriptionSeq::IR_ParDescriptionSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_ParDescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::ParameterDescription>
-+  TAO_Unbounded_Sequence<IR_ParameterDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::ParDescriptionSeq::ParDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR::ParameterDescription *buffer, CORBA::Boolean release)
-+IR_ParDescriptionSeq::IR_ParDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_ParameterDescription *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_ParDescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::ParameterDescription>
-+  TAO_Unbounded_Sequence<IR_ParameterDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::ParDescriptionSeq::ParDescriptionSeq (const ParDescriptionSeq &seq) // copy ctor
-+IR_ParDescriptionSeq::IR_ParDescriptionSeq (const IR_ParDescriptionSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_ParDescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::ParameterDescription>
-+  TAO_Unbounded_Sequence<IR_ParameterDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::ParDescriptionSeq::~ParDescriptionSeq (void) // dtor
-+IR_ParDescriptionSeq::~IR_ParDescriptionSeq (void) // dtor
- {}
--void IR::ParDescriptionSeq::_tao_any_destructor (void *x)
-+void IR_ParDescriptionSeq::_tao_any_destructor (void *x)
- {
--  ParDescriptionSeq *tmp = ACE_static_cast (ParDescriptionSeq*,x);
-+  IR_ParDescriptionSeq *tmp = ACE_static_cast (IR_ParDescriptionSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_ParDescriptionSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -29701,7 +29159,7 @@
-       48, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--        8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+        8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
-       5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-       CORBA::tk_enum, // typecode kind
-@@ -29718,11 +29176,12 @@
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ParDescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_ParDescriptionSeq), (char *) &_oc_IR_ParDescriptionSeq, 0, sizeof (IR::ParDescriptionSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ParDescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_ParDescriptionSeq), (char *) &_oc_IR_ParDescriptionSeq, 0, sizeof (IR_ParDescriptionSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParDescriptionSeq, &_tc_TAO_tc_IR_ParDescriptionSeq)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_ContextIdentifier[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -29743,16 +29202,13 @@
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContextIdentifier, &_tc_TAO_tc_IR_ContextIdentifier)
- TAO_NAMESPACE_END
- 
--#if !defined (_IR_CONTEXTIDSEQ_CS_)
--#define _IR_CONTEXTIDSEQ_CS_
--
- // *************************************************************
--// IR::ContextIdSeq
-+// IR_ContextIdSeq
- // *************************************************************
- 
--IR::ContextIdSeq::ContextIdSeq (void)
-+IR_ContextIdSeq::IR_ContextIdSeq (void)
- {}
--IR::ContextIdSeq::ContextIdSeq (CORBA::ULong max) // uses max size
-+IR_ContextIdSeq::IR_ContextIdSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_String_Sequence
-@@ -29761,7 +29217,7 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::ContextIdSeq::ContextIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-+IR_ContextIdSeq::IR_ContextIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_String_Sequence
-@@ -29770,7 +29226,7 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::ContextIdSeq::ContextIdSeq (const ContextIdSeq &seq) // copy ctor
-+IR_ContextIdSeq::IR_ContextIdSeq (const IR_ContextIdSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_String_Sequence
-@@ -29779,17 +29235,14 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::ContextIdSeq::~ContextIdSeq (void) // dtor
-+IR_ContextIdSeq::~IR_ContextIdSeq (void) // dtor
- {}
--void IR::ContextIdSeq::_tao_any_destructor (void *x)
-+void IR_ContextIdSeq::_tao_any_destructor (void *x)
- {
--  ContextIdSeq *tmp = ACE_static_cast (ContextIdSeq*,x);
-+  IR_ContextIdSeq *tmp = ACE_static_cast (IR_ContextIdSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_ContextIdSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -29815,7 +29268,7 @@
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ContextIdSeq (CORBA::tk_alias, sizeof (_oc_IR_ContextIdSeq), (char *) &_oc_IR_ContextIdSeq, 0, sizeof (IR::ContextIdSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ContextIdSeq (CORBA::tk_alias, sizeof (_oc_IR_ContextIdSeq), (char *) &_oc_IR_ContextIdSeq, 0, sizeof (IR_ContextIdSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContextIdSeq, &_tc_TAO_tc_IR_ContextIdSeq)
-@@ -29825,15 +29278,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_OperationDef_Proxy_Impl::_TAO_OperationDef_Proxy_Impl (void)
-+_TAO_OperationDef_Proxy_Impl::_TAO_OperationDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_OperationDef_Remote_Proxy_Impl::_TAO_OperationDef_Remote_Proxy_Impl (void)
-+_TAO_OperationDef_Remote_Proxy_Impl::_TAO_OperationDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--CORBA::TypeCode_ptr IR::_TAO_OperationDef_Remote_Proxy_Impl::result (
-+CORBA::TypeCode_ptr _TAO_OperationDef_Remote_Proxy_Impl::result (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -29871,7 +29324,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get ri (
-+      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -29993,7 +29446,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::IDLType_ptr IR::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
-+IR_IDLType_ptr _TAO_OperationDef_Remote_Proxy_Impl::result_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -30002,8 +29455,8 @@
-   ))
- {
-   
--  IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
--  IR::IDLType_var _tao_safe_retval (_tao_retval);
-+  IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
-+  IR_IDLType_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -30031,7 +29484,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get ri (
-+      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -30087,7 +29540,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -30153,24 +29606,19 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
-+void _TAO_OperationDef_Remote_Proxy_Impl::result_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr result_def,
-+    IR_IDLType_ptr result_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_result_def",
-@@ -30191,7 +29639,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set ri (
-+      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         result_def,
-@@ -30305,7 +29753,7 @@
-   
- }
- 
--IR::ParDescriptionSeq * IR::_TAO_OperationDef_Remote_Proxy_Impl::params (
-+IR_ParDescriptionSeq * _TAO_OperationDef_Remote_Proxy_Impl::params (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -30314,7 +29762,7 @@
-   ))
- {
-   
--  IR::ParDescriptionSeq *_tao_retval = 0;
-+  IR_ParDescriptionSeq *_tao_retval = 0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -30322,8 +29770,8 @@
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
-   
--  ACE_NEW_RETURN (_tao_retval, IR::ParDescriptionSeq, _tao_retval);
--  IR::ParDescriptionSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_ParDescriptionSeq, _tao_retval);
-+  IR_ParDescriptionSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_params",
-@@ -30344,7 +29792,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get ri (
-+      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -30400,7 +29848,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ParDescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ParDescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -30466,24 +29914,19 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_OperationDef_Remote_Proxy_Impl::params (
-+void _TAO_OperationDef_Remote_Proxy_Impl::params (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::ParDescriptionSeq & params,
-+    const IR_ParDescriptionSeq & params,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_params",
-@@ -30504,7 +29947,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set ri (
-+      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         params,
-@@ -30618,7 +30061,7 @@
-   
- }
- 
--IR::OperationMode IR::_TAO_OperationDef_Remote_Proxy_Impl::mode (
-+IR_OperationMode _TAO_OperationDef_Remote_Proxy_Impl::mode (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -30627,7 +30070,7 @@
-   ))
- {
-   
--  IR::OperationMode _tao_retval = (IR::OperationMode)0;
-+  IR_OperationMode _tao_retval = (IR_OperationMode)0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -30655,7 +30098,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get ri (
-+      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -30711,7 +30154,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::OperationMode  _tao_retval_info = _tao_retval;
-+              IR_OperationMode  _tao_retval_info = _tao_retval;
-                ri.result (_tao_retval_info);
-             );
-           
-@@ -30776,24 +30219,19 @@
-   return _tao_retval;
- }
- 
--void IR::_TAO_OperationDef_Remote_Proxy_Impl::mode (
-+void _TAO_OperationDef_Remote_Proxy_Impl::mode (
-     CORBA_Object *_collocated_tao_target_,
--    IR::OperationMode mode,
-+    IR_OperationMode mode,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_mode",
-@@ -30814,7 +30252,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set ri (
-+      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         mode,
-@@ -30928,7 +30366,7 @@
-   
- }
- 
--IR::ContextIdSeq * IR::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
-+IR_ContextIdSeq * _TAO_OperationDef_Remote_Proxy_Impl::contexts (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -30937,7 +30375,7 @@
-   ))
- {
-   
--  IR::ContextIdSeq *_tao_retval = 0;
-+  IR_ContextIdSeq *_tao_retval = 0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -30945,8 +30383,8 @@
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
-   
--  ACE_NEW_RETURN (_tao_retval, IR::ContextIdSeq, _tao_retval);
--  IR::ContextIdSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_ContextIdSeq, _tao_retval);
-+  IR_ContextIdSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_contexts",
-@@ -30967,7 +30405,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get ri (
-+      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -31023,7 +30461,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ContextIdSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ContextIdSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -31089,24 +30527,19 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
-+void _TAO_OperationDef_Remote_Proxy_Impl::contexts (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::ContextIdSeq & contexts,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_contexts",
-@@ -31127,7 +30560,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set ri (
-+      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         contexts,
-@@ -31241,7 +30674,7 @@
-   
- }
- 
--IR::ExceptionDefSeq * IR::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
-+IR_ExceptionDefSeq * _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -31250,7 +30683,7 @@
-   ))
- {
-   
--  IR::ExceptionDefSeq *_tao_retval = 0;
-+  IR_ExceptionDefSeq *_tao_retval = 0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -31258,8 +30691,8 @@
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
-   
--  ACE_NEW_RETURN (_tao_retval, IR::ExceptionDefSeq, _tao_retval);
--  IR::ExceptionDefSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_ExceptionDefSeq, _tao_retval);
-+  IR_ExceptionDefSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_exceptions",
-@@ -31280,7 +30713,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get ri (
-+      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -31336,7 +30769,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ExceptionDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ExceptionDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -31402,24 +30835,19 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
-+void _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_set_exceptions",
-@@ -31440,7 +30868,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set ri (
-+      IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         exceptions,
-@@ -31564,37 +30992,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_OperationDef_Proxy_Broker::_TAO_OperationDef_Proxy_Broker (void)
-+_TAO_OperationDef_Proxy_Broker::_TAO_OperationDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_OperationDef_Proxy_Broker::~_TAO_OperationDef_Proxy_Broker (void)
-+_TAO_OperationDef_Proxy_Broker::~_TAO_OperationDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_OperationDef_Proxy_Broker * (*IR__TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_OperationDef_Proxy_Broker * (*_TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_OperationDef_Remote_Proxy_Broker *
--IR::_TAO_OperationDef_Remote_Proxy_Broker::the_TAO_OperationDef_Remote_Proxy_Broker (void)
-+_TAO_OperationDef_Remote_Proxy_Broker *
-+_TAO_OperationDef_Remote_Proxy_Broker::the_TAO_OperationDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_OperationDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_OperationDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_OperationDef_Remote_Proxy_Broker::_TAO_OperationDef_Remote_Proxy_Broker (void)
-+_TAO_OperationDef_Remote_Proxy_Broker::_TAO_OperationDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_OperationDef_Remote_Proxy_Broker::~_TAO_OperationDef_Remote_Proxy_Broker (void)
-+_TAO_OperationDef_Remote_Proxy_Broker::~_TAO_OperationDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_OperationDef_Proxy_Impl&
--IR::_TAO_OperationDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::OperationDef *object,
-+_TAO_OperationDef_Proxy_Impl&
-+_TAO_OperationDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_OperationDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -31610,109 +31038,109 @@
- 
- 
- // default constructor
--IR::OperationDef::OperationDef (int collocated)
-+IR_OperationDef::IR_OperationDef (int collocated)
- {
-   this->IR_OperationDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::OperationDef::~OperationDef (void)
-+IR_OperationDef::~IR_OperationDef (void)
- {}
- 
- void
--IR::OperationDef::IR_OperationDef_setup_collocation (int collocated)
-+IR_OperationDef::IR_OperationDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_OperationDef_Proxy_Broker_ =
--      ::IR__TAO_OperationDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_OperationDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_OperationDef_Proxy_Broker_ =
--      ::IR::_TAO_OperationDef_Remote_Proxy_Broker::the_TAO_OperationDef_Remote_Proxy_Broker ();
-+      _TAO_OperationDef_Remote_Proxy_Broker::the_TAO_OperationDef_Remote_Proxy_Broker ();
-   
-   this->IR_Contained_setup_collocation (collocated);
- }
- 
--void IR::OperationDef::_tao_any_destructor (void *x)
-+void IR_OperationDef::_tao_any_destructor (void *x)
- {
--  OperationDef *tmp = ACE_static_cast (OperationDef*,x);
-+  IR_OperationDef *tmp = ACE_static_cast (IR_OperationDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::OperationDef_ptr IR::OperationDef::_narrow (
-+IR_OperationDef_ptr IR_OperationDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return OperationDef::_nil ();
-+    return IR_OperationDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/OperationDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (OperationDef::_nil ());
-+      ACE_CHECK_RETURN (IR_OperationDef::_nil ());
-       if (is_a == 0)
--        return OperationDef::_nil ();
-+        return IR_OperationDef::_nil ();
-     }
--  return OperationDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_OperationDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::OperationDef_ptr IR::OperationDef::_unchecked_narrow (
-+IR_OperationDef_ptr IR_OperationDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return OperationDef::_nil ();
-+    return IR_OperationDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      OperationDef_ptr default_proxy = OperationDef::_nil ();
-+      IR_OperationDef_ptr default_proxy = IR_OperationDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_OperationDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_OperationDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::OperationDef (
-+          ::IR_OperationDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          OperationDef::_nil ());
-+          IR_OperationDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::OperationDef (stub, 0, obj->_servant ()), OperationDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_OperationDef (stub, 0, obj->_servant ()), IR_OperationDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            OperationDef_ptr,
-+            IR_OperationDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &OperationDef::_narrow
-+                      &IR_OperationDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::OperationDef_ptr
--IR::OperationDef::_duplicate (OperationDef_ptr obj)
-+IR_OperationDef_ptr
-+IR_OperationDef::_duplicate (IR_OperationDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::OperationDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_OperationDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/OperationDef:1.0")) ||
-@@ -31724,34 +31152,34 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::OperationDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_OperationDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, OperationDef)::_narrow))
-+      &IR_OperationDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -31764,12 +31192,12 @@
-   return retv;
- }
- 
--const char* IR::OperationDef::_interface_repository_id (void) const
-+const char* IR_OperationDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/OperationDef:1.0";
- }
- 
--CORBA::TypeCode_ptr IR::OperationDef::result (
-+CORBA::TypeCode_ptr IR_OperationDef::result (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -31786,7 +31214,7 @@
-     );
- }
- 
--IR::IDLType_ptr IR::OperationDef::result_def (
-+IR_IDLType_ptr IR_OperationDef::result_def (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -31803,8 +31231,8 @@
-     );
- }
- 
--void IR::OperationDef::result_def (
--    IR::IDLType_ptr result_def,
-+void IR_OperationDef::result_def (
-+    IR_IDLType_ptr result_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -31822,7 +31250,7 @@
-     );
- }
- 
--IR::ParDescriptionSeq * IR::OperationDef::params (
-+IR_ParDescriptionSeq * IR_OperationDef::params (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -31839,8 +31267,8 @@
-     );
- }
- 
--void IR::OperationDef::params (
--    const IR::ParDescriptionSeq & params,
-+void IR_OperationDef::params (
-+    const IR_ParDescriptionSeq & params,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -31858,7 +31286,7 @@
-     );
- }
- 
--IR::OperationMode IR::OperationDef::mode (
-+IR_OperationMode IR_OperationDef::mode (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -31867,7 +31295,7 @@
- {
-   _TAO_OperationDef_Proxy_Impl &proxy = 
-     this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
--  ACE_CHECK_RETURN ((IR::OperationMode)0);
-+  ACE_CHECK_RETURN ((IR_OperationMode)0);
-   
-   return proxy.mode (
-       this,
-@@ -31875,8 +31303,8 @@
-     );
- }
- 
--void IR::OperationDef::mode (
--    IR::OperationMode mode,
-+void IR_OperationDef::mode (
-+    IR_OperationMode mode,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -31894,7 +31322,7 @@
-     );
- }
- 
--IR::ContextIdSeq * IR::OperationDef::contexts (
-+IR_ContextIdSeq * IR_OperationDef::contexts (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -31911,8 +31339,8 @@
-     );
- }
- 
--void IR::OperationDef::contexts (
--    const IR::ContextIdSeq & contexts,
-+void IR_OperationDef::contexts (
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -31930,7 +31358,7 @@
-     );
- }
- 
--IR::ExceptionDefSeq * IR::OperationDef::exceptions (
-+IR_ExceptionDefSeq * IR_OperationDef::exceptions (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -31947,8 +31375,8 @@
-     );
- }
- 
--void IR::OperationDef::exceptions (
--    const IR::ExceptionDefSeq & exceptions,
-+void IR_OperationDef::exceptions (
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -31966,9 +31394,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::TAO_ClientRequestInfo_IR_OperationDef_result_get (
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::TAO_ClientRequestInfo_IR_OperationDef_result_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -31977,7 +31404,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -31989,7 +31416,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -32002,7 +31429,7 @@
- 
- 
- CORBA::Any * 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -32018,13 +31445,13 @@
- }
- 
- void 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::result (CORBA::TypeCode_ptr result)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::result (CORBA::TypeCode_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::TAO_ClientRequestInfo_IR_OperationDef_result_def_get (
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::TAO_ClientRequestInfo_IR_OperationDef_result_def_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -32033,7 +31460,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -32045,7 +31472,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -32058,7 +31485,7 @@
- 
- 
- CORBA::Any * 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -32074,16 +31501,16 @@
- }
- 
- void 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::result (IR::IDLType_ptr result)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::result (IR_IDLType_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::TAO_ClientRequestInfo_IR_OperationDef_result_def_set (
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::TAO_ClientRequestInfo_IR_OperationDef_result_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr result_def,
-+    IR_IDLType_ptr result_def,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -32091,7 +31518,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -32111,7 +31538,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -32124,7 +31551,7 @@
- 
- 
- CORBA::Any * 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -32136,7 +31563,7 @@
-   return result_any;
- }
- 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::TAO_ClientRequestInfo_IR_OperationDef_params_get (
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::TAO_ClientRequestInfo_IR_OperationDef_params_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -32145,7 +31572,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -32157,7 +31584,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -32170,7 +31597,7 @@
- 
- 
- CORBA::Any * 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -32186,16 +31613,16 @@
- }
- 
- void 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::result (IR::ParDescriptionSeq * result)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::result (IR_ParDescriptionSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::TAO_ClientRequestInfo_IR_OperationDef_params_set (
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::TAO_ClientRequestInfo_IR_OperationDef_params_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::ParDescriptionSeq & params,
-+    const IR_ParDescriptionSeq & params,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -32203,7 +31630,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -32223,7 +31650,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -32236,7 +31663,7 @@
- 
- 
- CORBA::Any * 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -32248,7 +31675,7 @@
-   return result_any;
- }
- 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::TAO_ClientRequestInfo_IR_OperationDef_mode_get (
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::TAO_ClientRequestInfo_IR_OperationDef_mode_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -32257,7 +31684,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -32269,7 +31696,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -32282,7 +31709,7 @@
- 
- 
- CORBA::Any * 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -32298,16 +31725,16 @@
- }
- 
- void 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::result (IR::OperationMode result)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::result (IR_OperationMode result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::TAO_ClientRequestInfo_IR_OperationDef_mode_set (
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::TAO_ClientRequestInfo_IR_OperationDef_mode_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::OperationMode & mode,
-+    IR_OperationMode & mode,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -32315,7 +31742,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -32335,7 +31762,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -32348,7 +31775,7 @@
- 
- 
- CORBA::Any * 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -32360,7 +31787,7 @@
-   return result_any;
- }
- 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::TAO_ClientRequestInfo_IR_OperationDef_contexts_get (
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::TAO_ClientRequestInfo_IR_OperationDef_contexts_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -32369,7 +31796,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -32381,7 +31808,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -32394,7 +31821,7 @@
- 
- 
- CORBA::Any * 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -32410,16 +31837,16 @@
- }
- 
- void 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::result (IR::ContextIdSeq * result)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::result (IR_ContextIdSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::TAO_ClientRequestInfo_IR_OperationDef_contexts_set (
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::TAO_ClientRequestInfo_IR_OperationDef_contexts_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::ContextIdSeq & contexts,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -32427,7 +31854,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -32447,7 +31874,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -32460,7 +31887,7 @@
- 
- 
- CORBA::Any * 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -32472,7 +31899,7 @@
-   return result_any;
- }
- 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get (
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -32481,7 +31908,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -32493,7 +31920,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -32506,7 +31933,7 @@
- 
- 
- CORBA::Any * 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -32522,16 +31949,16 @@
- }
- 
- void 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::result (IR::ExceptionDefSeq * result)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::result (IR_ExceptionDefSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set (
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -32539,7 +31966,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -32559,7 +31986,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -32572,7 +31999,7 @@
- 
- 
- CORBA::Any * 
--IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -32585,17 +32012,19 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_OperationDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/OperationDef:1.0
--  13, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0),  // name = OperationDef
-+  13, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0),  // name = IR_OperationDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_OperationDef (CORBA::tk_objref, sizeof (_oc_IR_OperationDef), (char *) &_oc_IR_OperationDef, 0, sizeof (IR::OperationDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_OperationDef (CORBA::tk_objref, sizeof (_oc_IR_OperationDef), (char *) &_oc_IR_OperationDef, 0, sizeof (IR_OperationDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationDef, &_tc_TAO_tc_IR_OperationDef)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_OperationDescription[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -32709,7 +32138,7 @@
-         48, // encapsulation length
-           TAO_ENCAP_BYTE_ORDER, // byte order
-           27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--          8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+          8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
-         5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-         CORBA::tk_enum, // typecode kind
-@@ -32785,28 +32214,25 @@
- 
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_OperationDescription (CORBA::tk_struct, sizeof (_oc_IR_OperationDescription), (char *) &_oc_IR_OperationDescription, 0, sizeof (IR::OperationDescription));
-+static CORBA::TypeCode _tc_TAO_tc_IR_OperationDescription (CORBA::tk_struct, sizeof (_oc_IR_OperationDescription), (char *) &_oc_IR_OperationDescription, 0, sizeof (IR_OperationDescription));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationDescription, &_tc_TAO_tc_IR_OperationDescription)
- TAO_NAMESPACE_END
--void IR::OperationDescription::_tao_any_destructor (void *x)
-+
-+void IR_OperationDescription::_tao_any_destructor (void *x)
- {
--  OperationDescription *tmp = ACE_static_cast (OperationDescription*,x);
-+  IR_OperationDescription *tmp = ACE_static_cast (IR_OperationDescription*,x);
-   delete tmp;
- }
- 
--
--#if !defined (_IR_REPOSITORYIDSEQ_CS_)
--#define _IR_REPOSITORYIDSEQ_CS_
--
- // *************************************************************
--// IR::RepositoryIdSeq
-+// IR_RepositoryIdSeq
- // *************************************************************
- 
--IR::RepositoryIdSeq::RepositoryIdSeq (void)
-+IR_RepositoryIdSeq::IR_RepositoryIdSeq (void)
- {}
--IR::RepositoryIdSeq::RepositoryIdSeq (CORBA::ULong max) // uses max size
-+IR_RepositoryIdSeq::IR_RepositoryIdSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_String_Sequence
-@@ -32815,7 +32241,7 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::RepositoryIdSeq::RepositoryIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-+IR_RepositoryIdSeq::IR_RepositoryIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_String_Sequence
-@@ -32824,7 +32250,7 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::RepositoryIdSeq::RepositoryIdSeq (const RepositoryIdSeq &seq) // copy ctor
-+IR_RepositoryIdSeq::IR_RepositoryIdSeq (const IR_RepositoryIdSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_String_Sequence
-@@ -32833,17 +32259,14 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::RepositoryIdSeq::~RepositoryIdSeq (void) // dtor
-+IR_RepositoryIdSeq::~IR_RepositoryIdSeq (void) // dtor
- {}
--void IR::RepositoryIdSeq::_tao_any_destructor (void *x)
-+void IR_RepositoryIdSeq::_tao_any_destructor (void *x)
- {
--  RepositoryIdSeq *tmp = ACE_static_cast (RepositoryIdSeq*,x);
-+  IR_RepositoryIdSeq *tmp = ACE_static_cast (IR_RepositoryIdSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_RepositoryIdSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -32863,7 +32286,7 @@
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_RepositoryIdSeq (CORBA::tk_alias, sizeof (_oc_IR_RepositoryIdSeq), (char *) &_oc_IR_RepositoryIdSeq, 0, sizeof (IR::RepositoryIdSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_RepositoryIdSeq (CORBA::tk_alias, sizeof (_oc_IR_RepositoryIdSeq), (char *) &_oc_IR_RepositoryIdSeq, 0, sizeof (IR_RepositoryIdSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryIdSeq, &_tc_TAO_tc_IR_RepositoryIdSeq)
-@@ -32871,18 +32294,15 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CS_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CS_
--
-   void
--  IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::OperationDescription* tmp = 0;
-+    IR_OperationDescription* tmp = 0;
-     tmp = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::OperationDescription *old = ACE_reinterpret_cast (IR::OperationDescription *,this->buffer_);
-+      IR_OperationDescription *old = ACE_reinterpret_cast (IR_OperationDescription *,this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp[i] = old[i];
-@@ -32895,75 +32315,65 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
-     
--    IR::OperationDescription *tmp = ACE_reinterpret_cast (IR::OperationDescription *,this->buffer_);
-+    IR_OperationDescription *tmp = ACE_reinterpret_cast (IR_OperationDescription *,this->buffer_);
-     
-     _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   } 
-   
--  IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::~_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void) // Dtor.
-+  _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::~_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void) // Dtor.
-   {
-     this->_deallocate_buffer ();
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_OPDESCRIPTIONSEQ_CS_)
--#define _IR_OPDESCRIPTIONSEQ_CS_
--
- // *************************************************************
--// IR::OpDescriptionSeq
-+// IR_OpDescriptionSeq
- // *************************************************************
- 
--IR::OpDescriptionSeq::OpDescriptionSeq (void)
-+IR_OpDescriptionSeq::IR_OpDescriptionSeq (void)
- {}
--IR::OpDescriptionSeq::OpDescriptionSeq (CORBA::ULong max) // uses max size
-+IR_OpDescriptionSeq::IR_OpDescriptionSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_OpDescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::OperationDescription>
-+  TAO_Unbounded_Sequence<IR_OperationDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::OpDescriptionSeq::OpDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR::OperationDescription *buffer, CORBA::Boolean release)
-+IR_OpDescriptionSeq::IR_OpDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_OperationDescription *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_OpDescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::OperationDescription>
-+  TAO_Unbounded_Sequence<IR_OperationDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::OpDescriptionSeq::OpDescriptionSeq (const OpDescriptionSeq &seq) // copy ctor
-+IR_OpDescriptionSeq::IR_OpDescriptionSeq (const IR_OpDescriptionSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_OpDescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::OperationDescription>
-+  TAO_Unbounded_Sequence<IR_OperationDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::OpDescriptionSeq::~OpDescriptionSeq (void) // dtor
-+IR_OpDescriptionSeq::~IR_OpDescriptionSeq (void) // dtor
- {}
--void IR::OpDescriptionSeq::_tao_any_destructor (void *x)
-+void IR_OpDescriptionSeq::_tao_any_destructor (void *x)
- {
--  OpDescriptionSeq *tmp = ACE_static_cast (OpDescriptionSeq*,x);
-+  IR_OpDescriptionSeq *tmp = ACE_static_cast (IR_OpDescriptionSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_OpDescriptionSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -33085,7 +32495,7 @@
-             48, // encapsulation length
-               TAO_ENCAP_BYTE_ORDER, // byte order
-               27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--              8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+              8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
-             5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-             CORBA::tk_enum, // typecode kind
-@@ -33164,7 +32574,7 @@
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_OpDescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_OpDescriptionSeq), (char *) &_oc_IR_OpDescriptionSeq, 0, sizeof (IR::OpDescriptionSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_OpDescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_OpDescriptionSeq), (char *) &_oc_IR_OpDescriptionSeq, 0, sizeof (IR_OpDescriptionSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OpDescriptionSeq, &_tc_TAO_tc_IR_OpDescriptionSeq)
-@@ -33172,18 +32582,15 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CS_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CS_
--
-   void
--  IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::AttributeDescription* tmp = 0;
-+    IR_AttributeDescription* tmp = 0;
-     tmp = _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::AttributeDescription *old = ACE_reinterpret_cast (IR::AttributeDescription *,this->buffer_);
-+      IR_AttributeDescription *old = ACE_reinterpret_cast (IR_AttributeDescription *,this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp[i] = old[i];
-@@ -33196,75 +32603,65 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
-     
--    IR::AttributeDescription *tmp = ACE_reinterpret_cast (IR::AttributeDescription *,this->buffer_);
-+    IR_AttributeDescription *tmp = ACE_reinterpret_cast (IR_AttributeDescription *,this->buffer_);
-     
-     _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   } 
-   
--  IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::~_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (void) // Dtor.
-+  _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::~_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (void) // Dtor.
-   {
-     this->_deallocate_buffer ();
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_ATTRDESCRIPTIONSEQ_CS_)
--#define _IR_ATTRDESCRIPTIONSEQ_CS_
--
- // *************************************************************
--// IR::AttrDescriptionSeq
-+// IR_AttrDescriptionSeq
- // *************************************************************
- 
--IR::AttrDescriptionSeq::AttrDescriptionSeq (void)
-+IR_AttrDescriptionSeq::IR_AttrDescriptionSeq (void)
- {}
--IR::AttrDescriptionSeq::AttrDescriptionSeq (CORBA::ULong max) // uses max size
-+IR_AttrDescriptionSeq::IR_AttrDescriptionSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::AttributeDescription>
-+  TAO_Unbounded_Sequence<IR_AttributeDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::AttrDescriptionSeq::AttrDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR::AttributeDescription *buffer, CORBA::Boolean release)
-+IR_AttrDescriptionSeq::IR_AttrDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_AttributeDescription *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::AttributeDescription>
-+  TAO_Unbounded_Sequence<IR_AttributeDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::AttrDescriptionSeq::AttrDescriptionSeq (const AttrDescriptionSeq &seq) // copy ctor
-+IR_AttrDescriptionSeq::IR_AttrDescriptionSeq (const IR_AttrDescriptionSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::AttributeDescription>
-+  TAO_Unbounded_Sequence<IR_AttributeDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::AttrDescriptionSeq::~AttrDescriptionSeq (void) // dtor
-+IR_AttrDescriptionSeq::~IR_AttrDescriptionSeq (void) // dtor
- {}
--void IR::AttrDescriptionSeq::_tao_any_destructor (void *x)
-+void IR_AttrDescriptionSeq::_tao_any_destructor (void *x)
- {
--  AttrDescriptionSeq *tmp = ACE_static_cast (AttrDescriptionSeq*,x);
-+  IR_AttrDescriptionSeq *tmp = ACE_static_cast (IR_AttrDescriptionSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_AttrDescriptionSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -33448,7 +32845,7 @@
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_AttrDescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_AttrDescriptionSeq), (char *) &_oc_IR_AttrDescriptionSeq, 0, sizeof (IR::AttrDescriptionSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_AttrDescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_AttrDescriptionSeq), (char *) &_oc_IR_AttrDescriptionSeq, 0, sizeof (IR_AttrDescriptionSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttrDescriptionSeq, &_tc_TAO_tc_IR_AttrDescriptionSeq)
-@@ -33458,15 +32855,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_InterfaceDef_Proxy_Impl::_TAO_InterfaceDef_Proxy_Impl (void)
-+_TAO_InterfaceDef_Proxy_Impl::_TAO_InterfaceDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl (void)
-+_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--IR::InterfaceDefSeq * IR::_TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
-+IR_InterfaceDefSeq * _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -33475,7 +32872,7 @@
-   ))
- {
-   
--  IR::InterfaceDefSeq *_tao_retval = 0;
-+  IR_InterfaceDefSeq *_tao_retval = 0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -33483,8 +32880,8 @@
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
-   
--  ACE_NEW_RETURN (_tao_retval, IR::InterfaceDefSeq, _tao_retval);
--  IR::InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_InterfaceDefSeq, _tao_retval);
-+  IR_InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_base_interfaces",
-@@ -33505,7 +32902,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get ri (
-+      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -33561,7 +32958,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -33627,19 +33024,15 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
-+void _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -33665,7 +33058,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set ri (
-+      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         base_interfaces,
-@@ -33779,7 +33172,7 @@
-   
- }
- 
--CORBA::Boolean IR::_TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
-+CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -33816,7 +33209,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get ri (
-+      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -33937,7 +33330,7 @@
-   return _tao_retval;
- }
- 
--void IR::_TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
-+void _TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Boolean is_abstract,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -33946,10 +33339,6 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -33975,7 +33364,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set ri (
-+      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         is_abstract,
-@@ -34089,7 +33478,7 @@
-   
- }
- 
--CORBA::Boolean IR::_TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
-+CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -34126,7 +33515,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get ri (
-+      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -34247,7 +33636,7 @@
-   return _tao_retval;
- }
- 
--void IR::_TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
-+void _TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Boolean is_local,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -34256,10 +33645,6 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -34285,7 +33670,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set ri (
-+      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         is_local,
-@@ -34399,7 +33784,7 @@
-   
- }
- 
--CORBA::Boolean IR::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
-+CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
-     CORBA_Object *_collocated_tao_target_,
-     const char * interface_id,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -34437,7 +33822,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a ri (
-+      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         interface_id,
-@@ -34569,15 +33954,15 @@
-   return _tao_retval;
- }
- 
--IR::AttributeDef_ptr IR::_TAO_InterfaceDef_Remote_Proxy_Impl::create_attribute (
-+IR_AttributeDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_attribute (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+    IR_IDLType_ptr type,
-+    IR_AttributeMode mode,
-+    const IR_ExceptionDefSeq & get_exceptions,
-+    const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -34585,8 +33970,8 @@
-   ))
- {
-   
--  IR::AttributeDef_ptr _tao_retval = IR::AttributeDef::_nil ();
--  IR::AttributeDef_var _tao_safe_retval (_tao_retval);
-+  IR_AttributeDef_ptr _tao_retval = IR_AttributeDef::_nil ();
-+  IR_AttributeDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -34614,7 +33999,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute ri (
-+      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -34693,7 +34078,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -34759,16 +34144,16 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::OperationDef_ptr IR::_TAO_InterfaceDef_Remote_Proxy_Impl::create_operation (
-+IR_OperationDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_operation (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+    IR_IDLType_ptr result,
-+    IR_OperationMode mode,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -34776,8 +34161,8 @@
-   ))
- {
-   
--  IR::OperationDef_ptr _tao_retval = IR::OperationDef::_nil ();
--  IR::OperationDef_var _tao_safe_retval (_tao_retval);
-+  IR_OperationDef_ptr _tao_retval = IR_OperationDef::_nil ();
-+  IR_OperationDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -34805,7 +34190,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation ri (
-+      IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -34886,7 +34271,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -34962,37 +34347,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_InterfaceDef_Proxy_Broker::_TAO_InterfaceDef_Proxy_Broker (void)
-+_TAO_InterfaceDef_Proxy_Broker::_TAO_InterfaceDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_InterfaceDef_Proxy_Broker::~_TAO_InterfaceDef_Proxy_Broker (void)
-+_TAO_InterfaceDef_Proxy_Broker::~_TAO_InterfaceDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_InterfaceDef_Proxy_Broker * (*IR__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_InterfaceDef_Proxy_Broker * (*_TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_InterfaceDef_Remote_Proxy_Broker *
--IR::_TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker (void)
-+_TAO_InterfaceDef_Remote_Proxy_Broker *
-+_TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_InterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_InterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_InterfaceDef_Remote_Proxy_Broker::_TAO_InterfaceDef_Remote_Proxy_Broker (void)
-+_TAO_InterfaceDef_Remote_Proxy_Broker::_TAO_InterfaceDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_InterfaceDef_Remote_Proxy_Broker::~_TAO_InterfaceDef_Remote_Proxy_Broker (void)
-+_TAO_InterfaceDef_Remote_Proxy_Broker::~_TAO_InterfaceDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_InterfaceDef_Proxy_Impl&
--IR::_TAO_InterfaceDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::InterfaceDef *object,
-+_TAO_InterfaceDef_Proxy_Impl&
-+_TAO_InterfaceDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_InterfaceDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -35008,113 +34393,111 @@
- 
- 
- // default constructor
--IR::InterfaceDef::InterfaceDef (int collocated)
-+IR_InterfaceDef::IR_InterfaceDef (int collocated)
- {
-   this->IR_InterfaceDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::InterfaceDef::~InterfaceDef (void)
-+IR_InterfaceDef::~IR_InterfaceDef (void)
- {}
- 
- void
--IR::InterfaceDef::IR_InterfaceDef_setup_collocation (int collocated)
-+IR_InterfaceDef::IR_InterfaceDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_InterfaceDef_Proxy_Broker_ =
--      ::IR__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_InterfaceDef_Proxy_Broker_ =
--      ::IR::_TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker ();
-+      _TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker ();
-   
-   this->IR_Container_setup_collocation (collocated);
--  
-   this->IR_Contained_setup_collocation (collocated);
--  
-   this->IR_IDLType_setup_collocation (collocated);
- }
- 
--void IR::InterfaceDef::_tao_any_destructor (void *x)
-+void IR_InterfaceDef::_tao_any_destructor (void *x)
- {
--  InterfaceDef *tmp = ACE_static_cast (InterfaceDef*,x);
-+  IR_InterfaceDef *tmp = ACE_static_cast (IR_InterfaceDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::InterfaceDef_ptr IR::InterfaceDef::_narrow (
-+IR_InterfaceDef_ptr IR_InterfaceDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return InterfaceDef::_nil ();
-+    return IR_InterfaceDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/InterfaceDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (InterfaceDef::_nil ());
-+      ACE_CHECK_RETURN (IR_InterfaceDef::_nil ());
-       if (is_a == 0)
--        return InterfaceDef::_nil ();
-+        return IR_InterfaceDef::_nil ();
-     }
--  return InterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_InterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::InterfaceDef_ptr IR::InterfaceDef::_unchecked_narrow (
-+IR_InterfaceDef_ptr IR_InterfaceDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return InterfaceDef::_nil ();
-+    return IR_InterfaceDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      InterfaceDef_ptr default_proxy = InterfaceDef::_nil ();
-+      IR_InterfaceDef_ptr default_proxy = IR_InterfaceDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::InterfaceDef (
-+          ::IR_InterfaceDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          InterfaceDef::_nil ());
-+          IR_InterfaceDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::InterfaceDef (stub, 0, obj->_servant ()), InterfaceDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_InterfaceDef (stub, 0, obj->_servant ()), IR_InterfaceDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            InterfaceDef_ptr,
-+            IR_InterfaceDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &InterfaceDef::_narrow
-+                      &IR_InterfaceDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::InterfaceDef_ptr
--IR::InterfaceDef::_duplicate (InterfaceDef_ptr obj)
-+IR_InterfaceDef_ptr
-+IR_InterfaceDef::_duplicate (IR_InterfaceDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::InterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_InterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/InterfaceDef:1.0")) ||
-@@ -35128,58 +34511,58 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::InterfaceDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_InterfaceDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, InterfaceDef)::_narrow))
-+      &IR_InterfaceDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-+      &IR_Container::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Container_ptr,
-+            IR_Container_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -35192,12 +34575,12 @@
-   return retv;
- }
- 
--const char* IR::InterfaceDef::_interface_repository_id (void) const
-+const char* IR_InterfaceDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/InterfaceDef:1.0";
- }
- 
--IR::InterfaceDefSeq * IR::InterfaceDef::base_interfaces (
-+IR_InterfaceDefSeq * IR_InterfaceDef::base_interfaces (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -35214,8 +34597,8 @@
-     );
- }
- 
--void IR::InterfaceDef::base_interfaces (
--    const IR::InterfaceDefSeq & base_interfaces,
-+void IR_InterfaceDef::base_interfaces (
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -35233,7 +34616,7 @@
-     );
- }
- 
--CORBA::Boolean IR::InterfaceDef::is_abstract (
-+CORBA::Boolean IR_InterfaceDef::is_abstract (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -35250,7 +34633,7 @@
-     );
- }
- 
--void IR::InterfaceDef::is_abstract (
-+void IR_InterfaceDef::is_abstract (
-     CORBA::Boolean is_abstract,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -35269,7 +34652,7 @@
-     );
- }
- 
--CORBA::Boolean IR::InterfaceDef::is_local (
-+CORBA::Boolean IR_InterfaceDef::is_local (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -35286,7 +34669,7 @@
-     );
- }
- 
--void IR::InterfaceDef::is_local (
-+void IR_InterfaceDef::is_local (
-     CORBA::Boolean is_local,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -35305,7 +34688,7 @@
-     );
- }
- 
--CORBA::Boolean IR::InterfaceDef::is_a (
-+CORBA::Boolean IR_InterfaceDef::is_a (
-     const char * interface_id,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -35324,14 +34707,14 @@
-     );
- }
- 
--IR::AttributeDef_ptr IR::InterfaceDef::create_attribute (
-+IR_AttributeDef_ptr IR_InterfaceDef::create_attribute (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+    IR_IDLType_ptr type,
-+    IR_AttributeMode mode,
-+    const IR_ExceptionDefSeq & get_exceptions,
-+    const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -35355,15 +34738,15 @@
-     );
- }
- 
--IR::OperationDef_ptr IR::InterfaceDef::create_operation (
-+IR_OperationDef_ptr IR_InterfaceDef::create_operation (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+    IR_IDLType_ptr result,
-+    IR_OperationMode mode,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -35388,9 +34771,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get (
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -35399,7 +34781,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -35411,7 +34793,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -35424,7 +34806,7 @@
- 
- 
- CORBA::Any * 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -35440,16 +34822,16 @@
- }
- 
- void 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::result (IR::InterfaceDefSeq * result)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::result (IR_InterfaceDefSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set (
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::InterfaceDefSeq & base_interfaces,
-+    const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -35457,7 +34839,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -35477,7 +34859,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -35490,7 +34872,7 @@
- 
- 
- CORBA::Any * 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -35502,7 +34884,7 @@
-   return result_any;
- }
- 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get (
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -35511,7 +34893,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -35523,7 +34905,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -35536,7 +34918,7 @@
- 
- 
- CORBA::Any * 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -35552,13 +34934,13 @@
- }
- 
- void 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::result (CORBA::Boolean result)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::result (CORBA::Boolean result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set (
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::Boolean & is_abstract,
-@@ -35569,7 +34951,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -35588,7 +34970,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -35601,7 +34983,7 @@
- 
- 
- CORBA::Any * 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -35613,7 +34995,7 @@
-   return result_any;
- }
- 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get (
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -35622,7 +35004,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -35634,7 +35016,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -35647,7 +35029,7 @@
- 
- 
- CORBA::Any * 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -35663,13 +35045,13 @@
- }
- 
- void 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::result (CORBA::Boolean result)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::result (CORBA::Boolean result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set (
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::Boolean & is_local,
-@@ -35680,7 +35062,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -35699,7 +35081,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -35712,7 +35094,7 @@
- 
- 
- CORBA::Any * 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -35724,7 +35106,7 @@
-   return result_any;
- }
- 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::TAO_ClientRequestInfo_IR_InterfaceDef_is_a (
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::TAO_ClientRequestInfo_IR_InterfaceDef_is_a (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * interface_id,
-@@ -35735,7 +35117,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -35754,7 +35136,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -35767,7 +35149,7 @@
- 
- 
- CORBA::Any * 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -35783,22 +35165,22 @@
- }
- 
- void 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::result (CORBA::Boolean result)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::result (CORBA::Boolean result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute (
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode & mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+    IR_IDLType_ptr type,
-+    IR_AttributeMode & mode,
-+    const IR_ExceptionDefSeq & get_exceptions,
-+    const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -35812,7 +35194,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -35865,7 +35247,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -35878,7 +35260,7 @@
- 
- 
- CORBA::Any * 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -35894,23 +35276,23 @@
- }
- 
- void 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::result (IR::AttributeDef_ptr result)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::result (IR_AttributeDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation (
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode & mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+    IR_IDLType_ptr result,
-+    IR_OperationMode & mode,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -35925,7 +35307,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -35984,7 +35366,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -35997,7 +35379,7 @@
- 
- 
- CORBA::Any * 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -36013,24 +35395,26 @@
- }
- 
- void 
--IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::result (IR::OperationDef_ptr result)
-+IR_InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::result (IR_OperationDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_InterfaceDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/InterfaceDef:1.0
--  13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = InterfaceDef
-+  13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = IR_InterfaceDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_InterfaceDef (CORBA::tk_objref, sizeof (_oc_IR_InterfaceDef), (char *) &_oc_IR_InterfaceDef, 0, sizeof (IR::InterfaceDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_InterfaceDef (CORBA::tk_objref, sizeof (_oc_IR_InterfaceDef), (char *) &_oc_IR_InterfaceDef, 0, sizeof (IR_InterfaceDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDef, &_tc_TAO_tc_IR_InterfaceDef)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_InterfaceDescription[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -36195,7 +35579,7 @@
-               48, // encapsulation length
-                 TAO_ENCAP_BYTE_ORDER, // byte order
-                 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--                8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+                8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
-               5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-               CORBA::tk_enum, // typecode kind
-@@ -36488,14 +35872,15 @@
-   CORBA::tk_boolean,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_InterfaceDescription (CORBA::tk_struct, sizeof (_oc_IR_InterfaceDescription), (char *) &_oc_IR_InterfaceDescription, 0, sizeof (IR::InterfaceDescription));
-+static CORBA::TypeCode _tc_TAO_tc_IR_InterfaceDescription (CORBA::tk_struct, sizeof (_oc_IR_InterfaceDescription), (char *) &_oc_IR_InterfaceDescription, 0, sizeof (IR_InterfaceDescription));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDescription, &_tc_TAO_tc_IR_InterfaceDescription)
- TAO_NAMESPACE_END
--void IR::InterfaceDescription::_tao_any_destructor (void *x)
-+
-+void IR_InterfaceDescription::_tao_any_destructor (void *x)
- {
--  InterfaceDescription *tmp = ACE_static_cast (InterfaceDescription*,x);
-+  IR_InterfaceDescription *tmp = ACE_static_cast (IR_InterfaceDescription*,x);
-   delete tmp;
- }
- 
-@@ -36549,7 +35934,7 @@
-   48, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--    8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+    8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
-   7, ACE_NTOHL (0x61636365), ACE_NTOHL (0x73730000),  // name = access
-   CORBA::tk_alias, // typecode kind for typedefs
-@@ -36561,32 +35946,30 @@
- 
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ValueMember (CORBA::tk_struct, sizeof (_oc_IR_ValueMember), (char *) &_oc_IR_ValueMember, 0, sizeof (IR::ValueMember));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ValueMember (CORBA::tk_struct, sizeof (_oc_IR_ValueMember), (char *) &_oc_IR_ValueMember, 0, sizeof (IR_ValueMember));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueMember, &_tc_TAO_tc_IR_ValueMember)
- TAO_NAMESPACE_END
--void IR::ValueMember::_tao_any_destructor (void *x)
-+
-+void IR_ValueMember::_tao_any_destructor (void *x)
- {
--  ValueMember *tmp = ACE_static_cast (ValueMember*,x);
-+  IR_ValueMember *tmp = ACE_static_cast (IR_ValueMember*,x);
-   delete tmp;
- }
- 
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CS_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CS_
--
-   void
--  IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Sequence_IR_ValueMemberSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::ValueMember* tmp = 0;
-+    IR_ValueMember* tmp = 0;
-     tmp = _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::ValueMember *old = ACE_reinterpret_cast (IR::ValueMember *,this->buffer_);
-+      IR_ValueMember *old = ACE_reinterpret_cast (IR_ValueMember *,this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp[i] = old[i];
-@@ -36599,75 +35982,65 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Sequence_IR_ValueMemberSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
-     
--    IR::ValueMember *tmp = ACE_reinterpret_cast (IR::ValueMember *,this->buffer_);
-+    IR_ValueMember *tmp = ACE_reinterpret_cast (IR_ValueMember *,this->buffer_);
-     
-     _TAO_Unbounded_Sequence_IR_ValueMemberSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   } 
-   
--  IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::~_TAO_Unbounded_Sequence_IR_ValueMemberSeq (void) // Dtor.
-+  _TAO_Unbounded_Sequence_IR_ValueMemberSeq::~_TAO_Unbounded_Sequence_IR_ValueMemberSeq (void) // Dtor.
-   {
-     this->_deallocate_buffer ();
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_VALUEMEMBERSEQ_CS_)
--#define _IR_VALUEMEMBERSEQ_CS_
--
- // *************************************************************
--// IR::ValueMemberSeq
-+// IR_ValueMemberSeq
- // *************************************************************
- 
--IR::ValueMemberSeq::ValueMemberSeq (void)
-+IR_ValueMemberSeq::IR_ValueMemberSeq (void)
- {}
--IR::ValueMemberSeq::ValueMemberSeq (CORBA::ULong max) // uses max size
-+IR_ValueMemberSeq::IR_ValueMemberSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_ValueMemberSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::ValueMember>
-+  TAO_Unbounded_Sequence<IR_ValueMember>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::ValueMemberSeq::ValueMemberSeq (CORBA::ULong max, CORBA::ULong length, IR::ValueMember *buffer, CORBA::Boolean release)
-+IR_ValueMemberSeq::IR_ValueMemberSeq (CORBA::ULong max, CORBA::ULong length, IR_ValueMember *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_ValueMemberSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::ValueMember>
-+  TAO_Unbounded_Sequence<IR_ValueMember>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::ValueMemberSeq::ValueMemberSeq (const ValueMemberSeq &seq) // copy ctor
-+IR_ValueMemberSeq::IR_ValueMemberSeq (const IR_ValueMemberSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_ValueMemberSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::ValueMember>
-+  TAO_Unbounded_Sequence<IR_ValueMember>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::ValueMemberSeq::~ValueMemberSeq (void) // dtor
-+IR_ValueMemberSeq::~IR_ValueMemberSeq (void) // dtor
- {}
--void IR::ValueMemberSeq::_tao_any_destructor (void *x)
-+void IR_ValueMemberSeq::_tao_any_destructor (void *x)
- {
--  ValueMemberSeq *tmp = ACE_static_cast (ValueMemberSeq*,x);
-+  IR_ValueMemberSeq *tmp = ACE_static_cast (IR_ValueMemberSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_ValueMemberSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -36726,7 +36099,7 @@
-       48, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--        8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+        8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
-       7, ACE_NTOHL (0x61636365), ACE_NTOHL (0x73730000),  // name = access
-       CORBA::tk_alias, // typecode kind for typedefs
-@@ -36741,7 +36114,7 @@
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ValueMemberSeq (CORBA::tk_alias, sizeof (_oc_IR_ValueMemberSeq), (char *) &_oc_IR_ValueMemberSeq, 0, sizeof (IR::ValueMemberSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ValueMemberSeq (CORBA::tk_alias, sizeof (_oc_IR_ValueMemberSeq), (char *) &_oc_IR_ValueMemberSeq, 0, sizeof (IR_ValueMemberSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueMemberSeq, &_tc_TAO_tc_IR_ValueMemberSeq)
-@@ -36751,15 +36124,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_ValueMemberDef_Proxy_Impl::_TAO_ValueMemberDef_Proxy_Impl (void)
-+_TAO_ValueMemberDef_Proxy_Impl::_TAO_ValueMemberDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_ValueMemberDef_Remote_Proxy_Impl::_TAO_ValueMemberDef_Remote_Proxy_Impl (void)
-+_TAO_ValueMemberDef_Remote_Proxy_Impl::_TAO_ValueMemberDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--CORBA::TypeCode_ptr IR::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
-+CORBA::TypeCode_ptr _TAO_ValueMemberDef_Remote_Proxy_Impl::type (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -36797,7 +36170,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get ri (
-+      IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -36919,7 +36292,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::IDLType_ptr IR::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
-+IR_IDLType_ptr _TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -36928,8 +36301,8 @@
-   ))
- {
-   
--  IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
--  IR::IDLType_var _tao_safe_retval (_tao_retval);
-+  IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
-+  IR_IDLType_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -36957,7 +36330,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get ri (
-+      IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -37013,7 +36386,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -37079,19 +36452,15 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
-+void _TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr type_def,
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -37117,7 +36486,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set ri (
-+      IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         type_def,
-@@ -37231,7 +36600,7 @@
-   
- }
- 
--CORBA::Visibility IR::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
-+CORBA::Visibility _TAO_ValueMemberDef_Remote_Proxy_Impl::access (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -37268,7 +36637,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get ri (
-+      IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -37389,7 +36758,7 @@
-   return _tao_retval;
- }
- 
--void IR::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
-+void _TAO_ValueMemberDef_Remote_Proxy_Impl::access (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Visibility access,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -37398,10 +36767,6 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -37427,7 +36792,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set ri (
-+      IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         access,
-@@ -37551,37 +36916,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_ValueMemberDef_Proxy_Broker::_TAO_ValueMemberDef_Proxy_Broker (void)
-+_TAO_ValueMemberDef_Proxy_Broker::_TAO_ValueMemberDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ValueMemberDef_Proxy_Broker::~_TAO_ValueMemberDef_Proxy_Broker (void)
-+_TAO_ValueMemberDef_Proxy_Broker::~_TAO_ValueMemberDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ValueMemberDef_Proxy_Broker * (*IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_ValueMemberDef_Proxy_Broker * (*_TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_ValueMemberDef_Remote_Proxy_Broker *
--IR::_TAO_ValueMemberDef_Remote_Proxy_Broker::the_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
-+_TAO_ValueMemberDef_Remote_Proxy_Broker *
-+_TAO_ValueMemberDef_Remote_Proxy_Broker::the_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_ValueMemberDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_ValueMemberDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_ValueMemberDef_Remote_Proxy_Broker::_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
-+_TAO_ValueMemberDef_Remote_Proxy_Broker::_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ValueMemberDef_Remote_Proxy_Broker::~_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
-+_TAO_ValueMemberDef_Remote_Proxy_Broker::~_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ValueMemberDef_Proxy_Impl&
--IR::_TAO_ValueMemberDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::ValueMemberDef *object,
-+_TAO_ValueMemberDef_Proxy_Impl&
-+_TAO_ValueMemberDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_ValueMemberDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -37597,109 +36962,109 @@
- 
- 
- // default constructor
--IR::ValueMemberDef::ValueMemberDef (int collocated)
-+IR_ValueMemberDef::IR_ValueMemberDef (int collocated)
- {
-   this->IR_ValueMemberDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::ValueMemberDef::~ValueMemberDef (void)
-+IR_ValueMemberDef::~IR_ValueMemberDef (void)
- {}
- 
- void
--IR::ValueMemberDef::IR_ValueMemberDef_setup_collocation (int collocated)
-+IR_ValueMemberDef::IR_ValueMemberDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_ValueMemberDef_Proxy_Broker_ =
--      ::IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_ValueMemberDef_Proxy_Broker_ =
--      ::IR::_TAO_ValueMemberDef_Remote_Proxy_Broker::the_TAO_ValueMemberDef_Remote_Proxy_Broker ();
-+      _TAO_ValueMemberDef_Remote_Proxy_Broker::the_TAO_ValueMemberDef_Remote_Proxy_Broker ();
-   
-   this->IR_Contained_setup_collocation (collocated);
- }
- 
--void IR::ValueMemberDef::_tao_any_destructor (void *x)
-+void IR_ValueMemberDef::_tao_any_destructor (void *x)
- {
--  ValueMemberDef *tmp = ACE_static_cast (ValueMemberDef*,x);
-+  IR_ValueMemberDef *tmp = ACE_static_cast (IR_ValueMemberDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::ValueMemberDef_ptr IR::ValueMemberDef::_narrow (
-+IR_ValueMemberDef_ptr IR_ValueMemberDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ValueMemberDef::_nil ();
-+    return IR_ValueMemberDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ValueMemberDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (ValueMemberDef::_nil ());
-+      ACE_CHECK_RETURN (IR_ValueMemberDef::_nil ());
-       if (is_a == 0)
--        return ValueMemberDef::_nil ();
-+        return IR_ValueMemberDef::_nil ();
-     }
--  return ValueMemberDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_ValueMemberDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::ValueMemberDef_ptr IR::ValueMemberDef::_unchecked_narrow (
-+IR_ValueMemberDef_ptr IR_ValueMemberDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ValueMemberDef::_nil ();
-+    return IR_ValueMemberDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      ValueMemberDef_ptr default_proxy = ValueMemberDef::_nil ();
-+      IR_ValueMemberDef_ptr default_proxy = IR_ValueMemberDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::ValueMemberDef (
-+          ::IR_ValueMemberDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          ValueMemberDef::_nil ());
-+          IR_ValueMemberDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::ValueMemberDef (stub, 0, obj->_servant ()), ValueMemberDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_ValueMemberDef (stub, 0, obj->_servant ()), IR_ValueMemberDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            ValueMemberDef_ptr,
-+            IR_ValueMemberDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &ValueMemberDef::_narrow
-+                      &IR_ValueMemberDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::ValueMemberDef_ptr
--IR::ValueMemberDef::_duplicate (ValueMemberDef_ptr obj)
-+IR_ValueMemberDef_ptr
-+IR_ValueMemberDef::_duplicate (IR_ValueMemberDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::ValueMemberDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_ValueMemberDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ValueMemberDef:1.0")) ||
-@@ -37711,34 +37076,34 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::ValueMemberDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ValueMemberDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, ValueMemberDef)::_narrow))
-+      &IR_ValueMemberDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -37751,12 +37116,12 @@
-   return retv;
- }
- 
--const char* IR::ValueMemberDef::_interface_repository_id (void) const
-+const char* IR_ValueMemberDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/ValueMemberDef:1.0";
- }
- 
--CORBA::TypeCode_ptr IR::ValueMemberDef::type (
-+CORBA::TypeCode_ptr IR_ValueMemberDef::type (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -37773,7 +37138,7 @@
-     );
- }
- 
--IR::IDLType_ptr IR::ValueMemberDef::type_def (
-+IR_IDLType_ptr IR_ValueMemberDef::type_def (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -37790,8 +37155,8 @@
-     );
- }
- 
--void IR::ValueMemberDef::type_def (
--    IR::IDLType_ptr type_def,
-+void IR_ValueMemberDef::type_def (
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -37809,7 +37174,7 @@
-     );
- }
- 
--CORBA::Visibility IR::ValueMemberDef::access (
-+CORBA::Visibility IR_ValueMemberDef::access (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -37826,7 +37191,7 @@
-     );
- }
- 
--void IR::ValueMemberDef::access (
-+void IR_ValueMemberDef::access (
-     CORBA::Visibility access,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -37845,9 +37210,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get (
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -37856,7 +37220,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -37868,7 +37232,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -37881,7 +37245,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -37897,13 +37261,13 @@
- }
- 
- void 
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::result (CORBA::TypeCode_ptr result)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::result (CORBA::TypeCode_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get (
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -37912,7 +37276,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -37924,7 +37288,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -37937,7 +37301,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -37953,16 +37317,16 @@
- }
- 
- void 
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::result (IR::IDLType_ptr result)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::result (IR_IDLType_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set (
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr type_def,
-+    IR_IDLType_ptr type_def,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -37970,7 +37334,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -37990,7 +37354,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -38003,7 +37367,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -38015,7 +37379,7 @@
-   return result_any;
- }
- 
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get (
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -38024,7 +37388,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -38036,7 +37400,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -38049,7 +37413,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -38065,13 +37429,13 @@
- }
- 
- void 
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::result (CORBA::Visibility result)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::result (CORBA::Visibility result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set (
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::Visibility & access,
-@@ -38082,7 +37446,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -38101,7 +37465,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -38114,7 +37478,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -38127,13 +37491,14 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_ValueMemberDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65724465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/ValueMemberDef:1.0
--  15, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657244), ACE_NTOHL (0x65660000),  // name = ValueMemberDef
-+  15, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657244), ACE_NTOHL (0x65660000),  // name = IR_ValueMemberDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ValueMemberDef (CORBA::tk_objref, sizeof (_oc_IR_ValueMemberDef), (char *) &_oc_IR_ValueMemberDef, 0, sizeof (IR::ValueMemberDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ValueMemberDef (CORBA::tk_objref, sizeof (_oc_IR_ValueMemberDef), (char *) &_oc_IR_ValueMemberDef, 0, sizeof (IR_ValueMemberDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueMemberDef, &_tc_TAO_tc_IR_ValueMemberDef)
-@@ -38143,15 +37508,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_ValueDef_Proxy_Impl::_TAO_ValueDef_Proxy_Impl (void)
-+_TAO_ValueDef_Proxy_Impl::_TAO_ValueDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
-+_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--IR::InterfaceDefSeq * IR::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
-+IR_InterfaceDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -38160,7 +37525,7 @@
-   ))
- {
-   
--  IR::InterfaceDefSeq *_tao_retval = 0;
-+  IR_InterfaceDefSeq *_tao_retval = 0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -38168,8 +37533,8 @@
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
-   
--  ACE_NEW_RETURN (_tao_retval, IR::InterfaceDefSeq, _tao_retval);
--  IR::InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_InterfaceDefSeq, _tao_retval);
-+  IR_InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_supported_interfaces",
-@@ -38190,7 +37555,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -38246,7 +37611,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -38312,19 +37677,15 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
-+void _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::InterfaceDefSeq & supported_interfaces,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -38350,7 +37711,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         supported_interfaces,
-@@ -38464,7 +37825,7 @@
-   
- }
- 
--IR::InitializerSeq * IR::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
-+IR_InitializerSeq * _TAO_ValueDef_Remote_Proxy_Impl::initializers (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -38473,7 +37834,7 @@
-   ))
- {
-   
--  IR::InitializerSeq *_tao_retval = 0;
-+  IR_InitializerSeq *_tao_retval = 0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -38481,8 +37842,8 @@
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
-   
--  ACE_NEW_RETURN (_tao_retval, IR::InitializerSeq, _tao_retval);
--  IR::InitializerSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_InitializerSeq, _tao_retval);
-+  IR_InitializerSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_initializers",
-@@ -38503,7 +37864,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -38559,7 +37920,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::InitializerSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_InitializerSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -38625,19 +37986,15 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
-+void _TAO_ValueDef_Remote_Proxy_Impl::initializers (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::InitializerSeq & initializers,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -38663,7 +38020,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         initializers,
-@@ -38777,7 +38134,7 @@
-   
- }
- 
--IR::ValueDef_ptr IR::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
-+IR_ValueDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::base_value (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -38786,8 +38143,8 @@
-   ))
- {
-   
--  IR::ValueDef_ptr _tao_retval = IR::ValueDef::_nil ();
--  IR::ValueDef_var _tao_safe_retval (_tao_retval);
-+  IR_ValueDef_ptr _tao_retval = IR_ValueDef::_nil ();
-+  IR_ValueDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -38815,7 +38172,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -38871,7 +38228,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -38937,19 +38294,15 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
-+void _TAO_ValueDef_Remote_Proxy_Impl::base_value (
-     CORBA_Object *_collocated_tao_target_,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -38975,7 +38328,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         base_value,
-@@ -39089,7 +38442,7 @@
-   
- }
- 
--IR::ValueDefSeq * IR::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
-+IR_ValueDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -39098,7 +38451,7 @@
-   ))
- {
-   
--  IR::ValueDefSeq *_tao_retval = 0;
-+  IR_ValueDefSeq *_tao_retval = 0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -39106,8 +38459,8 @@
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
-   
--  ACE_NEW_RETURN (_tao_retval, IR::ValueDefSeq, _tao_retval);
--  IR::ValueDefSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_ValueDefSeq, _tao_retval);
-+  IR_ValueDefSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_abstract_base_values",
-@@ -39128,7 +38481,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -39184,7 +38537,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ValueDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ValueDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -39250,19 +38603,15 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
-+void _TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::ValueDefSeq & abstract_base_values,
-+    const IR_ValueDefSeq & abstract_base_values,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -39288,7 +38637,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         abstract_base_values,
-@@ -39402,7 +38751,7 @@
-   
- }
- 
--CORBA::Boolean IR::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
-+CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -39439,7 +38788,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -39560,7 +38909,7 @@
-   return _tao_retval;
- }
- 
--void IR::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
-+void _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Boolean is_abstract,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -39569,10 +38918,6 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -39598,7 +38943,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         is_abstract,
-@@ -39712,7 +39057,7 @@
-   
- }
- 
--CORBA::Boolean IR::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
-+CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -39749,7 +39094,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -39870,7 +39215,7 @@
-   return _tao_retval;
- }
- 
--void IR::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
-+void _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Boolean is_custom,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -39879,10 +39224,6 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -39908,7 +39249,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         is_custom,
-@@ -40022,7 +39363,7 @@
-   
- }
- 
--CORBA::Boolean IR::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
-+CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -40059,7 +39400,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -40180,7 +39521,7 @@
-   return _tao_retval;
- }
- 
--void IR::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
-+void _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Boolean is_truncatable,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -40189,10 +39530,6 @@
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -40218,7 +39555,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         is_truncatable,
-@@ -40332,7 +39669,7 @@
-   
- }
- 
--CORBA::Boolean IR::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
-+CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_a (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -40370,7 +39707,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -40502,12 +39839,12 @@
-   return _tao_retval;
- }
- 
--IR::ValueMemberDef_ptr IR::_TAO_ValueDef_Remote_Proxy_Impl::create_value_member (
-+IR_ValueMemberDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_value_member (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     CORBA::Visibility access,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -40516,8 +39853,8 @@
-   ))
- {
-   
--  IR::ValueMemberDef_ptr _tao_retval = IR::ValueMemberDef::_nil ();
--  IR::ValueMemberDef_var _tao_safe_retval (_tao_retval);
-+  IR_ValueMemberDef_ptr _tao_retval = IR_ValueMemberDef::_nil ();
-+  IR_ValueMemberDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -40545,7 +39882,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -40620,7 +39957,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ValueMemberDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ValueMemberDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -40686,15 +40023,15 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::AttributeDef_ptr IR::_TAO_ValueDef_Remote_Proxy_Impl::create_attribute (
-+IR_AttributeDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_attribute (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+    IR_IDLType_ptr type,
-+    IR_AttributeMode mode,
-+    const IR_ExceptionDefSeq & get_exceptions,
-+    const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -40702,8 +40039,8 @@
-   ))
- {
-   
--  IR::AttributeDef_ptr _tao_retval = IR::AttributeDef::_nil ();
--  IR::AttributeDef_var _tao_safe_retval (_tao_retval);
-+  IR_AttributeDef_ptr _tao_retval = IR_AttributeDef::_nil ();
-+  IR_AttributeDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -40731,7 +40068,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -40810,7 +40147,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -40876,16 +40213,16 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::OperationDef_ptr IR::_TAO_ValueDef_Remote_Proxy_Impl::create_operation (
-+IR_OperationDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_operation (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+    IR_IDLType_ptr result,
-+    IR_OperationMode mode,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -40893,8 +40230,8 @@
-   ))
- {
-   
--  IR::OperationDef_ptr _tao_retval = IR::OperationDef::_nil ();
--  IR::OperationDef_var _tao_safe_retval (_tao_retval);
-+  IR_OperationDef_ptr _tao_retval = IR_OperationDef::_nil ();
-+  IR_OperationDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -40922,7 +40259,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation ri (
-+      IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -41003,7 +40340,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -41079,37 +40416,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_ValueDef_Proxy_Broker::_TAO_ValueDef_Proxy_Broker (void)
-+_TAO_ValueDef_Proxy_Broker::_TAO_ValueDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ValueDef_Proxy_Broker::~_TAO_ValueDef_Proxy_Broker (void)
-+_TAO_ValueDef_Proxy_Broker::~_TAO_ValueDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ValueDef_Proxy_Broker * (*IR__TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_ValueDef_Proxy_Broker * (*_TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_ValueDef_Remote_Proxy_Broker *
--IR::_TAO_ValueDef_Remote_Proxy_Broker::the_TAO_ValueDef_Remote_Proxy_Broker (void)
-+_TAO_ValueDef_Remote_Proxy_Broker *
-+_TAO_ValueDef_Remote_Proxy_Broker::the_TAO_ValueDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_ValueDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_ValueDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_ValueDef_Remote_Proxy_Broker::_TAO_ValueDef_Remote_Proxy_Broker (void)
-+_TAO_ValueDef_Remote_Proxy_Broker::_TAO_ValueDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ValueDef_Remote_Proxy_Broker::~_TAO_ValueDef_Remote_Proxy_Broker (void)
-+_TAO_ValueDef_Remote_Proxy_Broker::~_TAO_ValueDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ValueDef_Proxy_Impl&
--IR::_TAO_ValueDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::ValueDef *object,
-+_TAO_ValueDef_Proxy_Impl&
-+_TAO_ValueDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_ValueDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -41125,113 +40462,111 @@
- 
- 
- // default constructor
--IR::ValueDef::ValueDef (int collocated)
-+IR_ValueDef::IR_ValueDef (int collocated)
- {
-   this->IR_ValueDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::ValueDef::~ValueDef (void)
-+IR_ValueDef::~IR_ValueDef (void)
- {}
- 
- void
--IR::ValueDef::IR_ValueDef_setup_collocation (int collocated)
-+IR_ValueDef::IR_ValueDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_ValueDef_Proxy_Broker_ =
--      ::IR__TAO_ValueDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_ValueDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_ValueDef_Proxy_Broker_ =
--      ::IR::_TAO_ValueDef_Remote_Proxy_Broker::the_TAO_ValueDef_Remote_Proxy_Broker ();
-+      _TAO_ValueDef_Remote_Proxy_Broker::the_TAO_ValueDef_Remote_Proxy_Broker ();
-   
-   this->IR_Container_setup_collocation (collocated);
--  
-   this->IR_Contained_setup_collocation (collocated);
--  
-   this->IR_IDLType_setup_collocation (collocated);
- }
- 
--void IR::ValueDef::_tao_any_destructor (void *x)
-+void IR_ValueDef::_tao_any_destructor (void *x)
- {
--  ValueDef *tmp = ACE_static_cast (ValueDef*,x);
-+  IR_ValueDef *tmp = ACE_static_cast (IR_ValueDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::ValueDef_ptr IR::ValueDef::_narrow (
-+IR_ValueDef_ptr IR_ValueDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ValueDef::_nil ();
-+    return IR_ValueDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ValueDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (ValueDef::_nil ());
-+      ACE_CHECK_RETURN (IR_ValueDef::_nil ());
-       if (is_a == 0)
--        return ValueDef::_nil ();
-+        return IR_ValueDef::_nil ();
-     }
--  return ValueDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_ValueDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::ValueDef_ptr IR::ValueDef::_unchecked_narrow (
-+IR_ValueDef_ptr IR_ValueDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ValueDef::_nil ();
-+    return IR_ValueDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      ValueDef_ptr default_proxy = ValueDef::_nil ();
-+      IR_ValueDef_ptr default_proxy = IR_ValueDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_ValueDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_ValueDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::ValueDef (
-+          ::IR_ValueDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          ValueDef::_nil ());
-+          IR_ValueDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::ValueDef (stub, 0, obj->_servant ()), ValueDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_ValueDef (stub, 0, obj->_servant ()), IR_ValueDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            ValueDef_ptr,
-+            IR_ValueDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &ValueDef::_narrow
-+                      &IR_ValueDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::ValueDef_ptr
--IR::ValueDef::_duplicate (ValueDef_ptr obj)
-+IR_ValueDef_ptr
-+IR_ValueDef::_duplicate (IR_ValueDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::ValueDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_ValueDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ValueDef:1.0")) ||
-@@ -41245,58 +40580,58 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::ValueDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ValueDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, ValueDef)::_narrow))
-+      &IR_ValueDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-+      &IR_Container::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Container_ptr,
-+            IR_Container_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -41309,12 +40644,12 @@
-   return retv;
- }
- 
--const char* IR::ValueDef::_interface_repository_id (void) const
-+const char* IR_ValueDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/ValueDef:1.0";
- }
- 
--IR::InterfaceDefSeq * IR::ValueDef::supported_interfaces (
-+IR_InterfaceDefSeq * IR_ValueDef::supported_interfaces (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -41331,8 +40666,8 @@
-     );
- }
- 
--void IR::ValueDef::supported_interfaces (
--    const IR::InterfaceDefSeq & supported_interfaces,
-+void IR_ValueDef::supported_interfaces (
-+    const IR_InterfaceDefSeq & supported_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -41350,7 +40685,7 @@
-     );
- }
- 
--IR::InitializerSeq * IR::ValueDef::initializers (
-+IR_InitializerSeq * IR_ValueDef::initializers (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -41367,8 +40702,8 @@
-     );
- }
- 
--void IR::ValueDef::initializers (
--    const IR::InitializerSeq & initializers,
-+void IR_ValueDef::initializers (
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -41386,7 +40721,7 @@
-     );
- }
- 
--IR::ValueDef_ptr IR::ValueDef::base_value (
-+IR_ValueDef_ptr IR_ValueDef::base_value (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -41403,8 +40738,8 @@
-     );
- }
- 
--void IR::ValueDef::base_value (
--    IR::ValueDef_ptr base_value,
-+void IR_ValueDef::base_value (
-+    IR_ValueDef_ptr base_value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -41422,7 +40757,7 @@
-     );
- }
- 
--IR::ValueDefSeq * IR::ValueDef::abstract_base_values (
-+IR_ValueDefSeq * IR_ValueDef::abstract_base_values (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -41439,8 +40774,8 @@
-     );
- }
- 
--void IR::ValueDef::abstract_base_values (
--    const IR::ValueDefSeq & abstract_base_values,
-+void IR_ValueDef::abstract_base_values (
-+    const IR_ValueDefSeq & abstract_base_values,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -41458,7 +40793,7 @@
-     );
- }
- 
--CORBA::Boolean IR::ValueDef::is_abstract (
-+CORBA::Boolean IR_ValueDef::is_abstract (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -41475,7 +40810,7 @@
-     );
- }
- 
--void IR::ValueDef::is_abstract (
-+void IR_ValueDef::is_abstract (
-     CORBA::Boolean is_abstract,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -41494,7 +40829,7 @@
-     );
- }
- 
--CORBA::Boolean IR::ValueDef::is_custom (
-+CORBA::Boolean IR_ValueDef::is_custom (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -41511,7 +40846,7 @@
-     );
- }
- 
--void IR::ValueDef::is_custom (
-+void IR_ValueDef::is_custom (
-     CORBA::Boolean is_custom,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -41530,7 +40865,7 @@
-     );
- }
- 
--CORBA::Boolean IR::ValueDef::is_truncatable (
-+CORBA::Boolean IR_ValueDef::is_truncatable (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -41547,7 +40882,7 @@
-     );
- }
- 
--void IR::ValueDef::is_truncatable (
-+void IR_ValueDef::is_truncatable (
-     CORBA::Boolean is_truncatable,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -41566,7 +40901,7 @@
-     );
- }
- 
--CORBA::Boolean IR::ValueDef::is_a (
-+CORBA::Boolean IR_ValueDef::is_a (
-     const char * id,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -41585,11 +40920,11 @@
-     );
- }
- 
--IR::ValueMemberDef_ptr IR::ValueDef::create_value_member (
-+IR_ValueMemberDef_ptr IR_ValueDef::create_value_member (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     CORBA::Visibility access,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -41612,14 +40947,14 @@
-     );
- }
- 
--IR::AttributeDef_ptr IR::ValueDef::create_attribute (
-+IR_AttributeDef_ptr IR_ValueDef::create_attribute (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+    IR_IDLType_ptr type,
-+    IR_AttributeMode mode,
-+    const IR_ExceptionDefSeq & get_exceptions,
-+    const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -41643,15 +40978,15 @@
-     );
- }
- 
--IR::OperationDef_ptr IR::ValueDef::create_operation (
-+IR_OperationDef_ptr IR_ValueDef::create_operation (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+    IR_IDLType_ptr result,
-+    IR_OperationMode mode,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -41676,9 +41011,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -41687,7 +41021,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -41699,7 +41033,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -41712,7 +41046,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -41728,16 +41062,16 @@
- }
- 
- void 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::result (IR::InterfaceDefSeq * result)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::result (IR_InterfaceDefSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::InterfaceDefSeq & supported_interfaces,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -41745,7 +41079,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -41765,7 +41099,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -41778,7 +41112,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -41790,7 +41124,7 @@
-   return result_any;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::TAO_ClientRequestInfo_IR_ValueDef_initializers_get (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::TAO_ClientRequestInfo_IR_ValueDef_initializers_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -41799,7 +41133,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -41811,7 +41145,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -41824,7 +41158,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -41840,16 +41174,16 @@
- }
- 
- void 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::result (IR::InitializerSeq * result)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::result (IR_InitializerSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::TAO_ClientRequestInfo_IR_ValueDef_initializers_set (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::TAO_ClientRequestInfo_IR_ValueDef_initializers_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::InitializerSeq & initializers,
-+    const IR_InitializerSeq & initializers,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -41857,7 +41191,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -41877,7 +41211,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -41890,7 +41224,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -41902,7 +41236,7 @@
-   return result_any;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::TAO_ClientRequestInfo_IR_ValueDef_base_value_get (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::TAO_ClientRequestInfo_IR_ValueDef_base_value_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -41911,7 +41245,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -41923,7 +41257,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -41936,7 +41270,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -41952,16 +41286,16 @@
- }
- 
- void 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::result (IR::ValueDef_ptr result)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::result (IR_ValueDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::TAO_ClientRequestInfo_IR_ValueDef_base_value_set (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::TAO_ClientRequestInfo_IR_ValueDef_base_value_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::ValueDef_ptr base_value,
-+    IR_ValueDef_ptr base_value,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -41969,7 +41303,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -41989,7 +41323,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -42002,7 +41336,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -42014,7 +41348,7 @@
-   return result_any;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -42023,7 +41357,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -42035,7 +41369,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -42048,7 +41382,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -42064,16 +41398,16 @@
- }
- 
- void 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::result (IR::ValueDefSeq * result)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::result (IR_ValueDefSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::ValueDefSeq & abstract_base_values,
-+    const IR_ValueDefSeq & abstract_base_values,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -42081,7 +41415,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -42101,7 +41435,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -42114,7 +41448,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -42126,7 +41460,7 @@
-   return result_any;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -42135,7 +41469,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -42147,7 +41481,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -42160,7 +41494,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -42176,13 +41510,13 @@
- }
- 
- void 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Boolean result)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Boolean result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::Boolean & is_abstract,
-@@ -42193,7 +41527,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -42212,7 +41546,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -42225,7 +41559,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -42237,7 +41571,7 @@
-   return result_any;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -42246,7 +41580,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -42258,7 +41592,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -42271,7 +41605,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -42287,13 +41621,13 @@
- }
- 
- void 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::result (CORBA::Boolean result)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::result (CORBA::Boolean result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::Boolean & is_custom,
-@@ -42304,7 +41638,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -42323,7 +41657,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -42336,7 +41670,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -42348,7 +41682,7 @@
-   return result_any;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -42357,7 +41691,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -42369,7 +41703,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -42382,7 +41716,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -42398,13 +41732,13 @@
- }
- 
- void 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::result (CORBA::Boolean result)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::result (CORBA::Boolean result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::Boolean & is_truncatable,
-@@ -42415,7 +41749,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -42434,7 +41768,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -42447,7 +41781,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -42459,7 +41793,7 @@
-   return result_any;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::TAO_ClientRequestInfo_IR_ValueDef_is_a (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::TAO_ClientRequestInfo_IR_ValueDef_is_a (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-@@ -42470,7 +41804,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -42489,7 +41823,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -42502,7 +41836,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -42518,19 +41852,19 @@
- }
- 
- void 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::result (CORBA::Boolean result)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::result (CORBA::Boolean result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::TAO_ClientRequestInfo_IR_ValueDef_create_value_member (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::TAO_ClientRequestInfo_IR_ValueDef_create_value_member (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+    IR_IDLType_ptr type,
-     const CORBA::Visibility & access,
-     CORBA::Environment &    
-   )
-@@ -42543,7 +41877,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -42583,7 +41917,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -42596,7 +41930,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -42612,22 +41946,22 @@
- }
- 
- void 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::result (IR::ValueMemberDef_ptr result)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::result (IR_ValueMemberDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::TAO_ClientRequestInfo_IR_ValueDef_create_attribute (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::TAO_ClientRequestInfo_IR_ValueDef_create_attribute (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode & mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+    IR_IDLType_ptr type,
-+    IR_AttributeMode & mode,
-+    const IR_ExceptionDefSeq & get_exceptions,
-+    const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -42641,7 +41975,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -42694,7 +42028,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -42707,7 +42041,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -42723,23 +42057,23 @@
- }
- 
- void 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::result (IR::AttributeDef_ptr result)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::result (IR_AttributeDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::TAO_ClientRequestInfo_IR_ValueDef_create_operation (
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::TAO_ClientRequestInfo_IR_ValueDef_create_operation (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode & mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+    IR_IDLType_ptr result,
-+    IR_OperationMode & mode,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-+    const IR_ContextIdSeq & contexts,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -42754,7 +42088,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -42813,7 +42147,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -42826,7 +42160,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -42842,24 +42176,26 @@
- }
- 
- void 
--IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::result (IR::OperationDef_ptr result)
-+IR_ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::result (IR_OperationDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_ValueDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/ValueDef:1.0
--  9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = ValueDef
-+  9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = IR_ValueDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ValueDef (CORBA::tk_objref, sizeof (_oc_IR_ValueDef), (char *) &_oc_IR_ValueDef, 0, sizeof (IR::ValueDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ValueDef (CORBA::tk_objref, sizeof (_oc_IR_ValueDef), (char *) &_oc_IR_ValueDef, 0, sizeof (IR_ValueDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDef, &_tc_TAO_tc_IR_ValueDef)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_ValueDescription[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -43030,7 +42366,7 @@
-               48, // encapsulation length
-                 TAO_ENCAP_BYTE_ORDER, // byte order
-                 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--                8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+                8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
-               5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-               CORBA::tk_enum, // typecode kind
-@@ -43352,7 +42688,7 @@
-         48, // encapsulation length
-           TAO_ENCAP_BYTE_ORDER, // byte order
-           27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--          8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+          8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
-         7, ACE_NTOHL (0x61636365), ACE_NTOHL (0x73730000),  // name = access
-         CORBA::tk_alias, // typecode kind for typedefs
-@@ -43372,7 +42708,7 @@
-   576, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x616c697a), ACE_NTOHL (0x65725365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/InitializerSeq:1.0
--    15, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657253), ACE_NTOHL (0x65710000),  // name = InitializerSeq
-+    15, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657253), ACE_NTOHL (0x65710000),  // name = IR_InitializerSeq
-     CORBA::tk_sequence, // typecode kind
-     504, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -43380,14 +42716,14 @@
-       488, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x616c697a), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/Initializer:1.0
--        12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200),  // name = Initializer
-+        12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200),  // name = IR_Initializer
-         2, // member count
-         8, ACE_NTOHL (0x6d656d62), ACE_NTOHL (0x65727300),  // name = members
-         CORBA::tk_alias, // typecode kind for typedefs
-         324, // encapsulation length
-           TAO_ENCAP_BYTE_ORDER, // byte order
-           35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/StructMemberSeq:1.0
--          16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100),  // name = StructMemberSeq
-+          16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100),  // name = IR_StructMemberSeq
-           CORBA::tk_sequence, // typecode kind
-           252, // encapsulation length
-             TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -43395,7 +42731,7 @@
-             236, // encapsulation length
-               TAO_ENCAP_BYTE_ORDER, // byte order
-               32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x6265723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/StructMember:1.0
--              13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0),  // name = StructMember
-+              13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0),  // name = IR_StructMember
-               3, // member count
-               5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-               CORBA::tk_alias, // typecode kind for typedefs
-@@ -43414,7 +42750,7 @@
-               48, // encapsulation length
-                 TAO_ENCAP_BYTE_ORDER, // byte order
-                 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--                8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+                8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
- 
-             0U,
-@@ -43489,14 +42825,15 @@
-   CORBA::tk_TypeCode,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ValueDescription (CORBA::tk_struct, sizeof (_oc_IR_ValueDescription), (char *) &_oc_IR_ValueDescription, 0, sizeof (IR::ValueDescription));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ValueDescription (CORBA::tk_struct, sizeof (_oc_IR_ValueDescription), (char *) &_oc_IR_ValueDescription, 0, sizeof (IR_ValueDescription));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDescription, &_tc_TAO_tc_IR_ValueDescription)
- TAO_NAMESPACE_END
--void IR::ValueDescription::_tao_any_destructor (void *x)
-+
-+void IR_ValueDescription::_tao_any_destructor (void *x)
- {
--  ValueDescription *tmp = ACE_static_cast (ValueDescription*,x);
-+  IR_ValueDescription *tmp = ACE_static_cast (IR_ValueDescription*,x);
-   delete tmp;
- }
- 
-@@ -43505,15 +42842,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_ValueBoxDef_Proxy_Impl::_TAO_ValueBoxDef_Proxy_Impl (void)
-+_TAO_ValueBoxDef_Proxy_Impl::_TAO_ValueBoxDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (void)
-+_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--IR::IDLType_ptr IR::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
-+IR_IDLType_ptr _TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -43522,8 +42859,8 @@
-   ))
- {
-   
--  IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
--  IR::IDLType_var _tao_safe_retval (_tao_retval);
-+  IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
-+  IR_IDLType_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -43551,7 +42888,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get ri (
-+      IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -43607,7 +42944,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -43673,19 +43010,15 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
-+void _TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
-     CORBA_Object *_collocated_tao_target_,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -43711,7 +43044,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set ri (
-+      IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         original_type_def,
-@@ -43835,37 +43168,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_ValueBoxDef_Proxy_Broker::_TAO_ValueBoxDef_Proxy_Broker (void)
-+_TAO_ValueBoxDef_Proxy_Broker::_TAO_ValueBoxDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ValueBoxDef_Proxy_Broker::~_TAO_ValueBoxDef_Proxy_Broker (void)
-+_TAO_ValueBoxDef_Proxy_Broker::~_TAO_ValueBoxDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ValueBoxDef_Proxy_Broker * (*IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_ValueBoxDef_Proxy_Broker * (*_TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_ValueBoxDef_Remote_Proxy_Broker *
--IR::_TAO_ValueBoxDef_Remote_Proxy_Broker::the_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
-+_TAO_ValueBoxDef_Remote_Proxy_Broker *
-+_TAO_ValueBoxDef_Remote_Proxy_Broker::the_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_ValueBoxDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_ValueBoxDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_ValueBoxDef_Remote_Proxy_Broker::_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
-+_TAO_ValueBoxDef_Remote_Proxy_Broker::_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ValueBoxDef_Remote_Proxy_Broker::~_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
-+_TAO_ValueBoxDef_Remote_Proxy_Broker::~_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ValueBoxDef_Proxy_Impl&
--IR::_TAO_ValueBoxDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::ValueBoxDef *object,
-+_TAO_ValueBoxDef_Proxy_Impl&
-+_TAO_ValueBoxDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_ValueBoxDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -43881,109 +43214,109 @@
- 
- 
- // default constructor
--IR::ValueBoxDef::ValueBoxDef (int collocated)
-+IR_ValueBoxDef::IR_ValueBoxDef (int collocated)
- {
-   this->IR_ValueBoxDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::ValueBoxDef::~ValueBoxDef (void)
-+IR_ValueBoxDef::~IR_ValueBoxDef (void)
- {}
- 
- void
--IR::ValueBoxDef::IR_ValueBoxDef_setup_collocation (int collocated)
-+IR_ValueBoxDef::IR_ValueBoxDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_ValueBoxDef_Proxy_Broker_ =
--      ::IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_ValueBoxDef_Proxy_Broker_ =
--      ::IR::_TAO_ValueBoxDef_Remote_Proxy_Broker::the_TAO_ValueBoxDef_Remote_Proxy_Broker ();
-+      _TAO_ValueBoxDef_Remote_Proxy_Broker::the_TAO_ValueBoxDef_Remote_Proxy_Broker ();
-   
-   this->IR_TypedefDef_setup_collocation (collocated);
- }
- 
--void IR::ValueBoxDef::_tao_any_destructor (void *x)
-+void IR_ValueBoxDef::_tao_any_destructor (void *x)
- {
--  ValueBoxDef *tmp = ACE_static_cast (ValueBoxDef*,x);
-+  IR_ValueBoxDef *tmp = ACE_static_cast (IR_ValueBoxDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::ValueBoxDef_ptr IR::ValueBoxDef::_narrow (
-+IR_ValueBoxDef_ptr IR_ValueBoxDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ValueBoxDef::_nil ();
-+    return IR_ValueBoxDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ValueBoxDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (ValueBoxDef::_nil ());
-+      ACE_CHECK_RETURN (IR_ValueBoxDef::_nil ());
-       if (is_a == 0)
--        return ValueBoxDef::_nil ();
-+        return IR_ValueBoxDef::_nil ();
-     }
--  return ValueBoxDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_ValueBoxDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::ValueBoxDef_ptr IR::ValueBoxDef::_unchecked_narrow (
-+IR_ValueBoxDef_ptr IR_ValueBoxDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ValueBoxDef::_nil ();
-+    return IR_ValueBoxDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      ValueBoxDef_ptr default_proxy = ValueBoxDef::_nil ();
-+      IR_ValueBoxDef_ptr default_proxy = IR_ValueBoxDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::ValueBoxDef (
-+          ::IR_ValueBoxDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          ValueBoxDef::_nil ());
-+          IR_ValueBoxDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::ValueBoxDef (stub, 0, obj->_servant ()), ValueBoxDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_ValueBoxDef (stub, 0, obj->_servant ()), IR_ValueBoxDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            ValueBoxDef_ptr,
-+            IR_ValueBoxDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &ValueBoxDef::_narrow
-+                      &IR_ValueBoxDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::ValueBoxDef_ptr
--IR::ValueBoxDef::_duplicate (ValueBoxDef_ptr obj)
-+IR_ValueBoxDef_ptr
-+IR_ValueBoxDef::_duplicate (IR_ValueBoxDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::ValueBoxDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_ValueBoxDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ValueBoxDef:1.0")) ||
-@@ -43997,58 +43330,58 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::ValueBoxDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ValueBoxDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, ValueBoxDef)::_narrow))
-+      &IR_ValueBoxDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, TypedefDef)::_narrow))
-+      &IR_TypedefDef::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::TypedefDef_ptr,
-+            IR_TypedefDef_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -44061,12 +43394,12 @@
-   return retv;
- }
- 
--const char* IR::ValueBoxDef::_interface_repository_id (void) const
-+const char* IR_ValueBoxDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/ValueBoxDef:1.0";
- }
- 
--IR::IDLType_ptr IR::ValueBoxDef::original_type_def (
-+IR_IDLType_ptr IR_ValueBoxDef::original_type_def (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -44083,8 +43416,8 @@
-     );
- }
- 
--void IR::ValueBoxDef::original_type_def (
--    IR::IDLType_ptr original_type_def,
-+void IR_ValueBoxDef::original_type_def (
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -44102,9 +43435,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get (
-+IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -44113,7 +43445,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -44125,7 +43457,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -44138,7 +43470,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -44154,16 +43486,16 @@
- }
- 
- void 
--IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::result (IR::IDLType_ptr result)
-+IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::result (IR_IDLType_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set (
-+IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr original_type_def,
-+    IR_IDLType_ptr original_type_def,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -44171,7 +43503,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -44191,7 +43523,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -44204,7 +43536,7 @@
- 
- 
- CORBA::Any * 
--IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -44217,13 +43549,14 @@
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_ValueBoxDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x426f7844), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ValueBoxDef:1.0
--  12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65426f78), ACE_NTOHL (0x44656600),  // name = ValueBoxDef
-+  12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65426f78), ACE_NTOHL (0x44656600),  // name = IR_ValueBoxDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ValueBoxDef (CORBA::tk_objref, sizeof (_oc_IR_ValueBoxDef), (char *) &_oc_IR_ValueBoxDef, 0, sizeof (IR::ValueBoxDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ValueBoxDef (CORBA::tk_objref, sizeof (_oc_IR_ValueBoxDef), (char *) &_oc_IR_ValueBoxDef, 0, sizeof (IR_ValueBoxDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueBoxDef, &_tc_TAO_tc_IR_ValueBoxDef)
-@@ -44233,15 +43566,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_ProvidesDef_Proxy_Impl::_TAO_ProvidesDef_Proxy_Impl (void)
-+_TAO_ProvidesDef_Proxy_Impl::_TAO_ProvidesDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void)
-+_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--IR::InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
-+IR_InterfaceDef_ptr _TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -44250,8 +43583,8 @@
-   ))
- {
-   
--  IR::InterfaceDef_ptr _tao_retval = IR::InterfaceDef::_nil ();
--  IR::InterfaceDef_var _tao_safe_retval (_tao_retval);
-+  IR_InterfaceDef_ptr _tao_retval = IR_InterfaceDef::_nil ();
-+  IR_InterfaceDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -44279,7 +43612,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get ri (
-+      IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -44335,7 +43668,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -44411,37 +43744,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_ProvidesDef_Proxy_Broker::_TAO_ProvidesDef_Proxy_Broker (void)
-+_TAO_ProvidesDef_Proxy_Broker::_TAO_ProvidesDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ProvidesDef_Proxy_Broker::~_TAO_ProvidesDef_Proxy_Broker (void)
-+_TAO_ProvidesDef_Proxy_Broker::~_TAO_ProvidesDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ProvidesDef_Proxy_Broker * (*IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_ProvidesDef_Proxy_Broker * (*_TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_ProvidesDef_Remote_Proxy_Broker *
--IR::_TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker (void)
-+_TAO_ProvidesDef_Remote_Proxy_Broker *
-+_TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_ProvidesDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_ProvidesDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_ProvidesDef_Remote_Proxy_Broker::_TAO_ProvidesDef_Remote_Proxy_Broker (void)
-+_TAO_ProvidesDef_Remote_Proxy_Broker::_TAO_ProvidesDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ProvidesDef_Remote_Proxy_Broker::~_TAO_ProvidesDef_Remote_Proxy_Broker (void)
-+_TAO_ProvidesDef_Remote_Proxy_Broker::~_TAO_ProvidesDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ProvidesDef_Proxy_Impl&
--IR::_TAO_ProvidesDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::ProvidesDef *object,
-+_TAO_ProvidesDef_Proxy_Impl&
-+_TAO_ProvidesDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_ProvidesDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -44457,109 +43790,109 @@
- 
- 
- // default constructor
--IR::ProvidesDef::ProvidesDef (int collocated)
-+IR_ProvidesDef::IR_ProvidesDef (int collocated)
- {
-   this->IR_ProvidesDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::ProvidesDef::~ProvidesDef (void)
-+IR_ProvidesDef::~IR_ProvidesDef (void)
- {}
- 
- void
--IR::ProvidesDef::IR_ProvidesDef_setup_collocation (int collocated)
-+IR_ProvidesDef::IR_ProvidesDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_ProvidesDef_Proxy_Broker_ =
--      ::IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_ProvidesDef_Proxy_Broker_ =
--      ::IR::_TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker ();
-+      _TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker ();
-   
-   this->IR_Contained_setup_collocation (collocated);
- }
- 
--void IR::ProvidesDef::_tao_any_destructor (void *x)
-+void IR_ProvidesDef::_tao_any_destructor (void *x)
- {
--  ProvidesDef *tmp = ACE_static_cast (ProvidesDef*,x);
-+  IR_ProvidesDef *tmp = ACE_static_cast (IR_ProvidesDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::ProvidesDef_ptr IR::ProvidesDef::_narrow (
-+IR_ProvidesDef_ptr IR_ProvidesDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ProvidesDef::_nil ();
-+    return IR_ProvidesDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ProvidesDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (ProvidesDef::_nil ());
-+      ACE_CHECK_RETURN (IR_ProvidesDef::_nil ());
-       if (is_a == 0)
--        return ProvidesDef::_nil ();
-+        return IR_ProvidesDef::_nil ();
-     }
--  return ProvidesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_ProvidesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::ProvidesDef_ptr IR::ProvidesDef::_unchecked_narrow (
-+IR_ProvidesDef_ptr IR_ProvidesDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ProvidesDef::_nil ();
-+    return IR_ProvidesDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      ProvidesDef_ptr default_proxy = ProvidesDef::_nil ();
-+      IR_ProvidesDef_ptr default_proxy = IR_ProvidesDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::ProvidesDef (
-+          ::IR_ProvidesDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          ProvidesDef::_nil ());
-+          IR_ProvidesDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::ProvidesDef (stub, 0, obj->_servant ()), ProvidesDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_ProvidesDef (stub, 0, obj->_servant ()), IR_ProvidesDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            ProvidesDef_ptr,
-+            IR_ProvidesDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &ProvidesDef::_narrow
-+                      &IR_ProvidesDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::ProvidesDef_ptr
--IR::ProvidesDef::_duplicate (ProvidesDef_ptr obj)
-+IR_ProvidesDef_ptr
-+IR_ProvidesDef::_duplicate (IR_ProvidesDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::ProvidesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_ProvidesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ProvidesDef:1.0")) ||
-@@ -44571,34 +43904,34 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::ProvidesDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ProvidesDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, ProvidesDef)::_narrow))
-+      &IR_ProvidesDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -44611,12 +43944,12 @@
-   return retv;
- }
- 
--const char* IR::ProvidesDef::_interface_repository_id (void) const
-+const char* IR_ProvidesDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/ProvidesDef:1.0";
- }
- 
--IR::InterfaceDef_ptr IR::ProvidesDef::interface_type (
-+IR_InterfaceDef_ptr IR_ProvidesDef::interface_type (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -44633,9 +43966,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
-+IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -44644,7 +43976,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -44656,7 +43988,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -44669,7 +44001,7 @@
- 
- 
- CORBA::Any * 
--IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -44685,24 +44017,26 @@
- }
- 
- void 
--IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (IR::InterfaceDef_ptr result)
-+IR_ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (IR_InterfaceDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_ProvidesDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ProvidesDef:1.0
--  12, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656600),  // name = ProvidesDef
-+  12, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656600),  // name = IR_ProvidesDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDef (CORBA::tk_objref, sizeof (_oc_IR_ProvidesDef), (char *) &_oc_IR_ProvidesDef, 0, sizeof (IR::ProvidesDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDef (CORBA::tk_objref, sizeof (_oc_IR_ProvidesDef), (char *) &_oc_IR_ProvidesDef, 0, sizeof (IR_ProvidesDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDef, &_tc_TAO_tc_IR_ProvidesDef)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_ProvidesDescription[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -44750,17 +44084,18 @@
-   60, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/InterfaceDef:1.0
--    13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = InterfaceDef
-+    13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = IR_InterfaceDef
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDescription (CORBA::tk_struct, sizeof (_oc_IR_ProvidesDescription), (char *) &_oc_IR_ProvidesDescription, 0, sizeof (IR::ProvidesDescription));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDescription (CORBA::tk_struct, sizeof (_oc_IR_ProvidesDescription), (char *) &_oc_IR_ProvidesDescription, 0, sizeof (IR_ProvidesDescription));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDescription, &_tc_TAO_tc_IR_ProvidesDescription)
- TAO_NAMESPACE_END
--void IR::ProvidesDescription::_tao_any_destructor (void *x)
-+
-+void IR_ProvidesDescription::_tao_any_destructor (void *x)
- {
--  ProvidesDescription *tmp = ACE_static_cast (ProvidesDescription*,x);
-+  IR_ProvidesDescription *tmp = ACE_static_cast (IR_ProvidesDescription*,x);
-   delete tmp;
- }
- 
-@@ -44769,15 +44104,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_UsesDef_Proxy_Impl::_TAO_UsesDef_Proxy_Impl (void)
-+_TAO_UsesDef_Proxy_Impl::_TAO_UsesDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void)
-+_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--IR::InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
-+IR_InterfaceDef_ptr _TAO_UsesDef_Remote_Proxy_Impl::interface_type (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -44786,8 +44121,8 @@
-   ))
- {
-   
--  IR::InterfaceDef_ptr _tao_retval = IR::InterfaceDef::_nil ();
--  IR::InterfaceDef_var _tao_safe_retval (_tao_retval);
-+  IR_InterfaceDef_ptr _tao_retval = IR_InterfaceDef::_nil ();
-+  IR_InterfaceDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -44815,7 +44150,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get ri (
-+      IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -44871,7 +44206,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -44937,7 +44272,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
-+CORBA::Boolean _TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -44974,7 +44309,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get ri (
-+      IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -45105,37 +44440,38 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_UsesDef_Proxy_Broker::_TAO_UsesDef_Proxy_Broker (void)
-+_TAO_UsesDef_Proxy_Broker::_TAO_UsesDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_UsesDef_Proxy_Broker::~_TAO_UsesDef_Proxy_Broker (void)
-+_TAO_UsesDef_Proxy_Broker::~_TAO_UsesDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_UsesDef_Proxy_Broker * (*IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
-+
-+_TAO_UsesDef_Proxy_Broker * (*_TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_UsesDef_Remote_Proxy_Broker *
--IR::_TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker (void)
-+_TAO_UsesDef_Remote_Proxy_Broker *
-+_TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_UsesDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_UsesDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_UsesDef_Remote_Proxy_Broker::_TAO_UsesDef_Remote_Proxy_Broker (void)
-+_TAO_UsesDef_Remote_Proxy_Broker::_TAO_UsesDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_UsesDef_Remote_Proxy_Broker::~_TAO_UsesDef_Remote_Proxy_Broker (void)
-+_TAO_UsesDef_Remote_Proxy_Broker::~_TAO_UsesDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_UsesDef_Proxy_Impl&
--IR::_TAO_UsesDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::UsesDef *object,
-+_TAO_UsesDef_Proxy_Impl&
-+_TAO_UsesDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_UsesDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -45151,109 +44487,109 @@
- 
- 
- // default constructor
--IR::UsesDef::UsesDef (int collocated)
-+IR_UsesDef::IR_UsesDef (int collocated)
- {
-   this->IR_UsesDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::UsesDef::~UsesDef (void)
-+IR_UsesDef::~IR_UsesDef (void)
- {}
- 
- void
--IR::UsesDef::IR_UsesDef_setup_collocation (int collocated)
-+IR_UsesDef::IR_UsesDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_UsesDef_Proxy_Broker_ =
--      ::IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_UsesDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_UsesDef_Proxy_Broker_ =
--      ::IR::_TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker ();
-+      _TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker ();
-   
-   this->IR_Contained_setup_collocation (collocated);
- }
- 
--void IR::UsesDef::_tao_any_destructor (void *x)
-+void IR_UsesDef::_tao_any_destructor (void *x)
- {
--  UsesDef *tmp = ACE_static_cast (UsesDef*,x);
-+  IR_UsesDef *tmp = ACE_static_cast (IR_UsesDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::UsesDef_ptr IR::UsesDef::_narrow (
-+IR_UsesDef_ptr IR_UsesDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return UsesDef::_nil ();
-+    return IR_UsesDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UsesDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (UsesDef::_nil ());
-+      ACE_CHECK_RETURN (IR_UsesDef::_nil ());
-       if (is_a == 0)
--        return UsesDef::_nil ();
-+        return IR_UsesDef::_nil ();
-     }
--  return UsesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_UsesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::UsesDef_ptr IR::UsesDef::_unchecked_narrow (
-+IR_UsesDef_ptr IR_UsesDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return UsesDef::_nil ();
-+    return IR_UsesDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      UsesDef_ptr default_proxy = UsesDef::_nil ();
-+      IR_UsesDef_ptr default_proxy = IR_UsesDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_UsesDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::UsesDef (
-+          ::IR_UsesDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          UsesDef::_nil ());
-+          IR_UsesDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::UsesDef (stub, 0, obj->_servant ()), UsesDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_UsesDef (stub, 0, obj->_servant ()), IR_UsesDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            UsesDef_ptr,
-+            IR_UsesDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &UsesDef::_narrow
-+                      &IR_UsesDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::UsesDef_ptr
--IR::UsesDef::_duplicate (UsesDef_ptr obj)
-+IR_UsesDef_ptr
-+IR_UsesDef::_duplicate (IR_UsesDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::UsesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_UsesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UsesDef:1.0")) ||
-@@ -45265,34 +44601,34 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::UsesDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_UsesDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, UsesDef)::_narrow))
-+      &IR_UsesDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -45305,12 +44641,12 @@
-   return retv;
- }
- 
--const char* IR::UsesDef::_interface_repository_id (void) const
-+const char* IR_UsesDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/UsesDef:1.0";
- }
- 
--IR::InterfaceDef_ptr IR::UsesDef::interface_type (
-+IR_InterfaceDef_ptr IR_UsesDef::interface_type (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -45327,7 +44663,7 @@
-     );
- }
- 
--CORBA::Boolean IR::UsesDef::is_multiple (
-+CORBA::Boolean IR_UsesDef::is_multiple (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -45344,9 +44680,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
-+IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -45355,7 +44690,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -45367,7 +44702,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -45380,7 +44715,7 @@
- 
- 
- CORBA::Any * 
--IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -45396,13 +44731,13 @@
- }
- 
- void 
--IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (IR::InterfaceDef_ptr result)
-+IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (IR_InterfaceDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
-+IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -45411,7 +44746,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -45423,7 +44758,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -45436,7 +44771,7 @@
- 
- 
- CORBA::Any * 
--IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -45452,24 +44787,26 @@
- }
- 
- void 
--IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Boolean result)
-+IR_UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Boolean result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_UsesDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x73657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UsesDef:1.0
--  8, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656600),  // name = UsesDef
-+  8, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656600),  // name = IR_UsesDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_UsesDef (CORBA::tk_objref, sizeof (_oc_IR_UsesDef), (char *) &_oc_IR_UsesDef, 0, sizeof (IR::UsesDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_UsesDef (CORBA::tk_objref, sizeof (_oc_IR_UsesDef), (char *) &_oc_IR_UsesDef, 0, sizeof (IR_UsesDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDef, &_tc_TAO_tc_IR_UsesDef)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_UsesDescription[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -45517,38 +44854,35 @@
-   60, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/InterfaceDef:1.0
--    13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = InterfaceDef
-+    13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = IR_InterfaceDef
- 
-   12, ACE_NTOHL (0x69735f6d), ACE_NTOHL (0x756c7469), ACE_NTOHL (0x706c6500),  // name = is_multiple
-   CORBA::tk_boolean,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_UsesDescription (CORBA::tk_struct, sizeof (_oc_IR_UsesDescription), (char *) &_oc_IR_UsesDescription, 0, sizeof (IR::UsesDescription));
-+static CORBA::TypeCode _tc_TAO_tc_IR_UsesDescription (CORBA::tk_struct, sizeof (_oc_IR_UsesDescription), (char *) &_oc_IR_UsesDescription, 0, sizeof (IR_UsesDescription));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDescription, &_tc_TAO_tc_IR_UsesDescription)
- TAO_NAMESPACE_END
--void IR::UsesDescription::_tao_any_destructor (void *x)
-+
-+void IR_UsesDescription::_tao_any_destructor (void *x)
- {
--  UsesDescription *tmp = ACE_static_cast (UsesDescription*,x);
-+  IR_UsesDescription *tmp = ACE_static_cast (IR_UsesDescription*,x);
-   delete tmp;
- }
- 
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CS_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CS_
--
-   void
--  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::ProvidesDescription* tmp = 0;
-+    IR_ProvidesDescription* tmp = 0;
-     tmp = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::ProvidesDescription *old = ACE_reinterpret_cast (IR::ProvidesDescription *,this->buffer_);
-+      IR_ProvidesDescription *old = ACE_reinterpret_cast (IR_ProvidesDescription *,this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp[i] = old[i];
-@@ -45561,75 +44895,65 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
-     
--    IR::ProvidesDescription *tmp = ACE_reinterpret_cast (IR::ProvidesDescription *,this->buffer_);
-+    IR_ProvidesDescription *tmp = ACE_reinterpret_cast (IR_ProvidesDescription *,this->buffer_);
-     
-     _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   } 
-   
--  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::~_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Dtor.
-+  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::~_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Dtor.
-   {
-     this->_deallocate_buffer ();
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_PROVIDESDESCSEQ_CS_)
--#define _IR_PROVIDESDESCSEQ_CS_
--
- // *************************************************************
--// IR::ProvidesDescSeq
-+// IR_ProvidesDescSeq
- // *************************************************************
- 
--IR::ProvidesDescSeq::ProvidesDescSeq (void)
-+IR_ProvidesDescSeq::IR_ProvidesDescSeq (void)
- {}
--IR::ProvidesDescSeq::ProvidesDescSeq (CORBA::ULong max) // uses max size
-+IR_ProvidesDescSeq::IR_ProvidesDescSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::ProvidesDescription>
-+  TAO_Unbounded_Sequence<IR_ProvidesDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::ProvidesDescSeq::ProvidesDescSeq (CORBA::ULong max, CORBA::ULong length, IR::ProvidesDescription *buffer, CORBA::Boolean release)
-+IR_ProvidesDescSeq::IR_ProvidesDescSeq (CORBA::ULong max, CORBA::ULong length, IR_ProvidesDescription *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::ProvidesDescription>
-+  TAO_Unbounded_Sequence<IR_ProvidesDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::ProvidesDescSeq::ProvidesDescSeq (const ProvidesDescSeq &seq) // copy ctor
-+IR_ProvidesDescSeq::IR_ProvidesDescSeq (const IR_ProvidesDescSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::ProvidesDescription>
-+  TAO_Unbounded_Sequence<IR_ProvidesDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::ProvidesDescSeq::~ProvidesDescSeq (void) // dtor
-+IR_ProvidesDescSeq::~IR_ProvidesDescSeq (void) // dtor
- {}
--void IR::ProvidesDescSeq::_tao_any_destructor (void *x)
-+void IR_ProvidesDescSeq::_tao_any_destructor (void *x)
- {
--  ProvidesDescSeq *tmp = ACE_static_cast (ProvidesDescSeq*,x);
-+  IR_ProvidesDescSeq *tmp = ACE_static_cast (IR_ProvidesDescSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_ProvidesDescSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -45685,13 +45009,13 @@
-       60, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/InterfaceDef:1.0
--        13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = InterfaceDef
-+        13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = IR_InterfaceDef
- 
- 
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDescSeq (CORBA::tk_alias, sizeof (_oc_IR_ProvidesDescSeq), (char *) &_oc_IR_ProvidesDescSeq, 0, sizeof (IR::ProvidesDescSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDescSeq (CORBA::tk_alias, sizeof (_oc_IR_ProvidesDescSeq), (char *) &_oc_IR_ProvidesDescSeq, 0, sizeof (IR_ProvidesDescSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDescSeq, &_tc_TAO_tc_IR_ProvidesDescSeq)
-@@ -45699,18 +45023,15 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CS_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CS_
--
-   void
--  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_allocate_buffer (CORBA::ULong length)
-+  _TAO_Unbounded_Sequence_IR_UsesDescSeq::_allocate_buffer (CORBA::ULong length)
-   {
--    IR::UsesDescription* tmp = 0;
-+    IR_UsesDescription* tmp = 0;
-     tmp = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
--      IR::UsesDescription *old = ACE_reinterpret_cast (IR::UsesDescription *,this->buffer_);
-+      IR_UsesDescription *old = ACE_reinterpret_cast (IR_UsesDescription *,this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp[i] = old[i];
-@@ -45723,75 +45044,65 @@
-   }
-   
-   void
--  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_deallocate_buffer (void)
-+  _TAO_Unbounded_Sequence_IR_UsesDescSeq::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
-     
--    IR::UsesDescription *tmp = ACE_reinterpret_cast (IR::UsesDescription *,this->buffer_);
-+    IR_UsesDescription *tmp = ACE_reinterpret_cast (IR_UsesDescription *,this->buffer_);
-     
-     _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
-     this->buffer_ = 0;
-   } 
-   
--  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::~_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Dtor.
-+  _TAO_Unbounded_Sequence_IR_UsesDescSeq::~_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Dtor.
-   {
-     this->_deallocate_buffer ();
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_USESDESCSEQ_CS_)
--#define _IR_USESDESCSEQ_CS_
--
- // *************************************************************
--// IR::UsesDescSeq
-+// IR_UsesDescSeq
- // *************************************************************
- 
--IR::UsesDescSeq::UsesDescSeq (void)
-+IR_UsesDescSeq::IR_UsesDescSeq (void)
- {}
--IR::UsesDescSeq::UsesDescSeq (CORBA::ULong max) // uses max size
-+IR_UsesDescSeq::IR_UsesDescSeq (CORBA::ULong max) // uses max size
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_UsesDescSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::UsesDescription>
-+  TAO_Unbounded_Sequence<IR_UsesDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max)
- {}
--IR::UsesDescSeq::UsesDescSeq (CORBA::ULong max, CORBA::ULong length, IR::UsesDescription *buffer, CORBA::Boolean release)
-+IR_UsesDescSeq::IR_UsesDescSeq (CORBA::ULong max, CORBA::ULong length, IR_UsesDescription *buffer, CORBA::Boolean release)
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_UsesDescSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::UsesDescription>
-+  TAO_Unbounded_Sequence<IR_UsesDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (max, length, buffer, release)
- {}
--IR::UsesDescSeq::UsesDescSeq (const UsesDescSeq &seq) // copy ctor
-+IR_UsesDescSeq::IR_UsesDescSeq (const IR_UsesDescSeq &seq) // copy ctor
-   : 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_UsesDescSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<IR::UsesDescription>
-+  TAO_Unbounded_Sequence<IR_UsesDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-  (seq)
- {}
--IR::UsesDescSeq::~UsesDescSeq (void) // dtor
-+IR_UsesDescSeq::~IR_UsesDescSeq (void) // dtor
- {}
--void IR::UsesDescSeq::_tao_any_destructor (void *x)
-+void IR_UsesDescSeq::_tao_any_destructor (void *x)
- {
--  UsesDescSeq *tmp = ACE_static_cast (UsesDescSeq*,x);
-+  IR_UsesDescSeq *tmp = ACE_static_cast (IR_UsesDescSeq*,x);
-   delete tmp;
- }
- 
--
--#endif /* end #if !defined */
--
- static const CORBA::Long _oc_IR_UsesDescSeq[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -45847,7 +45158,7 @@
-       60, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/InterfaceDef:1.0
--        13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = InterfaceDef
-+        13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = IR_InterfaceDef
- 
-       12, ACE_NTOHL (0x69735f6d), ACE_NTOHL (0x756c7469), ACE_NTOHL (0x706c6500),  // name = is_multiple
-       CORBA::tk_boolean,
-@@ -45856,7 +45167,7 @@
-     0U,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_UsesDescSeq (CORBA::tk_alias, sizeof (_oc_IR_UsesDescSeq), (char *) &_oc_IR_UsesDescSeq, 0, sizeof (IR::UsesDescSeq));
-+static CORBA::TypeCode _tc_TAO_tc_IR_UsesDescSeq (CORBA::tk_alias, sizeof (_oc_IR_UsesDescSeq), (char *) &_oc_IR_UsesDescSeq, 0, sizeof (IR_UsesDescSeq));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDescSeq, &_tc_TAO_tc_IR_UsesDescSeq)
-@@ -45866,15 +45177,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_EventDef_Proxy_Impl::_TAO_EventDef_Proxy_Impl (void)
-+_TAO_EventDef_Proxy_Impl::_TAO_EventDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_EventDef_Remote_Proxy_Impl::_TAO_EventDef_Remote_Proxy_Impl (void)
-+_TAO_EventDef_Remote_Proxy_Impl::_TAO_EventDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
-+CORBA::Boolean _TAO_EventDef_Remote_Proxy_Impl::is_a (
-     CORBA_Object *_collocated_tao_target_,
-     const char * event_id,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -45912,7 +45223,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a ri (
-+      IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         event_id,
-@@ -46044,7 +45355,7 @@
-   return _tao_retval;
- }
- 
--IR::ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
-+IR_ValueDef_ptr _TAO_EventDef_Remote_Proxy_Impl::event (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -46053,8 +45364,8 @@
-   ))
- {
-   
--  IR::ValueDef_ptr _tao_retval = IR::ValueDef::_nil ();
--  IR::ValueDef_var _tao_safe_retval (_tao_retval);
-+  IR_ValueDef_ptr _tao_retval = IR_ValueDef::_nil ();
-+  IR_ValueDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -46082,7 +45393,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get ri (
-+      IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -46138,7 +45449,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -46214,37 +45525,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_EventDef_Proxy_Broker::_TAO_EventDef_Proxy_Broker (void)
-+_TAO_EventDef_Proxy_Broker::_TAO_EventDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_EventDef_Proxy_Broker::~_TAO_EventDef_Proxy_Broker (void)
-+_TAO_EventDef_Proxy_Broker::~_TAO_EventDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_EventDef_Proxy_Broker * (*IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_EventDef_Proxy_Broker * (*_TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_EventDef_Remote_Proxy_Broker *
--IR::_TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker (void)
-+_TAO_EventDef_Remote_Proxy_Broker *
-+_TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_EventDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_EventDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_EventDef_Remote_Proxy_Broker::_TAO_EventDef_Remote_Proxy_Broker (void)
-+_TAO_EventDef_Remote_Proxy_Broker::_TAO_EventDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_EventDef_Remote_Proxy_Broker::~_TAO_EventDef_Remote_Proxy_Broker (void)
-+_TAO_EventDef_Remote_Proxy_Broker::~_TAO_EventDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_EventDef_Proxy_Impl&
--IR::_TAO_EventDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::EventDef *object,
-+_TAO_EventDef_Proxy_Impl&
-+_TAO_EventDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_EventDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -46260,109 +45571,109 @@
- 
- 
- // default constructor
--IR::EventDef::EventDef (int collocated)
-+IR_EventDef::IR_EventDef (int collocated)
- {
-   this->IR_EventDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::EventDef::~EventDef (void)
-+IR_EventDef::~IR_EventDef (void)
- {}
- 
- void
--IR::EventDef::IR_EventDef_setup_collocation (int collocated)
-+IR_EventDef::IR_EventDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_EventDef_Proxy_Broker_ =
--      ::IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_EventDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_EventDef_Proxy_Broker_ =
--      ::IR::_TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker ();
-+      _TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker ();
-   
-   this->IR_Contained_setup_collocation (collocated);
- }
- 
--void IR::EventDef::_tao_any_destructor (void *x)
-+void IR_EventDef::_tao_any_destructor (void *x)
- {
--  EventDef *tmp = ACE_static_cast (EventDef*,x);
-+  IR_EventDef *tmp = ACE_static_cast (IR_EventDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::EventDef_ptr IR::EventDef::_narrow (
-+IR_EventDef_ptr IR_EventDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return EventDef::_nil ();
-+    return IR_EventDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EventDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (EventDef::_nil ());
-+      ACE_CHECK_RETURN (IR_EventDef::_nil ());
-       if (is_a == 0)
--        return EventDef::_nil ();
-+        return IR_EventDef::_nil ();
-     }
--  return EventDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_EventDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::EventDef_ptr IR::EventDef::_unchecked_narrow (
-+IR_EventDef_ptr IR_EventDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return EventDef::_nil ();
-+    return IR_EventDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      EventDef_ptr default_proxy = EventDef::_nil ();
-+      IR_EventDef_ptr default_proxy = IR_EventDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_EventDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::EventDef (
-+          ::IR_EventDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          EventDef::_nil ());
-+          IR_EventDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::EventDef (stub, 0, obj->_servant ()), EventDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_EventDef (stub, 0, obj->_servant ()), IR_EventDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            EventDef_ptr,
-+            IR_EventDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &EventDef::_narrow
-+                      &IR_EventDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::EventDef_ptr
--IR::EventDef::_duplicate (EventDef_ptr obj)
-+IR_EventDef_ptr
-+IR_EventDef::_duplicate (IR_EventDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::EventDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_EventDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
-@@ -46374,34 +45685,34 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::EventDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_EventDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, EventDef)::_narrow))
-+      &IR_EventDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -46414,12 +45725,12 @@
-   return retv;
- }
- 
--const char* IR::EventDef::_interface_repository_id (void) const
-+const char* IR_EventDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/EventDef:1.0";
- }
- 
--CORBA::Boolean IR::EventDef::is_a (
-+CORBA::Boolean IR_EventDef::is_a (
-     const char * event_id,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -46438,7 +45749,7 @@
-     );
- }
- 
--IR::ValueDef_ptr IR::EventDef::event (
-+IR_ValueDef_ptr IR_EventDef::event (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -46455,9 +45766,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::TAO_ClientRequestInfo_IR_EventDef_is_a (
-+IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::TAO_ClientRequestInfo_IR_EventDef_is_a (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * event_id,
-@@ -46468,7 +45778,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -46487,7 +45797,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -46500,7 +45810,7 @@
- 
- 
- CORBA::Any * 
--IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -46516,13 +45826,13 @@
- }
- 
- void 
--IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::result (CORBA::Boolean result)
-+IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::result (CORBA::Boolean result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::TAO_ClientRequestInfo_IR_EventDef_event_get (
-+IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::TAO_ClientRequestInfo_IR_EventDef_event_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -46531,7 +45841,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -46543,7 +45853,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -46556,7 +45866,7 @@
- 
- 
- CORBA::Any * 
--IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -46572,24 +45882,26 @@
- }
- 
- void 
--IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::result (IR::ValueDef_ptr result)
-+IR_EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::result (IR_ValueDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_EventDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x76656e74), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/EventDef:1.0
--  9, ACE_NTOHL (0x4576656e), ACE_NTOHL (0x74446566), ACE_NTOHL (0x0),  // name = EventDef
-+  9, ACE_NTOHL (0x4576656e), ACE_NTOHL (0x74446566), ACE_NTOHL (0x0),  // name = IR_EventDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_EventDef (CORBA::tk_objref, sizeof (_oc_IR_EventDef), (char *) &_oc_IR_EventDef, 0, sizeof (IR::EventDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_EventDef (CORBA::tk_objref, sizeof (_oc_IR_EventDef), (char *) &_oc_IR_EventDef, 0, sizeof (IR_EventDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EventDef, &_tc_TAO_tc_IR_EventDef)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_EventDescription[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -46637,17 +45949,18 @@
-   52, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/ValueDef:1.0
--    9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = ValueDef
-+    9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = IR_ValueDef
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_EventDescription (CORBA::tk_struct, sizeof (_oc_IR_EventDescription), (char *) &_oc_IR_EventDescription, 0, sizeof (IR::EventDescription));
-+static CORBA::TypeCode _tc_TAO_tc_IR_EventDescription (CORBA::tk_struct, sizeof (_oc_IR_EventDescription), (char *) &_oc_IR_EventDescription, 0, sizeof (IR_EventDescription));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EventDescription, &_tc_TAO_tc_IR_EventDescription)
- TAO_NAMESPACE_END
--void IR::EventDescription::_tao_any_destructor (void *x)
-+
-+void IR_EventDescription::_tao_any_destructor (void *x)
- {
--  EventDescription *tmp = ACE_static_cast (EventDescription*,x);
-+  IR_EventDescription *tmp = ACE_static_cast (IR_EventDescription*,x);
-   delete tmp;
- }
- 
-@@ -46656,10 +45969,10 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_EmitsDef_Proxy_Impl::_TAO_EmitsDef_Proxy_Impl (void)
-+_TAO_EmitsDef_Proxy_Impl::_TAO_EmitsDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_EmitsDef_Remote_Proxy_Impl::_TAO_EmitsDef_Remote_Proxy_Impl (void)
-+_TAO_EmitsDef_Remote_Proxy_Impl::_TAO_EmitsDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
-@@ -46674,37 +45987,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_EmitsDef_Proxy_Broker::_TAO_EmitsDef_Proxy_Broker (void)
-+_TAO_EmitsDef_Proxy_Broker::_TAO_EmitsDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_EmitsDef_Proxy_Broker::~_TAO_EmitsDef_Proxy_Broker (void)
-+_TAO_EmitsDef_Proxy_Broker::~_TAO_EmitsDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_EmitsDef_Proxy_Broker * (*IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_EmitsDef_Proxy_Broker * (*_TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_EmitsDef_Remote_Proxy_Broker *
--IR::_TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker (void)
-+_TAO_EmitsDef_Remote_Proxy_Broker *
-+_TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_EmitsDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_EmitsDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_EmitsDef_Remote_Proxy_Broker::_TAO_EmitsDef_Remote_Proxy_Broker (void)
-+_TAO_EmitsDef_Remote_Proxy_Broker::_TAO_EmitsDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_EmitsDef_Remote_Proxy_Broker::~_TAO_EmitsDef_Remote_Proxy_Broker (void)
-+_TAO_EmitsDef_Remote_Proxy_Broker::~_TAO_EmitsDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_EmitsDef_Proxy_Impl&
--IR::_TAO_EmitsDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::EmitsDef *object,
-+_TAO_EmitsDef_Proxy_Impl&
-+_TAO_EmitsDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_EmitsDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -46720,109 +46033,109 @@
- 
- 
- // default constructor
--IR::EmitsDef::EmitsDef (int collocated)
-+IR_EmitsDef::IR_EmitsDef (int collocated)
- {
-   this->IR_EmitsDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::EmitsDef::~EmitsDef (void)
-+IR_EmitsDef::~IR_EmitsDef (void)
- {}
- 
- void
--IR::EmitsDef::IR_EmitsDef_setup_collocation (int collocated)
-+IR_EmitsDef::IR_EmitsDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_EmitsDef_Proxy_Broker_ =
--      ::IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_EmitsDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_EmitsDef_Proxy_Broker_ =
--      ::IR::_TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker ();
-+      _TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker ();
-   
-   this->IR_EventDef_setup_collocation (collocated);
- }
- 
--void IR::EmitsDef::_tao_any_destructor (void *x)
-+void IR_EmitsDef::_tao_any_destructor (void *x)
- {
--  EmitsDef *tmp = ACE_static_cast (EmitsDef*,x);
-+  IR_EmitsDef *tmp = ACE_static_cast (IR_EmitsDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::EmitsDef_ptr IR::EmitsDef::_narrow (
-+IR_EmitsDef_ptr IR_EmitsDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return EmitsDef::_nil ();
-+    return IR_EmitsDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EmitsDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (EmitsDef::_nil ());
-+      ACE_CHECK_RETURN (IR_EmitsDef::_nil ());
-       if (is_a == 0)
--        return EmitsDef::_nil ();
-+        return IR_EmitsDef::_nil ();
-     }
--  return EmitsDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_EmitsDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::EmitsDef_ptr IR::EmitsDef::_unchecked_narrow (
-+IR_EmitsDef_ptr IR_EmitsDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return EmitsDef::_nil ();
-+    return IR_EmitsDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      EmitsDef_ptr default_proxy = EmitsDef::_nil ();
-+      IR_EmitsDef_ptr default_proxy = IR_EmitsDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_EmitsDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::EmitsDef (
-+          ::IR_EmitsDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          EmitsDef::_nil ());
-+          IR_EmitsDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::EmitsDef (stub, 0, obj->_servant ()), EmitsDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_EmitsDef (stub, 0, obj->_servant ()), IR_EmitsDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            EmitsDef_ptr,
-+            IR_EmitsDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &EmitsDef::_narrow
-+                      &IR_EmitsDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::EmitsDef_ptr
--IR::EmitsDef::_duplicate (EmitsDef_ptr obj)
-+IR_EmitsDef_ptr
-+IR_EmitsDef::_duplicate (IR_EmitsDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::EmitsDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_EmitsDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EmitsDef:1.0")) ||
-@@ -46835,46 +46148,46 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::EmitsDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_EmitsDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, EmitsDef)::_narrow))
-+      &IR_EmitsDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, EventDef)::_narrow))
-+      &IR_EventDef::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::EventDef_ptr,
-+            IR_EventDef_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -46887,21 +46200,18 @@
-   return retv;
- }
- 
--const char* IR::EmitsDef::_interface_repository_id (void) const
-+const char* IR_EmitsDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/EmitsDef:1.0";
- }
- 
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
- static const CORBA::Long _oc_IR_EmitsDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/EmitsDef:1.0
--  9, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0),  // name = EmitsDef
-+  9, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0),  // name = IR_EmitsDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_EmitsDef (CORBA::tk_objref, sizeof (_oc_IR_EmitsDef), (char *) &_oc_IR_EmitsDef, 0, sizeof (IR::EmitsDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_EmitsDef (CORBA::tk_objref, sizeof (_oc_IR_EmitsDef), (char *) &_oc_IR_EmitsDef, 0, sizeof (IR_EmitsDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EmitsDef, &_tc_TAO_tc_IR_EmitsDef)
-@@ -46911,10 +46221,10 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_PublishesDef_Proxy_Impl::_TAO_PublishesDef_Proxy_Impl (void)
-+_TAO_PublishesDef_Proxy_Impl::_TAO_PublishesDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_PublishesDef_Remote_Proxy_Impl::_TAO_PublishesDef_Remote_Proxy_Impl (void)
-+_TAO_PublishesDef_Remote_Proxy_Impl::_TAO_PublishesDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
-@@ -46929,37 +46239,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_PublishesDef_Proxy_Broker::_TAO_PublishesDef_Proxy_Broker (void)
-+_TAO_PublishesDef_Proxy_Broker::_TAO_PublishesDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_PublishesDef_Proxy_Broker::~_TAO_PublishesDef_Proxy_Broker (void)
-+_TAO_PublishesDef_Proxy_Broker::~_TAO_PublishesDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_PublishesDef_Proxy_Broker * (*IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_PublishesDef_Proxy_Broker * (*_TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_PublishesDef_Remote_Proxy_Broker *
--IR::_TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker (void)
-+_TAO_PublishesDef_Remote_Proxy_Broker *
-+_TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_PublishesDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_PublishesDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_PublishesDef_Remote_Proxy_Broker::_TAO_PublishesDef_Remote_Proxy_Broker (void)
-+_TAO_PublishesDef_Remote_Proxy_Broker::_TAO_PublishesDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_PublishesDef_Remote_Proxy_Broker::~_TAO_PublishesDef_Remote_Proxy_Broker (void)
-+_TAO_PublishesDef_Remote_Proxy_Broker::~_TAO_PublishesDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_PublishesDef_Proxy_Impl&
--IR::_TAO_PublishesDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::PublishesDef *object,
-+_TAO_PublishesDef_Proxy_Impl&
-+_TAO_PublishesDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_PublishesDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -46975,109 +46285,109 @@
- 
- 
- // default constructor
--IR::PublishesDef::PublishesDef (int collocated)
-+IR_PublishesDef::IR_PublishesDef (int collocated)
- {
-   this->IR_PublishesDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::PublishesDef::~PublishesDef (void)
-+IR_PublishesDef::~IR_PublishesDef (void)
- {}
- 
- void
--IR::PublishesDef::IR_PublishesDef_setup_collocation (int collocated)
-+IR_PublishesDef::IR_PublishesDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_PublishesDef_Proxy_Broker_ =
--      ::IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_PublishesDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_PublishesDef_Proxy_Broker_ =
--      ::IR::_TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker ();
-+      _TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker ();
-   
-   this->IR_EventDef_setup_collocation (collocated);
- }
- 
--void IR::PublishesDef::_tao_any_destructor (void *x)
-+void IR_PublishesDef::_tao_any_destructor (void *x)
- {
--  PublishesDef *tmp = ACE_static_cast (PublishesDef*,x);
-+  IR_PublishesDef *tmp = ACE_static_cast (IR_PublishesDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::PublishesDef_ptr IR::PublishesDef::_narrow (
-+IR_PublishesDef_ptr IR_PublishesDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return PublishesDef::_nil ();
-+    return IR_PublishesDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PublishesDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (PublishesDef::_nil ());
-+      ACE_CHECK_RETURN (IR_PublishesDef::_nil ());
-       if (is_a == 0)
--        return PublishesDef::_nil ();
-+        return IR_PublishesDef::_nil ();
-     }
--  return PublishesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_PublishesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::PublishesDef_ptr IR::PublishesDef::_unchecked_narrow (
-+IR_PublishesDef_ptr IR_PublishesDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return PublishesDef::_nil ();
-+    return IR_PublishesDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      PublishesDef_ptr default_proxy = PublishesDef::_nil ();
-+      IR_PublishesDef_ptr default_proxy = IR_PublishesDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_PublishesDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::PublishesDef (
-+          ::IR_PublishesDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          PublishesDef::_nil ());
-+          IR_PublishesDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::PublishesDef (stub, 0, obj->_servant ()), PublishesDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_PublishesDef (stub, 0, obj->_servant ()), IR_PublishesDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            PublishesDef_ptr,
-+            IR_PublishesDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &PublishesDef::_narrow
-+                      &IR_PublishesDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::PublishesDef_ptr
--IR::PublishesDef::_duplicate (PublishesDef_ptr obj)
-+IR_PublishesDef_ptr
-+IR_PublishesDef::_duplicate (IR_PublishesDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::PublishesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_PublishesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PublishesDef:1.0")) ||
-@@ -47090,46 +46400,46 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::PublishesDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_PublishesDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, PublishesDef)::_narrow))
-+      &IR_PublishesDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, EventDef)::_narrow))
-+      &IR_EventDef::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::EventDef_ptr,
-+            IR_EventDef_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -47142,21 +46452,18 @@
-   return retv;
- }
- 
--const char* IR::PublishesDef::_interface_repository_id (void) const
-+const char* IR_PublishesDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/PublishesDef:1.0";
- }
- 
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
- static const CORBA::Long _oc_IR_PublishesDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/PublishesDef:1.0
--  13, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0),  // name = PublishesDef
-+  13, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0),  // name = IR_PublishesDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_PublishesDef (CORBA::tk_objref, sizeof (_oc_IR_PublishesDef), (char *) &_oc_IR_PublishesDef, 0, sizeof (IR::PublishesDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_PublishesDef (CORBA::tk_objref, sizeof (_oc_IR_PublishesDef), (char *) &_oc_IR_PublishesDef, 0, sizeof (IR_PublishesDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PublishesDef, &_tc_TAO_tc_IR_PublishesDef)
-@@ -47166,10 +46473,10 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_ConsumesDef_Proxy_Impl::_TAO_ConsumesDef_Proxy_Impl (void)
-+_TAO_ConsumesDef_Proxy_Impl::_TAO_ConsumesDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_ConsumesDef_Remote_Proxy_Impl::_TAO_ConsumesDef_Remote_Proxy_Impl (void)
-+_TAO_ConsumesDef_Remote_Proxy_Impl::_TAO_ConsumesDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
-@@ -47184,37 +46491,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_ConsumesDef_Proxy_Broker::_TAO_ConsumesDef_Proxy_Broker (void)
-+_TAO_ConsumesDef_Proxy_Broker::_TAO_ConsumesDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ConsumesDef_Proxy_Broker::~_TAO_ConsumesDef_Proxy_Broker (void)
-+_TAO_ConsumesDef_Proxy_Broker::~_TAO_ConsumesDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ConsumesDef_Proxy_Broker * (*IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_ConsumesDef_Proxy_Broker * (*_TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_ConsumesDef_Remote_Proxy_Broker *
--IR::_TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker (void)
-+_TAO_ConsumesDef_Remote_Proxy_Broker *
-+_TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_ConsumesDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_ConsumesDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_ConsumesDef_Remote_Proxy_Broker::_TAO_ConsumesDef_Remote_Proxy_Broker (void)
-+_TAO_ConsumesDef_Remote_Proxy_Broker::_TAO_ConsumesDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ConsumesDef_Remote_Proxy_Broker::~_TAO_ConsumesDef_Remote_Proxy_Broker (void)
-+_TAO_ConsumesDef_Remote_Proxy_Broker::~_TAO_ConsumesDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ConsumesDef_Proxy_Impl&
--IR::_TAO_ConsumesDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::ConsumesDef *object,
-+_TAO_ConsumesDef_Proxy_Impl&
-+_TAO_ConsumesDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_ConsumesDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -47230,109 +46537,109 @@
- 
- 
- // default constructor
--IR::ConsumesDef::ConsumesDef (int collocated)
-+IR_ConsumesDef::IR_ConsumesDef (int collocated)
- {
-   this->IR_ConsumesDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::ConsumesDef::~ConsumesDef (void)
-+IR_ConsumesDef::~IR_ConsumesDef (void)
- {}
- 
- void
--IR::ConsumesDef::IR_ConsumesDef_setup_collocation (int collocated)
-+IR_ConsumesDef::IR_ConsumesDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_ConsumesDef_Proxy_Broker_ =
--      ::IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_ConsumesDef_Proxy_Broker_ =
--      ::IR::_TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker ();
-+      _TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker ();
-   
-   this->IR_EventDef_setup_collocation (collocated);
- }
- 
--void IR::ConsumesDef::_tao_any_destructor (void *x)
-+void IR_ConsumesDef::_tao_any_destructor (void *x)
- {
--  ConsumesDef *tmp = ACE_static_cast (ConsumesDef*,x);
-+  IR_ConsumesDef *tmp = ACE_static_cast (IR_ConsumesDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::ConsumesDef_ptr IR::ConsumesDef::_narrow (
-+IR_ConsumesDef_ptr IR_ConsumesDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ConsumesDef::_nil ();
-+    return IR_ConsumesDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConsumesDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (ConsumesDef::_nil ());
-+      ACE_CHECK_RETURN (IR_ConsumesDef::_nil ());
-       if (is_a == 0)
--        return ConsumesDef::_nil ();
-+        return IR_ConsumesDef::_nil ();
-     }
--  return ConsumesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_ConsumesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::ConsumesDef_ptr IR::ConsumesDef::_unchecked_narrow (
-+IR_ConsumesDef_ptr IR_ConsumesDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ConsumesDef::_nil ();
-+    return IR_ConsumesDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      ConsumesDef_ptr default_proxy = ConsumesDef::_nil ();
-+      IR_ConsumesDef_ptr default_proxy = IR_ConsumesDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::ConsumesDef (
-+          ::IR_ConsumesDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          ConsumesDef::_nil ());
-+          IR_ConsumesDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::ConsumesDef (stub, 0, obj->_servant ()), ConsumesDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_ConsumesDef (stub, 0, obj->_servant ()), IR_ConsumesDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            ConsumesDef_ptr,
-+            IR_ConsumesDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &ConsumesDef::_narrow
-+                      &IR_ConsumesDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::ConsumesDef_ptr
--IR::ConsumesDef::_duplicate (ConsumesDef_ptr obj)
-+IR_ConsumesDef_ptr
-+IR_ConsumesDef::_duplicate (IR_ConsumesDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::ConsumesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_ConsumesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConsumesDef:1.0")) ||
-@@ -47345,46 +46652,46 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::ConsumesDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ConsumesDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, ConsumesDef)::_narrow))
-+      &IR_ConsumesDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, EventDef)::_narrow))
-+      &IR_EventDef::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::EventDef_ptr,
-+            IR_EventDef_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -47397,21 +46704,18 @@
-   return retv;
- }
- 
--const char* IR::ConsumesDef::_interface_repository_id (void) const
-+const char* IR_ConsumesDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/ConsumesDef:1.0";
- }
- 
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
- static const CORBA::Long _oc_IR_ConsumesDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7375), ACE_NTOHL (0x6d657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ConsumesDef:1.0
--  12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656600),  // name = ConsumesDef
-+  12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656600),  // name = IR_ConsumesDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ConsumesDef (CORBA::tk_objref, sizeof (_oc_IR_ConsumesDef), (char *) &_oc_IR_ConsumesDef, 0, sizeof (IR::ConsumesDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ConsumesDef (CORBA::tk_objref, sizeof (_oc_IR_ConsumesDef), (char *) &_oc_IR_ConsumesDef, 0, sizeof (IR_ConsumesDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConsumesDef, &_tc_TAO_tc_IR_ConsumesDef)
-@@ -47421,15 +46725,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_ComponentDef_Proxy_Impl::_TAO_ComponentDef_Proxy_Impl (void)
-+_TAO_ComponentDef_Proxy_Impl::_TAO_ComponentDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (void)
-+_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--IR::InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
-+IR_InterfaceDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -47438,7 +46742,7 @@
-   ))
- {
-   
--  IR::InterfaceDefSeq *_tao_retval = 0;
-+  IR_InterfaceDefSeq *_tao_retval = 0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -47446,8 +46750,8 @@
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
-   
--  ACE_NEW_RETURN (_tao_retval, IR::InterfaceDefSeq, _tao_retval);
--  IR::InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_InterfaceDefSeq, _tao_retval);
-+  IR_InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_supported_interfaces",
-@@ -47468,7 +46772,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get ri (
-+      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -47524,7 +46828,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -47590,19 +46894,15 @@
-   return _tao_safe_retval._retn ();
- }
- 
--void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
-+void _TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
-     CORBA_Object *_collocated_tao_target_,
--    const IR::InterfaceDefSeq & supported_interfaces,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-     CORBA::SystemException
-   ))
- {
--  
--
--  
--  
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
-@@ -47628,7 +46928,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set ri (
-+      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         supported_interfaces,
-@@ -47742,7 +47042,7 @@
-   
- }
- 
--IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
-+IR_ComponentDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::base_component (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -47751,8 +47051,8 @@
-   ))
- {
-   
--  IR::ComponentDef_ptr _tao_retval = IR::ComponentDef::_nil ();
--  IR::ComponentDef_var _tao_safe_retval (_tao_retval);
-+  IR_ComponentDef_ptr _tao_retval = IR_ComponentDef::_nil ();
-+  IR_ComponentDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -47780,7 +47080,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get ri (
-+      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -47836,7 +47136,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -47902,7 +47202,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interfaces (
-+IR_ProvidesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::provides_interfaces (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -47911,7 +47211,7 @@
-   ))
- {
-   
--  IR::ProvidesDefSeq *_tao_retval = 0;
-+  IR_ProvidesDefSeq *_tao_retval = 0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -47919,8 +47219,8 @@
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
-   
--  ACE_NEW_RETURN (_tao_retval, IR::ProvidesDefSeq, _tao_retval);
--  IR::ProvidesDefSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_ProvidesDefSeq, _tao_retval);
-+  IR_ProvidesDefSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_provides_interfaces",
-@@ -47941,7 +47241,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get ri (
-+      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -47997,7 +47297,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ProvidesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ProvidesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -48063,7 +47363,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
-+IR_UsesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -48072,7 +47372,7 @@
-   ))
- {
-   
--  IR::UsesDefSeq *_tao_retval = 0;
-+  IR_UsesDefSeq *_tao_retval = 0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -48080,8 +47380,8 @@
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
-   
--  ACE_NEW_RETURN (_tao_retval, IR::UsesDefSeq, _tao_retval);
--  IR::UsesDefSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_UsesDefSeq, _tao_retval);
-+  IR_UsesDefSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_uses_interfaces",
-@@ -48102,7 +47402,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get ri (
-+      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -48158,7 +47458,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::UsesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_UsesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -48224,7 +47524,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
-+IR_EmitsDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -48233,7 +47533,7 @@
-   ))
- {
-   
--  IR::EmitsDefSeq *_tao_retval = 0;
-+  IR_EmitsDefSeq *_tao_retval = 0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -48241,8 +47541,8 @@
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
-   
--  ACE_NEW_RETURN (_tao_retval, IR::EmitsDefSeq, _tao_retval);
--  IR::EmitsDefSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_EmitsDefSeq, _tao_retval);
-+  IR_EmitsDefSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_emits_events",
-@@ -48263,7 +47563,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get ri (
-+      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -48319,7 +47619,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::EmitsDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_EmitsDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -48385,7 +47685,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events (
-+IR_PublishesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::publishes_events (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -48394,7 +47694,7 @@
-   ))
- {
-   
--  IR::PublishesDefSeq *_tao_retval = 0;
-+  IR_PublishesDefSeq *_tao_retval = 0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -48402,8 +47702,8 @@
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
-   
--  ACE_NEW_RETURN (_tao_retval, IR::PublishesDefSeq, _tao_retval);
--  IR::PublishesDefSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_PublishesDefSeq, _tao_retval);
-+  IR_PublishesDefSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_publishes_events",
-@@ -48424,7 +47724,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get ri (
-+      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -48480,7 +47780,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::PublishesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_PublishesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -48546,7 +47846,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
-+IR_ConsumesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -48555,7 +47855,7 @@
-   ))
- {
-   
--  IR::ConsumesDefSeq *_tao_retval = 0;
-+  IR_ConsumesDefSeq *_tao_retval = 0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -48563,8 +47863,8 @@
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
-   
--  ACE_NEW_RETURN (_tao_retval, IR::ConsumesDefSeq, _tao_retval);
--  IR::ConsumesDefSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_ConsumesDefSeq, _tao_retval);
-+  IR_ConsumesDefSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_consumes_events",
-@@ -48585,7 +47885,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get ri (
-+      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -48641,7 +47941,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ConsumesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ConsumesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -48707,7 +48007,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
-+CORBA::Boolean _TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -48744,7 +48044,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get ri (
-+      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -48865,12 +48165,12 @@
-   return _tao_retval;
- }
- 
--IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
-+IR_ProvidesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::InterfaceDef_ptr interface_type,
-+    IR_InterfaceDef_ptr interface_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -48878,8 +48178,8 @@
-   ))
- {
-   
--  IR::ProvidesDef_ptr _tao_retval = IR::ProvidesDef::_nil ();
--  IR::ProvidesDef_var _tao_safe_retval (_tao_retval);
-+  IR_ProvidesDef_ptr _tao_retval = IR_ProvidesDef::_nil ();
-+  IR_ProvidesDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -48907,7 +48207,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides ri (
-+      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -48980,7 +48280,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ProvidesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ProvidesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -49046,12 +48346,12 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
-+IR_UsesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::InterfaceDef_ptr interface_type,
-+    IR_InterfaceDef_ptr interface_type,
-     CORBA::Boolean is_multiple,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -49060,8 +48360,8 @@
-   ))
- {
-   
--  IR::UsesDef_ptr _tao_retval = IR::UsesDef::_nil ();
--  IR::UsesDef_var _tao_safe_retval (_tao_retval);
-+  IR_UsesDef_ptr _tao_retval = IR_UsesDef::_nil ();
-+  IR_UsesDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -49089,7 +48389,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses ri (
-+      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -49164,7 +48464,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::UsesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_UsesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -49230,12 +48530,12 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
-+IR_EmitsDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -49243,8 +48543,8 @@
-   ))
- {
-   
--  IR::EmitsDef_ptr _tao_retval = IR::EmitsDef::_nil ();
--  IR::EmitsDef_var _tao_safe_retval (_tao_retval);
-+  IR_EmitsDef_ptr _tao_retval = IR_EmitsDef::_nil ();
-+  IR_EmitsDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -49272,7 +48572,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits ri (
-+      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -49345,7 +48645,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::EmitsDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_EmitsDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -49411,12 +48711,12 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
-+IR_PublishesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -49424,8 +48724,8 @@
-   ))
- {
-   
--  IR::PublishesDef_ptr _tao_retval = IR::PublishesDef::_nil ();
--  IR::PublishesDef_var _tao_safe_retval (_tao_retval);
-+  IR_PublishesDef_ptr _tao_retval = IR_PublishesDef::_nil ();
-+  IR_PublishesDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -49453,7 +48753,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes ri (
-+      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -49526,7 +48826,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::PublishesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_PublishesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -49592,12 +48892,12 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
-+IR_ConsumesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -49605,8 +48905,8 @@
-   ))
- {
-   
--  IR::ConsumesDef_ptr _tao_retval = IR::ConsumesDef::_nil ();
--  IR::ConsumesDef_var _tao_safe_retval (_tao_retval);
-+  IR_ConsumesDef_ptr _tao_retval = IR_ConsumesDef::_nil ();
-+  IR_ConsumesDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -49634,7 +48934,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes ri (
-+      IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -49707,7 +49007,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ConsumesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ConsumesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -49783,37 +49083,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_ComponentDef_Proxy_Broker::_TAO_ComponentDef_Proxy_Broker (void)
-+_TAO_ComponentDef_Proxy_Broker::_TAO_ComponentDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ComponentDef_Proxy_Broker::~_TAO_ComponentDef_Proxy_Broker (void)
-+_TAO_ComponentDef_Proxy_Broker::~_TAO_ComponentDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ComponentDef_Proxy_Broker * (*IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_ComponentDef_Proxy_Broker * (*_TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_ComponentDef_Remote_Proxy_Broker *
--IR::_TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker (void)
-+_TAO_ComponentDef_Remote_Proxy_Broker *
-+_TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_ComponentDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_ComponentDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_ComponentDef_Remote_Proxy_Broker::_TAO_ComponentDef_Remote_Proxy_Broker (void)
-+_TAO_ComponentDef_Remote_Proxy_Broker::_TAO_ComponentDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ComponentDef_Remote_Proxy_Broker::~_TAO_ComponentDef_Remote_Proxy_Broker (void)
-+_TAO_ComponentDef_Remote_Proxy_Broker::~_TAO_ComponentDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_ComponentDef_Proxy_Impl&
--IR::_TAO_ComponentDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::ComponentDef *object,
-+_TAO_ComponentDef_Proxy_Impl&
-+_TAO_ComponentDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_ComponentDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -49829,109 +49129,109 @@
- 
- 
- // default constructor
--IR::ComponentDef::ComponentDef (int collocated)
-+IR_ComponentDef::IR_ComponentDef (int collocated)
- {
-   this->IR_ComponentDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::ComponentDef::~ComponentDef (void)
-+IR_ComponentDef::~IR_ComponentDef (void)
- {}
- 
- void
--IR::ComponentDef::IR_ComponentDef_setup_collocation (int collocated)
-+IR_ComponentDef::IR_ComponentDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_ComponentDef_Proxy_Broker_ =
--      ::IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_ComponentDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_ComponentDef_Proxy_Broker_ =
--      ::IR::_TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker ();
-+      _TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker ();
-   
-   this->IR_InterfaceDef_setup_collocation (collocated);
- }
- 
--void IR::ComponentDef::_tao_any_destructor (void *x)
-+void IR_ComponentDef::_tao_any_destructor (void *x)
- {
--  ComponentDef *tmp = ACE_static_cast (ComponentDef*,x);
-+  IR_ComponentDef *tmp = ACE_static_cast (IR_ComponentDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::ComponentDef_ptr IR::ComponentDef::_narrow (
-+IR_ComponentDef_ptr IR_ComponentDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ComponentDef::_nil ();
-+    return IR_ComponentDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (ComponentDef::_nil ());
-+      ACE_CHECK_RETURN (IR_ComponentDef::_nil ());
-       if (is_a == 0)
--        return ComponentDef::_nil ();
-+        return IR_ComponentDef::_nil ();
-     }
--  return ComponentDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_ComponentDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::ComponentDef_ptr IR::ComponentDef::_unchecked_narrow (
-+IR_ComponentDef_ptr IR_ComponentDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return ComponentDef::_nil ();
-+    return IR_ComponentDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      ComponentDef_ptr default_proxy = ComponentDef::_nil ();
-+      IR_ComponentDef_ptr default_proxy = IR_ComponentDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_ComponentDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::ComponentDef (
-+          ::IR_ComponentDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          ComponentDef::_nil ());
-+          IR_ComponentDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::ComponentDef (stub, 0, obj->_servant ()), ComponentDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_ComponentDef (stub, 0, obj->_servant ()), IR_ComponentDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            ComponentDef_ptr,
-+            IR_ComponentDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &ComponentDef::_narrow
-+                      &IR_ComponentDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::ComponentDef_ptr
--IR::ComponentDef::_duplicate (ComponentDef_ptr obj)
-+IR_ComponentDef_ptr
-+IR_ComponentDef::_duplicate (IR_ComponentDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::ComponentDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_ComponentDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) ||
-@@ -49946,70 +49246,70 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::ComponentDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_ComponentDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, ComponentDef)::_narrow))
-+      &IR_ComponentDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, InterfaceDef)::_narrow))
-+      &IR_InterfaceDef::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::InterfaceDef_ptr,
-+            IR_InterfaceDef_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-+      &IR_Container::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Container_ptr,
-+            IR_Container_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -50022,12 +49322,12 @@
-   return retv;
- }
- 
--const char* IR::ComponentDef::_interface_repository_id (void) const
-+const char* IR_ComponentDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/ComponentDef:1.0";
- }
- 
--IR::InterfaceDefSeq * IR::ComponentDef::supported_interfaces (
-+IR_InterfaceDefSeq * IR_ComponentDef::supported_interfaces (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -50044,8 +49344,8 @@
-     );
- }
- 
--void IR::ComponentDef::supported_interfaces (
--    const IR::InterfaceDefSeq & supported_interfaces,
-+void IR_ComponentDef::supported_interfaces (
-+    const IR_InterfaceDefSeq & supported_interfaces,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -50063,7 +49363,7 @@
-     );
- }
- 
--IR::ComponentDef_ptr IR::ComponentDef::base_component (
-+IR_ComponentDef_ptr IR_ComponentDef::base_component (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -50080,7 +49380,7 @@
-     );
- }
- 
--IR::ProvidesDefSeq * IR::ComponentDef::provides_interfaces (
-+IR_ProvidesDefSeq * IR_ComponentDef::provides_interfaces (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -50097,7 +49397,7 @@
-     );
- }
- 
--IR::UsesDefSeq * IR::ComponentDef::uses_interfaces (
-+IR_UsesDefSeq * IR_ComponentDef::uses_interfaces (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -50114,7 +49414,7 @@
-     );
- }
- 
--IR::EmitsDefSeq * IR::ComponentDef::emits_events (
-+IR_EmitsDefSeq * IR_ComponentDef::emits_events (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -50131,7 +49431,7 @@
-     );
- }
- 
--IR::PublishesDefSeq * IR::ComponentDef::publishes_events (
-+IR_PublishesDefSeq * IR_ComponentDef::publishes_events (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -50148,7 +49448,7 @@
-     );
- }
- 
--IR::ConsumesDefSeq * IR::ComponentDef::consumes_events (
-+IR_ConsumesDefSeq * IR_ComponentDef::consumes_events (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -50165,7 +49465,7 @@
-     );
- }
- 
--CORBA::Boolean IR::ComponentDef::is_basic (
-+CORBA::Boolean IR_ComponentDef::is_basic (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -50182,11 +49482,11 @@
-     );
- }
- 
--IR::ProvidesDef_ptr IR::ComponentDef::create_provides (
-+IR_ProvidesDef_ptr IR_ComponentDef::create_provides (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::InterfaceDef_ptr interface_type,
-+    IR_InterfaceDef_ptr interface_type,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -50207,11 +49507,11 @@
-     );
- }
- 
--IR::UsesDef_ptr IR::ComponentDef::create_uses (
-+IR_UsesDef_ptr IR_ComponentDef::create_uses (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::InterfaceDef_ptr interface_type,
-+    IR_InterfaceDef_ptr interface_type,
-     CORBA::Boolean is_multiple,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -50234,11 +49534,11 @@
-     );
- }
- 
--IR::EmitsDef_ptr IR::ComponentDef::create_emits (
-+IR_EmitsDef_ptr IR_ComponentDef::create_emits (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -50259,11 +49559,11 @@
-     );
- }
- 
--IR::PublishesDef_ptr IR::ComponentDef::create_publishes (
-+IR_PublishesDef_ptr IR_ComponentDef::create_publishes (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -50284,11 +49584,11 @@
-     );
- }
- 
--IR::ConsumesDef_ptr IR::ComponentDef::create_consumes (
-+IR_ConsumesDef_ptr IR_ComponentDef::create_consumes (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -50309,9 +49609,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -50320,7 +49619,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -50332,7 +49631,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -50345,7 +49644,7 @@
- 
- 
- CORBA::Any * 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -50361,16 +49660,16 @@
- }
- 
- void 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (IR::InterfaceDefSeq * result)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (IR_InterfaceDefSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::InterfaceDefSeq & supported_interfaces,
-+    const IR_InterfaceDefSeq & supported_interfaces,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -50378,7 +49677,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -50398,7 +49697,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -50411,7 +49710,7 @@
- 
- 
- CORBA::Any * 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -50423,7 +49722,7 @@
-   return result_any;
- }
- 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -50432,7 +49731,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -50444,7 +49743,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -50457,7 +49756,7 @@
- 
- 
- CORBA::Any * 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -50473,13 +49772,13 @@
- }
- 
- void 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (IR::ComponentDef_ptr result)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (IR_ComponentDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -50488,7 +49787,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -50500,7 +49799,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -50513,7 +49812,7 @@
- 
- 
- CORBA::Any * 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -50529,13 +49828,13 @@
- }
- 
- void 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (IR::ProvidesDefSeq * result)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (IR_ProvidesDefSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -50544,7 +49843,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -50556,7 +49855,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -50569,7 +49868,7 @@
- 
- 
- CORBA::Any * 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -50585,13 +49884,13 @@
- }
- 
- void 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (IR::UsesDefSeq * result)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (IR_UsesDefSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -50600,7 +49899,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -50612,7 +49911,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -50625,7 +49924,7 @@
- 
- 
- CORBA::Any * 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -50641,13 +49940,13 @@
- }
- 
- void 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (IR::EmitsDefSeq * result)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (IR_EmitsDefSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -50656,7 +49955,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -50668,7 +49967,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -50681,7 +49980,7 @@
- 
- 
- CORBA::Any * 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -50697,13 +49996,13 @@
- }
- 
- void 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (IR::PublishesDefSeq * result)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (IR_PublishesDefSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -50712,7 +50011,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -50724,7 +50023,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -50737,7 +50036,7 @@
- 
- 
- CORBA::Any * 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -50753,13 +50052,13 @@
- }
- 
- void 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (IR::ConsumesDefSeq * result)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (IR_ConsumesDefSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -50768,7 +50067,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -50780,7 +50079,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -50793,7 +50092,7 @@
- 
- 
- CORBA::Any * 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -50809,19 +50108,19 @@
- }
- 
- void 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Boolean result)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Boolean result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::TAO_ClientRequestInfo_IR_ComponentDef_create_provides (
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::TAO_ClientRequestInfo_IR_ComponentDef_create_provides (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::InterfaceDef_ptr interface_type,
-+    IR_InterfaceDef_ptr interface_type,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -50832,7 +50131,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -50867,7 +50166,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -50880,7 +50179,7 @@
- 
- 
- CORBA::Any * 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -50896,19 +50195,19 @@
- }
- 
- void 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (IR::ProvidesDef_ptr result)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (IR_ProvidesDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::TAO_ClientRequestInfo_IR_ComponentDef_create_uses (
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::TAO_ClientRequestInfo_IR_ComponentDef_create_uses (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::InterfaceDef_ptr interface_type,
-+    IR_InterfaceDef_ptr interface_type,
-     const CORBA::Boolean & is_multiple,
-     CORBA::Environment &    
-   )
-@@ -50921,7 +50220,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -50961,7 +50260,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -50974,7 +50273,7 @@
- 
- 
- CORBA::Any * 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -50990,19 +50289,19 @@
- }
- 
- void 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (IR::UsesDef_ptr result)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (IR_UsesDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::TAO_ClientRequestInfo_IR_ComponentDef_create_emits (
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::TAO_ClientRequestInfo_IR_ComponentDef_create_emits (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -51013,7 +50312,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -51048,7 +50347,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -51061,7 +50360,7 @@
- 
- 
- CORBA::Any * 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -51077,19 +50376,19 @@
- }
- 
- void 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (IR::EmitsDef_ptr result)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (IR_EmitsDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes (
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -51100,7 +50399,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -51135,7 +50434,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -51148,7 +50447,7 @@
- 
- 
- CORBA::Any * 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -51164,19 +50463,19 @@
- }
- 
- void 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (IR::PublishesDef_ptr result)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (IR_PublishesDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes (
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+    IR_ValueDef_ptr value,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -51187,7 +50486,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -51222,7 +50521,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -51235,7 +50534,7 @@
- 
- 
- CORBA::Any * 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -51251,24 +50550,26 @@
- }
- 
- void 
--IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (IR::ConsumesDef_ptr result)
-+IR_ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (IR_ConsumesDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_ComponentDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/ComponentDef:1.0
--  13, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74446566), ACE_NTOHL (0x0),  // name = ComponentDef
-+  13, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74446566), ACE_NTOHL (0x0),  // name = IR_ComponentDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ComponentDef (CORBA::tk_objref, sizeof (_oc_IR_ComponentDef), (char *) &_oc_IR_ComponentDef, 0, sizeof (IR::ComponentDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ComponentDef (CORBA::tk_objref, sizeof (_oc_IR_ComponentDef), (char *) &_oc_IR_ComponentDef, 0, sizeof (IR_ComponentDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentDef, &_tc_TAO_tc_IR_ComponentDef)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_ComponentDescription[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -51345,7 +50646,7 @@
-   144, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657344), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/ProvidesDefSeq:1.0
--    15, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000),  // name = ProvidesDefSeq
-+    15, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000),  // name = IR_ProvidesDefSeq
-     CORBA::tk_sequence, // typecode kind
-     72, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -51353,7 +50654,7 @@
-       56, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ProvidesDef:1.0
--        12, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656600),  // name = ProvidesDef
-+        12, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656600),  // name = IR_ProvidesDef
- 
-       0U,
- 
-@@ -51363,7 +50664,7 @@
-   128, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x73657344), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/UsesDefSeq:1.0
--    11, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000),  // name = UsesDefSeq
-+    11, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000),  // name = IR_UsesDefSeq
-     CORBA::tk_sequence, // typecode kind
-     64, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -51371,7 +50672,7 @@
-       48, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x73657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/UsesDef:1.0
--        8, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656600),  // name = UsesDef
-+        8, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656600),  // name = IR_UsesDef
- 
-       0U,
- 
-@@ -51565,7 +50866,7 @@
-   132, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/EmitsDefSeq:1.0
--    12, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x53657100),  // name = EmitsDefSeq
-+    12, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x53657100),  // name = IR_EmitsDefSeq
-     CORBA::tk_sequence, // typecode kind
-     68, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -51573,7 +50874,7 @@
-       52, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/EmitsDef:1.0
--        9, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0),  // name = EmitsDef
-+        9, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0),  // name = IR_EmitsDef
- 
-       0U,
- 
-@@ -51583,7 +50884,7 @@
-   148, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/PublishesDefSeq:1.0
--    16, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x53657100),  // name = PublishesDefSeq
-+    16, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x53657100),  // name = IR_PublishesDefSeq
-     CORBA::tk_sequence, // typecode kind
-     76, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -51591,7 +50892,7 @@
-       60, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/PublishesDef:1.0
--        13, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0),  // name = PublishesDef
-+        13, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0),  // name = IR_PublishesDef
- 
-       0U,
- 
-@@ -51601,7 +50902,7 @@
-   144, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7375), ACE_NTOHL (0x6d657344), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/ConsumesDefSeq:1.0
--    15, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000),  // name = ConsumesDefSeq
-+    15, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000),  // name = IR_ConsumesDefSeq
-     CORBA::tk_sequence, // typecode kind
-     72, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -51609,7 +50910,7 @@
-       56, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7375), ACE_NTOHL (0x6d657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/ConsumesDef:1.0
--        12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656600),  // name = ConsumesDef
-+        12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656600),  // name = IR_ConsumesDef
- 
-       0U,
- 
-@@ -51618,14 +50919,15 @@
-   CORBA::tk_boolean,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_ComponentDescription (CORBA::tk_struct, sizeof (_oc_IR_ComponentDescription), (char *) &_oc_IR_ComponentDescription, 0, sizeof (IR::ComponentDescription));
-+static CORBA::TypeCode _tc_TAO_tc_IR_ComponentDescription (CORBA::tk_struct, sizeof (_oc_IR_ComponentDescription), (char *) &_oc_IR_ComponentDescription, 0, sizeof (IR_ComponentDescription));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentDescription, &_tc_TAO_tc_IR_ComponentDescription)
- TAO_NAMESPACE_END
--void IR::ComponentDescription::_tao_any_destructor (void *x)
-+
-+void IR_ComponentDescription::_tao_any_destructor (void *x)
- {
--  ComponentDescription *tmp = ACE_static_cast (ComponentDescription*,x);
-+  IR_ComponentDescription *tmp = ACE_static_cast (IR_ComponentDescription*,x);
-   delete tmp;
- }
- 
-@@ -51634,15 +50936,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_PrimaryKeyDef_Proxy_Impl::_TAO_PrimaryKeyDef_Proxy_Impl (void)
-+_TAO_PrimaryKeyDef_Proxy_Impl::_TAO_PrimaryKeyDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::_TAO_PrimaryKeyDef_Remote_Proxy_Impl (void)
-+_TAO_PrimaryKeyDef_Remote_Proxy_Impl::_TAO_PrimaryKeyDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
-+CORBA::Boolean _TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
-     CORBA_Object *_collocated_tao_target_,
-     const char * primary_key_id,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -51680,7 +50982,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a ri (
-+      IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         primary_key_id,
-@@ -51812,7 +51114,7 @@
-   return _tao_retval;
- }
- 
--IR::ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
-+IR_ValueDef_ptr _TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -51821,8 +51123,8 @@
-   ))
- {
-   
--  IR::ValueDef_ptr _tao_retval = IR::ValueDef::_nil ();
--  IR::ValueDef_var _tao_safe_retval (_tao_retval);
-+  IR_ValueDef_ptr _tao_retval = IR_ValueDef::_nil ();
-+  IR_ValueDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -51850,7 +51152,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get ri (
-+      IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -51906,7 +51208,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -51982,37 +51284,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_PrimaryKeyDef_Proxy_Broker::_TAO_PrimaryKeyDef_Proxy_Broker (void)
-+_TAO_PrimaryKeyDef_Proxy_Broker::_TAO_PrimaryKeyDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_PrimaryKeyDef_Proxy_Broker::~_TAO_PrimaryKeyDef_Proxy_Broker (void)
-+_TAO_PrimaryKeyDef_Proxy_Broker::~_TAO_PrimaryKeyDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_PrimaryKeyDef_Proxy_Broker * (*IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_PrimaryKeyDef_Proxy_Broker * (*_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker *
--IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
-+_TAO_PrimaryKeyDef_Remote_Proxy_Broker *
-+_TAO_PrimaryKeyDef_Remote_Proxy_Broker::the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_PrimaryKeyDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
-+_TAO_PrimaryKeyDef_Remote_Proxy_Broker::_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::~_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
-+_TAO_PrimaryKeyDef_Remote_Proxy_Broker::~_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_PrimaryKeyDef_Proxy_Impl&
--IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::PrimaryKeyDef *object,
-+_TAO_PrimaryKeyDef_Proxy_Impl&
-+_TAO_PrimaryKeyDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_PrimaryKeyDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -52028,109 +51330,109 @@
- 
- 
- // default constructor
--IR::PrimaryKeyDef::PrimaryKeyDef (int collocated)
-+IR_PrimaryKeyDef::IR_PrimaryKeyDef (int collocated)
- {
-   this->IR_PrimaryKeyDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::PrimaryKeyDef::~PrimaryKeyDef (void)
-+IR_PrimaryKeyDef::~IR_PrimaryKeyDef (void)
- {}
- 
- void
--IR::PrimaryKeyDef::IR_PrimaryKeyDef_setup_collocation (int collocated)
-+IR_PrimaryKeyDef::IR_PrimaryKeyDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_PrimaryKeyDef_Proxy_Broker_ =
--      ::IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_PrimaryKeyDef_Proxy_Broker_ =
--      ::IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::the_TAO_PrimaryKeyDef_Remote_Proxy_Broker ();
-+      _TAO_PrimaryKeyDef_Remote_Proxy_Broker::the_TAO_PrimaryKeyDef_Remote_Proxy_Broker ();
-   
-   this->IR_Contained_setup_collocation (collocated);
- }
- 
--void IR::PrimaryKeyDef::_tao_any_destructor (void *x)
-+void IR_PrimaryKeyDef::_tao_any_destructor (void *x)
- {
--  PrimaryKeyDef *tmp = ACE_static_cast (PrimaryKeyDef*,x);
-+  IR_PrimaryKeyDef *tmp = ACE_static_cast (IR_PrimaryKeyDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::PrimaryKeyDef_ptr IR::PrimaryKeyDef::_narrow (
-+IR_PrimaryKeyDef_ptr IR_PrimaryKeyDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return PrimaryKeyDef::_nil ();
-+    return IR_PrimaryKeyDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PrimaryKeyDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (PrimaryKeyDef::_nil ());
-+      ACE_CHECK_RETURN (IR_PrimaryKeyDef::_nil ());
-       if (is_a == 0)
--        return PrimaryKeyDef::_nil ();
-+        return IR_PrimaryKeyDef::_nil ();
-     }
--  return PrimaryKeyDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_PrimaryKeyDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::PrimaryKeyDef_ptr IR::PrimaryKeyDef::_unchecked_narrow (
-+IR_PrimaryKeyDef_ptr IR_PrimaryKeyDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return PrimaryKeyDef::_nil ();
-+    return IR_PrimaryKeyDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      PrimaryKeyDef_ptr default_proxy = PrimaryKeyDef::_nil ();
-+      IR_PrimaryKeyDef_ptr default_proxy = IR_PrimaryKeyDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::PrimaryKeyDef (
-+          ::IR_PrimaryKeyDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          PrimaryKeyDef::_nil ());
-+          IR_PrimaryKeyDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::PrimaryKeyDef (stub, 0, obj->_servant ()), PrimaryKeyDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_PrimaryKeyDef (stub, 0, obj->_servant ()), IR_PrimaryKeyDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            PrimaryKeyDef_ptr,
-+            IR_PrimaryKeyDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &PrimaryKeyDef::_narrow
-+                      &IR_PrimaryKeyDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::PrimaryKeyDef_ptr
--IR::PrimaryKeyDef::_duplicate (PrimaryKeyDef_ptr obj)
-+IR_PrimaryKeyDef_ptr
-+IR_PrimaryKeyDef::_duplicate (IR_PrimaryKeyDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::PrimaryKeyDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_PrimaryKeyDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimaryKeyDef:1.0")) ||
-@@ -52142,34 +51444,34 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::PrimaryKeyDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_PrimaryKeyDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, PrimaryKeyDef)::_narrow))
-+      &IR_PrimaryKeyDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -52182,12 +51484,12 @@
-   return retv;
- }
- 
--const char* IR::PrimaryKeyDef::_interface_repository_id (void) const
-+const char* IR_PrimaryKeyDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/PrimaryKeyDef:1.0";
- }
- 
--CORBA::Boolean IR::PrimaryKeyDef::is_a (
-+CORBA::Boolean IR_PrimaryKeyDef::is_a (
-     const char * primary_key_id,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -52206,7 +51508,7 @@
-     );
- }
- 
--IR::ValueDef_ptr IR::PrimaryKeyDef::primary_key (
-+IR_ValueDef_ptr IR_PrimaryKeyDef::primary_key (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -52223,9 +51525,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a (
-+IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * primary_key_id,
-@@ -52236,7 +51537,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -52255,7 +51556,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -52268,7 +51569,7 @@
- 
- 
- CORBA::Any * 
--IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -52284,13 +51585,13 @@
- }
- 
- void 
--IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Boolean result)
-+IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Boolean result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
-+IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -52299,7 +51600,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -52311,7 +51612,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -52324,7 +51625,7 @@
- 
- 
- CORBA::Any * 
--IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -52340,24 +51641,26 @@
- }
- 
- void 
--IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (IR::ValueDef_ptr result)
-+IR_PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (IR_ValueDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_PrimaryKeyDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x72696d61), ACE_NTOHL (0x72794b65), ACE_NTOHL (0x79446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/PrimaryKeyDef:1.0
--  14, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x6172794b), ACE_NTOHL (0x65794465), ACE_NTOHL (0x66000000),  // name = PrimaryKeyDef
-+  14, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x6172794b), ACE_NTOHL (0x65794465), ACE_NTOHL (0x66000000),  // name = IR_PrimaryKeyDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_PrimaryKeyDef (CORBA::tk_objref, sizeof (_oc_IR_PrimaryKeyDef), (char *) &_oc_IR_PrimaryKeyDef, 0, sizeof (IR::PrimaryKeyDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_PrimaryKeyDef (CORBA::tk_objref, sizeof (_oc_IR_PrimaryKeyDef), (char *) &_oc_IR_PrimaryKeyDef, 0, sizeof (IR_PrimaryKeyDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimaryKeyDef, &_tc_TAO_tc_IR_PrimaryKeyDef)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_PrimaryKeyDescription[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -52405,17 +51708,18 @@
-   52, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/ValueDef:1.0
--    9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = ValueDef
-+    9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0),  // name = IR_ValueDef
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_PrimaryKeyDescription (CORBA::tk_struct, sizeof (_oc_IR_PrimaryKeyDescription), (char *) &_oc_IR_PrimaryKeyDescription, 0, sizeof (IR::PrimaryKeyDescription));
-+static CORBA::TypeCode _tc_TAO_tc_IR_PrimaryKeyDescription (CORBA::tk_struct, sizeof (_oc_IR_PrimaryKeyDescription), (char *) &_oc_IR_PrimaryKeyDescription, 0, sizeof (IR_PrimaryKeyDescription));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimaryKeyDescription, &_tc_TAO_tc_IR_PrimaryKeyDescription)
- TAO_NAMESPACE_END
--void IR::PrimaryKeyDescription::_tao_any_destructor (void *x)
-+
-+void IR_PrimaryKeyDescription::_tao_any_destructor (void *x)
- {
--  PrimaryKeyDescription *tmp = ACE_static_cast (PrimaryKeyDescription*,x);
-+  IR_PrimaryKeyDescription *tmp = ACE_static_cast (IR_PrimaryKeyDescription*,x);
-   delete tmp;
- }
- 
-@@ -52424,10 +51728,10 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_FactoryDef_Proxy_Impl::_TAO_FactoryDef_Proxy_Impl (void)
-+_TAO_FactoryDef_Proxy_Impl::_TAO_FactoryDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_FactoryDef_Remote_Proxy_Impl::_TAO_FactoryDef_Remote_Proxy_Impl (void)
-+_TAO_FactoryDef_Remote_Proxy_Impl::_TAO_FactoryDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
-@@ -52442,37 +51746,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_FactoryDef_Proxy_Broker::_TAO_FactoryDef_Proxy_Broker (void)
-+_TAO_FactoryDef_Proxy_Broker::_TAO_FactoryDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_FactoryDef_Proxy_Broker::~_TAO_FactoryDef_Proxy_Broker (void)
-+_TAO_FactoryDef_Proxy_Broker::~_TAO_FactoryDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_FactoryDef_Proxy_Broker * (*IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_FactoryDef_Proxy_Broker * (*_TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_FactoryDef_Remote_Proxy_Broker *
--IR::_TAO_FactoryDef_Remote_Proxy_Broker::the_TAO_FactoryDef_Remote_Proxy_Broker (void)
-+_TAO_FactoryDef_Remote_Proxy_Broker *
-+_TAO_FactoryDef_Remote_Proxy_Broker::the_TAO_FactoryDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_FactoryDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_FactoryDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_FactoryDef_Remote_Proxy_Broker::_TAO_FactoryDef_Remote_Proxy_Broker (void)
-+_TAO_FactoryDef_Remote_Proxy_Broker::_TAO_FactoryDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_FactoryDef_Remote_Proxy_Broker::~_TAO_FactoryDef_Remote_Proxy_Broker (void)
-+_TAO_FactoryDef_Remote_Proxy_Broker::~_TAO_FactoryDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_FactoryDef_Proxy_Impl&
--IR::_TAO_FactoryDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::FactoryDef *object,
-+_TAO_FactoryDef_Proxy_Impl&
-+_TAO_FactoryDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_FactoryDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -52488,109 +51792,109 @@
- 
- 
- // default constructor
--IR::FactoryDef::FactoryDef (int collocated)
-+IR_FactoryDef::IR_FactoryDef (int collocated)
- {
-   this->IR_FactoryDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::FactoryDef::~FactoryDef (void)
-+IR_FactoryDef::~IR_FactoryDef (void)
- {}
- 
- void
--IR::FactoryDef::IR_FactoryDef_setup_collocation (int collocated)
-+IR_FactoryDef::IR_FactoryDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_FactoryDef_Proxy_Broker_ =
--      ::IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_FactoryDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_FactoryDef_Proxy_Broker_ =
--      ::IR::_TAO_FactoryDef_Remote_Proxy_Broker::the_TAO_FactoryDef_Remote_Proxy_Broker ();
-+      _TAO_FactoryDef_Remote_Proxy_Broker::the_TAO_FactoryDef_Remote_Proxy_Broker ();
-   
-   this->IR_OperationDef_setup_collocation (collocated);
- }
- 
--void IR::FactoryDef::_tao_any_destructor (void *x)
-+void IR_FactoryDef::_tao_any_destructor (void *x)
- {
--  FactoryDef *tmp = ACE_static_cast (FactoryDef*,x);
-+  IR_FactoryDef *tmp = ACE_static_cast (IR_FactoryDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::FactoryDef_ptr IR::FactoryDef::_narrow (
-+IR_FactoryDef_ptr IR_FactoryDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return FactoryDef::_nil ();
-+    return IR_FactoryDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FactoryDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (FactoryDef::_nil ());
-+      ACE_CHECK_RETURN (IR_FactoryDef::_nil ());
-       if (is_a == 0)
--        return FactoryDef::_nil ();
-+        return IR_FactoryDef::_nil ();
-     }
--  return FactoryDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_FactoryDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::FactoryDef_ptr IR::FactoryDef::_unchecked_narrow (
-+IR_FactoryDef_ptr IR_FactoryDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return FactoryDef::_nil ();
-+    return IR_FactoryDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      FactoryDef_ptr default_proxy = FactoryDef::_nil ();
-+      IR_FactoryDef_ptr default_proxy = IR_FactoryDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_FactoryDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::FactoryDef (
-+          ::IR_FactoryDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          FactoryDef::_nil ());
-+          IR_FactoryDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::FactoryDef (stub, 0, obj->_servant ()), FactoryDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_FactoryDef (stub, 0, obj->_servant ()), IR_FactoryDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            FactoryDef_ptr,
-+            IR_FactoryDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &FactoryDef::_narrow
-+                      &IR_FactoryDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::FactoryDef_ptr
--IR::FactoryDef::_duplicate (FactoryDef_ptr obj)
-+IR_FactoryDef_ptr
-+IR_FactoryDef::_duplicate (IR_FactoryDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::FactoryDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_FactoryDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) ||
-@@ -52603,46 +51907,46 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::FactoryDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_FactoryDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, FactoryDef)::_narrow))
-+      &IR_FactoryDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, OperationDef)::_narrow))
-+      &IR_OperationDef::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::OperationDef_ptr,
-+            IR_OperationDef_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -52655,21 +51959,18 @@
-   return retv;
- }
- 
--const char* IR::FactoryDef::_interface_repository_id (void) const
-+const char* IR_FactoryDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/FactoryDef:1.0";
- }
- 
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
- static const CORBA::Long _oc_IR_FactoryDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72794465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/FactoryDef:1.0
--  11, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65660000),  // name = FactoryDef
-+  11, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65660000),  // name = IR_FactoryDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_FactoryDef (CORBA::tk_objref, sizeof (_oc_IR_FactoryDef), (char *) &_oc_IR_FactoryDef, 0, sizeof (IR::FactoryDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_FactoryDef (CORBA::tk_objref, sizeof (_oc_IR_FactoryDef), (char *) &_oc_IR_FactoryDef, 0, sizeof (IR_FactoryDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FactoryDef, &_tc_TAO_tc_IR_FactoryDef)
-@@ -52679,10 +51980,10 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_FinderDef_Proxy_Impl::_TAO_FinderDef_Proxy_Impl (void)
-+_TAO_FinderDef_Proxy_Impl::_TAO_FinderDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_FinderDef_Remote_Proxy_Impl::_TAO_FinderDef_Remote_Proxy_Impl (void)
-+_TAO_FinderDef_Remote_Proxy_Impl::_TAO_FinderDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
-@@ -52697,37 +51998,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_FinderDef_Proxy_Broker::_TAO_FinderDef_Proxy_Broker (void)
-+_TAO_FinderDef_Proxy_Broker::_TAO_FinderDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_FinderDef_Proxy_Broker::~_TAO_FinderDef_Proxy_Broker (void)
-+_TAO_FinderDef_Proxy_Broker::~_TAO_FinderDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_FinderDef_Proxy_Broker * (*IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_FinderDef_Proxy_Broker * (*_TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_FinderDef_Remote_Proxy_Broker *
--IR::_TAO_FinderDef_Remote_Proxy_Broker::the_TAO_FinderDef_Remote_Proxy_Broker (void)
-+_TAO_FinderDef_Remote_Proxy_Broker *
-+_TAO_FinderDef_Remote_Proxy_Broker::the_TAO_FinderDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_FinderDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_FinderDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_FinderDef_Remote_Proxy_Broker::_TAO_FinderDef_Remote_Proxy_Broker (void)
-+_TAO_FinderDef_Remote_Proxy_Broker::_TAO_FinderDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_FinderDef_Remote_Proxy_Broker::~_TAO_FinderDef_Remote_Proxy_Broker (void)
-+_TAO_FinderDef_Remote_Proxy_Broker::~_TAO_FinderDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_FinderDef_Proxy_Impl&
--IR::_TAO_FinderDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::FinderDef *object,
-+_TAO_FinderDef_Proxy_Impl&
-+_TAO_FinderDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_FinderDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -52743,109 +52044,109 @@
- 
- 
- // default constructor
--IR::FinderDef::FinderDef (int collocated)
-+IR_FinderDef::IR_FinderDef (int collocated)
- {
-   this->IR_FinderDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::FinderDef::~FinderDef (void)
-+IR_FinderDef::~IR_FinderDef (void)
- {}
- 
- void
--IR::FinderDef::IR_FinderDef_setup_collocation (int collocated)
-+IR_FinderDef::IR_FinderDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_FinderDef_Proxy_Broker_ =
--      ::IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_FinderDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_FinderDef_Proxy_Broker_ =
--      ::IR::_TAO_FinderDef_Remote_Proxy_Broker::the_TAO_FinderDef_Remote_Proxy_Broker ();
-+      _TAO_FinderDef_Remote_Proxy_Broker::the_TAO_FinderDef_Remote_Proxy_Broker ();
-   
-   this->IR_OperationDef_setup_collocation (collocated);
- }
- 
--void IR::FinderDef::_tao_any_destructor (void *x)
-+void IR_FinderDef::_tao_any_destructor (void *x)
- {
--  FinderDef *tmp = ACE_static_cast (FinderDef*,x);
-+  IR_FinderDef *tmp = ACE_static_cast (IR_FinderDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::FinderDef_ptr IR::FinderDef::_narrow (
-+IR_FinderDef_ptr IR_FinderDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return FinderDef::_nil ();
-+    return IR_FinderDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FinderDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (FinderDef::_nil ());
-+      ACE_CHECK_RETURN (IR_FinderDef::_nil ());
-       if (is_a == 0)
--        return FinderDef::_nil ();
-+        return IR_FinderDef::_nil ();
-     }
--  return FinderDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_FinderDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::FinderDef_ptr IR::FinderDef::_unchecked_narrow (
-+IR_FinderDef_ptr IR_FinderDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return FinderDef::_nil ();
-+    return IR_FinderDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      FinderDef_ptr default_proxy = FinderDef::_nil ();
-+      IR_FinderDef_ptr default_proxy = IR_FinderDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_FinderDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::FinderDef (
-+          ::IR_FinderDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          FinderDef::_nil ());
-+          IR_FinderDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::FinderDef (stub, 0, obj->_servant ()), FinderDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_FinderDef (stub, 0, obj->_servant ()), IR_FinderDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            FinderDef_ptr,
-+            IR_FinderDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &FinderDef::_narrow
-+                      &IR_FinderDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::FinderDef_ptr
--IR::FinderDef::_duplicate (FinderDef_ptr obj)
-+IR_FinderDef_ptr
-+IR_FinderDef::_duplicate (IR_FinderDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::FinderDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_FinderDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) ||
-@@ -52858,46 +52159,46 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::FinderDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_FinderDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, FinderDef)::_narrow))
-+      &IR_FinderDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, OperationDef)::_narrow))
-+      &IR_OperationDef::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::OperationDef_ptr,
-+            IR_OperationDef_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -52910,21 +52211,18 @@
-   return retv;
- }
- 
--const char* IR::FinderDef::_interface_repository_id (void) const
-+const char* IR_FinderDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/FinderDef:1.0";
- }
- 
--
--#if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
- static const CORBA::Long _oc_IR_FinderDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x696e6465), ACE_NTOHL (0x72446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FinderDef:1.0
--  10, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66000000),  // name = FinderDef
-+  10, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66000000),  // name = IR_FinderDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_FinderDef (CORBA::tk_objref, sizeof (_oc_IR_FinderDef), (char *) &_oc_IR_FinderDef, 0, sizeof (IR::FinderDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_FinderDef (CORBA::tk_objref, sizeof (_oc_IR_FinderDef), (char *) &_oc_IR_FinderDef, 0, sizeof (IR_FinderDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FinderDef, &_tc_TAO_tc_IR_FinderDef)
-@@ -52934,15 +52232,15 @@
- //                Base & Remote Proxy  Implementation. 
- //
- 
--IR::_TAO_HomeDef_Proxy_Impl::_TAO_HomeDef_Proxy_Impl (void)
-+_TAO_HomeDef_Proxy_Impl::_TAO_HomeDef_Proxy_Impl (void)
- {}
- 
--IR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Impl (void)
-+_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Impl (void)
- {}
- 
- // Remote Implementation of the IDL interface methods
- 
--IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
-+IR_HomeDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::base_home (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -52951,8 +52249,8 @@
-   ))
- {
-   
--  IR::HomeDef_ptr _tao_retval = IR::HomeDef::_nil ();
--  IR::HomeDef_var _tao_safe_retval (_tao_retval);
-+  IR_HomeDef_ptr _tao_retval = IR_HomeDef::_nil ();
-+  IR_HomeDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -52980,7 +52278,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get ri (
-+      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -53036,7 +52334,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::HomeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_HomeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -53102,7 +52400,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
-+IR_ComponentDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::managed_component (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -53111,8 +52409,8 @@
-   ))
- {
-   
--  IR::ComponentDef_ptr _tao_retval = IR::ComponentDef::_nil ();
--  IR::ComponentDef_var _tao_safe_retval (_tao_retval);
-+  IR_ComponentDef_ptr _tao_retval = IR_ComponentDef::_nil ();
-+  IR_ComponentDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -53140,7 +52438,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get ri (
-+      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -53196,7 +52494,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -53262,7 +52560,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
-+IR_PrimaryKeyDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::primary_key (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -53271,8 +52569,8 @@
-   ))
- {
-   
--  IR::PrimaryKeyDef_ptr _tao_retval = IR::PrimaryKeyDef::_nil ();
--  IR::PrimaryKeyDef_var _tao_safe_retval (_tao_retval);
-+  IR_PrimaryKeyDef_ptr _tao_retval = IR_PrimaryKeyDef::_nil ();
-+  IR_PrimaryKeyDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -53300,7 +52598,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get ri (
-+      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -53356,7 +52654,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_PrimaryKeyDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -53422,7 +52720,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
-+IR_FactoryDefSeq * _TAO_HomeDef_Remote_Proxy_Impl::factories (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -53431,7 +52729,7 @@
-   ))
- {
-   
--  IR::FactoryDefSeq *_tao_retval = 0;
-+  IR_FactoryDefSeq *_tao_retval = 0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -53439,8 +52737,8 @@
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
-   
--  ACE_NEW_RETURN (_tao_retval, IR::FactoryDefSeq, _tao_retval);
--  IR::FactoryDefSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_FactoryDefSeq, _tao_retval);
-+  IR_FactoryDefSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_factories",
-@@ -53461,7 +52759,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get ri (
-+      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -53517,7 +52815,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::FactoryDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_FactoryDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -53583,7 +52881,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
-+IR_FinderDefSeq * _TAO_HomeDef_Remote_Proxy_Impl::finders (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -53592,7 +52890,7 @@
-   ))
- {
-   
--  IR::FinderDefSeq *_tao_retval = 0;
-+  IR_FinderDefSeq *_tao_retval = 0;
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -53600,8 +52898,8 @@
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
-   
--  ACE_NEW_RETURN (_tao_retval, IR::FinderDefSeq, _tao_retval);
--  IR::FinderDefSeq_var _tao_safe_retval (_tao_retval);
-+  ACE_NEW_RETURN (_tao_retval, IR_FinderDefSeq, _tao_retval);
-+  IR_FinderDefSeq_var _tao_safe_retval (_tao_retval);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "_get_finders",
-@@ -53622,7 +52920,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get ri (
-+      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -53678,7 +52976,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::FinderDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_FinderDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -53744,7 +53042,7 @@
-   return _tao_safe_retval._retn ();
- }
- 
--CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
-+CORBA::Boolean _TAO_HomeDef_Remote_Proxy_Impl::is_basic (
-     CORBA_Object *_collocated_tao_target_,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-@@ -53781,7 +53079,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get ri (
-+      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         ACE_TRY_ENV
-@@ -53902,12 +53200,12 @@
-   return _tao_retval;
- }
- 
--IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
-+IR_PrimaryKeyDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr primary_key,
-+    IR_ValueDef_ptr primary_key,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -53915,8 +53213,8 @@
-   ))
- {
-   
--  IR::PrimaryKeyDef_ptr _tao_retval = IR::PrimaryKeyDef::_nil ();
--  IR::PrimaryKeyDef_var _tao_safe_retval (_tao_retval);
-+  IR_PrimaryKeyDef_ptr _tao_retval = IR_PrimaryKeyDef::_nil ();
-+  IR_PrimaryKeyDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -53944,7 +53242,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key ri (
-+      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -54017,7 +53315,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_PrimaryKeyDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -54083,13 +53381,13 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
-+IR_FactoryDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::create_factory (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -54097,8 +53395,8 @@
-   ))
- {
-   
--  IR::FactoryDef_ptr _tao_retval = IR::FactoryDef::_nil ();
--  IR::FactoryDef_var _tao_safe_retval (_tao_retval);
-+  IR_FactoryDef_ptr _tao_retval = IR_FactoryDef::_nil ();
-+  IR_FactoryDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -54126,7 +53424,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory ri (
-+      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -54201,7 +53499,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::FactoryDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_FactoryDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -54267,13 +53565,13 @@
-   return _tao_safe_retval._retn ();
- }
- 
--IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
-+IR_FinderDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::create_finder (
-     CORBA_Object *_collocated_tao_target_,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -54281,8 +53579,8 @@
-   ))
- {
-   
--  IR::FinderDef_ptr _tao_retval = IR::FinderDef::_nil ();
--  IR::FinderDef_var _tao_safe_retval (_tao_retval);
-+  IR_FinderDef_ptr _tao_retval = IR_FinderDef::_nil ();
-+  IR_FinderDef_var _tao_safe_retval (_tao_retval);
-   
-   
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-@@ -54310,7 +53608,7 @@
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
-       
- #if TAO_HAS_INTERCEPTORS == 1
--      IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder ri (
-+      IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder ri (
-         &_tao_call,
-         _collocated_tao_target_,
-         id,
-@@ -54385,7 +53683,7 @@
-             }
-           
-           TAO_INTERCEPTOR (
--              IR::FinderDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-+              IR_FinderDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
-@@ -54461,37 +53759,37 @@
- //           Remote & Base  Proxy Broker Implementation
- //
- 
--IR::_TAO_HomeDef_Proxy_Broker::_TAO_HomeDef_Proxy_Broker (void)
-+_TAO_HomeDef_Proxy_Broker::_TAO_HomeDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_HomeDef_Proxy_Broker::~_TAO_HomeDef_Proxy_Broker (void)
-+_TAO_HomeDef_Proxy_Broker::~_TAO_HomeDef_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_HomeDef_Proxy_Broker * (*IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
-+_TAO_HomeDef_Proxy_Broker * (*_TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   ) = 0;
- 
- // Factory Member function Implementation.
--IR::_TAO_HomeDef_Remote_Proxy_Broker *
--IR::_TAO_HomeDef_Remote_Proxy_Broker::the_TAO_HomeDef_Remote_Proxy_Broker (void)
-+_TAO_HomeDef_Remote_Proxy_Broker *
-+_TAO_HomeDef_Remote_Proxy_Broker::the_TAO_HomeDef_Remote_Proxy_Broker (void)
- {
--  static ::IR::_TAO_HomeDef_Remote_Proxy_Broker remote_proxy_broker;
-+  static ::_TAO_HomeDef_Remote_Proxy_Broker remote_proxy_broker;
-   return &remote_proxy_broker;
- }
- 
--IR::_TAO_HomeDef_Remote_Proxy_Broker::_TAO_HomeDef_Remote_Proxy_Broker (void)
-+_TAO_HomeDef_Remote_Proxy_Broker::_TAO_HomeDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_HomeDef_Remote_Proxy_Broker::~_TAO_HomeDef_Remote_Proxy_Broker (void)
-+_TAO_HomeDef_Remote_Proxy_Broker::~_TAO_HomeDef_Remote_Proxy_Broker (void)
- {
- }
- 
--IR::_TAO_HomeDef_Proxy_Impl&
--IR::_TAO_HomeDef_Remote_Proxy_Broker::select_proxy (
--  ::IR::HomeDef *object,
-+_TAO_HomeDef_Proxy_Impl&
-+_TAO_HomeDef_Remote_Proxy_Broker::select_proxy (
-+  ::IR_HomeDef *object,
-   CORBA::Environment &ACE_TRY_ENV
- )
- {
-@@ -54507,109 +53805,109 @@
- 
- 
- // default constructor
--IR::HomeDef::HomeDef (int collocated)
-+IR_HomeDef::IR_HomeDef (int collocated)
- {
-   this->IR_HomeDef_setup_collocation (collocated);
- }
- 
- // destructor
--IR::HomeDef::~HomeDef (void)
-+IR_HomeDef::~IR_HomeDef (void)
- {}
- 
- void
--IR::HomeDef::IR_HomeDef_setup_collocation (int collocated)
-+IR_HomeDef::IR_HomeDef_setup_collocation (int collocated)
- {
-   if (collocated)
-     this->the_TAO_HomeDef_Proxy_Broker_ =
--      ::IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer (this);
-+      _TAO_HomeDef_Proxy_Broker_Factory_function_pointer (this);
-   else
-     this->the_TAO_HomeDef_Proxy_Broker_ =
--      ::IR::_TAO_HomeDef_Remote_Proxy_Broker::the_TAO_HomeDef_Remote_Proxy_Broker ();
-+      _TAO_HomeDef_Remote_Proxy_Broker::the_TAO_HomeDef_Remote_Proxy_Broker ();
-   
-   this->IR_InterfaceDef_setup_collocation (collocated);
- }
- 
--void IR::HomeDef::_tao_any_destructor (void *x)
-+void IR_HomeDef::_tao_any_destructor (void *x)
- {
--  HomeDef *tmp = ACE_static_cast (HomeDef*,x);
-+  IR_HomeDef *tmp = ACE_static_cast (IR_HomeDef*,x);
-   CORBA::release (tmp);
- }
- 
--IR::HomeDef_ptr IR::HomeDef::_narrow (
-+IR_HomeDef_ptr IR_HomeDef::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
-   if (CORBA::is_nil (obj))
--    return HomeDef::_nil ();
-+    return IR_HomeDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/HomeDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (HomeDef::_nil ());
-+      ACE_CHECK_RETURN (IR_HomeDef::_nil ());
-       if (is_a == 0)
--        return HomeDef::_nil ();
-+        return IR_HomeDef::_nil ();
-     }
--  return HomeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return IR_HomeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
--IR::HomeDef_ptr IR::HomeDef::_unchecked_narrow (
-+IR_HomeDef_ptr IR_HomeDef::_unchecked_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &
-   )
- {
-   if (CORBA::is_nil (obj))
--    return HomeDef::_nil ();
-+    return IR_HomeDef::_nil ();
-   if (! obj->_is_local ())
-     {
-       TAO_Stub* stub = obj->_stubobj ();
-       if (stub)
-         stub->_incr_refcnt ();
--      HomeDef_ptr default_proxy = HomeDef::_nil ();
-+      IR_HomeDef_ptr default_proxy = IR_HomeDef::_nil ();
- 
-       if (
-           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-           stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer != 0
-+          obj->_is_collocated () &&_TAO_HomeDef_Proxy_Broker_Factory_function_pointer != 0
-         )
-       {
-         ACE_NEW_RETURN (
-           default_proxy,
--          ::IR::HomeDef (
-+          ::IR_HomeDef (
-             stub,
-             1,
-             obj->_servant ()),
-             
--          HomeDef::_nil ());
-+          IR_HomeDef::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::IR::HomeDef (stub, 0, obj->_servant ()), HomeDef::_nil ());
-+        ACE_NEW_RETURN (default_proxy, ::IR_HomeDef (stub, 0, obj->_servant ()), IR_HomeDef::_nil ());
-         return default_proxy;
-       }
-     else 
-       return
-         ACE_reinterpret_cast
-           (
--            HomeDef_ptr,
-+            IR_HomeDef_ptr,
-               obj->_tao_QueryInterface
-                 (
-                   ACE_reinterpret_cast
-                     (
-                       ptr_arith_t,
--                      &HomeDef::_narrow
-+                      &IR_HomeDef::_narrow
-                     )
-                 )
-           );
- }
- 
--IR::HomeDef_ptr
--IR::HomeDef::_duplicate (HomeDef_ptr obj)
-+IR_HomeDef_ptr
-+IR_HomeDef::_duplicate (IR_HomeDef_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
- 
--CORBA::Boolean IR::HomeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
-+CORBA::Boolean IR_HomeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
- {
-   if (
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) ||
-@@ -54624,70 +53922,70 @@
-     return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
- }
- 
--void *IR::HomeDef::_tao_QueryInterface (ptr_arith_t type)
-+void *IR_HomeDef::_tao_QueryInterface (ptr_arith_t type)
- {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, HomeDef)::_narrow))
-+      &IR_HomeDef::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, InterfaceDef)::_narrow))
-+      &IR_InterfaceDef::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::InterfaceDef_ptr,
-+            IR_InterfaceDef_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Container)::_narrow))
-+      &IR_Container::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Container_ptr,
-+            IR_Container_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
-+      &IR_Contained::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::Contained_ptr,
-+            IR_Contained_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
-+      &IR_IDLType::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            IR::IDLType_ptr,
-+            IR_IDLType_ptr,
-             this
-           )
-       );
-   else if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &::CORBA::IRObject::_narrow))
-+      &CORBA_IRObject::_narrow))
-     retv = ACE_reinterpret_cast
-       (
-         void *,
-         ACE_static_cast
-           (
--            CORBA::IRObject_ptr,
-+            CORBA_IRObject_ptr,
-             this
-           )
-       );
-@@ -54700,12 +53998,12 @@
-   return retv;
- }
- 
--const char* IR::HomeDef::_interface_repository_id (void) const
-+const char* IR_HomeDef::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/IR/HomeDef:1.0";
- }
- 
--IR::HomeDef_ptr IR::HomeDef::base_home (
-+IR_HomeDef_ptr IR_HomeDef::base_home (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -54722,7 +54020,7 @@
-     );
- }
- 
--IR::ComponentDef_ptr IR::HomeDef::managed_component (
-+IR_ComponentDef_ptr IR_HomeDef::managed_component (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -54739,7 +54037,7 @@
-     );
- }
- 
--IR::PrimaryKeyDef_ptr IR::HomeDef::primary_key (
-+IR_PrimaryKeyDef_ptr IR_HomeDef::primary_key (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -54756,7 +54054,7 @@
-     );
- }
- 
--IR::FactoryDefSeq * IR::HomeDef::factories (
-+IR_FactoryDefSeq * IR_HomeDef::factories (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -54773,7 +54071,7 @@
-     );
- }
- 
--IR::FinderDefSeq * IR::HomeDef::finders (
-+IR_FinderDefSeq * IR_HomeDef::finders (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -54790,7 +54088,7 @@
-     );
- }
- 
--CORBA::Boolean IR::HomeDef::is_basic (
-+CORBA::Boolean IR_HomeDef::is_basic (
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -54807,11 +54105,11 @@
-     );
- }
- 
--IR::PrimaryKeyDef_ptr IR::HomeDef::create_primary_key (
-+IR_PrimaryKeyDef_ptr IR_HomeDef::create_primary_key (
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr primary_key,
-+    IR_ValueDef_ptr primary_key,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -54832,12 +54130,12 @@
-     );
- }
- 
--IR::FactoryDef_ptr IR::HomeDef::create_factory (
-+IR_FactoryDef_ptr IR_HomeDef::create_factory (
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -54859,12 +54157,12 @@
-     );
- }
- 
--IR::FinderDef_ptr IR::HomeDef::create_finder (
-+IR_FinderDef_ptr IR_HomeDef::create_finder (
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV
-   )
-   ACE_THROW_SPEC ((
-@@ -54886,9 +54184,8 @@
-     );
- }
- 
--
- #if (TAO_HAS_INTERCEPTORS == 1)
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -54897,7 +54194,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -54909,7 +54206,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -54922,7 +54219,7 @@
- 
- 
- CORBA::Any * 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -54938,13 +54235,13 @@
- }
- 
- void 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (IR::HomeDef_ptr result)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (IR_HomeDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -54953,7 +54250,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -54965,7 +54262,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -54978,7 +54275,7 @@
- 
- 
- CORBA::Any * 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -54994,13 +54291,13 @@
- }
- 
- void 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (IR::ComponentDef_ptr result)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (IR_ComponentDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -55009,7 +54306,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -55021,7 +54318,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -55034,7 +54331,7 @@
- 
- 
- CORBA::Any * 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -55050,13 +54347,13 @@
- }
- 
- void 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (IR::PrimaryKeyDef_ptr result)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (IR_PrimaryKeyDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::TAO_ClientRequestInfo_IR_HomeDef_factories_get (
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::TAO_ClientRequestInfo_IR_HomeDef_factories_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -55065,7 +54362,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -55077,7 +54374,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -55090,7 +54387,7 @@
- 
- 
- CORBA::Any * 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -55106,13 +54403,13 @@
- }
- 
- void 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (IR::FactoryDefSeq * result)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (IR_FactoryDefSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::TAO_ClientRequestInfo_IR_HomeDef_finders_get (
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::TAO_ClientRequestInfo_IR_HomeDef_finders_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -55121,7 +54418,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -55133,7 +54430,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -55146,7 +54443,7 @@
- 
- 
- CORBA::Any * 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -55162,13 +54459,13 @@
- }
- 
- void 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (IR::FinderDefSeq * result)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (IR_FinderDefSeq * result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     CORBA::Environment &    
-@@ -55177,7 +54474,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -55189,7 +54486,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -55202,7 +54499,7 @@
- 
- 
- CORBA::Any * 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -55218,19 +54515,19 @@
- }
- 
- void 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Boolean result)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Boolean result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key (
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr primary_key,
-+    IR_ValueDef_ptr primary_key,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -55241,7 +54538,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -55276,7 +54573,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -55289,7 +54586,7 @@
- 
- 
- CORBA::Any * 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -55305,20 +54602,20 @@
- }
- 
- void 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (IR::PrimaryKeyDef_ptr result)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (IR_PrimaryKeyDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::TAO_ClientRequestInfo_IR_HomeDef_create_factory (
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::TAO_ClientRequestInfo_IR_HomeDef_create_factory (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -55330,7 +54627,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -55371,7 +54668,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -55384,7 +54681,7 @@
- 
- 
- CORBA::Any * 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -55400,20 +54697,20 @@
- }
- 
- void 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (IR::FactoryDef_ptr result)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (IR_FactoryDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::TAO_ClientRequestInfo_IR_HomeDef_create_finder (
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::TAO_ClientRequestInfo_IR_HomeDef_create_finder (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
-+    const IR_ParDescriptionSeq & params,
-+    const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &    
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-@@ -55425,7 +54722,7 @@
- {}
- 
- Dynamic::ParameterList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the argument list on demand.
-@@ -55466,7 +54763,7 @@
- }
- 
- Dynamic::ExceptionList *
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the exception list on demand.
-@@ -55479,7 +54776,7 @@
- 
- 
- CORBA::Any * 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_TRY_ENV)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-   // Generate the result on demand.
-@@ -55495,24 +54792,26 @@
- }
- 
- void 
--IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (IR::FinderDef_ptr result)
-+IR_HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (IR_FinderDef_ptr result)
- {
-   // update the result 
-   this->_result = result;
- }
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-+
- static const CORBA::Long _oc_IR_HomeDef[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f48), ACE_NTOHL (0x6f6d6544), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/HomeDef:1.0
--  8, ACE_NTOHL (0x486f6d65), ACE_NTOHL (0x44656600),  // name = HomeDef
-+  8, ACE_NTOHL (0x486f6d65), ACE_NTOHL (0x44656600),  // name = IR_HomeDef
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_HomeDef (CORBA::tk_objref, sizeof (_oc_IR_HomeDef), (char *) &_oc_IR_HomeDef, 0, sizeof (IR::HomeDef));
-+static CORBA::TypeCode _tc_TAO_tc_IR_HomeDef (CORBA::tk_objref, sizeof (_oc_IR_HomeDef), (char *) &_oc_IR_HomeDef, 0, sizeof (IR_HomeDef));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_HomeDef, &_tc_TAO_tc_IR_HomeDef)
- TAO_NAMESPACE_END
-+
- static const CORBA::Long _oc_IR_HomeDescription[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -55578,14 +54877,14 @@
-   64, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x72696d61), ACE_NTOHL (0x72794b65), ACE_NTOHL (0x79446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/PrimaryKeyDef:1.0
--    14, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x6172794b), ACE_NTOHL (0x65794465), ACE_NTOHL (0x66000000),  // name = PrimaryKeyDef
-+    14, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x6172794b), ACE_NTOHL (0x65794465), ACE_NTOHL (0x66000000),  // name = IR_PrimaryKeyDef
- 
-   10, ACE_NTOHL (0x66616374), ACE_NTOHL (0x6f726965), ACE_NTOHL (0x73000000),  // name = factories
-   CORBA::tk_alias, // typecode kind for typedefs
-   144, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72794465), ACE_NTOHL (0x66536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FactoryDefSeq:1.0
--    14, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65665365), ACE_NTOHL (0x71000000),  // name = FactoryDefSeq
-+    14, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65665365), ACE_NTOHL (0x71000000),  // name = IR_FactoryDefSeq
-     CORBA::tk_sequence, // typecode kind
-     72, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -55593,7 +54892,7 @@
-       56, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72794465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/FactoryDef:1.0
--        11, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65660000),  // name = FactoryDef
-+        11, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65660000),  // name = IR_FactoryDef
- 
-       0U,
- 
-@@ -55603,7 +54902,7 @@
-   140, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x696e6465), ACE_NTOHL (0x72446566), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/FinderDefSeq:1.0
--    13, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66536571), ACE_NTOHL (0x0),  // name = FinderDefSeq
-+    13, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66536571), ACE_NTOHL (0x0),  // name = IR_FinderDefSeq
-     CORBA::tk_sequence, // typecode kind
-     72, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -55611,7 +54910,7 @@
-       56, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x696e6465), ACE_NTOHL (0x72446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FinderDef:1.0
--        10, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66000000),  // name = FinderDef
-+        10, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66000000),  // name = IR_FinderDef
- 
-       0U,
- 
-@@ -55738,7 +55037,7 @@
-               48, // encapsulation length
-                 TAO_ENCAP_BYTE_ORDER, // byte order
-                 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/IDLType:1.0
--                8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IDLType
-+                8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500),  // name = IR_IDLType
- 
-               5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
-               CORBA::tk_enum, // typecode kind
-@@ -56005,18 +55304,19 @@
-   CORBA::tk_boolean,
- 
- };
--static CORBA::TypeCode _tc_TAO_tc_IR_HomeDescription (CORBA::tk_struct, sizeof (_oc_IR_HomeDescription), (char *) &_oc_IR_HomeDescription, 0, sizeof (IR::HomeDescription));
-+static CORBA::TypeCode _tc_TAO_tc_IR_HomeDescription (CORBA::tk_struct, sizeof (_oc_IR_HomeDescription), (char *) &_oc_IR_HomeDescription, 0, sizeof (IR_HomeDescription));
- TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
- TAO_NAMESPACE_BEGIN (IR)
- TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_HomeDescription, &_tc_TAO_tc_IR_HomeDescription)
- TAO_NAMESPACE_END
--void IR::HomeDescription::_tao_any_destructor (void *x)
-+
-+void IR_HomeDescription::_tao_any_destructor (void *x)
- {
--  HomeDescription *tmp = ACE_static_cast (HomeDescription*,x);
-+  IR_HomeDescription *tmp = ACE_static_cast (IR_HomeDescription*,x);
-   delete tmp;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::DefinitionKind _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_DefinitionKind _tao_elem)
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -56027,18 +55327,16 @@
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::DefinitionKind &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_DefinitionKind &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_DefinitionKind, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_DefinitionKind, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -56056,7 +55354,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, CORBA::IRObject_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, CORBA_IRObject_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -56066,25 +55364,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        CORBA::IRObject::_duplicate (_tao_elem),
--        CORBA::IRObject::_tao_any_destructor
-+        CORBA_IRObject::_duplicate (_tao_elem),
-+        CORBA_IRObject::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::IRObject_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_IRObject_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = CORBA::IRObject::_nil ();
-+    _tao_elem = CORBA_IRObject::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (CORBA::_tc_IRObject, ACE_TRY_ENV);
-+    if (!type->equivalent (CORBA::_tc_IRObject, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -56095,29 +55391,29 @@
-           CORBA::_tc_IRObject,
-           1,
-           _tao_elem,
--          CORBA::IRObject::_tao_any_destructor
-+          CORBA_IRObject::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = CORBA::IRObject::_nil ();
-+    _tao_elem = CORBA_IRObject::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = CORBA::IRObject::_nil ();
-+  _tao_elem = CORBA_IRObject::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<CORBA::IRObject,CORBA::IRObject_var>;
-+    template class TAO_Object_Manager<CORBA_IRObject,CORBA_IRObject_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<CORBA::IRObject,CORBA::IRObject_var>
-+  #  pragma instantiate TAO_Object_Manager<CORBA_IRObject,CORBA_IRObject_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::Contained_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_Contained_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -56127,25 +55423,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::Contained::_duplicate (_tao_elem),
--        IR::Contained::_tao_any_destructor
-+        IR_Contained::_duplicate (_tao_elem),
-+        IR_Contained::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::Contained_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Contained_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::Contained::_nil ();
-+    _tao_elem = IR_Contained::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_Contained, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_Contained, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -56156,83 +55450,81 @@
-           IR::_tc_Contained,
-           1,
-           _tao_elem,
--          IR::Contained::_tao_any_destructor
-+          IR_Contained::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::Contained::_nil ();
-+    _tao_elem = IR_Contained::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::Contained::_nil ();
-+  _tao_elem = IR_Contained::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::Contained,IR::Contained_var>;
-+    template class TAO_Object_Manager<IR_Contained,IR_Contained_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::Contained,IR::Contained_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_Contained,IR_Contained_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::Contained::Description &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_Contained::Description &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-   _tao_any._tao_replace (
--      IR::Contained::_tc_Description,
-+      IR_Contained::_tc_Description,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin ()
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::Contained::Description *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_Contained::Description *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-   _tao_any._tao_replace (
--      IR::Contained::_tc_Description,
-+      IR_Contained::_tc_Description,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::Contained::Description::_tao_any_destructor
-+      IR_Contained::Description::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::Contained::Description *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Contained::Description *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::Contained::Description*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_Contained::Description*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::Contained::Description *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_Contained::Description *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::Contained::_tc_Description, ACE_TRY_ENV);
-+    if (!type->equivalent (IR_Contained::_tc_Description, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::Contained::Description*,
-+          const IR_Contained::Description*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::Contained::Description *tmp;
--      ACE_NEW_RETURN (tmp, IR::Contained::Description, 0);
-+      IR_Contained::Description *tmp;
-+      ACE_NEW_RETURN (tmp, IR_Contained::Description, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -56240,10 +55532,10 @@
-       if (stream >> *tmp)
-       {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            IR::Contained::_tc_Description,
-+            IR_Contained::_tc_Description,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::Contained::Description::_tao_any_destructor
-+            IR_Contained::Description::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -56263,7 +55555,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::InterfaceDefSeq &_tao_elem
-+    const IR_InterfaceDefSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -56277,7 +55569,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::InterfaceDefSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_InterfaceDefSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -56287,43 +55579,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::InterfaceDefSeq::_tao_any_destructor
-+      IR_InterfaceDefSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::InterfaceDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_InterfaceDefSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::InterfaceDefSeq*&,
-+      const IR_InterfaceDefSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::InterfaceDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_InterfaceDefSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_InterfaceDefSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_InterfaceDefSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::InterfaceDefSeq*,
-+          const IR_InterfaceDefSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::InterfaceDefSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::InterfaceDefSeq, 0);
-+      IR_InterfaceDefSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_InterfaceDefSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -56334,7 +55624,7 @@
-             IR::_tc_InterfaceDefSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::InterfaceDefSeq::_tao_any_destructor
-+            IR_InterfaceDefSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -56354,7 +55644,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::ValueDefSeq &_tao_elem
-+    const IR_ValueDefSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -56368,7 +55658,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ValueDefSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ValueDefSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -56378,43 +55668,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ValueDefSeq::_tao_any_destructor
-+      IR_ValueDefSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ValueDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueDefSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::ValueDefSeq*&,
-+      const IR_ValueDefSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ValueDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ValueDefSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ValueDefSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ValueDefSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ValueDefSeq*,
-+          const IR_ValueDefSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ValueDefSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::ValueDefSeq, 0);
-+      IR_ValueDefSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ValueDefSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -56425,7 +55713,7 @@
-             IR::_tc_ValueDefSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ValueDefSeq::_tao_any_destructor
-+            IR_ValueDefSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -56445,7 +55733,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::ComponentDefSeq &_tao_elem
-+    const IR_ComponentDefSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -56459,7 +55747,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ComponentDefSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ComponentDefSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -56469,43 +55757,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ComponentDefSeq::_tao_any_destructor
-+      IR_ComponentDefSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ComponentDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ComponentDefSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::ComponentDefSeq*&,
-+      const IR_ComponentDefSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ComponentDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ComponentDefSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDefSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ComponentDefSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ComponentDefSeq*,
-+          const IR_ComponentDefSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ComponentDefSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::ComponentDefSeq, 0);
-+      IR_ComponentDefSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ComponentDefSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -56516,7 +55802,7 @@
-             IR::_tc_ComponentDefSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ComponentDefSeq::_tao_any_destructor
-+            IR_ComponentDefSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -56536,7 +55822,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::ProvidesDefSeq &_tao_elem
-+    const IR_ProvidesDefSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -56550,7 +55836,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ProvidesDefSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ProvidesDefSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -56560,43 +55846,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ProvidesDefSeq::_tao_any_destructor
-+      IR_ProvidesDefSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ProvidesDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ProvidesDefSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::ProvidesDefSeq*&,
-+      const IR_ProvidesDefSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ProvidesDefSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDefSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ProvidesDefSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ProvidesDefSeq*,
-+          const IR_ProvidesDefSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ProvidesDefSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::ProvidesDefSeq, 0);
-+      IR_ProvidesDefSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ProvidesDefSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -56607,7 +55891,7 @@
-             IR::_tc_ProvidesDefSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ProvidesDefSeq::_tao_any_destructor
-+            IR_ProvidesDefSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -56627,7 +55911,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::UsesDefSeq &_tao_elem
-+    const IR_UsesDefSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -56641,7 +55925,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::UsesDefSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_UsesDefSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -56651,43 +55935,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::UsesDefSeq::_tao_any_destructor
-+      IR_UsesDefSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UsesDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UsesDefSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::UsesDefSeq*&,
-+      const IR_UsesDefSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_UsesDefSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDefSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_UsesDefSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::UsesDefSeq*,
-+          const IR_UsesDefSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::UsesDefSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::UsesDefSeq, 0);
-+      IR_UsesDefSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_UsesDefSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -56698,7 +55980,7 @@
-             IR::_tc_UsesDefSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::UsesDefSeq::_tao_any_destructor
-+            IR_UsesDefSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -56718,7 +56000,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::HomeDefSeq &_tao_elem
-+    const IR_HomeDefSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -56732,7 +56014,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::HomeDefSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_HomeDefSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -56742,43 +56024,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::HomeDefSeq::_tao_any_destructor
-+      IR_HomeDefSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::HomeDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_HomeDefSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::HomeDefSeq*&,
-+      const IR_HomeDefSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::HomeDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_HomeDefSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDefSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_HomeDefSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::HomeDefSeq*,
-+          const IR_HomeDefSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::HomeDefSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::HomeDefSeq, 0);
-+      IR_HomeDefSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_HomeDefSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -56789,7 +56069,7 @@
-             IR::_tc_HomeDefSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::HomeDefSeq::_tao_any_destructor
-+            IR_HomeDefSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -56809,7 +56089,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::EmitsDefSeq &_tao_elem
-+    const IR_EmitsDefSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -56823,7 +56103,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::EmitsDefSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_EmitsDefSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -56833,43 +56113,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::EmitsDefSeq::_tao_any_destructor
-+      IR_EmitsDefSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EmitsDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EmitsDefSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::EmitsDefSeq*&,
-+      const IR_EmitsDefSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::EmitsDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_EmitsDefSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDefSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_EmitsDefSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::EmitsDefSeq*,
-+          const IR_EmitsDefSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::EmitsDefSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::EmitsDefSeq, 0);
-+      IR_EmitsDefSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_EmitsDefSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -56880,7 +56158,7 @@
-             IR::_tc_EmitsDefSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::EmitsDefSeq::_tao_any_destructor
-+            IR_EmitsDefSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -56900,7 +56178,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::PublishesDefSeq &_tao_elem
-+    const IR_PublishesDefSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -56914,7 +56192,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::PublishesDefSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_PublishesDefSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -56924,43 +56202,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::PublishesDefSeq::_tao_any_destructor
-+      IR_PublishesDefSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PublishesDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PublishesDefSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::PublishesDefSeq*&,
-+      const IR_PublishesDefSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::PublishesDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_PublishesDefSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDefSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_PublishesDefSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::PublishesDefSeq*,
-+          const IR_PublishesDefSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::PublishesDefSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::PublishesDefSeq, 0);
-+      IR_PublishesDefSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_PublishesDefSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -56971,7 +56247,7 @@
-             IR::_tc_PublishesDefSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::PublishesDefSeq::_tao_any_destructor
-+            IR_PublishesDefSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -56991,7 +56267,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::ConsumesDefSeq &_tao_elem
-+    const IR_ConsumesDefSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -57005,7 +56281,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ConsumesDefSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ConsumesDefSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -57015,43 +56291,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ConsumesDefSeq::_tao_any_destructor
-+      IR_ConsumesDefSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ConsumesDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ConsumesDefSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::ConsumesDefSeq*&,
-+      const IR_ConsumesDefSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ConsumesDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ConsumesDefSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDefSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ConsumesDefSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ConsumesDefSeq*,
-+          const IR_ConsumesDefSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ConsumesDefSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::ConsumesDefSeq, 0);
-+      IR_ConsumesDefSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ConsumesDefSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -57062,7 +56336,7 @@
-             IR::_tc_ConsumesDefSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ConsumesDefSeq::_tao_any_destructor
-+            IR_ConsumesDefSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -57082,7 +56356,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::FactoryDefSeq &_tao_elem
-+    const IR_FactoryDefSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -57096,7 +56370,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::FactoryDefSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_FactoryDefSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -57106,43 +56380,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::FactoryDefSeq::_tao_any_destructor
-+      IR_FactoryDefSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FactoryDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_FactoryDefSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::FactoryDefSeq*&,
-+      const IR_FactoryDefSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::FactoryDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_FactoryDefSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDefSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_FactoryDefSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::FactoryDefSeq*,
-+          const IR_FactoryDefSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::FactoryDefSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::FactoryDefSeq, 0);
-+      IR_FactoryDefSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_FactoryDefSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -57153,7 +56425,7 @@
-             IR::_tc_FactoryDefSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::FactoryDefSeq::_tao_any_destructor
-+            IR_FactoryDefSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -57173,7 +56445,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::FinderDefSeq &_tao_elem
-+    const IR_FinderDefSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -57187,7 +56459,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::FinderDefSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_FinderDefSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -57197,43 +56469,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::FinderDefSeq::_tao_any_destructor
-+      IR_FinderDefSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FinderDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_FinderDefSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::FinderDefSeq*&,
-+      const IR_FinderDefSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::FinderDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_FinderDefSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_FinderDefSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_FinderDefSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::FinderDefSeq*,
-+          const IR_FinderDefSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::FinderDefSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::FinderDefSeq, 0);
-+      IR_FinderDefSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_FinderDefSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -57244,7 +56514,7 @@
-             IR::_tc_FinderDefSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::FinderDefSeq::_tao_any_destructor
-+            IR_FinderDefSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -57264,7 +56534,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::ContainedSeq &_tao_elem
-+    const IR_ContainedSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -57278,7 +56548,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ContainedSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ContainedSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -57288,43 +56558,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ContainedSeq::_tao_any_destructor
-+      IR_ContainedSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ContainedSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ContainedSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::ContainedSeq*&,
-+      const IR_ContainedSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ContainedSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ContainedSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ContainedSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ContainedSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ContainedSeq*,
-+          const IR_ContainedSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ContainedSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::ContainedSeq, 0);
-+      IR_ContainedSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ContainedSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -57335,7 +56603,7 @@
-             IR::_tc_ContainedSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ContainedSeq::_tao_any_destructor
-+            IR_ContainedSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -57353,7 +56621,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::StructMember &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_StructMember &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -57364,7 +56632,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::StructMember *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_StructMember *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -57374,40 +56642,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::StructMember::_tao_any_destructor
-+      IR_StructMember::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::StructMember *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_StructMember *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::StructMember*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_StructMember*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::StructMember *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_StructMember *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_StructMember, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_StructMember, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::StructMember*,
-+          const IR_StructMember*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::StructMember *tmp;
--      ACE_NEW_RETURN (tmp, IR::StructMember, 0);
-+      IR_StructMember *tmp;
-+      ACE_NEW_RETURN (tmp, IR_StructMember, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -57418,7 +56684,7 @@
-             IR::_tc_StructMember,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::StructMember::_tao_any_destructor
-+            IR_StructMember::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -57438,7 +56704,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::StructMemberSeq &_tao_elem
-+    const IR_StructMemberSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -57452,7 +56718,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::StructMemberSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_StructMemberSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -57462,43 +56728,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::StructMemberSeq::_tao_any_destructor
-+      IR_StructMemberSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::StructMemberSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_StructMemberSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::StructMemberSeq*&,
-+      const IR_StructMemberSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::StructMemberSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_StructMemberSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_StructMemberSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_StructMemberSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::StructMemberSeq*,
-+          const IR_StructMemberSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::StructMemberSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::StructMemberSeq, 0);
-+      IR_StructMemberSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_StructMemberSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -57509,7 +56773,7 @@
-             IR::_tc_StructMemberSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::StructMemberSeq::_tao_any_destructor
-+            IR_StructMemberSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -57527,7 +56791,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::Initializer &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_Initializer &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -57538,7 +56802,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::Initializer *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_Initializer *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -57548,40 +56812,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::Initializer::_tao_any_destructor
-+      IR_Initializer::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::Initializer *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Initializer *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::Initializer*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_Initializer*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::Initializer *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_Initializer *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_Initializer, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_Initializer, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::Initializer*,
-+          const IR_Initializer*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::Initializer *tmp;
--      ACE_NEW_RETURN (tmp, IR::Initializer, 0);
-+      IR_Initializer *tmp;
-+      ACE_NEW_RETURN (tmp, IR_Initializer, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -57592,7 +56854,7 @@
-             IR::_tc_Initializer,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::Initializer::_tao_any_destructor
-+            IR_Initializer::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -57612,7 +56874,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::InitializerSeq &_tao_elem
-+    const IR_InitializerSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -57626,7 +56888,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::InitializerSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_InitializerSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -57636,43 +56898,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::InitializerSeq::_tao_any_destructor
-+      IR_InitializerSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::InitializerSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_InitializerSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::InitializerSeq*&,
-+      const IR_InitializerSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::InitializerSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_InitializerSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_InitializerSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_InitializerSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::InitializerSeq*,
-+          const IR_InitializerSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::InitializerSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::InitializerSeq, 0);
-+      IR_InitializerSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_InitializerSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -57683,7 +56943,7 @@
-             IR::_tc_InitializerSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::InitializerSeq::_tao_any_destructor
-+            IR_InitializerSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -57701,7 +56961,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::UnionMember &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_UnionMember &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -57712,7 +56972,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::UnionMember *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_UnionMember *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -57722,40 +56982,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::UnionMember::_tao_any_destructor
-+      IR_UnionMember::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UnionMember *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UnionMember *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::UnionMember*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_UnionMember*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UnionMember *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_UnionMember *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_UnionMember, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_UnionMember, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::UnionMember*,
-+          const IR_UnionMember*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::UnionMember *tmp;
--      ACE_NEW_RETURN (tmp, IR::UnionMember, 0);
-+      IR_UnionMember *tmp;
-+      ACE_NEW_RETURN (tmp, IR_UnionMember, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -57766,7 +57024,7 @@
-             IR::_tc_UnionMember,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::UnionMember::_tao_any_destructor
-+            IR_UnionMember::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -57786,7 +57044,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::UnionMemberSeq &_tao_elem
-+    const IR_UnionMemberSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -57800,7 +57058,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::UnionMemberSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_UnionMemberSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -57810,43 +57068,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::UnionMemberSeq::_tao_any_destructor
-+      IR_UnionMemberSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UnionMemberSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UnionMemberSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::UnionMemberSeq*&,
-+      const IR_UnionMemberSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UnionMemberSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_UnionMemberSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_UnionMemberSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_UnionMemberSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::UnionMemberSeq*,
-+          const IR_UnionMemberSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::UnionMemberSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::UnionMemberSeq, 0);
-+      IR_UnionMemberSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_UnionMemberSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -57857,7 +57113,7 @@
-             IR::_tc_UnionMemberSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::UnionMemberSeq::_tao_any_destructor
-+            IR_UnionMemberSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -57877,7 +57133,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::EnumMemberSeq &_tao_elem
-+    const IR_EnumMemberSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -57891,7 +57147,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::EnumMemberSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_EnumMemberSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -57901,43 +57157,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::EnumMemberSeq::_tao_any_destructor
-+      IR_EnumMemberSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EnumMemberSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EnumMemberSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::EnumMemberSeq*&,
-+      const IR_EnumMemberSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::EnumMemberSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_EnumMemberSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_EnumMemberSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_EnumMemberSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::EnumMemberSeq*,
-+          const IR_EnumMemberSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::EnumMemberSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::EnumMemberSeq, 0);
-+      IR_EnumMemberSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_EnumMemberSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -57948,7 +57202,7 @@
-             IR::_tc_EnumMemberSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::EnumMemberSeq::_tao_any_destructor
-+            IR_EnumMemberSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -57966,7 +57220,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::Container_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_Container_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -57976,25 +57230,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::Container::_duplicate (_tao_elem),
--        IR::Container::_tao_any_destructor
-+        IR_Container::_duplicate (_tao_elem),
-+        IR_Container::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::Container_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Container_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::Container::_nil ();
-+    _tao_elem = IR_Container::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_Container, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_Container, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -58005,83 +57257,81 @@
-           IR::_tc_Container,
-           1,
-           _tao_elem,
--          IR::Container::_tao_any_destructor
-+          IR_Container::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::Container::_nil ();
-+    _tao_elem = IR_Container::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::Container::_nil ();
-+  _tao_elem = IR_Container::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::Container,IR::Container_var>;
-+    template class TAO_Object_Manager<IR_Container,IR_Container_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::Container,IR::Container_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_Container,IR_Container_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::Container::Description &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_Container::Description &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-   _tao_any._tao_replace (
--      IR::Container::_tc_Description,
-+      IR_Container::_tc_Description,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin ()
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::Container::Description *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_Container::Description *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-   _tao_any._tao_replace (
--      IR::Container::_tc_Description,
-+      IR_Container::_tc_Description,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::Container::Description::_tao_any_destructor
-+      IR_Container::Description::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::Container::Description *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Container::Description *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::Container::Description*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_Container::Description*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::Container::Description *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_Container::Description *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::Container::_tc_Description, ACE_TRY_ENV);
-+    if (!type->equivalent (IR_Container::_tc_Description, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::Container::Description*,
-+          const IR_Container::Description*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::Container::Description *tmp;
--      ACE_NEW_RETURN (tmp, IR::Container::Description, 0);
-+      IR_Container::Description *tmp;
-+      ACE_NEW_RETURN (tmp, IR_Container::Description, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -58089,10 +57339,10 @@
-       if (stream >> *tmp)
-       {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            IR::Container::_tc_Description,
-+            IR_Container::_tc_Description,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::Container::Description::_tao_any_destructor
-+            IR_Container::Description::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -58112,67 +57362,65 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::Container::DescriptionSeq &_tao_elem
-+    const IR_Container::DescriptionSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-   {
-     _tao_any._tao_replace (
--        IR::Container::_tc_DescriptionSeq,
-+        IR_Container::_tc_DescriptionSeq,
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin ()
-       );
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::Container::DescriptionSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_Container::DescriptionSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-   _tao_any._tao_replace (
--      IR::Container::_tc_DescriptionSeq,
-+      IR_Container::_tc_DescriptionSeq,
-       TAO_ENCAP_BYTE_ORDER,
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::Container::DescriptionSeq::_tao_any_destructor
-+      IR_Container::DescriptionSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::Container::DescriptionSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Container::DescriptionSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::Container::DescriptionSeq*&,
-+      const IR_Container::DescriptionSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::Container::DescriptionSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_Container::DescriptionSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::Container::_tc_DescriptionSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR_Container::_tc_DescriptionSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::Container::DescriptionSeq*,
-+          const IR_Container::DescriptionSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::Container::DescriptionSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::Container::DescriptionSeq, 0);
-+      IR_Container::DescriptionSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_Container::DescriptionSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -58180,10 +57428,10 @@
-       if (stream >> *tmp)
-       {
-         ((CORBA::Any *)&_tao_any)->_tao_replace (
--            IR::Container::_tc_DescriptionSeq,
-+            IR_Container::_tc_DescriptionSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::Container::DescriptionSeq::_tao_any_destructor
-+            IR_Container::DescriptionSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -58201,7 +57449,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::IDLType_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_IDLType_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -58211,25 +57459,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::IDLType::_duplicate (_tao_elem),
--        IR::IDLType::_tao_any_destructor
-+        IR_IDLType::_duplicate (_tao_elem),
-+        IR_IDLType::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::IDLType_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_IDLType_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::IDLType::_nil ();
-+    _tao_elem = IR_IDLType::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_IDLType, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_IDLType, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -58240,29 +57486,29 @@
-           IR::_tc_IDLType,
-           1,
-           _tao_elem,
--          IR::IDLType::_tao_any_destructor
-+          IR_IDLType::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::IDLType::_nil ();
-+    _tao_elem = IR_IDLType::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::IDLType::_nil ();
-+  _tao_elem = IR_IDLType::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::IDLType,IR::IDLType_var>;
-+    template class TAO_Object_Manager<IR_IDLType,IR_IDLType_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::IDLType,IR::IDLType_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_IDLType,IR_IDLType_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::PrimitiveKind _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_PrimitiveKind _tao_elem)
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -58273,18 +57519,16 @@
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PrimitiveKind &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PrimitiveKind &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_PrimitiveKind, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_PrimitiveKind, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -58302,7 +57546,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::Repository_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_Repository_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -58312,25 +57556,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::Repository::_duplicate (_tao_elem),
--        IR::Repository::_tao_any_destructor
-+        IR_Repository::_duplicate (_tao_elem),
-+        IR_Repository::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::Repository_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Repository_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::Repository::_nil ();
-+    _tao_elem = IR_Repository::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_Repository, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_Repository, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -58341,29 +57583,29 @@
-           IR::_tc_Repository,
-           1,
-           _tao_elem,
--          IR::Repository::_tao_any_destructor
-+          IR_Repository::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::Repository::_nil ();
-+    _tao_elem = IR_Repository::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::Repository::_nil ();
-+  _tao_elem = IR_Repository::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::Repository,IR::Repository_var>;
-+    template class TAO_Object_Manager<IR_Repository,IR_Repository_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::Repository,IR::Repository_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_Repository,IR_Repository_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ComponentRepository_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_ComponentRepository_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -58373,25 +57615,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::ComponentRepository::_duplicate (_tao_elem),
--        IR::ComponentRepository::_tao_any_destructor
-+        IR_ComponentRepository::_duplicate (_tao_elem),
-+        IR_ComponentRepository::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ComponentRepository_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ComponentRepository_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::ComponentRepository::_nil ();
-+    _tao_elem = IR_ComponentRepository::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentRepository, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ComponentRepository, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -58402,29 +57642,29 @@
-           IR::_tc_ComponentRepository,
-           1,
-           _tao_elem,
--          IR::ComponentRepository::_tao_any_destructor
-+          IR_ComponentRepository::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::ComponentRepository::_nil ();
-+    _tao_elem = IR_ComponentRepository::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::ComponentRepository::_nil ();
-+  _tao_elem = IR_ComponentRepository::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::ComponentRepository,IR::ComponentRepository_var>;
-+    template class TAO_Object_Manager<IR_ComponentRepository,IR_ComponentRepository_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::ComponentRepository,IR::ComponentRepository_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_ComponentRepository,IR_ComponentRepository_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ModuleDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_ModuleDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -58434,25 +57674,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::ModuleDef::_duplicate (_tao_elem),
--        IR::ModuleDef::_tao_any_destructor
-+        IR_ModuleDef::_duplicate (_tao_elem),
-+        IR_ModuleDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ModuleDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ModuleDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::ModuleDef::_nil ();
-+    _tao_elem = IR_ModuleDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ModuleDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ModuleDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -58463,29 +57701,29 @@
-           IR::_tc_ModuleDef,
-           1,
-           _tao_elem,
--          IR::ModuleDef::_tao_any_destructor
-+          IR_ModuleDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::ModuleDef::_nil ();
-+    _tao_elem = IR_ModuleDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::ModuleDef::_nil ();
-+  _tao_elem = IR_ModuleDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::ModuleDef,IR::ModuleDef_var>;
-+    template class TAO_Object_Manager<IR_ModuleDef,IR_ModuleDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::ModuleDef,IR::ModuleDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_ModuleDef,IR_ModuleDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::ModuleDescription &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_ModuleDescription &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -58496,7 +57734,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ModuleDescription *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ModuleDescription *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -58506,40 +57744,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ModuleDescription::_tao_any_destructor
-+      IR_ModuleDescription::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ModuleDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ModuleDescription *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::ModuleDescription*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_ModuleDescription*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ModuleDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ModuleDescription *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ModuleDescription, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ModuleDescription, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ModuleDescription*,
-+          const IR_ModuleDescription*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ModuleDescription *tmp;
--      ACE_NEW_RETURN (tmp, IR::ModuleDescription, 0);
-+      IR_ModuleDescription *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ModuleDescription, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -58550,7 +57786,7 @@
-             IR::_tc_ModuleDescription,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ModuleDescription::_tao_any_destructor
-+            IR_ModuleDescription::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -58568,7 +57804,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ConstantDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_ConstantDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -58578,25 +57814,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::ConstantDef::_duplicate (_tao_elem),
--        IR::ConstantDef::_tao_any_destructor
-+        IR_ConstantDef::_duplicate (_tao_elem),
-+        IR_ConstantDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ConstantDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ConstantDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::ConstantDef::_nil ();
-+    _tao_elem = IR_ConstantDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ConstantDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ConstantDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -58607,29 +57841,29 @@
-           IR::_tc_ConstantDef,
-           1,
-           _tao_elem,
--          IR::ConstantDef::_tao_any_destructor
-+          IR_ConstantDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::ConstantDef::_nil ();
-+    _tao_elem = IR_ConstantDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::ConstantDef::_nil ();
-+  _tao_elem = IR_ConstantDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::ConstantDef,IR::ConstantDef_var>;
-+    template class TAO_Object_Manager<IR_ConstantDef,IR_ConstantDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::ConstantDef,IR::ConstantDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_ConstantDef,IR_ConstantDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::ConstantDescription &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_ConstantDescription &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -58640,7 +57874,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ConstantDescription *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ConstantDescription *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -58650,40 +57884,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ConstantDescription::_tao_any_destructor
-+      IR_ConstantDescription::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ConstantDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ConstantDescription *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::ConstantDescription*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_ConstantDescription*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ConstantDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ConstantDescription *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ConstantDescription, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ConstantDescription, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ConstantDescription*,
-+          const IR_ConstantDescription*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ConstantDescription *tmp;
--      ACE_NEW_RETURN (tmp, IR::ConstantDescription, 0);
-+      IR_ConstantDescription *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ConstantDescription, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -58694,7 +57926,7 @@
-             IR::_tc_ConstantDescription,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ConstantDescription::_tao_any_destructor
-+            IR_ConstantDescription::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -58712,7 +57944,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::TypedefDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_TypedefDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -58722,25 +57954,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::TypedefDef::_duplicate (_tao_elem),
--        IR::TypedefDef::_tao_any_destructor
-+        IR_TypedefDef::_duplicate (_tao_elem),
-+        IR_TypedefDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::TypedefDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_TypedefDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::TypedefDef::_nil ();
-+    _tao_elem = IR_TypedefDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_TypedefDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_TypedefDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -58751,29 +57981,29 @@
-           IR::_tc_TypedefDef,
-           1,
-           _tao_elem,
--          IR::TypedefDef::_tao_any_destructor
-+          IR_TypedefDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::TypedefDef::_nil ();
-+    _tao_elem = IR_TypedefDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::TypedefDef::_nil ();
-+  _tao_elem = IR_TypedefDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::TypedefDef,IR::TypedefDef_var>;
-+    template class TAO_Object_Manager<IR_TypedefDef,IR_TypedefDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::TypedefDef,IR::TypedefDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_TypedefDef,IR_TypedefDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::TypeDescription &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_TypeDescription &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -58784,7 +58014,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::TypeDescription *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_TypeDescription *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -58794,40 +58024,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::TypeDescription::_tao_any_destructor
-+      IR_TypeDescription::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::TypeDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_TypeDescription *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::TypeDescription*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_TypeDescription*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::TypeDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_TypeDescription *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_TypeDescription, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_TypeDescription, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::TypeDescription*,
-+          const IR_TypeDescription*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::TypeDescription *tmp;
--      ACE_NEW_RETURN (tmp, IR::TypeDescription, 0);
-+      IR_TypeDescription *tmp;
-+      ACE_NEW_RETURN (tmp, IR_TypeDescription, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -58838,7 +58066,7 @@
-             IR::_tc_TypeDescription,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::TypeDescription::_tao_any_destructor
-+            IR_TypeDescription::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -58856,7 +58084,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::StructDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_StructDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -58866,25 +58094,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::StructDef::_duplicate (_tao_elem),
--        IR::StructDef::_tao_any_destructor
-+        IR_StructDef::_duplicate (_tao_elem),
-+        IR_StructDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::StructDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_StructDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::StructDef::_nil ();
-+    _tao_elem = IR_StructDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_StructDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_StructDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -58895,29 +58121,29 @@
-           IR::_tc_StructDef,
-           1,
-           _tao_elem,
--          IR::StructDef::_tao_any_destructor
-+          IR_StructDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::StructDef::_nil ();
-+    _tao_elem = IR_StructDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::StructDef::_nil ();
-+  _tao_elem = IR_StructDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::StructDef,IR::StructDef_var>;
-+    template class TAO_Object_Manager<IR_StructDef,IR_StructDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::StructDef,IR::StructDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_StructDef,IR_StructDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::UnionDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_UnionDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -58927,25 +58153,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::UnionDef::_duplicate (_tao_elem),
--        IR::UnionDef::_tao_any_destructor
-+        IR_UnionDef::_duplicate (_tao_elem),
-+        IR_UnionDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UnionDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UnionDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::UnionDef::_nil ();
-+    _tao_elem = IR_UnionDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_UnionDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_UnionDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -58956,29 +58180,29 @@
-           IR::_tc_UnionDef,
-           1,
-           _tao_elem,
--          IR::UnionDef::_tao_any_destructor
-+          IR_UnionDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::UnionDef::_nil ();
-+    _tao_elem = IR_UnionDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::UnionDef::_nil ();
-+  _tao_elem = IR_UnionDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::UnionDef,IR::UnionDef_var>;
-+    template class TAO_Object_Manager<IR_UnionDef,IR_UnionDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::UnionDef,IR::UnionDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_UnionDef,IR_UnionDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::EnumDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_EnumDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -58988,25 +58212,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::EnumDef::_duplicate (_tao_elem),
--        IR::EnumDef::_tao_any_destructor
-+        IR_EnumDef::_duplicate (_tao_elem),
-+        IR_EnumDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EnumDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EnumDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::EnumDef::_nil ();
-+    _tao_elem = IR_EnumDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_EnumDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_EnumDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -59017,29 +58239,29 @@
-           IR::_tc_EnumDef,
-           1,
-           _tao_elem,
--          IR::EnumDef::_tao_any_destructor
-+          IR_EnumDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::EnumDef::_nil ();
-+    _tao_elem = IR_EnumDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::EnumDef::_nil ();
-+  _tao_elem = IR_EnumDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::EnumDef,IR::EnumDef_var>;
-+    template class TAO_Object_Manager<IR_EnumDef,IR_EnumDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::EnumDef,IR::EnumDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_EnumDef,IR_EnumDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::AliasDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_AliasDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -59049,25 +58271,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::AliasDef::_duplicate (_tao_elem),
--        IR::AliasDef::_tao_any_destructor
-+        IR_AliasDef::_duplicate (_tao_elem),
-+        IR_AliasDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::AliasDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_AliasDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::AliasDef::_nil ();
-+    _tao_elem = IR_AliasDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_AliasDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_AliasDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -59078,29 +58298,29 @@
-           IR::_tc_AliasDef,
-           1,
-           _tao_elem,
--          IR::AliasDef::_tao_any_destructor
-+          IR_AliasDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::AliasDef::_nil ();
-+    _tao_elem = IR_AliasDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::AliasDef::_nil ();
-+  _tao_elem = IR_AliasDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::AliasDef,IR::AliasDef_var>;
-+    template class TAO_Object_Manager<IR_AliasDef,IR_AliasDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::AliasDef,IR::AliasDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_AliasDef,IR_AliasDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::NativeDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_NativeDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -59110,25 +58330,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::NativeDef::_duplicate (_tao_elem),
--        IR::NativeDef::_tao_any_destructor
-+        IR_NativeDef::_duplicate (_tao_elem),
-+        IR_NativeDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::NativeDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_NativeDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::NativeDef::_nil ();
-+    _tao_elem = IR_NativeDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_NativeDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_NativeDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -59139,29 +58357,29 @@
-           IR::_tc_NativeDef,
-           1,
-           _tao_elem,
--          IR::NativeDef::_tao_any_destructor
-+          IR_NativeDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::NativeDef::_nil ();
-+    _tao_elem = IR_NativeDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::NativeDef::_nil ();
-+  _tao_elem = IR_NativeDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::NativeDef,IR::NativeDef_var>;
-+    template class TAO_Object_Manager<IR_NativeDef,IR_NativeDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::NativeDef,IR::NativeDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_NativeDef,IR_NativeDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::PrimitiveDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_PrimitiveDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -59171,25 +58389,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::PrimitiveDef::_duplicate (_tao_elem),
--        IR::PrimitiveDef::_tao_any_destructor
-+        IR_PrimitiveDef::_duplicate (_tao_elem),
-+        IR_PrimitiveDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PrimitiveDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PrimitiveDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::PrimitiveDef::_nil ();
-+    _tao_elem = IR_PrimitiveDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_PrimitiveDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_PrimitiveDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -59200,29 +58416,29 @@
-           IR::_tc_PrimitiveDef,
-           1,
-           _tao_elem,
--          IR::PrimitiveDef::_tao_any_destructor
-+          IR_PrimitiveDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::PrimitiveDef::_nil ();
-+    _tao_elem = IR_PrimitiveDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::PrimitiveDef::_nil ();
-+  _tao_elem = IR_PrimitiveDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::PrimitiveDef,IR::PrimitiveDef_var>;
-+    template class TAO_Object_Manager<IR_PrimitiveDef,IR_PrimitiveDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::PrimitiveDef,IR::PrimitiveDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_PrimitiveDef,IR_PrimitiveDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::StringDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_StringDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -59232,25 +58448,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::StringDef::_duplicate (_tao_elem),
--        IR::StringDef::_tao_any_destructor
-+        IR_StringDef::_duplicate (_tao_elem),
-+        IR_StringDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::StringDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_StringDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::StringDef::_nil ();
-+    _tao_elem = IR_StringDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_StringDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_StringDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -59261,29 +58475,29 @@
-           IR::_tc_StringDef,
-           1,
-           _tao_elem,
--          IR::StringDef::_tao_any_destructor
-+          IR_StringDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::StringDef::_nil ();
-+    _tao_elem = IR_StringDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::StringDef::_nil ();
-+  _tao_elem = IR_StringDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::StringDef,IR::StringDef_var>;
-+    template class TAO_Object_Manager<IR_StringDef,IR_StringDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::StringDef,IR::StringDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_StringDef,IR_StringDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::WstringDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_WstringDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -59293,25 +58507,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::WstringDef::_duplicate (_tao_elem),
--        IR::WstringDef::_tao_any_destructor
-+        IR_WstringDef::_duplicate (_tao_elem),
-+        IR_WstringDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::WstringDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_WstringDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::WstringDef::_nil ();
-+    _tao_elem = IR_WstringDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_WstringDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_WstringDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -59322,29 +58534,29 @@
-           IR::_tc_WstringDef,
-           1,
-           _tao_elem,
--          IR::WstringDef::_tao_any_destructor
-+          IR_WstringDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::WstringDef::_nil ();
-+    _tao_elem = IR_WstringDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::WstringDef::_nil ();
-+  _tao_elem = IR_WstringDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::WstringDef,IR::WstringDef_var>;
-+    template class TAO_Object_Manager<IR_WstringDef,IR_WstringDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::WstringDef,IR::WstringDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_WstringDef,IR_WstringDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::FixedDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_FixedDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -59354,25 +58566,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::FixedDef::_duplicate (_tao_elem),
--        IR::FixedDef::_tao_any_destructor
-+        IR_FixedDef::_duplicate (_tao_elem),
-+        IR_FixedDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FixedDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_FixedDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::FixedDef::_nil ();
-+    _tao_elem = IR_FixedDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_FixedDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_FixedDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -59383,29 +58593,29 @@
-           IR::_tc_FixedDef,
-           1,
-           _tao_elem,
--          IR::FixedDef::_tao_any_destructor
-+          IR_FixedDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::FixedDef::_nil ();
-+    _tao_elem = IR_FixedDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::FixedDef::_nil ();
-+  _tao_elem = IR_FixedDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::FixedDef,IR::FixedDef_var>;
-+    template class TAO_Object_Manager<IR_FixedDef,IR_FixedDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::FixedDef,IR::FixedDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_FixedDef,IR_FixedDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::SequenceDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_SequenceDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -59415,25 +58625,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::SequenceDef::_duplicate (_tao_elem),
--        IR::SequenceDef::_tao_any_destructor
-+        IR_SequenceDef::_duplicate (_tao_elem),
-+        IR_SequenceDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::SequenceDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_SequenceDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::SequenceDef::_nil ();
-+    _tao_elem = IR_SequenceDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_SequenceDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_SequenceDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -59444,29 +58652,29 @@
-           IR::_tc_SequenceDef,
-           1,
-           _tao_elem,
--          IR::SequenceDef::_tao_any_destructor
-+          IR_SequenceDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::SequenceDef::_nil ();
-+    _tao_elem = IR_SequenceDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::SequenceDef::_nil ();
-+  _tao_elem = IR_SequenceDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::SequenceDef,IR::SequenceDef_var>;
-+    template class TAO_Object_Manager<IR_SequenceDef,IR_SequenceDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::SequenceDef,IR::SequenceDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_SequenceDef,IR_SequenceDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ArrayDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_ArrayDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -59476,25 +58684,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::ArrayDef::_duplicate (_tao_elem),
--        IR::ArrayDef::_tao_any_destructor
-+        IR_ArrayDef::_duplicate (_tao_elem),
-+        IR_ArrayDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ArrayDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ArrayDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::ArrayDef::_nil ();
-+    _tao_elem = IR_ArrayDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ArrayDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ArrayDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -59505,29 +58711,29 @@
-           IR::_tc_ArrayDef,
-           1,
-           _tao_elem,
--          IR::ArrayDef::_tao_any_destructor
-+          IR_ArrayDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::ArrayDef::_nil ();
-+    _tao_elem = IR_ArrayDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::ArrayDef::_nil ();
-+  _tao_elem = IR_ArrayDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::ArrayDef,IR::ArrayDef_var>;
-+    template class TAO_Object_Manager<IR_ArrayDef,IR_ArrayDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::ArrayDef,IR::ArrayDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_ArrayDef,IR_ArrayDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ExceptionDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_ExceptionDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -59537,25 +58743,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::ExceptionDef::_duplicate (_tao_elem),
--        IR::ExceptionDef::_tao_any_destructor
-+        IR_ExceptionDef::_duplicate (_tao_elem),
-+        IR_ExceptionDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ExceptionDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ExceptionDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::ExceptionDef::_nil ();
-+    _tao_elem = IR_ExceptionDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ExceptionDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ExceptionDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -59566,29 +58770,29 @@
-           IR::_tc_ExceptionDef,
-           1,
-           _tao_elem,
--          IR::ExceptionDef::_tao_any_destructor
-+          IR_ExceptionDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::ExceptionDef::_nil ();
-+    _tao_elem = IR_ExceptionDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::ExceptionDef::_nil ();
-+  _tao_elem = IR_ExceptionDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::ExceptionDef,IR::ExceptionDef_var>;
-+    template class TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::ExceptionDef,IR::ExceptionDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::ExceptionDescription &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_ExceptionDescription &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -59599,7 +58803,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ExceptionDescription *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ExceptionDescription *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -59609,40 +58813,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ExceptionDescription::_tao_any_destructor
-+      IR_ExceptionDescription::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ExceptionDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ExceptionDescription *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::ExceptionDescription*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_ExceptionDescription*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ExceptionDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ExceptionDescription *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ExceptionDescription, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ExceptionDescription, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ExceptionDescription*,
-+          const IR_ExceptionDescription*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ExceptionDescription *tmp;
--      ACE_NEW_RETURN (tmp, IR::ExceptionDescription, 0);
-+      IR_ExceptionDescription *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ExceptionDescription, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -59653,7 +58855,7 @@
-             IR::_tc_ExceptionDescription,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ExceptionDescription::_tao_any_destructor
-+            IR_ExceptionDescription::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -59673,7 +58875,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::ExceptionDefSeq &_tao_elem
-+    const IR_ExceptionDefSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -59687,7 +58889,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ExceptionDefSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ExceptionDefSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -59697,43 +58899,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ExceptionDefSeq::_tao_any_destructor
-+      IR_ExceptionDefSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ExceptionDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ExceptionDefSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::ExceptionDefSeq*&,
-+      const IR_ExceptionDefSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ExceptionDefSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ExceptionDefSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ExceptionDefSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ExceptionDefSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ExceptionDefSeq*,
-+          const IR_ExceptionDefSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ExceptionDefSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::ExceptionDefSeq, 0);
-+      IR_ExceptionDefSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ExceptionDefSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -59744,7 +58944,7 @@
-             IR::_tc_ExceptionDefSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ExceptionDefSeq::_tao_any_destructor
-+            IR_ExceptionDefSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -59764,7 +58964,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::ExcDescriptionSeq &_tao_elem
-+    const IR_ExcDescriptionSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -59778,7 +58978,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ExcDescriptionSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ExcDescriptionSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -59788,43 +58988,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ExcDescriptionSeq::_tao_any_destructor
-+      IR_ExcDescriptionSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ExcDescriptionSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ExcDescriptionSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::ExcDescriptionSeq*&,
-+      const IR_ExcDescriptionSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ExcDescriptionSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ExcDescriptionSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ExcDescriptionSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ExcDescriptionSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ExcDescriptionSeq*,
-+          const IR_ExcDescriptionSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ExcDescriptionSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::ExcDescriptionSeq, 0);
-+      IR_ExcDescriptionSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ExcDescriptionSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -59835,7 +59033,7 @@
-             IR::_tc_ExcDescriptionSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ExcDescriptionSeq::_tao_any_destructor
-+            IR_ExcDescriptionSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -59853,7 +59051,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::AttributeMode _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_AttributeMode _tao_elem)
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -59864,18 +59062,16 @@
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::AttributeMode &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_AttributeMode &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_AttributeMode, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_AttributeMode, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -59893,7 +59089,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::AttributeDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_AttributeDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -59903,25 +59099,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::AttributeDef::_duplicate (_tao_elem),
--        IR::AttributeDef::_tao_any_destructor
-+        IR_AttributeDef::_duplicate (_tao_elem),
-+        IR_AttributeDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::AttributeDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_AttributeDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::AttributeDef::_nil ();
-+    _tao_elem = IR_AttributeDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_AttributeDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_AttributeDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -59932,29 +59126,29 @@
-           IR::_tc_AttributeDef,
-           1,
-           _tao_elem,
--          IR::AttributeDef::_tao_any_destructor
-+          IR_AttributeDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::AttributeDef::_nil ();
-+    _tao_elem = IR_AttributeDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::AttributeDef::_nil ();
-+  _tao_elem = IR_AttributeDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::AttributeDef,IR::AttributeDef_var>;
-+    template class TAO_Object_Manager<IR_AttributeDef,IR_AttributeDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::AttributeDef,IR::AttributeDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_AttributeDef,IR_AttributeDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::AttributeDescription &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_AttributeDescription &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -59965,7 +59159,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::AttributeDescription *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_AttributeDescription *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -59975,40 +59169,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::AttributeDescription::_tao_any_destructor
-+      IR_AttributeDescription::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::AttributeDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_AttributeDescription *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::AttributeDescription*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_AttributeDescription*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::AttributeDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_AttributeDescription *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_AttributeDescription, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_AttributeDescription, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::AttributeDescription*,
-+          const IR_AttributeDescription*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::AttributeDescription *tmp;
--      ACE_NEW_RETURN (tmp, IR::AttributeDescription, 0);
-+      IR_AttributeDescription *tmp;
-+      ACE_NEW_RETURN (tmp, IR_AttributeDescription, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -60019,7 +59211,7 @@
-             IR::_tc_AttributeDescription,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::AttributeDescription::_tao_any_destructor
-+            IR_AttributeDescription::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -60037,7 +59229,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::OperationMode _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_OperationMode _tao_elem)
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -60048,18 +59240,16 @@
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::OperationMode &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_OperationMode &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_OperationMode, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_OperationMode, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -60077,7 +59267,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ParameterMode _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_ParameterMode _tao_elem)
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -60088,18 +59278,16 @@
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ParameterMode &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ParameterMode &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ParameterMode, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ParameterMode, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -60117,7 +59305,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::ParameterDescription &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_ParameterDescription &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -60128,7 +59316,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ParameterDescription *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ParameterDescription *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -60138,40 +59326,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ParameterDescription::_tao_any_destructor
-+      IR_ParameterDescription::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ParameterDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ParameterDescription *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::ParameterDescription*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_ParameterDescription*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ParameterDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ParameterDescription *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ParameterDescription, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ParameterDescription, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ParameterDescription*,
-+          const IR_ParameterDescription*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ParameterDescription *tmp;
--      ACE_NEW_RETURN (tmp, IR::ParameterDescription, 0);
-+      IR_ParameterDescription *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ParameterDescription, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -60182,7 +59368,7 @@
-             IR::_tc_ParameterDescription,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ParameterDescription::_tao_any_destructor
-+            IR_ParameterDescription::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -60202,7 +59388,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::ParDescriptionSeq &_tao_elem
-+    const IR_ParDescriptionSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -60216,7 +59402,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ParDescriptionSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ParDescriptionSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -60226,43 +59412,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ParDescriptionSeq::_tao_any_destructor
-+      IR_ParDescriptionSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ParDescriptionSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ParDescriptionSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::ParDescriptionSeq*&,
-+      const IR_ParDescriptionSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ParDescriptionSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ParDescriptionSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ParDescriptionSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ParDescriptionSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ParDescriptionSeq*,
-+          const IR_ParDescriptionSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ParDescriptionSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::ParDescriptionSeq, 0);
-+      IR_ParDescriptionSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ParDescriptionSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -60273,7 +59457,7 @@
-             IR::_tc_ParDescriptionSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ParDescriptionSeq::_tao_any_destructor
-+            IR_ParDescriptionSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -60293,7 +59477,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::ContextIdSeq &_tao_elem
-+    const IR_ContextIdSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -60307,7 +59491,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ContextIdSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ContextIdSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -60317,43 +59501,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ContextIdSeq::_tao_any_destructor
-+      IR_ContextIdSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ContextIdSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ContextIdSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::ContextIdSeq*&,
-+      const IR_ContextIdSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ContextIdSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ContextIdSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ContextIdSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ContextIdSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ContextIdSeq*,
-+          const IR_ContextIdSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ContextIdSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::ContextIdSeq, 0);
-+      IR_ContextIdSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ContextIdSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -60364,7 +59546,7 @@
-             IR::_tc_ContextIdSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ContextIdSeq::_tao_any_destructor
-+            IR_ContextIdSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -60382,7 +59564,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::OperationDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_OperationDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -60392,25 +59574,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::OperationDef::_duplicate (_tao_elem),
--        IR::OperationDef::_tao_any_destructor
-+        IR_OperationDef::_duplicate (_tao_elem),
-+        IR_OperationDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::OperationDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_OperationDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::OperationDef::_nil ();
-+    _tao_elem = IR_OperationDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_OperationDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_OperationDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -60421,29 +59601,29 @@
-           IR::_tc_OperationDef,
-           1,
-           _tao_elem,
--          IR::OperationDef::_tao_any_destructor
-+          IR_OperationDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::OperationDef::_nil ();
-+    _tao_elem = IR_OperationDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::OperationDef::_nil ();
-+  _tao_elem = IR_OperationDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::OperationDef,IR::OperationDef_var>;
-+    template class TAO_Object_Manager<IR_OperationDef,IR_OperationDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::OperationDef,IR::OperationDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_OperationDef,IR_OperationDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::OperationDescription &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_OperationDescription &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -60454,7 +59634,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::OperationDescription *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_OperationDescription *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -60464,40 +59644,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::OperationDescription::_tao_any_destructor
-+      IR_OperationDescription::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::OperationDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_OperationDescription *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::OperationDescription*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_OperationDescription*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::OperationDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_OperationDescription *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_OperationDescription, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_OperationDescription, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::OperationDescription*,
-+          const IR_OperationDescription*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::OperationDescription *tmp;
--      ACE_NEW_RETURN (tmp, IR::OperationDescription, 0);
-+      IR_OperationDescription *tmp;
-+      ACE_NEW_RETURN (tmp, IR_OperationDescription, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -60508,7 +59686,7 @@
-             IR::_tc_OperationDescription,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::OperationDescription::_tao_any_destructor
-+            IR_OperationDescription::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -60528,7 +59706,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::RepositoryIdSeq &_tao_elem
-+    const IR_RepositoryIdSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -60542,7 +59720,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::RepositoryIdSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_RepositoryIdSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -60552,43 +59730,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::RepositoryIdSeq::_tao_any_destructor
-+      IR_RepositoryIdSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::RepositoryIdSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_RepositoryIdSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::RepositoryIdSeq*&,
-+      const IR_RepositoryIdSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::RepositoryIdSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_RepositoryIdSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_RepositoryIdSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_RepositoryIdSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::RepositoryIdSeq*,
-+          const IR_RepositoryIdSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::RepositoryIdSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::RepositoryIdSeq, 0);
-+      IR_RepositoryIdSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_RepositoryIdSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -60599,7 +59775,7 @@
-             IR::_tc_RepositoryIdSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::RepositoryIdSeq::_tao_any_destructor
-+            IR_RepositoryIdSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -60619,7 +59795,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::OpDescriptionSeq &_tao_elem
-+    const IR_OpDescriptionSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -60633,7 +59809,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::OpDescriptionSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_OpDescriptionSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -60643,43 +59819,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::OpDescriptionSeq::_tao_any_destructor
-+      IR_OpDescriptionSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::OpDescriptionSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_OpDescriptionSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::OpDescriptionSeq*&,
-+      const IR_OpDescriptionSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::OpDescriptionSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_OpDescriptionSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_OpDescriptionSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_OpDescriptionSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::OpDescriptionSeq*,
-+          const IR_OpDescriptionSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::OpDescriptionSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::OpDescriptionSeq, 0);
-+      IR_OpDescriptionSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_OpDescriptionSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -60690,7 +59864,7 @@
-             IR::_tc_OpDescriptionSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::OpDescriptionSeq::_tao_any_destructor
-+            IR_OpDescriptionSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -60710,7 +59884,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::AttrDescriptionSeq &_tao_elem
-+    const IR_AttrDescriptionSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -60724,7 +59898,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::AttrDescriptionSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_AttrDescriptionSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -60734,43 +59908,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::AttrDescriptionSeq::_tao_any_destructor
-+      IR_AttrDescriptionSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::AttrDescriptionSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_AttrDescriptionSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::AttrDescriptionSeq*&,
-+      const IR_AttrDescriptionSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::AttrDescriptionSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_AttrDescriptionSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_AttrDescriptionSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_AttrDescriptionSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::AttrDescriptionSeq*,
-+          const IR_AttrDescriptionSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::AttrDescriptionSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::AttrDescriptionSeq, 0);
-+      IR_AttrDescriptionSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_AttrDescriptionSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -60781,7 +59953,7 @@
-             IR::_tc_AttrDescriptionSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::AttrDescriptionSeq::_tao_any_destructor
-+            IR_AttrDescriptionSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -60799,7 +59971,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::InterfaceDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_InterfaceDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -60809,25 +59981,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::InterfaceDef::_duplicate (_tao_elem),
--        IR::InterfaceDef::_tao_any_destructor
-+        IR_InterfaceDef::_duplicate (_tao_elem),
-+        IR_InterfaceDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::InterfaceDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_InterfaceDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::InterfaceDef::_nil ();
-+    _tao_elem = IR_InterfaceDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_InterfaceDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_InterfaceDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -60838,29 +60008,29 @@
-           IR::_tc_InterfaceDef,
-           1,
-           _tao_elem,
--          IR::InterfaceDef::_tao_any_destructor
-+          IR_InterfaceDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::InterfaceDef::_nil ();
-+    _tao_elem = IR_InterfaceDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::InterfaceDef::_nil ();
-+  _tao_elem = IR_InterfaceDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::InterfaceDef,IR::InterfaceDef_var>;
-+    template class TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::InterfaceDef,IR::InterfaceDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::InterfaceDescription &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_InterfaceDescription &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -60871,7 +60041,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::InterfaceDescription *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_InterfaceDescription *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -60881,40 +60051,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::InterfaceDescription::_tao_any_destructor
-+      IR_InterfaceDescription::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::InterfaceDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_InterfaceDescription *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::InterfaceDescription*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_InterfaceDescription*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::InterfaceDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_InterfaceDescription *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_InterfaceDescription, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_InterfaceDescription, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::InterfaceDescription*,
-+          const IR_InterfaceDescription*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::InterfaceDescription *tmp;
--      ACE_NEW_RETURN (tmp, IR::InterfaceDescription, 0);
-+      IR_InterfaceDescription *tmp;
-+      ACE_NEW_RETURN (tmp, IR_InterfaceDescription, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -60925,7 +60093,7 @@
-             IR::_tc_InterfaceDescription,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::InterfaceDescription::_tao_any_destructor
-+            IR_InterfaceDescription::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -60943,7 +60111,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::ValueMember &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_ValueMember &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -60954,7 +60122,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ValueMember *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ValueMember *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -60964,40 +60132,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ValueMember::_tao_any_destructor
-+      IR_ValueMember::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ValueMember *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueMember *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::ValueMember*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_ValueMember*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ValueMember *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ValueMember *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ValueMember, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ValueMember, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ValueMember*,
-+          const IR_ValueMember*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ValueMember *tmp;
--      ACE_NEW_RETURN (tmp, IR::ValueMember, 0);
-+      IR_ValueMember *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ValueMember, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -61008,7 +60174,7 @@
-             IR::_tc_ValueMember,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ValueMember::_tao_any_destructor
-+            IR_ValueMember::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -61028,7 +60194,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::ValueMemberSeq &_tao_elem
-+    const IR_ValueMemberSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -61042,7 +60208,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ValueMemberSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ValueMemberSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -61052,43 +60218,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ValueMemberSeq::_tao_any_destructor
-+      IR_ValueMemberSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ValueMemberSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueMemberSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::ValueMemberSeq*&,
-+      const IR_ValueMemberSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ValueMemberSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ValueMemberSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ValueMemberSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ValueMemberSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ValueMemberSeq*,
-+          const IR_ValueMemberSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ValueMemberSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::ValueMemberSeq, 0);
-+      IR_ValueMemberSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ValueMemberSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -61099,7 +60263,7 @@
-             IR::_tc_ValueMemberSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ValueMemberSeq::_tao_any_destructor
-+            IR_ValueMemberSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -61117,7 +60281,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ValueMemberDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_ValueMemberDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -61127,25 +60291,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::ValueMemberDef::_duplicate (_tao_elem),
--        IR::ValueMemberDef::_tao_any_destructor
-+        IR_ValueMemberDef::_duplicate (_tao_elem),
-+        IR_ValueMemberDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ValueMemberDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueMemberDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::ValueMemberDef::_nil ();
-+    _tao_elem = IR_ValueMemberDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ValueMemberDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ValueMemberDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -61156,29 +60318,29 @@
-           IR::_tc_ValueMemberDef,
-           1,
-           _tao_elem,
--          IR::ValueMemberDef::_tao_any_destructor
-+          IR_ValueMemberDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::ValueMemberDef::_nil ();
-+    _tao_elem = IR_ValueMemberDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::ValueMemberDef::_nil ();
-+  _tao_elem = IR_ValueMemberDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::ValueMemberDef,IR::ValueMemberDef_var>;
-+    template class TAO_Object_Manager<IR_ValueMemberDef,IR_ValueMemberDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::ValueMemberDef,IR::ValueMemberDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_ValueMemberDef,IR_ValueMemberDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ValueDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_ValueDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -61188,25 +60350,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::ValueDef::_duplicate (_tao_elem),
--        IR::ValueDef::_tao_any_destructor
-+        IR_ValueDef::_duplicate (_tao_elem),
-+        IR_ValueDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ValueDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::ValueDef::_nil ();
-+    _tao_elem = IR_ValueDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ValueDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ValueDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -61217,29 +60377,29 @@
-           IR::_tc_ValueDef,
-           1,
-           _tao_elem,
--          IR::ValueDef::_tao_any_destructor
-+          IR_ValueDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::ValueDef::_nil ();
-+    _tao_elem = IR_ValueDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::ValueDef::_nil ();
-+  _tao_elem = IR_ValueDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::ValueDef,IR::ValueDef_var>;
-+    template class TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::ValueDef,IR::ValueDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::ValueDescription &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_ValueDescription &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -61250,7 +60410,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ValueDescription *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ValueDescription *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -61260,40 +60420,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ValueDescription::_tao_any_destructor
-+      IR_ValueDescription::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ValueDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueDescription *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::ValueDescription*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_ValueDescription*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ValueDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ValueDescription *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ValueDescription, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ValueDescription, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ValueDescription*,
-+          const IR_ValueDescription*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ValueDescription *tmp;
--      ACE_NEW_RETURN (tmp, IR::ValueDescription, 0);
-+      IR_ValueDescription *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ValueDescription, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -61304,7 +60462,7 @@
-             IR::_tc_ValueDescription,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ValueDescription::_tao_any_destructor
-+            IR_ValueDescription::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -61322,7 +60480,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ValueBoxDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_ValueBoxDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -61332,25 +60490,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::ValueBoxDef::_duplicate (_tao_elem),
--        IR::ValueBoxDef::_tao_any_destructor
-+        IR_ValueBoxDef::_duplicate (_tao_elem),
-+        IR_ValueBoxDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ValueBoxDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueBoxDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::ValueBoxDef::_nil ();
-+    _tao_elem = IR_ValueBoxDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ValueBoxDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ValueBoxDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -61361,29 +60517,29 @@
-           IR::_tc_ValueBoxDef,
-           1,
-           _tao_elem,
--          IR::ValueBoxDef::_tao_any_destructor
-+          IR_ValueBoxDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::ValueBoxDef::_nil ();
-+    _tao_elem = IR_ValueBoxDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::ValueBoxDef::_nil ();
-+  _tao_elem = IR_ValueBoxDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::ValueBoxDef,IR::ValueBoxDef_var>;
-+    template class TAO_Object_Manager<IR_ValueBoxDef,IR_ValueBoxDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::ValueBoxDef,IR::ValueBoxDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_ValueBoxDef,IR_ValueBoxDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ProvidesDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_ProvidesDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -61393,25 +60549,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::ProvidesDef::_duplicate (_tao_elem),
--        IR::ProvidesDef::_tao_any_destructor
-+        IR_ProvidesDef::_duplicate (_tao_elem),
-+        IR_ProvidesDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ProvidesDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ProvidesDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::ProvidesDef::_nil ();
-+    _tao_elem = IR_ProvidesDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ProvidesDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -61422,29 +60576,29 @@
-           IR::_tc_ProvidesDef,
-           1,
-           _tao_elem,
--          IR::ProvidesDef::_tao_any_destructor
-+          IR_ProvidesDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::ProvidesDef::_nil ();
-+    _tao_elem = IR_ProvidesDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::ProvidesDef::_nil ();
-+  _tao_elem = IR_ProvidesDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var>;
-+    template class TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::ProvidesDescription &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_ProvidesDescription &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -61455,7 +60609,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ProvidesDescription *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ProvidesDescription *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -61465,40 +60619,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ProvidesDescription::_tao_any_destructor
-+      IR_ProvidesDescription::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ProvidesDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ProvidesDescription *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::ProvidesDescription*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_ProvidesDescription*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ProvidesDescription *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescription, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ProvidesDescription, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ProvidesDescription*,
-+          const IR_ProvidesDescription*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ProvidesDescription *tmp;
--      ACE_NEW_RETURN (tmp, IR::ProvidesDescription, 0);
-+      IR_ProvidesDescription *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ProvidesDescription, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -61509,7 +60661,7 @@
-             IR::_tc_ProvidesDescription,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ProvidesDescription::_tao_any_destructor
-+            IR_ProvidesDescription::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -61527,7 +60679,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::UsesDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_UsesDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -61537,25 +60689,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::UsesDef::_duplicate (_tao_elem),
--        IR::UsesDef::_tao_any_destructor
-+        IR_UsesDef::_duplicate (_tao_elem),
-+        IR_UsesDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UsesDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UsesDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::UsesDef::_nil ();
-+    _tao_elem = IR_UsesDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_UsesDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -61566,29 +60716,29 @@
-           IR::_tc_UsesDef,
-           1,
-           _tao_elem,
--          IR::UsesDef::_tao_any_destructor
-+          IR_UsesDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::UsesDef::_nil ();
-+    _tao_elem = IR_UsesDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::UsesDef::_nil ();
-+  _tao_elem = IR_UsesDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var>;
-+    template class TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::UsesDescription &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_UsesDescription &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -61599,7 +60749,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::UsesDescription *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_UsesDescription *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -61609,40 +60759,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::UsesDescription::_tao_any_destructor
-+      IR_UsesDescription::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UsesDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UsesDescription *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::UsesDescription*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_UsesDescription*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_UsesDescription *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescription, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_UsesDescription, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::UsesDescription*,
-+          const IR_UsesDescription*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::UsesDescription *tmp;
--      ACE_NEW_RETURN (tmp, IR::UsesDescription, 0);
-+      IR_UsesDescription *tmp;
-+      ACE_NEW_RETURN (tmp, IR_UsesDescription, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -61653,7 +60801,7 @@
-             IR::_tc_UsesDescription,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::UsesDescription::_tao_any_destructor
-+            IR_UsesDescription::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -61673,7 +60821,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::ProvidesDescSeq &_tao_elem
-+    const IR_ProvidesDescSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -61687,7 +60835,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ProvidesDescSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ProvidesDescSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -61697,43 +60845,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ProvidesDescSeq::_tao_any_destructor
-+      IR_ProvidesDescSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ProvidesDescSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ProvidesDescSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::ProvidesDescSeq*&,
-+      const IR_ProvidesDescSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDescSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ProvidesDescSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ProvidesDescSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ProvidesDescSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ProvidesDescSeq*,
-+          const IR_ProvidesDescSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ProvidesDescSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::ProvidesDescSeq, 0);
-+      IR_ProvidesDescSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ProvidesDescSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -61744,7 +60890,7 @@
-             IR::_tc_ProvidesDescSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ProvidesDescSeq::_tao_any_destructor
-+            IR_ProvidesDescSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -61764,7 +60910,7 @@
- 
- void operator<<= (
-     CORBA::Any &_tao_any,
--    const IR::UsesDescSeq &_tao_elem
-+    const IR_UsesDescSeq &_tao_elem
-   ) // copying
- {
-   TAO_OutputCDR stream;
-@@ -61778,7 +60924,7 @@
-   }
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::UsesDescSeq *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_UsesDescSeq *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -61788,43 +60934,41 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::UsesDescSeq::_tao_any_destructor
-+      IR_UsesDescSeq::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UsesDescSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UsesDescSeq *&_tao_elem)
- {
-   return _tao_any >>= ACE_const_cast(
--      const IR::UsesDescSeq*&,
-+      const IR_UsesDescSeq*&,
-       _tao_elem
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDescSeq *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_UsesDescSeq *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_UsesDescSeq, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_UsesDescSeq, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::UsesDescSeq*,
-+          const IR_UsesDescSeq*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::UsesDescSeq *tmp;
--      ACE_NEW_RETURN (tmp, IR::UsesDescSeq, 0);
-+      IR_UsesDescSeq *tmp;
-+      ACE_NEW_RETURN (tmp, IR_UsesDescSeq, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -61835,7 +60979,7 @@
-             IR::_tc_UsesDescSeq,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::UsesDescSeq::_tao_any_destructor
-+            IR_UsesDescSeq::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -61853,7 +60997,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::EventDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_EventDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -61863,25 +61007,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::EventDef::_duplicate (_tao_elem),
--        IR::EventDef::_tao_any_destructor
-+        IR_EventDef::_duplicate (_tao_elem),
-+        IR_EventDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EventDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EventDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::EventDef::_nil ();
-+    _tao_elem = IR_EventDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_EventDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_EventDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -61892,29 +61034,29 @@
-           IR::_tc_EventDef,
-           1,
-           _tao_elem,
--          IR::EventDef::_tao_any_destructor
-+          IR_EventDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::EventDef::_nil ();
-+    _tao_elem = IR_EventDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::EventDef::_nil ();
-+  _tao_elem = IR_EventDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::EventDef,IR::EventDef_var>;
-+    template class TAO_Object_Manager<IR_EventDef,IR_EventDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::EventDef,IR::EventDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_EventDef,IR_EventDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::EventDescription &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_EventDescription &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -61925,7 +61067,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::EventDescription *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_EventDescription *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -61935,40 +61077,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::EventDescription::_tao_any_destructor
-+      IR_EventDescription::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EventDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EventDescription *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::EventDescription*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_EventDescription*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::EventDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_EventDescription *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_EventDescription, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_EventDescription, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::EventDescription*,
-+          const IR_EventDescription*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::EventDescription *tmp;
--      ACE_NEW_RETURN (tmp, IR::EventDescription, 0);
-+      IR_EventDescription *tmp;
-+      ACE_NEW_RETURN (tmp, IR_EventDescription, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -61979,7 +61119,7 @@
-             IR::_tc_EventDescription,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::EventDescription::_tao_any_destructor
-+            IR_EventDescription::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -61997,7 +61137,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::EmitsDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_EmitsDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -62007,25 +61147,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::EmitsDef::_duplicate (_tao_elem),
--        IR::EmitsDef::_tao_any_destructor
-+        IR_EmitsDef::_duplicate (_tao_elem),
-+        IR_EmitsDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EmitsDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EmitsDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::EmitsDef::_nil ();
-+    _tao_elem = IR_EmitsDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_EmitsDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_EmitsDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -62036,29 +61174,29 @@
-           IR::_tc_EmitsDef,
-           1,
-           _tao_elem,
--          IR::EmitsDef::_tao_any_destructor
-+          IR_EmitsDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::EmitsDef::_nil ();
-+    _tao_elem = IR_EmitsDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::EmitsDef::_nil ();
-+  _tao_elem = IR_EmitsDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var>;
-+    template class TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::PublishesDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_PublishesDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -62068,25 +61206,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::PublishesDef::_duplicate (_tao_elem),
--        IR::PublishesDef::_tao_any_destructor
-+        IR_PublishesDef::_duplicate (_tao_elem),
-+        IR_PublishesDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PublishesDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PublishesDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::PublishesDef::_nil ();
-+    _tao_elem = IR_PublishesDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_PublishesDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_PublishesDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -62097,29 +61233,29 @@
-           IR::_tc_PublishesDef,
-           1,
-           _tao_elem,
--          IR::PublishesDef::_tao_any_destructor
-+          IR_PublishesDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::PublishesDef::_nil ();
-+    _tao_elem = IR_PublishesDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::PublishesDef::_nil ();
-+  _tao_elem = IR_PublishesDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var>;
-+    template class TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ConsumesDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_ConsumesDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -62129,25 +61265,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::ConsumesDef::_duplicate (_tao_elem),
--        IR::ConsumesDef::_tao_any_destructor
-+        IR_ConsumesDef::_duplicate (_tao_elem),
-+        IR_ConsumesDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ConsumesDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ConsumesDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::ConsumesDef::_nil ();
-+    _tao_elem = IR_ConsumesDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ConsumesDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ConsumesDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -62158,29 +61292,29 @@
-           IR::_tc_ConsumesDef,
-           1,
-           _tao_elem,
--          IR::ConsumesDef::_tao_any_destructor
-+          IR_ConsumesDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::ConsumesDef::_nil ();
-+    _tao_elem = IR_ConsumesDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::ConsumesDef::_nil ();
-+  _tao_elem = IR_ConsumesDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var>;
-+    template class TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ComponentDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_ComponentDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -62190,25 +61324,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::ComponentDef::_duplicate (_tao_elem),
--        IR::ComponentDef::_tao_any_destructor
-+        IR_ComponentDef::_duplicate (_tao_elem),
-+        IR_ComponentDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ComponentDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ComponentDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::ComponentDef::_nil ();
-+    _tao_elem = IR_ComponentDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ComponentDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -62219,29 +61351,29 @@
-           IR::_tc_ComponentDef,
-           1,
-           _tao_elem,
--          IR::ComponentDef::_tao_any_destructor
-+          IR_ComponentDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::ComponentDef::_nil ();
-+    _tao_elem = IR_ComponentDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::ComponentDef::_nil ();
-+  _tao_elem = IR_ComponentDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var>;
-+    template class TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::ComponentDescription &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_ComponentDescription &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -62252,7 +61384,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::ComponentDescription *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_ComponentDescription *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -62262,40 +61394,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::ComponentDescription::_tao_any_destructor
-+      IR_ComponentDescription::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ComponentDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ComponentDescription *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::ComponentDescription*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_ComponentDescription*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ComponentDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ComponentDescription *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_ComponentDescription, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_ComponentDescription, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::ComponentDescription*,
-+          const IR_ComponentDescription*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::ComponentDescription *tmp;
--      ACE_NEW_RETURN (tmp, IR::ComponentDescription, 0);
-+      IR_ComponentDescription *tmp;
-+      ACE_NEW_RETURN (tmp, IR_ComponentDescription, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -62306,7 +61436,7 @@
-             IR::_tc_ComponentDescription,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::ComponentDescription::_tao_any_destructor
-+            IR_ComponentDescription::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -62324,7 +61454,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::PrimaryKeyDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_PrimaryKeyDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -62334,25 +61464,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::PrimaryKeyDef::_duplicate (_tao_elem),
--        IR::PrimaryKeyDef::_tao_any_destructor
-+        IR_PrimaryKeyDef::_duplicate (_tao_elem),
-+        IR_PrimaryKeyDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PrimaryKeyDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PrimaryKeyDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::PrimaryKeyDef::_nil ();
-+    _tao_elem = IR_PrimaryKeyDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_PrimaryKeyDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -62363,29 +61491,29 @@
-           IR::_tc_PrimaryKeyDef,
-           1,
-           _tao_elem,
--          IR::PrimaryKeyDef::_tao_any_destructor
-+          IR_PrimaryKeyDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::PrimaryKeyDef::_nil ();
-+    _tao_elem = IR_PrimaryKeyDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::PrimaryKeyDef::_nil ();
-+  _tao_elem = IR_PrimaryKeyDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::PrimaryKeyDef,IR::PrimaryKeyDef_var>;
-+    template class TAO_Object_Manager<IR_PrimaryKeyDef,IR_PrimaryKeyDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::PrimaryKeyDef,IR::PrimaryKeyDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_PrimaryKeyDef,IR_PrimaryKeyDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::PrimaryKeyDescription &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_PrimaryKeyDescription &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -62396,7 +61524,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::PrimaryKeyDescription *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_PrimaryKeyDescription *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -62406,40 +61534,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::PrimaryKeyDescription::_tao_any_destructor
-+      IR_PrimaryKeyDescription::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PrimaryKeyDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PrimaryKeyDescription *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::PrimaryKeyDescription*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_PrimaryKeyDescription*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::PrimaryKeyDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_PrimaryKeyDescription *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_PrimaryKeyDescription, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_PrimaryKeyDescription, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::PrimaryKeyDescription*,
-+          const IR_PrimaryKeyDescription*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::PrimaryKeyDescription *tmp;
--      ACE_NEW_RETURN (tmp, IR::PrimaryKeyDescription, 0);
-+      IR_PrimaryKeyDescription *tmp;
-+      ACE_NEW_RETURN (tmp, IR_PrimaryKeyDescription, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -62450,7 +61576,7 @@
-             IR::_tc_PrimaryKeyDescription,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::PrimaryKeyDescription::_tao_any_destructor
-+            IR_PrimaryKeyDescription::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -62468,7 +61594,7 @@
-   return 0;
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::FactoryDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_FactoryDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -62478,25 +61604,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::FactoryDef::_duplicate (_tao_elem),
--        IR::FactoryDef::_tao_any_destructor
-+        IR_FactoryDef::_duplicate (_tao_elem),
-+        IR_FactoryDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FactoryDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_FactoryDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::FactoryDef::_nil ();
-+    _tao_elem = IR_FactoryDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_FactoryDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_FactoryDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -62507,29 +61631,29 @@
-           IR::_tc_FactoryDef,
-           1,
-           _tao_elem,
--          IR::FactoryDef::_tao_any_destructor
-+          IR_FactoryDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::FactoryDef::_nil ();
-+    _tao_elem = IR_FactoryDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::FactoryDef::_nil ();
-+  _tao_elem = IR_FactoryDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var>;
-+    template class TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::FinderDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_FinderDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -62539,25 +61663,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::FinderDef::_duplicate (_tao_elem),
--        IR::FinderDef::_tao_any_destructor
-+        IR_FinderDef::_duplicate (_tao_elem),
-+        IR_FinderDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FinderDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_FinderDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::FinderDef::_nil ();
-+    _tao_elem = IR_FinderDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_FinderDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_FinderDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -62568,29 +61690,29 @@
-           IR::_tc_FinderDef,
-           1,
-           _tao_elem,
--          IR::FinderDef::_tao_any_destructor
-+          IR_FinderDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::FinderDef::_nil ();
-+    _tao_elem = IR_FinderDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::FinderDef::_nil ();
-+  _tao_elem = IR_FinderDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var>;
-+    template class TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, IR::HomeDef_ptr _tao_elem)
-+void operator<<= (CORBA::Any &_tao_any, IR_HomeDef_ptr _tao_elem)
- {
-   TAO_OutputCDR stream;
-   if (stream << _tao_elem)
-@@ -62600,25 +61722,23 @@
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
--        IR::HomeDef::_duplicate (_tao_elem),
--        IR::HomeDef::_tao_any_destructor
-+        IR_HomeDef::_duplicate (_tao_elem),
-+        IR_HomeDef::_tao_any_destructor
-       );
-   }
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::HomeDef_ptr &_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_HomeDef_ptr &_tao_elem)
- {
-   ACE_TRY_NEW_ENV
-   {
--    _tao_elem = IR::HomeDef::_nil ();
-+    _tao_elem = IR_HomeDef::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDef, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_HomeDef, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -62629,29 +61749,29 @@
-           IR::_tc_HomeDef,
-           1,
-           _tao_elem,
--          IR::HomeDef::_tao_any_destructor
-+          IR_HomeDef::_tao_any_destructor
-         );
-       return 1;
-     }
-   }
-   ACE_CATCHANY
-   {
--    _tao_elem = IR::HomeDef::_nil ();
-+    _tao_elem = IR_HomeDef::_nil ();
-     return 0;
-   }
-   ACE_ENDTRY;
--  _tao_elem = IR::HomeDef::_nil ();
-+  _tao_elem = IR_HomeDef::_nil ();
-   return 0;
- }
- 
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var>;
-+    template class TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var>;
-   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var>
-+  #  pragma instantiate TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
--void operator<<= (CORBA::Any &_tao_any, const IR::HomeDescription &_tao_elem) // copying
-+void operator<<= (CORBA::Any &_tao_any, const IR_HomeDescription &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -62662,7 +61782,7 @@
-     );
- }
- 
--void operator<<= (CORBA::Any &_tao_any, IR::HomeDescription *_tao_elem) // non copying
-+void operator<<= (CORBA::Any &_tao_any, IR_HomeDescription *_tao_elem) // non copying
- {
-   TAO_OutputCDR stream;
-   stream << *_tao_elem;
-@@ -62672,40 +61792,38 @@
-       stream.begin (),
-       1,
-       _tao_elem,
--      IR::HomeDescription::_tao_any_destructor
-+      IR_HomeDescription::_tao_any_destructor
-     );
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::HomeDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_HomeDescription *&_tao_elem)
- {
--  return _tao_any >>= ACE_const_cast(const IR::HomeDescription*&,_tao_elem);
-+  return _tao_any >>= ACE_const_cast(const IR_HomeDescription*&,_tao_elem);
- }
- 
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::HomeDescription *&_tao_elem)
-+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_HomeDescription *&_tao_elem)
- {
-   _tao_elem = 0;
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (IR::_tc_HomeDescription, ACE_TRY_ENV);
-+    if (!type->equivalent (IR::_tc_HomeDescription, ACE_TRY_ENV)) // not equal
-+      {
-+        return 0;
-+      }
-     ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
--          const IR::HomeDescription*,
-+          const IR_HomeDescription*,
-           _tao_any.value ()
-         );
-       return 1;
-     }
-     else
-     {
--      IR::HomeDescription *tmp;
--      ACE_NEW_RETURN (tmp, IR::HomeDescription, 0);
-+      IR_HomeDescription *tmp;
-+      ACE_NEW_RETURN (tmp, IR_HomeDescription, 0);
-       TAO_InputCDR stream (
-           _tao_any._tao_get_cdr (),
-           _tao_any._tao_byte_order ()
-@@ -62716,7 +61834,7 @@
-             IR::_tc_HomeDescription,
-             1,
-             ACE_static_cast (void *, tmp),
--            IR::HomeDescription::_tao_any_destructor
-+            IR_HomeDescription::_tao_any_destructor
-           );
-         _tao_elem = tmp;
-         return 1;
-@@ -62736,7 +61854,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::InterfaceDefSeq &_tao_sequence
-+    const IR_InterfaceDefSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -62754,7 +61872,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::InterfaceDefSeq &_tao_sequence
-+    IR_InterfaceDefSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -62778,7 +61896,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ValueDefSeq &_tao_sequence
-+    const IR_ValueDefSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -62796,7 +61914,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::ValueDefSeq &_tao_sequence
-+    IR_ValueDefSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -62820,7 +61938,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ComponentDefSeq &_tao_sequence
-+    const IR_ComponentDefSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -62838,7 +61956,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::ComponentDefSeq &_tao_sequence
-+    IR_ComponentDefSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -62862,7 +61980,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ProvidesDefSeq &_tao_sequence
-+    const IR_ProvidesDefSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -62880,7 +61998,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::ProvidesDefSeq &_tao_sequence
-+    IR_ProvidesDefSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -62904,7 +62022,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::UsesDefSeq &_tao_sequence
-+    const IR_UsesDefSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -62922,7 +62040,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::UsesDefSeq &_tao_sequence
-+    IR_UsesDefSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -62946,7 +62064,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::HomeDefSeq &_tao_sequence
-+    const IR_HomeDefSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -62964,7 +62082,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::HomeDefSeq &_tao_sequence
-+    IR_HomeDefSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -62988,7 +62106,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::EmitsDefSeq &_tao_sequence
-+    const IR_EmitsDefSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63006,7 +62124,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::EmitsDefSeq &_tao_sequence
-+    IR_EmitsDefSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63030,7 +62148,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::PublishesDefSeq &_tao_sequence
-+    const IR_PublishesDefSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63048,7 +62166,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::PublishesDefSeq &_tao_sequence
-+    IR_PublishesDefSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63072,7 +62190,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ConsumesDefSeq &_tao_sequence
-+    const IR_ConsumesDefSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63090,7 +62208,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::ConsumesDefSeq &_tao_sequence
-+    IR_ConsumesDefSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63114,7 +62232,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::FactoryDefSeq &_tao_sequence
-+    const IR_FactoryDefSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63132,7 +62250,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::FactoryDefSeq &_tao_sequence
-+    IR_FactoryDefSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63156,7 +62274,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::FinderDefSeq &_tao_sequence
-+    const IR_FinderDefSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63174,7 +62292,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::FinderDefSeq &_tao_sequence
-+    IR_FinderDefSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63198,7 +62316,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ContainedSeq &_tao_sequence
-+    const IR_ContainedSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63216,7 +62334,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::ContainedSeq &_tao_sequence
-+    IR_ContainedSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63240,7 +62358,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::StructMemberSeq &_tao_sequence
-+    const IR_StructMemberSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63258,7 +62376,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::StructMemberSeq &_tao_sequence
-+    IR_StructMemberSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63282,7 +62400,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::InitializerSeq &_tao_sequence
-+    const IR_InitializerSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63300,7 +62418,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::InitializerSeq &_tao_sequence
-+    IR_InitializerSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63324,7 +62442,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::UnionMemberSeq &_tao_sequence
-+    const IR_UnionMemberSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63342,7 +62460,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::UnionMemberSeq &_tao_sequence
-+    IR_UnionMemberSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63366,7 +62484,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::EnumMemberSeq &_tao_sequence
-+    const IR_EnumMemberSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63384,7 +62502,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::EnumMemberSeq &_tao_sequence
-+    IR_EnumMemberSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63408,7 +62526,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::Container::DescriptionSeq &_tao_sequence
-+    const IR_Container::DescriptionSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63426,7 +62544,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::Container::DescriptionSeq &_tao_sequence
-+    IR_Container::DescriptionSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63450,7 +62568,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ExceptionDefSeq &_tao_sequence
-+    const IR_ExceptionDefSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63468,7 +62586,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::ExceptionDefSeq &_tao_sequence
-+    IR_ExceptionDefSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63492,7 +62610,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ExcDescriptionSeq &_tao_sequence
-+    const IR_ExcDescriptionSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63510,7 +62628,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::ExcDescriptionSeq &_tao_sequence
-+    IR_ExcDescriptionSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63534,7 +62652,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ParDescriptionSeq &_tao_sequence
-+    const IR_ParDescriptionSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63552,7 +62670,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::ParDescriptionSeq &_tao_sequence
-+    IR_ParDescriptionSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63576,7 +62694,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ContextIdSeq &_tao_sequence
-+    const IR_ContextIdSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63594,7 +62712,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::ContextIdSeq &_tao_sequence
-+    IR_ContextIdSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63618,7 +62736,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::RepositoryIdSeq &_tao_sequence
-+    const IR_RepositoryIdSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63636,7 +62754,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::RepositoryIdSeq &_tao_sequence
-+    IR_RepositoryIdSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63660,7 +62778,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::OpDescriptionSeq &_tao_sequence
-+    const IR_OpDescriptionSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63678,7 +62796,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::OpDescriptionSeq &_tao_sequence
-+    IR_OpDescriptionSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63702,7 +62820,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::AttrDescriptionSeq &_tao_sequence
-+    const IR_AttrDescriptionSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63720,7 +62838,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::AttrDescriptionSeq &_tao_sequence
-+    IR_AttrDescriptionSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63744,7 +62862,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ValueMemberSeq &_tao_sequence
-+    const IR_ValueMemberSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63762,7 +62880,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::ValueMemberSeq &_tao_sequence
-+    IR_ValueMemberSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63786,7 +62904,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ProvidesDescSeq &_tao_sequence
-+    const IR_ProvidesDescSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63804,7 +62922,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::ProvidesDescSeq &_tao_sequence
-+    IR_ProvidesDescSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
-@@ -63828,7 +62946,7 @@
- 
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
--    const IR::UsesDescSeq &_tao_sequence
-+    const IR_UsesDescSeq &_tao_sequence
-   )
- {
-   if (strm << _tao_sequence.length ())
-@@ -63846,7 +62964,7 @@
- 
- CORBA::Boolean operator>> (
-     TAO_InputCDR &strm,
--    IR::UsesDescSeq &_tao_sequence
-+    IR_UsesDescSeq &_tao_sequence
-   )
- {
-   CORBA::ULong _tao_seq_len;
diff --git a/TAO/tao/IFR_Client/diffs/InterfaceC.h.diff b/TAO/tao/IFR_Client/diffs/InterfaceC.h.diff
deleted file mode 100644
index 40b7f3da9de..00000000000
--- a/TAO/tao/IFR_Client/diffs/InterfaceC.h.diff
+++ /dev/null
@@ -1,26656 +0,0 @@
---- orig/InterfaceC.h	Fri Mar 09 00:47:29 2001
-+++ InterfaceC.h	Thu Mar 01 15:33:59 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,22 +19,27 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--#ifndef _TAO_IDL_ORIG_INTERFACEC_H_
--#define _TAO_IDL_ORIG_INTERFACEC_H_
--
-+#ifndef TAO_IDL_INTERFACEC_H
-+#define TAO_IDL_INTERFACEC_H
- #include "ace/pre.h"
--#include "tao/corba.h"
-+
-+#include "ifrfwd.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
--#include "ifr_client_export.h"
-+#include "tao/TAO_Singleton.h"
-+#include "tao/Any.h"
-+#include "tao/Object.h"
-+#include "tao/Managed_Types.h"
-+#include "tao/Sequence.h"
-+#include "tao/Typecode.h"
-+#include "tao/Remote_Object_Proxy_Impl.h"
- 
--#if defined (TAO_EXPORT_MACRO)
--#undef TAO_EXPORT_MACRO
--#endif
--#define TAO_EXPORT_MACRO TAO_IFR_Client_Export
-+#if (TAO_HAS_INTERCEPTORS == 1)
-+  #include "tao/ClientRequestInfo.h"
-+#endif /* TAO_HAS_INTERCEPTORS == 1 */
- 
- #if defined (TAO_EXPORT_NESTED_CLASSES)
- #  if defined (TAO_EXPORT_NESTED_MACRO)
-@@ -54,175 +59,84 @@
- #pragma option push -w-rvl -w-rch -w-ccc -w-inl
- #endif /* __BORLANDC__ */
- 
--TAO_NAMESPACE  IR
--{
--  enum DefinitionKind
--  {
--        dk_none,
--        dk_all,
--        dk_Attribute,
--        dk_Constant,
--        dk_Exception,
--        dk_Interface,
--        dk_Module,
--        dk_Operation,
--        dk_Typedef,
--        dk_Alias,
--        dk_Struct,
--        dk_Union,
--        dk_Enum,
--        dk_Primitive,
--        dk_String,
--        dk_Sequence,
--        dk_Array,
--        dk_Repository,
--        dk_Wstring,
--        dk_Fixed,
--        dk_Value,
--        dk_ValueBox,
--        dk_ValueMember,
--        dk_Native,
--        dk_Component,
--        dk_Home,
--        dk_Factory,
--        dk_Finder,
--        dk_PrimaryKey,
--        dk_Emits,
--        dk_Publishes,
--        dk_Consumes,
--        dk_Provides,
--        dk_Uses    
--  };
--  typedef DefinitionKind &DefinitionKind_out;
--  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_DefinitionKind;
--
--
--}
--TAO_NAMESPACE_CLOSE // module IR
--
--TAO_NAMESPACE  CORBA
--{
--  typedef char * Identifier;
--  typedef CORBA::String_var Identifier_var;
--  typedef CORBA::String_out Identifier_out;
--    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Identifier;
--
--  typedef char * ScopedName;
--  typedef CORBA::String_var ScopedName_var;
--  typedef CORBA::String_out ScopedName_out;
--    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ScopedName;
--
--  typedef char * RepositoryId;
--  typedef CORBA::String_var RepositoryId_var;
--  typedef CORBA::String_out RepositoryId_out;
--    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryId;
--
--
--#if !defined (_CORBA_IROBJECT___PTR_CH_)
--#define _CORBA_IROBJECT___PTR_CH_
--
--  class IRObject;
--  typedef IRObject *IRObject_ptr;
--  
--#endif /* end #if !defined */
--
--
--#if !defined (_CORBA_IROBJECT___VAR_CH_)
--#define _CORBA_IROBJECT___VAR_CH_
--
--  class TAO_IFR_Client_Export IRObject_var : public TAO_Base_var
-+  class TAO_IFR_Client_Export CORBA_IRObject_var : public TAO_Base_var
-   {
-   public:
--    IRObject_var (void); // default constructor
--    IRObject_var (IRObject_ptr p) : ptr_ (p) {} 
--    IRObject_var (const IRObject_var &); // copy constructor
--    ~IRObject_var (void); // destructor
-+    CORBA_IRObject_var (void); // default constructor
-+    CORBA_IRObject_var (CORBA_IRObject_ptr p) : ptr_ (p) {}
-+    CORBA_IRObject_var (const CORBA_IRObject_var &); // copy constructor
-+    ~CORBA_IRObject_var (void); // destructor
-     
--    IRObject_var &operator= (IRObject_ptr);
--    IRObject_var &operator= (const IRObject_var &);
--    IRObject_ptr operator-> (void) const;
-+    CORBA_IRObject_var &operator= (CORBA_IRObject_ptr);
-+    CORBA_IRObject_var &operator= (const CORBA_IRObject_var &);
-+    CORBA_IRObject_ptr operator-> (void) const;
-     
--    operator const IRObject_ptr &() const;
--    operator IRObject_ptr &();
-+    operator const CORBA_IRObject_ptr &() const;
-+    operator CORBA_IRObject_ptr &();
-     // in, inout, out, _retn 
--    IRObject_ptr in (void) const;
--    IRObject_ptr &inout (void);
--    IRObject_ptr &out (void);
--    IRObject_ptr _retn (void);
--    IRObject_ptr ptr (void) const;
-+    CORBA_IRObject_ptr in (void) const;
-+    CORBA_IRObject_ptr &inout (void);
-+    CORBA_IRObject_ptr &out (void);
-+    CORBA_IRObject_ptr _retn (void);
-+    CORBA_IRObject_ptr ptr (void) const;
- 
-   private:
--    IRObject_ptr ptr_;
-+    CORBA_IRObject_ptr ptr_;
-     // Unimplemented - prevents widening assignment.
--    IRObject_var (const TAO_Base_var &rhs);
--    IRObject_var &operator= (const TAO_Base_var &rhs);
-+    CORBA_IRObject_var (const TAO_Base_var &rhs);
-+    CORBA_IRObject_var &operator= (const TAO_Base_var &rhs);
-   };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_CORBA_IROBJECT___OUT_CH_)
--#define _CORBA_IROBJECT___OUT_CH_
--
--  class TAO_IFR_Client_Export IRObject_out
-+  class TAO_IFR_Client_Export CORBA_IRObject_out
-   {
-   public:
--    IRObject_out (IRObject_ptr &);
--    IRObject_out (IRObject_var &);
--    IRObject_out (const IRObject_out &);
--    IRObject_out &operator= (const IRObject_out &);
--    IRObject_out &operator= (const IRObject_var &);
--    IRObject_out &operator= (IRObject_ptr);
--    operator IRObject_ptr &();
--    IRObject_ptr &ptr (void);
--    IRObject_ptr operator-> (void);
-+    CORBA_IRObject_out (CORBA_IRObject_ptr &);
-+    CORBA_IRObject_out (CORBA_IRObject_var &);
-+    CORBA_IRObject_out (const CORBA_IRObject_out &);
-+    CORBA_IRObject_out &operator= (const CORBA_IRObject_out &);
-+    CORBA_IRObject_out &operator= (const CORBA_IRObject_var &);
-+    CORBA_IRObject_out &operator= (CORBA_IRObject_ptr);
-+    operator CORBA_IRObject_ptr &();
-+    CORBA_IRObject_ptr &ptr (void);
-+    CORBA_IRObject_ptr operator-> (void);
-     
-   private:
--    IRObject_ptr &ptr_;
-+    CORBA_IRObject_ptr &ptr_;
-   };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_CORBA_IROBJECT_CH_)
--#define _CORBA_IROBJECT_CH_
--
--// Forward Classes Declaration
-   class _TAO_IRObject_Proxy_Impl;
-   class _TAO_IRObject_Remote_Proxy_Impl;
-   class _TAO_IRObject_Proxy_Broker;
-   class _TAO_IRObject_Remote_Proxy_Broker;
-   
--  class TAO_IFR_Client_Export IRObject : public virtual CORBA_Object
-+  class TAO_IFR_Client_Export CORBA_IRObject : public virtual CORBA_Object
-   {
-   public:
-   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--    typedef IRObject_ptr _ptr_type;
--    typedef IRObject_var _var_type;
-+    typedef CORBA_IRObject_ptr _ptr_type;
-+    typedef CORBA_IRObject_var _var_type;
-   #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-     // the static operations
--    static IRObject_ptr _duplicate (IRObject_ptr obj);
--    static IRObject_ptr _narrow (
-+    static CORBA_IRObject_ptr _duplicate (CORBA_IRObject_ptr obj);
-+    static CORBA_IRObject_ptr _narrow (
-         CORBA::Object_ptr obj,
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       );
--    static IRObject_ptr _unchecked_narrow (
-+    static CORBA_IRObject_ptr _unchecked_narrow (
-         CORBA::Object_ptr obj,
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       );
--    static IRObject_ptr _nil (void)
-+    static CORBA_IRObject_ptr _nil (void)
-       {
--        return (IRObject_ptr)0;
-+        return (CORBA_IRObject_ptr)0;
-       }
- 
-     static void _tao_any_destructor (void*);
- 
--    virtual IR::DefinitionKind def_kind (
-+    virtual IR_DefinitionKind def_kind (
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       )
-@@ -251,14 +165,14 @@
-     _TAO_IRObject_Proxy_Broker *the_TAO_IRObject_Proxy_Broker_;
-     
-   protected:
--    IRObject (int collocated = 0);
-+    CORBA_IRObject (int collocated = 0);
-     
-     protected:
-       // This methods travese the inheritance tree and set the
-       // parents piece of the given class in the right mode
-       virtual void CORBA_IRObject_setup_collocation (int collocated);
-       
--      IRObject (
-+    CORBA_IRObject (
-         TAO_Stub *objref, 
-         CORBA::Boolean _tao_collocated = 0,
-         TAO_Abstract_ServantBase *servant = 0
-@@ -268,10 +182,10 @@
-       friend class _TAO_IRObject_ThruPOA_Proxy_Impl;
-       friend class _TAO_IRObject_Direct_Proxy_Impl;
-     
--    virtual ~IRObject (void);
-+    virtual ~CORBA_IRObject (void);
-   private:
--    IRObject (const IRObject &);
--    void operator= (const IRObject &);    
-+    CORBA_IRObject (const CORBA_IRObject &);
-+    void operator= (const CORBA_IRObject &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-     // Generation of interceptors related RequestInfo classes per operation.
-@@ -281,7 +195,7 @@
-     class TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get : public TAO_ClientRequestInfo
-     {
-     public:
--      friend class CORBA::IRObject;
-+      friend class CORBA_IRObject;
-       
-       friend class _TAO_IRObject_Remote_Proxy_Impl;
-       friend class _TAO_IRObject_ThruPOA_Proxy_Impl;
-@@ -315,15 +229,15 @@
-   private:
-     TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (const TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get &);
-     void operator= (const TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get &);
--    void result (IR::DefinitionKind result);
-+    void result (IR_DefinitionKind result);
-     // update the result 
--    IR::DefinitionKind _result;
-+    IR_DefinitionKind _result;
-   };
-   
-   class TAO_ClientRequestInfo_CORBA_IRObject_destroy : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class CORBA::IRObject;
-+    friend class CORBA_IRObject;
-     
-     friend class _TAO_IRObject_Remote_Proxy_Impl;
-     friend class _TAO_IRObject_ThruPOA_Proxy_Impl;
-@@ -364,7 +278,6 @@
- 
- };
- 
--
- // The Proxy Implementations are used by each interface to
- // perform a call. Each different implementation encapsulate
- // an invocation logics.
-@@ -379,7 +292,7 @@
- public:
-   virtual ~_TAO_IRObject_Proxy_Impl (void) { }
-   
--    virtual IR::DefinitionKind def_kind (
-+  virtual IR_DefinitionKind def_kind (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -399,6 +312,7 @@
-   _TAO_IRObject_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -417,7 +331,7 @@
-   
-   virtual ~_TAO_IRObject_Remote_Proxy_Impl (void) { }
-   
--    virtual IR::DefinitionKind def_kind (
-+  virtual IR_DefinitionKind def_kind (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -455,8 +369,9 @@
- {
- public:
-   virtual ~_TAO_IRObject_Proxy_Broker (void);
-+
-   virtual _TAO_IRObject_Proxy_Impl &select_proxy (
--    IRObject *object,
-+    CORBA_IRObject *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -465,6 +380,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -482,7 +398,7 @@
-   virtual ~_TAO_IRObject_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_IRObject_Proxy_Impl &select_proxy (
--    IRObject *object,
-+    CORBA_IRObject *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -496,367 +412,174 @@
-   static _TAO_IRObject_Remote_Proxy_Broker *the_TAO_IRObject_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IRObject;
--
--typedef CORBA::Short ValueModifier;
--typedef CORBA::Short_out ValueModifier_out;
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueModifier;
--
--TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short VM_NONE;
--
--TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short VM_CUSTOM;
--
--TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short VM_ABSTRACT;
--
--TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short VM_TRUNCATABLE;
--
--typedef CORBA::Short Visibility;
--typedef CORBA::Short_out Visibility_out;
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Visibility;
--
--TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short PRIVATE_MEMBER;
--
--TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short PUBLIC_MEMBER;
--
--
--}
--TAO_NAMESPACE_CLOSE // module CORBA
--
--TAO_NAMESPACE  IR
--{
--  typedef char * Identifier;
--  typedef CORBA::String_var Identifier_var;
--  typedef CORBA::String_out Identifier_out;
--    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Identifier;
--
--  typedef char * ScopedName;
--  typedef CORBA::String_var ScopedName_var;
--  typedef CORBA::String_out ScopedName_out;
--    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ScopedName;
--
--  typedef char * RepositoryId;
--  typedef CORBA::String_var RepositoryId_var;
--  typedef CORBA::String_out RepositoryId_out;
--    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryId;
--
--  typedef char * VersionSpec;
--  typedef CORBA::String_var VersionSpec_var;
--  typedef CORBA::String_out VersionSpec_out;
--    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_VersionSpec;
--
--  class Contained;
--  
--#if !defined (_IR_CONTAINED___PTR_CH_)
--#define _IR_CONTAINED___PTR_CH_
--
--typedef Contained *Contained_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINED___VAR_CH_)
--#define _IR_CONTAINED___VAR_CH_
--
--  class TAO_IFR_Client_Export Contained_var : public TAO_Base_var
--  {
--  public:
--    Contained_var (void); // default constructor
--    Contained_var (Contained_ptr p) : ptr_ (p) {} 
--    Contained_var (const Contained_var &); // copy constructor
--    ~Contained_var (void); // destructor
--    
--    Contained_var &operator= (Contained_ptr);
--    Contained_var &operator= (const Contained_var &);
--    Contained_ptr operator-> (void) const;
--    
--    operator const Contained_ptr &() const;
--    operator Contained_ptr &();
--    // in, inout, out, _retn 
--    Contained_ptr in (void) const;
--    Contained_ptr &inout (void);
--    Contained_ptr &out (void);
--    Contained_ptr _retn (void);
--    Contained_ptr ptr (void) const;
--
--  private:
--    Contained_ptr ptr_;
--    // Unimplemented - prevents widening assignment.
--    Contained_var (const TAO_Base_var &rhs);
--    Contained_var &operator= (const TAO_Base_var &rhs);
--  };
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINED___OUT_CH_)
--#define _IR_CONTAINED___OUT_CH_
--
--  class TAO_IFR_Client_Export Contained_out
--  {
--  public:
--    Contained_out (Contained_ptr &);
--    Contained_out (Contained_var &);
--    Contained_out (const Contained_out &);
--    Contained_out &operator= (const Contained_out &);
--    Contained_out &operator= (const Contained_var &);
--    Contained_out &operator= (Contained_ptr);
--    operator Contained_ptr &();
--    Contained_ptr &ptr (void);
--    Contained_ptr operator-> (void);
--    
--  private:
--    Contained_ptr &ptr_;
--  };
--
--
--#endif /* end #if !defined */
--
--  class Repository;
--  
--#if !defined (_IR_REPOSITORY___PTR_CH_)
--#define _IR_REPOSITORY___PTR_CH_
--
--typedef Repository *Repository_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_REPOSITORY___VAR_CH_)
--#define _IR_REPOSITORY___VAR_CH_
--
--  class TAO_IFR_Client_Export Repository_var : public TAO_Base_var
-+  class TAO_IFR_Client_Export IR_Contained_var : public TAO_Base_var
-   {
-   public:
--    Repository_var (void); // default constructor
--    Repository_var (Repository_ptr p) : ptr_ (p) {} 
--    Repository_var (const Repository_var &); // copy constructor
--    ~Repository_var (void); // destructor
-+    IR_Contained_var (void); // default constructor
-+    IR_Contained_var (IR_Contained_ptr p) : ptr_ (p) {}
-+    IR_Contained_var (const IR_Contained_var &); // copy constructor
-+    ~IR_Contained_var (void); // destructor
-     
--    Repository_var &operator= (Repository_ptr);
--    Repository_var &operator= (const Repository_var &);
--    Repository_ptr operator-> (void) const;
-+    IR_Contained_var &operator= (IR_Contained_ptr);
-+    IR_Contained_var &operator= (const IR_Contained_var &);
-+    IR_Contained_ptr operator-> (void) const;
-     
--    operator const Repository_ptr &() const;
--    operator Repository_ptr &();
-+    operator const IR_Contained_ptr &() const;
-+    operator IR_Contained_ptr &();
-     // in, inout, out, _retn 
--    Repository_ptr in (void) const;
--    Repository_ptr &inout (void);
--    Repository_ptr &out (void);
--    Repository_ptr _retn (void);
--    Repository_ptr ptr (void) const;
-+    IR_Contained_ptr in (void) const;
-+    IR_Contained_ptr &inout (void);
-+    IR_Contained_ptr &out (void);
-+    IR_Contained_ptr _retn (void);
-+    IR_Contained_ptr ptr (void) const;
- 
-   private:
--    Repository_ptr ptr_;
-+    IR_Contained_ptr ptr_;
-     // Unimplemented - prevents widening assignment.
--    Repository_var (const TAO_Base_var &rhs);
--    Repository_var &operator= (const TAO_Base_var &rhs);
-+    IR_Contained_var (const TAO_Base_var &rhs);
-+    IR_Contained_var &operator= (const TAO_Base_var &rhs);
-   };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_REPOSITORY___OUT_CH_)
--#define _IR_REPOSITORY___OUT_CH_
--
--  class TAO_IFR_Client_Export Repository_out
-+  class TAO_IFR_Client_Export IR_Contained_out
-   {
-   public:
--    Repository_out (Repository_ptr &);
--    Repository_out (Repository_var &);
--    Repository_out (const Repository_out &);
--    Repository_out &operator= (const Repository_out &);
--    Repository_out &operator= (const Repository_var &);
--    Repository_out &operator= (Repository_ptr);
--    operator Repository_ptr &();
--    Repository_ptr &ptr (void);
--    Repository_ptr operator-> (void);
-+    IR_Contained_out (IR_Contained_ptr &);
-+    IR_Contained_out (IR_Contained_var &);
-+    IR_Contained_out (const IR_Contained_out &);
-+    IR_Contained_out &operator= (const IR_Contained_out &);
-+    IR_Contained_out &operator= (const IR_Contained_var &);
-+    IR_Contained_out &operator= (IR_Contained_ptr);
-+    operator IR_Contained_ptr &();
-+    IR_Contained_ptr &ptr (void);
-+    IR_Contained_ptr operator-> (void);
-     
-   private:
--    Repository_ptr &ptr_;
-+    IR_Contained_ptr &ptr_;
-   };
- 
--
--#endif /* end #if !defined */
--
--  class Container;
--  
--#if !defined (_IR_CONTAINER___PTR_CH_)
--#define _IR_CONTAINER___PTR_CH_
--
--typedef Container *Container_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINER___VAR_CH_)
--#define _IR_CONTAINER___VAR_CH_
--
--  class TAO_IFR_Client_Export Container_var : public TAO_Base_var
-+  class TAO_IFR_Client_Export IR_Repository_var : public TAO_Base_var
-   {
-   public:
--    Container_var (void); // default constructor
--    Container_var (Container_ptr p) : ptr_ (p) {} 
--    Container_var (const Container_var &); // copy constructor
--    ~Container_var (void); // destructor
-+    IR_Repository_var (void); // default constructor
-+    IR_Repository_var (IR_Repository_ptr p) : ptr_ (p) {}
-+    IR_Repository_var (const IR_Repository_var &); // copy constructor
-+    ~IR_Repository_var (void); // destructor
-     
--    Container_var &operator= (Container_ptr);
--    Container_var &operator= (const Container_var &);
--    Container_ptr operator-> (void) const;
-+    IR_Repository_var &operator= (IR_Repository_ptr);
-+    IR_Repository_var &operator= (const IR_Repository_var &);
-+    IR_Repository_ptr operator-> (void) const;
-     
--    operator const Container_ptr &() const;
--    operator Container_ptr &();
-+    operator const IR_Repository_ptr &() const;
-+    operator IR_Repository_ptr &();
-     // in, inout, out, _retn 
--    Container_ptr in (void) const;
--    Container_ptr &inout (void);
--    Container_ptr &out (void);
--    Container_ptr _retn (void);
--    Container_ptr ptr (void) const;
-+    IR_Repository_ptr in (void) const;
-+    IR_Repository_ptr &inout (void);
-+    IR_Repository_ptr &out (void);
-+    IR_Repository_ptr _retn (void);
-+    IR_Repository_ptr ptr (void) const;
- 
-   private:
--    Container_ptr ptr_;
-+    IR_Repository_ptr ptr_;
-     // Unimplemented - prevents widening assignment.
--    Container_var (const TAO_Base_var &rhs);
--    Container_var &operator= (const TAO_Base_var &rhs);
-+    IR_Repository_var (const TAO_Base_var &rhs);
-+    IR_Repository_var &operator= (const TAO_Base_var &rhs);
-   };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINER___OUT_CH_)
--#define _IR_CONTAINER___OUT_CH_
--
--  class TAO_IFR_Client_Export Container_out
-+  class TAO_IFR_Client_Export IR_Repository_out
-   {
-   public:
--    Container_out (Container_ptr &);
--    Container_out (Container_var &);
--    Container_out (const Container_out &);
--    Container_out &operator= (const Container_out &);
--    Container_out &operator= (const Container_var &);
--    Container_out &operator= (Container_ptr);
--    operator Container_ptr &();
--    Container_ptr &ptr (void);
--    Container_ptr operator-> (void);
-+    IR_Repository_out (IR_Repository_ptr &);
-+    IR_Repository_out (IR_Repository_var &);
-+    IR_Repository_out (const IR_Repository_out &);
-+    IR_Repository_out &operator= (const IR_Repository_out &);
-+    IR_Repository_out &operator= (const IR_Repository_var &);
-+    IR_Repository_out &operator= (IR_Repository_ptr);
-+    operator IR_Repository_ptr &();
-+    IR_Repository_ptr &ptr (void);
-+    IR_Repository_ptr operator-> (void);
-     
-   private:
--    Container_ptr &ptr_;
-+    IR_Repository_ptr &ptr_;
-   };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINED___PTR_CH_)
--#define _IR_CONTAINED___PTR_CH_
--
--  class Contained;
--  typedef Contained *Contained_ptr;
--  
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINED___VAR_CH_)
--#define _IR_CONTAINED___VAR_CH_
--
--  class TAO_IFR_Client_Export Contained_var : public TAO_Base_var
-+  class TAO_IFR_Client_Export IR_Container_var : public TAO_Base_var
-   {
-   public:
--    Contained_var (void); // default constructor
--    Contained_var (Contained_ptr p) : ptr_ (p) {} 
--    Contained_var (const Contained_var &); // copy constructor
--    ~Contained_var (void); // destructor
-+    IR_Container_var (void); // default constructor
-+    IR_Container_var (IR_Container_ptr p) : ptr_ (p) {}
-+    IR_Container_var (const IR_Container_var &); // copy constructor
-+    ~IR_Container_var (void); // destructor
-     
--    Contained_var &operator= (Contained_ptr);
--    Contained_var &operator= (const Contained_var &);
--    Contained_ptr operator-> (void) const;
-+    IR_Container_var &operator= (IR_Container_ptr);
-+    IR_Container_var &operator= (const IR_Container_var &);
-+    IR_Container_ptr operator-> (void) const;
-     
--    operator const Contained_ptr &() const;
--    operator Contained_ptr &();
-+    operator const IR_Container_ptr &() const;
-+    operator IR_Container_ptr &();
-     // in, inout, out, _retn 
--    Contained_ptr in (void) const;
--    Contained_ptr &inout (void);
--    Contained_ptr &out (void);
--    Contained_ptr _retn (void);
--    Contained_ptr ptr (void) const;
-+    IR_Container_ptr in (void) const;
-+    IR_Container_ptr &inout (void);
-+    IR_Container_ptr &out (void);
-+    IR_Container_ptr _retn (void);
-+    IR_Container_ptr ptr (void) const;
- 
-   private:
--    Contained_ptr ptr_;
-+    IR_Container_ptr ptr_;
-     // Unimplemented - prevents widening assignment.
--    Contained_var (const TAO_Base_var &rhs);
--    Contained_var &operator= (const TAO_Base_var &rhs);
-+    IR_Container_var (const TAO_Base_var &rhs);
-+    IR_Container_var &operator= (const TAO_Base_var &rhs);
-   };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINED___OUT_CH_)
--#define _IR_CONTAINED___OUT_CH_
--
--  class TAO_IFR_Client_Export Contained_out
-+  class TAO_IFR_Client_Export IR_Container_out
-   {
-   public:
--    Contained_out (Contained_ptr &);
--    Contained_out (Contained_var &);
--    Contained_out (const Contained_out &);
--    Contained_out &operator= (const Contained_out &);
--    Contained_out &operator= (const Contained_var &);
--    Contained_out &operator= (Contained_ptr);
--    operator Contained_ptr &();
--    Contained_ptr &ptr (void);
--    Contained_ptr operator-> (void);
-+    IR_Container_out (IR_Container_ptr &);
-+    IR_Container_out (IR_Container_var &);
-+    IR_Container_out (const IR_Container_out &);
-+    IR_Container_out &operator= (const IR_Container_out &);
-+    IR_Container_out &operator= (const IR_Container_var &);
-+    IR_Container_out &operator= (IR_Container_ptr);
-+    operator IR_Container_ptr &();
-+    IR_Container_ptr &ptr (void);
-+    IR_Container_ptr operator-> (void);
-     
-   private:
--    Contained_ptr &ptr_;
-+    IR_Container_ptr &ptr_;
-   };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINED_CH_)
--#define _IR_CONTAINED_CH_
--
- // Forward Classes Declaration
-   class _TAO_Contained_Proxy_Impl;
-   class _TAO_Contained_Remote_Proxy_Impl;
-   class _TAO_Contained_Proxy_Broker;
-   class _TAO_Contained_Remote_Proxy_Broker;
-   
--  class TAO_IFR_Client_Export Contained: public virtual CORBA::IRObject
-+  class TAO_IFR_Client_Export IR_Contained: public virtual CORBA_IRObject
-   {
-   public:
-   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--    typedef Contained_ptr _ptr_type;
--    typedef Contained_var _var_type;
-+    typedef IR_Contained_ptr _ptr_type;
-+    typedef IR_Contained_var _var_type;
-   #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-     // the static operations
--    static Contained_ptr _duplicate (Contained_ptr obj);
--    static Contained_ptr _narrow (
-+    static IR_Contained_ptr _duplicate (IR_Contained_ptr obj);
-+    static IR_Contained_ptr _narrow (
-         CORBA::Object_ptr obj,
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       );
--    static Contained_ptr _unchecked_narrow (
-+    static IR_Contained_ptr _unchecked_narrow (
-         CORBA::Object_ptr obj,
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       );
--    static Contained_ptr _nil (void)
-+    static IR_Contained_ptr _nil (void)
-       {
--        return (Contained_ptr)0;
-+        return (IR_Contained_ptr)0;
-       }
- 
-     static void _tao_any_destructor (void*);
-@@ -912,7 +635,7 @@
-         CORBA::SystemException
-       ));
- 
--    virtual IR::Container_ptr defined_in (
-+    virtual IR_Container_ptr defined_in (
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       )
-@@ -928,7 +651,7 @@
-         CORBA::SystemException
-       ));
- 
--    virtual IR::Repository_ptr containing_repository (
-+    virtual IR_Repository_ptr containing_repository (
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       )
-@@ -948,7 +671,7 @@
- 
-       static void _tao_any_destructor (void*);
- 
--      ACE_NESTED_CLASS (IR, DefinitionKind) kind;
-+      IR_DefinitionKind kind;
-       CORBA::Any value;
-     };
- 
-@@ -1001,7 +724,7 @@
- 
-     static CORBA::TypeCode_ptr _tc_Description;
- 
--    virtual IR::Contained::Description * describe (
-+    virtual IR_Contained::Description * describe     (
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       )
-@@ -1010,7 +733,7 @@
-       ));
- 
-     virtual void move (
--        IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-         const char * new_name,
-         const char * new_version,
-         CORBA::Environment &ACE_TRY_ENV = 
-@@ -1033,14 +756,14 @@
-     _TAO_Contained_Proxy_Broker *the_TAO_Contained_Proxy_Broker_;
-     
-   protected:
--    Contained (int collocated = 0);
-+    IR_Contained (int collocated = 0);
-     
-     protected:
-       // This methods travese the inheritance tree and set the
-       // parents piece of the given class in the right mode
-       virtual void IR_Contained_setup_collocation (int collocated);
-       
--      Contained (
-+    IR_Contained (
-         TAO_Stub *objref, 
-         CORBA::Boolean _tao_collocated = 0,
-         TAO_Abstract_ServantBase *servant = 0
-@@ -1050,10 +773,10 @@
-       friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-       friend class _TAO_Contained_Direct_Proxy_Impl;
-     
--    virtual ~Contained (void);
-+  virtual ~IR_Contained (void);
-   private:
--    Contained (const Contained &);
--    void operator= (const Contained &);    
-+    IR_Contained (const IR_Contained &);
-+    void operator= (const IR_Contained &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-     // Generation of interceptors related RequestInfo classes per operation.
-@@ -1063,7 +786,7 @@
-     class TAO_ClientRequestInfo_IR_Contained_id_get : public TAO_ClientRequestInfo
-     {
-     public:
--      friend class IR::Contained;
-+      friend class IR_Contained;
-       
-       friend class _TAO_Contained_Remote_Proxy_Impl;
-       friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-@@ -1105,7 +828,7 @@
-   class TAO_ClientRequestInfo_IR_Contained_id_set : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::Contained;
-+    friend class IR_Contained;
-     
-     friend class _TAO_Contained_Remote_Proxy_Impl;
-     friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-@@ -1147,7 +870,7 @@
- class TAO_ClientRequestInfo_IR_Contained_name_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Contained;
-+    friend class IR_Contained;
-   
-   friend class _TAO_Contained_Remote_Proxy_Impl;
-   friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-@@ -1189,7 +912,7 @@
- class TAO_ClientRequestInfo_IR_Contained_name_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Contained;
-+    friend class IR_Contained;
-   
-   friend class _TAO_Contained_Remote_Proxy_Impl;
-   friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-@@ -1231,7 +954,7 @@
- class TAO_ClientRequestInfo_IR_Contained_version_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Contained;
-+    friend class IR_Contained;
-   
-   friend class _TAO_Contained_Remote_Proxy_Impl;
-   friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-@@ -1273,7 +996,7 @@
- class TAO_ClientRequestInfo_IR_Contained_version_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Contained;
-+    friend class IR_Contained;
-   
-   friend class _TAO_Contained_Remote_Proxy_Impl;
-   friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-@@ -1315,7 +1038,7 @@
- class TAO_ClientRequestInfo_IR_Contained_defined_in_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Contained;
-+    friend class IR_Contained;
-   
-   friend class _TAO_Contained_Remote_Proxy_Impl;
-   friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-@@ -1349,15 +1072,15 @@
- private:
-   TAO_ClientRequestInfo_IR_Contained_defined_in_get (const TAO_ClientRequestInfo_IR_Contained_defined_in_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_Contained_defined_in_get &);
--  void result (IR::Container_ptr result);
-+    void result (IR_Container_ptr result);
-   // update the result 
--  IR::Container_ptr _result;
-+    IR_Container_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Contained_absolute_name_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Contained;
-+    friend class IR_Contained;
-   
-   friend class _TAO_Contained_Remote_Proxy_Impl;
-   friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-@@ -1399,7 +1122,7 @@
- class TAO_ClientRequestInfo_IR_Contained_containing_repository_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Contained;
-+    friend class IR_Contained;
-   
-   friend class _TAO_Contained_Remote_Proxy_Impl;
-   friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-@@ -1433,15 +1156,15 @@
- private:
-   TAO_ClientRequestInfo_IR_Contained_containing_repository_get (const TAO_ClientRequestInfo_IR_Contained_containing_repository_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_Contained_containing_repository_get &);
--  void result (IR::Repository_ptr result);
-+    void result (IR_Repository_ptr result);
-   // update the result 
--  IR::Repository_ptr _result;
-+    IR_Repository_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Contained_describe : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Contained;
-+    friend class IR_Contained;
-   
-   friend class _TAO_Contained_Remote_Proxy_Impl;
-   friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-@@ -1475,15 +1198,15 @@
- private:
-   TAO_ClientRequestInfo_IR_Contained_describe (const TAO_ClientRequestInfo_IR_Contained_describe &);
-   void operator= (const TAO_ClientRequestInfo_IR_Contained_describe &);
--  void result (ACE_NESTED_CLASS (IR::Contained,Description) * result);
-+    void result (ACE_NESTED_CLASS (IR_Contained,Description) * result);
-   // update the result 
--  ACE_NESTED_CLASS (IR::Contained,Description) * _result;
-+    ACE_NESTED_CLASS (IR_Contained,Description) * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Contained_move : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Contained;
-+    friend class IR_Contained;
-   
-   friend class _TAO_Contained_Remote_Proxy_Impl;
-   friend class _TAO_Contained_ThruPOA_Proxy_Impl;
-@@ -1492,7 +1215,7 @@
- TAO_ClientRequestInfo_IR_Contained_move (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::Container_ptr new_container,
-+        IR_Container_ptr new_container,
-     const char * new_name,
-     const char * new_version,
-     CORBA::Environment &ACE_TRY_ENV = 
-@@ -1520,7 +1243,7 @@
- private:
-   TAO_ClientRequestInfo_IR_Contained_move (const TAO_ClientRequestInfo_IR_Contained_move &);
-   void operator= (const TAO_ClientRequestInfo_IR_Contained_move &);
--  IR::Container_ptr new_container_;
-+    IR_Container_ptr new_container_;
-   const char * new_name_;
-   const char * new_version_;
-   
-@@ -1541,7 +1264,7 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_Contained_Proxy_Impl : 
--  public virtual CORBA::_TAO_IRObject_Proxy_Impl
-+  public virtual _TAO_IRObject_Proxy_Impl
- {
- public:
-   virtual ~_TAO_Contained_Proxy_Impl (void) { }
-@@ -1597,7 +1320,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::Container_ptr defined_in (
-+  virtual IR_Container_ptr defined_in (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -1613,7 +1336,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::Repository_ptr containing_repository (
-+  virtual IR_Repository_ptr containing_repository (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -1621,7 +1344,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::Contained::Description * describe (
-+  virtual IR_Contained::Description * describe (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -1631,7 +1354,7 @@
- 
-   virtual void move (
-       CORBA_Object *_collocated_tao_target_,
--      IR::Container_ptr new_container,
-+      IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -1642,8 +1365,8 @@
- 
- protected:
-   _TAO_Contained_Proxy_Impl (void);
--
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -1656,7 +1379,7 @@
- class TAO_IFR_Client_Export _TAO_Contained_Remote_Proxy_Impl : 
-   public virtual _TAO_Contained_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual CORBA::_TAO_IRObject_Remote_Proxy_Impl
-+  public virtual _TAO_IRObject_Remote_Proxy_Impl
-   
- {
- public:
-@@ -1715,7 +1438,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::Container_ptr defined_in (
-+  virtual IR_Container_ptr defined_in (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -1731,7 +1454,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::Repository_ptr containing_repository (
-+  virtual IR_Repository_ptr containing_repository (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -1739,7 +1462,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::Contained::Description * describe (
-+  virtual IR_Contained::Description * describe (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -1749,7 +1472,7 @@
- 
-   virtual void move (
-       CORBA_Object *_collocated_tao_target_,
--      IR::Container_ptr new_container,
-+      IR_Container_ptr new_container,
-       const char * new_name,
-       const char * new_version,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -1757,7 +1480,6 @@
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
--
- };
- 
- //
-@@ -1780,8 +1502,9 @@
- {
- public:
-   virtual ~_TAO_Contained_Proxy_Broker (void);
-+
-   virtual _TAO_Contained_Proxy_Impl &select_proxy (
--    Contained *object,
-+    IR_Contained *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -1790,6 +1513,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -1807,7 +1531,7 @@
-   virtual ~_TAO_Contained_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_Contained_Proxy_Impl &select_proxy (
--    Contained *object,
-+    IR_Contained *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -1821,702 +1545,462 @@
-   static _TAO_Contained_Remote_Proxy_Broker *the_TAO_Contained_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Contained;
--
--class ModuleDef;
--
--#if !defined (_IR_MODULEDEF___PTR_CH_)
--#define _IR_MODULEDEF___PTR_CH_
--
--typedef ModuleDef *ModuleDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_MODULEDEF___VAR_CH_)
--#define _IR_MODULEDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ModuleDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_ModuleDef_var : public TAO_Base_var
- {
- public:
--  ModuleDef_var (void); // default constructor
--  ModuleDef_var (ModuleDef_ptr p) : ptr_ (p) {} 
--  ModuleDef_var (const ModuleDef_var &); // copy constructor
--  ~ModuleDef_var (void); // destructor
-+  IR_ModuleDef_var (void); // default constructor
-+  IR_ModuleDef_var (IR_ModuleDef_ptr p) : ptr_ (p) {}
-+  IR_ModuleDef_var (const IR_ModuleDef_var &); // copy constructor
-+  ~IR_ModuleDef_var (void); // destructor
-   
--  ModuleDef_var &operator= (ModuleDef_ptr);
--  ModuleDef_var &operator= (const ModuleDef_var &);
--  ModuleDef_ptr operator-> (void) const;
-+  IR_ModuleDef_var &operator= (IR_ModuleDef_ptr);
-+  IR_ModuleDef_var &operator= (const IR_ModuleDef_var &);
-+  IR_ModuleDef_ptr operator-> (void) const;
-   
--  operator const ModuleDef_ptr &() const;
--  operator ModuleDef_ptr &();
-+  operator const IR_ModuleDef_ptr &() const;
-+  operator IR_ModuleDef_ptr &();
-   // in, inout, out, _retn 
--  ModuleDef_ptr in (void) const;
--  ModuleDef_ptr &inout (void);
--  ModuleDef_ptr &out (void);
--  ModuleDef_ptr _retn (void);
--  ModuleDef_ptr ptr (void) const;
-+  IR_ModuleDef_ptr in (void) const;
-+  IR_ModuleDef_ptr &inout (void);
-+  IR_ModuleDef_ptr &out (void);
-+  IR_ModuleDef_ptr _retn (void);
-+  IR_ModuleDef_ptr ptr (void) const;
- 
- private:
--  ModuleDef_ptr ptr_;
-+  IR_ModuleDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  ModuleDef_var (const TAO_Base_var &rhs);
--  ModuleDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_ModuleDef_var (const TAO_Base_var &rhs);
-+  IR_ModuleDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_MODULEDEF___OUT_CH_)
--#define _IR_MODULEDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ModuleDef_out
-+class TAO_IFR_Client_Export IR_ModuleDef_out
- {
- public:
--  ModuleDef_out (ModuleDef_ptr &);
--  ModuleDef_out (ModuleDef_var &);
--  ModuleDef_out (const ModuleDef_out &);
--  ModuleDef_out &operator= (const ModuleDef_out &);
--  ModuleDef_out &operator= (const ModuleDef_var &);
--  ModuleDef_out &operator= (ModuleDef_ptr);
--  operator ModuleDef_ptr &();
--  ModuleDef_ptr &ptr (void);
--  ModuleDef_ptr operator-> (void);
-+  IR_ModuleDef_out (IR_ModuleDef_ptr &);
-+  IR_ModuleDef_out (IR_ModuleDef_var &);
-+  IR_ModuleDef_out (const IR_ModuleDef_out &);
-+  IR_ModuleDef_out &operator= (const IR_ModuleDef_out &);
-+  IR_ModuleDef_out &operator= (const IR_ModuleDef_var &);
-+  IR_ModuleDef_out &operator= (IR_ModuleDef_ptr);
-+  operator IR_ModuleDef_ptr &();
-+  IR_ModuleDef_ptr &ptr (void);
-+  IR_ModuleDef_ptr operator-> (void);
-   
- private:
--  ModuleDef_ptr &ptr_;
-+  IR_ModuleDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--class ConstantDef;
--
--#if !defined (_IR_CONSTANTDEF___PTR_CH_)
--#define _IR_CONSTANTDEF___PTR_CH_
--
--typedef ConstantDef *ConstantDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSTANTDEF___VAR_CH_)
--#define _IR_CONSTANTDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ConstantDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_ConstantDef_var : public TAO_Base_var
- {
- public:
--  ConstantDef_var (void); // default constructor
--  ConstantDef_var (ConstantDef_ptr p) : ptr_ (p) {} 
--  ConstantDef_var (const ConstantDef_var &); // copy constructor
--  ~ConstantDef_var (void); // destructor
-+  IR_ConstantDef_var (void); // default constructor
-+  IR_ConstantDef_var (IR_ConstantDef_ptr p) : ptr_ (p) {}
-+  IR_ConstantDef_var (const IR_ConstantDef_var &); // copy constructor
-+  ~IR_ConstantDef_var (void); // destructor
-   
--  ConstantDef_var &operator= (ConstantDef_ptr);
--  ConstantDef_var &operator= (const ConstantDef_var &);
--  ConstantDef_ptr operator-> (void) const;
-+  IR_ConstantDef_var &operator= (IR_ConstantDef_ptr);
-+  IR_ConstantDef_var &operator= (const IR_ConstantDef_var &);
-+  IR_ConstantDef_ptr operator-> (void) const;
-   
--  operator const ConstantDef_ptr &() const;
--  operator ConstantDef_ptr &();
-+  operator const IR_ConstantDef_ptr &() const;
-+  operator IR_ConstantDef_ptr &();
-   // in, inout, out, _retn 
--  ConstantDef_ptr in (void) const;
--  ConstantDef_ptr &inout (void);
--  ConstantDef_ptr &out (void);
--  ConstantDef_ptr _retn (void);
--  ConstantDef_ptr ptr (void) const;
-+  IR_ConstantDef_ptr in (void) const;
-+  IR_ConstantDef_ptr &inout (void);
-+  IR_ConstantDef_ptr &out (void);
-+  IR_ConstantDef_ptr _retn (void);
-+  IR_ConstantDef_ptr ptr (void) const;
- 
- private:
--  ConstantDef_ptr ptr_;
-+  IR_ConstantDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  ConstantDef_var (const TAO_Base_var &rhs);
--  ConstantDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_ConstantDef_var (const TAO_Base_var &rhs);
-+  IR_ConstantDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSTANTDEF___OUT_CH_)
--#define _IR_CONSTANTDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ConstantDef_out
-+class TAO_IFR_Client_Export IR_ConstantDef_out
- {
- public:
--  ConstantDef_out (ConstantDef_ptr &);
--  ConstantDef_out (ConstantDef_var &);
--  ConstantDef_out (const ConstantDef_out &);
--  ConstantDef_out &operator= (const ConstantDef_out &);
--  ConstantDef_out &operator= (const ConstantDef_var &);
--  ConstantDef_out &operator= (ConstantDef_ptr);
--  operator ConstantDef_ptr &();
--  ConstantDef_ptr &ptr (void);
--  ConstantDef_ptr operator-> (void);
-+  IR_ConstantDef_out (IR_ConstantDef_ptr &);
-+  IR_ConstantDef_out (IR_ConstantDef_var &);
-+  IR_ConstantDef_out (const IR_ConstantDef_out &);
-+  IR_ConstantDef_out &operator= (const IR_ConstantDef_out &);
-+  IR_ConstantDef_out &operator= (const IR_ConstantDef_var &);
-+  IR_ConstantDef_out &operator= (IR_ConstantDef_ptr);
-+  operator IR_ConstantDef_ptr &();
-+  IR_ConstantDef_ptr &ptr (void);
-+  IR_ConstantDef_ptr operator-> (void);
-   
- private:
--  ConstantDef_ptr &ptr_;
-+  IR_ConstantDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--class IDLType;
--
--#if !defined (_IR_IDLTYPE___PTR_CH_)
--#define _IR_IDLTYPE___PTR_CH_
--
--typedef IDLType *IDLType_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_IDLTYPE___VAR_CH_)
--#define _IR_IDLTYPE___VAR_CH_
--
--class TAO_IFR_Client_Export IDLType_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_IDLType_var : public TAO_Base_var
- {
- public:
--  IDLType_var (void); // default constructor
--  IDLType_var (IDLType_ptr p) : ptr_ (p) {} 
--  IDLType_var (const IDLType_var &); // copy constructor
--  ~IDLType_var (void); // destructor
-+  IR_IDLType_var (void); // default constructor
-+  IR_IDLType_var (IR_IDLType_ptr p) : ptr_ (p) {}
-+  IR_IDLType_var (const IR_IDLType_var &); // copy constructor
-+  ~IR_IDLType_var (void); // destructor
-   
--  IDLType_var &operator= (IDLType_ptr);
--  IDLType_var &operator= (const IDLType_var &);
--  IDLType_ptr operator-> (void) const;
-+  IR_IDLType_var &operator= (IR_IDLType_ptr);
-+  IR_IDLType_var &operator= (const IR_IDLType_var &);
-+  IR_IDLType_ptr operator-> (void) const;
-   
--  operator const IDLType_ptr &() const;
--  operator IDLType_ptr &();
-+  operator const IR_IDLType_ptr &() const;
-+  operator IR_IDLType_ptr &();
-   // in, inout, out, _retn 
--  IDLType_ptr in (void) const;
--  IDLType_ptr &inout (void);
--  IDLType_ptr &out (void);
--  IDLType_ptr _retn (void);
--  IDLType_ptr ptr (void) const;
-+  IR_IDLType_ptr in (void) const;
-+  IR_IDLType_ptr &inout (void);
-+  IR_IDLType_ptr &out (void);
-+  IR_IDLType_ptr _retn (void);
-+  IR_IDLType_ptr ptr (void) const;
- 
- private:
--  IDLType_ptr ptr_;
-+  IR_IDLType_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  IDLType_var (const TAO_Base_var &rhs);
--  IDLType_var &operator= (const TAO_Base_var &rhs);
-+  IR_IDLType_var (const TAO_Base_var &rhs);
-+  IR_IDLType_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_IDLTYPE___OUT_CH_)
--#define _IR_IDLTYPE___OUT_CH_
--
--class TAO_IFR_Client_Export IDLType_out
-+class TAO_IFR_Client_Export IR_IDLType_out
- {
- public:
--  IDLType_out (IDLType_ptr &);
--  IDLType_out (IDLType_var &);
--  IDLType_out (const IDLType_out &);
--  IDLType_out &operator= (const IDLType_out &);
--  IDLType_out &operator= (const IDLType_var &);
--  IDLType_out &operator= (IDLType_ptr);
--  operator IDLType_ptr &();
--  IDLType_ptr &ptr (void);
--  IDLType_ptr operator-> (void);
-+  IR_IDLType_out (IR_IDLType_ptr &);
-+  IR_IDLType_out (IR_IDLType_var &);
-+  IR_IDLType_out (const IR_IDLType_out &);
-+  IR_IDLType_out &operator= (const IR_IDLType_out &);
-+  IR_IDLType_out &operator= (const IR_IDLType_var &);
-+  IR_IDLType_out &operator= (IR_IDLType_ptr);
-+  operator IR_IDLType_ptr &();
-+  IR_IDLType_ptr &ptr (void);
-+  IR_IDLType_ptr operator-> (void);
-   
- private:
--  IDLType_ptr &ptr_;
-+  IR_IDLType_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--class StructDef;
--
--#if !defined (_IR_STRUCTDEF___PTR_CH_)
--#define _IR_STRUCTDEF___PTR_CH_
--
--typedef StructDef *StructDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRUCTDEF___VAR_CH_)
--#define _IR_STRUCTDEF___VAR_CH_
--
--class TAO_IFR_Client_Export StructDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_StructDef_var : public TAO_Base_var
- {
- public:
--  StructDef_var (void); // default constructor
--  StructDef_var (StructDef_ptr p) : ptr_ (p) {} 
--  StructDef_var (const StructDef_var &); // copy constructor
--  ~StructDef_var (void); // destructor
-+  IR_StructDef_var (void); // default constructor
-+  IR_StructDef_var (IR_StructDef_ptr p) : ptr_ (p) {}
-+  IR_StructDef_var (const IR_StructDef_var &); // copy constructor
-+  ~IR_StructDef_var (void); // destructor
-   
--  StructDef_var &operator= (StructDef_ptr);
--  StructDef_var &operator= (const StructDef_var &);
--  StructDef_ptr operator-> (void) const;
-+  IR_StructDef_var &operator= (IR_StructDef_ptr);
-+  IR_StructDef_var &operator= (const IR_StructDef_var &);
-+  IR_StructDef_ptr operator-> (void) const;
-   
--  operator const StructDef_ptr &() const;
--  operator StructDef_ptr &();
-+  operator const IR_StructDef_ptr &() const;
-+  operator IR_StructDef_ptr &();
-   // in, inout, out, _retn 
--  StructDef_ptr in (void) const;
--  StructDef_ptr &inout (void);
--  StructDef_ptr &out (void);
--  StructDef_ptr _retn (void);
--  StructDef_ptr ptr (void) const;
-+  IR_StructDef_ptr in (void) const;
-+  IR_StructDef_ptr &inout (void);
-+  IR_StructDef_ptr &out (void);
-+  IR_StructDef_ptr _retn (void);
-+  IR_StructDef_ptr ptr (void) const;
- 
- private:
--  StructDef_ptr ptr_;
-+  IR_StructDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  StructDef_var (const TAO_Base_var &rhs);
--  StructDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_StructDef_var (const TAO_Base_var &rhs);
-+  IR_StructDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRUCTDEF___OUT_CH_)
--#define _IR_STRUCTDEF___OUT_CH_
--
--class TAO_IFR_Client_Export StructDef_out
-+class TAO_IFR_Client_Export IR_StructDef_out
- {
- public:
--  StructDef_out (StructDef_ptr &);
--  StructDef_out (StructDef_var &);
--  StructDef_out (const StructDef_out &);
--  StructDef_out &operator= (const StructDef_out &);
--  StructDef_out &operator= (const StructDef_var &);
--  StructDef_out &operator= (StructDef_ptr);
--  operator StructDef_ptr &();
--  StructDef_ptr &ptr (void);
--  StructDef_ptr operator-> (void);
-+  IR_StructDef_out (IR_StructDef_ptr &);
-+  IR_StructDef_out (IR_StructDef_var &);
-+  IR_StructDef_out (const IR_StructDef_out &);
-+  IR_StructDef_out &operator= (const IR_StructDef_out &);
-+  IR_StructDef_out &operator= (const IR_StructDef_var &);
-+  IR_StructDef_out &operator= (IR_StructDef_ptr);
-+  operator IR_StructDef_ptr &();
-+  IR_StructDef_ptr &ptr (void);
-+  IR_StructDef_ptr operator-> (void);
-   
- private:
--  StructDef_ptr &ptr_;
-+  IR_StructDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--class UnionDef;
--
--#if !defined (_IR_UNIONDEF___PTR_CH_)
--#define _IR_UNIONDEF___PTR_CH_
--
--typedef UnionDef *UnionDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_UNIONDEF___VAR_CH_)
--#define _IR_UNIONDEF___VAR_CH_
--
--class TAO_IFR_Client_Export UnionDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_UnionDef_var : public TAO_Base_var
- {
- public:
--  UnionDef_var (void); // default constructor
--  UnionDef_var (UnionDef_ptr p) : ptr_ (p) {} 
--  UnionDef_var (const UnionDef_var &); // copy constructor
--  ~UnionDef_var (void); // destructor
-+  IR_UnionDef_var (void); // default constructor
-+  IR_UnionDef_var (IR_UnionDef_ptr p) : ptr_ (p) {}
-+  IR_UnionDef_var (const IR_UnionDef_var &); // copy constructor
-+  ~IR_UnionDef_var (void); // destructor
-   
--  UnionDef_var &operator= (UnionDef_ptr);
--  UnionDef_var &operator= (const UnionDef_var &);
--  UnionDef_ptr operator-> (void) const;
-+  IR_UnionDef_var &operator= (IR_UnionDef_ptr);
-+  IR_UnionDef_var &operator= (const IR_UnionDef_var &);
-+  IR_UnionDef_ptr operator-> (void) const;
-   
--  operator const UnionDef_ptr &() const;
--  operator UnionDef_ptr &();
-+  operator const IR_UnionDef_ptr &() const;
-+  operator IR_UnionDef_ptr &();
-   // in, inout, out, _retn 
--  UnionDef_ptr in (void) const;
--  UnionDef_ptr &inout (void);
--  UnionDef_ptr &out (void);
--  UnionDef_ptr _retn (void);
--  UnionDef_ptr ptr (void) const;
-+  IR_UnionDef_ptr in (void) const;
-+  IR_UnionDef_ptr &inout (void);
-+  IR_UnionDef_ptr &out (void);
-+  IR_UnionDef_ptr _retn (void);
-+  IR_UnionDef_ptr ptr (void) const;
- 
- private:
--  UnionDef_ptr ptr_;
-+  IR_UnionDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  UnionDef_var (const TAO_Base_var &rhs);
--  UnionDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_UnionDef_var (const TAO_Base_var &rhs);
-+  IR_UnionDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_UNIONDEF___OUT_CH_)
--#define _IR_UNIONDEF___OUT_CH_
--
--class TAO_IFR_Client_Export UnionDef_out
-+class TAO_IFR_Client_Export IR_UnionDef_out
- {
- public:
--  UnionDef_out (UnionDef_ptr &);
--  UnionDef_out (UnionDef_var &);
--  UnionDef_out (const UnionDef_out &);
--  UnionDef_out &operator= (const UnionDef_out &);
--  UnionDef_out &operator= (const UnionDef_var &);
--  UnionDef_out &operator= (UnionDef_ptr);
--  operator UnionDef_ptr &();
--  UnionDef_ptr &ptr (void);
--  UnionDef_ptr operator-> (void);
-+  IR_UnionDef_out (IR_UnionDef_ptr &);
-+  IR_UnionDef_out (IR_UnionDef_var &);
-+  IR_UnionDef_out (const IR_UnionDef_out &);
-+  IR_UnionDef_out &operator= (const IR_UnionDef_out &);
-+  IR_UnionDef_out &operator= (const IR_UnionDef_var &);
-+  IR_UnionDef_out &operator= (IR_UnionDef_ptr);
-+  operator IR_UnionDef_ptr &();
-+  IR_UnionDef_ptr &ptr (void);
-+  IR_UnionDef_ptr operator-> (void);
-   
- private:
--  UnionDef_ptr &ptr_;
-+  IR_UnionDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--class EnumDef;
--
--#if !defined (_IR_ENUMDEF___PTR_CH_)
--#define _IR_ENUMDEF___PTR_CH_
--
--typedef EnumDef *EnumDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ENUMDEF___VAR_CH_)
--#define _IR_ENUMDEF___VAR_CH_
--
--class TAO_IFR_Client_Export EnumDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_EnumDef_var : public TAO_Base_var
- {
- public:
--  EnumDef_var (void); // default constructor
--  EnumDef_var (EnumDef_ptr p) : ptr_ (p) {} 
--  EnumDef_var (const EnumDef_var &); // copy constructor
--  ~EnumDef_var (void); // destructor
-+  IR_EnumDef_var (void); // default constructor
-+  IR_EnumDef_var (IR_EnumDef_ptr p) : ptr_ (p) {}
-+  IR_EnumDef_var (const IR_EnumDef_var &); // copy constructor
-+  ~IR_EnumDef_var (void); // destructor
-   
--  EnumDef_var &operator= (EnumDef_ptr);
--  EnumDef_var &operator= (const EnumDef_var &);
--  EnumDef_ptr operator-> (void) const;
-+  IR_EnumDef_var &operator= (IR_EnumDef_ptr);
-+  IR_EnumDef_var &operator= (const IR_EnumDef_var &);
-+  IR_EnumDef_ptr operator-> (void) const;
-   
--  operator const EnumDef_ptr &() const;
--  operator EnumDef_ptr &();
-+  operator const IR_EnumDef_ptr &() const;
-+  operator IR_EnumDef_ptr &();
-   // in, inout, out, _retn 
--  EnumDef_ptr in (void) const;
--  EnumDef_ptr &inout (void);
--  EnumDef_ptr &out (void);
--  EnumDef_ptr _retn (void);
--  EnumDef_ptr ptr (void) const;
-+  IR_EnumDef_ptr in (void) const;
-+  IR_EnumDef_ptr &inout (void);
-+  IR_EnumDef_ptr &out (void);
-+  IR_EnumDef_ptr _retn (void);
-+  IR_EnumDef_ptr ptr (void) const;
- 
- private:
--  EnumDef_ptr ptr_;
-+  IR_EnumDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  EnumDef_var (const TAO_Base_var &rhs);
--  EnumDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_EnumDef_var (const TAO_Base_var &rhs);
-+  IR_EnumDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ENUMDEF___OUT_CH_)
--#define _IR_ENUMDEF___OUT_CH_
--
--class TAO_IFR_Client_Export EnumDef_out
-+class TAO_IFR_Client_Export IR_EnumDef_out
- {
- public:
--  EnumDef_out (EnumDef_ptr &);
--  EnumDef_out (EnumDef_var &);
--  EnumDef_out (const EnumDef_out &);
--  EnumDef_out &operator= (const EnumDef_out &);
--  EnumDef_out &operator= (const EnumDef_var &);
--  EnumDef_out &operator= (EnumDef_ptr);
--  operator EnumDef_ptr &();
--  EnumDef_ptr &ptr (void);
--  EnumDef_ptr operator-> (void);
-+  IR_EnumDef_out (IR_EnumDef_ptr &);
-+  IR_EnumDef_out (IR_EnumDef_var &);
-+  IR_EnumDef_out (const IR_EnumDef_out &);
-+  IR_EnumDef_out &operator= (const IR_EnumDef_out &);
-+  IR_EnumDef_out &operator= (const IR_EnumDef_var &);
-+  IR_EnumDef_out &operator= (IR_EnumDef_ptr);
-+  operator IR_EnumDef_ptr &();
-+  IR_EnumDef_ptr &ptr (void);
-+  IR_EnumDef_ptr operator-> (void);
-   
- private:
--  EnumDef_ptr &ptr_;
-+  IR_EnumDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--class AliasDef;
--
--#if !defined (_IR_ALIASDEF___PTR_CH_)
--#define _IR_ALIASDEF___PTR_CH_
--
--typedef AliasDef *AliasDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ALIASDEF___VAR_CH_)
--#define _IR_ALIASDEF___VAR_CH_
--
--class TAO_IFR_Client_Export AliasDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_AliasDef_var : public TAO_Base_var
- {
- public:
--  AliasDef_var (void); // default constructor
--  AliasDef_var (AliasDef_ptr p) : ptr_ (p) {} 
--  AliasDef_var (const AliasDef_var &); // copy constructor
--  ~AliasDef_var (void); // destructor
-+  IR_AliasDef_var (void); // default constructor
-+  IR_AliasDef_var (IR_AliasDef_ptr p) : ptr_ (p) {}
-+  IR_AliasDef_var (const IR_AliasDef_var &); // copy constructor
-+  ~IR_AliasDef_var (void); // destructor
-   
--  AliasDef_var &operator= (AliasDef_ptr);
--  AliasDef_var &operator= (const AliasDef_var &);
--  AliasDef_ptr operator-> (void) const;
-+  IR_AliasDef_var &operator= (IR_AliasDef_ptr);
-+  IR_AliasDef_var &operator= (const IR_AliasDef_var &);
-+  IR_AliasDef_ptr operator-> (void) const;
-   
--  operator const AliasDef_ptr &() const;
--  operator AliasDef_ptr &();
-+  operator const IR_AliasDef_ptr &() const;
-+  operator IR_AliasDef_ptr &();
-   // in, inout, out, _retn 
--  AliasDef_ptr in (void) const;
--  AliasDef_ptr &inout (void);
--  AliasDef_ptr &out (void);
--  AliasDef_ptr _retn (void);
--  AliasDef_ptr ptr (void) const;
-+  IR_AliasDef_ptr in (void) const;
-+  IR_AliasDef_ptr &inout (void);
-+  IR_AliasDef_ptr &out (void);
-+  IR_AliasDef_ptr _retn (void);
-+  IR_AliasDef_ptr ptr (void) const;
- 
- private:
--  AliasDef_ptr ptr_;
-+  IR_AliasDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  AliasDef_var (const TAO_Base_var &rhs);
--  AliasDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_AliasDef_var (const TAO_Base_var &rhs);
-+  IR_AliasDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ALIASDEF___OUT_CH_)
--#define _IR_ALIASDEF___OUT_CH_
--
--class TAO_IFR_Client_Export AliasDef_out
-+class TAO_IFR_Client_Export IR_AliasDef_out
- {
- public:
--  AliasDef_out (AliasDef_ptr &);
--  AliasDef_out (AliasDef_var &);
--  AliasDef_out (const AliasDef_out &);
--  AliasDef_out &operator= (const AliasDef_out &);
--  AliasDef_out &operator= (const AliasDef_var &);
--  AliasDef_out &operator= (AliasDef_ptr);
--  operator AliasDef_ptr &();
--  AliasDef_ptr &ptr (void);
--  AliasDef_ptr operator-> (void);
-+  IR_AliasDef_out (IR_AliasDef_ptr &);
-+  IR_AliasDef_out (IR_AliasDef_var &);
-+  IR_AliasDef_out (const IR_AliasDef_out &);
-+  IR_AliasDef_out &operator= (const IR_AliasDef_out &);
-+  IR_AliasDef_out &operator= (const IR_AliasDef_var &);
-+  IR_AliasDef_out &operator= (IR_AliasDef_ptr);
-+  operator IR_AliasDef_ptr &();
-+  IR_AliasDef_ptr &ptr (void);
-+  IR_AliasDef_ptr operator-> (void);
-   
- private:
--  AliasDef_ptr &ptr_;
-+  IR_AliasDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--class InterfaceDef;
--
--#if !defined (_IR_INTERFACEDEF___PTR_CH_)
--#define _IR_INTERFACEDEF___PTR_CH_
--
--typedef InterfaceDef *InterfaceDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_INTERFACEDEF___VAR_CH_)
--#define _IR_INTERFACEDEF___VAR_CH_
--
--class TAO_IFR_Client_Export InterfaceDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_InterfaceDef_var : public TAO_Base_var
- {
- public:
--  InterfaceDef_var (void); // default constructor
--  InterfaceDef_var (InterfaceDef_ptr p) : ptr_ (p) {} 
--  InterfaceDef_var (const InterfaceDef_var &); // copy constructor
--  ~InterfaceDef_var (void); // destructor
-+  IR_InterfaceDef_var (void); // default constructor
-+  IR_InterfaceDef_var (IR_InterfaceDef_ptr p) : ptr_ (p) {}
-+  IR_InterfaceDef_var (const IR_InterfaceDef_var &); // copy constructor
-+  ~IR_InterfaceDef_var (void); // destructor
-   
--  InterfaceDef_var &operator= (InterfaceDef_ptr);
--  InterfaceDef_var &operator= (const InterfaceDef_var &);
--  InterfaceDef_ptr operator-> (void) const;
-+  IR_InterfaceDef_var &operator= (IR_InterfaceDef_ptr);
-+  IR_InterfaceDef_var &operator= (const IR_InterfaceDef_var &);
-+  IR_InterfaceDef_ptr operator-> (void) const;
-   
--  operator const InterfaceDef_ptr &() const;
--  operator InterfaceDef_ptr &();
-+  operator const IR_InterfaceDef_ptr &() const;
-+  operator IR_InterfaceDef_ptr &();
-   // in, inout, out, _retn 
--  InterfaceDef_ptr in (void) const;
--  InterfaceDef_ptr &inout (void);
--  InterfaceDef_ptr &out (void);
--  InterfaceDef_ptr _retn (void);
--  InterfaceDef_ptr ptr (void) const;
-+  IR_InterfaceDef_ptr in (void) const;
-+  IR_InterfaceDef_ptr &inout (void);
-+  IR_InterfaceDef_ptr &out (void);
-+  IR_InterfaceDef_ptr _retn (void);
-+  IR_InterfaceDef_ptr ptr (void) const;
- 
- private:
--  InterfaceDef_ptr ptr_;
-+  IR_InterfaceDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  InterfaceDef_var (const TAO_Base_var &rhs);
--  InterfaceDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_InterfaceDef_var (const TAO_Base_var &rhs);
-+  IR_InterfaceDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_INTERFACEDEF___OUT_CH_)
--#define _IR_INTERFACEDEF___OUT_CH_
--
--class TAO_IFR_Client_Export InterfaceDef_out
-+class TAO_IFR_Client_Export IR_InterfaceDef_out
- {
- public:
--  InterfaceDef_out (InterfaceDef_ptr &);
--  InterfaceDef_out (InterfaceDef_var &);
--  InterfaceDef_out (const InterfaceDef_out &);
--  InterfaceDef_out &operator= (const InterfaceDef_out &);
--  InterfaceDef_out &operator= (const InterfaceDef_var &);
--  InterfaceDef_out &operator= (InterfaceDef_ptr);
--  operator InterfaceDef_ptr &();
--  InterfaceDef_ptr &ptr (void);
--  InterfaceDef_ptr operator-> (void);
-+  IR_InterfaceDef_out (IR_InterfaceDef_ptr &);
-+  IR_InterfaceDef_out (IR_InterfaceDef_var &);
-+  IR_InterfaceDef_out (const IR_InterfaceDef_out &);
-+  IR_InterfaceDef_out &operator= (const IR_InterfaceDef_out &);
-+  IR_InterfaceDef_out &operator= (const IR_InterfaceDef_var &);
-+  IR_InterfaceDef_out &operator= (IR_InterfaceDef_ptr);
-+  operator IR_InterfaceDef_ptr &();
-+  IR_InterfaceDef_ptr &ptr (void);
-+  IR_InterfaceDef_ptr operator-> (void);
-   
- private:
--  InterfaceDef_ptr &ptr_;
-+  IR_InterfaceDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--class ExceptionDef;
--
--#if !defined (_IR_EXCEPTIONDEF___PTR_CH_)
--#define _IR_EXCEPTIONDEF___PTR_CH_
--
--typedef ExceptionDef *ExceptionDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EXCEPTIONDEF___VAR_CH_)
--#define _IR_EXCEPTIONDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ExceptionDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_ExceptionDef_var : public TAO_Base_var
- {
- public:
--  ExceptionDef_var (void); // default constructor
--  ExceptionDef_var (ExceptionDef_ptr p) : ptr_ (p) {} 
--  ExceptionDef_var (const ExceptionDef_var &); // copy constructor
--  ~ExceptionDef_var (void); // destructor
-+  IR_ExceptionDef_var (void); // default constructor
-+  IR_ExceptionDef_var (IR_ExceptionDef_ptr p) : ptr_ (p) {}
-+  IR_ExceptionDef_var (const IR_ExceptionDef_var &); // copy constructor
-+  ~IR_ExceptionDef_var (void); // destructor
-   
--  ExceptionDef_var &operator= (ExceptionDef_ptr);
--  ExceptionDef_var &operator= (const ExceptionDef_var &);
--  ExceptionDef_ptr operator-> (void) const;
-+  IR_ExceptionDef_var &operator= (IR_ExceptionDef_ptr);
-+  IR_ExceptionDef_var &operator= (const IR_ExceptionDef_var &);
-+  IR_ExceptionDef_ptr operator-> (void) const;
-   
--  operator const ExceptionDef_ptr &() const;
--  operator ExceptionDef_ptr &();
-+  operator const IR_ExceptionDef_ptr &() const;
-+  operator IR_ExceptionDef_ptr &();
-   // in, inout, out, _retn 
--  ExceptionDef_ptr in (void) const;
--  ExceptionDef_ptr &inout (void);
--  ExceptionDef_ptr &out (void);
--  ExceptionDef_ptr _retn (void);
--  ExceptionDef_ptr ptr (void) const;
-+  IR_ExceptionDef_ptr in (void) const;
-+  IR_ExceptionDef_ptr &inout (void);
-+  IR_ExceptionDef_ptr &out (void);
-+  IR_ExceptionDef_ptr _retn (void);
-+  IR_ExceptionDef_ptr ptr (void) const;
- 
- private:
--  ExceptionDef_ptr ptr_;
-+  IR_ExceptionDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  ExceptionDef_var (const TAO_Base_var &rhs);
--  ExceptionDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_ExceptionDef_var (const TAO_Base_var &rhs);
-+  IR_ExceptionDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EXCEPTIONDEF___OUT_CH_)
--#define _IR_EXCEPTIONDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ExceptionDef_out
-+class TAO_IFR_Client_Export IR_ExceptionDef_out
- {
- public:
--  ExceptionDef_out (ExceptionDef_ptr &);
--  ExceptionDef_out (ExceptionDef_var &);
--  ExceptionDef_out (const ExceptionDef_out &);
--  ExceptionDef_out &operator= (const ExceptionDef_out &);
--  ExceptionDef_out &operator= (const ExceptionDef_var &);
--  ExceptionDef_out &operator= (ExceptionDef_ptr);
--  operator ExceptionDef_ptr &();
--  ExceptionDef_ptr &ptr (void);
--  ExceptionDef_ptr operator-> (void);
-+  IR_ExceptionDef_out (IR_ExceptionDef_ptr &);
-+  IR_ExceptionDef_out (IR_ExceptionDef_var &);
-+  IR_ExceptionDef_out (const IR_ExceptionDef_out &);
-+  IR_ExceptionDef_out &operator= (const IR_ExceptionDef_out &);
-+  IR_ExceptionDef_out &operator= (const IR_ExceptionDef_var &);
-+  IR_ExceptionDef_out &operator= (IR_ExceptionDef_ptr);
-+  operator IR_ExceptionDef_ptr &();
-+  IR_ExceptionDef_ptr &ptr (void);
-+  IR_ExceptionDef_ptr operator-> (void);
-   
- private:
--  ExceptionDef_ptr &ptr_;
-+  IR_ExceptionDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--class NativeDef;
--
--#if !defined (_IR_NATIVEDEF___PTR_CH_)
--#define _IR_NATIVEDEF___PTR_CH_
--
--typedef NativeDef *NativeDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_NATIVEDEF___VAR_CH_)
--#define _IR_NATIVEDEF___VAR_CH_
--
--class TAO_IFR_Client_Export NativeDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_NativeDef_var : public TAO_Base_var
- {
- public:
--  NativeDef_var (void); // default constructor
--  NativeDef_var (NativeDef_ptr p) : ptr_ (p) {} 
--  NativeDef_var (const NativeDef_var &); // copy constructor
--  ~NativeDef_var (void); // destructor
-+  IR_NativeDef_var (void); // default constructor
-+  IR_NativeDef_var (IR_NativeDef_ptr p) : ptr_ (p) {}
-+  IR_NativeDef_var (const IR_NativeDef_var &); // copy constructor
-+  ~IR_NativeDef_var (void); // destructor
-   
--  NativeDef_var &operator= (NativeDef_ptr);
--  NativeDef_var &operator= (const NativeDef_var &);
--  NativeDef_ptr operator-> (void) const;
-+  IR_NativeDef_var &operator= (IR_NativeDef_ptr);
-+  IR_NativeDef_var &operator= (const IR_NativeDef_var &);
-+  IR_NativeDef_ptr operator-> (void) const;
-   
--  operator const NativeDef_ptr &() const;
--  operator NativeDef_ptr &();
-+  operator const IR_NativeDef_ptr &() const;
-+  operator IR_NativeDef_ptr &();
-   // in, inout, out, _retn 
--  NativeDef_ptr in (void) const;
--  NativeDef_ptr &inout (void);
--  NativeDef_ptr &out (void);
--  NativeDef_ptr _retn (void);
--  NativeDef_ptr ptr (void) const;
-+  IR_NativeDef_ptr in (void) const;
-+  IR_NativeDef_ptr &inout (void);
-+  IR_NativeDef_ptr &out (void);
-+  IR_NativeDef_ptr _retn (void);
-+  IR_NativeDef_ptr ptr (void) const;
- 
- private:
--  NativeDef_ptr ptr_;
-+  IR_NativeDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  NativeDef_var (const TAO_Base_var &rhs);
--  NativeDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_NativeDef_var (const TAO_Base_var &rhs);
-+  IR_NativeDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_NATIVEDEF___OUT_CH_)
--#define _IR_NATIVEDEF___OUT_CH_
--
--class TAO_IFR_Client_Export NativeDef_out
-+class TAO_IFR_Client_Export IR_NativeDef_out
- {
- public:
--  NativeDef_out (NativeDef_ptr &);
--  NativeDef_out (NativeDef_var &);
--  NativeDef_out (const NativeDef_out &);
--  NativeDef_out &operator= (const NativeDef_out &);
--  NativeDef_out &operator= (const NativeDef_var &);
--  NativeDef_out &operator= (NativeDef_ptr);
--  operator NativeDef_ptr &();
--  NativeDef_ptr &ptr (void);
--  NativeDef_ptr operator-> (void);
-+  IR_NativeDef_out (IR_NativeDef_ptr &);
-+  IR_NativeDef_out (IR_NativeDef_var &);
-+  IR_NativeDef_out (const IR_NativeDef_out &);
-+  IR_NativeDef_out &operator= (const IR_NativeDef_out &);
-+  IR_NativeDef_out &operator= (const IR_NativeDef_var &);
-+  IR_NativeDef_out &operator= (IR_NativeDef_ptr);
-+  operator IR_NativeDef_ptr &();
-+  IR_NativeDef_ptr &ptr (void);
-+  IR_NativeDef_ptr operator-> (void);
-   
- private:
--  NativeDef_ptr &ptr_;
-+  IR_NativeDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CH_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CH_
--
-   class _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -2526,19 +2010,19 @@
-     _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum);
-     _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      InterfaceDef* *value,
-+      IR_InterfaceDef* *value,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs);
-     virtual ~_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (void);
-     _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs);
--    TAO_Object_Manager<IR::InterfaceDef,IR::InterfaceDef_var> operator[] (CORBA::ULong index) const;
--    static InterfaceDef **allocbuf (CORBA::ULong nelems);
--    static void freebuf (InterfaceDef **buffer);
-+    TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var> operator[] (CORBA::ULong index) const;
-+    static IR_InterfaceDef **allocbuf (CORBA::ULong nelems);
-+    static void freebuf (IR_InterfaceDef **buffer);
-     // The Base_Sequence functions, please see tao/Sequence.h
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
--    InterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
--    const InterfaceDef* *get_buffer (void) const;
-+    IR_InterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_InterfaceDef* *get_buffer (void) const;
-     virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-     virtual void _downcast (
-         void* target,
-@@ -2550,193 +2034,139 @@
-     
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_INTERFACEDEFSEQ_CH_)
--#define _IR_INTERFACEDEFSEQ_CH_
--
--class InterfaceDefSeq;
--class InterfaceDefSeq_var;
--
- // *************************************************************
--// InterfaceDefSeq
-+// IR_InterfaceDefSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export InterfaceDefSeq : public 
-+class TAO_IFR_Client_Export IR_InterfaceDefSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<InterfaceDef,InterfaceDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_InterfaceDef,IR_InterfaceDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  InterfaceDefSeq (void); // default ctor
--  InterfaceDefSeq (CORBA::ULong max); // uses max size
--  InterfaceDefSeq (
-+  IR_InterfaceDefSeq (void); // default ctor
-+  IR_InterfaceDefSeq (CORBA::ULong max); // uses max size
-+  IR_InterfaceDefSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    InterfaceDef_ptr *buffer, 
-+    IR_InterfaceDef_ptr *buffer,
-     CORBA::Boolean release = 0
-   );
--  InterfaceDefSeq (const InterfaceDefSeq &); // copy ctor
--  ~InterfaceDefSeq (void);
-+  IR_InterfaceDefSeq (const IR_InterfaceDefSeq &); // copy ctor
-+  ~IR_InterfaceDefSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef InterfaceDefSeq_var _var_type;
-+  typedef IR_InterfaceDefSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
-+// *************************************************************
-+// class IR_InterfaceDefSeq_var
-+// *************************************************************
- 
--
--#if !defined (_IR_INTERFACEDEFSEQ___VAR_CH_)
--#define _IR_INTERFACEDEFSEQ___VAR_CH_
--
--// *************************************************************
--// class IR::InterfaceDefSeq_var
--// *************************************************************
--
--class TAO_IFR_Client_Export InterfaceDefSeq_var
-+class TAO_IFR_Client_Export IR_InterfaceDefSeq_var
- {
- public:
--  InterfaceDefSeq_var (void); // default constructor
--  InterfaceDefSeq_var (InterfaceDefSeq *);
--  InterfaceDefSeq_var (const InterfaceDefSeq_var &); // copy constructor
--  ~InterfaceDefSeq_var (void); // destructor
-+  IR_InterfaceDefSeq_var (void); // default constructor
-+  IR_InterfaceDefSeq_var (IR_InterfaceDefSeq *);
-+  IR_InterfaceDefSeq_var (const IR_InterfaceDefSeq_var &); // copy constructor
-+  ~IR_InterfaceDefSeq_var (void); // destructor
-   
--  InterfaceDefSeq_var &operator= (InterfaceDefSeq *);
--  InterfaceDefSeq_var &operator= (const InterfaceDefSeq_var &);
--  InterfaceDefSeq *operator-> (void);
--  const InterfaceDefSeq *operator-> (void) const;
-+  IR_InterfaceDefSeq_var &operator= (IR_InterfaceDefSeq *);
-+  IR_InterfaceDefSeq_var &operator= (const IR_InterfaceDefSeq_var &);
-+  IR_InterfaceDefSeq *operator-> (void);
-+  const IR_InterfaceDefSeq *operator-> (void) const;
-   
--  operator const InterfaceDefSeq &() const;
--  operator InterfaceDefSeq &();
--  operator InterfaceDefSeq &() const;
--  operator InterfaceDefSeq *&(); // variable-size base types only
-+  operator const IR_InterfaceDefSeq &() const;
-+  operator IR_InterfaceDefSeq &();
-+  operator IR_InterfaceDefSeq &() const;
-+  operator IR_InterfaceDefSeq *&(); // variable-size base types only
-   
--  TAO_Object_Manager<InterfaceDef, InterfaceDef_var> operator[] (CORBA::ULong index);
-+  TAO_Object_Manager<IR_InterfaceDef, IR_InterfaceDef_var> operator[] (CORBA::ULong index);
-   
-   // in, inout, out, _retn 
--  const InterfaceDefSeq &in (void) const;
--  InterfaceDefSeq &inout (void);
--  InterfaceDefSeq *&out (void);
--  InterfaceDefSeq *_retn (void);
--  InterfaceDefSeq *ptr (void) const;
-+  const IR_InterfaceDefSeq &in (void) const;
-+  IR_InterfaceDefSeq &inout (void);
-+  IR_InterfaceDefSeq *&out (void);
-+  IR_InterfaceDefSeq *_retn (void);
-+  IR_InterfaceDefSeq *ptr (void) const;
- 
- private:
--  InterfaceDefSeq *ptr_;
-+  IR_InterfaceDefSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_INTERFACEDEFSEQ___OUT_CH_)
--#define _IR_INTERFACEDEFSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export InterfaceDefSeq_out
-+class TAO_IFR_Client_Export IR_InterfaceDefSeq_out
- {
- public:
--  InterfaceDefSeq_out (InterfaceDefSeq *&);
--  InterfaceDefSeq_out (InterfaceDefSeq_var &);
--  InterfaceDefSeq_out (const InterfaceDefSeq_out &);
--  InterfaceDefSeq_out &operator= (const InterfaceDefSeq_out &);
--  InterfaceDefSeq_out &operator= (InterfaceDefSeq *);
--  operator InterfaceDefSeq *&();
--  InterfaceDefSeq *&ptr (void);
--  InterfaceDefSeq *operator-> (void);
--  TAO_Object_Manager<InterfaceDef, InterfaceDef_var> operator[] (CORBA::ULong index);
-+  IR_InterfaceDefSeq_out (IR_InterfaceDefSeq *&);
-+  IR_InterfaceDefSeq_out (IR_InterfaceDefSeq_var &);
-+  IR_InterfaceDefSeq_out (const IR_InterfaceDefSeq_out &);
-+  IR_InterfaceDefSeq_out &operator= (const IR_InterfaceDefSeq_out &);
-+  IR_InterfaceDefSeq_out &operator= (IR_InterfaceDefSeq *);
-+  operator IR_InterfaceDefSeq *&();
-+  IR_InterfaceDefSeq *&ptr (void);
-+  IR_InterfaceDefSeq *operator-> (void);
-+  TAO_Object_Manager<IR_InterfaceDef, IR_InterfaceDef_var> operator[] (CORBA::ULong index);
-   
- private:
--  InterfaceDefSeq *&ptr_;
-+  IR_InterfaceDefSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const InterfaceDefSeq_var &);
-+  void operator= (const IR_InterfaceDefSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDefSeq;
--
--class ValueDef;
--
--#if !defined (_IR_VALUEDEF___PTR_CH_)
--#define _IR_VALUEDEF___PTR_CH_
--
--typedef ValueDef *ValueDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEDEF___VAR_CH_)
--#define _IR_VALUEDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ValueDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_ValueDef_var : public TAO_Base_var
- {
- public:
--  ValueDef_var (void); // default constructor
--  ValueDef_var (ValueDef_ptr p) : ptr_ (p) {} 
--  ValueDef_var (const ValueDef_var &); // copy constructor
--  ~ValueDef_var (void); // destructor
-+  IR_ValueDef_var (void); // default constructor
-+  IR_ValueDef_var (IR_ValueDef_ptr p) : ptr_ (p) {}
-+  IR_ValueDef_var (const IR_ValueDef_var &); // copy constructor
-+  ~IR_ValueDef_var (void); // destructor
-   
--  ValueDef_var &operator= (ValueDef_ptr);
--  ValueDef_var &operator= (const ValueDef_var &);
--  ValueDef_ptr operator-> (void) const;
-+  IR_ValueDef_var &operator= (IR_ValueDef_ptr);
-+  IR_ValueDef_var &operator= (const IR_ValueDef_var &);
-+  IR_ValueDef_ptr operator-> (void) const;
-   
--  operator const ValueDef_ptr &() const;
--  operator ValueDef_ptr &();
-+  operator const IR_ValueDef_ptr &() const;
-+  operator IR_ValueDef_ptr &();
-   // in, inout, out, _retn 
--  ValueDef_ptr in (void) const;
--  ValueDef_ptr &inout (void);
--  ValueDef_ptr &out (void);
--  ValueDef_ptr _retn (void);
--  ValueDef_ptr ptr (void) const;
-+  IR_ValueDef_ptr in (void) const;
-+  IR_ValueDef_ptr &inout (void);
-+  IR_ValueDef_ptr &out (void);
-+  IR_ValueDef_ptr _retn (void);
-+  IR_ValueDef_ptr ptr (void) const;
- 
- private:
--  ValueDef_ptr ptr_;
-+  IR_ValueDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  ValueDef_var (const TAO_Base_var &rhs);
--  ValueDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_ValueDef_var (const TAO_Base_var &rhs);
-+  IR_ValueDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEDEF___OUT_CH_)
--#define _IR_VALUEDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ValueDef_out
-+class TAO_IFR_Client_Export IR_ValueDef_out
- {
- public:
--  ValueDef_out (ValueDef_ptr &);
--  ValueDef_out (ValueDef_var &);
--  ValueDef_out (const ValueDef_out &);
--  ValueDef_out &operator= (const ValueDef_out &);
--  ValueDef_out &operator= (const ValueDef_var &);
--  ValueDef_out &operator= (ValueDef_ptr);
--  operator ValueDef_ptr &();
--  ValueDef_ptr &ptr (void);
--  ValueDef_ptr operator-> (void);
-+  IR_ValueDef_out (IR_ValueDef_ptr &);
-+  IR_ValueDef_out (IR_ValueDef_var &);
-+  IR_ValueDef_out (const IR_ValueDef_out &);
-+  IR_ValueDef_out &operator= (const IR_ValueDef_out &);
-+  IR_ValueDef_out &operator= (const IR_ValueDef_var &);
-+  IR_ValueDef_out &operator= (IR_ValueDef_ptr);
-+  operator IR_ValueDef_ptr &();
-+  IR_ValueDef_ptr &ptr (void);
-+  IR_ValueDef_ptr operator-> (void);
-   
- private:
--  ValueDef_ptr &ptr_;
-+  IR_ValueDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CH_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CH_
--
-   class _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -2746,19 +2176,19 @@
-     _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum);
-     _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      ValueDef* *value,
-+      IR_ValueDef* *value,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs);
-     virtual ~_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (void);
-     _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs);
--    TAO_Object_Manager<IR::ValueDef,IR::ValueDef_var> operator[] (CORBA::ULong index) const;
--    static ValueDef **allocbuf (CORBA::ULong nelems);
--    static void freebuf (ValueDef **buffer);
-+    TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var> operator[] (CORBA::ULong index) const;
-+    static IR_ValueDef **allocbuf (CORBA::ULong nelems);
-+    static void freebuf (IR_ValueDef **buffer);
-     // The Base_Sequence functions, please see tao/Sequence.h
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
--    ValueDef* *get_buffer (CORBA::Boolean orphan = 0);
--    const ValueDef* *get_buffer (void) const;
-+    IR_ValueDef* *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_ValueDef* *get_buffer (void) const;
-     virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-     virtual void _downcast (
-         void* target,
-@@ -2770,261 +2200,184 @@
-     
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_VALUEDEFSEQ_CH_)
--#define _IR_VALUEDEFSEQ_CH_
--
--class ValueDefSeq;
--class ValueDefSeq_var;
--
- // *************************************************************
--// ValueDefSeq
-+// IR_ValueDefSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export ValueDefSeq : public 
-+class TAO_IFR_Client_Export IR_ValueDefSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<ValueDef,ValueDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ValueDef,IR_ValueDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  ValueDefSeq (void); // default ctor
--  ValueDefSeq (CORBA::ULong max); // uses max size
--  ValueDefSeq (
-+  IR_ValueDefSeq (void); // default ctor
-+  IR_ValueDefSeq (CORBA::ULong max); // uses max size
-+  IR_ValueDefSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    ValueDef_ptr *buffer, 
-+    IR_ValueDef_ptr *buffer,
-     CORBA::Boolean release = 0
-   );
--  ValueDefSeq (const ValueDefSeq &); // copy ctor
--  ~ValueDefSeq (void);
-+  IR_ValueDefSeq (const IR_ValueDefSeq &); // copy ctor
-+  ~IR_ValueDefSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ValueDefSeq_var _var_type;
-+  typedef IR_ValueDefSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEDEFSEQ___VAR_CH_)
--#define _IR_VALUEDEFSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::ValueDefSeq_var
-+// class IR_ValueDefSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export ValueDefSeq_var
-+class TAO_IFR_Client_Export IR_ValueDefSeq_var
- {
- public:
--  ValueDefSeq_var (void); // default constructor
--  ValueDefSeq_var (ValueDefSeq *);
--  ValueDefSeq_var (const ValueDefSeq_var &); // copy constructor
--  ~ValueDefSeq_var (void); // destructor
-+  IR_ValueDefSeq_var (void); // default constructor
-+  IR_ValueDefSeq_var (IR_ValueDefSeq *);
-+  IR_ValueDefSeq_var (const IR_ValueDefSeq_var &); // copy constructor
-+  ~IR_ValueDefSeq_var (void); // destructor
-   
--  ValueDefSeq_var &operator= (ValueDefSeq *);
--  ValueDefSeq_var &operator= (const ValueDefSeq_var &);
--  ValueDefSeq *operator-> (void);
--  const ValueDefSeq *operator-> (void) const;
-+  IR_ValueDefSeq_var &operator= (IR_ValueDefSeq *);
-+  IR_ValueDefSeq_var &operator= (const IR_ValueDefSeq_var &);
-+  IR_ValueDefSeq *operator-> (void);
-+  const IR_ValueDefSeq *operator-> (void) const;
-   
--  operator const ValueDefSeq &() const;
--  operator ValueDefSeq &();
--  operator ValueDefSeq &() const;
--  operator ValueDefSeq *&(); // variable-size base types only
-+  operator const IR_ValueDefSeq &() const;
-+  operator IR_ValueDefSeq &();
-+  operator IR_ValueDefSeq &() const;
-+  operator IR_ValueDefSeq *&(); // variable-size base types only
-   
--  TAO_Object_Manager<ValueDef, ValueDef_var> operator[] (CORBA::ULong index);
-+  TAO_Object_Manager<IR_ValueDef, IR_ValueDef_var> operator[] (CORBA::ULong index);
-   
-   // in, inout, out, _retn 
--  const ValueDefSeq &in (void) const;
--  ValueDefSeq &inout (void);
--  ValueDefSeq *&out (void);
--  ValueDefSeq *_retn (void);
--  ValueDefSeq *ptr (void) const;
-+  const IR_ValueDefSeq &in (void) const;
-+  IR_ValueDefSeq &inout (void);
-+  IR_ValueDefSeq *&out (void);
-+  IR_ValueDefSeq *_retn (void);
-+  IR_ValueDefSeq *ptr (void) const;
- 
- private:
--  ValueDefSeq *ptr_;
-+  IR_ValueDefSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEDEFSEQ___OUT_CH_)
--#define _IR_VALUEDEFSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export ValueDefSeq_out
-+class TAO_IFR_Client_Export IR_ValueDefSeq_out
- {
- public:
--  ValueDefSeq_out (ValueDefSeq *&);
--  ValueDefSeq_out (ValueDefSeq_var &);
--  ValueDefSeq_out (const ValueDefSeq_out &);
--  ValueDefSeq_out &operator= (const ValueDefSeq_out &);
--  ValueDefSeq_out &operator= (ValueDefSeq *);
--  operator ValueDefSeq *&();
--  ValueDefSeq *&ptr (void);
--  ValueDefSeq *operator-> (void);
--  TAO_Object_Manager<ValueDef, ValueDef_var> operator[] (CORBA::ULong index);
-+  IR_ValueDefSeq_out (IR_ValueDefSeq *&);
-+  IR_ValueDefSeq_out (IR_ValueDefSeq_var &);
-+  IR_ValueDefSeq_out (const IR_ValueDefSeq_out &);
-+  IR_ValueDefSeq_out &operator= (const IR_ValueDefSeq_out &);
-+  IR_ValueDefSeq_out &operator= (IR_ValueDefSeq *);
-+  operator IR_ValueDefSeq *&();
-+  IR_ValueDefSeq *&ptr (void);
-+  IR_ValueDefSeq *operator-> (void);
-+  TAO_Object_Manager<IR_ValueDef, IR_ValueDef_var> operator[] (CORBA::ULong index);
-   
- private:
--  ValueDefSeq *&ptr_;
-+  IR_ValueDefSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ValueDefSeq_var &);
-+  void operator= (const IR_ValueDefSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueDefSeq;
--
--class ValueBoxDef;
--
--#if !defined (_IR_VALUEBOXDEF___PTR_CH_)
--#define _IR_VALUEBOXDEF___PTR_CH_
--
--typedef ValueBoxDef *ValueBoxDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEBOXDEF___VAR_CH_)
--#define _IR_VALUEBOXDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ValueBoxDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_ValueBoxDef_var : public TAO_Base_var
- {
- public:
--  ValueBoxDef_var (void); // default constructor
--  ValueBoxDef_var (ValueBoxDef_ptr p) : ptr_ (p) {} 
--  ValueBoxDef_var (const ValueBoxDef_var &); // copy constructor
--  ~ValueBoxDef_var (void); // destructor
-+  IR_ValueBoxDef_var (void); // default constructor
-+  IR_ValueBoxDef_var (IR_ValueBoxDef_ptr p) : ptr_ (p) {}
-+  IR_ValueBoxDef_var (const IR_ValueBoxDef_var &); // copy constructor
-+  ~IR_ValueBoxDef_var (void); // destructor
-   
--  ValueBoxDef_var &operator= (ValueBoxDef_ptr);
--  ValueBoxDef_var &operator= (const ValueBoxDef_var &);
--  ValueBoxDef_ptr operator-> (void) const;
-+  IR_ValueBoxDef_var &operator= (IR_ValueBoxDef_ptr);
-+  IR_ValueBoxDef_var &operator= (const IR_ValueBoxDef_var &);
-+  IR_ValueBoxDef_ptr operator-> (void) const;
-   
--  operator const ValueBoxDef_ptr &() const;
--  operator ValueBoxDef_ptr &();
-+  operator const IR_ValueBoxDef_ptr &() const;
-+  operator IR_ValueBoxDef_ptr &();
-   // in, inout, out, _retn 
--  ValueBoxDef_ptr in (void) const;
--  ValueBoxDef_ptr &inout (void);
--  ValueBoxDef_ptr &out (void);
--  ValueBoxDef_ptr _retn (void);
--  ValueBoxDef_ptr ptr (void) const;
-+  IR_ValueBoxDef_ptr in (void) const;
-+  IR_ValueBoxDef_ptr &inout (void);
-+  IR_ValueBoxDef_ptr &out (void);
-+  IR_ValueBoxDef_ptr _retn (void);
-+  IR_ValueBoxDef_ptr ptr (void) const;
- 
- private:
--  ValueBoxDef_ptr ptr_;
-+  IR_ValueBoxDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  ValueBoxDef_var (const TAO_Base_var &rhs);
--  ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_ValueBoxDef_var (const TAO_Base_var &rhs);
-+  IR_ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEBOXDEF___OUT_CH_)
--#define _IR_VALUEBOXDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ValueBoxDef_out
-+class TAO_IFR_Client_Export IR_ValueBoxDef_out
- {
- public:
--  ValueBoxDef_out (ValueBoxDef_ptr &);
--  ValueBoxDef_out (ValueBoxDef_var &);
--  ValueBoxDef_out (const ValueBoxDef_out &);
--  ValueBoxDef_out &operator= (const ValueBoxDef_out &);
--  ValueBoxDef_out &operator= (const ValueBoxDef_var &);
--  ValueBoxDef_out &operator= (ValueBoxDef_ptr);
--  operator ValueBoxDef_ptr &();
--  ValueBoxDef_ptr &ptr (void);
--  ValueBoxDef_ptr operator-> (void);
-+  IR_ValueBoxDef_out (IR_ValueBoxDef_ptr &);
-+  IR_ValueBoxDef_out (IR_ValueBoxDef_var &);
-+  IR_ValueBoxDef_out (const IR_ValueBoxDef_out &);
-+  IR_ValueBoxDef_out &operator= (const IR_ValueBoxDef_out &);
-+  IR_ValueBoxDef_out &operator= (const IR_ValueBoxDef_var &);
-+  IR_ValueBoxDef_out &operator= (IR_ValueBoxDef_ptr);
-+  operator IR_ValueBoxDef_ptr &();
-+  IR_ValueBoxDef_ptr &ptr (void);
-+  IR_ValueBoxDef_ptr operator-> (void);
-   
- private:
--  ValueBoxDef_ptr &ptr_;
-+  IR_ValueBoxDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--class ComponentDef;
--
--#if !defined (_IR_COMPONENTDEF___PTR_CH_)
--#define _IR_COMPONENTDEF___PTR_CH_
--
--typedef ComponentDef *ComponentDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_COMPONENTDEF___VAR_CH_)
--#define _IR_COMPONENTDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ComponentDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_ComponentDef_var : public TAO_Base_var
- {
- public:
--  ComponentDef_var (void); // default constructor
--  ComponentDef_var (ComponentDef_ptr p) : ptr_ (p) {} 
--  ComponentDef_var (const ComponentDef_var &); // copy constructor
--  ~ComponentDef_var (void); // destructor
-+  IR_ComponentDef_var (void); // default constructor
-+  IR_ComponentDef_var (IR_ComponentDef_ptr p) : ptr_ (p) {}
-+  IR_ComponentDef_var (const IR_ComponentDef_var &); // copy constructor
-+  ~IR_ComponentDef_var (void); // destructor
-   
--  ComponentDef_var &operator= (ComponentDef_ptr);
--  ComponentDef_var &operator= (const ComponentDef_var &);
--  ComponentDef_ptr operator-> (void) const;
-+  IR_ComponentDef_var &operator= (IR_ComponentDef_ptr);
-+  IR_ComponentDef_var &operator= (const IR_ComponentDef_var &);
-+  IR_ComponentDef_ptr operator-> (void) const;
-   
--  operator const ComponentDef_ptr &() const;
--  operator ComponentDef_ptr &();
-+  operator const IR_ComponentDef_ptr &() const;
-+  operator IR_ComponentDef_ptr &();
-   // in, inout, out, _retn 
--  ComponentDef_ptr in (void) const;
--  ComponentDef_ptr &inout (void);
--  ComponentDef_ptr &out (void);
--  ComponentDef_ptr _retn (void);
--  ComponentDef_ptr ptr (void) const;
-+  IR_ComponentDef_ptr in (void) const;
-+  IR_ComponentDef_ptr &inout (void);
-+  IR_ComponentDef_ptr &out (void);
-+  IR_ComponentDef_ptr _retn (void);
-+  IR_ComponentDef_ptr ptr (void) const;
- 
- private:
--  ComponentDef_ptr ptr_;
-+  IR_ComponentDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  ComponentDef_var (const TAO_Base_var &rhs);
--  ComponentDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_ComponentDef_var (const TAO_Base_var &rhs);
-+  IR_ComponentDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_COMPONENTDEF___OUT_CH_)
--#define _IR_COMPONENTDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ComponentDef_out
-+class TAO_IFR_Client_Export IR_ComponentDef_out
- {
- public:
--  ComponentDef_out (ComponentDef_ptr &);
--  ComponentDef_out (ComponentDef_var &);
--  ComponentDef_out (const ComponentDef_out &);
--  ComponentDef_out &operator= (const ComponentDef_out &);
--  ComponentDef_out &operator= (const ComponentDef_var &);
--  ComponentDef_out &operator= (ComponentDef_ptr);
--  operator ComponentDef_ptr &();
--  ComponentDef_ptr &ptr (void);
--  ComponentDef_ptr operator-> (void);
-+  IR_ComponentDef_out (IR_ComponentDef_ptr &);
-+  IR_ComponentDef_out (IR_ComponentDef_var &);
-+  IR_ComponentDef_out (const IR_ComponentDef_out &);
-+  IR_ComponentDef_out &operator= (const IR_ComponentDef_out &);
-+  IR_ComponentDef_out &operator= (const IR_ComponentDef_var &);
-+  IR_ComponentDef_out &operator= (IR_ComponentDef_ptr);
-+  operator IR_ComponentDef_ptr &();
-+  IR_ComponentDef_ptr &ptr (void);
-+  IR_ComponentDef_ptr operator-> (void);
-   
- private:
--  ComponentDef_ptr &ptr_;
-+  IR_ComponentDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CH_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CH_
--
-   class _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -3034,19 +2387,19 @@
-     _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum);
-     _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      ComponentDef* *value,
-+      IR_ComponentDef* *value,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs);
-     virtual ~_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void);
-     _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs);
--    TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var> operator[] (CORBA::ULong index) const;
--    static ComponentDef **allocbuf (CORBA::ULong nelems);
--    static void freebuf (ComponentDef **buffer);
-+    TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var> operator[] (CORBA::ULong index) const;
-+    static IR_ComponentDef **allocbuf (CORBA::ULong nelems);
-+    static void freebuf (IR_ComponentDef **buffer);
-     // The Base_Sequence functions, please see tao/Sequence.h
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
--    ComponentDef* *get_buffer (CORBA::Boolean orphan = 0);
--    const ComponentDef* *get_buffer (void) const;
-+    IR_ComponentDef* *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_ComponentDef* *get_buffer (void) const;
-     virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-     virtual void _downcast (
-         void* target,
-@@ -3058,193 +2411,139 @@
-     
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_COMPONENTDEFSEQ_CH_)
--#define _IR_COMPONENTDEFSEQ_CH_
--
--class ComponentDefSeq;
--class ComponentDefSeq_var;
--
- // *************************************************************
--// ComponentDefSeq
-+// IR_ComponentDefSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export ComponentDefSeq : public 
-+class TAO_IFR_Client_Export IR_ComponentDefSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<ComponentDef,ComponentDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ComponentDef,IR_ComponentDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  ComponentDefSeq (void); // default ctor
--  ComponentDefSeq (CORBA::ULong max); // uses max size
--  ComponentDefSeq (
-+  IR_ComponentDefSeq (void); // default ctor
-+  IR_ComponentDefSeq (CORBA::ULong max); // uses max size
-+  IR_ComponentDefSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    ComponentDef_ptr *buffer, 
-+    IR_ComponentDef_ptr *buffer,
-     CORBA::Boolean release = 0
-   );
--  ComponentDefSeq (const ComponentDefSeq &); // copy ctor
--  ~ComponentDefSeq (void);
-+  IR_ComponentDefSeq (const IR_ComponentDefSeq &); // copy ctor
-+  ~IR_ComponentDefSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ComponentDefSeq_var _var_type;
-+  typedef IR_ComponentDefSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_COMPONENTDEFSEQ___VAR_CH_)
--#define _IR_COMPONENTDEFSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::ComponentDefSeq_var
-+// class IR_ComponentDefSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export ComponentDefSeq_var
-+class TAO_IFR_Client_Export IR_ComponentDefSeq_var
- {
- public:
--  ComponentDefSeq_var (void); // default constructor
--  ComponentDefSeq_var (ComponentDefSeq *);
--  ComponentDefSeq_var (const ComponentDefSeq_var &); // copy constructor
--  ~ComponentDefSeq_var (void); // destructor
-+  IR_ComponentDefSeq_var (void); // default constructor
-+  IR_ComponentDefSeq_var (IR_ComponentDefSeq *);
-+  IR_ComponentDefSeq_var (const IR_ComponentDefSeq_var &); // copy constructor
-+  ~IR_ComponentDefSeq_var (void); // destructor
-   
--  ComponentDefSeq_var &operator= (ComponentDefSeq *);
--  ComponentDefSeq_var &operator= (const ComponentDefSeq_var &);
--  ComponentDefSeq *operator-> (void);
--  const ComponentDefSeq *operator-> (void) const;
-+  IR_ComponentDefSeq_var &operator= (IR_ComponentDefSeq *);
-+  IR_ComponentDefSeq_var &operator= (const IR_ComponentDefSeq_var &);
-+  IR_ComponentDefSeq *operator-> (void);
-+  const IR_ComponentDefSeq *operator-> (void) const;
-   
--  operator const ComponentDefSeq &() const;
--  operator ComponentDefSeq &();
--  operator ComponentDefSeq &() const;
--  operator ComponentDefSeq *&(); // variable-size base types only
-+  operator const IR_ComponentDefSeq &() const;
-+  operator IR_ComponentDefSeq &();
-+  operator IR_ComponentDefSeq &() const;
-+  operator IR_ComponentDefSeq *&(); // variable-size base types only
-   
--  TAO_Object_Manager<ComponentDef, ComponentDef_var> operator[] (CORBA::ULong index);
-+  TAO_Object_Manager<IR_ComponentDef, IR_ComponentDef_var> operator[] (CORBA::ULong index);
-   
-   // in, inout, out, _retn 
--  const ComponentDefSeq &in (void) const;
--  ComponentDefSeq &inout (void);
--  ComponentDefSeq *&out (void);
--  ComponentDefSeq *_retn (void);
--  ComponentDefSeq *ptr (void) const;
-+  const IR_ComponentDefSeq &in (void) const;
-+  IR_ComponentDefSeq &inout (void);
-+  IR_ComponentDefSeq *&out (void);
-+  IR_ComponentDefSeq *_retn (void);
-+  IR_ComponentDefSeq *ptr (void) const;
- 
- private:
--  ComponentDefSeq *ptr_;
-+  IR_ComponentDefSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_COMPONENTDEFSEQ___OUT_CH_)
--#define _IR_COMPONENTDEFSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export ComponentDefSeq_out
-+class TAO_IFR_Client_Export IR_ComponentDefSeq_out
- {
- public:
--  ComponentDefSeq_out (ComponentDefSeq *&);
--  ComponentDefSeq_out (ComponentDefSeq_var &);
--  ComponentDefSeq_out (const ComponentDefSeq_out &);
--  ComponentDefSeq_out &operator= (const ComponentDefSeq_out &);
--  ComponentDefSeq_out &operator= (ComponentDefSeq *);
--  operator ComponentDefSeq *&();
--  ComponentDefSeq *&ptr (void);
--  ComponentDefSeq *operator-> (void);
--  TAO_Object_Manager<ComponentDef, ComponentDef_var> operator[] (CORBA::ULong index);
-+  IR_ComponentDefSeq_out (IR_ComponentDefSeq *&);
-+  IR_ComponentDefSeq_out (IR_ComponentDefSeq_var &);
-+  IR_ComponentDefSeq_out (const IR_ComponentDefSeq_out &);
-+  IR_ComponentDefSeq_out &operator= (const IR_ComponentDefSeq_out &);
-+  IR_ComponentDefSeq_out &operator= (IR_ComponentDefSeq *);
-+  operator IR_ComponentDefSeq *&();
-+  IR_ComponentDefSeq *&ptr (void);
-+  IR_ComponentDefSeq *operator-> (void);
-+  TAO_Object_Manager<IR_ComponentDef, IR_ComponentDef_var> operator[] (CORBA::ULong index);
-   
- private:
--  ComponentDefSeq *&ptr_;
-+  IR_ComponentDefSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ComponentDefSeq_var &);
-+  void operator= (const IR_ComponentDefSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentDefSeq;
--
--class ProvidesDef;
--
--#if !defined (_IR_PROVIDESDEF___PTR_CH_)
--#define _IR_PROVIDESDEF___PTR_CH_
--
--typedef ProvidesDef *ProvidesDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PROVIDESDEF___VAR_CH_)
--#define _IR_PROVIDESDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ProvidesDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_ProvidesDef_var : public TAO_Base_var
- {
- public:
--  ProvidesDef_var (void); // default constructor
--  ProvidesDef_var (ProvidesDef_ptr p) : ptr_ (p) {} 
--  ProvidesDef_var (const ProvidesDef_var &); // copy constructor
--  ~ProvidesDef_var (void); // destructor
-+  IR_ProvidesDef_var (void); // default constructor
-+  IR_ProvidesDef_var (IR_ProvidesDef_ptr p) : ptr_ (p) {}
-+  IR_ProvidesDef_var (const IR_ProvidesDef_var &); // copy constructor
-+  ~IR_ProvidesDef_var (void); // destructor
-   
--  ProvidesDef_var &operator= (ProvidesDef_ptr);
--  ProvidesDef_var &operator= (const ProvidesDef_var &);
--  ProvidesDef_ptr operator-> (void) const;
-+  IR_ProvidesDef_var &operator= (IR_ProvidesDef_ptr);
-+  IR_ProvidesDef_var &operator= (const IR_ProvidesDef_var &);
-+  IR_ProvidesDef_ptr operator-> (void) const;
-   
--  operator const ProvidesDef_ptr &() const;
--  operator ProvidesDef_ptr &();
-+  operator const IR_ProvidesDef_ptr &() const;
-+  operator IR_ProvidesDef_ptr &();
-   // in, inout, out, _retn 
--  ProvidesDef_ptr in (void) const;
--  ProvidesDef_ptr &inout (void);
--  ProvidesDef_ptr &out (void);
--  ProvidesDef_ptr _retn (void);
--  ProvidesDef_ptr ptr (void) const;
-+  IR_ProvidesDef_ptr in (void) const;
-+  IR_ProvidesDef_ptr &inout (void);
-+  IR_ProvidesDef_ptr &out (void);
-+  IR_ProvidesDef_ptr _retn (void);
-+  IR_ProvidesDef_ptr ptr (void) const;
- 
- private:
--  ProvidesDef_ptr ptr_;
-+  IR_ProvidesDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  ProvidesDef_var (const TAO_Base_var &rhs);
--  ProvidesDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_ProvidesDef_var (const TAO_Base_var &rhs);
-+  IR_ProvidesDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PROVIDESDEF___OUT_CH_)
--#define _IR_PROVIDESDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ProvidesDef_out
-+class TAO_IFR_Client_Export IR_ProvidesDef_out
- {
- public:
--  ProvidesDef_out (ProvidesDef_ptr &);
--  ProvidesDef_out (ProvidesDef_var &);
--  ProvidesDef_out (const ProvidesDef_out &);
--  ProvidesDef_out &operator= (const ProvidesDef_out &);
--  ProvidesDef_out &operator= (const ProvidesDef_var &);
--  ProvidesDef_out &operator= (ProvidesDef_ptr);
--  operator ProvidesDef_ptr &();
--  ProvidesDef_ptr &ptr (void);
--  ProvidesDef_ptr operator-> (void);
-+  IR_ProvidesDef_out (IR_ProvidesDef_ptr &);
-+  IR_ProvidesDef_out (IR_ProvidesDef_var &);
-+  IR_ProvidesDef_out (const IR_ProvidesDef_out &);
-+  IR_ProvidesDef_out &operator= (const IR_ProvidesDef_out &);
-+  IR_ProvidesDef_out &operator= (const IR_ProvidesDef_var &);
-+  IR_ProvidesDef_out &operator= (IR_ProvidesDef_ptr);
-+  operator IR_ProvidesDef_ptr &();
-+  IR_ProvidesDef_ptr &ptr (void);
-+  IR_ProvidesDef_ptr operator-> (void);
-   
- private:
--  ProvidesDef_ptr &ptr_;
-+  IR_ProvidesDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CH_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CH_
--
-   class _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -3254,19 +2553,19 @@
-     _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum);
-     _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      ProvidesDef* *value,
-+      IR_ProvidesDef* *value,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs);
-     virtual ~_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void);
-     _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs);
--    TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var> operator[] (CORBA::ULong index) const;
--    static ProvidesDef **allocbuf (CORBA::ULong nelems);
--    static void freebuf (ProvidesDef **buffer);
-+    TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var> operator[] (CORBA::ULong index) const;
-+    static IR_ProvidesDef **allocbuf (CORBA::ULong nelems);
-+    static void freebuf (IR_ProvidesDef **buffer);
-     // The Base_Sequence functions, please see tao/Sequence.h
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
--    ProvidesDef* *get_buffer (CORBA::Boolean orphan = 0);
--    const ProvidesDef* *get_buffer (void) const;
-+    IR_ProvidesDef* *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_ProvidesDef* *get_buffer (void) const;
-     virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-     virtual void _downcast (
-         void* target,
-@@ -3278,193 +2577,139 @@
-     
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_PROVIDESDEFSEQ_CH_)
--#define _IR_PROVIDESDEFSEQ_CH_
--
--class ProvidesDefSeq;
--class ProvidesDefSeq_var;
--
- // *************************************************************
--// ProvidesDefSeq
-+// IR_ProvidesDefSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export ProvidesDefSeq : public 
-+class TAO_IFR_Client_Export IR_ProvidesDefSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<ProvidesDef,ProvidesDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ProvidesDef,IR_ProvidesDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  ProvidesDefSeq (void); // default ctor
--  ProvidesDefSeq (CORBA::ULong max); // uses max size
--  ProvidesDefSeq (
-+  IR_ProvidesDefSeq (void); // default ctor
-+  IR_ProvidesDefSeq (CORBA::ULong max); // uses max size
-+  IR_ProvidesDefSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    ProvidesDef_ptr *buffer, 
-+    IR_ProvidesDef_ptr *buffer,
-     CORBA::Boolean release = 0
-   );
--  ProvidesDefSeq (const ProvidesDefSeq &); // copy ctor
--  ~ProvidesDefSeq (void);
-+  IR_ProvidesDefSeq (const IR_ProvidesDefSeq &); // copy ctor
-+  ~IR_ProvidesDefSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ProvidesDefSeq_var _var_type;
-+  typedef IR_ProvidesDefSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PROVIDESDEFSEQ___VAR_CH_)
--#define _IR_PROVIDESDEFSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::ProvidesDefSeq_var
-+// class IR_ProvidesDefSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export ProvidesDefSeq_var
-+class TAO_IFR_Client_Export IR_ProvidesDefSeq_var
- {
- public:
--  ProvidesDefSeq_var (void); // default constructor
--  ProvidesDefSeq_var (ProvidesDefSeq *);
--  ProvidesDefSeq_var (const ProvidesDefSeq_var &); // copy constructor
--  ~ProvidesDefSeq_var (void); // destructor
-+  IR_ProvidesDefSeq_var (void); // default constructor
-+  IR_ProvidesDefSeq_var (IR_ProvidesDefSeq *);
-+  IR_ProvidesDefSeq_var (const IR_ProvidesDefSeq_var &); // copy constructor
-+  ~IR_ProvidesDefSeq_var (void); // destructor
-   
--  ProvidesDefSeq_var &operator= (ProvidesDefSeq *);
--  ProvidesDefSeq_var &operator= (const ProvidesDefSeq_var &);
--  ProvidesDefSeq *operator-> (void);
--  const ProvidesDefSeq *operator-> (void) const;
-+  IR_ProvidesDefSeq_var &operator= (IR_ProvidesDefSeq *);
-+  IR_ProvidesDefSeq_var &operator= (const IR_ProvidesDefSeq_var &);
-+  IR_ProvidesDefSeq *operator-> (void);
-+  const IR_ProvidesDefSeq *operator-> (void) const;
-   
--  operator const ProvidesDefSeq &() const;
--  operator ProvidesDefSeq &();
--  operator ProvidesDefSeq &() const;
--  operator ProvidesDefSeq *&(); // variable-size base types only
-+  operator const IR_ProvidesDefSeq &() const;
-+  operator IR_ProvidesDefSeq &();
-+  operator IR_ProvidesDefSeq &() const;
-+  operator IR_ProvidesDefSeq *&(); // variable-size base types only
-   
--  TAO_Object_Manager<ProvidesDef, ProvidesDef_var> operator[] (CORBA::ULong index);
-+  TAO_Object_Manager<IR_ProvidesDef, IR_ProvidesDef_var> operator[] (CORBA::ULong index);
-   
-   // in, inout, out, _retn 
--  const ProvidesDefSeq &in (void) const;
--  ProvidesDefSeq &inout (void);
--  ProvidesDefSeq *&out (void);
--  ProvidesDefSeq *_retn (void);
--  ProvidesDefSeq *ptr (void) const;
-+  const IR_ProvidesDefSeq &in (void) const;
-+  IR_ProvidesDefSeq &inout (void);
-+  IR_ProvidesDefSeq *&out (void);
-+  IR_ProvidesDefSeq *_retn (void);
-+  IR_ProvidesDefSeq *ptr (void) const;
- 
- private:
--  ProvidesDefSeq *ptr_;
-+  IR_ProvidesDefSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PROVIDESDEFSEQ___OUT_CH_)
--#define _IR_PROVIDESDEFSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export ProvidesDefSeq_out
-+class TAO_IFR_Client_Export IR_ProvidesDefSeq_out
- {
- public:
--  ProvidesDefSeq_out (ProvidesDefSeq *&);
--  ProvidesDefSeq_out (ProvidesDefSeq_var &);
--  ProvidesDefSeq_out (const ProvidesDefSeq_out &);
--  ProvidesDefSeq_out &operator= (const ProvidesDefSeq_out &);
--  ProvidesDefSeq_out &operator= (ProvidesDefSeq *);
--  operator ProvidesDefSeq *&();
--  ProvidesDefSeq *&ptr (void);
--  ProvidesDefSeq *operator-> (void);
--  TAO_Object_Manager<ProvidesDef, ProvidesDef_var> operator[] (CORBA::ULong index);
-+  IR_ProvidesDefSeq_out (IR_ProvidesDefSeq *&);
-+  IR_ProvidesDefSeq_out (IR_ProvidesDefSeq_var &);
-+  IR_ProvidesDefSeq_out (const IR_ProvidesDefSeq_out &);
-+  IR_ProvidesDefSeq_out &operator= (const IR_ProvidesDefSeq_out &);
-+  IR_ProvidesDefSeq_out &operator= (IR_ProvidesDefSeq *);
-+  operator IR_ProvidesDefSeq *&();
-+  IR_ProvidesDefSeq *&ptr (void);
-+  IR_ProvidesDefSeq *operator-> (void);
-+  TAO_Object_Manager<IR_ProvidesDef, IR_ProvidesDef_var> operator[] (CORBA::ULong index);
-   
- private:
--  ProvidesDefSeq *&ptr_;
-+  IR_ProvidesDefSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ProvidesDefSeq_var &);
-+  void operator= (const IR_ProvidesDefSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDefSeq;
--
--class UsesDef;
--
--#if !defined (_IR_USESDEF___PTR_CH_)
--#define _IR_USESDEF___PTR_CH_
--
--typedef UsesDef *UsesDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_USESDEF___VAR_CH_)
--#define _IR_USESDEF___VAR_CH_
--
--class TAO_IFR_Client_Export UsesDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_UsesDef_var : public TAO_Base_var
- {
- public:
--  UsesDef_var (void); // default constructor
--  UsesDef_var (UsesDef_ptr p) : ptr_ (p) {} 
--  UsesDef_var (const UsesDef_var &); // copy constructor
--  ~UsesDef_var (void); // destructor
-+  IR_UsesDef_var (void); // default constructor
-+  IR_UsesDef_var (IR_UsesDef_ptr p) : ptr_ (p) {}
-+  IR_UsesDef_var (const IR_UsesDef_var &); // copy constructor
-+  ~IR_UsesDef_var (void); // destructor
-   
--  UsesDef_var &operator= (UsesDef_ptr);
--  UsesDef_var &operator= (const UsesDef_var &);
--  UsesDef_ptr operator-> (void) const;
-+  IR_UsesDef_var &operator= (IR_UsesDef_ptr);
-+  IR_UsesDef_var &operator= (const IR_UsesDef_var &);
-+  IR_UsesDef_ptr operator-> (void) const;
-   
--  operator const UsesDef_ptr &() const;
--  operator UsesDef_ptr &();
-+  operator const IR_UsesDef_ptr &() const;
-+  operator IR_UsesDef_ptr &();
-   // in, inout, out, _retn 
--  UsesDef_ptr in (void) const;
--  UsesDef_ptr &inout (void);
--  UsesDef_ptr &out (void);
--  UsesDef_ptr _retn (void);
--  UsesDef_ptr ptr (void) const;
-+  IR_UsesDef_ptr in (void) const;
-+  IR_UsesDef_ptr &inout (void);
-+  IR_UsesDef_ptr &out (void);
-+  IR_UsesDef_ptr _retn (void);
-+  IR_UsesDef_ptr ptr (void) const;
- 
- private:
--  UsesDef_ptr ptr_;
-+  IR_UsesDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  UsesDef_var (const TAO_Base_var &rhs);
--  UsesDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_UsesDef_var (const TAO_Base_var &rhs);
-+  IR_UsesDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_USESDEF___OUT_CH_)
--#define _IR_USESDEF___OUT_CH_
--
--class TAO_IFR_Client_Export UsesDef_out
-+class TAO_IFR_Client_Export IR_UsesDef_out
- {
- public:
--  UsesDef_out (UsesDef_ptr &);
--  UsesDef_out (UsesDef_var &);
--  UsesDef_out (const UsesDef_out &);
--  UsesDef_out &operator= (const UsesDef_out &);
--  UsesDef_out &operator= (const UsesDef_var &);
--  UsesDef_out &operator= (UsesDef_ptr);
--  operator UsesDef_ptr &();
--  UsesDef_ptr &ptr (void);
--  UsesDef_ptr operator-> (void);
-+  IR_UsesDef_out (IR_UsesDef_ptr &);
-+  IR_UsesDef_out (IR_UsesDef_var &);
-+  IR_UsesDef_out (const IR_UsesDef_out &);
-+  IR_UsesDef_out &operator= (const IR_UsesDef_out &);
-+  IR_UsesDef_out &operator= (const IR_UsesDef_var &);
-+  IR_UsesDef_out &operator= (IR_UsesDef_ptr);
-+  operator IR_UsesDef_ptr &();
-+  IR_UsesDef_ptr &ptr (void);
-+  IR_UsesDef_ptr operator-> (void);
-   
- private:
--  UsesDef_ptr &ptr_;
-+  IR_UsesDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CH_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CH_
--
-   class _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -3474,19 +2719,19 @@
-     _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum);
-     _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      UsesDef* *value,
-+      IR_UsesDef* *value,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs);
-     virtual ~_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void);
-     _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs);
--    TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var> operator[] (CORBA::ULong index) const;
--    static UsesDef **allocbuf (CORBA::ULong nelems);
--    static void freebuf (UsesDef **buffer);
-+    TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var> operator[] (CORBA::ULong index) const;
-+    static IR_UsesDef **allocbuf (CORBA::ULong nelems);
-+    static void freebuf (IR_UsesDef **buffer);
-     // The Base_Sequence functions, please see tao/Sequence.h
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
--    UsesDef* *get_buffer (CORBA::Boolean orphan = 0);
--    const UsesDef* *get_buffer (void) const;
-+    IR_UsesDef* *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_UsesDef* *get_buffer (void) const;
-     virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-     virtual void _downcast (
-         void* target,
-@@ -3498,193 +2743,140 @@
-     
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_USESDEFSEQ_CH_)
--#define _IR_USESDEFSEQ_CH_
--
--class UsesDefSeq;
--class UsesDefSeq_var;
--
- // *************************************************************
--// UsesDefSeq
-+// IR_UsesDefSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export UsesDefSeq : public 
-+class TAO_IFR_Client_Export IR_UsesDefSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<UsesDef,UsesDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_UsesDef,IR_UsesDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  UsesDefSeq (void); // default ctor
--  UsesDefSeq (CORBA::ULong max); // uses max size
--  UsesDefSeq (
-+  IR_UsesDefSeq (void); // default ctor
-+  IR_UsesDefSeq (CORBA::ULong max); // uses max size
-+  IR_UsesDefSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    UsesDef_ptr *buffer, 
-+    IR_UsesDef_ptr *buffer,
-     CORBA::Boolean release = 0
-   );
--  UsesDefSeq (const UsesDefSeq &); // copy ctor
--  ~UsesDefSeq (void);
-+  IR_UsesDefSeq (const IR_UsesDefSeq &); // copy ctor
-+  ~IR_UsesDefSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef UsesDefSeq_var _var_type;
-+  typedef IR_UsesDefSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_USESDEFSEQ___VAR_CH_)
--#define _IR_USESDEFSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::UsesDefSeq_var
-+// class IR_UsesDefSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export UsesDefSeq_var
-+class TAO_IFR_Client_Export IR_UsesDefSeq_var
- {
- public:
--  UsesDefSeq_var (void); // default constructor
--  UsesDefSeq_var (UsesDefSeq *);
--  UsesDefSeq_var (const UsesDefSeq_var &); // copy constructor
--  ~UsesDefSeq_var (void); // destructor
-+  IR_UsesDefSeq_var (void); // default constructor
-+  IR_UsesDefSeq_var (IR_UsesDefSeq *);
-+  IR_UsesDefSeq_var (const IR_UsesDefSeq_var &); // copy constructor
-+  ~IR_UsesDefSeq_var (void); // destructor
-   
--  UsesDefSeq_var &operator= (UsesDefSeq *);
--  UsesDefSeq_var &operator= (const UsesDefSeq_var &);
--  UsesDefSeq *operator-> (void);
--  const UsesDefSeq *operator-> (void) const;
-+  IR_UsesDefSeq_var &operator= (IR_UsesDefSeq *);
-+  IR_UsesDefSeq_var &operator= (const IR_UsesDefSeq_var &);
-+  IR_UsesDefSeq *operator-> (void);
-+  const IR_UsesDefSeq *operator-> (void) const;
-   
--  operator const UsesDefSeq &() const;
--  operator UsesDefSeq &();
--  operator UsesDefSeq &() const;
--  operator UsesDefSeq *&(); // variable-size base types only
-+  operator const IR_UsesDefSeq &() const;
-+  operator IR_UsesDefSeq &();
-+  operator IR_UsesDefSeq &() const;
-+  operator IR_UsesDefSeq *&(); // variable-size base types only
-   
--  TAO_Object_Manager<UsesDef, UsesDef_var> operator[] (CORBA::ULong index);
-+  TAO_Object_Manager<IR_UsesDef, IR_UsesDef_var> operator[] (CORBA::ULong index);
-   
-   // in, inout, out, _retn 
--  const UsesDefSeq &in (void) const;
--  UsesDefSeq &inout (void);
--  UsesDefSeq *&out (void);
--  UsesDefSeq *_retn (void);
--  UsesDefSeq *ptr (void) const;
-+  const IR_UsesDefSeq &in (void) const;
-+  IR_UsesDefSeq &inout (void);
-+  IR_UsesDefSeq *&out (void);
-+  IR_UsesDefSeq *_retn (void);
-+  IR_UsesDefSeq *ptr (void) const;
- 
- private:
--  UsesDefSeq *ptr_;
-+  IR_UsesDefSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_USESDEFSEQ___OUT_CH_)
--#define _IR_USESDEFSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export UsesDefSeq_out
-+class TAO_IFR_Client_Export IR_UsesDefSeq_out
- {
- public:
--  UsesDefSeq_out (UsesDefSeq *&);
--  UsesDefSeq_out (UsesDefSeq_var &);
--  UsesDefSeq_out (const UsesDefSeq_out &);
--  UsesDefSeq_out &operator= (const UsesDefSeq_out &);
--  UsesDefSeq_out &operator= (UsesDefSeq *);
--  operator UsesDefSeq *&();
--  UsesDefSeq *&ptr (void);
--  UsesDefSeq *operator-> (void);
--  TAO_Object_Manager<UsesDef, UsesDef_var> operator[] (CORBA::ULong index);
-+  IR_UsesDefSeq_out (IR_UsesDefSeq *&);
-+  IR_UsesDefSeq_out (IR_UsesDefSeq_var &);
-+  IR_UsesDefSeq_out (const IR_UsesDefSeq_out &);
-+  IR_UsesDefSeq_out &operator= (const IR_UsesDefSeq_out &);
-+  IR_UsesDefSeq_out &operator= (IR_UsesDefSeq *);
-+  operator IR_UsesDefSeq *&();
-+  IR_UsesDefSeq *&ptr (void);
-+  IR_UsesDefSeq *operator-> (void);
-+  TAO_Object_Manager<IR_UsesDef, IR_UsesDef_var> operator[] (CORBA::ULong index);
-   
- private:
--  UsesDefSeq *&ptr_;
-+  IR_UsesDefSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const UsesDefSeq_var &);
-+  void operator= (const IR_UsesDefSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDefSeq;
--
--class HomeDef;
--
--#if !defined (_IR_HOMEDEF___PTR_CH_)
--#define _IR_HOMEDEF___PTR_CH_
--
--typedef HomeDef *HomeDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_HOMEDEF___VAR_CH_)
--#define _IR_HOMEDEF___VAR_CH_
--
--class TAO_IFR_Client_Export HomeDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_HomeDef_var : public TAO_Base_var
- {
- public:
--  HomeDef_var (void); // default constructor
--  HomeDef_var (HomeDef_ptr p) : ptr_ (p) {} 
--  HomeDef_var (const HomeDef_var &); // copy constructor
--  ~HomeDef_var (void); // destructor
-+  IR_HomeDef_var (void); // default constructor
-+  IR_HomeDef_var (IR_HomeDef_ptr p) : ptr_ (p) {}
-+  IR_HomeDef_var (const IR_HomeDef_var &); // copy constructor
-+  ~IR_HomeDef_var (void); // destructor
-   
--  HomeDef_var &operator= (HomeDef_ptr);
--  HomeDef_var &operator= (const HomeDef_var &);
--  HomeDef_ptr operator-> (void) const;
-+  IR_HomeDef_var &operator= (IR_HomeDef_ptr);
-+  IR_HomeDef_var &operator= (const IR_HomeDef_var &);
-+  IR_HomeDef_ptr operator-> (void) const;
-   
--  operator const HomeDef_ptr &() const;
--  operator HomeDef_ptr &();
-+  operator const IR_HomeDef_ptr &() const;
-+  operator IR_HomeDef_ptr &();
-   // in, inout, out, _retn 
--  HomeDef_ptr in (void) const;
--  HomeDef_ptr &inout (void);
--  HomeDef_ptr &out (void);
--  HomeDef_ptr _retn (void);
--  HomeDef_ptr ptr (void) const;
-+  IR_HomeDef_ptr in (void) const;
-+  IR_HomeDef_ptr &inout (void);
-+  IR_HomeDef_ptr &out (void);
-+  IR_HomeDef_ptr _retn (void);
-+  IR_HomeDef_ptr ptr (void) const;
- 
- private:
--  HomeDef_ptr ptr_;
-+  IR_HomeDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  HomeDef_var (const TAO_Base_var &rhs);
--  HomeDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_HomeDef_var (const TAO_Base_var &rhs);
-+  IR_HomeDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_HOMEDEF___OUT_CH_)
--#define _IR_HOMEDEF___OUT_CH_
--
--class TAO_IFR_Client_Export HomeDef_out
-+class TAO_IFR_Client_Export IR_HomeDef_out
- {
- public:
--  HomeDef_out (HomeDef_ptr &);
--  HomeDef_out (HomeDef_var &);
--  HomeDef_out (const HomeDef_out &);
--  HomeDef_out &operator= (const HomeDef_out &);
--  HomeDef_out &operator= (const HomeDef_var &);
--  HomeDef_out &operator= (HomeDef_ptr);
--  operator HomeDef_ptr &();
--  HomeDef_ptr &ptr (void);
--  HomeDef_ptr operator-> (void);
-+  IR_HomeDef_out (IR_HomeDef_ptr &);
-+  IR_HomeDef_out (IR_HomeDef_var &);
-+  IR_HomeDef_out (const IR_HomeDef_out &);
-+  IR_HomeDef_out &operator= (const IR_HomeDef_out &);
-+  IR_HomeDef_out &operator= (const IR_HomeDef_var &);
-+  IR_HomeDef_out &operator= (IR_HomeDef_ptr);
-+  operator IR_HomeDef_ptr &();
-+  IR_HomeDef_ptr &ptr (void);
-+  IR_HomeDef_ptr operator-> (void);
-   
- private:
--  HomeDef_ptr &ptr_;
-+  IR_HomeDef_ptr &ptr_;
- };
- 
- 
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CH_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CH_
--
-   class _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -3694,19 +2886,19 @@
-     _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum);
-     _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      HomeDef* *value,
-+      IR_HomeDef* *value,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq(const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs);
-     virtual ~_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void);
-     _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs);
--    TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var> operator[] (CORBA::ULong index) const;
--    static HomeDef **allocbuf (CORBA::ULong nelems);
--    static void freebuf (HomeDef **buffer);
-+    TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var> operator[] (CORBA::ULong index) const;
-+    static IR_HomeDef **allocbuf (CORBA::ULong nelems);
-+    static void freebuf (IR_HomeDef **buffer);
-     // The Base_Sequence functions, please see tao/Sequence.h
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
--    HomeDef* *get_buffer (CORBA::Boolean orphan = 0);
--    const HomeDef* *get_buffer (void) const;
-+    IR_HomeDef* *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_HomeDef* *get_buffer (void) const;
-     virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-     virtual void _downcast (
-         void* target,
-@@ -3718,261 +2910,184 @@
-     
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_HOMEDEFSEQ_CH_)
--#define _IR_HOMEDEFSEQ_CH_
--
--class HomeDefSeq;
--class HomeDefSeq_var;
--
- // *************************************************************
--// HomeDefSeq
-+// IR_HomeDefSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export HomeDefSeq : public 
-+class TAO_IFR_Client_Export IR_HomeDefSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<HomeDef,HomeDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_HomeDef,IR_HomeDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  HomeDefSeq (void); // default ctor
--  HomeDefSeq (CORBA::ULong max); // uses max size
--  HomeDefSeq (
-+  IR_HomeDefSeq (void); // default ctor
-+  IR_HomeDefSeq (CORBA::ULong max); // uses max size
-+  IR_HomeDefSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    HomeDef_ptr *buffer, 
-+    IR_HomeDef_ptr *buffer,
-     CORBA::Boolean release = 0
-   );
--  HomeDefSeq (const HomeDefSeq &); // copy ctor
--  ~HomeDefSeq (void);
-+  IR_HomeDefSeq (const IR_HomeDefSeq &); // copy ctor
-+  ~IR_HomeDefSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef HomeDefSeq_var _var_type;
-+  typedef IR_HomeDefSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_HOMEDEFSEQ___VAR_CH_)
--#define _IR_HOMEDEFSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::HomeDefSeq_var
-+// class IR_HomeDefSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export HomeDefSeq_var
-+class TAO_IFR_Client_Export IR_HomeDefSeq_var
- {
- public:
--  HomeDefSeq_var (void); // default constructor
--  HomeDefSeq_var (HomeDefSeq *);
--  HomeDefSeq_var (const HomeDefSeq_var &); // copy constructor
--  ~HomeDefSeq_var (void); // destructor
-+  IR_HomeDefSeq_var (void); // default constructor
-+  IR_HomeDefSeq_var (IR_HomeDefSeq *);
-+  IR_HomeDefSeq_var (const IR_HomeDefSeq_var &); // copy constructor
-+  ~IR_HomeDefSeq_var (void); // destructor
-   
--  HomeDefSeq_var &operator= (HomeDefSeq *);
--  HomeDefSeq_var &operator= (const HomeDefSeq_var &);
--  HomeDefSeq *operator-> (void);
--  const HomeDefSeq *operator-> (void) const;
-+  IR_HomeDefSeq_var &operator= (IR_HomeDefSeq *);
-+  IR_HomeDefSeq_var &operator= (const IR_HomeDefSeq_var &);
-+  IR_HomeDefSeq *operator-> (void);
-+  const IR_HomeDefSeq *operator-> (void) const;
-   
--  operator const HomeDefSeq &() const;
--  operator HomeDefSeq &();
--  operator HomeDefSeq &() const;
--  operator HomeDefSeq *&(); // variable-size base types only
-+  operator const IR_HomeDefSeq &() const;
-+  operator IR_HomeDefSeq &();
-+  operator IR_HomeDefSeq &() const;
-+  operator IR_HomeDefSeq *&(); // variable-size base types only
-   
--  TAO_Object_Manager<HomeDef, HomeDef_var> operator[] (CORBA::ULong index);
-+  TAO_Object_Manager<IR_HomeDef, IR_HomeDef_var> operator[] (CORBA::ULong index);
-   
-   // in, inout, out, _retn 
--  const HomeDefSeq &in (void) const;
--  HomeDefSeq &inout (void);
--  HomeDefSeq *&out (void);
--  HomeDefSeq *_retn (void);
--  HomeDefSeq *ptr (void) const;
-+  const IR_HomeDefSeq &in (void) const;
-+  IR_HomeDefSeq &inout (void);
-+  IR_HomeDefSeq *&out (void);
-+  IR_HomeDefSeq *_retn (void);
-+  IR_HomeDefSeq *ptr (void) const;
- 
- private:
--  HomeDefSeq *ptr_;
-+  IR_HomeDefSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_HOMEDEFSEQ___OUT_CH_)
--#define _IR_HOMEDEFSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export HomeDefSeq_out
-+class TAO_IFR_Client_Export IR_HomeDefSeq_out
- {
- public:
--  HomeDefSeq_out (HomeDefSeq *&);
--  HomeDefSeq_out (HomeDefSeq_var &);
--  HomeDefSeq_out (const HomeDefSeq_out &);
--  HomeDefSeq_out &operator= (const HomeDefSeq_out &);
--  HomeDefSeq_out &operator= (HomeDefSeq *);
--  operator HomeDefSeq *&();
--  HomeDefSeq *&ptr (void);
--  HomeDefSeq *operator-> (void);
--  TAO_Object_Manager<HomeDef, HomeDef_var> operator[] (CORBA::ULong index);
-+  IR_HomeDefSeq_out (IR_HomeDefSeq *&);
-+  IR_HomeDefSeq_out (IR_HomeDefSeq_var &);
-+  IR_HomeDefSeq_out (const IR_HomeDefSeq_out &);
-+  IR_HomeDefSeq_out &operator= (const IR_HomeDefSeq_out &);
-+  IR_HomeDefSeq_out &operator= (IR_HomeDefSeq *);
-+  operator IR_HomeDefSeq *&();
-+  IR_HomeDefSeq *&ptr (void);
-+  IR_HomeDefSeq *operator-> (void);
-+  TAO_Object_Manager<IR_HomeDef, IR_HomeDef_var> operator[] (CORBA::ULong index);
-   
- private:
--  HomeDefSeq *&ptr_;
-+  IR_HomeDefSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const HomeDefSeq_var &);
-+  void operator= (const IR_HomeDefSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_HomeDefSeq;
--
--class EventDef;
--
--#if !defined (_IR_EVENTDEF___PTR_CH_)
--#define _IR_EVENTDEF___PTR_CH_
--
--typedef EventDef *EventDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EVENTDEF___VAR_CH_)
--#define _IR_EVENTDEF___VAR_CH_
--
--class TAO_IFR_Client_Export EventDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_EventDef_var : public TAO_Base_var
- {
- public:
--  EventDef_var (void); // default constructor
--  EventDef_var (EventDef_ptr p) : ptr_ (p) {} 
--  EventDef_var (const EventDef_var &); // copy constructor
--  ~EventDef_var (void); // destructor
-+  IR_EventDef_var (void); // default constructor
-+  IR_EventDef_var (IR_EventDef_ptr p) : ptr_ (p) {}
-+  IR_EventDef_var (const IR_EventDef_var &); // copy constructor
-+  ~IR_EventDef_var (void); // destructor
-   
--  EventDef_var &operator= (EventDef_ptr);
--  EventDef_var &operator= (const EventDef_var &);
--  EventDef_ptr operator-> (void) const;
-+  IR_EventDef_var &operator= (IR_EventDef_ptr);
-+  IR_EventDef_var &operator= (const IR_EventDef_var &);
-+  IR_EventDef_ptr operator-> (void) const;
-   
--  operator const EventDef_ptr &() const;
--  operator EventDef_ptr &();
-+  operator const IR_EventDef_ptr &() const;
-+  operator IR_EventDef_ptr &();
-   // in, inout, out, _retn 
--  EventDef_ptr in (void) const;
--  EventDef_ptr &inout (void);
--  EventDef_ptr &out (void);
--  EventDef_ptr _retn (void);
--  EventDef_ptr ptr (void) const;
-+  IR_EventDef_ptr in (void) const;
-+  IR_EventDef_ptr &inout (void);
-+  IR_EventDef_ptr &out (void);
-+  IR_EventDef_ptr _retn (void);
-+  IR_EventDef_ptr ptr (void) const;
- 
- private:
--  EventDef_ptr ptr_;
-+  IR_EventDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  EventDef_var (const TAO_Base_var &rhs);
--  EventDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_EventDef_var (const TAO_Base_var &rhs);
-+  IR_EventDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EVENTDEF___OUT_CH_)
--#define _IR_EVENTDEF___OUT_CH_
--
--class TAO_IFR_Client_Export EventDef_out
-+class TAO_IFR_Client_Export IR_EventDef_out
- {
- public:
--  EventDef_out (EventDef_ptr &);
--  EventDef_out (EventDef_var &);
--  EventDef_out (const EventDef_out &);
--  EventDef_out &operator= (const EventDef_out &);
--  EventDef_out &operator= (const EventDef_var &);
--  EventDef_out &operator= (EventDef_ptr);
--  operator EventDef_ptr &();
--  EventDef_ptr &ptr (void);
--  EventDef_ptr operator-> (void);
-+  IR_EventDef_out (IR_EventDef_ptr &);
-+  IR_EventDef_out (IR_EventDef_var &);
-+  IR_EventDef_out (const IR_EventDef_out &);
-+  IR_EventDef_out &operator= (const IR_EventDef_out &);
-+  IR_EventDef_out &operator= (const IR_EventDef_var &);
-+  IR_EventDef_out &operator= (IR_EventDef_ptr);
-+  operator IR_EventDef_ptr &();
-+  IR_EventDef_ptr &ptr (void);
-+  IR_EventDef_ptr operator-> (void);
-   
- private:
--  EventDef_ptr &ptr_;
-+  IR_EventDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--class EmitsDef;
--
--#if !defined (_IR_EMITSDEF___PTR_CH_)
--#define _IR_EMITSDEF___PTR_CH_
--
--typedef EmitsDef *EmitsDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EMITSDEF___VAR_CH_)
--#define _IR_EMITSDEF___VAR_CH_
--
--class TAO_IFR_Client_Export EmitsDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_EmitsDef_var : public TAO_Base_var
- {
- public:
--  EmitsDef_var (void); // default constructor
--  EmitsDef_var (EmitsDef_ptr p) : ptr_ (p) {} 
--  EmitsDef_var (const EmitsDef_var &); // copy constructor
--  ~EmitsDef_var (void); // destructor
-+  IR_EmitsDef_var (void); // default constructor
-+  IR_EmitsDef_var (IR_EmitsDef_ptr p) : ptr_ (p) {}
-+  IR_EmitsDef_var (const IR_EmitsDef_var &); // copy constructor
-+  ~IR_EmitsDef_var (void); // destructor
-   
--  EmitsDef_var &operator= (EmitsDef_ptr);
--  EmitsDef_var &operator= (const EmitsDef_var &);
--  EmitsDef_ptr operator-> (void) const;
-+  IR_EmitsDef_var &operator= (IR_EmitsDef_ptr);
-+  IR_EmitsDef_var &operator= (const IR_EmitsDef_var &);
-+  IR_EmitsDef_ptr operator-> (void) const;
-   
--  operator const EmitsDef_ptr &() const;
--  operator EmitsDef_ptr &();
-+  operator const IR_EmitsDef_ptr &() const;
-+  operator IR_EmitsDef_ptr &();
-   // in, inout, out, _retn 
--  EmitsDef_ptr in (void) const;
--  EmitsDef_ptr &inout (void);
--  EmitsDef_ptr &out (void);
--  EmitsDef_ptr _retn (void);
--  EmitsDef_ptr ptr (void) const;
-+  IR_EmitsDef_ptr in (void) const;
-+  IR_EmitsDef_ptr &inout (void);
-+  IR_EmitsDef_ptr &out (void);
-+  IR_EmitsDef_ptr _retn (void);
-+  IR_EmitsDef_ptr ptr (void) const;
- 
- private:
--  EmitsDef_ptr ptr_;
-+  IR_EmitsDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  EmitsDef_var (const TAO_Base_var &rhs);
--  EmitsDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_EmitsDef_var (const TAO_Base_var &rhs);
-+  IR_EmitsDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EMITSDEF___OUT_CH_)
--#define _IR_EMITSDEF___OUT_CH_
--
--class TAO_IFR_Client_Export EmitsDef_out
-+class TAO_IFR_Client_Export IR_EmitsDef_out
- {
- public:
--  EmitsDef_out (EmitsDef_ptr &);
--  EmitsDef_out (EmitsDef_var &);
--  EmitsDef_out (const EmitsDef_out &);
--  EmitsDef_out &operator= (const EmitsDef_out &);
--  EmitsDef_out &operator= (const EmitsDef_var &);
--  EmitsDef_out &operator= (EmitsDef_ptr);
--  operator EmitsDef_ptr &();
--  EmitsDef_ptr &ptr (void);
--  EmitsDef_ptr operator-> (void);
-+  IR_EmitsDef_out (IR_EmitsDef_ptr &);
-+  IR_EmitsDef_out (IR_EmitsDef_var &);
-+  IR_EmitsDef_out (const IR_EmitsDef_out &);
-+  IR_EmitsDef_out &operator= (const IR_EmitsDef_out &);
-+  IR_EmitsDef_out &operator= (const IR_EmitsDef_var &);
-+  IR_EmitsDef_out &operator= (IR_EmitsDef_ptr);
-+  operator IR_EmitsDef_ptr &();
-+  IR_EmitsDef_ptr &ptr (void);
-+  IR_EmitsDef_ptr operator-> (void);
-   
- private:
--  EmitsDef_ptr &ptr_;
-+  IR_EmitsDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CH_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CH_
--
-   class _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -3982,19 +3097,19 @@
-     _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum);
-     _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      EmitsDef* *value,
-+      IR_EmitsDef* *value,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq(const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs);
-     virtual ~_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void);
-     _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs);
--    TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var> operator[] (CORBA::ULong index) const;
--    static EmitsDef **allocbuf (CORBA::ULong nelems);
--    static void freebuf (EmitsDef **buffer);
-+    TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var> operator[] (CORBA::ULong index) const;
-+    static IR_EmitsDef **allocbuf (CORBA::ULong nelems);
-+    static void freebuf (IR_EmitsDef **buffer);
-     // The Base_Sequence functions, please see tao/Sequence.h
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
--    EmitsDef* *get_buffer (CORBA::Boolean orphan = 0);
--    const EmitsDef* *get_buffer (void) const;
-+    IR_EmitsDef* *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_EmitsDef* *get_buffer (void) const;
-     virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-     virtual void _downcast (
-         void* target,
-@@ -4006,193 +3121,139 @@
-     
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_EMITSDEFSEQ_CH_)
--#define _IR_EMITSDEFSEQ_CH_
--
--class EmitsDefSeq;
--class EmitsDefSeq_var;
--
- // *************************************************************
--// EmitsDefSeq
-+// IR_EmitsDefSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export EmitsDefSeq : public 
-+class TAO_IFR_Client_Export IR_EmitsDefSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<EmitsDef,EmitsDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_EmitsDef,IR_EmitsDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  EmitsDefSeq (void); // default ctor
--  EmitsDefSeq (CORBA::ULong max); // uses max size
--  EmitsDefSeq (
-+  IR_EmitsDefSeq (void); // default ctor
-+  IR_EmitsDefSeq (CORBA::ULong max); // uses max size
-+  IR_EmitsDefSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    EmitsDef_ptr *buffer, 
-+    IR_EmitsDef_ptr *buffer,
-     CORBA::Boolean release = 0
-   );
--  EmitsDefSeq (const EmitsDefSeq &); // copy ctor
--  ~EmitsDefSeq (void);
-+  IR_EmitsDefSeq (const IR_EmitsDefSeq &); // copy ctor
-+  ~IR_EmitsDefSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef EmitsDefSeq_var _var_type;
-+  typedef IR_EmitsDefSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EMITSDEFSEQ___VAR_CH_)
--#define _IR_EMITSDEFSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::EmitsDefSeq_var
-+// class IR_EmitsDefSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export EmitsDefSeq_var
-+class TAO_IFR_Client_Export IR_EmitsDefSeq_var
- {
- public:
--  EmitsDefSeq_var (void); // default constructor
--  EmitsDefSeq_var (EmitsDefSeq *);
--  EmitsDefSeq_var (const EmitsDefSeq_var &); // copy constructor
--  ~EmitsDefSeq_var (void); // destructor
-+  IR_EmitsDefSeq_var (void); // default constructor
-+  IR_EmitsDefSeq_var (IR_EmitsDefSeq *);
-+  IR_EmitsDefSeq_var (const IR_EmitsDefSeq_var &); // copy constructor
-+  ~IR_EmitsDefSeq_var (void); // destructor
-   
--  EmitsDefSeq_var &operator= (EmitsDefSeq *);
--  EmitsDefSeq_var &operator= (const EmitsDefSeq_var &);
--  EmitsDefSeq *operator-> (void);
--  const EmitsDefSeq *operator-> (void) const;
-+  IR_EmitsDefSeq_var &operator= (IR_EmitsDefSeq *);
-+  IR_EmitsDefSeq_var &operator= (const IR_EmitsDefSeq_var &);
-+  IR_EmitsDefSeq *operator-> (void);
-+  const IR_EmitsDefSeq *operator-> (void) const;
-   
--  operator const EmitsDefSeq &() const;
--  operator EmitsDefSeq &();
--  operator EmitsDefSeq &() const;
--  operator EmitsDefSeq *&(); // variable-size base types only
-+  operator const IR_EmitsDefSeq &() const;
-+  operator IR_EmitsDefSeq &();
-+  operator IR_EmitsDefSeq &() const;
-+  operator IR_EmitsDefSeq *&(); // variable-size base types only
-   
--  TAO_Object_Manager<EmitsDef, EmitsDef_var> operator[] (CORBA::ULong index);
-+  TAO_Object_Manager<IR_EmitsDef, IR_EmitsDef_var> operator[] (CORBA::ULong index);
-   
-   // in, inout, out, _retn 
--  const EmitsDefSeq &in (void) const;
--  EmitsDefSeq &inout (void);
--  EmitsDefSeq *&out (void);
--  EmitsDefSeq *_retn (void);
--  EmitsDefSeq *ptr (void) const;
-+  const IR_EmitsDefSeq &in (void) const;
-+  IR_EmitsDefSeq &inout (void);
-+  IR_EmitsDefSeq *&out (void);
-+  IR_EmitsDefSeq *_retn (void);
-+  IR_EmitsDefSeq *ptr (void) const;
- 
- private:
--  EmitsDefSeq *ptr_;
-+  IR_EmitsDefSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EMITSDEFSEQ___OUT_CH_)
--#define _IR_EMITSDEFSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export EmitsDefSeq_out
-+class TAO_IFR_Client_Export IR_EmitsDefSeq_out
- {
- public:
--  EmitsDefSeq_out (EmitsDefSeq *&);
--  EmitsDefSeq_out (EmitsDefSeq_var &);
--  EmitsDefSeq_out (const EmitsDefSeq_out &);
--  EmitsDefSeq_out &operator= (const EmitsDefSeq_out &);
--  EmitsDefSeq_out &operator= (EmitsDefSeq *);
--  operator EmitsDefSeq *&();
--  EmitsDefSeq *&ptr (void);
--  EmitsDefSeq *operator-> (void);
--  TAO_Object_Manager<EmitsDef, EmitsDef_var> operator[] (CORBA::ULong index);
-+  IR_EmitsDefSeq_out (IR_EmitsDefSeq *&);
-+  IR_EmitsDefSeq_out (IR_EmitsDefSeq_var &);
-+  IR_EmitsDefSeq_out (const IR_EmitsDefSeq_out &);
-+  IR_EmitsDefSeq_out &operator= (const IR_EmitsDefSeq_out &);
-+  IR_EmitsDefSeq_out &operator= (IR_EmitsDefSeq *);
-+  operator IR_EmitsDefSeq *&();
-+  IR_EmitsDefSeq *&ptr (void);
-+  IR_EmitsDefSeq *operator-> (void);
-+  TAO_Object_Manager<IR_EmitsDef, IR_EmitsDef_var> operator[] (CORBA::ULong index);
-   
- private:
--  EmitsDefSeq *&ptr_;
-+  IR_EmitsDefSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const EmitsDefSeq_var &);
-+  void operator= (const IR_EmitsDefSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EmitsDefSeq;
--
--class PublishesDef;
--
--#if !defined (_IR_PUBLISHESDEF___PTR_CH_)
--#define _IR_PUBLISHESDEF___PTR_CH_
--
--typedef PublishesDef *PublishesDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PUBLISHESDEF___VAR_CH_)
--#define _IR_PUBLISHESDEF___VAR_CH_
--
--class TAO_IFR_Client_Export PublishesDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_PublishesDef_var : public TAO_Base_var
- {
- public:
--  PublishesDef_var (void); // default constructor
--  PublishesDef_var (PublishesDef_ptr p) : ptr_ (p) {} 
--  PublishesDef_var (const PublishesDef_var &); // copy constructor
--  ~PublishesDef_var (void); // destructor
-+  IR_PublishesDef_var (void); // default constructor
-+  IR_PublishesDef_var (IR_PublishesDef_ptr p) : ptr_ (p) {}
-+  IR_PublishesDef_var (const IR_PublishesDef_var &); // copy constructor
-+  ~IR_PublishesDef_var (void); // destructor
-   
--  PublishesDef_var &operator= (PublishesDef_ptr);
--  PublishesDef_var &operator= (const PublishesDef_var &);
--  PublishesDef_ptr operator-> (void) const;
-+  IR_PublishesDef_var &operator= (IR_PublishesDef_ptr);
-+  IR_PublishesDef_var &operator= (const IR_PublishesDef_var &);
-+  IR_PublishesDef_ptr operator-> (void) const;
-   
--  operator const PublishesDef_ptr &() const;
--  operator PublishesDef_ptr &();
-+  operator const IR_PublishesDef_ptr &() const;
-+  operator IR_PublishesDef_ptr &();
-   // in, inout, out, _retn 
--  PublishesDef_ptr in (void) const;
--  PublishesDef_ptr &inout (void);
--  PublishesDef_ptr &out (void);
--  PublishesDef_ptr _retn (void);
--  PublishesDef_ptr ptr (void) const;
-+  IR_PublishesDef_ptr in (void) const;
-+  IR_PublishesDef_ptr &inout (void);
-+  IR_PublishesDef_ptr &out (void);
-+  IR_PublishesDef_ptr _retn (void);
-+  IR_PublishesDef_ptr ptr (void) const;
- 
- private:
--  PublishesDef_ptr ptr_;
-+  IR_PublishesDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  PublishesDef_var (const TAO_Base_var &rhs);
--  PublishesDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_PublishesDef_var (const TAO_Base_var &rhs);
-+  IR_PublishesDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PUBLISHESDEF___OUT_CH_)
--#define _IR_PUBLISHESDEF___OUT_CH_
--
--class TAO_IFR_Client_Export PublishesDef_out
-+class TAO_IFR_Client_Export IR_PublishesDef_out
- {
- public:
--  PublishesDef_out (PublishesDef_ptr &);
--  PublishesDef_out (PublishesDef_var &);
--  PublishesDef_out (const PublishesDef_out &);
--  PublishesDef_out &operator= (const PublishesDef_out &);
--  PublishesDef_out &operator= (const PublishesDef_var &);
--  PublishesDef_out &operator= (PublishesDef_ptr);
--  operator PublishesDef_ptr &();
--  PublishesDef_ptr &ptr (void);
--  PublishesDef_ptr operator-> (void);
-+  IR_PublishesDef_out (IR_PublishesDef_ptr &);
-+  IR_PublishesDef_out (IR_PublishesDef_var &);
-+  IR_PublishesDef_out (const IR_PublishesDef_out &);
-+  IR_PublishesDef_out &operator= (const IR_PublishesDef_out &);
-+  IR_PublishesDef_out &operator= (const IR_PublishesDef_var &);
-+  IR_PublishesDef_out &operator= (IR_PublishesDef_ptr);
-+  operator IR_PublishesDef_ptr &();
-+  IR_PublishesDef_ptr &ptr (void);
-+  IR_PublishesDef_ptr operator-> (void);
-   
- private:
--  PublishesDef_ptr &ptr_;
-+  IR_PublishesDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CH_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CH_
--
-   class _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -4202,19 +3263,19 @@
-     _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum);
-     _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      PublishesDef* *value,
-+      IR_PublishesDef* *value,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs);
-     virtual ~_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void);
-     _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs);
--    TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var> operator[] (CORBA::ULong index) const;
--    static PublishesDef **allocbuf (CORBA::ULong nelems);
--    static void freebuf (PublishesDef **buffer);
-+    TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var> operator[] (CORBA::ULong index) const;
-+    static IR_PublishesDef **allocbuf (CORBA::ULong nelems);
-+    static void freebuf (IR_PublishesDef **buffer);
-     // The Base_Sequence functions, please see tao/Sequence.h
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
--    PublishesDef* *get_buffer (CORBA::Boolean orphan = 0);
--    const PublishesDef* *get_buffer (void) const;
-+    IR_PublishesDef* *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_PublishesDef* *get_buffer (void) const;
-     virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-     virtual void _downcast (
-         void* target,
-@@ -4226,193 +3287,139 @@
-     
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_PUBLISHESDEFSEQ_CH_)
--#define _IR_PUBLISHESDEFSEQ_CH_
--
--class PublishesDefSeq;
--class PublishesDefSeq_var;
--
- // *************************************************************
--// PublishesDefSeq
-+// IR_PublishesDefSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export PublishesDefSeq : public 
-+class TAO_IFR_Client_Export IR_PublishesDefSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<PublishesDef,PublishesDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_PublishesDef,IR_PublishesDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  PublishesDefSeq (void); // default ctor
--  PublishesDefSeq (CORBA::ULong max); // uses max size
--  PublishesDefSeq (
-+  IR_PublishesDefSeq (void); // default ctor
-+  IR_PublishesDefSeq (CORBA::ULong max); // uses max size
-+  IR_PublishesDefSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    PublishesDef_ptr *buffer, 
-+    IR_PublishesDef_ptr *buffer,
-     CORBA::Boolean release = 0
-   );
--  PublishesDefSeq (const PublishesDefSeq &); // copy ctor
--  ~PublishesDefSeq (void);
-+  IR_PublishesDefSeq (const IR_PublishesDefSeq &); // copy ctor
-+  ~IR_PublishesDefSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef PublishesDefSeq_var _var_type;
-+  typedef IR_PublishesDefSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PUBLISHESDEFSEQ___VAR_CH_)
--#define _IR_PUBLISHESDEFSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::PublishesDefSeq_var
-+// class IR_PublishesDefSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export PublishesDefSeq_var
-+class TAO_IFR_Client_Export IR_PublishesDefSeq_var
- {
- public:
--  PublishesDefSeq_var (void); // default constructor
--  PublishesDefSeq_var (PublishesDefSeq *);
--  PublishesDefSeq_var (const PublishesDefSeq_var &); // copy constructor
--  ~PublishesDefSeq_var (void); // destructor
-+  IR_PublishesDefSeq_var (void); // default constructor
-+  IR_PublishesDefSeq_var (IR_PublishesDefSeq *);
-+  IR_PublishesDefSeq_var (const IR_PublishesDefSeq_var &); // copy constructor
-+  ~IR_PublishesDefSeq_var (void); // destructor
-   
--  PublishesDefSeq_var &operator= (PublishesDefSeq *);
--  PublishesDefSeq_var &operator= (const PublishesDefSeq_var &);
--  PublishesDefSeq *operator-> (void);
--  const PublishesDefSeq *operator-> (void) const;
-+  IR_PublishesDefSeq_var &operator= (IR_PublishesDefSeq *);
-+  IR_PublishesDefSeq_var &operator= (const IR_PublishesDefSeq_var &);
-+  IR_PublishesDefSeq *operator-> (void);
-+  const IR_PublishesDefSeq *operator-> (void) const;
-   
--  operator const PublishesDefSeq &() const;
--  operator PublishesDefSeq &();
--  operator PublishesDefSeq &() const;
--  operator PublishesDefSeq *&(); // variable-size base types only
-+  operator const IR_PublishesDefSeq &() const;
-+  operator IR_PublishesDefSeq &();
-+  operator IR_PublishesDefSeq &() const;
-+  operator IR_PublishesDefSeq *&(); // variable-size base types only
-   
--  TAO_Object_Manager<PublishesDef, PublishesDef_var> operator[] (CORBA::ULong index);
-+  TAO_Object_Manager<IR_PublishesDef, IR_PublishesDef_var> operator[] (CORBA::ULong index);
-   
-   // in, inout, out, _retn 
--  const PublishesDefSeq &in (void) const;
--  PublishesDefSeq &inout (void);
--  PublishesDefSeq *&out (void);
--  PublishesDefSeq *_retn (void);
--  PublishesDefSeq *ptr (void) const;
-+  const IR_PublishesDefSeq &in (void) const;
-+  IR_PublishesDefSeq &inout (void);
-+  IR_PublishesDefSeq *&out (void);
-+  IR_PublishesDefSeq *_retn (void);
-+  IR_PublishesDefSeq *ptr (void) const;
- 
- private:
--  PublishesDefSeq *ptr_;
-+  IR_PublishesDefSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PUBLISHESDEFSEQ___OUT_CH_)
--#define _IR_PUBLISHESDEFSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export PublishesDefSeq_out
-+class TAO_IFR_Client_Export IR_PublishesDefSeq_out
- {
- public:
--  PublishesDefSeq_out (PublishesDefSeq *&);
--  PublishesDefSeq_out (PublishesDefSeq_var &);
--  PublishesDefSeq_out (const PublishesDefSeq_out &);
--  PublishesDefSeq_out &operator= (const PublishesDefSeq_out &);
--  PublishesDefSeq_out &operator= (PublishesDefSeq *);
--  operator PublishesDefSeq *&();
--  PublishesDefSeq *&ptr (void);
--  PublishesDefSeq *operator-> (void);
--  TAO_Object_Manager<PublishesDef, PublishesDef_var> operator[] (CORBA::ULong index);
-+  IR_PublishesDefSeq_out (IR_PublishesDefSeq *&);
-+  IR_PublishesDefSeq_out (IR_PublishesDefSeq_var &);
-+  IR_PublishesDefSeq_out (const IR_PublishesDefSeq_out &);
-+  IR_PublishesDefSeq_out &operator= (const IR_PublishesDefSeq_out &);
-+  IR_PublishesDefSeq_out &operator= (IR_PublishesDefSeq *);
-+  operator IR_PublishesDefSeq *&();
-+  IR_PublishesDefSeq *&ptr (void);
-+  IR_PublishesDefSeq *operator-> (void);
-+  TAO_Object_Manager<IR_PublishesDef, IR_PublishesDef_var> operator[] (CORBA::ULong index);
-   
- private:
--  PublishesDefSeq *&ptr_;
-+  IR_PublishesDefSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const PublishesDefSeq_var &);
-+  void operator= (const IR_PublishesDefSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PublishesDefSeq;
--
--class ConsumesDef;
--
--#if !defined (_IR_CONSUMESDEF___PTR_CH_)
--#define _IR_CONSUMESDEF___PTR_CH_
--
--typedef ConsumesDef *ConsumesDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSUMESDEF___VAR_CH_)
--#define _IR_CONSUMESDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ConsumesDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_ConsumesDef_var : public TAO_Base_var
- {
- public:
--  ConsumesDef_var (void); // default constructor
--  ConsumesDef_var (ConsumesDef_ptr p) : ptr_ (p) {} 
--  ConsumesDef_var (const ConsumesDef_var &); // copy constructor
--  ~ConsumesDef_var (void); // destructor
-+  IR_ConsumesDef_var (void); // default constructor
-+  IR_ConsumesDef_var (IR_ConsumesDef_ptr p) : ptr_ (p) {}
-+  IR_ConsumesDef_var (const IR_ConsumesDef_var &); // copy constructor
-+  ~IR_ConsumesDef_var (void); // destructor
-   
--  ConsumesDef_var &operator= (ConsumesDef_ptr);
--  ConsumesDef_var &operator= (const ConsumesDef_var &);
--  ConsumesDef_ptr operator-> (void) const;
-+  IR_ConsumesDef_var &operator= (IR_ConsumesDef_ptr);
-+  IR_ConsumesDef_var &operator= (const IR_ConsumesDef_var &);
-+  IR_ConsumesDef_ptr operator-> (void) const;
-   
--  operator const ConsumesDef_ptr &() const;
--  operator ConsumesDef_ptr &();
-+  operator const IR_ConsumesDef_ptr &() const;
-+  operator IR_ConsumesDef_ptr &();
-   // in, inout, out, _retn 
--  ConsumesDef_ptr in (void) const;
--  ConsumesDef_ptr &inout (void);
--  ConsumesDef_ptr &out (void);
--  ConsumesDef_ptr _retn (void);
--  ConsumesDef_ptr ptr (void) const;
-+  IR_ConsumesDef_ptr in (void) const;
-+  IR_ConsumesDef_ptr &inout (void);
-+  IR_ConsumesDef_ptr &out (void);
-+  IR_ConsumesDef_ptr _retn (void);
-+  IR_ConsumesDef_ptr ptr (void) const;
- 
- private:
--  ConsumesDef_ptr ptr_;
-+  IR_ConsumesDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  ConsumesDef_var (const TAO_Base_var &rhs);
--  ConsumesDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_ConsumesDef_var (const TAO_Base_var &rhs);
-+  IR_ConsumesDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSUMESDEF___OUT_CH_)
--#define _IR_CONSUMESDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ConsumesDef_out
-+class TAO_IFR_Client_Export IR_ConsumesDef_out
- {
- public:
--  ConsumesDef_out (ConsumesDef_ptr &);
--  ConsumesDef_out (ConsumesDef_var &);
--  ConsumesDef_out (const ConsumesDef_out &);
--  ConsumesDef_out &operator= (const ConsumesDef_out &);
--  ConsumesDef_out &operator= (const ConsumesDef_var &);
--  ConsumesDef_out &operator= (ConsumesDef_ptr);
--  operator ConsumesDef_ptr &();
--  ConsumesDef_ptr &ptr (void);
--  ConsumesDef_ptr operator-> (void);
-+  IR_ConsumesDef_out (IR_ConsumesDef_ptr &);
-+  IR_ConsumesDef_out (IR_ConsumesDef_var &);
-+  IR_ConsumesDef_out (const IR_ConsumesDef_out &);
-+  IR_ConsumesDef_out &operator= (const IR_ConsumesDef_out &);
-+  IR_ConsumesDef_out &operator= (const IR_ConsumesDef_var &);
-+  IR_ConsumesDef_out &operator= (IR_ConsumesDef_ptr);
-+  operator IR_ConsumesDef_ptr &();
-+  IR_ConsumesDef_ptr &ptr (void);
-+  IR_ConsumesDef_ptr operator-> (void);
-   
- private:
--  ConsumesDef_ptr &ptr_;
-+  IR_ConsumesDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CH_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CH_
--
-   class _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -4422,19 +3429,19 @@
-     _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum);
-     _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      ConsumesDef* *value,
-+      IR_ConsumesDef* *value,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs);
-     virtual ~_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void);
-     _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs);
--    TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var> operator[] (CORBA::ULong index) const;
--    static ConsumesDef **allocbuf (CORBA::ULong nelems);
--    static void freebuf (ConsumesDef **buffer);
-+    TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var> operator[] (CORBA::ULong index) const;
-+    static IR_ConsumesDef **allocbuf (CORBA::ULong nelems);
-+    static void freebuf (IR_ConsumesDef **buffer);
-     // The Base_Sequence functions, please see tao/Sequence.h
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
--    ConsumesDef* *get_buffer (CORBA::Boolean orphan = 0);
--    const ConsumesDef* *get_buffer (void) const;
-+    IR_ConsumesDef* *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_ConsumesDef* *get_buffer (void) const;
-     virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-     virtual void _downcast (
-         void* target,
-@@ -4446,193 +3453,139 @@
-     
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_CONSUMESDEFSEQ_CH_)
--#define _IR_CONSUMESDEFSEQ_CH_
--
--class ConsumesDefSeq;
--class ConsumesDefSeq_var;
--
- // *************************************************************
--// ConsumesDefSeq
-+// IR_ConsumesDefSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export ConsumesDefSeq : public 
-+class TAO_IFR_Client_Export IR_ConsumesDefSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<ConsumesDef,ConsumesDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ConsumesDef,IR_ConsumesDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  ConsumesDefSeq (void); // default ctor
--  ConsumesDefSeq (CORBA::ULong max); // uses max size
--  ConsumesDefSeq (
-+  IR_ConsumesDefSeq (void); // default ctor
-+  IR_ConsumesDefSeq (CORBA::ULong max); // uses max size
-+  IR_ConsumesDefSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    ConsumesDef_ptr *buffer, 
-+    IR_ConsumesDef_ptr *buffer,
-     CORBA::Boolean release = 0
-   );
--  ConsumesDefSeq (const ConsumesDefSeq &); // copy ctor
--  ~ConsumesDefSeq (void);
-+  IR_ConsumesDefSeq (const IR_ConsumesDefSeq &); // copy ctor
-+  ~IR_ConsumesDefSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ConsumesDefSeq_var _var_type;
-+  typedef IR_ConsumesDefSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSUMESDEFSEQ___VAR_CH_)
--#define _IR_CONSUMESDEFSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::ConsumesDefSeq_var
-+// class IR_ConsumesDefSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export ConsumesDefSeq_var
-+class TAO_IFR_Client_Export IR_ConsumesDefSeq_var
- {
- public:
--  ConsumesDefSeq_var (void); // default constructor
--  ConsumesDefSeq_var (ConsumesDefSeq *);
--  ConsumesDefSeq_var (const ConsumesDefSeq_var &); // copy constructor
--  ~ConsumesDefSeq_var (void); // destructor
-+  IR_ConsumesDefSeq_var (void); // default constructor
-+  IR_ConsumesDefSeq_var (IR_ConsumesDefSeq *);
-+  IR_ConsumesDefSeq_var (const IR_ConsumesDefSeq_var &); // copy constructor
-+  ~IR_ConsumesDefSeq_var (void); // destructor
-   
--  ConsumesDefSeq_var &operator= (ConsumesDefSeq *);
--  ConsumesDefSeq_var &operator= (const ConsumesDefSeq_var &);
--  ConsumesDefSeq *operator-> (void);
--  const ConsumesDefSeq *operator-> (void) const;
-+  IR_ConsumesDefSeq_var &operator= (IR_ConsumesDefSeq *);
-+  IR_ConsumesDefSeq_var &operator= (const IR_ConsumesDefSeq_var &);
-+  IR_ConsumesDefSeq *operator-> (void);
-+  const IR_ConsumesDefSeq *operator-> (void) const;
-   
--  operator const ConsumesDefSeq &() const;
--  operator ConsumesDefSeq &();
--  operator ConsumesDefSeq &() const;
--  operator ConsumesDefSeq *&(); // variable-size base types only
-+  operator const IR_ConsumesDefSeq &() const;
-+  operator IR_ConsumesDefSeq &();
-+  operator IR_ConsumesDefSeq &() const;
-+  operator IR_ConsumesDefSeq *&(); // variable-size base types only
-   
--  TAO_Object_Manager<ConsumesDef, ConsumesDef_var> operator[] (CORBA::ULong index);
-+  TAO_Object_Manager<IR_ConsumesDef, IR_ConsumesDef_var> operator[] (CORBA::ULong index);
-   
-   // in, inout, out, _retn 
--  const ConsumesDefSeq &in (void) const;
--  ConsumesDefSeq &inout (void);
--  ConsumesDefSeq *&out (void);
--  ConsumesDefSeq *_retn (void);
--  ConsumesDefSeq *ptr (void) const;
-+  const IR_ConsumesDefSeq &in (void) const;
-+  IR_ConsumesDefSeq &inout (void);
-+  IR_ConsumesDefSeq *&out (void);
-+  IR_ConsumesDefSeq *_retn (void);
-+  IR_ConsumesDefSeq *ptr (void) const;
- 
- private:
--  ConsumesDefSeq *ptr_;
-+  IR_ConsumesDefSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSUMESDEFSEQ___OUT_CH_)
--#define _IR_CONSUMESDEFSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export ConsumesDefSeq_out
-+class TAO_IFR_Client_Export IR_ConsumesDefSeq_out
- {
- public:
--  ConsumesDefSeq_out (ConsumesDefSeq *&);
--  ConsumesDefSeq_out (ConsumesDefSeq_var &);
--  ConsumesDefSeq_out (const ConsumesDefSeq_out &);
--  ConsumesDefSeq_out &operator= (const ConsumesDefSeq_out &);
--  ConsumesDefSeq_out &operator= (ConsumesDefSeq *);
--  operator ConsumesDefSeq *&();
--  ConsumesDefSeq *&ptr (void);
--  ConsumesDefSeq *operator-> (void);
--  TAO_Object_Manager<ConsumesDef, ConsumesDef_var> operator[] (CORBA::ULong index);
-+  IR_ConsumesDefSeq_out (IR_ConsumesDefSeq *&);
-+  IR_ConsumesDefSeq_out (IR_ConsumesDefSeq_var &);
-+  IR_ConsumesDefSeq_out (const IR_ConsumesDefSeq_out &);
-+  IR_ConsumesDefSeq_out &operator= (const IR_ConsumesDefSeq_out &);
-+  IR_ConsumesDefSeq_out &operator= (IR_ConsumesDefSeq *);
-+  operator IR_ConsumesDefSeq *&();
-+  IR_ConsumesDefSeq *&ptr (void);
-+  IR_ConsumesDefSeq *operator-> (void);
-+  TAO_Object_Manager<IR_ConsumesDef, IR_ConsumesDef_var> operator[] (CORBA::ULong index);
-   
- private:
--  ConsumesDefSeq *&ptr_;
-+  IR_ConsumesDefSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ConsumesDefSeq_var &);
-+  void operator= (const IR_ConsumesDefSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConsumesDefSeq;
--
--class FactoryDef;
--
--#if !defined (_IR_FACTORYDEF___PTR_CH_)
--#define _IR_FACTORYDEF___PTR_CH_
--
--typedef FactoryDef *FactoryDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FACTORYDEF___VAR_CH_)
--#define _IR_FACTORYDEF___VAR_CH_
--
--class TAO_IFR_Client_Export FactoryDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_FactoryDef_var : public TAO_Base_var
- {
- public:
--  FactoryDef_var (void); // default constructor
--  FactoryDef_var (FactoryDef_ptr p) : ptr_ (p) {} 
--  FactoryDef_var (const FactoryDef_var &); // copy constructor
--  ~FactoryDef_var (void); // destructor
-+  IR_FactoryDef_var (void); // default constructor
-+  IR_FactoryDef_var (IR_FactoryDef_ptr p) : ptr_ (p) {}
-+  IR_FactoryDef_var (const IR_FactoryDef_var &); // copy constructor
-+  ~IR_FactoryDef_var (void); // destructor
-   
--  FactoryDef_var &operator= (FactoryDef_ptr);
--  FactoryDef_var &operator= (const FactoryDef_var &);
--  FactoryDef_ptr operator-> (void) const;
-+  IR_FactoryDef_var &operator= (IR_FactoryDef_ptr);
-+  IR_FactoryDef_var &operator= (const IR_FactoryDef_var &);
-+  IR_FactoryDef_ptr operator-> (void) const;
-   
--  operator const FactoryDef_ptr &() const;
--  operator FactoryDef_ptr &();
-+  operator const IR_FactoryDef_ptr &() const;
-+  operator IR_FactoryDef_ptr &();
-   // in, inout, out, _retn 
--  FactoryDef_ptr in (void) const;
--  FactoryDef_ptr &inout (void);
--  FactoryDef_ptr &out (void);
--  FactoryDef_ptr _retn (void);
--  FactoryDef_ptr ptr (void) const;
-+  IR_FactoryDef_ptr in (void) const;
-+  IR_FactoryDef_ptr &inout (void);
-+  IR_FactoryDef_ptr &out (void);
-+  IR_FactoryDef_ptr _retn (void);
-+  IR_FactoryDef_ptr ptr (void) const;
- 
- private:
--  FactoryDef_ptr ptr_;
-+  IR_FactoryDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  FactoryDef_var (const TAO_Base_var &rhs);
--  FactoryDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_FactoryDef_var (const TAO_Base_var &rhs);
-+  IR_FactoryDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FACTORYDEF___OUT_CH_)
--#define _IR_FACTORYDEF___OUT_CH_
--
--class TAO_IFR_Client_Export FactoryDef_out
-+class TAO_IFR_Client_Export IR_FactoryDef_out
- {
- public:
--  FactoryDef_out (FactoryDef_ptr &);
--  FactoryDef_out (FactoryDef_var &);
--  FactoryDef_out (const FactoryDef_out &);
--  FactoryDef_out &operator= (const FactoryDef_out &);
--  FactoryDef_out &operator= (const FactoryDef_var &);
--  FactoryDef_out &operator= (FactoryDef_ptr);
--  operator FactoryDef_ptr &();
--  FactoryDef_ptr &ptr (void);
--  FactoryDef_ptr operator-> (void);
-+  IR_FactoryDef_out (IR_FactoryDef_ptr &);
-+  IR_FactoryDef_out (IR_FactoryDef_var &);
-+  IR_FactoryDef_out (const IR_FactoryDef_out &);
-+  IR_FactoryDef_out &operator= (const IR_FactoryDef_out &);
-+  IR_FactoryDef_out &operator= (const IR_FactoryDef_var &);
-+  IR_FactoryDef_out &operator= (IR_FactoryDef_ptr);
-+  operator IR_FactoryDef_ptr &();
-+  IR_FactoryDef_ptr &ptr (void);
-+  IR_FactoryDef_ptr operator-> (void);
-   
- private:
--  FactoryDef_ptr &ptr_;
-+  IR_FactoryDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CH_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CH_
--
-   class _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -4642,19 +3595,19 @@
-     _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum);
-     _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      FactoryDef* *value,
-+      IR_FactoryDef* *value,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs);
-     virtual ~_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void);
-     _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs);
--    TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var> operator[] (CORBA::ULong index) const;
--    static FactoryDef **allocbuf (CORBA::ULong nelems);
--    static void freebuf (FactoryDef **buffer);
-+    TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var> operator[] (CORBA::ULong index) const;
-+    static IR_FactoryDef **allocbuf (CORBA::ULong nelems);
-+    static void freebuf (IR_FactoryDef **buffer);
-     // The Base_Sequence functions, please see tao/Sequence.h
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
--    FactoryDef* *get_buffer (CORBA::Boolean orphan = 0);
--    const FactoryDef* *get_buffer (void) const;
-+    IR_FactoryDef* *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_FactoryDef* *get_buffer (void) const;
-     virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-     virtual void _downcast (
-         void* target,
-@@ -4666,193 +3619,139 @@
-     
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_FACTORYDEFSEQ_CH_)
--#define _IR_FACTORYDEFSEQ_CH_
--
--class FactoryDefSeq;
--class FactoryDefSeq_var;
--
- // *************************************************************
--// FactoryDefSeq
-+// IR_FactoryDefSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export FactoryDefSeq : public 
-+class TAO_IFR_Client_Export IR_FactoryDefSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<FactoryDef,FactoryDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_FactoryDef,IR_FactoryDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  FactoryDefSeq (void); // default ctor
--  FactoryDefSeq (CORBA::ULong max); // uses max size
--  FactoryDefSeq (
-+  IR_FactoryDefSeq (void); // default ctor
-+  IR_FactoryDefSeq (CORBA::ULong max); // uses max size
-+  IR_FactoryDefSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    FactoryDef_ptr *buffer, 
-+    IR_FactoryDef_ptr *buffer,
-     CORBA::Boolean release = 0
-   );
--  FactoryDefSeq (const FactoryDefSeq &); // copy ctor
--  ~FactoryDefSeq (void);
-+  IR_FactoryDefSeq (const IR_FactoryDefSeq &); // copy ctor
-+  ~IR_FactoryDefSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef FactoryDefSeq_var _var_type;
-+  typedef IR_FactoryDefSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FACTORYDEFSEQ___VAR_CH_)
--#define _IR_FACTORYDEFSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::FactoryDefSeq_var
-+// class IR_FactoryDefSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export FactoryDefSeq_var
-+class TAO_IFR_Client_Export IR_FactoryDefSeq_var
- {
- public:
--  FactoryDefSeq_var (void); // default constructor
--  FactoryDefSeq_var (FactoryDefSeq *);
--  FactoryDefSeq_var (const FactoryDefSeq_var &); // copy constructor
--  ~FactoryDefSeq_var (void); // destructor
-+  IR_FactoryDefSeq_var (void); // default constructor
-+  IR_FactoryDefSeq_var (IR_FactoryDefSeq *);
-+  IR_FactoryDefSeq_var (const IR_FactoryDefSeq_var &); // copy constructor
-+  ~IR_FactoryDefSeq_var (void); // destructor
-   
--  FactoryDefSeq_var &operator= (FactoryDefSeq *);
--  FactoryDefSeq_var &operator= (const FactoryDefSeq_var &);
--  FactoryDefSeq *operator-> (void);
--  const FactoryDefSeq *operator-> (void) const;
-+  IR_FactoryDefSeq_var &operator= (IR_FactoryDefSeq *);
-+  IR_FactoryDefSeq_var &operator= (const IR_FactoryDefSeq_var &);
-+  IR_FactoryDefSeq *operator-> (void);
-+  const IR_FactoryDefSeq *operator-> (void) const;
-   
--  operator const FactoryDefSeq &() const;
--  operator FactoryDefSeq &();
--  operator FactoryDefSeq &() const;
--  operator FactoryDefSeq *&(); // variable-size base types only
-+  operator const IR_FactoryDefSeq &() const;
-+  operator IR_FactoryDefSeq &();
-+  operator IR_FactoryDefSeq &() const;
-+  operator IR_FactoryDefSeq *&(); // variable-size base types only
-   
--  TAO_Object_Manager<FactoryDef, FactoryDef_var> operator[] (CORBA::ULong index);
-+  TAO_Object_Manager<IR_FactoryDef, IR_FactoryDef_var> operator[] (CORBA::ULong index);
-   
-   // in, inout, out, _retn 
--  const FactoryDefSeq &in (void) const;
--  FactoryDefSeq &inout (void);
--  FactoryDefSeq *&out (void);
--  FactoryDefSeq *_retn (void);
--  FactoryDefSeq *ptr (void) const;
-+  const IR_FactoryDefSeq &in (void) const;
-+  IR_FactoryDefSeq &inout (void);
-+  IR_FactoryDefSeq *&out (void);
-+  IR_FactoryDefSeq *_retn (void);
-+  IR_FactoryDefSeq *ptr (void) const;
- 
- private:
--  FactoryDefSeq *ptr_;
-+  IR_FactoryDefSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FACTORYDEFSEQ___OUT_CH_)
--#define _IR_FACTORYDEFSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export FactoryDefSeq_out
-+class TAO_IFR_Client_Export IR_FactoryDefSeq_out
- {
- public:
--  FactoryDefSeq_out (FactoryDefSeq *&);
--  FactoryDefSeq_out (FactoryDefSeq_var &);
--  FactoryDefSeq_out (const FactoryDefSeq_out &);
--  FactoryDefSeq_out &operator= (const FactoryDefSeq_out &);
--  FactoryDefSeq_out &operator= (FactoryDefSeq *);
--  operator FactoryDefSeq *&();
--  FactoryDefSeq *&ptr (void);
--  FactoryDefSeq *operator-> (void);
--  TAO_Object_Manager<FactoryDef, FactoryDef_var> operator[] (CORBA::ULong index);
-+  IR_FactoryDefSeq_out (IR_FactoryDefSeq *&);
-+  IR_FactoryDefSeq_out (IR_FactoryDefSeq_var &);
-+  IR_FactoryDefSeq_out (const IR_FactoryDefSeq_out &);
-+  IR_FactoryDefSeq_out &operator= (const IR_FactoryDefSeq_out &);
-+  IR_FactoryDefSeq_out &operator= (IR_FactoryDefSeq *);
-+  operator IR_FactoryDefSeq *&();
-+  IR_FactoryDefSeq *&ptr (void);
-+  IR_FactoryDefSeq *operator-> (void);
-+  TAO_Object_Manager<IR_FactoryDef, IR_FactoryDef_var> operator[] (CORBA::ULong index);
-   
- private:
--  FactoryDefSeq *&ptr_;
-+  IR_FactoryDefSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const FactoryDefSeq_var &);
-+  void operator= (const IR_FactoryDefSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FactoryDefSeq;
--
--class FinderDef;
--
--#if !defined (_IR_FINDERDEF___PTR_CH_)
--#define _IR_FINDERDEF___PTR_CH_
--
--typedef FinderDef *FinderDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FINDERDEF___VAR_CH_)
--#define _IR_FINDERDEF___VAR_CH_
--
--class TAO_IFR_Client_Export FinderDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_FinderDef_var : public TAO_Base_var
- {
- public:
--  FinderDef_var (void); // default constructor
--  FinderDef_var (FinderDef_ptr p) : ptr_ (p) {} 
--  FinderDef_var (const FinderDef_var &); // copy constructor
--  ~FinderDef_var (void); // destructor
-+  IR_FinderDef_var (void); // default constructor
-+  IR_FinderDef_var (IR_FinderDef_ptr p) : ptr_ (p) {}
-+  IR_FinderDef_var (const IR_FinderDef_var &); // copy constructor
-+  ~IR_FinderDef_var (void); // destructor
-   
--  FinderDef_var &operator= (FinderDef_ptr);
--  FinderDef_var &operator= (const FinderDef_var &);
--  FinderDef_ptr operator-> (void) const;
-+  IR_FinderDef_var &operator= (IR_FinderDef_ptr);
-+  IR_FinderDef_var &operator= (const IR_FinderDef_var &);
-+  IR_FinderDef_ptr operator-> (void) const;
-   
--  operator const FinderDef_ptr &() const;
--  operator FinderDef_ptr &();
-+  operator const IR_FinderDef_ptr &() const;
-+  operator IR_FinderDef_ptr &();
-   // in, inout, out, _retn 
--  FinderDef_ptr in (void) const;
--  FinderDef_ptr &inout (void);
--  FinderDef_ptr &out (void);
--  FinderDef_ptr _retn (void);
--  FinderDef_ptr ptr (void) const;
-+  IR_FinderDef_ptr in (void) const;
-+  IR_FinderDef_ptr &inout (void);
-+  IR_FinderDef_ptr &out (void);
-+  IR_FinderDef_ptr _retn (void);
-+  IR_FinderDef_ptr ptr (void) const;
- 
- private:
--  FinderDef_ptr ptr_;
-+  IR_FinderDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  FinderDef_var (const TAO_Base_var &rhs);
--  FinderDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_FinderDef_var (const TAO_Base_var &rhs);
-+  IR_FinderDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FINDERDEF___OUT_CH_)
--#define _IR_FINDERDEF___OUT_CH_
--
--class TAO_IFR_Client_Export FinderDef_out
-+class TAO_IFR_Client_Export IR_FinderDef_out
- {
- public:
--  FinderDef_out (FinderDef_ptr &);
--  FinderDef_out (FinderDef_var &);
--  FinderDef_out (const FinderDef_out &);
--  FinderDef_out &operator= (const FinderDef_out &);
--  FinderDef_out &operator= (const FinderDef_var &);
--  FinderDef_out &operator= (FinderDef_ptr);
--  operator FinderDef_ptr &();
--  FinderDef_ptr &ptr (void);
--  FinderDef_ptr operator-> (void);
-+  IR_FinderDef_out (IR_FinderDef_ptr &);
-+  IR_FinderDef_out (IR_FinderDef_var &);
-+  IR_FinderDef_out (const IR_FinderDef_out &);
-+  IR_FinderDef_out &operator= (const IR_FinderDef_out &);
-+  IR_FinderDef_out &operator= (const IR_FinderDef_var &);
-+  IR_FinderDef_out &operator= (IR_FinderDef_ptr);
-+  operator IR_FinderDef_ptr &();
-+  IR_FinderDef_ptr &ptr (void);
-+  IR_FinderDef_ptr operator-> (void);
-   
- private:
--  FinderDef_ptr &ptr_;
-+  IR_FinderDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CH_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CH_
--
-   class _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -4862,19 +3761,19 @@
-     _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum);
-     _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      FinderDef* *value,
-+      IR_FinderDef* *value,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs);
-     virtual ~_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void);
-     _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs);
--    TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var> operator[] (CORBA::ULong index) const;
--    static FinderDef **allocbuf (CORBA::ULong nelems);
--    static void freebuf (FinderDef **buffer);
-+    TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var> operator[] (CORBA::ULong index) const;
-+    static IR_FinderDef **allocbuf (CORBA::ULong nelems);
-+    static void freebuf (IR_FinderDef **buffer);
-     // The Base_Sequence functions, please see tao/Sequence.h
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
--    FinderDef* *get_buffer (CORBA::Boolean orphan = 0);
--    const FinderDef* *get_buffer (void) const;
-+    IR_FinderDef* *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_FinderDef* *get_buffer (void) const;
-     virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-     virtual void _downcast (
-         void* target,
-@@ -4886,193 +3785,139 @@
-     
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_FINDERDEFSEQ_CH_)
--#define _IR_FINDERDEFSEQ_CH_
--
--class FinderDefSeq;
--class FinderDefSeq_var;
--
- // *************************************************************
--// FinderDefSeq
-+// IR_FinderDefSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export FinderDefSeq : public 
-+class TAO_IFR_Client_Export IR_FinderDefSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<FinderDef,FinderDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_FinderDef,IR_FinderDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  FinderDefSeq (void); // default ctor
--  FinderDefSeq (CORBA::ULong max); // uses max size
--  FinderDefSeq (
-+  IR_FinderDefSeq (void); // default ctor
-+  IR_FinderDefSeq (CORBA::ULong max); // uses max size
-+  IR_FinderDefSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    FinderDef_ptr *buffer, 
-+    IR_FinderDef_ptr *buffer,
-     CORBA::Boolean release = 0
-   );
--  FinderDefSeq (const FinderDefSeq &); // copy ctor
--  ~FinderDefSeq (void);
-+  IR_FinderDefSeq (const IR_FinderDefSeq &); // copy ctor
-+  ~IR_FinderDefSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef FinderDefSeq_var _var_type;
-+  typedef IR_FinderDefSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FINDERDEFSEQ___VAR_CH_)
--#define _IR_FINDERDEFSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::FinderDefSeq_var
-+// class IR_FinderDefSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export FinderDefSeq_var
-+class TAO_IFR_Client_Export IR_FinderDefSeq_var
- {
- public:
--  FinderDefSeq_var (void); // default constructor
--  FinderDefSeq_var (FinderDefSeq *);
--  FinderDefSeq_var (const FinderDefSeq_var &); // copy constructor
--  ~FinderDefSeq_var (void); // destructor
-+  IR_FinderDefSeq_var (void); // default constructor
-+  IR_FinderDefSeq_var (IR_FinderDefSeq *);
-+  IR_FinderDefSeq_var (const IR_FinderDefSeq_var &); // copy constructor
-+  ~IR_FinderDefSeq_var (void); // destructor
-   
--  FinderDefSeq_var &operator= (FinderDefSeq *);
--  FinderDefSeq_var &operator= (const FinderDefSeq_var &);
--  FinderDefSeq *operator-> (void);
--  const FinderDefSeq *operator-> (void) const;
-+  IR_FinderDefSeq_var &operator= (IR_FinderDefSeq *);
-+  IR_FinderDefSeq_var &operator= (const IR_FinderDefSeq_var &);
-+  IR_FinderDefSeq *operator-> (void);
-+  const IR_FinderDefSeq *operator-> (void) const;
-   
--  operator const FinderDefSeq &() const;
--  operator FinderDefSeq &();
--  operator FinderDefSeq &() const;
--  operator FinderDefSeq *&(); // variable-size base types only
-+  operator const IR_FinderDefSeq &() const;
-+  operator IR_FinderDefSeq &();
-+  operator IR_FinderDefSeq &() const;
-+  operator IR_FinderDefSeq *&(); // variable-size base types only
-   
--  TAO_Object_Manager<FinderDef, FinderDef_var> operator[] (CORBA::ULong index);
-+  TAO_Object_Manager<IR_FinderDef, IR_FinderDef_var> operator[] (CORBA::ULong index);
-   
-   // in, inout, out, _retn 
--  const FinderDefSeq &in (void) const;
--  FinderDefSeq &inout (void);
--  FinderDefSeq *&out (void);
--  FinderDefSeq *_retn (void);
--  FinderDefSeq *ptr (void) const;
-+  const IR_FinderDefSeq &in (void) const;
-+  IR_FinderDefSeq &inout (void);
-+  IR_FinderDefSeq *&out (void);
-+  IR_FinderDefSeq *_retn (void);
-+  IR_FinderDefSeq *ptr (void) const;
- 
- private:
--  FinderDefSeq *ptr_;
-+  IR_FinderDefSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FINDERDEFSEQ___OUT_CH_)
--#define _IR_FINDERDEFSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export FinderDefSeq_out
-+class TAO_IFR_Client_Export IR_FinderDefSeq_out
- {
- public:
--  FinderDefSeq_out (FinderDefSeq *&);
--  FinderDefSeq_out (FinderDefSeq_var &);
--  FinderDefSeq_out (const FinderDefSeq_out &);
--  FinderDefSeq_out &operator= (const FinderDefSeq_out &);
--  FinderDefSeq_out &operator= (FinderDefSeq *);
--  operator FinderDefSeq *&();
--  FinderDefSeq *&ptr (void);
--  FinderDefSeq *operator-> (void);
--  TAO_Object_Manager<FinderDef, FinderDef_var> operator[] (CORBA::ULong index);
-+  IR_FinderDefSeq_out (IR_FinderDefSeq *&);
-+  IR_FinderDefSeq_out (IR_FinderDefSeq_var &);
-+  IR_FinderDefSeq_out (const IR_FinderDefSeq_out &);
-+  IR_FinderDefSeq_out &operator= (const IR_FinderDefSeq_out &);
-+  IR_FinderDefSeq_out &operator= (IR_FinderDefSeq *);
-+  operator IR_FinderDefSeq *&();
-+  IR_FinderDefSeq *&ptr (void);
-+  IR_FinderDefSeq *operator-> (void);
-+  TAO_Object_Manager<IR_FinderDef, IR_FinderDef_var> operator[] (CORBA::ULong index);
-   
- private:
--  FinderDefSeq *&ptr_;
-+  IR_FinderDefSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const FinderDefSeq_var &);
-+  void operator= (const IR_FinderDefSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FinderDefSeq;
--
--class PrimaryKeyDef;
--
--#if !defined (_IR_PRIMARYKEYDEF___PTR_CH_)
--#define _IR_PRIMARYKEYDEF___PTR_CH_
--
--typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PRIMARYKEYDEF___VAR_CH_)
--#define _IR_PRIMARYKEYDEF___VAR_CH_
--
--class TAO_IFR_Client_Export PrimaryKeyDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_PrimaryKeyDef_var : public TAO_Base_var
- {
- public:
--  PrimaryKeyDef_var (void); // default constructor
--  PrimaryKeyDef_var (PrimaryKeyDef_ptr p) : ptr_ (p) {} 
--  PrimaryKeyDef_var (const PrimaryKeyDef_var &); // copy constructor
--  ~PrimaryKeyDef_var (void); // destructor
-+  IR_PrimaryKeyDef_var (void); // default constructor
-+  IR_PrimaryKeyDef_var (IR_PrimaryKeyDef_ptr p) : ptr_ (p) {}
-+  IR_PrimaryKeyDef_var (const IR_PrimaryKeyDef_var &); // copy constructor
-+  ~IR_PrimaryKeyDef_var (void); // destructor
-   
--  PrimaryKeyDef_var &operator= (PrimaryKeyDef_ptr);
--  PrimaryKeyDef_var &operator= (const PrimaryKeyDef_var &);
--  PrimaryKeyDef_ptr operator-> (void) const;
-+  IR_PrimaryKeyDef_var &operator= (IR_PrimaryKeyDef_ptr);
-+  IR_PrimaryKeyDef_var &operator= (const IR_PrimaryKeyDef_var &);
-+  IR_PrimaryKeyDef_ptr operator-> (void) const;
-   
--  operator const PrimaryKeyDef_ptr &() const;
--  operator PrimaryKeyDef_ptr &();
-+  operator const IR_PrimaryKeyDef_ptr &() const;
-+  operator IR_PrimaryKeyDef_ptr &();
-   // in, inout, out, _retn 
--  PrimaryKeyDef_ptr in (void) const;
--  PrimaryKeyDef_ptr &inout (void);
--  PrimaryKeyDef_ptr &out (void);
--  PrimaryKeyDef_ptr _retn (void);
--  PrimaryKeyDef_ptr ptr (void) const;
-+  IR_PrimaryKeyDef_ptr in (void) const;
-+  IR_PrimaryKeyDef_ptr &inout (void);
-+  IR_PrimaryKeyDef_ptr &out (void);
-+  IR_PrimaryKeyDef_ptr _retn (void);
-+  IR_PrimaryKeyDef_ptr ptr (void) const;
- 
- private:
--  PrimaryKeyDef_ptr ptr_;
-+  IR_PrimaryKeyDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  PrimaryKeyDef_var (const TAO_Base_var &rhs);
--  PrimaryKeyDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_PrimaryKeyDef_var (const TAO_Base_var &rhs);
-+  IR_PrimaryKeyDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PRIMARYKEYDEF___OUT_CH_)
--#define _IR_PRIMARYKEYDEF___OUT_CH_
--
--class TAO_IFR_Client_Export PrimaryKeyDef_out
-+class TAO_IFR_Client_Export IR_PrimaryKeyDef_out
- {
- public:
--  PrimaryKeyDef_out (PrimaryKeyDef_ptr &);
--  PrimaryKeyDef_out (PrimaryKeyDef_var &);
--  PrimaryKeyDef_out (const PrimaryKeyDef_out &);
--  PrimaryKeyDef_out &operator= (const PrimaryKeyDef_out &);
--  PrimaryKeyDef_out &operator= (const PrimaryKeyDef_var &);
--  PrimaryKeyDef_out &operator= (PrimaryKeyDef_ptr);
--  operator PrimaryKeyDef_ptr &();
--  PrimaryKeyDef_ptr &ptr (void);
--  PrimaryKeyDef_ptr operator-> (void);
-+  IR_PrimaryKeyDef_out (IR_PrimaryKeyDef_ptr &);
-+  IR_PrimaryKeyDef_out (IR_PrimaryKeyDef_var &);
-+  IR_PrimaryKeyDef_out (const IR_PrimaryKeyDef_out &);
-+  IR_PrimaryKeyDef_out &operator= (const IR_PrimaryKeyDef_out &);
-+  IR_PrimaryKeyDef_out &operator= (const IR_PrimaryKeyDef_var &);
-+  IR_PrimaryKeyDef_out &operator= (IR_PrimaryKeyDef_ptr);
-+  operator IR_PrimaryKeyDef_ptr &();
-+  IR_PrimaryKeyDef_ptr &ptr (void);
-+  IR_PrimaryKeyDef_ptr operator-> (void);
-   
- private:
--  PrimaryKeyDef_ptr &ptr_;
-+  IR_PrimaryKeyDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CH_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CH_
--
-   class _TAO_Unbounded_Object_Sequence_IR_ContainedSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -5082,19 +3927,19 @@
-     _TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum);
-     _TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      Contained* *value,
-+      IR_Contained* *value,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Object_Sequence_IR_ContainedSeq(const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs);
-     virtual ~_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (void);
-     _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs);
--    TAO_Object_Manager<IR::Contained,IR::Contained_var> operator[] (CORBA::ULong index) const;
--    static Contained **allocbuf (CORBA::ULong nelems);
--    static void freebuf (Contained **buffer);
-+    TAO_Object_Manager<IR_Contained,IR_Contained_var> operator[] (CORBA::ULong index) const;
-+    static IR_Contained **allocbuf (CORBA::ULong nelems);
-+    static void freebuf (IR_Contained **buffer);
-     // The Base_Sequence functions, please see tao/Sequence.h
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
--    Contained* *get_buffer (CORBA::Boolean orphan = 0);
--    const Contained* *get_buffer (void) const;
-+    IR_Contained* *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_Contained* *get_buffer (void) const;
-     virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-     virtual void _downcast (
-         void* target,
-@@ -5106,191 +3951,156 @@
-     
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_CONTAINEDSEQ_CH_)
--#define _IR_CONTAINEDSEQ_CH_
--
--class ContainedSeq;
--class ContainedSeq_var;
--
- // *************************************************************
--// ContainedSeq
-+// IR_ContainedSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export ContainedSeq : public 
-+class TAO_IFR_Client_Export IR_ContainedSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ContainedSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<Contained,Contained_var>
-+  TAO_Unbounded_Object_Sequence<IR_Contained,IR_Contained_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  ContainedSeq (void); // default ctor
--  ContainedSeq (CORBA::ULong max); // uses max size
--  ContainedSeq (
-+  IR_ContainedSeq (void); // default ctor
-+  IR_ContainedSeq (CORBA::ULong max); // uses max size
-+  IR_ContainedSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    Contained_ptr *buffer, 
-+    IR_Contained_ptr *buffer,
-     CORBA::Boolean release = 0
-   );
--  ContainedSeq (const ContainedSeq &); // copy ctor
--  ~ContainedSeq (void);
-+  IR_ContainedSeq (const IR_ContainedSeq &); // copy ctor
-+  ~IR_ContainedSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ContainedSeq_var _var_type;
--#endif /* ! __GNUC__ || g++ >= 2.8 */
--
--};
--
--#endif /* end #if !defined */
--
-+  typedef IR_ContainedSeq_var _var_type;
-+#endif /* ! __GNUC__ || g++ >= 2.8 */
- 
--#if !defined (_IR_CONTAINEDSEQ___VAR_CH_)
--#define _IR_CONTAINEDSEQ___VAR_CH_
-+};
- 
- // *************************************************************
--// class IR::ContainedSeq_var
-+// class IR_ContainedSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export ContainedSeq_var
-+class TAO_IFR_Client_Export IR_ContainedSeq_var
- {
- public:
--  ContainedSeq_var (void); // default constructor
--  ContainedSeq_var (ContainedSeq *);
--  ContainedSeq_var (const ContainedSeq_var &); // copy constructor
--  ~ContainedSeq_var (void); // destructor
-+  IR_ContainedSeq_var (void); // default constructor
-+  IR_ContainedSeq_var (IR_ContainedSeq *);
-+  IR_ContainedSeq_var (const IR_ContainedSeq_var &); // copy constructor
-+  ~IR_ContainedSeq_var (void); // destructor
-   
--  ContainedSeq_var &operator= (ContainedSeq *);
--  ContainedSeq_var &operator= (const ContainedSeq_var &);
--  ContainedSeq *operator-> (void);
--  const ContainedSeq *operator-> (void) const;
-+  IR_ContainedSeq_var &operator= (IR_ContainedSeq *);
-+  IR_ContainedSeq_var &operator= (const IR_ContainedSeq_var &);
-+  IR_ContainedSeq *operator-> (void);
-+  const IR_ContainedSeq *operator-> (void) const;
-   
--  operator const ContainedSeq &() const;
--  operator ContainedSeq &();
--  operator ContainedSeq &() const;
--  operator ContainedSeq *&(); // variable-size base types only
-+  operator const IR_ContainedSeq &() const;
-+  operator IR_ContainedSeq &();
-+  operator IR_ContainedSeq &() const;
-+  operator IR_ContainedSeq *&(); // variable-size base types only
-   
--  TAO_Object_Manager<Contained, Contained_var> operator[] (CORBA::ULong index);
-+  TAO_Object_Manager<IR_Contained, IR_Contained_var> operator[] (CORBA::ULong index);
-   
-   // in, inout, out, _retn 
--  const ContainedSeq &in (void) const;
--  ContainedSeq &inout (void);
--  ContainedSeq *&out (void);
--  ContainedSeq *_retn (void);
--  ContainedSeq *ptr (void) const;
-+  const IR_ContainedSeq &in (void) const;
-+  IR_ContainedSeq &inout (void);
-+  IR_ContainedSeq *&out (void);
-+  IR_ContainedSeq *_retn (void);
-+  IR_ContainedSeq *ptr (void) const;
- 
- private:
--  ContainedSeq *ptr_;
-+  IR_ContainedSeq *ptr_;
- };
- 
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINEDSEQ___OUT_CH_)
--#define _IR_CONTAINEDSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export ContainedSeq_out
-+class TAO_IFR_Client_Export IR_ContainedSeq_out
- {
- public:
--  ContainedSeq_out (ContainedSeq *&);
--  ContainedSeq_out (ContainedSeq_var &);
--  ContainedSeq_out (const ContainedSeq_out &);
--  ContainedSeq_out &operator= (const ContainedSeq_out &);
--  ContainedSeq_out &operator= (ContainedSeq *);
--  operator ContainedSeq *&();
--  ContainedSeq *&ptr (void);
--  ContainedSeq *operator-> (void);
--  TAO_Object_Manager<Contained, Contained_var> operator[] (CORBA::ULong index);
-+  IR_ContainedSeq_out (IR_ContainedSeq *&);
-+  IR_ContainedSeq_out (IR_ContainedSeq_var &);
-+  IR_ContainedSeq_out (const IR_ContainedSeq_out &);
-+  IR_ContainedSeq_out &operator= (const IR_ContainedSeq_out &);
-+  IR_ContainedSeq_out &operator= (IR_ContainedSeq *);
-+  operator IR_ContainedSeq *&();
-+  IR_ContainedSeq *&ptr (void);
-+  IR_ContainedSeq *operator-> (void);
-+  TAO_Object_Manager<IR_Contained, IR_Contained_var> operator[] (CORBA::ULong index);
-   
- private:
--  ContainedSeq *&ptr_;
-+  IR_ContainedSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ContainedSeq_var &);
-+  void operator= (const IR_ContainedSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContainedSeq;
--
--struct StructMember;
--class StructMember_var;
--
--struct TAO_IFR_Client_Export StructMember
-+struct TAO_IFR_Client_Export IR_StructMember
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef StructMember_var _var_type;
-+  typedef IR_StructMember_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
- 
-   TAO_String_Manager name;
-   CORBA::TypeCode_var type;
--  ACE_NESTED_CLASS (IR, IDLType_var) type_def;
-+  IR_IDLType_var type_def;
- };
- 
--class TAO_IFR_Client_Export StructMember_var
-+class TAO_IFR_Client_Export IR_StructMember_var
- {
- public:
--  StructMember_var (void); // default constructor
--  StructMember_var (StructMember *);
--  StructMember_var (const StructMember_var &); // copy constructor
--  ~StructMember_var (void); // destructor
-+  IR_StructMember_var (void); // default constructor
-+  IR_StructMember_var (IR_StructMember *);
-+  IR_StructMember_var (const IR_StructMember_var &); // copy constructor
-+  ~IR_StructMember_var (void); // destructor
-   
--  StructMember_var &operator= (StructMember *);
--  StructMember_var &operator= (const StructMember_var &);
--  StructMember *operator-> (void);
--  const StructMember *operator-> (void) const;
-+  IR_StructMember_var &operator= (IR_StructMember *);
-+  IR_StructMember_var &operator= (const IR_StructMember_var &);
-+  IR_StructMember *operator-> (void);
-+  const IR_StructMember *operator-> (void) const;
-   
--  operator const StructMember &() const;
--  operator StructMember &();
--  operator StructMember &() const;
--  operator StructMember *&(); // variable-size types only
-+  operator const IR_StructMember &() const;
-+  operator IR_StructMember &();
-+  operator IR_StructMember &() const;
-+  operator IR_StructMember *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const StructMember &in (void) const;
--  StructMember &inout (void);
--  StructMember *&out (void);
--  StructMember *_retn (void);
--  StructMember *ptr (void) const;
-+  const IR_StructMember &in (void) const;
-+  IR_StructMember &inout (void);
-+  IR_StructMember *&out (void);
-+  IR_StructMember *_retn (void);
-+  IR_StructMember *ptr (void) const;
- 
- private:
--  StructMember *ptr_;
-+  IR_StructMember *ptr_;
- };
- 
--class TAO_IFR_Client_Export StructMember_out
-+class TAO_IFR_Client_Export IR_StructMember_out
- {
- public:
--  StructMember_out (StructMember *&);
--  StructMember_out (StructMember_var &);
--  StructMember_out (const StructMember_out &);
--  StructMember_out &operator= (const StructMember_out &);
--  StructMember_out &operator= (StructMember *);
--  operator StructMember *&();
--  StructMember *&ptr (void);
--  StructMember *operator-> (void);
-+  IR_StructMember_out (IR_StructMember *&);
-+  IR_StructMember_out (IR_StructMember_var &);
-+  IR_StructMember_out (const IR_StructMember_out &);
-+  IR_StructMember_out &operator= (const IR_StructMember_out &);
-+  IR_StructMember_out &operator= (IR_StructMember *);
-+  operator IR_StructMember *&();
-+  IR_StructMember *&ptr (void);
-+  IR_StructMember *operator-> (void);
-   
- private:
--  StructMember *&ptr_;
-+  IR_StructMember *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const StructMember_var &);
-+  void operator= (const IR_StructMember_var &);
- };
- 
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StructMember;
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CH_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CH_
--
-   class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_StructMemberSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -5300,214 +4110,178 @@
-     _TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum); 
-     _TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      StructMember *data,
-+      IR_StructMember *data,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Sequence_IR_StructMemberSeq (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs);
-     _TAO_Unbounded_Sequence_IR_StructMemberSeq &operator= (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs);
-     virtual ~_TAO_Unbounded_Sequence_IR_StructMemberSeq (void); // Dtor.
-     // = Accessors.
--    StructMember &operator[] (CORBA::ULong i);
--    const StructMember &operator[] (CORBA::ULong i) const;
-+    IR_StructMember &operator[] (CORBA::ULong i);
-+    const IR_StructMember &operator[] (CORBA::ULong i) const;
-     // = Static operations.
--    static StructMember *allocbuf (CORBA::ULong size);
--    static void freebuf (StructMember *buffer);
-+    static IR_StructMember *allocbuf (CORBA::ULong size);
-+    static void freebuf (IR_StructMember *buffer);
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
-     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-     
--    StructMember *get_buffer (CORBA::Boolean orphan = 0);
--    const StructMember *get_buffer (void) const;
-+    IR_StructMember *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_StructMember *get_buffer (void) const;
-     void replace (CORBA::ULong max,
-       CORBA::ULong length,
--      StructMember *data,
-+      IR_StructMember *data,
-       CORBA::Boolean release);
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_STRUCTMEMBERSEQ_CH_)
--#define _IR_STRUCTMEMBERSEQ_CH_
--
--class StructMemberSeq;
--class StructMemberSeq_var;
--
- // *************************************************************
--// StructMemberSeq
-+// IR_StructMemberSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export StructMemberSeq : public 
-+class TAO_IFR_Client_Export IR_StructMemberSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_StructMemberSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<StructMember>
-+  TAO_Unbounded_Sequence<IR_StructMember>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  StructMemberSeq (void); // default ctor
--  StructMemberSeq (CORBA::ULong max); // uses max size
--  StructMemberSeq (
-+  IR_StructMemberSeq (void); // default ctor
-+  IR_StructMemberSeq (CORBA::ULong max); // uses max size
-+  IR_StructMemberSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    StructMember *buffer, 
-+    IR_StructMember *buffer,
-     CORBA::Boolean release = 0
-   );
--  StructMemberSeq (const StructMemberSeq &); // copy ctor
--  ~StructMemberSeq (void);
-+  IR_StructMemberSeq (const IR_StructMemberSeq &); // copy ctor
-+  ~IR_StructMemberSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef StructMemberSeq_var _var_type;
-+  typedef IR_StructMemberSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRUCTMEMBERSEQ___VAR_CH_)
--#define _IR_STRUCTMEMBERSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::StructMemberSeq_var
-+// class IR_StructMemberSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export StructMemberSeq_var
-+class TAO_IFR_Client_Export IR_StructMemberSeq_var
- {
- public:
--  StructMemberSeq_var (void); // default constructor
--  StructMemberSeq_var (StructMemberSeq *);
--  StructMemberSeq_var (const StructMemberSeq_var &); // copy constructor
--  ~StructMemberSeq_var (void); // destructor
-+  IR_StructMemberSeq_var (void); // default constructor
-+  IR_StructMemberSeq_var (IR_StructMemberSeq *);
-+  IR_StructMemberSeq_var (const IR_StructMemberSeq_var &); // copy constructor
-+  ~IR_StructMemberSeq_var (void); // destructor
-   
--  StructMemberSeq_var &operator= (StructMemberSeq *);
--  StructMemberSeq_var &operator= (const StructMemberSeq_var &);
--  StructMemberSeq *operator-> (void);
--  const StructMemberSeq *operator-> (void) const;
-+  IR_StructMemberSeq_var &operator= (IR_StructMemberSeq *);
-+  IR_StructMemberSeq_var &operator= (const IR_StructMemberSeq_var &);
-+  IR_StructMemberSeq *operator-> (void);
-+  const IR_StructMemberSeq *operator-> (void) const;
-   
--  operator const StructMemberSeq &() const;
--  operator StructMemberSeq &();
--  operator StructMemberSeq &() const;
--  operator StructMemberSeq *&(); // variable-size base types only
-+  operator const IR_StructMemberSeq &() const;
-+  operator IR_StructMemberSeq &();
-+  operator IR_StructMemberSeq &() const;
-+  operator IR_StructMemberSeq *&(); // variable-size base types only
-   
--  StructMember & operator[] (CORBA::ULong index);
--  const StructMember & operator[] (CORBA::ULong index) const;
-+  IR_StructMember & operator[] (CORBA::ULong index);
-+  const IR_StructMember & operator[] (CORBA::ULong index) const;
-   
-   // in, inout, out, _retn 
--  const StructMemberSeq &in (void) const;
--  StructMemberSeq &inout (void);
--  StructMemberSeq *&out (void);
--  StructMemberSeq *_retn (void);
--  StructMemberSeq *ptr (void) const;
-+  const IR_StructMemberSeq &in (void) const;
-+  IR_StructMemberSeq &inout (void);
-+  IR_StructMemberSeq *&out (void);
-+  IR_StructMemberSeq *_retn (void);
-+  IR_StructMemberSeq *ptr (void) const;
- 
- private:
--  StructMemberSeq *ptr_;
-+  IR_StructMemberSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRUCTMEMBERSEQ___OUT_CH_)
--#define _IR_STRUCTMEMBERSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export StructMemberSeq_out
-+class TAO_IFR_Client_Export IR_StructMemberSeq_out
- {
- public:
--  StructMemberSeq_out (StructMemberSeq *&);
--  StructMemberSeq_out (StructMemberSeq_var &);
--  StructMemberSeq_out (const StructMemberSeq_out &);
--  StructMemberSeq_out &operator= (const StructMemberSeq_out &);
--  StructMemberSeq_out &operator= (StructMemberSeq *);
--  operator StructMemberSeq *&();
--  StructMemberSeq *&ptr (void);
--  StructMemberSeq *operator-> (void);
--  StructMember & operator[] (CORBA::ULong index);
-+  IR_StructMemberSeq_out (IR_StructMemberSeq *&);
-+  IR_StructMemberSeq_out (IR_StructMemberSeq_var &);
-+  IR_StructMemberSeq_out (const IR_StructMemberSeq_out &);
-+  IR_StructMemberSeq_out &operator= (const IR_StructMemberSeq_out &);
-+  IR_StructMemberSeq_out &operator= (IR_StructMemberSeq *);
-+  operator IR_StructMemberSeq *&();
-+  IR_StructMemberSeq *&ptr (void);
-+  IR_StructMemberSeq *operator-> (void);
-+  IR_StructMember & operator[] (CORBA::ULong index);
-   
- private:
--  StructMemberSeq *&ptr_;
-+  IR_StructMemberSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const StructMemberSeq_var &);
-+  void operator= (const IR_StructMemberSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StructMemberSeq;
--
--struct Initializer;
--class Initializer_var;
--
--struct TAO_IFR_Client_Export Initializer
-+struct TAO_IFR_Client_Export IR_Initializer
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef Initializer_var _var_type;
-+  typedef IR_Initializer_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
- 
--  ACE_NESTED_CLASS (IR, StructMemberSeq) members;
-+  IR_StructMemberSeq members;
-   TAO_String_Manager name;
- };
- 
--class TAO_IFR_Client_Export Initializer_var
-+class TAO_IFR_Client_Export IR_Initializer_var
- {
- public:
--  Initializer_var (void); // default constructor
--  Initializer_var (Initializer *);
--  Initializer_var (const Initializer_var &); // copy constructor
--  ~Initializer_var (void); // destructor
-+  IR_Initializer_var (void); // default constructor
-+  IR_Initializer_var (IR_Initializer *);
-+  IR_Initializer_var (const IR_Initializer_var &); // copy constructor
-+  ~IR_Initializer_var (void); // destructor
-   
--  Initializer_var &operator= (Initializer *);
--  Initializer_var &operator= (const Initializer_var &);
--  Initializer *operator-> (void);
--  const Initializer *operator-> (void) const;
-+  IR_Initializer_var &operator= (IR_Initializer *);
-+  IR_Initializer_var &operator= (const IR_Initializer_var &);
-+  IR_Initializer *operator-> (void);
-+  const IR_Initializer *operator-> (void) const;
-   
--  operator const Initializer &() const;
--  operator Initializer &();
--  operator Initializer &() const;
--  operator Initializer *&(); // variable-size types only
-+  operator const IR_Initializer &() const;
-+  operator IR_Initializer &();
-+  operator IR_Initializer &() const;
-+  operator IR_Initializer *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const Initializer &in (void) const;
--  Initializer &inout (void);
--  Initializer *&out (void);
--  Initializer *_retn (void);
--  Initializer *ptr (void) const;
-+  const IR_Initializer &in (void) const;
-+  IR_Initializer &inout (void);
-+  IR_Initializer *&out (void);
-+  IR_Initializer *_retn (void);
-+  IR_Initializer *ptr (void) const;
- 
- private:
--  Initializer *ptr_;
-+  IR_Initializer *ptr_;
- };
- 
--class TAO_IFR_Client_Export Initializer_out
-+class TAO_IFR_Client_Export IR_Initializer_out
- {
- public:
--  Initializer_out (Initializer *&);
--  Initializer_out (Initializer_var &);
--  Initializer_out (const Initializer_out &);
--  Initializer_out &operator= (const Initializer_out &);
--  Initializer_out &operator= (Initializer *);
--  operator Initializer *&();
--  Initializer *&ptr (void);
--  Initializer *operator-> (void);
-+  IR_Initializer_out (IR_Initializer *&);
-+  IR_Initializer_out (IR_Initializer_var &);
-+  IR_Initializer_out (const IR_Initializer_out &);
-+  IR_Initializer_out &operator= (const IR_Initializer_out &);
-+  IR_Initializer_out &operator= (IR_Initializer *);
-+  operator IR_Initializer *&();
-+  IR_Initializer *&ptr (void);
-+  IR_Initializer *operator-> (void);
-   
- private:
--  Initializer *&ptr_;
-+  IR_Initializer *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const Initializer_var &);
-+  void operator= (const IR_Initializer_var &);
- };
- 
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Initializer;
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CH_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CH_
--
-   class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_InitializerSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -5517,151 +4291,121 @@
-     _TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum); 
-     _TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      Initializer *data,
-+      IR_Initializer *data,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Sequence_IR_InitializerSeq (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs);
-     _TAO_Unbounded_Sequence_IR_InitializerSeq &operator= (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs);
-     virtual ~_TAO_Unbounded_Sequence_IR_InitializerSeq (void); // Dtor.
-     // = Accessors.
--    Initializer &operator[] (CORBA::ULong i);
--    const Initializer &operator[] (CORBA::ULong i) const;
-+    IR_Initializer &operator[] (CORBA::ULong i);
-+    const IR_Initializer &operator[] (CORBA::ULong i) const;
-     // = Static operations.
--    static Initializer *allocbuf (CORBA::ULong size);
--    static void freebuf (Initializer *buffer);
-+    static IR_Initializer *allocbuf (CORBA::ULong size);
-+    static void freebuf (IR_Initializer *buffer);
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
-     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-     
--    Initializer *get_buffer (CORBA::Boolean orphan = 0);
--    const Initializer *get_buffer (void) const;
-+    IR_Initializer *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_Initializer *get_buffer (void) const;
-     void replace (CORBA::ULong max,
-       CORBA::ULong length,
--      Initializer *data,
-+      IR_Initializer *data,
-       CORBA::Boolean release);
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_INITIALIZERSEQ_CH_)
--#define _IR_INITIALIZERSEQ_CH_
--
--class InitializerSeq;
--class InitializerSeq_var;
--
- // *************************************************************
--// InitializerSeq
-+// IR_InitializerSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export InitializerSeq : public 
-+class TAO_IFR_Client_Export IR_InitializerSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_InitializerSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<Initializer>
-+  TAO_Unbounded_Sequence<IR_Initializer>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  InitializerSeq (void); // default ctor
--  InitializerSeq (CORBA::ULong max); // uses max size
--  InitializerSeq (
-+  IR_InitializerSeq (void); // default ctor
-+  IR_InitializerSeq (CORBA::ULong max); // uses max size
-+  IR_InitializerSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    Initializer *buffer, 
-+    IR_Initializer *buffer,
-     CORBA::Boolean release = 0
-   );
--  InitializerSeq (const InitializerSeq &); // copy ctor
--  ~InitializerSeq (void);
-+  IR_InitializerSeq (const IR_InitializerSeq &); // copy ctor
-+  ~IR_InitializerSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef InitializerSeq_var _var_type;
-+  typedef IR_InitializerSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_INITIALIZERSEQ___VAR_CH_)
--#define _IR_INITIALIZERSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::InitializerSeq_var
-+// class IR_InitializerSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export InitializerSeq_var
-+class TAO_IFR_Client_Export IR_InitializerSeq_var
- {
- public:
--  InitializerSeq_var (void); // default constructor
--  InitializerSeq_var (InitializerSeq *);
--  InitializerSeq_var (const InitializerSeq_var &); // copy constructor
--  ~InitializerSeq_var (void); // destructor
-+  IR_InitializerSeq_var (void); // default constructor
-+  IR_InitializerSeq_var (IR_InitializerSeq *);
-+  IR_InitializerSeq_var (const IR_InitializerSeq_var &); // copy constructor
-+  ~IR_InitializerSeq_var (void); // destructor
-   
--  InitializerSeq_var &operator= (InitializerSeq *);
--  InitializerSeq_var &operator= (const InitializerSeq_var &);
--  InitializerSeq *operator-> (void);
--  const InitializerSeq *operator-> (void) const;
-+  IR_InitializerSeq_var &operator= (IR_InitializerSeq *);
-+  IR_InitializerSeq_var &operator= (const IR_InitializerSeq_var &);
-+  IR_InitializerSeq *operator-> (void);
-+  const IR_InitializerSeq *operator-> (void) const;
-   
--  operator const InitializerSeq &() const;
--  operator InitializerSeq &();
--  operator InitializerSeq &() const;
--  operator InitializerSeq *&(); // variable-size base types only
-+  operator const IR_InitializerSeq &() const;
-+  operator IR_InitializerSeq &();
-+  operator IR_InitializerSeq &() const;
-+  operator IR_InitializerSeq *&(); // variable-size base types only
-   
--  Initializer & operator[] (CORBA::ULong index);
--  const Initializer & operator[] (CORBA::ULong index) const;
-+  IR_Initializer & operator[] (CORBA::ULong index);
-+  const IR_Initializer & operator[] (CORBA::ULong index) const;
-   
-   // in, inout, out, _retn 
--  const InitializerSeq &in (void) const;
--  InitializerSeq &inout (void);
--  InitializerSeq *&out (void);
--  InitializerSeq *_retn (void);
--  InitializerSeq *ptr (void) const;
-+  const IR_InitializerSeq &in (void) const;
-+  IR_InitializerSeq &inout (void);
-+  IR_InitializerSeq *&out (void);
-+  IR_InitializerSeq *_retn (void);
-+  IR_InitializerSeq *ptr (void) const;
- 
- private:
--  InitializerSeq *ptr_;
-+  IR_InitializerSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_INITIALIZERSEQ___OUT_CH_)
--#define _IR_INITIALIZERSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export InitializerSeq_out
-+class TAO_IFR_Client_Export IR_InitializerSeq_out
- {
- public:
--  InitializerSeq_out (InitializerSeq *&);
--  InitializerSeq_out (InitializerSeq_var &);
--  InitializerSeq_out (const InitializerSeq_out &);
--  InitializerSeq_out &operator= (const InitializerSeq_out &);
--  InitializerSeq_out &operator= (InitializerSeq *);
--  operator InitializerSeq *&();
--  InitializerSeq *&ptr (void);
--  InitializerSeq *operator-> (void);
--  Initializer & operator[] (CORBA::ULong index);
-+  IR_InitializerSeq_out (IR_InitializerSeq *&);
-+  IR_InitializerSeq_out (IR_InitializerSeq_var &);
-+  IR_InitializerSeq_out (const IR_InitializerSeq_out &);
-+  IR_InitializerSeq_out &operator= (const IR_InitializerSeq_out &);
-+  IR_InitializerSeq_out &operator= (IR_InitializerSeq *);
-+  operator IR_InitializerSeq *&();
-+  IR_InitializerSeq *&ptr (void);
-+  IR_InitializerSeq *operator-> (void);
-+  IR_Initializer & operator[] (CORBA::ULong index);
-   
- private:
--  InitializerSeq *&ptr_;
-+  IR_InitializerSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const InitializerSeq_var &);
-+  void operator= (const IR_InitializerSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InitializerSeq;
--
--struct UnionMember;
--class UnionMember_var;
--
--struct TAO_IFR_Client_Export UnionMember
-+struct TAO_IFR_Client_Export IR_UnionMember
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef UnionMember_var _var_type;
-+  typedef IR_UnionMember_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
-@@ -5669,64 +4413,58 @@
-   TAO_String_Manager name;
-   CORBA::Any label;
-   CORBA::TypeCode_var type;
--  ACE_NESTED_CLASS (IR, IDLType_var) type_def;
-+  IR_IDLType_var type_def;
- };
- 
--class TAO_IFR_Client_Export UnionMember_var
-+class TAO_IFR_Client_Export IR_UnionMember_var
- {
- public:
--  UnionMember_var (void); // default constructor
--  UnionMember_var (UnionMember *);
--  UnionMember_var (const UnionMember_var &); // copy constructor
--  ~UnionMember_var (void); // destructor
-+  IR_UnionMember_var (void); // default constructor
-+  IR_UnionMember_var (IR_UnionMember *);
-+  IR_UnionMember_var (const IR_UnionMember_var &); // copy constructor
-+  ~IR_UnionMember_var (void); // destructor
-   
--  UnionMember_var &operator= (UnionMember *);
--  UnionMember_var &operator= (const UnionMember_var &);
--  UnionMember *operator-> (void);
--  const UnionMember *operator-> (void) const;
-+  IR_UnionMember_var &operator= (IR_UnionMember *);
-+  IR_UnionMember_var &operator= (const IR_UnionMember_var &);
-+  IR_UnionMember *operator-> (void);
-+  const IR_UnionMember *operator-> (void) const;
-   
--  operator const UnionMember &() const;
--  operator UnionMember &();
--  operator UnionMember &() const;
--  operator UnionMember *&(); // variable-size types only
-+  operator const IR_UnionMember &() const;
-+  operator IR_UnionMember &();
-+  operator IR_UnionMember &() const;
-+  operator IR_UnionMember *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const UnionMember &in (void) const;
--  UnionMember &inout (void);
--  UnionMember *&out (void);
--  UnionMember *_retn (void);
--  UnionMember *ptr (void) const;
-+  const IR_UnionMember &in (void) const;
-+  IR_UnionMember &inout (void);
-+  IR_UnionMember *&out (void);
-+  IR_UnionMember *_retn (void);
-+  IR_UnionMember *ptr (void) const;
- 
- private:
--  UnionMember *ptr_;
-+  IR_UnionMember *ptr_;
- };
- 
--class TAO_IFR_Client_Export UnionMember_out
-+class TAO_IFR_Client_Export IR_UnionMember_out
- {
- public:
--  UnionMember_out (UnionMember *&);
--  UnionMember_out (UnionMember_var &);
--  UnionMember_out (const UnionMember_out &);
--  UnionMember_out &operator= (const UnionMember_out &);
--  UnionMember_out &operator= (UnionMember *);
--  operator UnionMember *&();
--  UnionMember *&ptr (void);
--  UnionMember *operator-> (void);
-+  IR_UnionMember_out (IR_UnionMember *&);
-+  IR_UnionMember_out (IR_UnionMember_var &);
-+  IR_UnionMember_out (const IR_UnionMember_out &);
-+  IR_UnionMember_out &operator= (const IR_UnionMember_out &);
-+  IR_UnionMember_out &operator= (IR_UnionMember *);
-+  operator IR_UnionMember *&();
-+  IR_UnionMember *&ptr (void);
-+  IR_UnionMember *operator-> (void);
-   
- private:
--  UnionMember *&ptr_;
-+  IR_UnionMember *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const UnionMember_var &);
-+  void operator= (const IR_UnionMember_var &);
- };
- 
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UnionMember;
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CH_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CH_
--
-   class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_UnionMemberSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -5736,155 +4474,121 @@
-     _TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum); 
-     _TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      UnionMember *data,
-+      IR_UnionMember *data,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Sequence_IR_UnionMemberSeq (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs);
-     _TAO_Unbounded_Sequence_IR_UnionMemberSeq &operator= (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs);
-     virtual ~_TAO_Unbounded_Sequence_IR_UnionMemberSeq (void); // Dtor.
-     // = Accessors.
--    UnionMember &operator[] (CORBA::ULong i);
--    const UnionMember &operator[] (CORBA::ULong i) const;
-+    IR_UnionMember &operator[] (CORBA::ULong i);
-+    const IR_UnionMember &operator[] (CORBA::ULong i) const;
-     // = Static operations.
--    static UnionMember *allocbuf (CORBA::ULong size);
--    static void freebuf (UnionMember *buffer);
-+    static IR_UnionMember *allocbuf (CORBA::ULong size);
-+    static void freebuf (IR_UnionMember *buffer);
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
-     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-     
--    UnionMember *get_buffer (CORBA::Boolean orphan = 0);
--    const UnionMember *get_buffer (void) const;
-+    IR_UnionMember *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_UnionMember *get_buffer (void) const;
-     void replace (CORBA::ULong max,
-       CORBA::ULong length,
--      UnionMember *data,
-+      IR_UnionMember *data,
-       CORBA::Boolean release);
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_UNIONMEMBERSEQ_CH_)
--#define _IR_UNIONMEMBERSEQ_CH_
--
--class UnionMemberSeq;
--class UnionMemberSeq_var;
--
- // *************************************************************
--// UnionMemberSeq
-+// IR_UnionMemberSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export UnionMemberSeq : public 
-+class TAO_IFR_Client_Export IR_UnionMemberSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_UnionMemberSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<UnionMember>
-+  TAO_Unbounded_Sequence<IR_UnionMember>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  UnionMemberSeq (void); // default ctor
--  UnionMemberSeq (CORBA::ULong max); // uses max size
--  UnionMemberSeq (
-+  IR_UnionMemberSeq (void); // default ctor
-+  IR_UnionMemberSeq (CORBA::ULong max); // uses max size
-+  IR_UnionMemberSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    UnionMember *buffer, 
-+    IR_UnionMember *buffer,
-     CORBA::Boolean release = 0
-   );
--  UnionMemberSeq (const UnionMemberSeq &); // copy ctor
--  ~UnionMemberSeq (void);
-+  IR_UnionMemberSeq (const IR_UnionMemberSeq &); // copy ctor
-+  ~IR_UnionMemberSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef UnionMemberSeq_var _var_type;
-+  typedef IR_UnionMemberSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_UNIONMEMBERSEQ___VAR_CH_)
--#define _IR_UNIONMEMBERSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::UnionMemberSeq_var
-+// class IR_UnionMemberSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export UnionMemberSeq_var
-+class TAO_IFR_Client_Export IR_UnionMemberSeq_var
- {
- public:
--  UnionMemberSeq_var (void); // default constructor
--  UnionMemberSeq_var (UnionMemberSeq *);
--  UnionMemberSeq_var (const UnionMemberSeq_var &); // copy constructor
--  ~UnionMemberSeq_var (void); // destructor
-+  IR_UnionMemberSeq_var (void); // default constructor
-+  IR_UnionMemberSeq_var (IR_UnionMemberSeq *);
-+  IR_UnionMemberSeq_var (const IR_UnionMemberSeq_var &); // copy constructor
-+  ~IR_UnionMemberSeq_var (void); // destructor
-   
--  UnionMemberSeq_var &operator= (UnionMemberSeq *);
--  UnionMemberSeq_var &operator= (const UnionMemberSeq_var &);
--  UnionMemberSeq *operator-> (void);
--  const UnionMemberSeq *operator-> (void) const;
-+  IR_UnionMemberSeq_var &operator= (IR_UnionMemberSeq *);
-+  IR_UnionMemberSeq_var &operator= (const IR_UnionMemberSeq_var &);
-+  IR_UnionMemberSeq *operator-> (void);
-+  const IR_UnionMemberSeq *operator-> (void) const;
-   
--  operator const UnionMemberSeq &() const;
--  operator UnionMemberSeq &();
--  operator UnionMemberSeq &() const;
--  operator UnionMemberSeq *&(); // variable-size base types only
-+  operator const IR_UnionMemberSeq &() const;
-+  operator IR_UnionMemberSeq &();
-+  operator IR_UnionMemberSeq &() const;
-+  operator IR_UnionMemberSeq *&(); // variable-size base types only
-   
--  UnionMember & operator[] (CORBA::ULong index);
--  const UnionMember & operator[] (CORBA::ULong index) const;
-+  IR_UnionMember & operator[] (CORBA::ULong index);
-+  const IR_UnionMember & operator[] (CORBA::ULong index) const;
-   
-   // in, inout, out, _retn 
--  const UnionMemberSeq &in (void) const;
--  UnionMemberSeq &inout (void);
--  UnionMemberSeq *&out (void);
--  UnionMemberSeq *_retn (void);
--  UnionMemberSeq *ptr (void) const;
-+  const IR_UnionMemberSeq &in (void) const;
-+  IR_UnionMemberSeq &inout (void);
-+  IR_UnionMemberSeq *&out (void);
-+  IR_UnionMemberSeq *_retn (void);
-+  IR_UnionMemberSeq *ptr (void) const;
- 
- private:
--  UnionMemberSeq *ptr_;
-+  IR_UnionMemberSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_UNIONMEMBERSEQ___OUT_CH_)
--#define _IR_UNIONMEMBERSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export UnionMemberSeq_out
-+class TAO_IFR_Client_Export IR_UnionMemberSeq_out
- {
- public:
--  UnionMemberSeq_out (UnionMemberSeq *&);
--  UnionMemberSeq_out (UnionMemberSeq_var &);
--  UnionMemberSeq_out (const UnionMemberSeq_out &);
--  UnionMemberSeq_out &operator= (const UnionMemberSeq_out &);
--  UnionMemberSeq_out &operator= (UnionMemberSeq *);
--  operator UnionMemberSeq *&();
--  UnionMemberSeq *&ptr (void);
--  UnionMemberSeq *operator-> (void);
--  UnionMember & operator[] (CORBA::ULong index);
-+  IR_UnionMemberSeq_out (IR_UnionMemberSeq *&);
-+  IR_UnionMemberSeq_out (IR_UnionMemberSeq_var &);
-+  IR_UnionMemberSeq_out (const IR_UnionMemberSeq_out &);
-+  IR_UnionMemberSeq_out &operator= (const IR_UnionMemberSeq_out &);
-+  IR_UnionMemberSeq_out &operator= (IR_UnionMemberSeq *);
-+  operator IR_UnionMemberSeq *&();
-+  IR_UnionMemberSeq *&ptr (void);
-+  IR_UnionMemberSeq *operator-> (void);
-+  IR_UnionMember & operator[] (CORBA::ULong index);
-   
- private:
--  UnionMemberSeq *&ptr_;
-+  IR_UnionMemberSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const UnionMemberSeq_var &);
-+  void operator= (const IR_UnionMemberSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UnionMemberSeq;
--
--
--#if !defined (_IR_ENUMMEMBERSEQ_CH_)
--#define _IR_ENUMMEMBERSEQ_CH_
--
--class EnumMemberSeq;
--class EnumMemberSeq_var;
--
- // *************************************************************
--// EnumMemberSeq
-+// IR_EnumMemberSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export EnumMemberSeq : public 
-+class TAO_IFR_Client_Export IR_EnumMemberSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_String_Sequence
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-@@ -5892,202 +4596,112 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  EnumMemberSeq (void); // default ctor
--  EnumMemberSeq (CORBA::ULong max); // uses max size
--  EnumMemberSeq (
-+  IR_EnumMemberSeq (void); // default ctor
-+  IR_EnumMemberSeq (CORBA::ULong max); // uses max size
-+  IR_EnumMemberSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
-     char * *buffer, 
-     CORBA::Boolean release = 0
-   );
--  EnumMemberSeq (const EnumMemberSeq &); // copy ctor
--  ~EnumMemberSeq (void);
-+  IR_EnumMemberSeq (const IR_EnumMemberSeq &); // copy ctor
-+  ~IR_EnumMemberSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef EnumMemberSeq_var _var_type;
-+  typedef IR_EnumMemberSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ENUMMEMBERSEQ___VAR_CH_)
--#define _IR_ENUMMEMBERSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::EnumMemberSeq_var
-+// class IR_EnumMemberSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export EnumMemberSeq_var
-+class TAO_IFR_Client_Export IR_EnumMemberSeq_var
- {
- public:
--  EnumMemberSeq_var (void); // default constructor
--  EnumMemberSeq_var (EnumMemberSeq *);
--  EnumMemberSeq_var (const EnumMemberSeq_var &); // copy constructor
--  ~EnumMemberSeq_var (void); // destructor
-+  IR_EnumMemberSeq_var (void); // default constructor
-+  IR_EnumMemberSeq_var (IR_EnumMemberSeq *);
-+  IR_EnumMemberSeq_var (const IR_EnumMemberSeq_var &); // copy constructor
-+  ~IR_EnumMemberSeq_var (void); // destructor
-   
--  EnumMemberSeq_var &operator= (EnumMemberSeq *);
--  EnumMemberSeq_var &operator= (const EnumMemberSeq_var &);
--  EnumMemberSeq *operator-> (void);
--  const EnumMemberSeq *operator-> (void) const;
-+  IR_EnumMemberSeq_var &operator= (IR_EnumMemberSeq *);
-+  IR_EnumMemberSeq_var &operator= (const IR_EnumMemberSeq_var &);
-+  IR_EnumMemberSeq *operator-> (void);
-+  const IR_EnumMemberSeq *operator-> (void) const;
-   
--  operator const EnumMemberSeq &() const;
--  operator EnumMemberSeq &();
--  operator EnumMemberSeq &() const;
--  operator EnumMemberSeq *&(); // variable-size base types only
-+  operator const IR_EnumMemberSeq &() const;
-+  operator IR_EnumMemberSeq &();
-+  operator IR_EnumMemberSeq &() const;
-+  operator IR_EnumMemberSeq *&(); // variable-size base types only
-   
-   TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-   
-   // in, inout, out, _retn 
--  const EnumMemberSeq &in (void) const;
--  EnumMemberSeq &inout (void);
--  EnumMemberSeq *&out (void);
--  EnumMemberSeq *_retn (void);
--  EnumMemberSeq *ptr (void) const;
-+  const IR_EnumMemberSeq &in (void) const;
-+  IR_EnumMemberSeq &inout (void);
-+  IR_EnumMemberSeq *&out (void);
-+  IR_EnumMemberSeq *_retn (void);
-+  IR_EnumMemberSeq *ptr (void) const;
- 
- private:
--  EnumMemberSeq *ptr_;
-+  IR_EnumMemberSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ENUMMEMBERSEQ___OUT_CH_)
--#define _IR_ENUMMEMBERSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export EnumMemberSeq_out
-+class TAO_IFR_Client_Export IR_EnumMemberSeq_out
- {
- public:
--  EnumMemberSeq_out (EnumMemberSeq *&);
--  EnumMemberSeq_out (EnumMemberSeq_var &);
--  EnumMemberSeq_out (const EnumMemberSeq_out &);
--  EnumMemberSeq_out &operator= (const EnumMemberSeq_out &);
--  EnumMemberSeq_out &operator= (EnumMemberSeq *);
--  operator EnumMemberSeq *&();
--  EnumMemberSeq *&ptr (void);
--  EnumMemberSeq *operator-> (void);
-+  IR_EnumMemberSeq_out (IR_EnumMemberSeq *&);
-+  IR_EnumMemberSeq_out (IR_EnumMemberSeq_var &);
-+  IR_EnumMemberSeq_out (const IR_EnumMemberSeq_out &);
-+  IR_EnumMemberSeq_out &operator= (const IR_EnumMemberSeq_out &);
-+  IR_EnumMemberSeq_out &operator= (IR_EnumMemberSeq *);
-+  operator IR_EnumMemberSeq *&();
-+  IR_EnumMemberSeq *&ptr (void);
-+  IR_EnumMemberSeq *operator-> (void);
-   TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-   
- private:
--  EnumMemberSeq *&ptr_;
-+  IR_EnumMemberSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const EnumMemberSeq_var &);
--};
--
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnumMemberSeq;
--
--
--#if !defined (_IR_CONTAINER___PTR_CH_)
--#define _IR_CONTAINER___PTR_CH_
--
--class Container;
--typedef Container *Container_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINER___VAR_CH_)
--#define _IR_CONTAINER___VAR_CH_
--
--class TAO_IFR_Client_Export Container_var : public TAO_Base_var
--{
--public:
--  Container_var (void); // default constructor
--  Container_var (Container_ptr p) : ptr_ (p) {} 
--  Container_var (const Container_var &); // copy constructor
--  ~Container_var (void); // destructor
--  
--  Container_var &operator= (Container_ptr);
--  Container_var &operator= (const Container_var &);
--  Container_ptr operator-> (void) const;
--  
--  operator const Container_ptr &() const;
--  operator Container_ptr &();
--  // in, inout, out, _retn 
--  Container_ptr in (void) const;
--  Container_ptr &inout (void);
--  Container_ptr &out (void);
--  Container_ptr _retn (void);
--  Container_ptr ptr (void) const;
--
--private:
--  Container_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  Container_var (const TAO_Base_var &rhs);
--  Container_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINER___OUT_CH_)
--#define _IR_CONTAINER___OUT_CH_
--
--class TAO_IFR_Client_Export Container_out
--{
--public:
--  Container_out (Container_ptr &);
--  Container_out (Container_var &);
--  Container_out (const Container_out &);
--  Container_out &operator= (const Container_out &);
--  Container_out &operator= (const Container_var &);
--  Container_out &operator= (Container_ptr);
--  operator Container_ptr &();
--  Container_ptr &ptr (void);
--  Container_ptr operator-> (void);
--  
--private:
--  Container_ptr &ptr_;
-+  void operator= (const IR_EnumMemberSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINER_CH_)
--#define _IR_CONTAINER_CH_
--
- // Forward Classes Declaration
- class _TAO_Container_Proxy_Impl;
- class _TAO_Container_Remote_Proxy_Impl;
- class _TAO_Container_Proxy_Broker;
- class _TAO_Container_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export Container: public virtual CORBA::IRObject
-+class TAO_IFR_Client_Export IR_Container: public virtual CORBA_IRObject
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef Container_ptr _ptr_type;
--  typedef Container_var _var_type;
-+  typedef IR_Container_ptr _ptr_type;
-+  typedef IR_Container_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static Container_ptr _duplicate (Container_ptr obj);
--  static Container_ptr _narrow (
-+  static IR_Container_ptr _duplicate (IR_Container_ptr obj);
-+  static IR_Container_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static Container_ptr _unchecked_narrow (
-+  static IR_Container_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static Container_ptr _nil (void)
-+  static IR_Container_ptr _nil (void)
-     {
--      return (Container_ptr)0;
-+      return (IR_Container_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
- 
--  virtual IR::Contained_ptr lookup (
-+  virtual IR_Contained_ptr lookup (
-       const char * search_name,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -6096,8 +4710,8 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ContainedSeq * contents (
--      IR::DefinitionKind limit_type,
-+  virtual IR_ContainedSeq * contents (
-+      IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -6106,10 +4720,10 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ContainedSeq * lookup_name (
-+  virtual IR_ContainedSeq * lookup_name (
-       const char * search_name,
-       CORBA::Long levels_to_search,
--      IR::DefinitionKind limit_type,
-+      IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -6130,8 +4744,8 @@
- 
-     static void _tao_any_destructor (void*);
- 
--    ACE_NESTED_CLASS (IR, Contained_var) contained_object;
--    ACE_NESTED_CLASS (IR, DefinitionKind) kind;
-+    IR_Contained_var contained_object;
-+    IR_DefinitionKind kind;
-     CORBA::Any value;
-   };
- 
-@@ -6187,9 +4801,6 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-     
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CH_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CH_
--
-     class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq : public TAO_Unbounded_Base_Sequence
-     {
-     public:
-@@ -6222,15 +4833,8 @@
-         CORBA::Boolean release);
-     };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-   
--#if !defined (_IR_CONTAINER_DESCRIPTIONSEQ_CH_)
--#define _IR_CONTAINER_DESCRIPTIONSEQ_CH_
--
--  class DescriptionSeq;
-   class DescriptionSeq_var;
-   
-   // *************************************************************
-@@ -6263,14 +4867,8 @@
- 
-   };
-   
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINER_DESCRIPTIONSEQ___VAR_CH_)
--#define _IR_CONTAINER_DESCRIPTIONSEQ___VAR_CH_
--
-   // *************************************************************
--  // class IR::Container::DescriptionSeq_var
-+  // class IR_Container::DescriptionSeq_var
-   // *************************************************************
- 
-   class TAO_IFR_Client_Export DescriptionSeq_var
-@@ -6305,13 +4903,6 @@
-     DescriptionSeq *ptr_;
-   };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINER_DESCRIPTIONSEQ___OUT_CH_)
--#define _IR_CONTAINER_DESCRIPTIONSEQ___OUT_CH_
--
-   class TAO_IFR_Client_Export DescriptionSeq_out
-   {
-   public:
-@@ -6331,13 +4922,10 @@
-     void operator= (const DescriptionSeq_var &);
-   };
- 
--
--#endif /* end #if !defined */
--
-   static CORBA::TypeCode_ptr _tc_DescriptionSeq;
- 
--  virtual IR::Container::DescriptionSeq * describe_contents (
--      IR::DefinitionKind limit_type,
-+  virtual IR_Container::DescriptionSeq * describe_contents (
-+      IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Long max_returned_objs,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -6347,7 +4935,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ModuleDef_ptr create_module (
-+  virtual IR_ModuleDef_ptr create_module (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -6358,11 +4946,11 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ConstantDef_ptr create_constant (
-+  virtual IR_ConstantDef_ptr create_constant (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+      IR_IDLType_ptr type,
-       const CORBA::Any & value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -6371,11 +4959,11 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::StructDef_ptr create_struct (
-+  virtual IR_StructDef_ptr create_struct (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+      const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6383,12 +4971,12 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::UnionDef_ptr create_union (
-+  virtual IR_UnionDef_ptr create_union (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr discriminator_type,
--      const IR::UnionMemberSeq & members,
-+      IR_IDLType_ptr discriminator_type,
-+      const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6396,11 +4984,11 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::EnumDef_ptr create_enum (
-+  virtual IR_EnumDef_ptr create_enum (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::EnumMemberSeq & members,
-+      const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6408,11 +4996,11 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::AliasDef_ptr create_alias (
-+  virtual IR_AliasDef_ptr create_alias (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type,
-+      IR_IDLType_ptr original_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6420,11 +5008,11 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::InterfaceDef_ptr create_interface (
-+  virtual IR_InterfaceDef_ptr create_interface (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::InterfaceDefSeq & base_interfaces,
-+      const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Boolean is_abstract,
-       CORBA::Boolean is_local,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -6434,17 +5022,17 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueDef_ptr create_value (
-+  virtual IR_ValueDef_ptr create_value (
-       const char * id,
-       const char * name,
-       const char * version,
-       CORBA::Boolean is_custom,
-       CORBA::Boolean is_abstract,
--      IR::ValueDef_ptr base_value,
-+      IR_ValueDef_ptr base_value,
-       CORBA::Boolean is_truncatable,
--      const IR::ValueDefSeq & abstract_base_values,
--      const IR::InterfaceDefSeq & supported_interfaces,
--      const IR::InitializerSeq & initializers,
-+      const IR_ValueDefSeq & abstract_base_values,
-+      const IR_InterfaceDefSeq & supported_interfaces,
-+      const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6452,11 +5040,11 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueBoxDef_ptr create_value_box (
-+  virtual IR_ValueBoxDef_ptr create_value_box (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type_def,
-+      IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6464,11 +5052,11 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ExceptionDef_ptr create_exception (
-+  virtual IR_ExceptionDef_ptr create_exception (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+      const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -6476,7 +5064,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::NativeDef_ptr create_native (
-+  virtual IR_NativeDef_ptr create_native (
-       const char * id,
-       const char * name,
-       const char * version,
-@@ -6500,14 +5088,14 @@
-   _TAO_Container_Proxy_Broker *the_TAO_Container_Proxy_Broker_;
-   
- protected:
--  Container (int collocated = 0);
-+  IR_Container (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_Container_setup_collocation (int collocated);
-     
--    Container (
-+  IR_Container (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -6517,10 +5105,10 @@
-     friend class _TAO_Container_ThruPOA_Proxy_Impl;
-     friend class _TAO_Container_Direct_Proxy_Impl;
-   
--  virtual ~Container (void);
-+  virtual ~IR_Container (void);
- private:
--  Container (const Container &);
--  void operator= (const Container &);  
-+  IR_Container (const IR_Container &);
-+  void operator= (const IR_Container &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -6530,7 +5118,7 @@
-   class TAO_ClientRequestInfo_IR_Container_lookup : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::Container;
-+    friend class IR_Container;
-     
-     friend class _TAO_Container_Remote_Proxy_Impl;
-     friend class _TAO_Container_ThruPOA_Proxy_Impl;
-@@ -6566,15 +5154,15 @@
-   TAO_ClientRequestInfo_IR_Container_lookup (const TAO_ClientRequestInfo_IR_Container_lookup &);
-   void operator= (const TAO_ClientRequestInfo_IR_Container_lookup &);
-   const char * search_name_;
--  void result (IR::Contained_ptr result);
-+    void result (IR_Contained_ptr result);
-   // update the result 
--  IR::Contained_ptr _result;
-+    IR_Contained_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Container_contents : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Container;
-+    friend class IR_Container;
-   
-   friend class _TAO_Container_Remote_Proxy_Impl;
-   friend class _TAO_Container_ThruPOA_Proxy_Impl;
-@@ -6583,7 +5171,7 @@
- TAO_ClientRequestInfo_IR_Container_contents (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::DefinitionKind & limit_type,
-+        IR_DefinitionKind & limit_type,
-     const CORBA::Boolean & exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-@@ -6610,17 +5198,17 @@
- private:
-   TAO_ClientRequestInfo_IR_Container_contents (const TAO_ClientRequestInfo_IR_Container_contents &);
-   void operator= (const TAO_ClientRequestInfo_IR_Container_contents &);
--  const IR::DefinitionKind & limit_type_;
-+    const IR_DefinitionKind & limit_type_;
-   const CORBA::Boolean & exclude_inherited_;
--  void result (IR::ContainedSeq * result);
-+    void result (IR_ContainedSeq * result);
-   // update the result 
--  IR::ContainedSeq * _result;
-+    IR_ContainedSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Container_lookup_name : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Container;
-+    friend class IR_Container;
-   
-   friend class _TAO_Container_Remote_Proxy_Impl;
-   friend class _TAO_Container_ThruPOA_Proxy_Impl;
-@@ -6631,7 +5219,7 @@
-     CORBA::Object_ptr _tao_target,
-     const char * search_name,
-     const CORBA::Long & levels_to_search,
--    IR::DefinitionKind & limit_type,
-+        IR_DefinitionKind & limit_type,
-     const CORBA::Boolean & exclude_inherited,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-@@ -6660,17 +5248,17 @@
-   void operator= (const TAO_ClientRequestInfo_IR_Container_lookup_name &);
-   const char * search_name_;
-   const CORBA::Long & levels_to_search_;
--  const IR::DefinitionKind & limit_type_;
-+    const IR_DefinitionKind & limit_type_;
-   const CORBA::Boolean & exclude_inherited_;
--  void result (IR::ContainedSeq * result);
-+    void result (IR_ContainedSeq * result);
-   // update the result 
--  IR::ContainedSeq * _result;
-+    IR_ContainedSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Container_describe_contents : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Container;
-+    friend class IR_Container;
-   
-   friend class _TAO_Container_Remote_Proxy_Impl;
-   friend class _TAO_Container_ThruPOA_Proxy_Impl;
-@@ -6679,7 +5267,7 @@
- TAO_ClientRequestInfo_IR_Container_describe_contents (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::DefinitionKind & limit_type,
-+        IR_DefinitionKind & limit_type,
-     const CORBA::Boolean & exclude_inherited,
-     const CORBA::Long & max_returned_objs,
-     CORBA::Environment &ACE_TRY_ENV = 
-@@ -6707,18 +5295,18 @@
- private:
-   TAO_ClientRequestInfo_IR_Container_describe_contents (const TAO_ClientRequestInfo_IR_Container_describe_contents &);
-   void operator= (const TAO_ClientRequestInfo_IR_Container_describe_contents &);
--  const IR::DefinitionKind & limit_type_;
-+    const IR_DefinitionKind & limit_type_;
-   const CORBA::Boolean & exclude_inherited_;
-   const CORBA::Long & max_returned_objs_;
--  void result (ACE_NESTED_CLASS (IR::Container,DescriptionSeq) * result);
-+    void result (ACE_NESTED_CLASS (IR_Container,DescriptionSeq) * result);
-   // update the result 
--  ACE_NESTED_CLASS (IR::Container,DescriptionSeq) * _result;
-+    ACE_NESTED_CLASS (IR_Container,DescriptionSeq) * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Container_create_module : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Container;
-+    friend class IR_Container;
-   
-   friend class _TAO_Container_Remote_Proxy_Impl;
-   friend class _TAO_Container_ThruPOA_Proxy_Impl;
-@@ -6758,15 +5346,15 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  void result (IR::ModuleDef_ptr result);
-+    void result (IR_ModuleDef_ptr result);
-   // update the result 
--  IR::ModuleDef_ptr _result;
-+    IR_ModuleDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Container_create_constant : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Container;
-+    friend class IR_Container;
-   
-   friend class _TAO_Container_Remote_Proxy_Impl;
-   friend class _TAO_Container_ThruPOA_Proxy_Impl;
-@@ -6778,7 +5366,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-     const CORBA::Any & value,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-@@ -6808,17 +5396,17 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::IDLType_ptr type_;
-+    IR_IDLType_ptr type_;
-   const CORBA::Any & value_;
--  void result (IR::ConstantDef_ptr result);
-+    void result (IR_ConstantDef_ptr result);
-   // update the result 
--  IR::ConstantDef_ptr _result;
-+    IR_ConstantDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Container_create_struct : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Container;
-+    friend class IR_Container;
-   
-   friend class _TAO_Container_Remote_Proxy_Impl;
-   friend class _TAO_Container_ThruPOA_Proxy_Impl;
-@@ -6830,7 +5418,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -6859,16 +5447,16 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  const IR::StructMemberSeq & members_;
--  void result (IR::StructDef_ptr result);
-+    const IR_StructMemberSeq & members_;
-+    void result (IR_StructDef_ptr result);
-   // update the result 
--  IR::StructDef_ptr _result;
-+    IR_StructDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Container_create_union : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Container;
-+    friend class IR_Container;
-   
-   friend class _TAO_Container_Remote_Proxy_Impl;
-   friend class _TAO_Container_ThruPOA_Proxy_Impl;
-@@ -6880,8 +5468,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr discriminator_type,
--    const IR::UnionMemberSeq & members,
-+        IR_IDLType_ptr discriminator_type,
-+        const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -6910,17 +5498,17 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::IDLType_ptr discriminator_type_;
--  const IR::UnionMemberSeq & members_;
--  void result (IR::UnionDef_ptr result);
-+    IR_IDLType_ptr discriminator_type_;
-+    const IR_UnionMemberSeq & members_;
-+    void result (IR_UnionDef_ptr result);
-   // update the result 
--  IR::UnionDef_ptr _result;
-+    IR_UnionDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Container_create_enum : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Container;
-+    friend class IR_Container;
-   
-   friend class _TAO_Container_Remote_Proxy_Impl;
-   friend class _TAO_Container_ThruPOA_Proxy_Impl;
-@@ -6932,7 +5520,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -6961,16 +5549,16 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  const IR::EnumMemberSeq & members_;
--  void result (IR::EnumDef_ptr result);
-+    const IR_EnumMemberSeq & members_;
-+    void result (IR_EnumDef_ptr result);
-   // update the result 
--  IR::EnumDef_ptr _result;
-+    IR_EnumDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Container_create_alias : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Container;
-+    friend class IR_Container;
-   
-   friend class _TAO_Container_Remote_Proxy_Impl;
-   friend class _TAO_Container_ThruPOA_Proxy_Impl;
-@@ -6982,7 +5570,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type,
-+        IR_IDLType_ptr original_type,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -7011,16 +5599,16 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::IDLType_ptr original_type_;
--  void result (IR::AliasDef_ptr result);
-+    IR_IDLType_ptr original_type_;
-+    void result (IR_AliasDef_ptr result);
-   // update the result 
--  IR::AliasDef_ptr _result;
-+    IR_AliasDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Container_create_interface : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Container;
-+    friend class IR_Container;
-   
-   friend class _TAO_Container_Remote_Proxy_Impl;
-   friend class _TAO_Container_ThruPOA_Proxy_Impl;
-@@ -7032,7 +5620,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-     const CORBA::Boolean & is_abstract,
-     const CORBA::Boolean & is_local,
-     CORBA::Environment &ACE_TRY_ENV = 
-@@ -7063,18 +5651,18 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  const IR::InterfaceDefSeq & base_interfaces_;
-+    const IR_InterfaceDefSeq & base_interfaces_;
-   const CORBA::Boolean & is_abstract_;
-   const CORBA::Boolean & is_local_;
--  void result (IR::InterfaceDef_ptr result);
-+    void result (IR_InterfaceDef_ptr result);
-   // update the result 
--  IR::InterfaceDef_ptr _result;
-+    IR_InterfaceDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Container_create_value : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Container;
-+    friend class IR_Container;
-   
-   friend class _TAO_Container_Remote_Proxy_Impl;
-   friend class _TAO_Container_ThruPOA_Proxy_Impl;
-@@ -7088,11 +5676,11 @@
-     const char * version,
-     const CORBA::Boolean & is_custom,
-     const CORBA::Boolean & is_abstract,
--    IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-     const CORBA::Boolean & is_truncatable,
--    const IR::ValueDefSeq & abstract_base_values,
--    const IR::InterfaceDefSeq & supported_interfaces,
--    const IR::InitializerSeq & initializers,
-+        const IR_ValueDefSeq & abstract_base_values,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-+        const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -7123,20 +5711,20 @@
-   const char * version_;
-   const CORBA::Boolean & is_custom_;
-   const CORBA::Boolean & is_abstract_;
--  IR::ValueDef_ptr base_value_;
-+    IR_ValueDef_ptr base_value_;
-   const CORBA::Boolean & is_truncatable_;
--  const IR::ValueDefSeq & abstract_base_values_;
--  const IR::InterfaceDefSeq & supported_interfaces_;
--  const IR::InitializerSeq & initializers_;
--  void result (IR::ValueDef_ptr result);
-+    const IR_ValueDefSeq & abstract_base_values_;
-+    const IR_InterfaceDefSeq & supported_interfaces_;
-+    const IR_InitializerSeq & initializers_;
-+    void result (IR_ValueDef_ptr result);
-   // update the result 
--  IR::ValueDef_ptr _result;
-+    IR_ValueDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Container_create_value_box : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Container;
-+    friend class IR_Container;
-   
-   friend class _TAO_Container_Remote_Proxy_Impl;
-   friend class _TAO_Container_ThruPOA_Proxy_Impl;
-@@ -7148,7 +5736,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -7177,16 +5765,16 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::IDLType_ptr original_type_def_;
--  void result (IR::ValueBoxDef_ptr result);
-+    IR_IDLType_ptr original_type_def_;
-+    void result (IR_ValueBoxDef_ptr result);
-   // update the result 
--  IR::ValueBoxDef_ptr _result;
-+    IR_ValueBoxDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Container_create_exception : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Container;
-+    friend class IR_Container;
-   
-   friend class _TAO_Container_Remote_Proxy_Impl;
-   friend class _TAO_Container_ThruPOA_Proxy_Impl;
-@@ -7198,7 +5786,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -7227,16 +5815,16 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  const IR::StructMemberSeq & members_;
--  void result (IR::ExceptionDef_ptr result);
-+    const IR_StructMemberSeq & members_;
-+    void result (IR_ExceptionDef_ptr result);
-   // update the result 
--  IR::ExceptionDef_ptr _result;
-+    IR_ExceptionDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Container_create_native : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Container;
-+    friend class IR_Container;
-   
-   friend class _TAO_Container_Remote_Proxy_Impl;
-   friend class _TAO_Container_ThruPOA_Proxy_Impl;
-@@ -7276,9 +5864,9 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  void result (IR::NativeDef_ptr result);
-+    void result (IR_NativeDef_ptr result);
-   // update the result 
--  IR::NativeDef_ptr _result;
-+    IR_NativeDef_ptr _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-@@ -7296,12 +5884,12 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_Container_Proxy_Impl : 
--  public virtual CORBA::_TAO_IRObject_Proxy_Impl
-+  public virtual _TAO_IRObject_Proxy_Impl
- {
- public:
-   virtual ~_TAO_Container_Proxy_Impl (void) { }
-   
--    virtual IR::Contained_ptr lookup (
-+  virtual IR_Contained_ptr lookup (
-       CORBA_Object *_collocated_tao_target_,
-       const char * search_name,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -7310,9 +5898,9 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ContainedSeq * contents (
-+  virtual IR_ContainedSeq * contents (
-       CORBA_Object *_collocated_tao_target_,
--      IR::DefinitionKind limit_type,
-+      IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -7320,11 +5908,11 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ContainedSeq * lookup_name (
-+  virtual IR_ContainedSeq * lookup_name (
-       CORBA_Object *_collocated_tao_target_,
-       const char * search_name,
-       CORBA::Long levels_to_search,
--      IR::DefinitionKind limit_type,
-+      IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -7332,9 +5920,9 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::Container::DescriptionSeq * describe_contents (
-+  virtual IR_Container::DescriptionSeq * describe_contents (
-       CORBA_Object *_collocated_tao_target_,
--      IR::DefinitionKind limit_type,
-+      IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Long max_returned_objs,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -7343,7 +5931,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ModuleDef_ptr create_module (
-+  virtual IR_ModuleDef_ptr create_module (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-@@ -7354,12 +5942,12 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ConstantDef_ptr create_constant (
-+  virtual IR_ConstantDef_ptr create_constant (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+      IR_IDLType_ptr type,
-       const CORBA::Any & value,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -7367,61 +5955,61 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::StructDef_ptr create_struct (
-+  virtual IR_StructDef_ptr create_struct (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+      const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::UnionDef_ptr create_union (
-+  virtual IR_UnionDef_ptr create_union (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr discriminator_type,
--      const IR::UnionMemberSeq & members,
-+      IR_IDLType_ptr discriminator_type,
-+      const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::EnumDef_ptr create_enum (
-+  virtual IR_EnumDef_ptr create_enum (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::EnumMemberSeq & members,
-+      const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::AliasDef_ptr create_alias (
-+  virtual IR_AliasDef_ptr create_alias (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type,
-+      IR_IDLType_ptr original_type,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::InterfaceDef_ptr create_interface (
-+  virtual IR_InterfaceDef_ptr create_interface (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::InterfaceDefSeq & base_interfaces,
-+      const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Boolean is_abstract,
-       CORBA::Boolean is_local,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -7430,49 +6018,49 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ValueDef_ptr create_value (
-+  virtual IR_ValueDef_ptr create_value (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
-       CORBA::Boolean is_custom,
-       CORBA::Boolean is_abstract,
--      IR::ValueDef_ptr base_value,
-+      IR_ValueDef_ptr base_value,
-       CORBA::Boolean is_truncatable,
--      const IR::ValueDefSeq & abstract_base_values,
--      const IR::InterfaceDefSeq & supported_interfaces,
--      const IR::InitializerSeq & initializers,
-+      const IR_ValueDefSeq & abstract_base_values,
-+      const IR_InterfaceDefSeq & supported_interfaces,
-+      const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ValueBoxDef_ptr create_value_box (
-+  virtual IR_ValueBoxDef_ptr create_value_box (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type_def,
-+      IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ExceptionDef_ptr create_exception (
-+  virtual IR_ExceptionDef_ptr create_exception (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+      const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::NativeDef_ptr create_native (
-+  virtual IR_NativeDef_ptr create_native (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-@@ -7487,6 +6075,7 @@
-   _TAO_Container_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -7499,7 +6088,7 @@
- class TAO_IFR_Client_Export _TAO_Container_Remote_Proxy_Impl : 
-   public virtual _TAO_Container_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual CORBA::_TAO_IRObject_Remote_Proxy_Impl
-+  public virtual _TAO_IRObject_Remote_Proxy_Impl
-   
- {
- public:
-@@ -7507,7 +6096,7 @@
-   
-   virtual ~_TAO_Container_Remote_Proxy_Impl (void) { }
-   
--    virtual IR::Contained_ptr lookup (
-+  virtual IR_Contained_ptr lookup (
-       CORBA_Object *_collocated_tao_target_,
-       const char * search_name,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -7516,9 +6105,9 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ContainedSeq * contents (
-+  virtual IR_ContainedSeq * contents (
-       CORBA_Object *_collocated_tao_target_,
--      IR::DefinitionKind limit_type,
-+      IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -7526,11 +6115,11 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ContainedSeq * lookup_name (
-+  virtual IR_ContainedSeq * lookup_name (
-       CORBA_Object *_collocated_tao_target_,
-       const char * search_name,
-       CORBA::Long levels_to_search,
--      IR::DefinitionKind limit_type,
-+      IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -7538,9 +6127,9 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::Container::DescriptionSeq * describe_contents (
-+  virtual IR_Container::DescriptionSeq * describe_contents (
-       CORBA_Object *_collocated_tao_target_,
--      IR::DefinitionKind limit_type,
-+      IR_DefinitionKind limit_type,
-       CORBA::Boolean exclude_inherited,
-       CORBA::Long max_returned_objs,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -7549,7 +6138,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ModuleDef_ptr create_module (
-+  virtual IR_ModuleDef_ptr create_module (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-@@ -7560,12 +6149,12 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ConstantDef_ptr create_constant (
-+  virtual IR_ConstantDef_ptr create_constant (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+      IR_IDLType_ptr type,
-       const CORBA::Any & value,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -7573,61 +6162,61 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::StructDef_ptr create_struct (
-+  virtual IR_StructDef_ptr create_struct (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+      const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::UnionDef_ptr create_union (
-+  virtual IR_UnionDef_ptr create_union (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr discriminator_type,
--      const IR::UnionMemberSeq & members,
-+      IR_IDLType_ptr discriminator_type,
-+      const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::EnumDef_ptr create_enum (
-+  virtual IR_EnumDef_ptr create_enum (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::EnumMemberSeq & members,
-+      const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::AliasDef_ptr create_alias (
-+  virtual IR_AliasDef_ptr create_alias (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type,
-+      IR_IDLType_ptr original_type,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::InterfaceDef_ptr create_interface (
-+  virtual IR_InterfaceDef_ptr create_interface (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::InterfaceDefSeq & base_interfaces,
-+      const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Boolean is_abstract,
-       CORBA::Boolean is_local,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -7636,49 +6225,49 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueDef_ptr create_value (
-+  virtual IR_ValueDef_ptr create_value (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
-       CORBA::Boolean is_custom,
-       CORBA::Boolean is_abstract,
--      IR::ValueDef_ptr base_value,
-+      IR_ValueDef_ptr base_value,
-       CORBA::Boolean is_truncatable,
--      const IR::ValueDefSeq & abstract_base_values,
--      const IR::InterfaceDefSeq & supported_interfaces,
--      const IR::InitializerSeq & initializers,
-+      const IR_ValueDefSeq & abstract_base_values,
-+      const IR_InterfaceDefSeq & supported_interfaces,
-+      const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueBoxDef_ptr create_value_box (
-+  virtual IR_ValueBoxDef_ptr create_value_box (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr original_type_def,
-+      IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ExceptionDef_ptr create_exception (
-+  virtual IR_ExceptionDef_ptr create_exception (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::StructMemberSeq & members,
-+      const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::NativeDef_ptr create_native (
-+  virtual IR_NativeDef_ptr create_native (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-@@ -7688,7 +6277,6 @@
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
--
- };
- 
- //
-@@ -7711,8 +6299,9 @@
- {
- public:
-   virtual ~_TAO_Container_Proxy_Broker (void);
-+
-   virtual _TAO_Container_Proxy_Impl &select_proxy (
--    Container *object,
-+    IR_Container *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -7721,6 +6310,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -7738,7 +6328,7 @@
-   virtual ~_TAO_Container_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_Container_Proxy_Impl &select_proxy (
--    Container *object,
-+    IR_Container *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -7752,117 +6342,39 @@
-   static _TAO_Container_Remote_Proxy_Broker *the_TAO_Container_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Container;
--
--
--#if !defined (_IR_IDLTYPE___PTR_CH_)
--#define _IR_IDLTYPE___PTR_CH_
--
--class IDLType;
--typedef IDLType *IDLType_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_IDLTYPE___VAR_CH_)
--#define _IR_IDLTYPE___VAR_CH_
--
--class TAO_IFR_Client_Export IDLType_var : public TAO_Base_var
--{
--public:
--  IDLType_var (void); // default constructor
--  IDLType_var (IDLType_ptr p) : ptr_ (p) {} 
--  IDLType_var (const IDLType_var &); // copy constructor
--  ~IDLType_var (void); // destructor
--  
--  IDLType_var &operator= (IDLType_ptr);
--  IDLType_var &operator= (const IDLType_var &);
--  IDLType_ptr operator-> (void) const;
--  
--  operator const IDLType_ptr &() const;
--  operator IDLType_ptr &();
--  // in, inout, out, _retn 
--  IDLType_ptr in (void) const;
--  IDLType_ptr &inout (void);
--  IDLType_ptr &out (void);
--  IDLType_ptr _retn (void);
--  IDLType_ptr ptr (void) const;
--
--private:
--  IDLType_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  IDLType_var (const TAO_Base_var &rhs);
--  IDLType_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_IDLTYPE___OUT_CH_)
--#define _IR_IDLTYPE___OUT_CH_
--
--class TAO_IFR_Client_Export IDLType_out
--{
--public:
--  IDLType_out (IDLType_ptr &);
--  IDLType_out (IDLType_var &);
--  IDLType_out (const IDLType_out &);
--  IDLType_out &operator= (const IDLType_out &);
--  IDLType_out &operator= (const IDLType_var &);
--  IDLType_out &operator= (IDLType_ptr);
--  operator IDLType_ptr &();
--  IDLType_ptr &ptr (void);
--  IDLType_ptr operator-> (void);
--  
--private:
--  IDLType_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_IDLTYPE_CH_)
--#define _IR_IDLTYPE_CH_
--
- // Forward Classes Declaration
- class _TAO_IDLType_Proxy_Impl;
- class _TAO_IDLType_Remote_Proxy_Impl;
- class _TAO_IDLType_Proxy_Broker;
- class _TAO_IDLType_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export IDLType: public virtual CORBA::IRObject
-+class TAO_IFR_Client_Export IR_IDLType : public virtual CORBA_IRObject
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef IDLType_ptr _ptr_type;
--  typedef IDLType_var _var_type;
-+  typedef IR_IDLType_ptr _ptr_type;
-+  typedef IR_IDLType_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static IDLType_ptr _duplicate (IDLType_ptr obj);
--  static IDLType_ptr _narrow (
-+  static IR_IDLType_ptr _duplicate (IR_IDLType_ptr obj);
-+  static IR_IDLType_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static IDLType_ptr _unchecked_narrow (
-+  static IR_IDLType_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static IDLType_ptr _nil (void)
-+  static IR_IDLType_ptr _nil (void)
-     {
--      return (IDLType_ptr)0;
-+      return (IR_IDLType_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -7888,14 +6400,14 @@
-   _TAO_IDLType_Proxy_Broker *the_TAO_IDLType_Proxy_Broker_;
-   
- protected:
--  IDLType (int collocated = 0);
-+  IR_IDLType (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_IDLType_setup_collocation (int collocated);
-     
--    IDLType (
-+  IR_IDLType (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -7905,10 +6417,10 @@
-     friend class _TAO_IDLType_ThruPOA_Proxy_Impl;
-     friend class _TAO_IDLType_Direct_Proxy_Impl;
-   
--  virtual ~IDLType (void);
-+  virtual ~IR_IDLType (void);
- private:
--  IDLType (const IDLType &);
--  void operator= (const IDLType &);  
-+  IR_IDLType (const IR_IDLType &);
-+  void operator= (const IR_IDLType &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -7918,7 +6430,7 @@
-   class TAO_ClientRequestInfo_IR_IDLType_type_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::IDLType;
-+    friend class IR_IDLType;
-     
-     friend class _TAO_IDLType_Remote_Proxy_Impl;
-     friend class _TAO_IDLType_ThruPOA_Proxy_Impl;
-@@ -7972,7 +6484,7 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_IDLType_Proxy_Impl : 
--  public virtual CORBA::_TAO_IRObject_Proxy_Impl
-+  public virtual _TAO_IRObject_Proxy_Impl
- {
- public:
-   virtual ~_TAO_IDLType_Proxy_Impl (void) { }
-@@ -7989,6 +6501,7 @@
-   _TAO_IDLType_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -8001,7 +6514,7 @@
- class TAO_IFR_Client_Export _TAO_IDLType_Remote_Proxy_Impl : 
-   public virtual _TAO_IDLType_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual CORBA::_TAO_IRObject_Remote_Proxy_Impl
-+  public virtual _TAO_IRObject_Remote_Proxy_Impl
-   
- {
- public:
-@@ -8039,8 +6552,9 @@
- {
- public:
-   virtual ~_TAO_IDLType_Proxy_Broker (void);
-+
-   virtual _TAO_IDLType_Proxy_Impl &select_proxy (
--    IDLType *object,
-+    IR_IDLType *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -8049,6 +6563,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -8066,7 +6581,7 @@
-   virtual ~_TAO_IDLType_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_IDLType_Proxy_Impl &select_proxy (
--    IDLType *object,
-+    IR_IDLType *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -8080,558 +6595,315 @@
-   static _TAO_IDLType_Remote_Proxy_Broker *the_TAO_IDLType_Remote_Proxy_Broker (void);
- };
- 
-+//
-+//              End Remote Proxy Broker Declaration
-+///////////////////////////////////////////////////////////////////////
- 
--//
--//              End Remote Proxy Broker Declaration 
--///////////////////////////////////////////////////////////////////////
--
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IDLType;
--
--class PrimitiveDef;
--
--#if !defined (_IR_PRIMITIVEDEF___PTR_CH_)
--#define _IR_PRIMITIVEDEF___PTR_CH_
--
--typedef PrimitiveDef *PrimitiveDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PRIMITIVEDEF___VAR_CH_)
--#define _IR_PRIMITIVEDEF___VAR_CH_
--
--class TAO_IFR_Client_Export PrimitiveDef_var : public TAO_Base_var
--{
--public:
--  PrimitiveDef_var (void); // default constructor
--  PrimitiveDef_var (PrimitiveDef_ptr p) : ptr_ (p) {} 
--  PrimitiveDef_var (const PrimitiveDef_var &); // copy constructor
--  ~PrimitiveDef_var (void); // destructor
--  
--  PrimitiveDef_var &operator= (PrimitiveDef_ptr);
--  PrimitiveDef_var &operator= (const PrimitiveDef_var &);
--  PrimitiveDef_ptr operator-> (void) const;
--  
--  operator const PrimitiveDef_ptr &() const;
--  operator PrimitiveDef_ptr &();
--  // in, inout, out, _retn 
--  PrimitiveDef_ptr in (void) const;
--  PrimitiveDef_ptr &inout (void);
--  PrimitiveDef_ptr &out (void);
--  PrimitiveDef_ptr _retn (void);
--  PrimitiveDef_ptr ptr (void) const;
--
--private:
--  PrimitiveDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  PrimitiveDef_var (const TAO_Base_var &rhs);
--  PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PRIMITIVEDEF___OUT_CH_)
--#define _IR_PRIMITIVEDEF___OUT_CH_
--
--class TAO_IFR_Client_Export PrimitiveDef_out
--{
--public:
--  PrimitiveDef_out (PrimitiveDef_ptr &);
--  PrimitiveDef_out (PrimitiveDef_var &);
--  PrimitiveDef_out (const PrimitiveDef_out &);
--  PrimitiveDef_out &operator= (const PrimitiveDef_out &);
--  PrimitiveDef_out &operator= (const PrimitiveDef_var &);
--  PrimitiveDef_out &operator= (PrimitiveDef_ptr);
--  operator PrimitiveDef_ptr &();
--  PrimitiveDef_ptr &ptr (void);
--  PrimitiveDef_ptr operator-> (void);
--  
--private:
--  PrimitiveDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--class StringDef;
--
--#if !defined (_IR_STRINGDEF___PTR_CH_)
--#define _IR_STRINGDEF___PTR_CH_
--
--typedef StringDef *StringDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRINGDEF___VAR_CH_)
--#define _IR_STRINGDEF___VAR_CH_
--
--class TAO_IFR_Client_Export StringDef_var : public TAO_Base_var
--{
--public:
--  StringDef_var (void); // default constructor
--  StringDef_var (StringDef_ptr p) : ptr_ (p) {} 
--  StringDef_var (const StringDef_var &); // copy constructor
--  ~StringDef_var (void); // destructor
--  
--  StringDef_var &operator= (StringDef_ptr);
--  StringDef_var &operator= (const StringDef_var &);
--  StringDef_ptr operator-> (void) const;
--  
--  operator const StringDef_ptr &() const;
--  operator StringDef_ptr &();
--  // in, inout, out, _retn 
--  StringDef_ptr in (void) const;
--  StringDef_ptr &inout (void);
--  StringDef_ptr &out (void);
--  StringDef_ptr _retn (void);
--  StringDef_ptr ptr (void) const;
--
--private:
--  StringDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  StringDef_var (const TAO_Base_var &rhs);
--  StringDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRINGDEF___OUT_CH_)
--#define _IR_STRINGDEF___OUT_CH_
--
--class TAO_IFR_Client_Export StringDef_out
--{
--public:
--  StringDef_out (StringDef_ptr &);
--  StringDef_out (StringDef_var &);
--  StringDef_out (const StringDef_out &);
--  StringDef_out &operator= (const StringDef_out &);
--  StringDef_out &operator= (const StringDef_var &);
--  StringDef_out &operator= (StringDef_ptr);
--  operator StringDef_ptr &();
--  StringDef_ptr &ptr (void);
--  StringDef_ptr operator-> (void);
--  
--private:
--  StringDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--class SequenceDef;
--
--#if !defined (_IR_SEQUENCEDEF___PTR_CH_)
--#define _IR_SEQUENCEDEF___PTR_CH_
--
--typedef SequenceDef *SequenceDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_SEQUENCEDEF___VAR_CH_)
--#define _IR_SEQUENCEDEF___VAR_CH_
--
--class TAO_IFR_Client_Export SequenceDef_var : public TAO_Base_var
--{
--public:
--  SequenceDef_var (void); // default constructor
--  SequenceDef_var (SequenceDef_ptr p) : ptr_ (p) {} 
--  SequenceDef_var (const SequenceDef_var &); // copy constructor
--  ~SequenceDef_var (void); // destructor
--  
--  SequenceDef_var &operator= (SequenceDef_ptr);
--  SequenceDef_var &operator= (const SequenceDef_var &);
--  SequenceDef_ptr operator-> (void) const;
--  
--  operator const SequenceDef_ptr &() const;
--  operator SequenceDef_ptr &();
--  // in, inout, out, _retn 
--  SequenceDef_ptr in (void) const;
--  SequenceDef_ptr &inout (void);
--  SequenceDef_ptr &out (void);
--  SequenceDef_ptr _retn (void);
--  SequenceDef_ptr ptr (void) const;
--
--private:
--  SequenceDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  SequenceDef_var (const TAO_Base_var &rhs);
--  SequenceDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_SEQUENCEDEF___OUT_CH_)
--#define _IR_SEQUENCEDEF___OUT_CH_
--
--class TAO_IFR_Client_Export SequenceDef_out
--{
--public:
--  SequenceDef_out (SequenceDef_ptr &);
--  SequenceDef_out (SequenceDef_var &);
--  SequenceDef_out (const SequenceDef_out &);
--  SequenceDef_out &operator= (const SequenceDef_out &);
--  SequenceDef_out &operator= (const SequenceDef_var &);
--  SequenceDef_out &operator= (SequenceDef_ptr);
--  operator SequenceDef_ptr &();
--  SequenceDef_ptr &ptr (void);
--  SequenceDef_ptr operator-> (void);
--  
--private:
--  SequenceDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--class ArrayDef;
--
--#if !defined (_IR_ARRAYDEF___PTR_CH_)
--#define _IR_ARRAYDEF___PTR_CH_
--
--typedef ArrayDef *ArrayDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ARRAYDEF___VAR_CH_)
--#define _IR_ARRAYDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ArrayDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_PrimitiveDef_var : public TAO_Base_var
- {
- public:
--  ArrayDef_var (void); // default constructor
--  ArrayDef_var (ArrayDef_ptr p) : ptr_ (p) {} 
--  ArrayDef_var (const ArrayDef_var &); // copy constructor
--  ~ArrayDef_var (void); // destructor
-+  IR_PrimitiveDef_var (void); // default constructor
-+  IR_PrimitiveDef_var (IR_PrimitiveDef_ptr p) : ptr_ (p) {}
-+  IR_PrimitiveDef_var (const IR_PrimitiveDef_var &); // copy constructor
-+  ~IR_PrimitiveDef_var (void); // destructor
-   
--  ArrayDef_var &operator= (ArrayDef_ptr);
--  ArrayDef_var &operator= (const ArrayDef_var &);
--  ArrayDef_ptr operator-> (void) const;
-+  IR_PrimitiveDef_var &operator= (IR_PrimitiveDef_ptr);
-+  IR_PrimitiveDef_var &operator= (const IR_PrimitiveDef_var &);
-+  IR_PrimitiveDef_ptr operator-> (void) const;
-   
--  operator const ArrayDef_ptr &() const;
--  operator ArrayDef_ptr &();
-+  operator const IR_PrimitiveDef_ptr &() const;
-+  operator IR_PrimitiveDef_ptr &();
-   // in, inout, out, _retn 
--  ArrayDef_ptr in (void) const;
--  ArrayDef_ptr &inout (void);
--  ArrayDef_ptr &out (void);
--  ArrayDef_ptr _retn (void);
--  ArrayDef_ptr ptr (void) const;
-+  IR_PrimitiveDef_ptr in (void) const;
-+  IR_PrimitiveDef_ptr &inout (void);
-+  IR_PrimitiveDef_ptr &out (void);
-+  IR_PrimitiveDef_ptr _retn (void);
-+  IR_PrimitiveDef_ptr ptr (void) const;
- 
- private:
--  ArrayDef_ptr ptr_;
-+  IR_PrimitiveDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  ArrayDef_var (const TAO_Base_var &rhs);
--  ArrayDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_PrimitiveDef_var (const TAO_Base_var &rhs);
-+  IR_PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ARRAYDEF___OUT_CH_)
--#define _IR_ARRAYDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ArrayDef_out
-+class TAO_IFR_Client_Export IR_PrimitiveDef_out
- {
- public:
--  ArrayDef_out (ArrayDef_ptr &);
--  ArrayDef_out (ArrayDef_var &);
--  ArrayDef_out (const ArrayDef_out &);
--  ArrayDef_out &operator= (const ArrayDef_out &);
--  ArrayDef_out &operator= (const ArrayDef_var &);
--  ArrayDef_out &operator= (ArrayDef_ptr);
--  operator ArrayDef_ptr &();
--  ArrayDef_ptr &ptr (void);
--  ArrayDef_ptr operator-> (void);
-+  IR_PrimitiveDef_out (IR_PrimitiveDef_ptr &);
-+  IR_PrimitiveDef_out (IR_PrimitiveDef_var &);
-+  IR_PrimitiveDef_out (const IR_PrimitiveDef_out &);
-+  IR_PrimitiveDef_out &operator= (const IR_PrimitiveDef_out &);
-+  IR_PrimitiveDef_out &operator= (const IR_PrimitiveDef_var &);
-+  IR_PrimitiveDef_out &operator= (IR_PrimitiveDef_ptr);
-+  operator IR_PrimitiveDef_ptr &();
-+  IR_PrimitiveDef_ptr &ptr (void);
-+  IR_PrimitiveDef_ptr operator-> (void);
-   
- private:
--  ArrayDef_ptr &ptr_;
-+  IR_PrimitiveDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--class WstringDef;
--
--#if !defined (_IR_WSTRINGDEF___PTR_CH_)
--#define _IR_WSTRINGDEF___PTR_CH_
--
--typedef WstringDef *WstringDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_WSTRINGDEF___VAR_CH_)
--#define _IR_WSTRINGDEF___VAR_CH_
--
--class TAO_IFR_Client_Export WstringDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_StringDef_var : public TAO_Base_var
- {
- public:
--  WstringDef_var (void); // default constructor
--  WstringDef_var (WstringDef_ptr p) : ptr_ (p) {} 
--  WstringDef_var (const WstringDef_var &); // copy constructor
--  ~WstringDef_var (void); // destructor
-+  IR_StringDef_var (void); // default constructor
-+  IR_StringDef_var (IR_StringDef_ptr p) : ptr_ (p) {}
-+  IR_StringDef_var (const IR_StringDef_var &); // copy constructor
-+  ~IR_StringDef_var (void); // destructor
-   
--  WstringDef_var &operator= (WstringDef_ptr);
--  WstringDef_var &operator= (const WstringDef_var &);
--  WstringDef_ptr operator-> (void) const;
-+  IR_StringDef_var &operator= (IR_StringDef_ptr);
-+  IR_StringDef_var &operator= (const IR_StringDef_var &);
-+  IR_StringDef_ptr operator-> (void) const;
-   
--  operator const WstringDef_ptr &() const;
--  operator WstringDef_ptr &();
-+  operator const IR_StringDef_ptr &() const;
-+  operator IR_StringDef_ptr &();
-   // in, inout, out, _retn 
--  WstringDef_ptr in (void) const;
--  WstringDef_ptr &inout (void);
--  WstringDef_ptr &out (void);
--  WstringDef_ptr _retn (void);
--  WstringDef_ptr ptr (void) const;
-+  IR_StringDef_ptr in (void) const;
-+  IR_StringDef_ptr &inout (void);
-+  IR_StringDef_ptr &out (void);
-+  IR_StringDef_ptr _retn (void);
-+  IR_StringDef_ptr ptr (void) const;
- 
- private:
--  WstringDef_ptr ptr_;
-+  IR_StringDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  WstringDef_var (const TAO_Base_var &rhs);
--  WstringDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_StringDef_var (const TAO_Base_var &rhs);
-+  IR_StringDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_WSTRINGDEF___OUT_CH_)
--#define _IR_WSTRINGDEF___OUT_CH_
--
--class TAO_IFR_Client_Export WstringDef_out
-+class TAO_IFR_Client_Export IR_StringDef_out
- {
- public:
--  WstringDef_out (WstringDef_ptr &);
--  WstringDef_out (WstringDef_var &);
--  WstringDef_out (const WstringDef_out &);
--  WstringDef_out &operator= (const WstringDef_out &);
--  WstringDef_out &operator= (const WstringDef_var &);
--  WstringDef_out &operator= (WstringDef_ptr);
--  operator WstringDef_ptr &();
--  WstringDef_ptr &ptr (void);
--  WstringDef_ptr operator-> (void);
-+  IR_StringDef_out (IR_StringDef_ptr &);
-+  IR_StringDef_out (IR_StringDef_var &);
-+  IR_StringDef_out (const IR_StringDef_out &);
-+  IR_StringDef_out &operator= (const IR_StringDef_out &);
-+  IR_StringDef_out &operator= (const IR_StringDef_var &);
-+  IR_StringDef_out &operator= (IR_StringDef_ptr);
-+  operator IR_StringDef_ptr &();
-+  IR_StringDef_ptr &ptr (void);
-+  IR_StringDef_ptr operator-> (void);
-   
- private:
--  WstringDef_ptr &ptr_;
-+  IR_StringDef_ptr &ptr_;
- };
- 
-+class TAO_IFR_Client_Export IR_SequenceDef_var : public TAO_Base_var
-+{
-+public:
-+  IR_SequenceDef_var (void); // default constructor
-+  IR_SequenceDef_var (IR_SequenceDef_ptr p) : ptr_ (p) {}
-+  IR_SequenceDef_var (const IR_SequenceDef_var &); // copy constructor
-+  ~IR_SequenceDef_var (void); // destructor
- 
--#endif /* end #if !defined */
--
--class FixedDef;
--
--#if !defined (_IR_FIXEDDEF___PTR_CH_)
--#define _IR_FIXEDDEF___PTR_CH_
-+  IR_SequenceDef_var &operator= (IR_SequenceDef_ptr);
-+  IR_SequenceDef_var &operator= (const IR_SequenceDef_var &);
-+  IR_SequenceDef_ptr operator-> (void) const;
- 
--typedef FixedDef *FixedDef_ptr;
-+  operator const IR_SequenceDef_ptr &() const;
-+  operator IR_SequenceDef_ptr &();
-+  // in, inout, out, _retn
-+  IR_SequenceDef_ptr in (void) const;
-+  IR_SequenceDef_ptr &inout (void);
-+  IR_SequenceDef_ptr &out (void);
-+  IR_SequenceDef_ptr _retn (void);
-+  IR_SequenceDef_ptr ptr (void) const;
- 
--#endif /* end #if !defined */
-+private:
-+  IR_SequenceDef_ptr ptr_;
-+  // Unimplemented - prevents widening assignment.
-+  IR_SequenceDef_var (const TAO_Base_var &rhs);
-+  IR_SequenceDef_var &operator= (const TAO_Base_var &rhs);
-+};
- 
-+class TAO_IFR_Client_Export IR_SequenceDef_out
-+{
-+public:
-+  IR_SequenceDef_out (IR_SequenceDef_ptr &);
-+  IR_SequenceDef_out (IR_SequenceDef_var &);
-+  IR_SequenceDef_out (const IR_SequenceDef_out &);
-+  IR_SequenceDef_out &operator= (const IR_SequenceDef_out &);
-+  IR_SequenceDef_out &operator= (const IR_SequenceDef_var &);
-+  IR_SequenceDef_out &operator= (IR_SequenceDef_ptr);
-+  operator IR_SequenceDef_ptr &();
-+  IR_SequenceDef_ptr &ptr (void);
-+  IR_SequenceDef_ptr operator-> (void);
- 
--#if !defined (_IR_FIXEDDEF___VAR_CH_)
--#define _IR_FIXEDDEF___VAR_CH_
-+private:
-+  IR_SequenceDef_ptr &ptr_;
-+};
- 
--class TAO_IFR_Client_Export FixedDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_ArrayDef_var : public TAO_Base_var
- {
- public:
--  FixedDef_var (void); // default constructor
--  FixedDef_var (FixedDef_ptr p) : ptr_ (p) {} 
--  FixedDef_var (const FixedDef_var &); // copy constructor
--  ~FixedDef_var (void); // destructor
-+  IR_ArrayDef_var (void); // default constructor
-+  IR_ArrayDef_var (IR_ArrayDef_ptr p) : ptr_ (p) {}
-+  IR_ArrayDef_var (const IR_ArrayDef_var &); // copy constructor
-+  ~IR_ArrayDef_var (void); // destructor
-   
--  FixedDef_var &operator= (FixedDef_ptr);
--  FixedDef_var &operator= (const FixedDef_var &);
--  FixedDef_ptr operator-> (void) const;
-+  IR_ArrayDef_var &operator= (IR_ArrayDef_ptr);
-+  IR_ArrayDef_var &operator= (const IR_ArrayDef_var &);
-+  IR_ArrayDef_ptr operator-> (void) const;
-   
--  operator const FixedDef_ptr &() const;
--  operator FixedDef_ptr &();
-+  operator const IR_ArrayDef_ptr &() const;
-+  operator IR_ArrayDef_ptr &();
-   // in, inout, out, _retn 
--  FixedDef_ptr in (void) const;
--  FixedDef_ptr &inout (void);
--  FixedDef_ptr &out (void);
--  FixedDef_ptr _retn (void);
--  FixedDef_ptr ptr (void) const;
-+  IR_ArrayDef_ptr in (void) const;
-+  IR_ArrayDef_ptr &inout (void);
-+  IR_ArrayDef_ptr &out (void);
-+  IR_ArrayDef_ptr _retn (void);
-+  IR_ArrayDef_ptr ptr (void) const;
- 
- private:
--  FixedDef_ptr ptr_;
-+  IR_ArrayDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  FixedDef_var (const TAO_Base_var &rhs);
--  FixedDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_ArrayDef_var (const TAO_Base_var &rhs);
-+  IR_ArrayDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FIXEDDEF___OUT_CH_)
--#define _IR_FIXEDDEF___OUT_CH_
--
--class TAO_IFR_Client_Export FixedDef_out
-+class TAO_IFR_Client_Export IR_ArrayDef_out
- {
- public:
--  FixedDef_out (FixedDef_ptr &);
--  FixedDef_out (FixedDef_var &);
--  FixedDef_out (const FixedDef_out &);
--  FixedDef_out &operator= (const FixedDef_out &);
--  FixedDef_out &operator= (const FixedDef_var &);
--  FixedDef_out &operator= (FixedDef_ptr);
--  operator FixedDef_ptr &();
--  FixedDef_ptr &ptr (void);
--  FixedDef_ptr operator-> (void);
-+  IR_ArrayDef_out (IR_ArrayDef_ptr &);
-+  IR_ArrayDef_out (IR_ArrayDef_var &);
-+  IR_ArrayDef_out (const IR_ArrayDef_out &);
-+  IR_ArrayDef_out &operator= (const IR_ArrayDef_out &);
-+  IR_ArrayDef_out &operator= (const IR_ArrayDef_var &);
-+  IR_ArrayDef_out &operator= (IR_ArrayDef_ptr);
-+  operator IR_ArrayDef_ptr &();
-+  IR_ArrayDef_ptr &ptr (void);
-+  IR_ArrayDef_ptr operator-> (void);
-   
- private:
--  FixedDef_ptr &ptr_;
-+  IR_ArrayDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--enum PrimitiveKind
-+class TAO_IFR_Client_Export IR_WstringDef_var : public TAO_Base_var
- {
--    pk_null,
--    pk_void,
--    pk_short,
--    pk_long,
--    pk_ushort,
--    pk_ulong,
--    pk_float,
--    pk_double,
--    pk_boolean,
--    pk_char,
--    pk_octet,
--    pk_any,
--    pk_TypeCode,
--    pk_Principal,
--    pk_string,
--    pk_objref,
--    pk_longlong,
--    pk_ulonglong,
--    pk_longdouble,
--    pk_wchar,
--    pk_wstring,
--    pk_value_base  
--};
--typedef PrimitiveKind &PrimitiveKind_out;
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimitiveKind;
--
-+public:
-+  IR_WstringDef_var (void); // default constructor
-+  IR_WstringDef_var (IR_WstringDef_ptr p) : ptr_ (p) {}
-+  IR_WstringDef_var (const IR_WstringDef_var &); // copy constructor
-+  ~IR_WstringDef_var (void); // destructor
- 
--#if !defined (_IR_REPOSITORY___PTR_CH_)
--#define _IR_REPOSITORY___PTR_CH_
-+  IR_WstringDef_var &operator= (IR_WstringDef_ptr);
-+  IR_WstringDef_var &operator= (const IR_WstringDef_var &);
-+  IR_WstringDef_ptr operator-> (void) const;
- 
--class Repository;
--typedef Repository *Repository_ptr;
-+  operator const IR_WstringDef_ptr &() const;
-+  operator IR_WstringDef_ptr &();
-+  // in, inout, out, _retn
-+  IR_WstringDef_ptr in (void) const;
-+  IR_WstringDef_ptr &inout (void);
-+  IR_WstringDef_ptr &out (void);
-+  IR_WstringDef_ptr _retn (void);
-+  IR_WstringDef_ptr ptr (void) const;
- 
--#endif /* end #if !defined */
-+private:
-+  IR_WstringDef_ptr ptr_;
-+  // Unimplemented - prevents widening assignment.
-+  IR_WstringDef_var (const TAO_Base_var &rhs);
-+  IR_WstringDef_var &operator= (const TAO_Base_var &rhs);
-+};
- 
-+class TAO_IFR_Client_Export IR_WstringDef_out
-+{
-+public:
-+  IR_WstringDef_out (IR_WstringDef_ptr &);
-+  IR_WstringDef_out (IR_WstringDef_var &);
-+  IR_WstringDef_out (const IR_WstringDef_out &);
-+  IR_WstringDef_out &operator= (const IR_WstringDef_out &);
-+  IR_WstringDef_out &operator= (const IR_WstringDef_var &);
-+  IR_WstringDef_out &operator= (IR_WstringDef_ptr);
-+  operator IR_WstringDef_ptr &();
-+  IR_WstringDef_ptr &ptr (void);
-+  IR_WstringDef_ptr operator-> (void);
- 
--#if !defined (_IR_REPOSITORY___VAR_CH_)
--#define _IR_REPOSITORY___VAR_CH_
-+private:
-+  IR_WstringDef_ptr &ptr_;
-+};
- 
--class TAO_IFR_Client_Export Repository_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_FixedDef_var : public TAO_Base_var
- {
- public:
--  Repository_var (void); // default constructor
--  Repository_var (Repository_ptr p) : ptr_ (p) {} 
--  Repository_var (const Repository_var &); // copy constructor
--  ~Repository_var (void); // destructor
-+  IR_FixedDef_var (void); // default constructor
-+  IR_FixedDef_var (IR_FixedDef_ptr p) : ptr_ (p) {}
-+  IR_FixedDef_var (const IR_FixedDef_var &); // copy constructor
-+  ~IR_FixedDef_var (void); // destructor
-   
--  Repository_var &operator= (Repository_ptr);
--  Repository_var &operator= (const Repository_var &);
--  Repository_ptr operator-> (void) const;
-+  IR_FixedDef_var &operator= (IR_FixedDef_ptr);
-+  IR_FixedDef_var &operator= (const IR_FixedDef_var &);
-+  IR_FixedDef_ptr operator-> (void) const;
-   
--  operator const Repository_ptr &() const;
--  operator Repository_ptr &();
-+  operator const IR_FixedDef_ptr &() const;
-+  operator IR_FixedDef_ptr &();
-   // in, inout, out, _retn 
--  Repository_ptr in (void) const;
--  Repository_ptr &inout (void);
--  Repository_ptr &out (void);
--  Repository_ptr _retn (void);
--  Repository_ptr ptr (void) const;
-+  IR_FixedDef_ptr in (void) const;
-+  IR_FixedDef_ptr &inout (void);
-+  IR_FixedDef_ptr &out (void);
-+  IR_FixedDef_ptr _retn (void);
-+  IR_FixedDef_ptr ptr (void) const;
- 
- private:
--  Repository_ptr ptr_;
-+  IR_FixedDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  Repository_var (const TAO_Base_var &rhs);
--  Repository_var &operator= (const TAO_Base_var &rhs);
-+  IR_FixedDef_var (const TAO_Base_var &rhs);
-+  IR_FixedDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_REPOSITORY___OUT_CH_)
--#define _IR_REPOSITORY___OUT_CH_
--
--class TAO_IFR_Client_Export Repository_out
-+class TAO_IFR_Client_Export IR_FixedDef_out
- {
- public:
--  Repository_out (Repository_ptr &);
--  Repository_out (Repository_var &);
--  Repository_out (const Repository_out &);
--  Repository_out &operator= (const Repository_out &);
--  Repository_out &operator= (const Repository_var &);
--  Repository_out &operator= (Repository_ptr);
--  operator Repository_ptr &();
--  Repository_ptr &ptr (void);
--  Repository_ptr operator-> (void);
-+  IR_FixedDef_out (IR_FixedDef_ptr &);
-+  IR_FixedDef_out (IR_FixedDef_var &);
-+  IR_FixedDef_out (const IR_FixedDef_out &);
-+  IR_FixedDef_out &operator= (const IR_FixedDef_out &);
-+  IR_FixedDef_out &operator= (const IR_FixedDef_var &);
-+  IR_FixedDef_out &operator= (IR_FixedDef_ptr);
-+  operator IR_FixedDef_ptr &();
-+  IR_FixedDef_ptr &ptr (void);
-+  IR_FixedDef_ptr operator-> (void);
-   
- private:
--  Repository_ptr &ptr_;
-+  IR_FixedDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_REPOSITORY_CH_)
--#define _IR_REPOSITORY_CH_
--
- // Forward Classes Declaration
- class _TAO_Repository_Proxy_Impl;
- class _TAO_Repository_Remote_Proxy_Impl;
- class _TAO_Repository_Proxy_Broker;
- class _TAO_Repository_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export Repository: public virtual Container
-+class TAO_IFR_Client_Export IR_Repository: public virtual IR_Container
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef Repository_ptr _ptr_type;
--  typedef Repository_var _var_type;
-+  typedef IR_Repository_ptr _ptr_type;
-+  typedef IR_Repository_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static Repository_ptr _duplicate (Repository_ptr obj);
--  static Repository_ptr _narrow (
-+  static IR_Repository_ptr _duplicate (IR_Repository_ptr obj);
-+  static IR_Repository_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static Repository_ptr _unchecked_narrow (
-+  static IR_Repository_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static Repository_ptr _nil (void)
-+  static IR_Repository_ptr _nil (void)
-     {
--      return (Repository_ptr)0;
-+      return (IR_Repository_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
- 
--  virtual IR::Contained_ptr lookup_id (
-+  virtual IR_Contained_ptr lookup_id (
-       const char * search_id,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -8649,8 +6921,8 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::PrimitiveDef_ptr get_primitive (
--      IR::PrimitiveKind kind,
-+  virtual IR_PrimitiveDef_ptr get_primitive (
-+      IR_PrimitiveKind kind,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8658,7 +6930,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::StringDef_ptr create_string (
-+  virtual IR_StringDef_ptr create_string (
-       CORBA::ULong bound,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -8667,7 +6939,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::WstringDef_ptr create_wstring (
-+  virtual IR_WstringDef_ptr create_wstring (
-       CORBA::ULong bound,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -8676,9 +6948,9 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::SequenceDef_ptr create_sequence (
-+  virtual IR_SequenceDef_ptr create_sequence (
-       CORBA::ULong bound,
--      IR::IDLType_ptr element_type,
-+      IR_IDLType_ptr element_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8686,9 +6958,9 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ArrayDef_ptr create_array (
-+  virtual IR_ArrayDef_ptr create_array (
-       CORBA::ULong length,
--      IR::IDLType_ptr element_type,
-+      IR_IDLType_ptr element_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -8696,7 +6968,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::FixedDef_ptr create_fixed (
-+  virtual IR_FixedDef_ptr create_fixed (
-       CORBA::UShort digits,
-       CORBA::Short scale,
-       CORBA::Environment &ACE_TRY_ENV = 
-@@ -8719,14 +6991,14 @@
-   _TAO_Repository_Proxy_Broker *the_TAO_Repository_Proxy_Broker_;
-   
- protected:
--  Repository (int collocated = 0);
-+  IR_Repository (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_Repository_setup_collocation (int collocated);
-     
--    Repository (
-+  IR_Repository (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -8736,10 +7008,10 @@
-     friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-     friend class _TAO_Repository_Direct_Proxy_Impl;
-   
--  virtual ~Repository (void);
-+  virtual ~IR_Repository (void);
- private:
--  Repository (const Repository &);
--  void operator= (const Repository &);  
-+  IR_Repository (const IR_Repository &);
-+  void operator= (const IR_Repository &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -8749,7 +7021,7 @@
-   class TAO_ClientRequestInfo_IR_Repository_lookup_id : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::Repository;
-+    friend class IR_Repository;
-     
-     friend class _TAO_Repository_Remote_Proxy_Impl;
-     friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-@@ -8785,15 +7057,15 @@
-   TAO_ClientRequestInfo_IR_Repository_lookup_id (const TAO_ClientRequestInfo_IR_Repository_lookup_id &);
-   void operator= (const TAO_ClientRequestInfo_IR_Repository_lookup_id &);
-   const char * search_id_;
--  void result (IR::Contained_ptr result);
-+    void result (IR_Contained_ptr result);
-   // update the result 
--  IR::Contained_ptr _result;
-+    IR_Contained_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Repository;
-+    friend class IR_Repository;
-   
-   friend class _TAO_Repository_Remote_Proxy_Impl;
-   friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-@@ -8837,7 +7109,7 @@
- class TAO_ClientRequestInfo_IR_Repository_get_primitive : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Repository;
-+    friend class IR_Repository;
-   
-   friend class _TAO_Repository_Remote_Proxy_Impl;
-   friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-@@ -8846,7 +7118,7 @@
- TAO_ClientRequestInfo_IR_Repository_get_primitive (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::PrimitiveKind & kind,
-+        IR_PrimitiveKind & kind,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -8872,16 +7144,16 @@
- private:
-   TAO_ClientRequestInfo_IR_Repository_get_primitive (const TAO_ClientRequestInfo_IR_Repository_get_primitive &);
-   void operator= (const TAO_ClientRequestInfo_IR_Repository_get_primitive &);
--  const IR::PrimitiveKind & kind_;
--  void result (IR::PrimitiveDef_ptr result);
-+    const IR_PrimitiveKind & kind_;
-+    void result (IR_PrimitiveDef_ptr result);
-   // update the result 
--  IR::PrimitiveDef_ptr _result;
-+    IR_PrimitiveDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Repository_create_string : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Repository;
-+    friend class IR_Repository;
-   
-   friend class _TAO_Repository_Remote_Proxy_Impl;
-   friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-@@ -8917,15 +7189,15 @@
-   TAO_ClientRequestInfo_IR_Repository_create_string (const TAO_ClientRequestInfo_IR_Repository_create_string &);
-   void operator= (const TAO_ClientRequestInfo_IR_Repository_create_string &);
-   const CORBA::ULong & bound_;
--  void result (IR::StringDef_ptr result);
-+    void result (IR_StringDef_ptr result);
-   // update the result 
--  IR::StringDef_ptr _result;
-+    IR_StringDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Repository_create_wstring : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Repository;
-+    friend class IR_Repository;
-   
-   friend class _TAO_Repository_Remote_Proxy_Impl;
-   friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-@@ -8961,15 +7233,15 @@
-   TAO_ClientRequestInfo_IR_Repository_create_wstring (const TAO_ClientRequestInfo_IR_Repository_create_wstring &);
-   void operator= (const TAO_ClientRequestInfo_IR_Repository_create_wstring &);
-   const CORBA::ULong & bound_;
--  void result (IR::WstringDef_ptr result);
-+    void result (IR_WstringDef_ptr result);
-   // update the result 
--  IR::WstringDef_ptr _result;
-+    IR_WstringDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Repository_create_sequence : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Repository;
-+    friend class IR_Repository;
-   
-   friend class _TAO_Repository_Remote_Proxy_Impl;
-   friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-@@ -8979,7 +7251,7 @@
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::ULong & bound,
--    IR::IDLType_ptr element_type,
-+        IR_IDLType_ptr element_type,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -9006,16 +7278,16 @@
-   TAO_ClientRequestInfo_IR_Repository_create_sequence (const TAO_ClientRequestInfo_IR_Repository_create_sequence &);
-   void operator= (const TAO_ClientRequestInfo_IR_Repository_create_sequence &);
-   const CORBA::ULong & bound_;
--  IR::IDLType_ptr element_type_;
--  void result (IR::SequenceDef_ptr result);
-+    IR_IDLType_ptr element_type_;
-+    void result (IR_SequenceDef_ptr result);
-   // update the result 
--  IR::SequenceDef_ptr _result;
-+    IR_SequenceDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Repository_create_array : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Repository;
-+    friend class IR_Repository;
-   
-   friend class _TAO_Repository_Remote_Proxy_Impl;
-   friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-@@ -9025,7 +7297,7 @@
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::ULong & length,
--    IR::IDLType_ptr element_type,
-+        IR_IDLType_ptr element_type,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -9052,16 +7324,16 @@
-   TAO_ClientRequestInfo_IR_Repository_create_array (const TAO_ClientRequestInfo_IR_Repository_create_array &);
-   void operator= (const TAO_ClientRequestInfo_IR_Repository_create_array &);
-   const CORBA::ULong & length_;
--  IR::IDLType_ptr element_type_;
--  void result (IR::ArrayDef_ptr result);
-+    IR_IDLType_ptr element_type_;
-+    void result (IR_ArrayDef_ptr result);
-   // update the result 
--  IR::ArrayDef_ptr _result;
-+    IR_ArrayDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_Repository_create_fixed : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::Repository;
-+    friend class IR_Repository;
-   
-   friend class _TAO_Repository_Remote_Proxy_Impl;
-   friend class _TAO_Repository_ThruPOA_Proxy_Impl;
-@@ -9099,9 +7371,9 @@
-   void operator= (const TAO_ClientRequestInfo_IR_Repository_create_fixed &);
-   const CORBA::UShort & digits_;
-   const CORBA::Short & scale_;
--  void result (IR::FixedDef_ptr result);
-+    void result (IR_FixedDef_ptr result);
-   // update the result 
--  IR::FixedDef_ptr _result;
-+    IR_FixedDef_ptr _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-@@ -9119,12 +7391,12 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_Repository_Proxy_Impl : 
--  public virtual IR::_TAO_Container_Proxy_Impl
-+  public virtual _TAO_Container_Proxy_Impl
- {
- public:
-   virtual ~_TAO_Repository_Proxy_Impl (void) { }
-   
--    virtual IR::Contained_ptr lookup_id (
-+  virtual IR_Contained_ptr lookup_id (
-       CORBA_Object *_collocated_tao_target_,
-       const char * search_id,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -9142,16 +7414,16 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::PrimitiveDef_ptr get_primitive (
-+  virtual IR_PrimitiveDef_ptr get_primitive (
-       CORBA_Object *_collocated_tao_target_,
--      IR::PrimitiveKind kind,
-+      IR_PrimitiveKind kind,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::StringDef_ptr create_string (
-+  virtual IR_StringDef_ptr create_string (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::ULong bound,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -9160,7 +7432,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::WstringDef_ptr create_wstring (
-+  virtual IR_WstringDef_ptr create_wstring (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::ULong bound,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -9169,27 +7441,27 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::SequenceDef_ptr create_sequence (
-+  virtual IR_SequenceDef_ptr create_sequence (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::ULong bound,
--      IR::IDLType_ptr element_type,
-+      IR_IDLType_ptr element_type,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ArrayDef_ptr create_array (
-+  virtual IR_ArrayDef_ptr create_array (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::ULong length,
--      IR::IDLType_ptr element_type,
-+      IR_IDLType_ptr element_type,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::FixedDef_ptr create_fixed (
-+  virtual IR_FixedDef_ptr create_fixed (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::UShort digits,
-       CORBA::Short scale,
-@@ -9203,6 +7475,7 @@
-   _TAO_Repository_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -9215,7 +7488,7 @@
- class TAO_IFR_Client_Export _TAO_Repository_Remote_Proxy_Impl : 
-   public virtual _TAO_Repository_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_Container_Remote_Proxy_Impl
-+  public virtual _TAO_Container_Remote_Proxy_Impl
-   
- {
- public:
-@@ -9223,7 +7496,7 @@
-   
-   virtual ~_TAO_Repository_Remote_Proxy_Impl (void) { }
-   
--    virtual IR::Contained_ptr lookup_id (
-+  virtual IR_Contained_ptr lookup_id (
-       CORBA_Object *_collocated_tao_target_,
-       const char * search_id,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -9241,16 +7514,16 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::PrimitiveDef_ptr get_primitive (
-+  virtual IR_PrimitiveDef_ptr get_primitive (
-       CORBA_Object *_collocated_tao_target_,
--      IR::PrimitiveKind kind,
-+      IR_PrimitiveKind kind,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::StringDef_ptr create_string (
-+  virtual IR_StringDef_ptr create_string (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::ULong bound,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -9259,7 +7532,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::WstringDef_ptr create_wstring (
-+  virtual IR_WstringDef_ptr create_wstring (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::ULong bound,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -9268,27 +7541,27 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::SequenceDef_ptr create_sequence (
-+  virtual IR_SequenceDef_ptr create_sequence (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::ULong bound,
--      IR::IDLType_ptr element_type,
-+      IR_IDLType_ptr element_type,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ArrayDef_ptr create_array (
-+  virtual IR_ArrayDef_ptr create_array (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::ULong length,
--      IR::IDLType_ptr element_type,
-+      IR_IDLType_ptr element_type,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::FixedDef_ptr create_fixed (
-+  virtual IR_FixedDef_ptr create_fixed (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::UShort digits,
-       CORBA::Short scale,
-@@ -9320,8 +7593,9 @@
- {
- public:
-   virtual ~_TAO_Repository_Proxy_Broker (void);
-+
-   virtual _TAO_Repository_Proxy_Impl &select_proxy (
--    Repository *object,
-+    IR_Repository *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -9330,6 +7604,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -9347,7 +7622,7 @@
-   virtual ~_TAO_Repository_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_Repository_Proxy_Impl &select_proxy (
--    Repository *object,
-+    IR_Repository *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -9361,127 +7636,94 @@
-   static _TAO_Repository_Remote_Proxy_Broker *the_TAO_Repository_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Repository;
--
--
--#if !defined (_IR_COMPONENTREPOSITORY___PTR_CH_)
--#define _IR_COMPONENTREPOSITORY___PTR_CH_
--
--class ComponentRepository;
--typedef ComponentRepository *ComponentRepository_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_COMPONENTREPOSITORY___VAR_CH_)
--#define _IR_COMPONENTREPOSITORY___VAR_CH_
--
--class TAO_IFR_Client_Export ComponentRepository_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_ComponentRepository_var : public TAO_Base_var
- {
- public:
--  ComponentRepository_var (void); // default constructor
--  ComponentRepository_var (ComponentRepository_ptr p) : ptr_ (p) {} 
--  ComponentRepository_var (const ComponentRepository_var &); // copy constructor
--  ~ComponentRepository_var (void); // destructor
-+  IR_ComponentRepository_var (void); // default constructor
-+  IR_ComponentRepository_var (IR_ComponentRepository_ptr p) : ptr_ (p) {}
-+  IR_ComponentRepository_var (const IR_ComponentRepository_var &); // copy constructor
-+  ~IR_ComponentRepository_var (void); // destructor
-   
--  ComponentRepository_var &operator= (ComponentRepository_ptr);
--  ComponentRepository_var &operator= (const ComponentRepository_var &);
--  ComponentRepository_ptr operator-> (void) const;
-+  IR_ComponentRepository_var &operator= (IR_ComponentRepository_ptr);
-+  IR_ComponentRepository_var &operator= (const IR_ComponentRepository_var &);
-+  IR_ComponentRepository_ptr operator-> (void) const;
-   
--  operator const ComponentRepository_ptr &() const;
--  operator ComponentRepository_ptr &();
-+  operator const IR_ComponentRepository_ptr &() const;
-+  operator IR_ComponentRepository_ptr &();
-   // in, inout, out, _retn 
--  ComponentRepository_ptr in (void) const;
--  ComponentRepository_ptr &inout (void);
--  ComponentRepository_ptr &out (void);
--  ComponentRepository_ptr _retn (void);
--  ComponentRepository_ptr ptr (void) const;
-+  IR_ComponentRepository_ptr in (void) const;
-+  IR_ComponentRepository_ptr &inout (void);
-+  IR_ComponentRepository_ptr &out (void);
-+  IR_ComponentRepository_ptr _retn (void);
-+  IR_ComponentRepository_ptr ptr (void) const;
- 
- private:
--  ComponentRepository_ptr ptr_;
-+  IR_ComponentRepository_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  ComponentRepository_var (const TAO_Base_var &rhs);
--  ComponentRepository_var &operator= (const TAO_Base_var &rhs);
-+  IR_ComponentRepository_var (const TAO_Base_var &rhs);
-+  IR_ComponentRepository_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_COMPONENTREPOSITORY___OUT_CH_)
--#define _IR_COMPONENTREPOSITORY___OUT_CH_
--
--class TAO_IFR_Client_Export ComponentRepository_out
-+class TAO_IFR_Client_Export IR_ComponentRepository_out
- {
- public:
--  ComponentRepository_out (ComponentRepository_ptr &);
--  ComponentRepository_out (ComponentRepository_var &);
--  ComponentRepository_out (const ComponentRepository_out &);
--  ComponentRepository_out &operator= (const ComponentRepository_out &);
--  ComponentRepository_out &operator= (const ComponentRepository_var &);
--  ComponentRepository_out &operator= (ComponentRepository_ptr);
--  operator ComponentRepository_ptr &();
--  ComponentRepository_ptr &ptr (void);
--  ComponentRepository_ptr operator-> (void);
-+  IR_ComponentRepository_out (IR_ComponentRepository_ptr &);
-+  IR_ComponentRepository_out (IR_ComponentRepository_var &);
-+  IR_ComponentRepository_out (const IR_ComponentRepository_out &);
-+  IR_ComponentRepository_out &operator= (const IR_ComponentRepository_out &);
-+  IR_ComponentRepository_out &operator= (const IR_ComponentRepository_var &);
-+  IR_ComponentRepository_out &operator= (IR_ComponentRepository_ptr);
-+  operator IR_ComponentRepository_ptr &();
-+  IR_ComponentRepository_ptr &ptr (void);
-+  IR_ComponentRepository_ptr operator-> (void);
-   
- private:
--  ComponentRepository_ptr &ptr_;
-+  IR_ComponentRepository_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_COMPONENTREPOSITORY_CH_)
--#define _IR_COMPONENTREPOSITORY_CH_
--
- // Forward Classes Declaration
- class _TAO_ComponentRepository_Proxy_Impl;
- class _TAO_ComponentRepository_Remote_Proxy_Impl;
- class _TAO_ComponentRepository_Proxy_Broker;
- class _TAO_ComponentRepository_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ComponentRepository: public virtual Repository
-+class TAO_IFR_Client_Export IR_ComponentRepository: public virtual IR_Repository
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ComponentRepository_ptr _ptr_type;
--  typedef ComponentRepository_var _var_type;
-+  typedef IR_ComponentRepository_ptr _ptr_type;
-+  typedef IR_ComponentRepository_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static ComponentRepository_ptr _duplicate (ComponentRepository_ptr obj);
--  static ComponentRepository_ptr _narrow (
-+  static IR_ComponentRepository_ptr _duplicate (IR_ComponentRepository_ptr obj);
-+  static IR_ComponentRepository_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ComponentRepository_ptr _unchecked_narrow (
-+  static IR_ComponentRepository_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ComponentRepository_ptr _nil (void)
-+  static IR_ComponentRepository_ptr _nil (void)
-     {
--      return (ComponentRepository_ptr)0;
-+      return (IR_ComponentRepository_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
- 
--  virtual IR::ComponentDef_ptr create_component (
-+  virtual IR_ComponentDef_ptr create_component (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ComponentDef_ptr base_component,
--      const IR::InterfaceDefSeq & supports_interfaces,
-+      IR_ComponentDef_ptr base_component,
-+      const IR_InterfaceDefSeq & supports_interfaces,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9489,13 +7731,13 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::HomeDef_ptr create_home (
-+  virtual IR_HomeDef_ptr create_home (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::HomeDef_ptr base_home,
--      IR::ComponentDef_ptr managed_component,
--      IR::ValueDef_ptr primary_key,
-+      IR_HomeDef_ptr base_home,
-+      IR_ComponentDef_ptr managed_component,
-+      IR_ValueDef_ptr primary_key,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -9516,14 +7758,14 @@
-   _TAO_ComponentRepository_Proxy_Broker *the_TAO_ComponentRepository_Proxy_Broker_;
-   
- protected:
--  ComponentRepository (int collocated = 0);
-+  IR_ComponentRepository (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_ComponentRepository_setup_collocation (int collocated);
-     
--    ComponentRepository (
-+  IR_ComponentRepository (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -9533,10 +7775,10 @@
-     friend class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
-     friend class _TAO_ComponentRepository_Direct_Proxy_Impl;
-   
--  virtual ~ComponentRepository (void);
-+  virtual ~IR_ComponentRepository (void);
- private:
--  ComponentRepository (const ComponentRepository &);
--  void operator= (const ComponentRepository &);  
-+  IR_ComponentRepository (const IR_ComponentRepository &);
-+  void operator= (const IR_ComponentRepository &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -9546,7 +7788,7 @@
-   class TAO_ClientRequestInfo_IR_ComponentRepository_create_component : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::ComponentRepository;
-+    friend class IR_ComponentRepository;
-     
-     friend class _TAO_ComponentRepository_Remote_Proxy_Impl;
-     friend class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
-@@ -9558,8 +7800,8 @@
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ComponentDef_ptr base_component,
--      const IR::InterfaceDefSeq & supports_interfaces,
-+        IR_ComponentDef_ptr base_component,
-+        const IR_InterfaceDefSeq & supports_interfaces,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
-@@ -9588,17 +7830,17 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::ComponentDef_ptr base_component_;
--  const IR::InterfaceDefSeq & supports_interfaces_;
--  void result (IR::ComponentDef_ptr result);
-+    IR_ComponentDef_ptr base_component_;
-+    const IR_InterfaceDefSeq & supports_interfaces_;
-+    void result (IR_ComponentDef_ptr result);
-   // update the result 
--  IR::ComponentDef_ptr _result;
-+    IR_ComponentDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ComponentRepository_create_home : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ComponentRepository;
-+    friend class IR_ComponentRepository;
-   
-   friend class _TAO_ComponentRepository_Remote_Proxy_Impl;
-   friend class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
-@@ -9610,9 +7852,9 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::HomeDef_ptr base_home,
--    IR::ComponentDef_ptr managed_component,
--    IR::ValueDef_ptr primary_key,
-+        IR_HomeDef_ptr base_home,
-+        IR_ComponentDef_ptr managed_component,
-+        IR_ValueDef_ptr primary_key,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -9641,12 +7883,12 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::HomeDef_ptr base_home_;
--  IR::ComponentDef_ptr managed_component_;
--  IR::ValueDef_ptr primary_key_;
--  void result (IR::HomeDef_ptr result);
-+    IR_HomeDef_ptr base_home_;
-+    IR_ComponentDef_ptr managed_component_;
-+    IR_ValueDef_ptr primary_key_;
-+    void result (IR_HomeDef_ptr result);
-   // update the result 
--  IR::HomeDef_ptr _result;
-+    IR_HomeDef_ptr _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-@@ -9664,32 +7906,32 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Impl : 
--  public virtual IR::_TAO_Repository_Proxy_Impl
-+  public virtual _TAO_Repository_Proxy_Impl
- {
- public:
-   virtual ~_TAO_ComponentRepository_Proxy_Impl (void) { }
-   
--    virtual IR::ComponentDef_ptr create_component (
-+  virtual IR_ComponentDef_ptr create_component (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ComponentDef_ptr base_component,
--      const IR::InterfaceDefSeq & supports_interfaces,
-+      IR_ComponentDef_ptr base_component,
-+      const IR_InterfaceDefSeq & supports_interfaces,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::HomeDef_ptr create_home (
-+  virtual IR_HomeDef_ptr create_home (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::HomeDef_ptr base_home,
--      IR::ComponentDef_ptr managed_component,
--      IR::ValueDef_ptr primary_key,
-+      IR_HomeDef_ptr base_home,
-+      IR_ComponentDef_ptr managed_component,
-+      IR_ValueDef_ptr primary_key,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -9700,6 +7942,7 @@
-   _TAO_ComponentRepository_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -9712,7 +7955,7 @@
- class TAO_IFR_Client_Export _TAO_ComponentRepository_Remote_Proxy_Impl : 
-   public virtual _TAO_ComponentRepository_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_Repository_Remote_Proxy_Impl
-+  public virtual _TAO_Repository_Remote_Proxy_Impl
-   
- {
- public:
-@@ -9720,27 +7963,27 @@
-   
-   virtual ~_TAO_ComponentRepository_Remote_Proxy_Impl (void) { }
-   
--    virtual IR::ComponentDef_ptr create_component (
-+  virtual IR_ComponentDef_ptr create_component (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ComponentDef_ptr base_component,
--      const IR::InterfaceDefSeq & supports_interfaces,
-+      IR_ComponentDef_ptr base_component,
-+      const IR_InterfaceDefSeq & supports_interfaces,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::HomeDef_ptr create_home (
-+  virtual IR_HomeDef_ptr create_home (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::HomeDef_ptr base_home,
--      IR::ComponentDef_ptr managed_component,
--      IR::ValueDef_ptr primary_key,
-+      IR_HomeDef_ptr base_home,
-+      IR_ComponentDef_ptr managed_component,
-+      IR_ValueDef_ptr primary_key,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -9769,8 +8012,9 @@
- {
- public:
-   virtual ~_TAO_ComponentRepository_Proxy_Broker (void);
-+
-   virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
--    ComponentRepository *object,
-+    IR_ComponentRepository *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -9779,6 +8023,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -9796,7 +8041,7 @@
-   virtual ~_TAO_ComponentRepository_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
--    ComponentRepository *object,
-+    IR_ComponentRepository *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -9810,117 +8055,39 @@
-   static _TAO_ComponentRepository_Remote_Proxy_Broker *the_TAO_ComponentRepository_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentRepository;
--
--
--#if !defined (_IR_MODULEDEF___PTR_CH_)
--#define _IR_MODULEDEF___PTR_CH_
--
--class ModuleDef;
--typedef ModuleDef *ModuleDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_MODULEDEF___VAR_CH_)
--#define _IR_MODULEDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ModuleDef_var : public TAO_Base_var
--{
--public:
--  ModuleDef_var (void); // default constructor
--  ModuleDef_var (ModuleDef_ptr p) : ptr_ (p) {} 
--  ModuleDef_var (const ModuleDef_var &); // copy constructor
--  ~ModuleDef_var (void); // destructor
--  
--  ModuleDef_var &operator= (ModuleDef_ptr);
--  ModuleDef_var &operator= (const ModuleDef_var &);
--  ModuleDef_ptr operator-> (void) const;
--  
--  operator const ModuleDef_ptr &() const;
--  operator ModuleDef_ptr &();
--  // in, inout, out, _retn 
--  ModuleDef_ptr in (void) const;
--  ModuleDef_ptr &inout (void);
--  ModuleDef_ptr &out (void);
--  ModuleDef_ptr _retn (void);
--  ModuleDef_ptr ptr (void) const;
--
--private:
--  ModuleDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  ModuleDef_var (const TAO_Base_var &rhs);
--  ModuleDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_MODULEDEF___OUT_CH_)
--#define _IR_MODULEDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ModuleDef_out
--{
--public:
--  ModuleDef_out (ModuleDef_ptr &);
--  ModuleDef_out (ModuleDef_var &);
--  ModuleDef_out (const ModuleDef_out &);
--  ModuleDef_out &operator= (const ModuleDef_out &);
--  ModuleDef_out &operator= (const ModuleDef_var &);
--  ModuleDef_out &operator= (ModuleDef_ptr);
--  operator ModuleDef_ptr &();
--  ModuleDef_ptr &ptr (void);
--  ModuleDef_ptr operator-> (void);
--  
--private:
--  ModuleDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_MODULEDEF_CH_)
--#define _IR_MODULEDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_ModuleDef_Proxy_Impl;
- class _TAO_ModuleDef_Remote_Proxy_Impl;
- class _TAO_ModuleDef_Proxy_Broker;
- class _TAO_ModuleDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ModuleDef: public virtual Container, public virtual Contained
-+class TAO_IFR_Client_Export IR_ModuleDef: public virtual IR_Container, public virtual IR_Contained
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ModuleDef_ptr _ptr_type;
--  typedef ModuleDef_var _var_type;
-+  typedef IR_ModuleDef_ptr _ptr_type;
-+  typedef IR_ModuleDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static ModuleDef_ptr _duplicate (ModuleDef_ptr obj);
--  static ModuleDef_ptr _narrow (
-+  static IR_ModuleDef_ptr _duplicate (IR_ModuleDef_ptr obj);
-+  static IR_ModuleDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ModuleDef_ptr _unchecked_narrow (
-+  static IR_ModuleDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ModuleDef_ptr _nil (void)
-+  static IR_ModuleDef_ptr _nil (void)
-     {
--      return (ModuleDef_ptr)0;
-+      return (IR_ModuleDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -9938,14 +8105,14 @@
-   _TAO_ModuleDef_Proxy_Broker *the_TAO_ModuleDef_Proxy_Broker_;
-   
- protected:
--  ModuleDef (int collocated = 0);
-+  IR_ModuleDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_ModuleDef_setup_collocation (int collocated);
-     
--    ModuleDef (
-+  IR_ModuleDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -9955,10 +8122,10 @@
-     friend class _TAO_ModuleDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_ModuleDef_Direct_Proxy_Impl;
-   
--  virtual ~ModuleDef (void);
-+  virtual ~IR_ModuleDef (void);
- private:
--  ModuleDef (const ModuleDef &);
--  void operator= (const ModuleDef &);  
-+  IR_ModuleDef (const IR_ModuleDef &);
-+  void operator= (const IR_ModuleDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -9980,8 +8147,8 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Impl : 
--  public virtual IR::_TAO_Container_Proxy_Impl, 
--  public virtual IR::_TAO_Contained_Proxy_Impl
-+    public virtual _TAO_Container_Proxy_Impl,
-+    public virtual _TAO_Contained_Proxy_Impl
- {
- public:
-   virtual ~_TAO_ModuleDef_Proxy_Impl (void) { }
-@@ -9990,6 +8157,7 @@
-   _TAO_ModuleDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -10002,8 +8170,8 @@
- class TAO_IFR_Client_Export _TAO_ModuleDef_Remote_Proxy_Impl : 
-   public virtual _TAO_ModuleDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_Container_Remote_Proxy_Impl, 
--  public virtual IR::_TAO_Contained_Remote_Proxy_Impl
-+  public virtual _TAO_Container_Remote_Proxy_Impl,
-+  public virtual _TAO_Contained_Remote_Proxy_Impl
-   
- {
- public:
-@@ -10033,8 +8201,9 @@
- {
- public:
-   virtual ~_TAO_ModuleDef_Proxy_Broker (void);
-+
-   virtual _TAO_ModuleDef_Proxy_Impl &select_proxy (
--    ModuleDef *object,
-+    IR_ModuleDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -10043,6 +8212,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -10060,7 +8230,7 @@
-   virtual ~_TAO_ModuleDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_ModuleDef_Proxy_Impl &select_proxy (
--    ModuleDef *object,
-+    IR_ModuleDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -10074,24 +8244,15 @@
-   static _TAO_ModuleDef_Remote_Proxy_Broker *the_TAO_ModuleDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ModuleDef;
--
--struct ModuleDescription;
--class ModuleDescription_var;
--
--struct TAO_IFR_Client_Export ModuleDescription
-+struct TAO_IFR_Client_Export IR_ModuleDescription
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ModuleDescription_var _var_type;
-+  typedef IR_ModuleDescription_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
-@@ -10102,156 +8263,82 @@
-   TAO_String_Manager version;
- };
- 
--class TAO_IFR_Client_Export ModuleDescription_var
-+class TAO_IFR_Client_Export IR_ModuleDescription_var
- {
- public:
--  ModuleDescription_var (void); // default constructor
--  ModuleDescription_var (ModuleDescription *);
--  ModuleDescription_var (const ModuleDescription_var &); // copy constructor
--  ~ModuleDescription_var (void); // destructor
-+  IR_ModuleDescription_var (void); // default constructor
-+  IR_ModuleDescription_var (IR_ModuleDescription *);
-+  IR_ModuleDescription_var (const IR_ModuleDescription_var &); // copy constructor
-+  ~IR_ModuleDescription_var (void); // destructor
-   
--  ModuleDescription_var &operator= (ModuleDescription *);
--  ModuleDescription_var &operator= (const ModuleDescription_var &);
--  ModuleDescription *operator-> (void);
--  const ModuleDescription *operator-> (void) const;
-+  IR_ModuleDescription_var &operator= (IR_ModuleDescription *);
-+  IR_ModuleDescription_var &operator= (const IR_ModuleDescription_var &);
-+  IR_ModuleDescription *operator-> (void);
-+  const IR_ModuleDescription *operator-> (void) const;
-   
--  operator const ModuleDescription &() const;
--  operator ModuleDescription &();
--  operator ModuleDescription &() const;
--  operator ModuleDescription *&(); // variable-size types only
-+  operator const IR_ModuleDescription &() const;
-+  operator IR_ModuleDescription &();
-+  operator IR_ModuleDescription &() const;
-+  operator IR_ModuleDescription *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const ModuleDescription &in (void) const;
--  ModuleDescription &inout (void);
--  ModuleDescription *&out (void);
--  ModuleDescription *_retn (void);
--  ModuleDescription *ptr (void) const;
-+  const IR_ModuleDescription &in (void) const;
-+  IR_ModuleDescription &inout (void);
-+  IR_ModuleDescription *&out (void);
-+  IR_ModuleDescription *_retn (void);
-+  IR_ModuleDescription *ptr (void) const;
- 
- private:
--  ModuleDescription *ptr_;
-+  IR_ModuleDescription *ptr_;
- };
- 
--class TAO_IFR_Client_Export ModuleDescription_out
-+class TAO_IFR_Client_Export IR_ModuleDescription_out
- {
- public:
--  ModuleDescription_out (ModuleDescription *&);
--  ModuleDescription_out (ModuleDescription_var &);
--  ModuleDescription_out (const ModuleDescription_out &);
--  ModuleDescription_out &operator= (const ModuleDescription_out &);
--  ModuleDescription_out &operator= (ModuleDescription *);
--  operator ModuleDescription *&();
--  ModuleDescription *&ptr (void);
--  ModuleDescription *operator-> (void);
-+  IR_ModuleDescription_out (IR_ModuleDescription *&);
-+  IR_ModuleDescription_out (IR_ModuleDescription_var &);
-+  IR_ModuleDescription_out (const IR_ModuleDescription_out &);
-+  IR_ModuleDescription_out &operator= (const IR_ModuleDescription_out &);
-+  IR_ModuleDescription_out &operator= (IR_ModuleDescription *);
-+  operator IR_ModuleDescription *&();
-+  IR_ModuleDescription *&ptr (void);
-+  IR_ModuleDescription *operator-> (void);
-   
- private:
--  ModuleDescription *&ptr_;
-+  IR_ModuleDescription *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ModuleDescription_var &);
--};
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ModuleDescription;
--
--
--#if !defined (_IR_CONSTANTDEF___PTR_CH_)
--#define _IR_CONSTANTDEF___PTR_CH_
--
--class ConstantDef;
--typedef ConstantDef *ConstantDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSTANTDEF___VAR_CH_)
--#define _IR_CONSTANTDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ConstantDef_var : public TAO_Base_var
--{
--public:
--  ConstantDef_var (void); // default constructor
--  ConstantDef_var (ConstantDef_ptr p) : ptr_ (p) {} 
--  ConstantDef_var (const ConstantDef_var &); // copy constructor
--  ~ConstantDef_var (void); // destructor
--  
--  ConstantDef_var &operator= (ConstantDef_ptr);
--  ConstantDef_var &operator= (const ConstantDef_var &);
--  ConstantDef_ptr operator-> (void) const;
--  
--  operator const ConstantDef_ptr &() const;
--  operator ConstantDef_ptr &();
--  // in, inout, out, _retn 
--  ConstantDef_ptr in (void) const;
--  ConstantDef_ptr &inout (void);
--  ConstantDef_ptr &out (void);
--  ConstantDef_ptr _retn (void);
--  ConstantDef_ptr ptr (void) const;
--
--private:
--  ConstantDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  ConstantDef_var (const TAO_Base_var &rhs);
--  ConstantDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSTANTDEF___OUT_CH_)
--#define _IR_CONSTANTDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ConstantDef_out
--{
--public:
--  ConstantDef_out (ConstantDef_ptr &);
--  ConstantDef_out (ConstantDef_var &);
--  ConstantDef_out (const ConstantDef_out &);
--  ConstantDef_out &operator= (const ConstantDef_out &);
--  ConstantDef_out &operator= (const ConstantDef_var &);
--  ConstantDef_out &operator= (ConstantDef_ptr);
--  operator ConstantDef_ptr &();
--  ConstantDef_ptr &ptr (void);
--  ConstantDef_ptr operator-> (void);
--  
--private:
--  ConstantDef_ptr &ptr_;
-+  void operator= (const IR_ModuleDescription_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSTANTDEF_CH_)
--#define _IR_CONSTANTDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_ConstantDef_Proxy_Impl;
- class _TAO_ConstantDef_Remote_Proxy_Impl;
- class _TAO_ConstantDef_Proxy_Broker;
- class _TAO_ConstantDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ConstantDef: public virtual Contained
-+class TAO_IFR_Client_Export IR_ConstantDef: public virtual IR_Contained
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ConstantDef_ptr _ptr_type;
--  typedef ConstantDef_var _var_type;
-+  typedef IR_ConstantDef_ptr _ptr_type;
-+  typedef IR_ConstantDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static ConstantDef_ptr _duplicate (ConstantDef_ptr obj);
--  static ConstantDef_ptr _narrow (
-+  static IR_ConstantDef_ptr _duplicate (IR_ConstantDef_ptr obj);
-+  static IR_ConstantDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ConstantDef_ptr _unchecked_narrow (
-+  static IR_ConstantDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ConstantDef_ptr _nil (void)
-+  static IR_ConstantDef_ptr _nil (void)
-     {
--      return (ConstantDef_ptr)0;
-+      return (IR_ConstantDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -10264,7 +8351,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr type_def (
-+  virtual IR_IDLType_ptr type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -10273,7 +8360,7 @@
-     ));
- 
-   virtual void type_def (
--      IR::IDLType_ptr type_def,
-+      IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -10311,14 +8398,14 @@
-   _TAO_ConstantDef_Proxy_Broker *the_TAO_ConstantDef_Proxy_Broker_;
-   
- protected:
--  ConstantDef (int collocated = 0);
-+  IR_ConstantDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_ConstantDef_setup_collocation (int collocated);
-     
--    ConstantDef (
-+  IR_ConstantDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -10328,10 +8415,10 @@
-     friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_ConstantDef_Direct_Proxy_Impl;
-   
--  virtual ~ConstantDef (void);
-+  virtual ~IR_ConstantDef (void);
- private:
--  ConstantDef (const ConstantDef &);
--  void operator= (const ConstantDef &);  
-+  IR_ConstantDef (const IR_ConstantDef &);
-+  void operator= (const IR_ConstantDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -10341,7 +8428,7 @@
-   class TAO_ClientRequestInfo_IR_ConstantDef_type_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::ConstantDef;
-+    friend class IR_ConstantDef;
-     
-     friend class _TAO_ConstantDef_Remote_Proxy_Impl;
-     friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
-@@ -10383,7 +8470,7 @@
- class TAO_ClientRequestInfo_IR_ConstantDef_type_def_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ConstantDef;
-+    friend class IR_ConstantDef;
-   
-   friend class _TAO_ConstantDef_Remote_Proxy_Impl;
-   friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
-@@ -10417,15 +8504,15 @@
- private:
-   TAO_ClientRequestInfo_IR_ConstantDef_type_def_get (const TAO_ClientRequestInfo_IR_ConstantDef_type_def_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ConstantDef_type_def_get &);
--  void result (IR::IDLType_ptr result);
-+    void result (IR_IDLType_ptr result);
-   // update the result 
--  IR::IDLType_ptr _result;
-+    IR_IDLType_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ConstantDef_type_def_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ConstantDef;
-+    friend class IR_ConstantDef;
-   
-   friend class _TAO_ConstantDef_Remote_Proxy_Impl;
-   friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
-@@ -10434,7 +8521,7 @@
- TAO_ClientRequestInfo_IR_ConstantDef_type_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr type_def,
-+        IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -10460,14 +8547,14 @@
- private:
-   TAO_ClientRequestInfo_IR_ConstantDef_type_def_set (const TAO_ClientRequestInfo_IR_ConstantDef_type_def_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_ConstantDef_type_def_set &);
--  IR::IDLType_ptr type_def_;
-+    IR_IDLType_ptr type_def_;
-   
- };
- 
- class TAO_ClientRequestInfo_IR_ConstantDef_value_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ConstantDef;
-+    friend class IR_ConstantDef;
-   
-   friend class _TAO_ConstantDef_Remote_Proxy_Impl;
-   friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
-@@ -10509,7 +8596,7 @@
- class TAO_ClientRequestInfo_IR_ConstantDef_value_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ConstantDef;
-+    friend class IR_ConstantDef;
-   
-   friend class _TAO_ConstantDef_Remote_Proxy_Impl;
-   friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
-@@ -10563,7 +8650,7 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Impl : 
--  public virtual IR::_TAO_Contained_Proxy_Impl
-+  public virtual _TAO_Contained_Proxy_Impl
- {
- public:
-   virtual ~_TAO_ConstantDef_Proxy_Impl (void) { }
-@@ -10576,7 +8663,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::IDLType_ptr type_def (
-+  virtual IR_IDLType_ptr type_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -10586,7 +8673,7 @@
- 
-   virtual void type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr type_def,
-+      IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -10614,6 +8701,7 @@
-   _TAO_ConstantDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -10626,7 +8714,7 @@
- class TAO_IFR_Client_Export _TAO_ConstantDef_Remote_Proxy_Impl : 
-   public virtual _TAO_ConstantDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_Contained_Remote_Proxy_Impl
-+  public virtual _TAO_Contained_Remote_Proxy_Impl
-   
- {
- public:
-@@ -10642,7 +8730,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr type_def (
-+  virtual IR_IDLType_ptr type_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -10652,7 +8740,7 @@
- 
-   virtual void type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr type_def,
-+      IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -10699,7 +8787,7 @@
- public:
-   virtual ~_TAO_ConstantDef_Proxy_Broker (void);
-   virtual _TAO_ConstantDef_Proxy_Impl &select_proxy (
--    ConstantDef *object,
-+    IR_ConstantDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -10708,6 +8796,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -10725,7 +8814,7 @@
-   virtual ~_TAO_ConstantDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_ConstantDef_Proxy_Impl &select_proxy (
--    ConstantDef *object,
-+    IR_ConstantDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -10739,24 +8828,15 @@
-   static _TAO_ConstantDef_Remote_Proxy_Broker *the_TAO_ConstantDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConstantDef;
--
--struct ConstantDescription;
--class ConstantDescription_var;
--
--struct TAO_IFR_Client_Export ConstantDescription
-+struct TAO_IFR_Client_Export IR_ConstantDescription
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ConstantDescription_var _var_type;
-+  typedef IR_ConstantDescription_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
-@@ -10769,156 +8849,127 @@
-   CORBA::Any value;
- };
- 
--class TAO_IFR_Client_Export ConstantDescription_var
-+class TAO_IFR_Client_Export IR_ConstantDescription_var
- {
- public:
--  ConstantDescription_var (void); // default constructor
--  ConstantDescription_var (ConstantDescription *);
--  ConstantDescription_var (const ConstantDescription_var &); // copy constructor
--  ~ConstantDescription_var (void); // destructor
-+  IR_ConstantDescription_var (void); // default constructor
-+  IR_ConstantDescription_var (IR_ConstantDescription *);
-+  IR_ConstantDescription_var (const IR_ConstantDescription_var &); // copy constructor
-+  ~IR_ConstantDescription_var (void); // destructor
-   
--  ConstantDescription_var &operator= (ConstantDescription *);
--  ConstantDescription_var &operator= (const ConstantDescription_var &);
--  ConstantDescription *operator-> (void);
--  const ConstantDescription *operator-> (void) const;
-+  IR_ConstantDescription_var &operator= (IR_ConstantDescription *);
-+  IR_ConstantDescription_var &operator= (const IR_ConstantDescription_var &);
-+  IR_ConstantDescription *operator-> (void);
-+  const IR_ConstantDescription *operator-> (void) const;
-   
--  operator const ConstantDescription &() const;
--  operator ConstantDescription &();
--  operator ConstantDescription &() const;
--  operator ConstantDescription *&(); // variable-size types only
-+  operator const IR_ConstantDescription &() const;
-+  operator IR_ConstantDescription &();
-+  operator IR_ConstantDescription &() const;
-+  operator IR_ConstantDescription *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const ConstantDescription &in (void) const;
--  ConstantDescription &inout (void);
--  ConstantDescription *&out (void);
--  ConstantDescription *_retn (void);
--  ConstantDescription *ptr (void) const;
-+  const IR_ConstantDescription &in (void) const;
-+  IR_ConstantDescription &inout (void);
-+  IR_ConstantDescription *&out (void);
-+  IR_ConstantDescription *_retn (void);
-+  IR_ConstantDescription *ptr (void) const;
- 
- private:
--  ConstantDescription *ptr_;
-+  IR_ConstantDescription *ptr_;
- };
- 
--class TAO_IFR_Client_Export ConstantDescription_out
-+class TAO_IFR_Client_Export IR_ConstantDescription_out
- {
- public:
--  ConstantDescription_out (ConstantDescription *&);
--  ConstantDescription_out (ConstantDescription_var &);
--  ConstantDescription_out (const ConstantDescription_out &);
--  ConstantDescription_out &operator= (const ConstantDescription_out &);
--  ConstantDescription_out &operator= (ConstantDescription *);
--  operator ConstantDescription *&();
--  ConstantDescription *&ptr (void);
--  ConstantDescription *operator-> (void);
-+  IR_ConstantDescription_out (IR_ConstantDescription *&);
-+  IR_ConstantDescription_out (IR_ConstantDescription_var &);
-+  IR_ConstantDescription_out (const IR_ConstantDescription_out &);
-+  IR_ConstantDescription_out &operator= (const IR_ConstantDescription_out &);
-+  IR_ConstantDescription_out &operator= (IR_ConstantDescription *);
-+  operator IR_ConstantDescription *&();
-+  IR_ConstantDescription *&ptr (void);
-+  IR_ConstantDescription *operator-> (void);
-   
- private:
--  ConstantDescription *&ptr_;
-+  IR_ConstantDescription *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ConstantDescription_var &);
-+  void operator= (const IR_ConstantDescription_var &);
- };
- 
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConstantDescription;
--
--
--#if !defined (_IR_TYPEDEFDEF___PTR_CH_)
--#define _IR_TYPEDEFDEF___PTR_CH_
--
--class TypedefDef;
--typedef TypedefDef *TypedefDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_TYPEDEFDEF___VAR_CH_)
--#define _IR_TYPEDEFDEF___VAR_CH_
--
--class TAO_IFR_Client_Export TypedefDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_TypedefDef_var : public TAO_Base_var
- {
- public:
--  TypedefDef_var (void); // default constructor
--  TypedefDef_var (TypedefDef_ptr p) : ptr_ (p) {} 
--  TypedefDef_var (const TypedefDef_var &); // copy constructor
--  ~TypedefDef_var (void); // destructor
-+  IR_TypedefDef_var (void); // default constructor
-+  IR_TypedefDef_var (IR_TypedefDef_ptr p) : ptr_ (p) {}
-+  IR_TypedefDef_var (const IR_TypedefDef_var &); // copy constructor
-+  ~IR_TypedefDef_var (void); // destructor
-   
--  TypedefDef_var &operator= (TypedefDef_ptr);
--  TypedefDef_var &operator= (const TypedefDef_var &);
--  TypedefDef_ptr operator-> (void) const;
-+  IR_TypedefDef_var &operator= (IR_TypedefDef_ptr);
-+  IR_TypedefDef_var &operator= (const IR_TypedefDef_var &);
-+  IR_TypedefDef_ptr operator-> (void) const;
-   
--  operator const TypedefDef_ptr &() const;
--  operator TypedefDef_ptr &();
-+  operator const IR_TypedefDef_ptr &() const;
-+  operator IR_TypedefDef_ptr &();
-   // in, inout, out, _retn 
--  TypedefDef_ptr in (void) const;
--  TypedefDef_ptr &inout (void);
--  TypedefDef_ptr &out (void);
--  TypedefDef_ptr _retn (void);
--  TypedefDef_ptr ptr (void) const;
-+  IR_TypedefDef_ptr in (void) const;
-+  IR_TypedefDef_ptr &inout (void);
-+  IR_TypedefDef_ptr &out (void);
-+  IR_TypedefDef_ptr _retn (void);
-+  IR_TypedefDef_ptr ptr (void) const;
- 
- private:
--  TypedefDef_ptr ptr_;
-+  IR_TypedefDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  TypedefDef_var (const TAO_Base_var &rhs);
--  TypedefDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_TypedefDef_var (const TAO_Base_var &rhs);
-+  IR_TypedefDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_TYPEDEFDEF___OUT_CH_)
--#define _IR_TYPEDEFDEF___OUT_CH_
--
--class TAO_IFR_Client_Export TypedefDef_out
-+class TAO_IFR_Client_Export IR_TypedefDef_out
- {
- public:
--  TypedefDef_out (TypedefDef_ptr &);
--  TypedefDef_out (TypedefDef_var &);
--  TypedefDef_out (const TypedefDef_out &);
--  TypedefDef_out &operator= (const TypedefDef_out &);
--  TypedefDef_out &operator= (const TypedefDef_var &);
--  TypedefDef_out &operator= (TypedefDef_ptr);
--  operator TypedefDef_ptr &();
--  TypedefDef_ptr &ptr (void);
--  TypedefDef_ptr operator-> (void);
-+  IR_TypedefDef_out (IR_TypedefDef_ptr &);
-+  IR_TypedefDef_out (IR_TypedefDef_var &);
-+  IR_TypedefDef_out (const IR_TypedefDef_out &);
-+  IR_TypedefDef_out &operator= (const IR_TypedefDef_out &);
-+  IR_TypedefDef_out &operator= (const IR_TypedefDef_var &);
-+  IR_TypedefDef_out &operator= (IR_TypedefDef_ptr);
-+  operator IR_TypedefDef_ptr &();
-+  IR_TypedefDef_ptr &ptr (void);
-+  IR_TypedefDef_ptr operator-> (void);
-   
- private:
--  TypedefDef_ptr &ptr_;
-+  IR_TypedefDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_TYPEDEFDEF_CH_)
--#define _IR_TYPEDEFDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_TypedefDef_Proxy_Impl;
- class _TAO_TypedefDef_Remote_Proxy_Impl;
- class _TAO_TypedefDef_Proxy_Broker;
- class _TAO_TypedefDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export TypedefDef: public virtual Contained, public virtual IDLType
-+class TAO_IFR_Client_Export IR_TypedefDef: public virtual IR_Contained, public virtual IR_IDLType
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef TypedefDef_ptr _ptr_type;
--  typedef TypedefDef_var _var_type;
-+  typedef IR_TypedefDef_ptr _ptr_type;
-+  typedef IR_TypedefDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static TypedefDef_ptr _duplicate (TypedefDef_ptr obj);
--  static TypedefDef_ptr _narrow (
-+  static IR_TypedefDef_ptr _duplicate (IR_TypedefDef_ptr obj);
-+  static IR_TypedefDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static TypedefDef_ptr _unchecked_narrow (
-+  static IR_TypedefDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static TypedefDef_ptr _nil (void)
-+  static IR_TypedefDef_ptr _nil (void)
-     {
--      return (TypedefDef_ptr)0;
-+      return (IR_TypedefDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -10936,14 +8987,14 @@
-   _TAO_TypedefDef_Proxy_Broker *the_TAO_TypedefDef_Proxy_Broker_;
-   
- protected:
--  TypedefDef (int collocated = 0);
-+  IR_TypedefDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_TypedefDef_setup_collocation (int collocated);
-     
--    TypedefDef (
-+  IR_TypedefDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -10953,10 +9004,10 @@
-     friend class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_TypedefDef_Direct_Proxy_Impl;
-   
--  virtual ~TypedefDef (void);
-+  virtual ~IR_TypedefDef (void);
- private:
--  TypedefDef (const TypedefDef &);
--  void operator= (const TypedefDef &);  
-+  IR_TypedefDef (const IR_TypedefDef &);
-+  void operator= (const IR_TypedefDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -10978,8 +9029,8 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Impl : 
--  public virtual IR::_TAO_Contained_Proxy_Impl, 
--  public virtual IR::_TAO_IDLType_Proxy_Impl
-+    public virtual _TAO_Contained_Proxy_Impl,
-+    public virtual _TAO_IDLType_Proxy_Impl
- {
- public:
-   virtual ~_TAO_TypedefDef_Proxy_Impl (void) { }
-@@ -10988,6 +9039,7 @@
-   _TAO_TypedefDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -11000,8 +9052,8 @@
- class TAO_IFR_Client_Export _TAO_TypedefDef_Remote_Proxy_Impl : 
-   public virtual _TAO_TypedefDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_Contained_Remote_Proxy_Impl, 
--  public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
-+  public virtual _TAO_Contained_Remote_Proxy_Impl,
-+  public virtual _TAO_IDLType_Remote_Proxy_Impl
-   
- {
- public:
-@@ -11032,7 +9084,7 @@
- public:
-   virtual ~_TAO_TypedefDef_Proxy_Broker (void);
-   virtual _TAO_TypedefDef_Proxy_Impl &select_proxy (
--    TypedefDef *object,
-+    IR_TypedefDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -11041,6 +9093,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -11058,7 +9111,7 @@
-   virtual ~_TAO_TypedefDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_TypedefDef_Proxy_Impl &select_proxy (
--    TypedefDef *object,
-+    IR_TypedefDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -11072,24 +9125,15 @@
-   static _TAO_TypedefDef_Remote_Proxy_Broker *the_TAO_TypedefDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TypedefDef;
--
--struct TypeDescription;
--class TypeDescription_var;
--
--struct TAO_IFR_Client_Export TypeDescription
-+struct TAO_IFR_Client_Export IR_TypeDescription
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef TypeDescription_var _var_type;
-+  typedef IR_TypeDescription_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
-@@ -11101,161 +9145,87 @@
-   CORBA::TypeCode_var type;
- };
- 
--class TAO_IFR_Client_Export TypeDescription_var
-+class TAO_IFR_Client_Export IR_TypeDescription_var
- {
- public:
--  TypeDescription_var (void); // default constructor
--  TypeDescription_var (TypeDescription *);
--  TypeDescription_var (const TypeDescription_var &); // copy constructor
--  ~TypeDescription_var (void); // destructor
-+  IR_TypeDescription_var (void); // default constructor
-+  IR_TypeDescription_var (IR_TypeDescription *);
-+  IR_TypeDescription_var (const IR_TypeDescription_var &); // copy constructor
-+  ~IR_TypeDescription_var (void); // destructor
-   
--  TypeDescription_var &operator= (TypeDescription *);
--  TypeDescription_var &operator= (const TypeDescription_var &);
--  TypeDescription *operator-> (void);
--  const TypeDescription *operator-> (void) const;
-+  IR_TypeDescription_var &operator= (IR_TypeDescription *);
-+  IR_TypeDescription_var &operator= (const IR_TypeDescription_var &);
-+  IR_TypeDescription *operator-> (void);
-+  const IR_TypeDescription *operator-> (void) const;
-   
--  operator const TypeDescription &() const;
--  operator TypeDescription &();
--  operator TypeDescription &() const;
--  operator TypeDescription *&(); // variable-size types only
-+  operator const IR_TypeDescription &() const;
-+  operator IR_TypeDescription &();
-+  operator IR_TypeDescription &() const;
-+  operator IR_TypeDescription *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const TypeDescription &in (void) const;
--  TypeDescription &inout (void);
--  TypeDescription *&out (void);
--  TypeDescription *_retn (void);
--  TypeDescription *ptr (void) const;
-+  const IR_TypeDescription &in (void) const;
-+  IR_TypeDescription &inout (void);
-+  IR_TypeDescription *&out (void);
-+  IR_TypeDescription *_retn (void);
-+  IR_TypeDescription *ptr (void) const;
- 
- private:
--  TypeDescription *ptr_;
-+  IR_TypeDescription *ptr_;
- };
- 
--class TAO_IFR_Client_Export TypeDescription_out
-+class TAO_IFR_Client_Export IR_TypeDescription_out
- {
- public:
--  TypeDescription_out (TypeDescription *&);
--  TypeDescription_out (TypeDescription_var &);
--  TypeDescription_out (const TypeDescription_out &);
--  TypeDescription_out &operator= (const TypeDescription_out &);
--  TypeDescription_out &operator= (TypeDescription *);
--  operator TypeDescription *&();
--  TypeDescription *&ptr (void);
--  TypeDescription *operator-> (void);
-+  IR_TypeDescription_out (IR_TypeDescription *&);
-+  IR_TypeDescription_out (IR_TypeDescription_var &);
-+  IR_TypeDescription_out (const IR_TypeDescription_out &);
-+  IR_TypeDescription_out &operator= (const IR_TypeDescription_out &);
-+  IR_TypeDescription_out &operator= (IR_TypeDescription *);
-+  operator IR_TypeDescription *&();
-+  IR_TypeDescription *&ptr (void);
-+  IR_TypeDescription *operator-> (void);
-   
- private:
--  TypeDescription *&ptr_;
-+  IR_TypeDescription *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const TypeDescription_var &);
--};
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TypeDescription;
--
--
--#if !defined (_IR_STRUCTDEF___PTR_CH_)
--#define _IR_STRUCTDEF___PTR_CH_
--
--class StructDef;
--typedef StructDef *StructDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRUCTDEF___VAR_CH_)
--#define _IR_STRUCTDEF___VAR_CH_
--
--class TAO_IFR_Client_Export StructDef_var : public TAO_Base_var
--{
--public:
--  StructDef_var (void); // default constructor
--  StructDef_var (StructDef_ptr p) : ptr_ (p) {} 
--  StructDef_var (const StructDef_var &); // copy constructor
--  ~StructDef_var (void); // destructor
--  
--  StructDef_var &operator= (StructDef_ptr);
--  StructDef_var &operator= (const StructDef_var &);
--  StructDef_ptr operator-> (void) const;
--  
--  operator const StructDef_ptr &() const;
--  operator StructDef_ptr &();
--  // in, inout, out, _retn 
--  StructDef_ptr in (void) const;
--  StructDef_ptr &inout (void);
--  StructDef_ptr &out (void);
--  StructDef_ptr _retn (void);
--  StructDef_ptr ptr (void) const;
--
--private:
--  StructDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  StructDef_var (const TAO_Base_var &rhs);
--  StructDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRUCTDEF___OUT_CH_)
--#define _IR_STRUCTDEF___OUT_CH_
--
--class TAO_IFR_Client_Export StructDef_out
--{
--public:
--  StructDef_out (StructDef_ptr &);
--  StructDef_out (StructDef_var &);
--  StructDef_out (const StructDef_out &);
--  StructDef_out &operator= (const StructDef_out &);
--  StructDef_out &operator= (const StructDef_var &);
--  StructDef_out &operator= (StructDef_ptr);
--  operator StructDef_ptr &();
--  StructDef_ptr &ptr (void);
--  StructDef_ptr operator-> (void);
--  
--private:
--  StructDef_ptr &ptr_;
-+  void operator= (const IR_TypeDescription_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRUCTDEF_CH_)
--#define _IR_STRUCTDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_StructDef_Proxy_Impl;
- class _TAO_StructDef_Remote_Proxy_Impl;
- class _TAO_StructDef_Proxy_Broker;
- class _TAO_StructDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export StructDef: public virtual TypedefDef, public virtual Container
-+class TAO_IFR_Client_Export IR_StructDef: public virtual IR_TypedefDef, public virtual IR_Container
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef StructDef_ptr _ptr_type;
--  typedef StructDef_var _var_type;
-+  typedef IR_StructDef_ptr _ptr_type;
-+  typedef IR_StructDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static StructDef_ptr _duplicate (StructDef_ptr obj);
--  static StructDef_ptr _narrow (
-+  static IR_StructDef_ptr _duplicate (IR_StructDef_ptr obj);
-+  static IR_StructDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static StructDef_ptr _unchecked_narrow (
-+  static IR_StructDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static StructDef_ptr _nil (void)
-+  static IR_StructDef_ptr _nil (void)
-     {
--      return (StructDef_ptr)0;
-+      return (IR_StructDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
- 
--  virtual IR::StructMemberSeq * members (
-+  virtual IR_StructMemberSeq * members   (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -11264,7 +9234,7 @@
-     ));
- 
-   virtual void members (
--      const IR::StructMemberSeq & members,
-+            const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -11285,14 +9255,14 @@
-   _TAO_StructDef_Proxy_Broker *the_TAO_StructDef_Proxy_Broker_;
-   
- protected:
--  StructDef (int collocated = 0);
-+  IR_StructDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_StructDef_setup_collocation (int collocated);
-     
--    StructDef (
-+  IR_StructDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -11302,10 +9272,10 @@
-     friend class _TAO_StructDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_StructDef_Direct_Proxy_Impl;
-   
--  virtual ~StructDef (void);
-+  virtual ~IR_StructDef (void);
- private:
--  StructDef (const StructDef &);
--  void operator= (const StructDef &);  
-+  IR_StructDef (const IR_StructDef &);
-+  void operator= (const IR_StructDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -11315,7 +9285,7 @@
-   class TAO_ClientRequestInfo_IR_StructDef_members_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::StructDef;
-+    friend class IR_StructDef;
-     
-     friend class _TAO_StructDef_Remote_Proxy_Impl;
-     friend class _TAO_StructDef_ThruPOA_Proxy_Impl;
-@@ -11349,15 +9319,15 @@
- private:
-   TAO_ClientRequestInfo_IR_StructDef_members_get (const TAO_ClientRequestInfo_IR_StructDef_members_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_StructDef_members_get &);
--  void result (IR::StructMemberSeq * result);
-+    void result (IR_StructMemberSeq * result);
-   // update the result 
--  IR::StructMemberSeq * _result;
-+    IR_StructMemberSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_StructDef_members_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::StructDef;
-+    friend class IR_StructDef;
-   
-   friend class _TAO_StructDef_Remote_Proxy_Impl;
-   friend class _TAO_StructDef_ThruPOA_Proxy_Impl;
-@@ -11366,7 +9336,7 @@
- TAO_ClientRequestInfo_IR_StructDef_members_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -11392,7 +9362,7 @@
- private:
-   TAO_ClientRequestInfo_IR_StructDef_members_set (const TAO_ClientRequestInfo_IR_StructDef_members_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_StructDef_members_set &);
--  const IR::StructMemberSeq & members_;
-+    const IR_StructMemberSeq & members_;
-   
- };
- 
-@@ -11411,13 +9381,13 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_StructDef_Proxy_Impl : 
--  public virtual IR::_TAO_TypedefDef_Proxy_Impl, 
--  public virtual IR::_TAO_Container_Proxy_Impl
-+  public virtual _TAO_TypedefDef_Proxy_Impl,
-+  public virtual _TAO_Container_Proxy_Impl
- {
- public:
-   virtual ~_TAO_StructDef_Proxy_Impl (void) { }
-   
--    virtual IR::StructMemberSeq * members (
-+  virtual IR_StructMemberSeq * members (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -11427,7 +9397,7 @@
- 
-   virtual void members (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::StructMemberSeq & members,
-+      const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -11438,6 +9408,7 @@
-   _TAO_StructDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -11450,8 +9421,8 @@
- class TAO_IFR_Client_Export _TAO_StructDef_Remote_Proxy_Impl : 
-   public virtual _TAO_StructDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_TypedefDef_Remote_Proxy_Impl, 
--  public virtual IR::_TAO_Container_Remote_Proxy_Impl
-+  public virtual _TAO_TypedefDef_Remote_Proxy_Impl,
-+  public virtual _TAO_Container_Remote_Proxy_Impl
-   
- {
- public:
-@@ -11459,7 +9430,7 @@
-   
-   virtual ~_TAO_StructDef_Remote_Proxy_Impl (void) { }
-   
--    virtual IR::StructMemberSeq * members (
-+  virtual IR_StructMemberSeq * members (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -11469,7 +9440,7 @@
- 
-   virtual void members (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::StructMemberSeq & members,
-+      const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -11498,8 +9469,9 @@
- {
- public:
-   virtual ~_TAO_StructDef_Proxy_Broker (void);
-+
-   virtual _TAO_StructDef_Proxy_Impl &select_proxy (
--    StructDef *object,
-+    IR_StructDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -11508,6 +9480,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -11525,7 +9498,7 @@
-   virtual ~_TAO_StructDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_StructDef_Proxy_Impl &select_proxy (
--    StructDef *object,
-+    IR_StructDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -11539,117 +9512,39 @@
-   static _TAO_StructDef_Remote_Proxy_Broker *the_TAO_StructDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StructDef;
--
--
--#if !defined (_IR_UNIONDEF___PTR_CH_)
--#define _IR_UNIONDEF___PTR_CH_
--
--class UnionDef;
--typedef UnionDef *UnionDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_UNIONDEF___VAR_CH_)
--#define _IR_UNIONDEF___VAR_CH_
--
--class TAO_IFR_Client_Export UnionDef_var : public TAO_Base_var
--{
--public:
--  UnionDef_var (void); // default constructor
--  UnionDef_var (UnionDef_ptr p) : ptr_ (p) {} 
--  UnionDef_var (const UnionDef_var &); // copy constructor
--  ~UnionDef_var (void); // destructor
--  
--  UnionDef_var &operator= (UnionDef_ptr);
--  UnionDef_var &operator= (const UnionDef_var &);
--  UnionDef_ptr operator-> (void) const;
--  
--  operator const UnionDef_ptr &() const;
--  operator UnionDef_ptr &();
--  // in, inout, out, _retn 
--  UnionDef_ptr in (void) const;
--  UnionDef_ptr &inout (void);
--  UnionDef_ptr &out (void);
--  UnionDef_ptr _retn (void);
--  UnionDef_ptr ptr (void) const;
--
--private:
--  UnionDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  UnionDef_var (const TAO_Base_var &rhs);
--  UnionDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_UNIONDEF___OUT_CH_)
--#define _IR_UNIONDEF___OUT_CH_
--
--class TAO_IFR_Client_Export UnionDef_out
--{
--public:
--  UnionDef_out (UnionDef_ptr &);
--  UnionDef_out (UnionDef_var &);
--  UnionDef_out (const UnionDef_out &);
--  UnionDef_out &operator= (const UnionDef_out &);
--  UnionDef_out &operator= (const UnionDef_var &);
--  UnionDef_out &operator= (UnionDef_ptr);
--  operator UnionDef_ptr &();
--  UnionDef_ptr &ptr (void);
--  UnionDef_ptr operator-> (void);
--  
--private:
--  UnionDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_UNIONDEF_CH_)
--#define _IR_UNIONDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_UnionDef_Proxy_Impl;
- class _TAO_UnionDef_Remote_Proxy_Impl;
- class _TAO_UnionDef_Proxy_Broker;
- class _TAO_UnionDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export UnionDef: public virtual TypedefDef, public virtual Container
-+class TAO_IFR_Client_Export IR_UnionDef: public virtual IR_TypedefDef, public virtual IR_Container
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef UnionDef_ptr _ptr_type;
--  typedef UnionDef_var _var_type;
-+  typedef IR_UnionDef_ptr _ptr_type;
-+  typedef IR_UnionDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static UnionDef_ptr _duplicate (UnionDef_ptr obj);
--  static UnionDef_ptr _narrow (
-+  static IR_UnionDef_ptr _duplicate (IR_UnionDef_ptr obj);
-+  static IR_UnionDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static UnionDef_ptr _unchecked_narrow (
-+  static IR_UnionDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static UnionDef_ptr _nil (void)
-+  static IR_UnionDef_ptr _nil (void)
-     {
--      return (UnionDef_ptr)0;
-+      return (IR_UnionDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -11662,7 +9557,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr discriminator_type_def (
-+  virtual IR_IDLType_ptr discriminator_type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -11671,7 +9566,7 @@
-     ));
- 
-   virtual void discriminator_type_def (
--      IR::IDLType_ptr discriminator_type_def,
-+      IR_IDLType_ptr discriminator_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -11679,7 +9574,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::UnionMemberSeq * members (
-+  virtual IR_UnionMemberSeq * members (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -11688,7 +9583,7 @@
-     ));
- 
-   virtual void members (
--      const IR::UnionMemberSeq & members,
-+      const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -11709,14 +9604,14 @@
-   _TAO_UnionDef_Proxy_Broker *the_TAO_UnionDef_Proxy_Broker_;
-   
- protected:
--  UnionDef (int collocated = 0);
-+  IR_UnionDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_UnionDef_setup_collocation (int collocated);
-     
--    UnionDef (
-+  IR_UnionDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -11726,10 +9621,10 @@
-     friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_UnionDef_Direct_Proxy_Impl;
-   
--  virtual ~UnionDef (void);
-+  virtual ~IR_UnionDef (void);
- private:
--  UnionDef (const UnionDef &);
--  void operator= (const UnionDef &);  
-+ IR_UnionDef (const IR_UnionDef &);
-+  void operator= (const IR_UnionDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -11739,7 +9634,7 @@
-   class TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::UnionDef;
-+    friend class IR_UnionDef;
-     
-     friend class _TAO_UnionDef_Remote_Proxy_Impl;
-     friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
-@@ -11781,7 +9676,7 @@
- class TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::UnionDef;
-+    friend class IR_UnionDef;
-   
-   friend class _TAO_UnionDef_Remote_Proxy_Impl;
-   friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
-@@ -11815,15 +9710,15 @@
- private:
-   TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get (const TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get &);
--  void result (IR::IDLType_ptr result);
-+    void result (IR_IDLType_ptr result);
-   // update the result 
--  IR::IDLType_ptr _result;
-+    IR_IDLType_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::UnionDef;
-+    friend class IR_UnionDef;
-   
-   friend class _TAO_UnionDef_Remote_Proxy_Impl;
-   friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
-@@ -11832,7 +9727,7 @@
- TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr discriminator_type_def,
-+        IR_IDLType_ptr discriminator_type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -11858,14 +9753,14 @@
- private:
-   TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set (const TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set &);
--  IR::IDLType_ptr discriminator_type_def_;
-+    IR_IDLType_ptr discriminator_type_def_;
-   
- };
- 
- class TAO_ClientRequestInfo_IR_UnionDef_members_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::UnionDef;
-+    friend class IR_UnionDef;
-   
-   friend class _TAO_UnionDef_Remote_Proxy_Impl;
-   friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
-@@ -11899,15 +9794,15 @@
- private:
-   TAO_ClientRequestInfo_IR_UnionDef_members_get (const TAO_ClientRequestInfo_IR_UnionDef_members_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_UnionDef_members_get &);
--  void result (IR::UnionMemberSeq * result);
-+    void result (IR_UnionMemberSeq * result);
-   // update the result 
--  IR::UnionMemberSeq * _result;
-+    IR_UnionMemberSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_UnionDef_members_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::UnionDef;
-+    friend class IR_UnionDef;
-   
-   friend class _TAO_UnionDef_Remote_Proxy_Impl;
-   friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
-@@ -11916,7 +9811,7 @@
- TAO_ClientRequestInfo_IR_UnionDef_members_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::UnionMemberSeq & members,
-+        const IR_UnionMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -11942,7 +9837,7 @@
- private:
-   TAO_ClientRequestInfo_IR_UnionDef_members_set (const TAO_ClientRequestInfo_IR_UnionDef_members_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_UnionDef_members_set &);
--  const IR::UnionMemberSeq & members_;
-+    const IR_UnionMemberSeq & members_;
-   
- };
- 
-@@ -11961,8 +9856,8 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_UnionDef_Proxy_Impl : 
--  public virtual IR::_TAO_TypedefDef_Proxy_Impl, 
--  public virtual IR::_TAO_Container_Proxy_Impl
-+  public virtual _TAO_TypedefDef_Proxy_Impl,
-+  public virtual _TAO_Container_Proxy_Impl
- {
- public:
-   virtual ~_TAO_UnionDef_Proxy_Impl (void) { }
-@@ -11975,7 +9870,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::IDLType_ptr discriminator_type_def (
-+  virtual IR_IDLType_ptr discriminator_type_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -11985,14 +9880,14 @@
- 
-   virtual void discriminator_type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr discriminator_type_def,
-+      IR_IDLType_ptr discriminator_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::UnionMemberSeq * members (
-+  virtual IR_UnionMemberSeq * members (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -12002,7 +9897,7 @@
- 
-   virtual void members (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::UnionMemberSeq & members,
-+      const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -12013,6 +9908,7 @@
-   _TAO_UnionDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -12025,8 +9921,8 @@
- class TAO_IFR_Client_Export _TAO_UnionDef_Remote_Proxy_Impl : 
-   public virtual _TAO_UnionDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_TypedefDef_Remote_Proxy_Impl, 
--  public virtual IR::_TAO_Container_Remote_Proxy_Impl
-+  public virtual _TAO_TypedefDef_Remote_Proxy_Impl,
-+  public virtual _TAO_Container_Remote_Proxy_Impl
-   
- {
- public:
-@@ -12042,7 +9938,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr discriminator_type_def (
-+  virtual IR_IDLType_ptr discriminator_type_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -12052,14 +9948,14 @@
- 
-   virtual void discriminator_type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr discriminator_type_def,
-+      IR_IDLType_ptr discriminator_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::UnionMemberSeq * members (
-+  virtual IR_UnionMemberSeq * members (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -12069,7 +9965,7 @@
- 
-   virtual void members (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::UnionMemberSeq & members,
-+      const IR_UnionMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -12098,8 +9994,9 @@
- {
- public:
-   virtual ~_TAO_UnionDef_Proxy_Broker (void);
-+
-   virtual _TAO_UnionDef_Proxy_Impl &select_proxy (
--    UnionDef *object,
-+    IR_UnionDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -12108,6 +10005,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -12125,7 +10023,7 @@
-   virtual ~_TAO_UnionDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_UnionDef_Proxy_Impl &select_proxy (
--    UnionDef *object,
-+    IR_UnionDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -12139,122 +10037,44 @@
-   static _TAO_UnionDef_Remote_Proxy_Broker *the_TAO_UnionDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UnionDef;
--
--
--#if !defined (_IR_ENUMDEF___PTR_CH_)
--#define _IR_ENUMDEF___PTR_CH_
--
--class EnumDef;
--typedef EnumDef *EnumDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ENUMDEF___VAR_CH_)
--#define _IR_ENUMDEF___VAR_CH_
--
--class TAO_IFR_Client_Export EnumDef_var : public TAO_Base_var
--{
--public:
--  EnumDef_var (void); // default constructor
--  EnumDef_var (EnumDef_ptr p) : ptr_ (p) {} 
--  EnumDef_var (const EnumDef_var &); // copy constructor
--  ~EnumDef_var (void); // destructor
--  
--  EnumDef_var &operator= (EnumDef_ptr);
--  EnumDef_var &operator= (const EnumDef_var &);
--  EnumDef_ptr operator-> (void) const;
--  
--  operator const EnumDef_ptr &() const;
--  operator EnumDef_ptr &();
--  // in, inout, out, _retn 
--  EnumDef_ptr in (void) const;
--  EnumDef_ptr &inout (void);
--  EnumDef_ptr &out (void);
--  EnumDef_ptr _retn (void);
--  EnumDef_ptr ptr (void) const;
--
--private:
--  EnumDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  EnumDef_var (const TAO_Base_var &rhs);
--  EnumDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ENUMDEF___OUT_CH_)
--#define _IR_ENUMDEF___OUT_CH_
--
--class TAO_IFR_Client_Export EnumDef_out
--{
--public:
--  EnumDef_out (EnumDef_ptr &);
--  EnumDef_out (EnumDef_var &);
--  EnumDef_out (const EnumDef_out &);
--  EnumDef_out &operator= (const EnumDef_out &);
--  EnumDef_out &operator= (const EnumDef_var &);
--  EnumDef_out &operator= (EnumDef_ptr);
--  operator EnumDef_ptr &();
--  EnumDef_ptr &ptr (void);
--  EnumDef_ptr operator-> (void);
--  
--private:
--  EnumDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ENUMDEF_CH_)
--#define _IR_ENUMDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_EnumDef_Proxy_Impl;
- class _TAO_EnumDef_Remote_Proxy_Impl;
- class _TAO_EnumDef_Proxy_Broker;
- class _TAO_EnumDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export EnumDef: public virtual TypedefDef
-+class TAO_IFR_Client_Export IR_EnumDef: public virtual IR_TypedefDef
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef EnumDef_ptr _ptr_type;
--  typedef EnumDef_var _var_type;
-+  typedef IR_EnumDef_ptr _ptr_type;
-+  typedef IR_EnumDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static EnumDef_ptr _duplicate (EnumDef_ptr obj);
--  static EnumDef_ptr _narrow (
-+  static IR_EnumDef_ptr _duplicate (IR_EnumDef_ptr obj);
-+  static IR_EnumDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static EnumDef_ptr _unchecked_narrow (
-+  static IR_EnumDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static EnumDef_ptr _nil (void)
-+  static IR_EnumDef_ptr _nil (void)
-     {
--      return (EnumDef_ptr)0;
-+      return (IR_EnumDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
- 
--  virtual IR::EnumMemberSeq * members (
-+  virtual IR_EnumMemberSeq * members (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -12263,7 +10083,7 @@
-     ));
- 
-   virtual void members (
--      const IR::EnumMemberSeq & members,
-+      const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -12284,14 +10104,14 @@
-   _TAO_EnumDef_Proxy_Broker *the_TAO_EnumDef_Proxy_Broker_;
-   
- protected:
--  EnumDef (int collocated = 0);
-+  IR_EnumDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_EnumDef_setup_collocation (int collocated);
-     
--    EnumDef (
-+  IR_EnumDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -12301,10 +10121,10 @@
-     friend class _TAO_EnumDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_EnumDef_Direct_Proxy_Impl;
-   
--  virtual ~EnumDef (void);
-+  virtual ~IR_EnumDef (void);
- private:
--  EnumDef (const EnumDef &);
--  void operator= (const EnumDef &);  
-+  IR_EnumDef (const IR_EnumDef &);
-+  void operator= (const IR_EnumDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -12314,7 +10134,7 @@
-   class TAO_ClientRequestInfo_IR_EnumDef_members_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::EnumDef;
-+    friend class IR_EnumDef;
-     
-     friend class _TAO_EnumDef_Remote_Proxy_Impl;
-     friend class _TAO_EnumDef_ThruPOA_Proxy_Impl;
-@@ -12348,15 +10168,15 @@
- private:
-   TAO_ClientRequestInfo_IR_EnumDef_members_get (const TAO_ClientRequestInfo_IR_EnumDef_members_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_EnumDef_members_get &);
--  void result (IR::EnumMemberSeq * result);
-+    void result (IR_EnumMemberSeq * result);
-   // update the result 
--  IR::EnumMemberSeq * _result;
-+    IR_EnumMemberSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_EnumDef_members_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::EnumDef;
-+    friend class IR_EnumDef;
-   
-   friend class _TAO_EnumDef_Remote_Proxy_Impl;
-   friend class _TAO_EnumDef_ThruPOA_Proxy_Impl;
-@@ -12365,7 +10185,7 @@
- TAO_ClientRequestInfo_IR_EnumDef_members_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -12391,7 +10211,7 @@
- private:
-   TAO_ClientRequestInfo_IR_EnumDef_members_set (const TAO_ClientRequestInfo_IR_EnumDef_members_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_EnumDef_members_set &);
--  const IR::EnumMemberSeq & members_;
-+    const IR_EnumMemberSeq & members_;
-   
- };
- 
-@@ -12410,12 +10230,12 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_EnumDef_Proxy_Impl : 
--  public virtual IR::_TAO_TypedefDef_Proxy_Impl
-+  public virtual _TAO_TypedefDef_Proxy_Impl
- {
- public:
-   virtual ~_TAO_EnumDef_Proxy_Impl (void) { }
-   
--    virtual IR::EnumMemberSeq * members (
-+  virtual IR_EnumMemberSeq * members (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -12425,7 +10245,7 @@
- 
-   virtual void members (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::EnumMemberSeq & members,
-+      const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -12436,6 +10256,7 @@
-   _TAO_EnumDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -12448,7 +10269,7 @@
- class TAO_IFR_Client_Export _TAO_EnumDef_Remote_Proxy_Impl : 
-   public virtual _TAO_EnumDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_TypedefDef_Remote_Proxy_Impl
-+  public virtual _TAO_TypedefDef_Remote_Proxy_Impl
-   
- {
- public:
-@@ -12456,7 +10277,7 @@
-   
-   virtual ~_TAO_EnumDef_Remote_Proxy_Impl (void) { }
-   
--    virtual IR::EnumMemberSeq * members (
-+  virtual IR_EnumMemberSeq * members (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -12466,7 +10287,7 @@
- 
-   virtual void members (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::EnumMemberSeq & members,
-+      const IR_EnumMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -12495,8 +10316,9 @@
- {
- public:
-   virtual ~_TAO_EnumDef_Proxy_Broker (void);
-+
-   virtual _TAO_EnumDef_Proxy_Impl &select_proxy (
--    EnumDef *object,
-+    IR_EnumDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -12505,6 +10327,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -12522,7 +10345,7 @@
-   virtual ~_TAO_EnumDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_EnumDef_Proxy_Impl &select_proxy (
--    EnumDef *object,
-+    IR_EnumDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -12536,122 +10359,44 @@
-   static _TAO_EnumDef_Remote_Proxy_Broker *the_TAO_EnumDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnumDef;
--
--
--#if !defined (_IR_ALIASDEF___PTR_CH_)
--#define _IR_ALIASDEF___PTR_CH_
--
--class AliasDef;
--typedef AliasDef *AliasDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ALIASDEF___VAR_CH_)
--#define _IR_ALIASDEF___VAR_CH_
--
--class TAO_IFR_Client_Export AliasDef_var : public TAO_Base_var
--{
--public:
--  AliasDef_var (void); // default constructor
--  AliasDef_var (AliasDef_ptr p) : ptr_ (p) {} 
--  AliasDef_var (const AliasDef_var &); // copy constructor
--  ~AliasDef_var (void); // destructor
--  
--  AliasDef_var &operator= (AliasDef_ptr);
--  AliasDef_var &operator= (const AliasDef_var &);
--  AliasDef_ptr operator-> (void) const;
--  
--  operator const AliasDef_ptr &() const;
--  operator AliasDef_ptr &();
--  // in, inout, out, _retn 
--  AliasDef_ptr in (void) const;
--  AliasDef_ptr &inout (void);
--  AliasDef_ptr &out (void);
--  AliasDef_ptr _retn (void);
--  AliasDef_ptr ptr (void) const;
--
--private:
--  AliasDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  AliasDef_var (const TAO_Base_var &rhs);
--  AliasDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ALIASDEF___OUT_CH_)
--#define _IR_ALIASDEF___OUT_CH_
--
--class TAO_IFR_Client_Export AliasDef_out
--{
--public:
--  AliasDef_out (AliasDef_ptr &);
--  AliasDef_out (AliasDef_var &);
--  AliasDef_out (const AliasDef_out &);
--  AliasDef_out &operator= (const AliasDef_out &);
--  AliasDef_out &operator= (const AliasDef_var &);
--  AliasDef_out &operator= (AliasDef_ptr);
--  operator AliasDef_ptr &();
--  AliasDef_ptr &ptr (void);
--  AliasDef_ptr operator-> (void);
--  
--private:
--  AliasDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ALIASDEF_CH_)
--#define _IR_ALIASDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_AliasDef_Proxy_Impl;
- class _TAO_AliasDef_Remote_Proxy_Impl;
- class _TAO_AliasDef_Proxy_Broker;
- class _TAO_AliasDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export AliasDef: public virtual TypedefDef
-+class TAO_IFR_Client_Export IR_AliasDef: public virtual IR_TypedefDef
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef AliasDef_ptr _ptr_type;
--  typedef AliasDef_var _var_type;
-+  typedef IR_AliasDef_ptr _ptr_type;
-+  typedef IR_AliasDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static AliasDef_ptr _duplicate (AliasDef_ptr obj);
--  static AliasDef_ptr _narrow (
-+  static IR_AliasDef_ptr _duplicate (IR_AliasDef_ptr obj);
-+  static IR_AliasDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static AliasDef_ptr _unchecked_narrow (
-+  static IR_AliasDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static AliasDef_ptr _nil (void)
-+  static IR_AliasDef_ptr _nil (void)
-     {
--      return (AliasDef_ptr)0;
-+      return (IR_AliasDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
- 
--  virtual IR::IDLType_ptr original_type_def (
-+  virtual IR_IDLType_ptr original_type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -12660,7 +10405,7 @@
-     ));
- 
-   virtual void original_type_def (
--      IR::IDLType_ptr original_type_def,
-+      IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -12681,14 +10426,14 @@
-   _TAO_AliasDef_Proxy_Broker *the_TAO_AliasDef_Proxy_Broker_;
-   
- protected:
--  AliasDef (int collocated = 0);
-+  IR_AliasDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_AliasDef_setup_collocation (int collocated);
-     
--    AliasDef (
-+  IR_AliasDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -12698,10 +10443,10 @@
-     friend class _TAO_AliasDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_AliasDef_Direct_Proxy_Impl;
-   
--  virtual ~AliasDef (void);
-+  virtual ~IR_AliasDef (void);
- private:
--  AliasDef (const AliasDef &);
--  void operator= (const AliasDef &);  
-+  IR_AliasDef (const IR_AliasDef &);
-+  void operator= (const IR_AliasDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -12711,7 +10456,7 @@
-   class TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::AliasDef;
-+    friend class IR_AliasDef;
-     
-     friend class _TAO_AliasDef_Remote_Proxy_Impl;
-     friend class _TAO_AliasDef_ThruPOA_Proxy_Impl;
-@@ -12745,15 +10490,15 @@
- private:
-   TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get (const TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get &);
--  void result (IR::IDLType_ptr result);
-+    void result (IR_IDLType_ptr result);
-   // update the result 
--  IR::IDLType_ptr _result;
-+    IR_IDLType_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::AliasDef;
-+    friend class IR_AliasDef;
-   
-   friend class _TAO_AliasDef_Remote_Proxy_Impl;
-   friend class _TAO_AliasDef_ThruPOA_Proxy_Impl;
-@@ -12762,7 +10507,7 @@
- TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -12788,7 +10533,7 @@
- private:
-   TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set (const TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set &);
--  IR::IDLType_ptr original_type_def_;
-+    IR_IDLType_ptr original_type_def_;
-   
- };
- 
-@@ -12807,12 +10552,12 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_AliasDef_Proxy_Impl : 
--  public virtual IR::_TAO_TypedefDef_Proxy_Impl
-+  public virtual _TAO_TypedefDef_Proxy_Impl
- {
- public:
-   virtual ~_TAO_AliasDef_Proxy_Impl (void) { }
-   
--    virtual IR::IDLType_ptr original_type_def (
-+  virtual IR_IDLType_ptr original_type_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -12822,7 +10567,7 @@
- 
-   virtual void original_type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr original_type_def,
-+      IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -12833,6 +10578,7 @@
-   _TAO_AliasDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -12845,7 +10591,7 @@
- class TAO_IFR_Client_Export _TAO_AliasDef_Remote_Proxy_Impl : 
-   public virtual _TAO_AliasDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_TypedefDef_Remote_Proxy_Impl
-+  public virtual _TAO_TypedefDef_Remote_Proxy_Impl
-   
- {
- public:
-@@ -12853,7 +10599,7 @@
-   
-   virtual ~_TAO_AliasDef_Remote_Proxy_Impl (void) { }
-   
--    virtual IR::IDLType_ptr original_type_def (
-+  virtual IR_IDLType_ptr original_type_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -12863,7 +10609,7 @@
- 
-   virtual void original_type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr original_type_def,
-+      IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -12892,8 +10638,9 @@
- {
- public:
-   virtual ~_TAO_AliasDef_Proxy_Broker (void);
-+
-   virtual _TAO_AliasDef_Proxy_Impl &select_proxy (
--    AliasDef *object,
-+    IR_AliasDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -12902,6 +10649,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -12919,7 +10667,7 @@
-   virtual ~_TAO_AliasDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_AliasDef_Proxy_Impl &select_proxy (
--    AliasDef *object,
-+    IR_AliasDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -12933,117 +10681,39 @@
-   static _TAO_AliasDef_Remote_Proxy_Broker *the_TAO_AliasDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AliasDef;
--
--
--#if !defined (_IR_NATIVEDEF___PTR_CH_)
--#define _IR_NATIVEDEF___PTR_CH_
--
--class NativeDef;
--typedef NativeDef *NativeDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_NATIVEDEF___VAR_CH_)
--#define _IR_NATIVEDEF___VAR_CH_
--
--class TAO_IFR_Client_Export NativeDef_var : public TAO_Base_var
--{
--public:
--  NativeDef_var (void); // default constructor
--  NativeDef_var (NativeDef_ptr p) : ptr_ (p) {} 
--  NativeDef_var (const NativeDef_var &); // copy constructor
--  ~NativeDef_var (void); // destructor
--  
--  NativeDef_var &operator= (NativeDef_ptr);
--  NativeDef_var &operator= (const NativeDef_var &);
--  NativeDef_ptr operator-> (void) const;
--  
--  operator const NativeDef_ptr &() const;
--  operator NativeDef_ptr &();
--  // in, inout, out, _retn 
--  NativeDef_ptr in (void) const;
--  NativeDef_ptr &inout (void);
--  NativeDef_ptr &out (void);
--  NativeDef_ptr _retn (void);
--  NativeDef_ptr ptr (void) const;
--
--private:
--  NativeDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  NativeDef_var (const TAO_Base_var &rhs);
--  NativeDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_NATIVEDEF___OUT_CH_)
--#define _IR_NATIVEDEF___OUT_CH_
--
--class TAO_IFR_Client_Export NativeDef_out
--{
--public:
--  NativeDef_out (NativeDef_ptr &);
--  NativeDef_out (NativeDef_var &);
--  NativeDef_out (const NativeDef_out &);
--  NativeDef_out &operator= (const NativeDef_out &);
--  NativeDef_out &operator= (const NativeDef_var &);
--  NativeDef_out &operator= (NativeDef_ptr);
--  operator NativeDef_ptr &();
--  NativeDef_ptr &ptr (void);
--  NativeDef_ptr operator-> (void);
--  
--private:
--  NativeDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_NATIVEDEF_CH_)
--#define _IR_NATIVEDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_NativeDef_Proxy_Impl;
- class _TAO_NativeDef_Remote_Proxy_Impl;
- class _TAO_NativeDef_Proxy_Broker;
- class _TAO_NativeDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export NativeDef: public virtual TypedefDef
-+class TAO_IFR_Client_Export IR_NativeDef: public virtual IR_TypedefDef
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef NativeDef_ptr _ptr_type;
--  typedef NativeDef_var _var_type;
-+  typedef IR_NativeDef_ptr _ptr_type;
-+  typedef IR_NativeDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static NativeDef_ptr _duplicate (NativeDef_ptr obj);
--  static NativeDef_ptr _narrow (
-+  static IR_NativeDef_ptr _duplicate (IR_NativeDef_ptr obj);
-+  static IR_NativeDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static NativeDef_ptr _unchecked_narrow (
-+  static IR_NativeDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static NativeDef_ptr _nil (void)
-+  static IR_NativeDef_ptr _nil (void)
-     {
--      return (NativeDef_ptr)0;
-+      return (IR_NativeDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -13061,14 +10731,14 @@
-   _TAO_NativeDef_Proxy_Broker *the_TAO_NativeDef_Proxy_Broker_;
-   
- protected:
--  NativeDef (int collocated = 0);
-+  IR_NativeDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_NativeDef_setup_collocation (int collocated);
-     
--    NativeDef (
-+  IR_NativeDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -13078,10 +10748,10 @@
-     friend class _TAO_NativeDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_NativeDef_Direct_Proxy_Impl;
-   
--  virtual ~NativeDef (void);
-+  virtual ~IR_NativeDef (void);
- private:
--  NativeDef (const NativeDef &);
--  void operator= (const NativeDef &);  
-+  IR_NativeDef (const IR_NativeDef &);
-+  void operator= (const IR_NativeDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -13103,7 +10773,7 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Impl : 
--  public virtual IR::_TAO_TypedefDef_Proxy_Impl
-+  public virtual _TAO_TypedefDef_Proxy_Impl
- {
- public:
-   virtual ~_TAO_NativeDef_Proxy_Impl (void) { }
-@@ -13112,6 +10782,7 @@
-   _TAO_NativeDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -13124,7 +10795,7 @@
- class TAO_IFR_Client_Export _TAO_NativeDef_Remote_Proxy_Impl : 
-   public virtual _TAO_NativeDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_TypedefDef_Remote_Proxy_Impl
-+  public virtual _TAO_TypedefDef_Remote_Proxy_Impl
-   
- {
- public:
-@@ -13154,8 +10825,9 @@
- {
- public:
-   virtual ~_TAO_NativeDef_Proxy_Broker (void);
-+
-   virtual _TAO_NativeDef_Proxy_Impl &select_proxy (
--    NativeDef *object,
-+    IR_NativeDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -13164,6 +10836,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -13181,7 +10854,7 @@
-   virtual ~_TAO_NativeDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_NativeDef_Proxy_Impl &select_proxy (
--    NativeDef *object,
-+    IR_NativeDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -13195,122 +10868,44 @@
-   static _TAO_NativeDef_Remote_Proxy_Broker *the_TAO_NativeDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NativeDef;
--
--
--#if !defined (_IR_PRIMITIVEDEF___PTR_CH_)
--#define _IR_PRIMITIVEDEF___PTR_CH_
--
--class PrimitiveDef;
--typedef PrimitiveDef *PrimitiveDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PRIMITIVEDEF___VAR_CH_)
--#define _IR_PRIMITIVEDEF___VAR_CH_
--
--class TAO_IFR_Client_Export PrimitiveDef_var : public TAO_Base_var
--{
--public:
--  PrimitiveDef_var (void); // default constructor
--  PrimitiveDef_var (PrimitiveDef_ptr p) : ptr_ (p) {} 
--  PrimitiveDef_var (const PrimitiveDef_var &); // copy constructor
--  ~PrimitiveDef_var (void); // destructor
--  
--  PrimitiveDef_var &operator= (PrimitiveDef_ptr);
--  PrimitiveDef_var &operator= (const PrimitiveDef_var &);
--  PrimitiveDef_ptr operator-> (void) const;
--  
--  operator const PrimitiveDef_ptr &() const;
--  operator PrimitiveDef_ptr &();
--  // in, inout, out, _retn 
--  PrimitiveDef_ptr in (void) const;
--  PrimitiveDef_ptr &inout (void);
--  PrimitiveDef_ptr &out (void);
--  PrimitiveDef_ptr _retn (void);
--  PrimitiveDef_ptr ptr (void) const;
--
--private:
--  PrimitiveDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  PrimitiveDef_var (const TAO_Base_var &rhs);
--  PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PRIMITIVEDEF___OUT_CH_)
--#define _IR_PRIMITIVEDEF___OUT_CH_
--
--class TAO_IFR_Client_Export PrimitiveDef_out
--{
--public:
--  PrimitiveDef_out (PrimitiveDef_ptr &);
--  PrimitiveDef_out (PrimitiveDef_var &);
--  PrimitiveDef_out (const PrimitiveDef_out &);
--  PrimitiveDef_out &operator= (const PrimitiveDef_out &);
--  PrimitiveDef_out &operator= (const PrimitiveDef_var &);
--  PrimitiveDef_out &operator= (PrimitiveDef_ptr);
--  operator PrimitiveDef_ptr &();
--  PrimitiveDef_ptr &ptr (void);
--  PrimitiveDef_ptr operator-> (void);
--  
--private:
--  PrimitiveDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PRIMITIVEDEF_CH_)
--#define _IR_PRIMITIVEDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_PrimitiveDef_Proxy_Impl;
- class _TAO_PrimitiveDef_Remote_Proxy_Impl;
- class _TAO_PrimitiveDef_Proxy_Broker;
- class _TAO_PrimitiveDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export PrimitiveDef: public virtual IDLType
-+class TAO_IFR_Client_Export IR_PrimitiveDef: public virtual IR_IDLType
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef PrimitiveDef_ptr _ptr_type;
--  typedef PrimitiveDef_var _var_type;
-+  typedef IR_PrimitiveDef_ptr _ptr_type;
-+  typedef IR_PrimitiveDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static PrimitiveDef_ptr _duplicate (PrimitiveDef_ptr obj);
--  static PrimitiveDef_ptr _narrow (
-+  static IR_PrimitiveDef_ptr _duplicate (IR_PrimitiveDef_ptr obj);
-+  static IR_PrimitiveDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static PrimitiveDef_ptr _unchecked_narrow (
-+  static IR_PrimitiveDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static PrimitiveDef_ptr _nil (void)
-+  static IR_PrimitiveDef_ptr _nil (void)
-     {
--      return (PrimitiveDef_ptr)0;
-+      return (IR_PrimitiveDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
- 
--  virtual IR::PrimitiveKind kind (
-+  virtual IR_PrimitiveKind kind (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -13331,14 +10926,14 @@
-   _TAO_PrimitiveDef_Proxy_Broker *the_TAO_PrimitiveDef_Proxy_Broker_;
-   
- protected:
--  PrimitiveDef (int collocated = 0);
-+  IR_PrimitiveDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_PrimitiveDef_setup_collocation (int collocated);
-     
--    PrimitiveDef (
-+  IR_PrimitiveDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -13348,10 +10943,10 @@
-     friend class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_PrimitiveDef_Direct_Proxy_Impl;
-   
--  virtual ~PrimitiveDef (void);
-+  virtual ~IR_PrimitiveDef (void);
- private:
--  PrimitiveDef (const PrimitiveDef &);
--  void operator= (const PrimitiveDef &);  
-+  IR_PrimitiveDef (const IR_PrimitiveDef &);
-+  void operator= (const IR_PrimitiveDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -13361,7 +10956,7 @@
-   class TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::PrimitiveDef;
-+    friend class IR_PrimitiveDef;
-     
-     friend class _TAO_PrimitiveDef_Remote_Proxy_Impl;
-     friend class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
-@@ -13395,9 +10990,9 @@
- private:
-   TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get (const TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get &);
--  void result (IR::PrimitiveKind result);
-+    void result (IR_PrimitiveKind result);
-   // update the result 
--  IR::PrimitiveKind _result;
-+    IR_PrimitiveKind _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-@@ -13415,12 +11010,12 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_PrimitiveDef_Proxy_Impl : 
--  public virtual IR::_TAO_IDLType_Proxy_Impl
-+  public virtual _TAO_IDLType_Proxy_Impl
- {
- public:
-   virtual ~_TAO_PrimitiveDef_Proxy_Impl (void) { }
-   
--    virtual IR::PrimitiveKind kind (
-+  virtual IR_PrimitiveKind kind (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -13432,6 +11027,7 @@
-   _TAO_PrimitiveDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -13444,7 +11040,7 @@
- class TAO_IFR_Client_Export _TAO_PrimitiveDef_Remote_Proxy_Impl : 
-   public virtual _TAO_PrimitiveDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
-+  public virtual _TAO_IDLType_Remote_Proxy_Impl
-   
- {
- public:
-@@ -13452,7 +11048,7 @@
-   
-   virtual ~_TAO_PrimitiveDef_Remote_Proxy_Impl (void) { }
-   
--    virtual IR::PrimitiveKind kind (
-+  virtual IR_PrimitiveKind kind (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -13482,8 +11078,9 @@
- {
- public:
-   virtual ~_TAO_PrimitiveDef_Proxy_Broker (void);
-+
-   virtual _TAO_PrimitiveDef_Proxy_Impl &select_proxy (
--    PrimitiveDef *object,
-+    IR_PrimitiveDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -13492,6 +11089,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -13509,7 +11107,7 @@
-   virtual ~_TAO_PrimitiveDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_PrimitiveDef_Proxy_Impl &select_proxy (
--    PrimitiveDef *object,
-+    IR_PrimitiveDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -13523,117 +11121,39 @@
-   static _TAO_PrimitiveDef_Remote_Proxy_Broker *the_TAO_PrimitiveDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimitiveDef;
--
--
--#if !defined (_IR_STRINGDEF___PTR_CH_)
--#define _IR_STRINGDEF___PTR_CH_
--
--class StringDef;
--typedef StringDef *StringDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRINGDEF___VAR_CH_)
--#define _IR_STRINGDEF___VAR_CH_
--
--class TAO_IFR_Client_Export StringDef_var : public TAO_Base_var
--{
--public:
--  StringDef_var (void); // default constructor
--  StringDef_var (StringDef_ptr p) : ptr_ (p) {} 
--  StringDef_var (const StringDef_var &); // copy constructor
--  ~StringDef_var (void); // destructor
--  
--  StringDef_var &operator= (StringDef_ptr);
--  StringDef_var &operator= (const StringDef_var &);
--  StringDef_ptr operator-> (void) const;
--  
--  operator const StringDef_ptr &() const;
--  operator StringDef_ptr &();
--  // in, inout, out, _retn 
--  StringDef_ptr in (void) const;
--  StringDef_ptr &inout (void);
--  StringDef_ptr &out (void);
--  StringDef_ptr _retn (void);
--  StringDef_ptr ptr (void) const;
--
--private:
--  StringDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  StringDef_var (const TAO_Base_var &rhs);
--  StringDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRINGDEF___OUT_CH_)
--#define _IR_STRINGDEF___OUT_CH_
--
--class TAO_IFR_Client_Export StringDef_out
--{
--public:
--  StringDef_out (StringDef_ptr &);
--  StringDef_out (StringDef_var &);
--  StringDef_out (const StringDef_out &);
--  StringDef_out &operator= (const StringDef_out &);
--  StringDef_out &operator= (const StringDef_var &);
--  StringDef_out &operator= (StringDef_ptr);
--  operator StringDef_ptr &();
--  StringDef_ptr &ptr (void);
--  StringDef_ptr operator-> (void);
--  
--private:
--  StringDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRINGDEF_CH_)
--#define _IR_STRINGDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_StringDef_Proxy_Impl;
- class _TAO_StringDef_Remote_Proxy_Impl;
- class _TAO_StringDef_Proxy_Broker;
- class _TAO_StringDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export StringDef: public virtual IDLType
-+class TAO_IFR_Client_Export IR_StringDef: public virtual IR_IDLType
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef StringDef_ptr _ptr_type;
--  typedef StringDef_var _var_type;
-+  typedef IR_StringDef_ptr _ptr_type;
-+  typedef IR_StringDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static StringDef_ptr _duplicate (StringDef_ptr obj);
--  static StringDef_ptr _narrow (
-+  static IR_StringDef_ptr _duplicate (IR_StringDef_ptr obj);
-+  static IR_StringDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static StringDef_ptr _unchecked_narrow (
-+  static IR_StringDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static StringDef_ptr _nil (void)
-+  static IR_StringDef_ptr _nil (void)
-     {
--      return (StringDef_ptr)0;
-+      return (IR_StringDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -13668,14 +11188,14 @@
-   _TAO_StringDef_Proxy_Broker *the_TAO_StringDef_Proxy_Broker_;
-   
- protected:
--  StringDef (int collocated = 0);
-+  IR_StringDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_StringDef_setup_collocation (int collocated);
-     
--    StringDef (
-+  IR_StringDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -13685,10 +11205,10 @@
-     friend class _TAO_StringDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_StringDef_Direct_Proxy_Impl;
-   
--  virtual ~StringDef (void);
-+  virtual ~IR_StringDef (void);
- private:
--  StringDef (const StringDef &);
--  void operator= (const StringDef &);  
-+  IR_StringDef (const IR_StringDef &);
-+  void operator= (const IR_StringDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -13698,7 +11218,7 @@
-   class TAO_ClientRequestInfo_IR_StringDef_bound_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::StringDef;
-+    friend class IR_StringDef;
-     
-     friend class _TAO_StringDef_Remote_Proxy_Impl;
-     friend class _TAO_StringDef_ThruPOA_Proxy_Impl;
-@@ -13740,7 +11260,7 @@
- class TAO_ClientRequestInfo_IR_StringDef_bound_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::StringDef;
-+    friend class IR_StringDef;
-   
-   friend class _TAO_StringDef_Remote_Proxy_Impl;
-   friend class _TAO_StringDef_ThruPOA_Proxy_Impl;
-@@ -13794,7 +11314,7 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_StringDef_Proxy_Impl : 
--  public virtual IR::_TAO_IDLType_Proxy_Impl
-+  public virtual _TAO_IDLType_Proxy_Impl
- {
- public:
-   virtual ~_TAO_StringDef_Proxy_Impl (void) { }
-@@ -13820,6 +11340,7 @@
-   _TAO_StringDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -13832,7 +11353,7 @@
- class TAO_IFR_Client_Export _TAO_StringDef_Remote_Proxy_Impl : 
-   public virtual _TAO_StringDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
-+  public virtual _TAO_IDLType_Remote_Proxy_Impl
-   
- {
- public:
-@@ -13879,8 +11400,9 @@
- {
- public:
-   virtual ~_TAO_StringDef_Proxy_Broker (void);
-+
-   virtual _TAO_StringDef_Proxy_Impl &select_proxy (
--    StringDef *object,
-+    IR_StringDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -13889,6 +11411,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -13906,7 +11429,7 @@
-   virtual ~_TAO_StringDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_StringDef_Proxy_Impl &select_proxy (
--    StringDef *object,
-+    IR_StringDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -13920,117 +11443,39 @@
-   static _TAO_StringDef_Remote_Proxy_Broker *the_TAO_StringDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StringDef;
--
--
--#if !defined (_IR_WSTRINGDEF___PTR_CH_)
--#define _IR_WSTRINGDEF___PTR_CH_
--
--class WstringDef;
--typedef WstringDef *WstringDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_WSTRINGDEF___VAR_CH_)
--#define _IR_WSTRINGDEF___VAR_CH_
--
--class TAO_IFR_Client_Export WstringDef_var : public TAO_Base_var
--{
--public:
--  WstringDef_var (void); // default constructor
--  WstringDef_var (WstringDef_ptr p) : ptr_ (p) {} 
--  WstringDef_var (const WstringDef_var &); // copy constructor
--  ~WstringDef_var (void); // destructor
--  
--  WstringDef_var &operator= (WstringDef_ptr);
--  WstringDef_var &operator= (const WstringDef_var &);
--  WstringDef_ptr operator-> (void) const;
--  
--  operator const WstringDef_ptr &() const;
--  operator WstringDef_ptr &();
--  // in, inout, out, _retn 
--  WstringDef_ptr in (void) const;
--  WstringDef_ptr &inout (void);
--  WstringDef_ptr &out (void);
--  WstringDef_ptr _retn (void);
--  WstringDef_ptr ptr (void) const;
--
--private:
--  WstringDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  WstringDef_var (const TAO_Base_var &rhs);
--  WstringDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_WSTRINGDEF___OUT_CH_)
--#define _IR_WSTRINGDEF___OUT_CH_
--
--class TAO_IFR_Client_Export WstringDef_out
--{
--public:
--  WstringDef_out (WstringDef_ptr &);
--  WstringDef_out (WstringDef_var &);
--  WstringDef_out (const WstringDef_out &);
--  WstringDef_out &operator= (const WstringDef_out &);
--  WstringDef_out &operator= (const WstringDef_var &);
--  WstringDef_out &operator= (WstringDef_ptr);
--  operator WstringDef_ptr &();
--  WstringDef_ptr &ptr (void);
--  WstringDef_ptr operator-> (void);
--  
--private:
--  WstringDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_WSTRINGDEF_CH_)
--#define _IR_WSTRINGDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_WstringDef_Proxy_Impl;
- class _TAO_WstringDef_Remote_Proxy_Impl;
- class _TAO_WstringDef_Proxy_Broker;
- class _TAO_WstringDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export WstringDef: public virtual IDLType
-+class TAO_IFR_Client_Export IR_WstringDef: public virtual IR_IDLType
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef WstringDef_ptr _ptr_type;
--  typedef WstringDef_var _var_type;
-+  typedef IR_WstringDef_ptr _ptr_type;
-+  typedef IR_WstringDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static WstringDef_ptr _duplicate (WstringDef_ptr obj);
--  static WstringDef_ptr _narrow (
-+  static IR_WstringDef_ptr _duplicate (IR_WstringDef_ptr obj);
-+  static IR_WstringDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static WstringDef_ptr _unchecked_narrow (
-+  static IR_WstringDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static WstringDef_ptr _nil (void)
-+  static IR_WstringDef_ptr _nil (void)
-     {
--      return (WstringDef_ptr)0;
-+      return (IR_WstringDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -14065,14 +11510,14 @@
-   _TAO_WstringDef_Proxy_Broker *the_TAO_WstringDef_Proxy_Broker_;
-   
- protected:
--  WstringDef (int collocated = 0);
-+  IR_WstringDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_WstringDef_setup_collocation (int collocated);
-     
--    WstringDef (
-+  IR_WstringDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -14082,10 +11527,10 @@
-     friend class _TAO_WstringDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_WstringDef_Direct_Proxy_Impl;
-   
--  virtual ~WstringDef (void);
-+  virtual ~IR_WstringDef (void);
- private:
--  WstringDef (const WstringDef &);
--  void operator= (const WstringDef &);  
-+  IR_WstringDef (const IR_WstringDef &);
-+  void operator= (const IR_WstringDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -14095,7 +11540,7 @@
-   class TAO_ClientRequestInfo_IR_WstringDef_bound_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::WstringDef;
-+    friend class IR_WstringDef;
-     
-     friend class _TAO_WstringDef_Remote_Proxy_Impl;
-     friend class _TAO_WstringDef_ThruPOA_Proxy_Impl;
-@@ -14137,7 +11582,7 @@
- class TAO_ClientRequestInfo_IR_WstringDef_bound_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::WstringDef;
-+    friend class IR_WstringDef;
-   
-   friend class _TAO_WstringDef_Remote_Proxy_Impl;
-   friend class _TAO_WstringDef_ThruPOA_Proxy_Impl;
-@@ -14191,7 +11636,7 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Impl : 
--  public virtual IR::_TAO_IDLType_Proxy_Impl
-+  public virtual _TAO_IDLType_Proxy_Impl
- {
- public:
-   virtual ~_TAO_WstringDef_Proxy_Impl (void) { }
-@@ -14217,6 +11662,7 @@
-   _TAO_WstringDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -14229,7 +11675,7 @@
- class TAO_IFR_Client_Export _TAO_WstringDef_Remote_Proxy_Impl : 
-   public virtual _TAO_WstringDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
-+  public virtual _TAO_IDLType_Remote_Proxy_Impl
-   
- {
- public:
-@@ -14276,8 +11722,9 @@
- {
- public:
-   virtual ~_TAO_WstringDef_Proxy_Broker (void);
-+
-   virtual _TAO_WstringDef_Proxy_Impl &select_proxy (
--    WstringDef *object,
-+    IR_WstringDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -14286,6 +11733,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -14303,7 +11751,7 @@
-   virtual ~_TAO_WstringDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_WstringDef_Proxy_Impl &select_proxy (
--    WstringDef *object,
-+    IR_WstringDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -14317,117 +11765,39 @@
-   static _TAO_WstringDef_Remote_Proxy_Broker *the_TAO_WstringDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_WstringDef;
--
--
--#if !defined (_IR_FIXEDDEF___PTR_CH_)
--#define _IR_FIXEDDEF___PTR_CH_
--
--class FixedDef;
--typedef FixedDef *FixedDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FIXEDDEF___VAR_CH_)
--#define _IR_FIXEDDEF___VAR_CH_
--
--class TAO_IFR_Client_Export FixedDef_var : public TAO_Base_var
--{
--public:
--  FixedDef_var (void); // default constructor
--  FixedDef_var (FixedDef_ptr p) : ptr_ (p) {} 
--  FixedDef_var (const FixedDef_var &); // copy constructor
--  ~FixedDef_var (void); // destructor
--  
--  FixedDef_var &operator= (FixedDef_ptr);
--  FixedDef_var &operator= (const FixedDef_var &);
--  FixedDef_ptr operator-> (void) const;
--  
--  operator const FixedDef_ptr &() const;
--  operator FixedDef_ptr &();
--  // in, inout, out, _retn 
--  FixedDef_ptr in (void) const;
--  FixedDef_ptr &inout (void);
--  FixedDef_ptr &out (void);
--  FixedDef_ptr _retn (void);
--  FixedDef_ptr ptr (void) const;
--
--private:
--  FixedDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  FixedDef_var (const TAO_Base_var &rhs);
--  FixedDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FIXEDDEF___OUT_CH_)
--#define _IR_FIXEDDEF___OUT_CH_
--
--class TAO_IFR_Client_Export FixedDef_out
--{
--public:
--  FixedDef_out (FixedDef_ptr &);
--  FixedDef_out (FixedDef_var &);
--  FixedDef_out (const FixedDef_out &);
--  FixedDef_out &operator= (const FixedDef_out &);
--  FixedDef_out &operator= (const FixedDef_var &);
--  FixedDef_out &operator= (FixedDef_ptr);
--  operator FixedDef_ptr &();
--  FixedDef_ptr &ptr (void);
--  FixedDef_ptr operator-> (void);
--  
--private:
--  FixedDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FIXEDDEF_CH_)
--#define _IR_FIXEDDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_FixedDef_Proxy_Impl;
- class _TAO_FixedDef_Remote_Proxy_Impl;
- class _TAO_FixedDef_Proxy_Broker;
- class _TAO_FixedDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export FixedDef: public virtual IDLType
-+class TAO_IFR_Client_Export IR_FixedDef: public virtual IR_IDLType
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef FixedDef_ptr _ptr_type;
--  typedef FixedDef_var _var_type;
-+  typedef IR_FixedDef_ptr _ptr_type;
-+  typedef IR_FixedDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static FixedDef_ptr _duplicate (FixedDef_ptr obj);
--  static FixedDef_ptr _narrow (
-+  static IR_FixedDef_ptr _duplicate (IR_FixedDef_ptr obj);
-+  static IR_FixedDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static FixedDef_ptr _unchecked_narrow (
-+  static IR_FixedDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static FixedDef_ptr _nil (void)
-+  static IR_FixedDef_ptr _nil (void)
-     {
--      return (FixedDef_ptr)0;
-+      return (IR_FixedDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -14479,14 +11849,14 @@
-   _TAO_FixedDef_Proxy_Broker *the_TAO_FixedDef_Proxy_Broker_;
-   
- protected:
--  FixedDef (int collocated = 0);
-+  IR_FixedDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_FixedDef_setup_collocation (int collocated);
-     
--    FixedDef (
-+  IR_FixedDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -14496,10 +11866,10 @@
-     friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_FixedDef_Direct_Proxy_Impl;
-   
--  virtual ~FixedDef (void);
-+  virtual ~IR_FixedDef (void);
- private:
--  FixedDef (const FixedDef &);
--  void operator= (const FixedDef &);  
-+  IR_FixedDef (const IR_FixedDef &);
-+  void operator= (const IR_FixedDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -14509,7 +11879,7 @@
-   class TAO_ClientRequestInfo_IR_FixedDef_digits_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::FixedDef;
-+    friend class IR_FixedDef;
-     
-     friend class _TAO_FixedDef_Remote_Proxy_Impl;
-     friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
-@@ -14551,7 +11921,7 @@
- class TAO_ClientRequestInfo_IR_FixedDef_digits_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::FixedDef;
-+    friend class IR_FixedDef;
-   
-   friend class _TAO_FixedDef_Remote_Proxy_Impl;
-   friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
-@@ -14593,7 +11963,7 @@
- class TAO_ClientRequestInfo_IR_FixedDef_scale_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::FixedDef;
-+    friend class IR_FixedDef;
-   
-   friend class _TAO_FixedDef_Remote_Proxy_Impl;
-   friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
-@@ -14635,7 +12005,7 @@
- class TAO_ClientRequestInfo_IR_FixedDef_scale_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::FixedDef;
-+    friend class IR_FixedDef;
-   
-   friend class _TAO_FixedDef_Remote_Proxy_Impl;
-   friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
-@@ -14689,7 +12059,7 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_FixedDef_Proxy_Impl : 
--  public virtual IR::_TAO_IDLType_Proxy_Impl
-+  public virtual _TAO_IDLType_Proxy_Impl
- {
- public:
-   virtual ~_TAO_FixedDef_Proxy_Impl (void) { }
-@@ -14732,6 +12102,7 @@
-   _TAO_FixedDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -14744,7 +12115,7 @@
- class TAO_IFR_Client_Export _TAO_FixedDef_Remote_Proxy_Impl : 
-   public virtual _TAO_FixedDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
-+  public virtual _TAO_IDLType_Remote_Proxy_Impl
-   
- {
- public:
-@@ -14808,8 +12179,9 @@
- {
- public:
-   virtual ~_TAO_FixedDef_Proxy_Broker (void);
-+
-   virtual _TAO_FixedDef_Proxy_Impl &select_proxy (
--    FixedDef *object,
-+    IR_FixedDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -14818,6 +12190,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -14835,7 +12208,7 @@
-   virtual ~_TAO_FixedDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_FixedDef_Proxy_Impl &select_proxy (
--    FixedDef *object,
-+    IR_FixedDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -14849,117 +12222,39 @@
-   static _TAO_FixedDef_Remote_Proxy_Broker *the_TAO_FixedDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FixedDef;
--
--
--#if !defined (_IR_SEQUENCEDEF___PTR_CH_)
--#define _IR_SEQUENCEDEF___PTR_CH_
--
--class SequenceDef;
--typedef SequenceDef *SequenceDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_SEQUENCEDEF___VAR_CH_)
--#define _IR_SEQUENCEDEF___VAR_CH_
--
--class TAO_IFR_Client_Export SequenceDef_var : public TAO_Base_var
--{
--public:
--  SequenceDef_var (void); // default constructor
--  SequenceDef_var (SequenceDef_ptr p) : ptr_ (p) {} 
--  SequenceDef_var (const SequenceDef_var &); // copy constructor
--  ~SequenceDef_var (void); // destructor
--  
--  SequenceDef_var &operator= (SequenceDef_ptr);
--  SequenceDef_var &operator= (const SequenceDef_var &);
--  SequenceDef_ptr operator-> (void) const;
--  
--  operator const SequenceDef_ptr &() const;
--  operator SequenceDef_ptr &();
--  // in, inout, out, _retn 
--  SequenceDef_ptr in (void) const;
--  SequenceDef_ptr &inout (void);
--  SequenceDef_ptr &out (void);
--  SequenceDef_ptr _retn (void);
--  SequenceDef_ptr ptr (void) const;
--
--private:
--  SequenceDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  SequenceDef_var (const TAO_Base_var &rhs);
--  SequenceDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_SEQUENCEDEF___OUT_CH_)
--#define _IR_SEQUENCEDEF___OUT_CH_
--
--class TAO_IFR_Client_Export SequenceDef_out
--{
--public:
--  SequenceDef_out (SequenceDef_ptr &);
--  SequenceDef_out (SequenceDef_var &);
--  SequenceDef_out (const SequenceDef_out &);
--  SequenceDef_out &operator= (const SequenceDef_out &);
--  SequenceDef_out &operator= (const SequenceDef_var &);
--  SequenceDef_out &operator= (SequenceDef_ptr);
--  operator SequenceDef_ptr &();
--  SequenceDef_ptr &ptr (void);
--  SequenceDef_ptr operator-> (void);
--  
--private:
--  SequenceDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_SEQUENCEDEF_CH_)
--#define _IR_SEQUENCEDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_SequenceDef_Proxy_Impl;
- class _TAO_SequenceDef_Remote_Proxy_Impl;
- class _TAO_SequenceDef_Proxy_Broker;
- class _TAO_SequenceDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export SequenceDef: public virtual IDLType
-+class TAO_IFR_Client_Export IR_SequenceDef: public virtual IR_IDLType
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef SequenceDef_ptr _ptr_type;
--  typedef SequenceDef_var _var_type;
-+  typedef IR_SequenceDef_ptr _ptr_type;
-+  typedef IR_SequenceDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static SequenceDef_ptr _duplicate (SequenceDef_ptr obj);
--  static SequenceDef_ptr _narrow (
-+  static IR_SequenceDef_ptr _duplicate (IR_SequenceDef_ptr obj);
-+  static IR_SequenceDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static SequenceDef_ptr _unchecked_narrow (
-+  static IR_SequenceDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static SequenceDef_ptr _nil (void)
-+  static IR_SequenceDef_ptr _nil (void)
-     {
--      return (SequenceDef_ptr)0;
-+      return (IR_SequenceDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -14989,7 +12284,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr element_type_def (
-+  virtual IR_IDLType_ptr element_type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -14998,7 +12293,7 @@
-     ));
- 
-   virtual void element_type_def (
--      IR::IDLType_ptr element_type_def,
-+      IR_IDLType_ptr element_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15019,14 +12314,14 @@
-   _TAO_SequenceDef_Proxy_Broker *the_TAO_SequenceDef_Proxy_Broker_;
-   
- protected:
--  SequenceDef (int collocated = 0);
-+  IR_SequenceDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_SequenceDef_setup_collocation (int collocated);
-     
--    SequenceDef (
-+  IR_SequenceDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -15036,10 +12331,10 @@
-     friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_SequenceDef_Direct_Proxy_Impl;
-   
--  virtual ~SequenceDef (void);
-+  virtual ~IR_SequenceDef (void);
- private:
--  SequenceDef (const SequenceDef &);
--  void operator= (const SequenceDef &);  
-+  IR_SequenceDef (const IR_SequenceDef &);
-+  void operator= (const IR_SequenceDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -15049,7 +12344,7 @@
-   class TAO_ClientRequestInfo_IR_SequenceDef_bound_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::SequenceDef;
-+    friend class IR_SequenceDef;
-     
-     friend class _TAO_SequenceDef_Remote_Proxy_Impl;
-     friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
-@@ -15091,7 +12386,7 @@
- class TAO_ClientRequestInfo_IR_SequenceDef_bound_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::SequenceDef;
-+    friend class IR_SequenceDef;
-   
-   friend class _TAO_SequenceDef_Remote_Proxy_Impl;
-   friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
-@@ -15133,7 +12428,7 @@
- class TAO_ClientRequestInfo_IR_SequenceDef_element_type_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::SequenceDef;
-+    friend class IR_SequenceDef;
-   
-   friend class _TAO_SequenceDef_Remote_Proxy_Impl;
-   friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
-@@ -15175,7 +12470,7 @@
- class TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::SequenceDef;
-+    friend class IR_SequenceDef;
-   
-   friend class _TAO_SequenceDef_Remote_Proxy_Impl;
-   friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
-@@ -15209,15 +12504,15 @@
- private:
-   TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get (const TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get &);
--  void result (IR::IDLType_ptr result);
-+    void result (IR_IDLType_ptr result);
-   // update the result 
--  IR::IDLType_ptr _result;
-+    IR_IDLType_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::SequenceDef;
-+    friend class IR_SequenceDef;
-   
-   friend class _TAO_SequenceDef_Remote_Proxy_Impl;
-   friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
-@@ -15226,7 +12521,7 @@
- TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr element_type_def,
-+        IR_IDLType_ptr element_type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -15252,7 +12547,7 @@
- private:
-   TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set (const TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set &);
--  IR::IDLType_ptr element_type_def_;
-+    IR_IDLType_ptr element_type_def_;
-   
- };
- 
-@@ -15271,7 +12566,7 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Impl : 
--  public virtual IR::_TAO_IDLType_Proxy_Impl
-+  public virtual _TAO_IDLType_Proxy_Impl
- {
- public:
-   virtual ~_TAO_SequenceDef_Proxy_Impl (void) { }
-@@ -15301,7 +12596,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::IDLType_ptr element_type_def (
-+  virtual IR_IDLType_ptr element_type_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -15311,7 +12606,7 @@
- 
-   virtual void element_type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr element_type_def,
-+      IR_IDLType_ptr element_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -15322,6 +12617,8 @@
-   _TAO_SequenceDef_Proxy_Impl (void);
- 
- };
-+
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -15334,7 +12631,7 @@
- class TAO_IFR_Client_Export _TAO_SequenceDef_Remote_Proxy_Impl : 
-   public virtual _TAO_SequenceDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
-+  public virtual _TAO_IDLType_Remote_Proxy_Impl
-   
- {
- public:
-@@ -15367,7 +12664,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr element_type_def (
-+  virtual IR_IDLType_ptr element_type_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -15377,7 +12674,7 @@
- 
-   virtual void element_type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr element_type_def,
-+      IR_IDLType_ptr element_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -15406,8 +12703,9 @@
- {
- public:
-   virtual ~_TAO_SequenceDef_Proxy_Broker (void);
-+
-   virtual _TAO_SequenceDef_Proxy_Impl &select_proxy (
--    SequenceDef *object,
-+    IR_SequenceDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -15416,6 +12714,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -15433,7 +12732,7 @@
-   virtual ~_TAO_SequenceDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_SequenceDef_Proxy_Impl &select_proxy (
--    SequenceDef *object,
-+    IR_SequenceDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -15447,117 +12746,39 @@
-   static _TAO_SequenceDef_Remote_Proxy_Broker *the_TAO_SequenceDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SequenceDef;
--
--
--#if !defined (_IR_ARRAYDEF___PTR_CH_)
--#define _IR_ARRAYDEF___PTR_CH_
--
--class ArrayDef;
--typedef ArrayDef *ArrayDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ARRAYDEF___VAR_CH_)
--#define _IR_ARRAYDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ArrayDef_var : public TAO_Base_var
--{
--public:
--  ArrayDef_var (void); // default constructor
--  ArrayDef_var (ArrayDef_ptr p) : ptr_ (p) {} 
--  ArrayDef_var (const ArrayDef_var &); // copy constructor
--  ~ArrayDef_var (void); // destructor
--  
--  ArrayDef_var &operator= (ArrayDef_ptr);
--  ArrayDef_var &operator= (const ArrayDef_var &);
--  ArrayDef_ptr operator-> (void) const;
--  
--  operator const ArrayDef_ptr &() const;
--  operator ArrayDef_ptr &();
--  // in, inout, out, _retn 
--  ArrayDef_ptr in (void) const;
--  ArrayDef_ptr &inout (void);
--  ArrayDef_ptr &out (void);
--  ArrayDef_ptr _retn (void);
--  ArrayDef_ptr ptr (void) const;
--
--private:
--  ArrayDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  ArrayDef_var (const TAO_Base_var &rhs);
--  ArrayDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ARRAYDEF___OUT_CH_)
--#define _IR_ARRAYDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ArrayDef_out
--{
--public:
--  ArrayDef_out (ArrayDef_ptr &);
--  ArrayDef_out (ArrayDef_var &);
--  ArrayDef_out (const ArrayDef_out &);
--  ArrayDef_out &operator= (const ArrayDef_out &);
--  ArrayDef_out &operator= (const ArrayDef_var &);
--  ArrayDef_out &operator= (ArrayDef_ptr);
--  operator ArrayDef_ptr &();
--  ArrayDef_ptr &ptr (void);
--  ArrayDef_ptr operator-> (void);
--  
--private:
--  ArrayDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ARRAYDEF_CH_)
--#define _IR_ARRAYDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_ArrayDef_Proxy_Impl;
- class _TAO_ArrayDef_Remote_Proxy_Impl;
- class _TAO_ArrayDef_Proxy_Broker;
- class _TAO_ArrayDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ArrayDef: public virtual IDLType
-+class TAO_IFR_Client_Export IR_ArrayDef: public virtual IR_IDLType
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ArrayDef_ptr _ptr_type;
--  typedef ArrayDef_var _var_type;
-+  typedef IR_ArrayDef_ptr _ptr_type;
-+  typedef IR_ArrayDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static ArrayDef_ptr _duplicate (ArrayDef_ptr obj);
--  static ArrayDef_ptr _narrow (
-+  static IR_ArrayDef_ptr _duplicate (IR_ArrayDef_ptr obj);
-+  static IR_ArrayDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ArrayDef_ptr _unchecked_narrow (
-+  static IR_ArrayDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ArrayDef_ptr _nil (void)
-+  static IR_ArrayDef_ptr _nil (void)
-     {
--      return (ArrayDef_ptr)0;
-+      return (IR_ArrayDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -15587,7 +12808,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr element_type_def (
-+  virtual IR_IDLType_ptr element_type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15596,7 +12817,7 @@
-     ));
- 
-   virtual void element_type_def (
--      IR::IDLType_ptr element_type_def,
-+      IR_IDLType_ptr element_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -15617,14 +12838,14 @@
-   _TAO_ArrayDef_Proxy_Broker *the_TAO_ArrayDef_Proxy_Broker_;
-   
- protected:
--  ArrayDef (int collocated = 0);
-+  IR_ArrayDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_ArrayDef_setup_collocation (int collocated);
-     
--    ArrayDef (
-+  IR_ArrayDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -15634,10 +12855,10 @@
-     friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_ArrayDef_Direct_Proxy_Impl;
-   
--  virtual ~ArrayDef (void);
-+  virtual ~IR_ArrayDef (void);
- private:
--  ArrayDef (const ArrayDef &);
--  void operator= (const ArrayDef &);  
-+  IR_ArrayDef (const IR_ArrayDef &);
-+  void operator= (const IR_ArrayDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -15647,7 +12868,7 @@
-   class TAO_ClientRequestInfo_IR_ArrayDef_length_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::ArrayDef;
-+    friend class IR_ArrayDef;
-     
-     friend class _TAO_ArrayDef_Remote_Proxy_Impl;
-     friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
-@@ -15689,7 +12910,7 @@
- class TAO_ClientRequestInfo_IR_ArrayDef_length_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ArrayDef;
-+    friend class IR_ArrayDef;
-   
-   friend class _TAO_ArrayDef_Remote_Proxy_Impl;
-   friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
-@@ -15731,7 +12952,7 @@
- class TAO_ClientRequestInfo_IR_ArrayDef_element_type_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ArrayDef;
-+    friend class IR_ArrayDef;
-   
-   friend class _TAO_ArrayDef_Remote_Proxy_Impl;
-   friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
-@@ -15773,7 +12994,7 @@
- class TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ArrayDef;
-+    friend class IR_ArrayDef;
-   
-   friend class _TAO_ArrayDef_Remote_Proxy_Impl;
-   friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
-@@ -15807,15 +13028,15 @@
- private:
-   TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get (const TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get &);
--  void result (IR::IDLType_ptr result);
-+    void result (IR_IDLType_ptr result);
-   // update the result 
--  IR::IDLType_ptr _result;
-+    IR_IDLType_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ArrayDef;
-+    friend class IR_ArrayDef;
-   
-   friend class _TAO_ArrayDef_Remote_Proxy_Impl;
-   friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
-@@ -15824,7 +13045,7 @@
- TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr element_type_def,
-+        IR_IDLType_ptr element_type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -15850,7 +13071,7 @@
- private:
-   TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set (const TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set &);
--  IR::IDLType_ptr element_type_def_;
-+    IR_IDLType_ptr element_type_def_;
-   
- };
- 
-@@ -15869,7 +13090,7 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Impl : 
--  public virtual IR::_TAO_IDLType_Proxy_Impl
-+  public virtual _TAO_IDLType_Proxy_Impl
- {
- public:
-   virtual ~_TAO_ArrayDef_Proxy_Impl (void) { }
-@@ -15899,7 +13120,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::IDLType_ptr element_type_def (
-+  virtual IR_IDLType_ptr element_type_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -15909,7 +13130,7 @@
- 
-   virtual void element_type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr element_type_def,
-+      IR_IDLType_ptr element_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -15920,6 +13141,7 @@
-   _TAO_ArrayDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -15932,7 +13154,7 @@
- class TAO_IFR_Client_Export _TAO_ArrayDef_Remote_Proxy_Impl : 
-   public virtual _TAO_ArrayDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
-+  public virtual _TAO_IDLType_Remote_Proxy_Impl
-   
- {
- public:
-@@ -15965,7 +13187,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr element_type_def (
-+  virtual IR_IDLType_ptr element_type_def   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -15975,7 +13197,7 @@
- 
-   virtual void element_type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr element_type_def,
-+      IR_IDLType_ptr element_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -16004,8 +13226,9 @@
- {
- public:
-   virtual ~_TAO_ArrayDef_Proxy_Broker (void);
-+
-   virtual _TAO_ArrayDef_Proxy_Impl &select_proxy (
--    ArrayDef *object,
-+    IR_ArrayDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -16014,6 +13237,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -16031,7 +13255,7 @@
-   virtual ~_TAO_ArrayDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_ArrayDef_Proxy_Impl &select_proxy (
--    ArrayDef *object,
-+    IR_ArrayDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -16045,117 +13269,41 @@
-   static _TAO_ArrayDef_Remote_Proxy_Broker *the_TAO_ArrayDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ArrayDef;
--
--
--#if !defined (_IR_EXCEPTIONDEF___PTR_CH_)
--#define _IR_EXCEPTIONDEF___PTR_CH_
--
--class ExceptionDef;
--typedef ExceptionDef *ExceptionDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EXCEPTIONDEF___VAR_CH_)
--#define _IR_EXCEPTIONDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ExceptionDef_var : public TAO_Base_var
--{
--public:
--  ExceptionDef_var (void); // default constructor
--  ExceptionDef_var (ExceptionDef_ptr p) : ptr_ (p) {} 
--  ExceptionDef_var (const ExceptionDef_var &); // copy constructor
--  ~ExceptionDef_var (void); // destructor
--  
--  ExceptionDef_var &operator= (ExceptionDef_ptr);
--  ExceptionDef_var &operator= (const ExceptionDef_var &);
--  ExceptionDef_ptr operator-> (void) const;
--  
--  operator const ExceptionDef_ptr &() const;
--  operator ExceptionDef_ptr &();
--  // in, inout, out, _retn 
--  ExceptionDef_ptr in (void) const;
--  ExceptionDef_ptr &inout (void);
--  ExceptionDef_ptr &out (void);
--  ExceptionDef_ptr _retn (void);
--  ExceptionDef_ptr ptr (void) const;
--
--private:
--  ExceptionDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  ExceptionDef_var (const TAO_Base_var &rhs);
--  ExceptionDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EXCEPTIONDEF___OUT_CH_)
--#define _IR_EXCEPTIONDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ExceptionDef_out
--{
--public:
--  ExceptionDef_out (ExceptionDef_ptr &);
--  ExceptionDef_out (ExceptionDef_var &);
--  ExceptionDef_out (const ExceptionDef_out &);
--  ExceptionDef_out &operator= (const ExceptionDef_out &);
--  ExceptionDef_out &operator= (const ExceptionDef_var &);
--  ExceptionDef_out &operator= (ExceptionDef_ptr);
--  operator ExceptionDef_ptr &();
--  ExceptionDef_ptr &ptr (void);
--  ExceptionDef_ptr operator-> (void);
--  
--private:
--  ExceptionDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EXCEPTIONDEF_CH_)
--#define _IR_EXCEPTIONDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_ExceptionDef_Proxy_Impl;
- class _TAO_ExceptionDef_Remote_Proxy_Impl;
- class _TAO_ExceptionDef_Proxy_Broker;
- class _TAO_ExceptionDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ExceptionDef: public virtual Contained, public virtual Container
-+class TAO_IFR_Client_Export IR_ExceptionDef
-+  : public virtual IR_Contained,
-+    public virtual IR_Container
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ExceptionDef_ptr _ptr_type;
--  typedef ExceptionDef_var _var_type;
-+  typedef IR_ExceptionDef_ptr _ptr_type;
-+  typedef IR_ExceptionDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static ExceptionDef_ptr _duplicate (ExceptionDef_ptr obj);
--  static ExceptionDef_ptr _narrow (
-+  static IR_ExceptionDef_ptr _duplicate (IR_ExceptionDef_ptr obj);
-+  static IR_ExceptionDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ExceptionDef_ptr _unchecked_narrow (
-+  static IR_ExceptionDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ExceptionDef_ptr _nil (void)
-+  static IR_ExceptionDef_ptr _nil (void)
-     {
--      return (ExceptionDef_ptr)0;
-+      return (IR_ExceptionDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -16168,7 +13316,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::StructMemberSeq * members (
-+  virtual IR_StructMemberSeq * members (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -16177,7 +13325,7 @@
-     ));
- 
-   virtual void members (
--      const IR::StructMemberSeq & members,
-+      const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -16198,14 +13346,14 @@
-   _TAO_ExceptionDef_Proxy_Broker *the_TAO_ExceptionDef_Proxy_Broker_;
-   
- protected:
--  ExceptionDef (int collocated = 0);
-+  IR_ExceptionDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_ExceptionDef_setup_collocation (int collocated);
-     
--    ExceptionDef (
-+  IR_ExceptionDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -16215,10 +13363,10 @@
-     friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_ExceptionDef_Direct_Proxy_Impl;
-   
--  virtual ~ExceptionDef (void);
-+  virtual ~IR_ExceptionDef (void);
- private:
--  ExceptionDef (const ExceptionDef &);
--  void operator= (const ExceptionDef &);  
-+  IR_ExceptionDef (const IR_ExceptionDef &);
-+  void operator= (const IR_ExceptionDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -16228,7 +13376,7 @@
-   class TAO_ClientRequestInfo_IR_ExceptionDef_type_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::ExceptionDef;
-+    friend class IR_ExceptionDef;
-     
-     friend class _TAO_ExceptionDef_Remote_Proxy_Impl;
-     friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
-@@ -16270,7 +13418,7 @@
- class TAO_ClientRequestInfo_IR_ExceptionDef_members_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ExceptionDef;
-+    friend class IR_ExceptionDef;
-   
-   friend class _TAO_ExceptionDef_Remote_Proxy_Impl;
-   friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
-@@ -16304,15 +13452,15 @@
- private:
-   TAO_ClientRequestInfo_IR_ExceptionDef_members_get (const TAO_ClientRequestInfo_IR_ExceptionDef_members_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ExceptionDef_members_get &);
--  void result (IR::StructMemberSeq * result);
-+    void result (IR_StructMemberSeq * result);
-   // update the result 
--  IR::StructMemberSeq * _result;
-+    IR_StructMemberSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ExceptionDef_members_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ExceptionDef;
-+    friend class IR_ExceptionDef;
-   
-   friend class _TAO_ExceptionDef_Remote_Proxy_Impl;
-   friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
-@@ -16321,7 +13469,7 @@
- TAO_ClientRequestInfo_IR_ExceptionDef_members_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -16347,7 +13495,7 @@
- private:
-   TAO_ClientRequestInfo_IR_ExceptionDef_members_set (const TAO_ClientRequestInfo_IR_ExceptionDef_members_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_ExceptionDef_members_set &);
--  const IR::StructMemberSeq & members_;
-+    const IR_StructMemberSeq & members_;
-   
- };
- 
-@@ -16366,8 +13514,8 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_ExceptionDef_Proxy_Impl : 
--  public virtual IR::_TAO_Contained_Proxy_Impl, 
--  public virtual IR::_TAO_Container_Proxy_Impl
-+  public virtual _TAO_Contained_Proxy_Impl,
-+  public virtual _TAO_Container_Proxy_Impl
- {
- public:
-   virtual ~_TAO_ExceptionDef_Proxy_Impl (void) { }
-@@ -16380,7 +13528,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::StructMemberSeq * members (
-+  virtual IR_StructMemberSeq * members   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -16390,7 +13538,7 @@
- 
-   virtual void members (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::StructMemberSeq & members,
-+      const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -16401,6 +13549,7 @@
-   _TAO_ExceptionDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -16413,8 +13562,8 @@
- class TAO_IFR_Client_Export _TAO_ExceptionDef_Remote_Proxy_Impl : 
-   public virtual _TAO_ExceptionDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_Contained_Remote_Proxy_Impl, 
--  public virtual IR::_TAO_Container_Remote_Proxy_Impl
-+  public virtual _TAO_Contained_Remote_Proxy_Impl,
-+  public virtual _TAO_Container_Remote_Proxy_Impl
-   
- {
- public:
-@@ -16430,7 +13579,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::StructMemberSeq * members (
-+  virtual IR_StructMemberSeq * members (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -16440,7 +13589,7 @@
- 
-   virtual void members (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::StructMemberSeq & members,
-+      const IR_StructMemberSeq & members,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -16469,8 +13618,9 @@
- {
- public:
-   virtual ~_TAO_ExceptionDef_Proxy_Broker (void);
-+
-   virtual _TAO_ExceptionDef_Proxy_Impl &select_proxy (
--    ExceptionDef *object,
-+    IR_ExceptionDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -16479,6 +13629,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -16496,7 +13647,7 @@
-   virtual ~_TAO_ExceptionDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_ExceptionDef_Proxy_Impl &select_proxy (
--    ExceptionDef *object,
-+    IR_ExceptionDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -16510,24 +13661,15 @@
-   static _TAO_ExceptionDef_Remote_Proxy_Broker *the_TAO_ExceptionDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionDef;
--
--struct ExceptionDescription;
--class ExceptionDescription_var;
--
--struct TAO_IFR_Client_Export ExceptionDescription
-+struct TAO_IFR_Client_Export IR_ExceptionDescription
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ExceptionDescription_var _var_type;
-+  typedef IR_ExceptionDescription_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
-@@ -16539,61 +13681,55 @@
-   CORBA::TypeCode_var type;
- };
- 
--class TAO_IFR_Client_Export ExceptionDescription_var
-+class TAO_IFR_Client_Export IR_ExceptionDescription_var
- {
- public:
--  ExceptionDescription_var (void); // default constructor
--  ExceptionDescription_var (ExceptionDescription *);
--  ExceptionDescription_var (const ExceptionDescription_var &); // copy constructor
--  ~ExceptionDescription_var (void); // destructor
-+  IR_ExceptionDescription_var (void); // default constructor
-+  IR_ExceptionDescription_var (IR_ExceptionDescription *);
-+  IR_ExceptionDescription_var (const IR_ExceptionDescription_var &); // copy constructor
-+  ~IR_ExceptionDescription_var (void); // destructor
-   
--  ExceptionDescription_var &operator= (ExceptionDescription *);
--  ExceptionDescription_var &operator= (const ExceptionDescription_var &);
--  ExceptionDescription *operator-> (void);
--  const ExceptionDescription *operator-> (void) const;
-+  IR_ExceptionDescription_var &operator= (IR_ExceptionDescription *);
-+  IR_ExceptionDescription_var &operator= (const IR_ExceptionDescription_var &);
-+  IR_ExceptionDescription *operator-> (void);
-+  const IR_ExceptionDescription *operator-> (void) const;
-   
--  operator const ExceptionDescription &() const;
--  operator ExceptionDescription &();
--  operator ExceptionDescription &() const;
--  operator ExceptionDescription *&(); // variable-size types only
-+  operator const IR_ExceptionDescription &() const;
-+  operator IR_ExceptionDescription &();
-+  operator IR_ExceptionDescription &() const;
-+  operator IR_ExceptionDescription *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const ExceptionDescription &in (void) const;
--  ExceptionDescription &inout (void);
--  ExceptionDescription *&out (void);
--  ExceptionDescription *_retn (void);
--  ExceptionDescription *ptr (void) const;
-+  const IR_ExceptionDescription &in (void) const;
-+  IR_ExceptionDescription &inout (void);
-+  IR_ExceptionDescription *&out (void);
-+  IR_ExceptionDescription *_retn (void);
-+  IR_ExceptionDescription *ptr (void) const;
- 
- private:
--  ExceptionDescription *ptr_;
-+  IR_ExceptionDescription *ptr_;
- };
- 
--class TAO_IFR_Client_Export ExceptionDescription_out
-+class TAO_IFR_Client_Export IR_ExceptionDescription_out
- {
- public:
--  ExceptionDescription_out (ExceptionDescription *&);
--  ExceptionDescription_out (ExceptionDescription_var &);
--  ExceptionDescription_out (const ExceptionDescription_out &);
--  ExceptionDescription_out &operator= (const ExceptionDescription_out &);
--  ExceptionDescription_out &operator= (ExceptionDescription *);
--  operator ExceptionDescription *&();
--  ExceptionDescription *&ptr (void);
--  ExceptionDescription *operator-> (void);
-+  IR_ExceptionDescription_out (IR_ExceptionDescription *&);
-+  IR_ExceptionDescription_out (IR_ExceptionDescription_var &);
-+  IR_ExceptionDescription_out (const IR_ExceptionDescription_out &);
-+  IR_ExceptionDescription_out &operator= (const IR_ExceptionDescription_out &);
-+  IR_ExceptionDescription_out &operator= (IR_ExceptionDescription *);
-+  operator IR_ExceptionDescription *&();
-+  IR_ExceptionDescription *&ptr (void);
-+  IR_ExceptionDescription *operator-> (void);
-   
- private:
--  ExceptionDescription *&ptr_;
-+  IR_ExceptionDescription *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ExceptionDescription_var &);
-+  void operator= (const IR_ExceptionDescription_var &);
- };
- 
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionDescription;
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CH_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CH_
--
-   class _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -16603,19 +13739,19 @@
-     _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum);
-     _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      ExceptionDef* *value,
-+      IR_ExceptionDef* *value,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs);
-     virtual ~_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (void);
-     _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs);
--    TAO_Object_Manager<IR::ExceptionDef,IR::ExceptionDef_var> operator[] (CORBA::ULong index) const;
--    static ExceptionDef **allocbuf (CORBA::ULong nelems);
--    static void freebuf (ExceptionDef **buffer);
-+    TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var> operator[] (CORBA::ULong index) const;
-+    static IR_ExceptionDef **allocbuf (CORBA::ULong nelems);
-+    static void freebuf (IR_ExceptionDef **buffer);
-     // The Base_Sequence functions, please see tao/Sequence.h
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
--    ExceptionDef* *get_buffer (CORBA::Boolean orphan = 0);
--    const ExceptionDef* *get_buffer (void) const;
-+    IR_ExceptionDef* *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_ExceptionDef* *get_buffer (void) const;
-     virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-     virtual void _downcast (
-         void* target,
-@@ -16627,125 +13763,94 @@
-     
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_EXCEPTIONDEFSEQ_CH_)
--#define _IR_EXCEPTIONDEFSEQ_CH_
--
--class ExceptionDefSeq;
--class ExceptionDefSeq_var;
--
- // *************************************************************
--// ExceptionDefSeq
-+// IR_ExceptionDefSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export ExceptionDefSeq : public 
-+class TAO_IFR_Client_Export IR_ExceptionDefSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Object_Sequence<ExceptionDef,ExceptionDef_var>
-+  TAO_Unbounded_Object_Sequence<IR_ExceptionDef,IR_ExceptionDef_var>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  ExceptionDefSeq (void); // default ctor
--  ExceptionDefSeq (CORBA::ULong max); // uses max size
--  ExceptionDefSeq (
-+  IR_ExceptionDefSeq (void); // default ctor
-+  IR_ExceptionDefSeq (CORBA::ULong max); // uses max size
-+  IR_ExceptionDefSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    ExceptionDef_ptr *buffer, 
-+    IR_ExceptionDef_ptr *buffer,
-     CORBA::Boolean release = 0
-   );
--  ExceptionDefSeq (const ExceptionDefSeq &); // copy ctor
--  ~ExceptionDefSeq (void);
-+  IR_ExceptionDefSeq (const IR_ExceptionDefSeq &); // copy ctor
-+  ~IR_ExceptionDefSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ExceptionDefSeq_var _var_type;
-+  typedef IR_ExceptionDefSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EXCEPTIONDEFSEQ___VAR_CH_)
--#define _IR_EXCEPTIONDEFSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::ExceptionDefSeq_var
-+// class IR_ExceptionDefSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export ExceptionDefSeq_var
-+class TAO_IFR_Client_Export IR_ExceptionDefSeq_var
- {
- public:
--  ExceptionDefSeq_var (void); // default constructor
--  ExceptionDefSeq_var (ExceptionDefSeq *);
--  ExceptionDefSeq_var (const ExceptionDefSeq_var &); // copy constructor
--  ~ExceptionDefSeq_var (void); // destructor
-+  IR_ExceptionDefSeq_var (void); // default constructor
-+  IR_ExceptionDefSeq_var (IR_ExceptionDefSeq *);
-+  IR_ExceptionDefSeq_var (const IR_ExceptionDefSeq_var &); // copy constructor
-+  ~IR_ExceptionDefSeq_var (void); // destructor
-   
--  ExceptionDefSeq_var &operator= (ExceptionDefSeq *);
--  ExceptionDefSeq_var &operator= (const ExceptionDefSeq_var &);
--  ExceptionDefSeq *operator-> (void);
--  const ExceptionDefSeq *operator-> (void) const;
-+  IR_ExceptionDefSeq_var &operator= (IR_ExceptionDefSeq *);
-+  IR_ExceptionDefSeq_var &operator= (const IR_ExceptionDefSeq_var &);
-+  IR_ExceptionDefSeq *operator-> (void);
-+  const IR_ExceptionDefSeq *operator-> (void) const;
-   
--  operator const ExceptionDefSeq &() const;
--  operator ExceptionDefSeq &();
--  operator ExceptionDefSeq &() const;
--  operator ExceptionDefSeq *&(); // variable-size base types only
-+  operator const IR_ExceptionDefSeq &() const;
-+  operator IR_ExceptionDefSeq &();
-+  operator IR_ExceptionDefSeq &() const;
-+  operator IR_ExceptionDefSeq *&(); // variable-size base types only
-   
--  TAO_Object_Manager<ExceptionDef, ExceptionDef_var> operator[] (CORBA::ULong index);
-+  TAO_Object_Manager<IR_ExceptionDef, IR_ExceptionDef_var> operator[] (CORBA::ULong index);
-   
-   // in, inout, out, _retn 
--  const ExceptionDefSeq &in (void) const;
--  ExceptionDefSeq &inout (void);
--  ExceptionDefSeq *&out (void);
--  ExceptionDefSeq *_retn (void);
--  ExceptionDefSeq *ptr (void) const;
-+  const IR_ExceptionDefSeq &in (void) const;
-+  IR_ExceptionDefSeq &inout (void);
-+  IR_ExceptionDefSeq *&out (void);
-+  IR_ExceptionDefSeq *_retn (void);
-+  IR_ExceptionDefSeq *ptr (void) const;
- 
- private:
--  ExceptionDefSeq *ptr_;
-+  IR_ExceptionDefSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EXCEPTIONDEFSEQ___OUT_CH_)
--#define _IR_EXCEPTIONDEFSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export ExceptionDefSeq_out
-+class TAO_IFR_Client_Export IR_ExceptionDefSeq_out
- {
- public:
--  ExceptionDefSeq_out (ExceptionDefSeq *&);
--  ExceptionDefSeq_out (ExceptionDefSeq_var &);
--  ExceptionDefSeq_out (const ExceptionDefSeq_out &);
--  ExceptionDefSeq_out &operator= (const ExceptionDefSeq_out &);
--  ExceptionDefSeq_out &operator= (ExceptionDefSeq *);
--  operator ExceptionDefSeq *&();
--  ExceptionDefSeq *&ptr (void);
--  ExceptionDefSeq *operator-> (void);
--  TAO_Object_Manager<ExceptionDef, ExceptionDef_var> operator[] (CORBA::ULong index);
-+  IR_ExceptionDefSeq_out (IR_ExceptionDefSeq *&);
-+  IR_ExceptionDefSeq_out (IR_ExceptionDefSeq_var &);
-+  IR_ExceptionDefSeq_out (const IR_ExceptionDefSeq_out &);
-+  IR_ExceptionDefSeq_out &operator= (const IR_ExceptionDefSeq_out &);
-+  IR_ExceptionDefSeq_out &operator= (IR_ExceptionDefSeq *);
-+  operator IR_ExceptionDefSeq *&();
-+  IR_ExceptionDefSeq *&ptr (void);
-+  IR_ExceptionDefSeq *operator-> (void);
-+  TAO_Object_Manager<IR_ExceptionDef, IR_ExceptionDef_var> operator[] (CORBA::ULong index);
-   
- private:
--  ExceptionDefSeq *&ptr_;
-+  IR_ExceptionDefSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ExceptionDefSeq_var &);
-+  void operator= (const IR_ExceptionDefSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionDefSeq;
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CH_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CH_
--
-   class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -16755,252 +13860,190 @@
-     _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum); 
-     _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      ExceptionDescription *data,
-+      IR_ExceptionDescription *data,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs);
-     _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &operator= (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs);
-     virtual ~_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (void); // Dtor.
-     // = Accessors.
--    ExceptionDescription &operator[] (CORBA::ULong i);
--    const ExceptionDescription &operator[] (CORBA::ULong i) const;
-+    IR_ExceptionDescription &operator[] (CORBA::ULong i);
-+    const IR_ExceptionDescription &operator[] (CORBA::ULong i) const;
-     // = Static operations.
--    static ExceptionDescription *allocbuf (CORBA::ULong size);
--    static void freebuf (ExceptionDescription *buffer);
-+    static IR_ExceptionDescription *allocbuf (CORBA::ULong size);
-+    static void freebuf (IR_ExceptionDescription *buffer);
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
-     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-     
--    ExceptionDescription *get_buffer (CORBA::Boolean orphan = 0);
--    const ExceptionDescription *get_buffer (void) const;
-+    IR_ExceptionDescription *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_ExceptionDescription *get_buffer (void) const;
-     void replace (CORBA::ULong max,
-       CORBA::ULong length,
--      ExceptionDescription *data,
-+      IR_ExceptionDescription *data,
-       CORBA::Boolean release);
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_EXCDESCRIPTIONSEQ_CH_)
--#define _IR_EXCDESCRIPTIONSEQ_CH_
--
--class ExcDescriptionSeq;
--class ExcDescriptionSeq_var;
--
- // *************************************************************
--// ExcDescriptionSeq
-+// IR_ExcDescriptionSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export ExcDescriptionSeq : public 
-+class TAO_IFR_Client_Export IR_ExcDescriptionSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<ExceptionDescription>
-+  TAO_Unbounded_Sequence<IR_ExceptionDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  ExcDescriptionSeq (void); // default ctor
--  ExcDescriptionSeq (CORBA::ULong max); // uses max size
--  ExcDescriptionSeq (
-+  IR_ExcDescriptionSeq (void); // default ctor
-+  IR_ExcDescriptionSeq (CORBA::ULong max); // uses max size
-+  IR_ExcDescriptionSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    ExceptionDescription *buffer, 
-+    IR_ExceptionDescription *buffer,
-     CORBA::Boolean release = 0
-   );
--  ExcDescriptionSeq (const ExcDescriptionSeq &); // copy ctor
--  ~ExcDescriptionSeq (void);
-+  IR_ExcDescriptionSeq (const IR_ExcDescriptionSeq &); // copy ctor
-+  ~IR_ExcDescriptionSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ExcDescriptionSeq_var _var_type;
-+  typedef IR_ExcDescriptionSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EXCDESCRIPTIONSEQ___VAR_CH_)
--#define _IR_EXCDESCRIPTIONSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::ExcDescriptionSeq_var
-+// class IR_ExcDescriptionSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export ExcDescriptionSeq_var
-+class TAO_IFR_Client_Export IR_ExcDescriptionSeq_var
- {
- public:
--  ExcDescriptionSeq_var (void); // default constructor
--  ExcDescriptionSeq_var (ExcDescriptionSeq *);
--  ExcDescriptionSeq_var (const ExcDescriptionSeq_var &); // copy constructor
--  ~ExcDescriptionSeq_var (void); // destructor
-+  IR_ExcDescriptionSeq_var (void); // default constructor
-+  IR_ExcDescriptionSeq_var (IR_ExcDescriptionSeq *);
-+  IR_ExcDescriptionSeq_var (const IR_ExcDescriptionSeq_var &); // copy constructor
-+  ~IR_ExcDescriptionSeq_var (void); // destructor
-   
--  ExcDescriptionSeq_var &operator= (ExcDescriptionSeq *);
--  ExcDescriptionSeq_var &operator= (const ExcDescriptionSeq_var &);
--  ExcDescriptionSeq *operator-> (void);
--  const ExcDescriptionSeq *operator-> (void) const;
-+  IR_ExcDescriptionSeq_var &operator= (IR_ExcDescriptionSeq *);
-+  IR_ExcDescriptionSeq_var &operator= (const IR_ExcDescriptionSeq_var &);
-+  IR_ExcDescriptionSeq *operator-> (void);
-+  const IR_ExcDescriptionSeq *operator-> (void) const;
-   
--  operator const ExcDescriptionSeq &() const;
--  operator ExcDescriptionSeq &();
--  operator ExcDescriptionSeq &() const;
--  operator ExcDescriptionSeq *&(); // variable-size base types only
-+  operator const IR_ExcDescriptionSeq &() const;
-+  operator IR_ExcDescriptionSeq &();
-+  operator IR_ExcDescriptionSeq &() const;
-+  operator IR_ExcDescriptionSeq *&(); // variable-size base types only
-   
--  ExceptionDescription & operator[] (CORBA::ULong index);
--  const ExceptionDescription & operator[] (CORBA::ULong index) const;
-+  IR_ExceptionDescription & operator[] (CORBA::ULong index);
-+  const IR_ExceptionDescription & operator[] (CORBA::ULong index) const;
-   
-   // in, inout, out, _retn 
--  const ExcDescriptionSeq &in (void) const;
--  ExcDescriptionSeq &inout (void);
--  ExcDescriptionSeq *&out (void);
--  ExcDescriptionSeq *_retn (void);
--  ExcDescriptionSeq *ptr (void) const;
-+  const IR_ExcDescriptionSeq &in (void) const;
-+  IR_ExcDescriptionSeq &inout (void);
-+  IR_ExcDescriptionSeq *&out (void);
-+  IR_ExcDescriptionSeq *_retn (void);
-+  IR_ExcDescriptionSeq *ptr (void) const;
- 
- private:
--  ExcDescriptionSeq *ptr_;
-+  IR_ExcDescriptionSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EXCDESCRIPTIONSEQ___OUT_CH_)
--#define _IR_EXCDESCRIPTIONSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export ExcDescriptionSeq_out
-+class TAO_IFR_Client_Export IR_ExcDescriptionSeq_out
- {
- public:
--  ExcDescriptionSeq_out (ExcDescriptionSeq *&);
--  ExcDescriptionSeq_out (ExcDescriptionSeq_var &);
--  ExcDescriptionSeq_out (const ExcDescriptionSeq_out &);
--  ExcDescriptionSeq_out &operator= (const ExcDescriptionSeq_out &);
--  ExcDescriptionSeq_out &operator= (ExcDescriptionSeq *);
--  operator ExcDescriptionSeq *&();
--  ExcDescriptionSeq *&ptr (void);
--  ExcDescriptionSeq *operator-> (void);
--  ExceptionDescription & operator[] (CORBA::ULong index);
-+  IR_ExcDescriptionSeq_out (IR_ExcDescriptionSeq *&);
-+  IR_ExcDescriptionSeq_out (IR_ExcDescriptionSeq_var &);
-+  IR_ExcDescriptionSeq_out (const IR_ExcDescriptionSeq_out &);
-+  IR_ExcDescriptionSeq_out &operator= (const IR_ExcDescriptionSeq_out &);
-+  IR_ExcDescriptionSeq_out &operator= (IR_ExcDescriptionSeq *);
-+  operator IR_ExcDescriptionSeq *&();
-+  IR_ExcDescriptionSeq *&ptr (void);
-+  IR_ExcDescriptionSeq *operator-> (void);
-+  IR_ExceptionDescription & operator[] (CORBA::ULong index);
-   
- private:
--  ExcDescriptionSeq *&ptr_;
-+  IR_ExcDescriptionSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ExcDescriptionSeq_var &);
--};
--
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExcDescriptionSeq;
--
--enum AttributeMode
--{
--    ATTR_NORMAL,
--    ATTR_READONLY  
-+  void operator= (const IR_ExcDescriptionSeq_var &);
- };
--typedef AttributeMode &AttributeMode_out;
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeMode;
--
--
--#if !defined (_IR_ATTRIBUTEDEF___PTR_CH_)
--#define _IR_ATTRIBUTEDEF___PTR_CH_
--
--class AttributeDef;
--typedef AttributeDef *AttributeDef_ptr;
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ATTRIBUTEDEF___VAR_CH_)
--#define _IR_ATTRIBUTEDEF___VAR_CH_
--
--class TAO_IFR_Client_Export AttributeDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_AttributeDef_var : public TAO_Base_var
- {
- public:
--  AttributeDef_var (void); // default constructor
--  AttributeDef_var (AttributeDef_ptr p) : ptr_ (p) {} 
--  AttributeDef_var (const AttributeDef_var &); // copy constructor
--  ~AttributeDef_var (void); // destructor
-+  IR_AttributeDef_var (void); // default constructor
-+  IR_AttributeDef_var (IR_AttributeDef_ptr p) : ptr_ (p) {}
-+  IR_AttributeDef_var (const IR_AttributeDef_var &); // copy constructor
-+  ~IR_AttributeDef_var (void); // destructor
-   
--  AttributeDef_var &operator= (AttributeDef_ptr);
--  AttributeDef_var &operator= (const AttributeDef_var &);
--  AttributeDef_ptr operator-> (void) const;
-+  IR_AttributeDef_var &operator= (IR_AttributeDef_ptr);
-+  IR_AttributeDef_var &operator= (const IR_AttributeDef_var &);
-+  IR_AttributeDef_ptr operator-> (void) const;
-   
--  operator const AttributeDef_ptr &() const;
--  operator AttributeDef_ptr &();
-+  operator const IR_AttributeDef_ptr &() const;
-+  operator IR_AttributeDef_ptr &();
-   // in, inout, out, _retn 
--  AttributeDef_ptr in (void) const;
--  AttributeDef_ptr &inout (void);
--  AttributeDef_ptr &out (void);
--  AttributeDef_ptr _retn (void);
--  AttributeDef_ptr ptr (void) const;
-+  IR_AttributeDef_ptr in (void) const;
-+  IR_AttributeDef_ptr &inout (void);
-+  IR_AttributeDef_ptr &out (void);
-+  IR_AttributeDef_ptr _retn (void);
-+  IR_AttributeDef_ptr ptr (void) const;
- 
- private:
--  AttributeDef_ptr ptr_;
-+  IR_AttributeDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  AttributeDef_var (const TAO_Base_var &rhs);
--  AttributeDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_AttributeDef_var (const TAO_Base_var &rhs);
-+  IR_AttributeDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ATTRIBUTEDEF___OUT_CH_)
--#define _IR_ATTRIBUTEDEF___OUT_CH_
--
--class TAO_IFR_Client_Export AttributeDef_out
-+class TAO_IFR_Client_Export IR_AttributeDef_out
- {
- public:
--  AttributeDef_out (AttributeDef_ptr &);
--  AttributeDef_out (AttributeDef_var &);
--  AttributeDef_out (const AttributeDef_out &);
--  AttributeDef_out &operator= (const AttributeDef_out &);
--  AttributeDef_out &operator= (const AttributeDef_var &);
--  AttributeDef_out &operator= (AttributeDef_ptr);
--  operator AttributeDef_ptr &();
--  AttributeDef_ptr &ptr (void);
--  AttributeDef_ptr operator-> (void);
-+  IR_AttributeDef_out (IR_AttributeDef_ptr &);
-+  IR_AttributeDef_out (IR_AttributeDef_var &);
-+  IR_AttributeDef_out (const IR_AttributeDef_out &);
-+  IR_AttributeDef_out &operator= (const IR_AttributeDef_out &);
-+  IR_AttributeDef_out &operator= (const IR_AttributeDef_var &);
-+  IR_AttributeDef_out &operator= (IR_AttributeDef_ptr);
-+  operator IR_AttributeDef_ptr &();
-+  IR_AttributeDef_ptr &ptr (void);
-+  IR_AttributeDef_ptr operator-> (void);
-   
- private:
--  AttributeDef_ptr &ptr_;
-+  IR_AttributeDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ATTRIBUTEDEF_CH_)
--#define _IR_ATTRIBUTEDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_AttributeDef_Proxy_Impl;
- class _TAO_AttributeDef_Remote_Proxy_Impl;
- class _TAO_AttributeDef_Proxy_Broker;
- class _TAO_AttributeDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export AttributeDef: public virtual Contained
-+class TAO_IFR_Client_Export IR_AttributeDef: public virtual IR_Contained
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef AttributeDef_ptr _ptr_type;
--  typedef AttributeDef_var _var_type;
-+  typedef IR_AttributeDef_ptr _ptr_type;
-+  typedef IR_AttributeDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static AttributeDef_ptr _duplicate (AttributeDef_ptr obj);
--  static AttributeDef_ptr _narrow (
-+  static IR_AttributeDef_ptr _duplicate (IR_AttributeDef_ptr obj);
-+  static IR_AttributeDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static AttributeDef_ptr _unchecked_narrow (
-+  static IR_AttributeDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static AttributeDef_ptr _nil (void)
-+  static IR_AttributeDef_ptr _nil (void)
-     {
--      return (AttributeDef_ptr)0;
-+      return (IR_AttributeDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -17013,7 +14056,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr type_def (
-+  virtual IR_IDLType_ptr type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17022,7 +14065,7 @@
-     ));
- 
-   virtual void type_def (
--      IR::IDLType_ptr type_def,
-+      IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17030,7 +14073,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::AttributeMode mode (
-+  virtual IR_AttributeMode mode (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17039,7 +14082,7 @@
-     ));
- 
-   virtual void mode (
--      IR::AttributeMode mode,
-+      IR_AttributeMode mode,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -17060,14 +14103,14 @@
-   _TAO_AttributeDef_Proxy_Broker *the_TAO_AttributeDef_Proxy_Broker_;
-   
- protected:
--  AttributeDef (int collocated = 0);
-+  IR_AttributeDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_AttributeDef_setup_collocation (int collocated);
-     
--    AttributeDef (
-+  IR_AttributeDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -17077,10 +14120,10 @@
-     friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_AttributeDef_Direct_Proxy_Impl;
-   
--  virtual ~AttributeDef (void);
-+  virtual ~IR_AttributeDef (void);
- private:
--  AttributeDef (const AttributeDef &);
--  void operator= (const AttributeDef &);  
-+  IR_AttributeDef (const IR_AttributeDef &);
-+  void operator= (const IR_AttributeDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -17090,7 +14133,7 @@
-   class TAO_ClientRequestInfo_IR_AttributeDef_type_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::AttributeDef;
-+    friend class IR_AttributeDef;
-     
-     friend class _TAO_AttributeDef_Remote_Proxy_Impl;
-     friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
-@@ -17132,7 +14175,7 @@
- class TAO_ClientRequestInfo_IR_AttributeDef_type_def_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::AttributeDef;
-+    friend class IR_AttributeDef;
-   
-   friend class _TAO_AttributeDef_Remote_Proxy_Impl;
-   friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
-@@ -17166,15 +14209,15 @@
- private:
-   TAO_ClientRequestInfo_IR_AttributeDef_type_def_get (const TAO_ClientRequestInfo_IR_AttributeDef_type_def_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_AttributeDef_type_def_get &);
--  void result (IR::IDLType_ptr result);
-+    void result (IR_IDLType_ptr result);
-   // update the result 
--  IR::IDLType_ptr _result;
-+    IR_IDLType_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_AttributeDef_type_def_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::AttributeDef;
-+    friend class IR_AttributeDef;
-   
-   friend class _TAO_AttributeDef_Remote_Proxy_Impl;
-   friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
-@@ -17183,7 +14226,7 @@
- TAO_ClientRequestInfo_IR_AttributeDef_type_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr type_def,
-+        IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -17209,14 +14252,14 @@
- private:
-   TAO_ClientRequestInfo_IR_AttributeDef_type_def_set (const TAO_ClientRequestInfo_IR_AttributeDef_type_def_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_AttributeDef_type_def_set &);
--  IR::IDLType_ptr type_def_;
-+    IR_IDLType_ptr type_def_;
-   
- };
- 
- class TAO_ClientRequestInfo_IR_AttributeDef_mode_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::AttributeDef;
-+    friend class IR_AttributeDef;
-   
-   friend class _TAO_AttributeDef_Remote_Proxy_Impl;
-   friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
-@@ -17250,15 +14293,15 @@
- private:
-   TAO_ClientRequestInfo_IR_AttributeDef_mode_get (const TAO_ClientRequestInfo_IR_AttributeDef_mode_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_AttributeDef_mode_get &);
--  void result (IR::AttributeMode result);
-+    void result (IR_AttributeMode result);
-   // update the result 
--  IR::AttributeMode _result;
-+    IR_AttributeMode _result;
- };
- 
- class TAO_ClientRequestInfo_IR_AttributeDef_mode_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::AttributeDef;
-+    friend class IR_AttributeDef;
-   
-   friend class _TAO_AttributeDef_Remote_Proxy_Impl;
-   friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
-@@ -17267,7 +14310,7 @@
- TAO_ClientRequestInfo_IR_AttributeDef_mode_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::AttributeMode & mode,
-+        IR_AttributeMode & mode,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -17293,7 +14336,7 @@
- private:
-   TAO_ClientRequestInfo_IR_AttributeDef_mode_set (const TAO_ClientRequestInfo_IR_AttributeDef_mode_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_AttributeDef_mode_set &);
--  const IR::AttributeMode & mode_;
-+    const IR_AttributeMode & mode_;
-   
- };
- 
-@@ -17312,7 +14355,7 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_AttributeDef_Proxy_Impl : 
--  public virtual IR::_TAO_Contained_Proxy_Impl
-+  public virtual _TAO_Contained_Proxy_Impl
- {
- public:
-   virtual ~_TAO_AttributeDef_Proxy_Impl (void) { }
-@@ -17325,7 +14368,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::IDLType_ptr type_def (
-+  virtual IR_IDLType_ptr type_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -17335,14 +14378,14 @@
- 
-   virtual void type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr type_def,
-+      IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::AttributeMode mode (
-+  virtual IR_AttributeMode mode (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -17352,7 +14395,7 @@
- 
-   virtual void mode (
-       CORBA_Object *_collocated_tao_target_,
--      IR::AttributeMode mode,
-+      IR_AttributeMode mode,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -17363,6 +14406,7 @@
-   _TAO_AttributeDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -17375,7 +14419,7 @@
- class TAO_IFR_Client_Export _TAO_AttributeDef_Remote_Proxy_Impl : 
-   public virtual _TAO_AttributeDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_Contained_Remote_Proxy_Impl
-+  public virtual _TAO_Contained_Remote_Proxy_Impl
-   
- {
- public:
-@@ -17391,7 +14435,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr type_def (
-+  virtual IR_IDLType_ptr type_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -17401,14 +14445,14 @@
- 
-   virtual void type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr type_def,
-+      IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::AttributeMode mode (
-+  virtual IR_AttributeMode mode (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -17418,7 +14462,7 @@
- 
-   virtual void mode (
-       CORBA_Object *_collocated_tao_target_,
--      IR::AttributeMode mode,
-+      IR_AttributeMode mode,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -17447,8 +14491,9 @@
- {
- public:
-   virtual ~_TAO_AttributeDef_Proxy_Broker (void);
-+
-   virtual _TAO_AttributeDef_Proxy_Impl &select_proxy (
--    AttributeDef *object,
-+    IR_AttributeDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -17457,6 +14502,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -17474,7 +14520,7 @@
-   virtual ~_TAO_AttributeDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_AttributeDef_Proxy_Impl &select_proxy (
--    AttributeDef *object,
-+    IR_AttributeDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -17488,24 +14534,15 @@
-   static _TAO_AttributeDef_Remote_Proxy_Broker *the_TAO_AttributeDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeDef;
--
--struct AttributeDescription;
--class AttributeDescription_var;
--
--struct TAO_IFR_Client_Export AttributeDescription
-+struct TAO_IFR_Client_Export IR_AttributeDescription
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef AttributeDescription_var _var_type;
-+  typedef IR_AttributeDescription_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
-@@ -17515,150 +14552,122 @@
-   TAO_String_Manager defined_in;
-   TAO_String_Manager version;
-   CORBA::TypeCode_var type;
--  ACE_NESTED_CLASS (IR, AttributeMode) mode;
--  ACE_NESTED_CLASS (IR, ExcDescriptionSeq) get_exceptions;
--  ACE_NESTED_CLASS (IR, ExcDescriptionSeq) put_exceptions;
-+  IR_AttributeMode mode;
-+  IR_ExcDescriptionSeq get_exceptions;
-+  IR_ExcDescriptionSeq put_exceptions;
- };
- 
--class TAO_IFR_Client_Export AttributeDescription_var
-+class TAO_IFR_Client_Export IR_AttributeDescription_var
- {
- public:
--  AttributeDescription_var (void); // default constructor
--  AttributeDescription_var (AttributeDescription *);
--  AttributeDescription_var (const AttributeDescription_var &); // copy constructor
--  ~AttributeDescription_var (void); // destructor
-+  IR_AttributeDescription_var (void); // default constructor
-+  IR_AttributeDescription_var (IR_AttributeDescription *);
-+  IR_AttributeDescription_var (const IR_AttributeDescription_var &); // copy constructor
-+  ~IR_AttributeDescription_var (void); // destructor
-   
--  AttributeDescription_var &operator= (AttributeDescription *);
--  AttributeDescription_var &operator= (const AttributeDescription_var &);
--  AttributeDescription *operator-> (void);
--  const AttributeDescription *operator-> (void) const;
-+  IR_AttributeDescription_var &operator= (IR_AttributeDescription *);
-+  IR_AttributeDescription_var &operator= (const IR_AttributeDescription_var &);
-+  IR_AttributeDescription *operator-> (void);
-+  const IR_AttributeDescription *operator-> (void) const;
-   
--  operator const AttributeDescription &() const;
--  operator AttributeDescription &();
--  operator AttributeDescription &() const;
--  operator AttributeDescription *&(); // variable-size types only
-+  operator const IR_AttributeDescription &() const;
-+  operator IR_AttributeDescription &();
-+  operator IR_AttributeDescription &() const;
-+  operator IR_AttributeDescription *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const AttributeDescription &in (void) const;
--  AttributeDescription &inout (void);
--  AttributeDescription *&out (void);
--  AttributeDescription *_retn (void);
--  AttributeDescription *ptr (void) const;
-+  const IR_AttributeDescription &in (void) const;
-+  IR_AttributeDescription &inout (void);
-+  IR_AttributeDescription *&out (void);
-+  IR_AttributeDescription *_retn (void);
-+  IR_AttributeDescription *ptr (void) const;
- 
- private:
--  AttributeDescription *ptr_;
-+  IR_AttributeDescription *ptr_;
- };
- 
--class TAO_IFR_Client_Export AttributeDescription_out
-+class TAO_IFR_Client_Export IR_AttributeDescription_out
- {
- public:
--  AttributeDescription_out (AttributeDescription *&);
--  AttributeDescription_out (AttributeDescription_var &);
--  AttributeDescription_out (const AttributeDescription_out &);
--  AttributeDescription_out &operator= (const AttributeDescription_out &);
--  AttributeDescription_out &operator= (AttributeDescription *);
--  operator AttributeDescription *&();
--  AttributeDescription *&ptr (void);
--  AttributeDescription *operator-> (void);
-+  IR_AttributeDescription_out (IR_AttributeDescription *&);
-+  IR_AttributeDescription_out (IR_AttributeDescription_var &);
-+  IR_AttributeDescription_out (const IR_AttributeDescription_out &);
-+  IR_AttributeDescription_out &operator= (const IR_AttributeDescription_out &);
-+  IR_AttributeDescription_out &operator= (IR_AttributeDescription *);
-+  operator IR_AttributeDescription *&();
-+  IR_AttributeDescription *&ptr (void);
-+  IR_AttributeDescription *operator-> (void);
-   
- private:
--  AttributeDescription *&ptr_;
-+  IR_AttributeDescription *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const AttributeDescription_var &);
--};
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeDescription;
--
--enum OperationMode
--{
--    OP_NORMAL,
--    OP_ONEWAY  
--};
--typedef OperationMode &OperationMode_out;
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationMode;
--
--enum ParameterMode
--{
--    PARAM_IN,
--    PARAM_OUT,
--    PARAM_INOUT  
-+  void operator= (const IR_AttributeDescription_var &);
- };
--typedef ParameterMode &ParameterMode_out;
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParameterMode;
- 
--struct ParameterDescription;
--class ParameterDescription_var;
--
--struct TAO_IFR_Client_Export ParameterDescription
-+struct TAO_IFR_Client_Export IR_ParameterDescription
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ParameterDescription_var _var_type;
-+  typedef IR_ParameterDescription_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
- 
-   TAO_String_Manager name;
-   CORBA::TypeCode_var type;
--  ACE_NESTED_CLASS (IR, IDLType_var) type_def;
--  ACE_NESTED_CLASS (IR, ParameterMode) mode;
-+  IR_IDLType_var type_def;
-+  IR_ParameterMode mode;
- };
- 
--class TAO_IFR_Client_Export ParameterDescription_var
-+class TAO_IFR_Client_Export IR_ParameterDescription_var
- {
- public:
--  ParameterDescription_var (void); // default constructor
--  ParameterDescription_var (ParameterDescription *);
--  ParameterDescription_var (const ParameterDescription_var &); // copy constructor
--  ~ParameterDescription_var (void); // destructor
-+  IR_ParameterDescription_var (void); // default constructor
-+  IR_ParameterDescription_var (IR_ParameterDescription *);
-+  IR_ParameterDescription_var (const IR_ParameterDescription_var &); // copy constructor
-+  ~IR_ParameterDescription_var (void); // destructor
-   
--  ParameterDescription_var &operator= (ParameterDescription *);
--  ParameterDescription_var &operator= (const ParameterDescription_var &);
--  ParameterDescription *operator-> (void);
--  const ParameterDescription *operator-> (void) const;
-+  IR_ParameterDescription_var &operator= (IR_ParameterDescription *);
-+  IR_ParameterDescription_var &operator= (const IR_ParameterDescription_var &);
-+  IR_ParameterDescription *operator-> (void);
-+  const IR_ParameterDescription *operator-> (void) const;
-   
--  operator const ParameterDescription &() const;
--  operator ParameterDescription &();
--  operator ParameterDescription &() const;
--  operator ParameterDescription *&(); // variable-size types only
-+  operator const IR_ParameterDescription &() const;
-+  operator IR_ParameterDescription &();
-+  operator IR_ParameterDescription &() const;
-+  operator IR_ParameterDescription *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const ParameterDescription &in (void) const;
--  ParameterDescription &inout (void);
--  ParameterDescription *&out (void);
--  ParameterDescription *_retn (void);
--  ParameterDescription *ptr (void) const;
-+  const IR_ParameterDescription &in (void) const;
-+  IR_ParameterDescription &inout (void);
-+  IR_ParameterDescription *&out (void);
-+  IR_ParameterDescription *_retn (void);
-+  IR_ParameterDescription *ptr (void) const;
- 
- private:
--  ParameterDescription *ptr_;
-+  IR_ParameterDescription *ptr_;
- };
- 
--class TAO_IFR_Client_Export ParameterDescription_out
-+class TAO_IFR_Client_Export IR_ParameterDescription_out
- {
- public:
--  ParameterDescription_out (ParameterDescription *&);
--  ParameterDescription_out (ParameterDescription_var &);
--  ParameterDescription_out (const ParameterDescription_out &);
--  ParameterDescription_out &operator= (const ParameterDescription_out &);
--  ParameterDescription_out &operator= (ParameterDescription *);
--  operator ParameterDescription *&();
--  ParameterDescription *&ptr (void);
--  ParameterDescription *operator-> (void);
-+  IR_ParameterDescription_out (IR_ParameterDescription *&);
-+  IR_ParameterDescription_out (IR_ParameterDescription_var &);
-+  IR_ParameterDescription_out (const IR_ParameterDescription_out &);
-+  IR_ParameterDescription_out &operator= (const IR_ParameterDescription_out &);
-+  IR_ParameterDescription_out &operator= (IR_ParameterDescription *);
-+  operator IR_ParameterDescription *&();
-+  IR_ParameterDescription *&ptr (void);
-+  IR_ParameterDescription *operator-> (void);
-   
- private:
--  ParameterDescription *&ptr_;
-+  IR_ParameterDescription *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ParameterDescription_var &);
-+  void operator= (const IR_ParameterDescription_var &);
- };
- 
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParameterDescription;
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CH_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CH_
--
-   class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_ParDescriptionSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -17668,160 +14677,121 @@
-     _TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum); 
-     _TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      ParameterDescription *data,
-+      IR_ParameterDescription *data,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Sequence_IR_ParDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs);
-     _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &operator= (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs);
-     virtual ~_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void); // Dtor.
-     // = Accessors.
--    ParameterDescription &operator[] (CORBA::ULong i);
--    const ParameterDescription &operator[] (CORBA::ULong i) const;
-+    IR_ParameterDescription &operator[] (CORBA::ULong i);
-+    const IR_ParameterDescription &operator[] (CORBA::ULong i) const;
-     // = Static operations.
--    static ParameterDescription *allocbuf (CORBA::ULong size);
--    static void freebuf (ParameterDescription *buffer);
-+    static IR_ParameterDescription *allocbuf (CORBA::ULong size);
-+    static void freebuf (IR_ParameterDescription *buffer);
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
-     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-     
--    ParameterDescription *get_buffer (CORBA::Boolean orphan = 0);
--    const ParameterDescription *get_buffer (void) const;
-+    IR_ParameterDescription *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_ParameterDescription *get_buffer (void) const;
-     void replace (CORBA::ULong max,
-       CORBA::ULong length,
--      ParameterDescription *data,
-+      IR_ParameterDescription *data,
-       CORBA::Boolean release);
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_PARDESCRIPTIONSEQ_CH_)
--#define _IR_PARDESCRIPTIONSEQ_CH_
--
--class ParDescriptionSeq;
--class ParDescriptionSeq_var;
--
- // *************************************************************
--// ParDescriptionSeq
-+// IR_ParDescriptionSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export ParDescriptionSeq : public 
-+class TAO_IFR_Client_Export IR_ParDescriptionSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_ParDescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<ParameterDescription>
-+  TAO_Unbounded_Sequence<IR_ParameterDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  ParDescriptionSeq (void); // default ctor
--  ParDescriptionSeq (CORBA::ULong max); // uses max size
--  ParDescriptionSeq (
-+  IR_ParDescriptionSeq (void); // default ctor
-+  IR_ParDescriptionSeq (CORBA::ULong max); // uses max size
-+  IR_ParDescriptionSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    ParameterDescription *buffer, 
-+    IR_ParameterDescription *buffer,
-     CORBA::Boolean release = 0
-   );
--  ParDescriptionSeq (const ParDescriptionSeq &); // copy ctor
--  ~ParDescriptionSeq (void);
-+  IR_ParDescriptionSeq (const IR_ParDescriptionSeq &); // copy ctor
-+  ~IR_ParDescriptionSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ParDescriptionSeq_var _var_type;
-+  typedef IR_ParDescriptionSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PARDESCRIPTIONSEQ___VAR_CH_)
--#define _IR_PARDESCRIPTIONSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::ParDescriptionSeq_var
-+// class IR_ParDescriptionSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export ParDescriptionSeq_var
-+class TAO_IFR_Client_Export IR_ParDescriptionSeq_var
- {
- public:
--  ParDescriptionSeq_var (void); // default constructor
--  ParDescriptionSeq_var (ParDescriptionSeq *);
--  ParDescriptionSeq_var (const ParDescriptionSeq_var &); // copy constructor
--  ~ParDescriptionSeq_var (void); // destructor
-+  IR_ParDescriptionSeq_var (void); // default constructor
-+  IR_ParDescriptionSeq_var (IR_ParDescriptionSeq *);
-+  IR_ParDescriptionSeq_var (const IR_ParDescriptionSeq_var &); // copy constructor
-+  ~IR_ParDescriptionSeq_var (void); // destructor
-   
--  ParDescriptionSeq_var &operator= (ParDescriptionSeq *);
--  ParDescriptionSeq_var &operator= (const ParDescriptionSeq_var &);
--  ParDescriptionSeq *operator-> (void);
--  const ParDescriptionSeq *operator-> (void) const;
-+  IR_ParDescriptionSeq_var &operator= (IR_ParDescriptionSeq *);
-+  IR_ParDescriptionSeq_var &operator= (const IR_ParDescriptionSeq_var &);
-+  IR_ParDescriptionSeq *operator-> (void);
-+  const IR_ParDescriptionSeq *operator-> (void) const;
-   
--  operator const ParDescriptionSeq &() const;
--  operator ParDescriptionSeq &();
--  operator ParDescriptionSeq &() const;
--  operator ParDescriptionSeq *&(); // variable-size base types only
-+  operator const IR_ParDescriptionSeq &() const;
-+  operator IR_ParDescriptionSeq &();
-+  operator IR_ParDescriptionSeq &() const;
-+  operator IR_ParDescriptionSeq *&(); // variable-size base types only
-   
--  ParameterDescription & operator[] (CORBA::ULong index);
--  const ParameterDescription & operator[] (CORBA::ULong index) const;
-+  IR_ParameterDescription & operator[] (CORBA::ULong index);
-+  const IR_ParameterDescription & operator[] (CORBA::ULong index) const;
-   
-   // in, inout, out, _retn 
--  const ParDescriptionSeq &in (void) const;
--  ParDescriptionSeq &inout (void);
--  ParDescriptionSeq *&out (void);
--  ParDescriptionSeq *_retn (void);
--  ParDescriptionSeq *ptr (void) const;
-+  const IR_ParDescriptionSeq &in (void) const;
-+  IR_ParDescriptionSeq &inout (void);
-+  IR_ParDescriptionSeq *&out (void);
-+  IR_ParDescriptionSeq *_retn (void);
-+  IR_ParDescriptionSeq *ptr (void) const;
- 
- private:
--  ParDescriptionSeq *ptr_;
-+  IR_ParDescriptionSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PARDESCRIPTIONSEQ___OUT_CH_)
--#define _IR_PARDESCRIPTIONSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export ParDescriptionSeq_out
-+class TAO_IFR_Client_Export IR_ParDescriptionSeq_out
- {
- public:
--  ParDescriptionSeq_out (ParDescriptionSeq *&);
--  ParDescriptionSeq_out (ParDescriptionSeq_var &);
--  ParDescriptionSeq_out (const ParDescriptionSeq_out &);
--  ParDescriptionSeq_out &operator= (const ParDescriptionSeq_out &);
--  ParDescriptionSeq_out &operator= (ParDescriptionSeq *);
--  operator ParDescriptionSeq *&();
--  ParDescriptionSeq *&ptr (void);
--  ParDescriptionSeq *operator-> (void);
--  ParameterDescription & operator[] (CORBA::ULong index);
-+  IR_ParDescriptionSeq_out (IR_ParDescriptionSeq *&);
-+  IR_ParDescriptionSeq_out (IR_ParDescriptionSeq_var &);
-+  IR_ParDescriptionSeq_out (const IR_ParDescriptionSeq_out &);
-+  IR_ParDescriptionSeq_out &operator= (const IR_ParDescriptionSeq_out &);
-+  IR_ParDescriptionSeq_out &operator= (IR_ParDescriptionSeq *);
-+  operator IR_ParDescriptionSeq *&();
-+  IR_ParDescriptionSeq *&ptr (void);
-+  IR_ParDescriptionSeq *operator-> (void);
-+  IR_ParameterDescription & operator[] (CORBA::ULong index);
-   
- private:
--  ParDescriptionSeq *&ptr_;
-+  IR_ParDescriptionSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ParDescriptionSeq_var &);
-+  void operator= (const IR_ParDescriptionSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParDescriptionSeq;
--
--typedef char * ContextIdentifier;
--typedef CORBA::String_var ContextIdentifier_var;
--typedef CORBA::String_out ContextIdentifier_out;
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContextIdentifier;
--
--
--#if !defined (_IR_CONTEXTIDSEQ_CH_)
--#define _IR_CONTEXTIDSEQ_CH_
--
--class ContextIdSeq;
--class ContextIdSeq_var;
--
- // *************************************************************
--// ContextIdSeq
-+// IR_ContextIdSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export ContextIdSeq : public 
-+class TAO_IFR_Client_Export IR_ContextIdSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_String_Sequence
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-@@ -17829,197 +14799,152 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  ContextIdSeq (void); // default ctor
--  ContextIdSeq (CORBA::ULong max); // uses max size
--  ContextIdSeq (
-+  IR_ContextIdSeq (void); // default ctor
-+  IR_ContextIdSeq (CORBA::ULong max); // uses max size
-+  IR_ContextIdSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
-     char * *buffer, 
-     CORBA::Boolean release = 0
-   );
--  ContextIdSeq (const ContextIdSeq &); // copy ctor
--  ~ContextIdSeq (void);
-+  IR_ContextIdSeq (const IR_ContextIdSeq &); // copy ctor
-+  ~IR_ContextIdSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ContextIdSeq_var _var_type;
-+  typedef IR_ContextIdSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTEXTIDSEQ___VAR_CH_)
--#define _IR_CONTEXTIDSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::ContextIdSeq_var
-+// class IR_ContextIdSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export ContextIdSeq_var
-+class TAO_IFR_Client_Export IR_ContextIdSeq_var
- {
- public:
--  ContextIdSeq_var (void); // default constructor
--  ContextIdSeq_var (ContextIdSeq *);
--  ContextIdSeq_var (const ContextIdSeq_var &); // copy constructor
--  ~ContextIdSeq_var (void); // destructor
-+  IR_ContextIdSeq_var (void); // default constructor
-+  IR_ContextIdSeq_var (IR_ContextIdSeq *);
-+  IR_ContextIdSeq_var (const IR_ContextIdSeq_var &); // copy constructor
-+  ~IR_ContextIdSeq_var (void); // destructor
-   
--  ContextIdSeq_var &operator= (ContextIdSeq *);
--  ContextIdSeq_var &operator= (const ContextIdSeq_var &);
--  ContextIdSeq *operator-> (void);
--  const ContextIdSeq *operator-> (void) const;
-+  IR_ContextIdSeq_var &operator= (IR_ContextIdSeq *);
-+  IR_ContextIdSeq_var &operator= (const IR_ContextIdSeq_var &);
-+  IR_ContextIdSeq *operator-> (void);
-+  const IR_ContextIdSeq *operator-> (void) const;
-   
--  operator const ContextIdSeq &() const;
--  operator ContextIdSeq &();
--  operator ContextIdSeq &() const;
--  operator ContextIdSeq *&(); // variable-size base types only
-+  operator const IR_ContextIdSeq &() const;
-+  operator IR_ContextIdSeq &();
-+  operator IR_ContextIdSeq &() const;
-+  operator IR_ContextIdSeq *&(); // variable-size base types only
-   
-   TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-   
-   // in, inout, out, _retn 
--  const ContextIdSeq &in (void) const;
--  ContextIdSeq &inout (void);
--  ContextIdSeq *&out (void);
--  ContextIdSeq *_retn (void);
--  ContextIdSeq *ptr (void) const;
-+  const IR_ContextIdSeq &in (void) const;
-+  IR_ContextIdSeq &inout (void);
-+  IR_ContextIdSeq *&out (void);
-+  IR_ContextIdSeq *_retn (void);
-+  IR_ContextIdSeq *ptr (void) const;
- 
- private:
--  ContextIdSeq *ptr_;
-+  IR_ContextIdSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTEXTIDSEQ___OUT_CH_)
--#define _IR_CONTEXTIDSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export ContextIdSeq_out
-+class TAO_IFR_Client_Export IR_ContextIdSeq_out
- {
- public:
--  ContextIdSeq_out (ContextIdSeq *&);
--  ContextIdSeq_out (ContextIdSeq_var &);
--  ContextIdSeq_out (const ContextIdSeq_out &);
--  ContextIdSeq_out &operator= (const ContextIdSeq_out &);
--  ContextIdSeq_out &operator= (ContextIdSeq *);
--  operator ContextIdSeq *&();
--  ContextIdSeq *&ptr (void);
--  ContextIdSeq *operator-> (void);
-+  IR_ContextIdSeq_out (IR_ContextIdSeq *&);
-+  IR_ContextIdSeq_out (IR_ContextIdSeq_var &);
-+  IR_ContextIdSeq_out (const IR_ContextIdSeq_out &);
-+  IR_ContextIdSeq_out &operator= (const IR_ContextIdSeq_out &);
-+  IR_ContextIdSeq_out &operator= (IR_ContextIdSeq *);
-+  operator IR_ContextIdSeq *&();
-+  IR_ContextIdSeq *&ptr (void);
-+  IR_ContextIdSeq *operator-> (void);
-   TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-   
- private:
--  ContextIdSeq *&ptr_;
-+  IR_ContextIdSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ContextIdSeq_var &);
-+  void operator= (const IR_ContextIdSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContextIdSeq;
--
--
--#if !defined (_IR_OPERATIONDEF___PTR_CH_)
--#define _IR_OPERATIONDEF___PTR_CH_
--
--class OperationDef;
--typedef OperationDef *OperationDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_OPERATIONDEF___VAR_CH_)
--#define _IR_OPERATIONDEF___VAR_CH_
--
--class TAO_IFR_Client_Export OperationDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_OperationDef_var : public TAO_Base_var
- {
- public:
--  OperationDef_var (void); // default constructor
--  OperationDef_var (OperationDef_ptr p) : ptr_ (p) {} 
--  OperationDef_var (const OperationDef_var &); // copy constructor
--  ~OperationDef_var (void); // destructor
-+  IR_OperationDef_var (void); // default constructor
-+  IR_OperationDef_var (IR_OperationDef_ptr p) : ptr_ (p) {}
-+  IR_OperationDef_var (const IR_OperationDef_var &); // copy constructor
-+  ~IR_OperationDef_var (void); // destructor
-   
--  OperationDef_var &operator= (OperationDef_ptr);
--  OperationDef_var &operator= (const OperationDef_var &);
--  OperationDef_ptr operator-> (void) const;
-+  IR_OperationDef_var &operator= (IR_OperationDef_ptr);
-+  IR_OperationDef_var &operator= (const IR_OperationDef_var &);
-+  IR_OperationDef_ptr operator-> (void) const;
-   
--  operator const OperationDef_ptr &() const;
--  operator OperationDef_ptr &();
-+  operator const IR_OperationDef_ptr &() const;
-+  operator IR_OperationDef_ptr &();
-   // in, inout, out, _retn 
--  OperationDef_ptr in (void) const;
--  OperationDef_ptr &inout (void);
--  OperationDef_ptr &out (void);
--  OperationDef_ptr _retn (void);
--  OperationDef_ptr ptr (void) const;
-+  IR_OperationDef_ptr in (void) const;
-+  IR_OperationDef_ptr &inout (void);
-+  IR_OperationDef_ptr &out (void);
-+  IR_OperationDef_ptr _retn (void);
-+  IR_OperationDef_ptr ptr (void) const;
- 
- private:
--  OperationDef_ptr ptr_;
-+  IR_OperationDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  OperationDef_var (const TAO_Base_var &rhs);
--  OperationDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_OperationDef_var (const TAO_Base_var &rhs);
-+  IR_OperationDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_OPERATIONDEF___OUT_CH_)
--#define _IR_OPERATIONDEF___OUT_CH_
--
--class TAO_IFR_Client_Export OperationDef_out
-+class TAO_IFR_Client_Export IR_OperationDef_out
- {
- public:
--  OperationDef_out (OperationDef_ptr &);
--  OperationDef_out (OperationDef_var &);
--  OperationDef_out (const OperationDef_out &);
--  OperationDef_out &operator= (const OperationDef_out &);
--  OperationDef_out &operator= (const OperationDef_var &);
--  OperationDef_out &operator= (OperationDef_ptr);
--  operator OperationDef_ptr &();
--  OperationDef_ptr &ptr (void);
--  OperationDef_ptr operator-> (void);
-+  IR_OperationDef_out (IR_OperationDef_ptr &);
-+  IR_OperationDef_out (IR_OperationDef_var &);
-+  IR_OperationDef_out (const IR_OperationDef_out &);
-+  IR_OperationDef_out &operator= (const IR_OperationDef_out &);
-+  IR_OperationDef_out &operator= (const IR_OperationDef_var &);
-+  IR_OperationDef_out &operator= (IR_OperationDef_ptr);
-+  operator IR_OperationDef_ptr &();
-+  IR_OperationDef_ptr &ptr (void);
-+  IR_OperationDef_ptr operator-> (void);
-   
- private:
--  OperationDef_ptr &ptr_;
-+  IR_OperationDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_OPERATIONDEF_CH_)
--#define _IR_OPERATIONDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_OperationDef_Proxy_Impl;
- class _TAO_OperationDef_Remote_Proxy_Impl;
- class _TAO_OperationDef_Proxy_Broker;
- class _TAO_OperationDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export OperationDef: public virtual Contained
-+class TAO_IFR_Client_Export IR_OperationDef: public virtual IR_Contained
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef OperationDef_ptr _ptr_type;
--  typedef OperationDef_var _var_type;
-+  typedef IR_OperationDef_ptr _ptr_type;
-+  typedef IR_OperationDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static OperationDef_ptr _duplicate (OperationDef_ptr obj);
--  static OperationDef_ptr _narrow (
-+  static IR_OperationDef_ptr _duplicate (IR_OperationDef_ptr obj);
-+  static IR_OperationDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static OperationDef_ptr _unchecked_narrow (
-+  static IR_OperationDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static OperationDef_ptr _nil (void)
-+  static IR_OperationDef_ptr _nil (void)
-     {
--      return (OperationDef_ptr)0;
-+      return (IR_OperationDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -18032,7 +14957,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr result_def (
-+  virtual IR_IDLType_ptr result_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18041,7 +14966,7 @@
-     ));
- 
-   virtual void result_def (
--      IR::IDLType_ptr result_def,
-+      IR_IDLType_ptr result_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18049,7 +14974,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ParDescriptionSeq * params (
-+  virtual IR_ParDescriptionSeq * params (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18058,7 +14983,7 @@
-     ));
- 
-   virtual void params (
--      const IR::ParDescriptionSeq & params,
-+      const IR_ParDescriptionSeq & params,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18066,7 +14991,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::OperationMode mode (
-+  virtual IR_OperationMode mode (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18075,7 +15000,7 @@
-     ));
- 
-   virtual void mode (
--      IR::OperationMode mode,
-+      IR_OperationMode mode,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18083,7 +15008,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ContextIdSeq * contexts (
-+  virtual IR_ContextIdSeq * contexts (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18092,7 +15017,7 @@
-     ));
- 
-   virtual void contexts (
--      const IR::ContextIdSeq & contexts,
-+      const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18100,7 +15025,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ExceptionDefSeq * exceptions (
-+  virtual IR_ExceptionDefSeq * exceptions (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18109,7 +15034,7 @@
-     ));
- 
-   virtual void exceptions (
--      const IR::ExceptionDefSeq & exceptions,
-+      const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -18130,14 +15055,14 @@
-   _TAO_OperationDef_Proxy_Broker *the_TAO_OperationDef_Proxy_Broker_;
-   
- protected:
--  OperationDef (int collocated = 0);
-+  IR_OperationDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_OperationDef_setup_collocation (int collocated);
-     
--    OperationDef (
-+  IR_OperationDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -18147,10 +15072,10 @@
-     friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_OperationDef_Direct_Proxy_Impl;
-   
--  virtual ~OperationDef (void);
-+  virtual ~IR_OperationDef (void);
- private:
--  OperationDef (const OperationDef &);
--  void operator= (const OperationDef &);  
-+  IR_OperationDef (const IR_OperationDef &);
-+  void operator= (const IR_OperationDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -18160,7 +15085,7 @@
-   class TAO_ClientRequestInfo_IR_OperationDef_result_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::OperationDef;
-+    friend class IR_OperationDef;
-     
-     friend class _TAO_OperationDef_Remote_Proxy_Impl;
-     friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-@@ -18202,7 +15127,7 @@
- class TAO_ClientRequestInfo_IR_OperationDef_result_def_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::OperationDef;
-+    friend class IR_OperationDef;
-   
-   friend class _TAO_OperationDef_Remote_Proxy_Impl;
-   friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-@@ -18236,15 +15161,15 @@
- private:
-   TAO_ClientRequestInfo_IR_OperationDef_result_def_get (const TAO_ClientRequestInfo_IR_OperationDef_result_def_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_OperationDef_result_def_get &);
--  void result (IR::IDLType_ptr result);
-+    void result (IR_IDLType_ptr result);
-   // update the result 
--  IR::IDLType_ptr _result;
-+    IR_IDLType_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_OperationDef_result_def_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::OperationDef;
-+    friend class IR_OperationDef;
-   
-   friend class _TAO_OperationDef_Remote_Proxy_Impl;
-   friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-@@ -18253,7 +15178,7 @@
- TAO_ClientRequestInfo_IR_OperationDef_result_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr result_def,
-+        IR_IDLType_ptr result_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -18279,14 +15204,14 @@
- private:
-   TAO_ClientRequestInfo_IR_OperationDef_result_def_set (const TAO_ClientRequestInfo_IR_OperationDef_result_def_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_OperationDef_result_def_set &);
--  IR::IDLType_ptr result_def_;
-+    IR_IDLType_ptr result_def_;
-   
- };
- 
- class TAO_ClientRequestInfo_IR_OperationDef_params_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::OperationDef;
-+    friend class IR_OperationDef;
-   
-   friend class _TAO_OperationDef_Remote_Proxy_Impl;
-   friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-@@ -18320,15 +15245,15 @@
- private:
-   TAO_ClientRequestInfo_IR_OperationDef_params_get (const TAO_ClientRequestInfo_IR_OperationDef_params_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_OperationDef_params_get &);
--  void result (IR::ParDescriptionSeq * result);
-+    void result (IR_ParDescriptionSeq * result);
-   // update the result 
--  IR::ParDescriptionSeq * _result;
-+    IR_ParDescriptionSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_OperationDef_params_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::OperationDef;
-+    friend class IR_OperationDef;
-   
-   friend class _TAO_OperationDef_Remote_Proxy_Impl;
-   friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-@@ -18337,7 +15262,7 @@
- TAO_ClientRequestInfo_IR_OperationDef_params_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::ParDescriptionSeq & params,
-+        const IR_ParDescriptionSeq & params,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -18363,14 +15288,14 @@
- private:
-   TAO_ClientRequestInfo_IR_OperationDef_params_set (const TAO_ClientRequestInfo_IR_OperationDef_params_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_OperationDef_params_set &);
--  const IR::ParDescriptionSeq & params_;
-+    const IR_ParDescriptionSeq & params_;
-   
- };
- 
- class TAO_ClientRequestInfo_IR_OperationDef_mode_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::OperationDef;
-+    friend class IR_OperationDef;
-   
-   friend class _TAO_OperationDef_Remote_Proxy_Impl;
-   friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-@@ -18404,15 +15329,15 @@
- private:
-   TAO_ClientRequestInfo_IR_OperationDef_mode_get (const TAO_ClientRequestInfo_IR_OperationDef_mode_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_OperationDef_mode_get &);
--  void result (IR::OperationMode result);
-+    void result (IR_OperationMode result);
-   // update the result 
--  IR::OperationMode _result;
-+    IR_OperationMode _result;
- };
- 
- class TAO_ClientRequestInfo_IR_OperationDef_mode_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::OperationDef;
-+    friend class IR_OperationDef;
-   
-   friend class _TAO_OperationDef_Remote_Proxy_Impl;
-   friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-@@ -18421,7 +15346,7 @@
- TAO_ClientRequestInfo_IR_OperationDef_mode_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::OperationMode & mode,
-+        IR_OperationMode & mode,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -18447,14 +15372,14 @@
- private:
-   TAO_ClientRequestInfo_IR_OperationDef_mode_set (const TAO_ClientRequestInfo_IR_OperationDef_mode_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_OperationDef_mode_set &);
--  const IR::OperationMode & mode_;
-+    const IR_OperationMode & mode_;
-   
- };
- 
- class TAO_ClientRequestInfo_IR_OperationDef_contexts_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::OperationDef;
-+    friend class IR_OperationDef;
-   
-   friend class _TAO_OperationDef_Remote_Proxy_Impl;
-   friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-@@ -18488,15 +15413,15 @@
- private:
-   TAO_ClientRequestInfo_IR_OperationDef_contexts_get (const TAO_ClientRequestInfo_IR_OperationDef_contexts_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_OperationDef_contexts_get &);
--  void result (IR::ContextIdSeq * result);
-+    void result (IR_ContextIdSeq * result);
-   // update the result 
--  IR::ContextIdSeq * _result;
-+    IR_ContextIdSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_OperationDef_contexts_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::OperationDef;
-+    friend class IR_OperationDef;
-   
-   friend class _TAO_OperationDef_Remote_Proxy_Impl;
-   friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-@@ -18505,7 +15430,7 @@
- TAO_ClientRequestInfo_IR_OperationDef_contexts_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::ContextIdSeq & contexts,
-+        const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -18531,14 +15456,14 @@
- private:
-   TAO_ClientRequestInfo_IR_OperationDef_contexts_set (const TAO_ClientRequestInfo_IR_OperationDef_contexts_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_OperationDef_contexts_set &);
--  const IR::ContextIdSeq & contexts_;
-+    const IR_ContextIdSeq & contexts_;
-   
- };
- 
- class TAO_ClientRequestInfo_IR_OperationDef_exceptions_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::OperationDef;
-+    friend class IR_OperationDef;
-   
-   friend class _TAO_OperationDef_Remote_Proxy_Impl;
-   friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-@@ -18572,15 +15497,15 @@
- private:
-   TAO_ClientRequestInfo_IR_OperationDef_exceptions_get (const TAO_ClientRequestInfo_IR_OperationDef_exceptions_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_OperationDef_exceptions_get &);
--  void result (IR::ExceptionDefSeq * result);
-+    void result (IR_ExceptionDefSeq * result);
-   // update the result 
--  IR::ExceptionDefSeq * _result;
-+    IR_ExceptionDefSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_OperationDef_exceptions_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::OperationDef;
-+    friend class IR_OperationDef;
-   
-   friend class _TAO_OperationDef_Remote_Proxy_Impl;
-   friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
-@@ -18589,7 +15514,7 @@
- TAO_ClientRequestInfo_IR_OperationDef_exceptions_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::ExceptionDefSeq & exceptions,
-+        const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -18615,7 +15540,7 @@
- private:
-   TAO_ClientRequestInfo_IR_OperationDef_exceptions_set (const TAO_ClientRequestInfo_IR_OperationDef_exceptions_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_OperationDef_exceptions_set &);
--  const IR::ExceptionDefSeq & exceptions_;
-+    const IR_ExceptionDefSeq & exceptions_;
-   
- };
- 
-@@ -18634,7 +15559,7 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_OperationDef_Proxy_Impl : 
--  public virtual IR::_TAO_Contained_Proxy_Impl
-+  public virtual _TAO_Contained_Proxy_Impl
- {
- public:
-   virtual ~_TAO_OperationDef_Proxy_Impl (void) { }
-@@ -18647,7 +15572,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::IDLType_ptr result_def (
-+  virtual IR_IDLType_ptr result_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -18657,14 +15582,14 @@
- 
-   virtual void result_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr result_def,
-+      IR_IDLType_ptr result_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ParDescriptionSeq * params (
-+  virtual IR_ParDescriptionSeq * params (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -18674,14 +15599,14 @@
- 
-   virtual void params (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::ParDescriptionSeq & params,
-+      const IR_ParDescriptionSeq & params,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::OperationMode mode (
-+  virtual IR_OperationMode mode (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -18691,14 +15616,14 @@
- 
-   virtual void mode (
-       CORBA_Object *_collocated_tao_target_,
--      IR::OperationMode mode,
-+      IR_OperationMode mode,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ContextIdSeq * contexts (
-+  virtual IR_ContextIdSeq * contexts (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -18708,14 +15633,14 @@
- 
-   virtual void contexts (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::ContextIdSeq & contexts,
-+      const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ExceptionDefSeq * exceptions (
-+  virtual IR_ExceptionDefSeq * exceptions (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -18725,7 +15650,7 @@
- 
-   virtual void exceptions (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::ExceptionDefSeq & exceptions,
-+      const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -18736,6 +15661,7 @@
-   _TAO_OperationDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -18748,7 +15674,7 @@
- class TAO_IFR_Client_Export _TAO_OperationDef_Remote_Proxy_Impl : 
-   public virtual _TAO_OperationDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_Contained_Remote_Proxy_Impl
-+  public virtual _TAO_Contained_Remote_Proxy_Impl
-   
- {
- public:
-@@ -18764,7 +15690,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr result_def (
-+  virtual IR_IDLType_ptr result_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -18774,14 +15700,14 @@
- 
-   virtual void result_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr result_def,
-+      IR_IDLType_ptr result_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ParDescriptionSeq * params (
-+  virtual IR_ParDescriptionSeq * params (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -18791,14 +15717,14 @@
- 
-   virtual void params (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::ParDescriptionSeq & params,
-+      const IR_ParDescriptionSeq & params,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::OperationMode mode (
-+  virtual IR_OperationMode mode (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -18808,14 +15734,14 @@
- 
-   virtual void mode (
-       CORBA_Object *_collocated_tao_target_,
--      IR::OperationMode mode,
-+      IR_OperationMode mode,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ContextIdSeq * contexts (
-+  virtual IR_ContextIdSeq * contexts (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -18825,14 +15751,14 @@
- 
-   virtual void contexts (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::ContextIdSeq & contexts,
-+      const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ExceptionDefSeq * exceptions (
-+  virtual IR_ExceptionDefSeq * exceptions (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -18842,7 +15768,7 @@
- 
-   virtual void exceptions (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::ExceptionDefSeq & exceptions,
-+      const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -18871,8 +15797,9 @@
- {
- public:
-   virtual ~_TAO_OperationDef_Proxy_Broker (void);
-+
-   virtual _TAO_OperationDef_Proxy_Impl &select_proxy (
--    OperationDef *object,
-+    IR_OperationDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -18881,6 +15808,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -18898,7 +15826,7 @@
-   virtual ~_TAO_OperationDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_OperationDef_Proxy_Impl &select_proxy (
--    OperationDef *object,
-+    IR_OperationDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -18912,24 +15840,15 @@
-   static _TAO_OperationDef_Remote_Proxy_Broker *the_TAO_OperationDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationDef;
--
--struct OperationDescription;
--class OperationDescription_var;
--
--struct TAO_IFR_Client_Export OperationDescription
-+struct TAO_IFR_Client_Export IR_OperationDescription
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef OperationDescription_var _var_type;
-+  typedef IR_OperationDescription_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
-@@ -18939,73 +15858,64 @@
-   TAO_String_Manager defined_in;
-   TAO_String_Manager version;
-   CORBA::TypeCode_var result;
--  ACE_NESTED_CLASS (IR, OperationMode) mode;
--  ACE_NESTED_CLASS (IR, ContextIdSeq) contexts;
--  ACE_NESTED_CLASS (IR, ParDescriptionSeq) parameters;
--  ACE_NESTED_CLASS (IR, ExcDescriptionSeq) exceptions;
-+  IR_OperationMode mode;
-+  IR_ContextIdSeq contexts;
-+  IR_ParDescriptionSeq parameters;
-+  IR_ExcDescriptionSeq exceptions;
- };
- 
--class TAO_IFR_Client_Export OperationDescription_var
-+class TAO_IFR_Client_Export IR_OperationDescription_var
- {
- public:
--  OperationDescription_var (void); // default constructor
--  OperationDescription_var (OperationDescription *);
--  OperationDescription_var (const OperationDescription_var &); // copy constructor
--  ~OperationDescription_var (void); // destructor
-+  IR_OperationDescription_var (void); // default constructor
-+  IR_OperationDescription_var (IR_OperationDescription *);
-+  IR_OperationDescription_var (const IR_OperationDescription_var &); // copy constructor
-+  ~IR_OperationDescription_var (void); // destructor
-   
--  OperationDescription_var &operator= (OperationDescription *);
--  OperationDescription_var &operator= (const OperationDescription_var &);
--  OperationDescription *operator-> (void);
--  const OperationDescription *operator-> (void) const;
-+  IR_OperationDescription_var &operator= (IR_OperationDescription *);
-+  IR_OperationDescription_var &operator= (const IR_OperationDescription_var &);
-+  IR_OperationDescription *operator-> (void);
-+  const IR_OperationDescription *operator-> (void) const;
-   
--  operator const OperationDescription &() const;
--  operator OperationDescription &();
--  operator OperationDescription &() const;
--  operator OperationDescription *&(); // variable-size types only
-+  operator const IR_OperationDescription &() const;
-+  operator IR_OperationDescription &();
-+  operator IR_OperationDescription &() const;
-+  operator IR_OperationDescription *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const OperationDescription &in (void) const;
--  OperationDescription &inout (void);
--  OperationDescription *&out (void);
--  OperationDescription *_retn (void);
--  OperationDescription *ptr (void) const;
-+  const IR_OperationDescription &in (void) const;
-+  IR_OperationDescription &inout (void);
-+  IR_OperationDescription *&out (void);
-+  IR_OperationDescription *_retn (void);
-+  IR_OperationDescription *ptr (void) const;
- 
- private:
--  OperationDescription *ptr_;
-+  IR_OperationDescription *ptr_;
- };
- 
--class TAO_IFR_Client_Export OperationDescription_out
-+class TAO_IFR_Client_Export IR_OperationDescription_out
- {
- public:
--  OperationDescription_out (OperationDescription *&);
--  OperationDescription_out (OperationDescription_var &);
--  OperationDescription_out (const OperationDescription_out &);
--  OperationDescription_out &operator= (const OperationDescription_out &);
--  OperationDescription_out &operator= (OperationDescription *);
--  operator OperationDescription *&();
--  OperationDescription *&ptr (void);
--  OperationDescription *operator-> (void);
-+  IR_OperationDescription_out (IR_OperationDescription *&);
-+  IR_OperationDescription_out (IR_OperationDescription_var &);
-+  IR_OperationDescription_out (const IR_OperationDescription_out &);
-+  IR_OperationDescription_out &operator= (const IR_OperationDescription_out &);
-+  IR_OperationDescription_out &operator= (IR_OperationDescription *);
-+  operator IR_OperationDescription *&();
-+  IR_OperationDescription *&ptr (void);
-+  IR_OperationDescription *operator-> (void);
-   
- private:
--  OperationDescription *&ptr_;
-+  IR_OperationDescription *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const OperationDescription_var &);
-+  void operator= (const IR_OperationDescription_var &);
- };
- 
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationDescription;
--
--
--#if !defined (_IR_REPOSITORYIDSEQ_CH_)
--#define _IR_REPOSITORYIDSEQ_CH_
--
--class RepositoryIdSeq;
--class RepositoryIdSeq_var;
--
- // *************************************************************
--// RepositoryIdSeq
-+// IR_RepositoryIdSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export RepositoryIdSeq : public 
-+class TAO_IFR_Client_Export IR_RepositoryIdSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   TAO_Unbounded_String_Sequence
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-@@ -19013,102 +15923,80 @@
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  RepositoryIdSeq (void); // default ctor
--  RepositoryIdSeq (CORBA::ULong max); // uses max size
--  RepositoryIdSeq (
-+  IR_RepositoryIdSeq (void); // default ctor
-+  IR_RepositoryIdSeq (CORBA::ULong max); // uses max size
-+  IR_RepositoryIdSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
-     char * *buffer, 
-     CORBA::Boolean release = 0
-   );
--  RepositoryIdSeq (const RepositoryIdSeq &); // copy ctor
--  ~RepositoryIdSeq (void);
-+  IR_RepositoryIdSeq (const IR_RepositoryIdSeq &); // copy ctor
-+  ~IR_RepositoryIdSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef RepositoryIdSeq_var _var_type;
-+  typedef IR_RepositoryIdSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_REPOSITORYIDSEQ___VAR_CH_)
--#define _IR_REPOSITORYIDSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::RepositoryIdSeq_var
-+// class IR_RepositoryIdSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export RepositoryIdSeq_var
-+class TAO_IFR_Client_Export IR_RepositoryIdSeq_var
- {
- public:
--  RepositoryIdSeq_var (void); // default constructor
--  RepositoryIdSeq_var (RepositoryIdSeq *);
--  RepositoryIdSeq_var (const RepositoryIdSeq_var &); // copy constructor
--  ~RepositoryIdSeq_var (void); // destructor
-+  IR_RepositoryIdSeq_var (void); // default constructor
-+  IR_RepositoryIdSeq_var (IR_RepositoryIdSeq *);
-+  IR_RepositoryIdSeq_var (const IR_RepositoryIdSeq_var &); // copy constructor
-+  ~IR_RepositoryIdSeq_var (void); // destructor
-   
--  RepositoryIdSeq_var &operator= (RepositoryIdSeq *);
--  RepositoryIdSeq_var &operator= (const RepositoryIdSeq_var &);
--  RepositoryIdSeq *operator-> (void);
--  const RepositoryIdSeq *operator-> (void) const;
-+  IR_RepositoryIdSeq_var &operator= (IR_RepositoryIdSeq *);
-+  IR_RepositoryIdSeq_var &operator= (const IR_RepositoryIdSeq_var &);
-+  IR_RepositoryIdSeq *operator-> (void);
-+  const IR_RepositoryIdSeq *operator-> (void) const;
-   
--  operator const RepositoryIdSeq &() const;
--  operator RepositoryIdSeq &();
--  operator RepositoryIdSeq &() const;
--  operator RepositoryIdSeq *&(); // variable-size base types only
-+  operator const IR_RepositoryIdSeq &() const;
-+  operator IR_RepositoryIdSeq &();
-+  operator IR_RepositoryIdSeq &() const;
-+  operator IR_RepositoryIdSeq *&(); // variable-size base types only
-   
-   TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-   
-   // in, inout, out, _retn 
--  const RepositoryIdSeq &in (void) const;
--  RepositoryIdSeq &inout (void);
--  RepositoryIdSeq *&out (void);
--  RepositoryIdSeq *_retn (void);
--  RepositoryIdSeq *ptr (void) const;
-+  const IR_RepositoryIdSeq &in (void) const;
-+  IR_RepositoryIdSeq &inout (void);
-+  IR_RepositoryIdSeq *&out (void);
-+  IR_RepositoryIdSeq *_retn (void);
-+  IR_RepositoryIdSeq *ptr (void) const;
- 
- private:
--  RepositoryIdSeq *ptr_;
-+  IR_RepositoryIdSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_REPOSITORYIDSEQ___OUT_CH_)
--#define _IR_REPOSITORYIDSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export RepositoryIdSeq_out
-+class TAO_IFR_Client_Export IR_RepositoryIdSeq_out
- {
- public:
--  RepositoryIdSeq_out (RepositoryIdSeq *&);
--  RepositoryIdSeq_out (RepositoryIdSeq_var &);
--  RepositoryIdSeq_out (const RepositoryIdSeq_out &);
--  RepositoryIdSeq_out &operator= (const RepositoryIdSeq_out &);
--  RepositoryIdSeq_out &operator= (RepositoryIdSeq *);
--  operator RepositoryIdSeq *&();
--  RepositoryIdSeq *&ptr (void);
--  RepositoryIdSeq *operator-> (void);
-+  IR_RepositoryIdSeq_out (IR_RepositoryIdSeq *&);
-+  IR_RepositoryIdSeq_out (IR_RepositoryIdSeq_var &);
-+  IR_RepositoryIdSeq_out (const IR_RepositoryIdSeq_out &);
-+  IR_RepositoryIdSeq_out &operator= (const IR_RepositoryIdSeq_out &);
-+  IR_RepositoryIdSeq_out &operator= (IR_RepositoryIdSeq *);
-+  operator IR_RepositoryIdSeq *&();
-+  IR_RepositoryIdSeq *&ptr (void);
-+  IR_RepositoryIdSeq *operator-> (void);
-   TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-   
- private:
--  RepositoryIdSeq *&ptr_;
-+  IR_RepositoryIdSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const RepositoryIdSeq_var &);
-+  void operator= (const IR_RepositoryIdSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryIdSeq;
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CH_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CH_
--
-   class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_OpDescriptionSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -19118,149 +16006,118 @@
-     _TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum); 
-     _TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      OperationDescription *data,
-+      IR_OperationDescription *data,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Sequence_IR_OpDescriptionSeq (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs);
-     _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &operator= (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs);
-     virtual ~_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void); // Dtor.
-     // = Accessors.
--    OperationDescription &operator[] (CORBA::ULong i);
--    const OperationDescription &operator[] (CORBA::ULong i) const;
-+    IR_OperationDescription &operator[] (CORBA::ULong i);
-+    const IR_OperationDescription &operator[] (CORBA::ULong i) const;
-     // = Static operations.
--    static OperationDescription *allocbuf (CORBA::ULong size);
--    static void freebuf (OperationDescription *buffer);
-+    static IR_OperationDescription *allocbuf (CORBA::ULong size);
-+    static void freebuf (IR_OperationDescription *buffer);
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
-     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-     
--    OperationDescription *get_buffer (CORBA::Boolean orphan = 0);
--    const OperationDescription *get_buffer (void) const;
-+    IR_OperationDescription *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_OperationDescription *get_buffer (void) const;
-     void replace (CORBA::ULong max,
-       CORBA::ULong length,
--      OperationDescription *data,
-+      IR_OperationDescription *data,
-       CORBA::Boolean release);
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_OPDESCRIPTIONSEQ_CH_)
--#define _IR_OPDESCRIPTIONSEQ_CH_
--
--class OpDescriptionSeq;
--class OpDescriptionSeq_var;
--
- // *************************************************************
--// OpDescriptionSeq
-+// IR_OpDescriptionSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export OpDescriptionSeq : public 
-+class TAO_IFR_Client_Export IR_OpDescriptionSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_OpDescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<OperationDescription>
-+  TAO_Unbounded_Sequence<IR_OperationDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  OpDescriptionSeq (void); // default ctor
--  OpDescriptionSeq (CORBA::ULong max); // uses max size
--  OpDescriptionSeq (
-+  IR_OpDescriptionSeq (void); // default ctor
-+  IR_OpDescriptionSeq (CORBA::ULong max); // uses max size
-+  IR_OpDescriptionSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    OperationDescription *buffer, 
-+    IR_OperationDescription *buffer,
-     CORBA::Boolean release = 0
-   );
--  OpDescriptionSeq (const OpDescriptionSeq &); // copy ctor
--  ~OpDescriptionSeq (void);
-+  IR_OpDescriptionSeq (const IR_OpDescriptionSeq &); // copy ctor
-+  ~IR_OpDescriptionSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef OpDescriptionSeq_var _var_type;
-+  typedef IR_OpDescriptionSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_OPDESCRIPTIONSEQ___VAR_CH_)
--#define _IR_OPDESCRIPTIONSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::OpDescriptionSeq_var
-+// class IR_OpDescriptionSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export OpDescriptionSeq_var
-+class TAO_IFR_Client_Export IR_OpDescriptionSeq_var
- {
- public:
--  OpDescriptionSeq_var (void); // default constructor
--  OpDescriptionSeq_var (OpDescriptionSeq *);
--  OpDescriptionSeq_var (const OpDescriptionSeq_var &); // copy constructor
--  ~OpDescriptionSeq_var (void); // destructor
-+  IR_OpDescriptionSeq_var (void); // default constructor
-+  IR_OpDescriptionSeq_var (IR_OpDescriptionSeq *);
-+  IR_OpDescriptionSeq_var (const IR_OpDescriptionSeq_var &); // copy constructor
-+  ~IR_OpDescriptionSeq_var (void); // destructor
-   
--  OpDescriptionSeq_var &operator= (OpDescriptionSeq *);
--  OpDescriptionSeq_var &operator= (const OpDescriptionSeq_var &);
--  OpDescriptionSeq *operator-> (void);
--  const OpDescriptionSeq *operator-> (void) const;
-+  IR_OpDescriptionSeq_var &operator= (IR_OpDescriptionSeq *);
-+  IR_OpDescriptionSeq_var &operator= (const IR_OpDescriptionSeq_var &);
-+  IR_OpDescriptionSeq *operator-> (void);
-+  const IR_OpDescriptionSeq *operator-> (void) const;
-   
--  operator const OpDescriptionSeq &() const;
--  operator OpDescriptionSeq &();
--  operator OpDescriptionSeq &() const;
--  operator OpDescriptionSeq *&(); // variable-size base types only
-+  operator const IR_OpDescriptionSeq &() const;
-+  operator IR_OpDescriptionSeq &();
-+  operator IR_OpDescriptionSeq &() const;
-+  operator IR_OpDescriptionSeq *&(); // variable-size base types only
-   
--  OperationDescription & operator[] (CORBA::ULong index);
--  const OperationDescription & operator[] (CORBA::ULong index) const;
-+  IR_OperationDescription & operator[] (CORBA::ULong index);
-+  const IR_OperationDescription & operator[] (CORBA::ULong index) const;
-   
-   // in, inout, out, _retn 
--  const OpDescriptionSeq &in (void) const;
--  OpDescriptionSeq &inout (void);
--  OpDescriptionSeq *&out (void);
--  OpDescriptionSeq *_retn (void);
--  OpDescriptionSeq *ptr (void) const;
-+  const IR_OpDescriptionSeq &in (void) const;
-+  IR_OpDescriptionSeq &inout (void);
-+  IR_OpDescriptionSeq *&out (void);
-+  IR_OpDescriptionSeq *_retn (void);
-+  IR_OpDescriptionSeq *ptr (void) const;
- 
- private:
--  OpDescriptionSeq *ptr_;
-+  IR_OpDescriptionSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_OPDESCRIPTIONSEQ___OUT_CH_)
--#define _IR_OPDESCRIPTIONSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export OpDescriptionSeq_out
-+class TAO_IFR_Client_Export IR_OpDescriptionSeq_out
- {
- public:
--  OpDescriptionSeq_out (OpDescriptionSeq *&);
--  OpDescriptionSeq_out (OpDescriptionSeq_var &);
--  OpDescriptionSeq_out (const OpDescriptionSeq_out &);
--  OpDescriptionSeq_out &operator= (const OpDescriptionSeq_out &);
--  OpDescriptionSeq_out &operator= (OpDescriptionSeq *);
--  operator OpDescriptionSeq *&();
--  OpDescriptionSeq *&ptr (void);
--  OpDescriptionSeq *operator-> (void);
--  OperationDescription & operator[] (CORBA::ULong index);
-+  IR_OpDescriptionSeq_out (IR_OpDescriptionSeq *&);
-+  IR_OpDescriptionSeq_out (IR_OpDescriptionSeq_var &);
-+  IR_OpDescriptionSeq_out (const IR_OpDescriptionSeq_out &);
-+  IR_OpDescriptionSeq_out &operator= (const IR_OpDescriptionSeq_out &);
-+  IR_OpDescriptionSeq_out &operator= (IR_OpDescriptionSeq *);
-+  operator IR_OpDescriptionSeq *&();
-+  IR_OpDescriptionSeq *&ptr (void);
-+  IR_OpDescriptionSeq *operator-> (void);
-+  IR_OperationDescription & operator[] (CORBA::ULong index);
-   
- private:
--  OpDescriptionSeq *&ptr_;
-+  IR_OpDescriptionSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const OpDescriptionSeq_var &);
-+  void operator= (const IR_OpDescriptionSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OpDescriptionSeq;
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CH_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CH_
--
-   class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -19270,249 +16127,151 @@
-     _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum); 
-     _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      AttributeDescription *data,
-+      IR_AttributeDescription *data,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs);
-     _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &operator= (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs);
-     virtual ~_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (void); // Dtor.
-     // = Accessors.
--    AttributeDescription &operator[] (CORBA::ULong i);
--    const AttributeDescription &operator[] (CORBA::ULong i) const;
-+    IR_AttributeDescription &operator[] (CORBA::ULong i);
-+    const IR_AttributeDescription &operator[] (CORBA::ULong i) const;
-     // = Static operations.
--    static AttributeDescription *allocbuf (CORBA::ULong size);
--    static void freebuf (AttributeDescription *buffer);
-+    static IR_AttributeDescription *allocbuf (CORBA::ULong size);
-+    static void freebuf (IR_AttributeDescription *buffer);
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
-     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-     
--    AttributeDescription *get_buffer (CORBA::Boolean orphan = 0);
--    const AttributeDescription *get_buffer (void) const;
-+    IR_AttributeDescription *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_AttributeDescription *get_buffer (void) const;
-     void replace (CORBA::ULong max,
-       CORBA::ULong length,
--      AttributeDescription *data,
-+      IR_AttributeDescription *data,
-       CORBA::Boolean release);
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_ATTRDESCRIPTIONSEQ_CH_)
--#define _IR_ATTRDESCRIPTIONSEQ_CH_
--
--class AttrDescriptionSeq;
--class AttrDescriptionSeq_var;
--
- // *************************************************************
--// AttrDescriptionSeq
-+// IR_AttrDescriptionSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export AttrDescriptionSeq : public 
-+class TAO_IFR_Client_Export IR_AttrDescriptionSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<AttributeDescription>
-+  TAO_Unbounded_Sequence<IR_AttributeDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  AttrDescriptionSeq (void); // default ctor
--  AttrDescriptionSeq (CORBA::ULong max); // uses max size
--  AttrDescriptionSeq (
-+  IR_AttrDescriptionSeq (void); // default ctor
-+  IR_AttrDescriptionSeq (CORBA::ULong max); // uses max size
-+  IR_AttrDescriptionSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    AttributeDescription *buffer, 
-+    IR_AttributeDescription *buffer,
-     CORBA::Boolean release = 0
-   );
--  AttrDescriptionSeq (const AttrDescriptionSeq &); // copy ctor
--  ~AttrDescriptionSeq (void);
-+  IR_AttrDescriptionSeq (const IR_AttrDescriptionSeq &); // copy ctor
-+  ~IR_AttrDescriptionSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef AttrDescriptionSeq_var _var_type;
-+  typedef IR_AttrDescriptionSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ATTRDESCRIPTIONSEQ___VAR_CH_)
--#define _IR_ATTRDESCRIPTIONSEQ___VAR_CH_
- 
- // *************************************************************
--// class IR::AttrDescriptionSeq_var
-+// class IR_AttrDescriptionSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export AttrDescriptionSeq_var
-+class TAO_IFR_Client_Export IR_AttrDescriptionSeq_var
- {
- public:
--  AttrDescriptionSeq_var (void); // default constructor
--  AttrDescriptionSeq_var (AttrDescriptionSeq *);
--  AttrDescriptionSeq_var (const AttrDescriptionSeq_var &); // copy constructor
--  ~AttrDescriptionSeq_var (void); // destructor
-+  IR_AttrDescriptionSeq_var (void); // default constructor
-+  IR_AttrDescriptionSeq_var (IR_AttrDescriptionSeq *);
-+  IR_AttrDescriptionSeq_var (const IR_AttrDescriptionSeq_var &); // copy constructor
-+  ~IR_AttrDescriptionSeq_var (void); // destructor
-   
--  AttrDescriptionSeq_var &operator= (AttrDescriptionSeq *);
--  AttrDescriptionSeq_var &operator= (const AttrDescriptionSeq_var &);
--  AttrDescriptionSeq *operator-> (void);
--  const AttrDescriptionSeq *operator-> (void) const;
-+  IR_AttrDescriptionSeq_var &operator= (IR_AttrDescriptionSeq *);
-+  IR_AttrDescriptionSeq_var &operator= (const IR_AttrDescriptionSeq_var &);
-+  IR_AttrDescriptionSeq *operator-> (void);
-+  const IR_AttrDescriptionSeq *operator-> (void) const;
-   
--  operator const AttrDescriptionSeq &() const;
--  operator AttrDescriptionSeq &();
--  operator AttrDescriptionSeq &() const;
--  operator AttrDescriptionSeq *&(); // variable-size base types only
-+  operator const IR_AttrDescriptionSeq &() const;
-+  operator IR_AttrDescriptionSeq &();
-+  operator IR_AttrDescriptionSeq &() const;
-+  operator IR_AttrDescriptionSeq *&(); // variable-size base types only
-   
--  AttributeDescription & operator[] (CORBA::ULong index);
--  const AttributeDescription & operator[] (CORBA::ULong index) const;
-+  IR_AttributeDescription & operator[] (CORBA::ULong index);
-+  const IR_AttributeDescription & operator[] (CORBA::ULong index) const;
-   
-   // in, inout, out, _retn 
--  const AttrDescriptionSeq &in (void) const;
--  AttrDescriptionSeq &inout (void);
--  AttrDescriptionSeq *&out (void);
--  AttrDescriptionSeq *_retn (void);
--  AttrDescriptionSeq *ptr (void) const;
-+  const IR_AttrDescriptionSeq &in (void) const;
-+  IR_AttrDescriptionSeq &inout (void);
-+  IR_AttrDescriptionSeq *&out (void);
-+  IR_AttrDescriptionSeq *_retn (void);
-+  IR_AttrDescriptionSeq *ptr (void) const;
- 
- private:
--  AttrDescriptionSeq *ptr_;
-+  IR_AttrDescriptionSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ATTRDESCRIPTIONSEQ___OUT_CH_)
--#define _IR_ATTRDESCRIPTIONSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export AttrDescriptionSeq_out
-+class TAO_IFR_Client_Export IR_AttrDescriptionSeq_out
- {
- public:
--  AttrDescriptionSeq_out (AttrDescriptionSeq *&);
--  AttrDescriptionSeq_out (AttrDescriptionSeq_var &);
--  AttrDescriptionSeq_out (const AttrDescriptionSeq_out &);
--  AttrDescriptionSeq_out &operator= (const AttrDescriptionSeq_out &);
--  AttrDescriptionSeq_out &operator= (AttrDescriptionSeq *);
--  operator AttrDescriptionSeq *&();
--  AttrDescriptionSeq *&ptr (void);
--  AttrDescriptionSeq *operator-> (void);
--  AttributeDescription & operator[] (CORBA::ULong index);
-+  IR_AttrDescriptionSeq_out (IR_AttrDescriptionSeq *&);
-+  IR_AttrDescriptionSeq_out (IR_AttrDescriptionSeq_var &);
-+  IR_AttrDescriptionSeq_out (const IR_AttrDescriptionSeq_out &);
-+  IR_AttrDescriptionSeq_out &operator= (const IR_AttrDescriptionSeq_out &);
-+  IR_AttrDescriptionSeq_out &operator= (IR_AttrDescriptionSeq *);
-+  operator IR_AttrDescriptionSeq *&();
-+  IR_AttrDescriptionSeq *&ptr (void);
-+  IR_AttrDescriptionSeq *operator-> (void);
-+  IR_AttributeDescription & operator[] (CORBA::ULong index);
-   
- private:
--  AttrDescriptionSeq *&ptr_;
-+  IR_AttrDescriptionSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const AttrDescriptionSeq_var &);
--};
--
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttrDescriptionSeq;
--
--
--#if !defined (_IR_INTERFACEDEF___PTR_CH_)
--#define _IR_INTERFACEDEF___PTR_CH_
--
--class InterfaceDef;
--typedef InterfaceDef *InterfaceDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_INTERFACEDEF___VAR_CH_)
--#define _IR_INTERFACEDEF___VAR_CH_
--
--class TAO_IFR_Client_Export InterfaceDef_var : public TAO_Base_var
--{
--public:
--  InterfaceDef_var (void); // default constructor
--  InterfaceDef_var (InterfaceDef_ptr p) : ptr_ (p) {} 
--  InterfaceDef_var (const InterfaceDef_var &); // copy constructor
--  ~InterfaceDef_var (void); // destructor
--  
--  InterfaceDef_var &operator= (InterfaceDef_ptr);
--  InterfaceDef_var &operator= (const InterfaceDef_var &);
--  InterfaceDef_ptr operator-> (void) const;
--  
--  operator const InterfaceDef_ptr &() const;
--  operator InterfaceDef_ptr &();
--  // in, inout, out, _retn 
--  InterfaceDef_ptr in (void) const;
--  InterfaceDef_ptr &inout (void);
--  InterfaceDef_ptr &out (void);
--  InterfaceDef_ptr _retn (void);
--  InterfaceDef_ptr ptr (void) const;
--
--private:
--  InterfaceDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  InterfaceDef_var (const TAO_Base_var &rhs);
--  InterfaceDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_INTERFACEDEF___OUT_CH_)
--#define _IR_INTERFACEDEF___OUT_CH_
--
--class TAO_IFR_Client_Export InterfaceDef_out
--{
--public:
--  InterfaceDef_out (InterfaceDef_ptr &);
--  InterfaceDef_out (InterfaceDef_var &);
--  InterfaceDef_out (const InterfaceDef_out &);
--  InterfaceDef_out &operator= (const InterfaceDef_out &);
--  InterfaceDef_out &operator= (const InterfaceDef_var &);
--  InterfaceDef_out &operator= (InterfaceDef_ptr);
--  operator InterfaceDef_ptr &();
--  InterfaceDef_ptr &ptr (void);
--  InterfaceDef_ptr operator-> (void);
--  
--private:
--  InterfaceDef_ptr &ptr_;
-+  void operator= (const IR_AttrDescriptionSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_INTERFACEDEF_CH_)
--#define _IR_INTERFACEDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_InterfaceDef_Proxy_Impl;
- class _TAO_InterfaceDef_Remote_Proxy_Impl;
- class _TAO_InterfaceDef_Proxy_Broker;
- class _TAO_InterfaceDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export InterfaceDef: public virtual Container, public virtual Contained, public virtual IDLType
-+class TAO_IFR_Client_Export IR_InterfaceDef: public virtual IR_Container, public virtual IR_Contained, public virtual IR_IDLType
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef InterfaceDef_ptr _ptr_type;
--  typedef InterfaceDef_var _var_type;
-+  typedef IR_InterfaceDef_ptr _ptr_type;
-+  typedef IR_InterfaceDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static InterfaceDef_ptr _duplicate (InterfaceDef_ptr obj);
--  static InterfaceDef_ptr _narrow (
-+  static IR_InterfaceDef_ptr _duplicate (IR_InterfaceDef_ptr obj);
-+  static IR_InterfaceDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static InterfaceDef_ptr _unchecked_narrow (
-+  static IR_InterfaceDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static InterfaceDef_ptr _nil (void)
-+  static IR_InterfaceDef_ptr _nil (void)
-     {
--      return (InterfaceDef_ptr)0;
-+      return (IR_InterfaceDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
- 
--  virtual IR::InterfaceDefSeq * base_interfaces (
-+  virtual IR_InterfaceDefSeq * base_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19521,7 +16280,7 @@
-     ));
- 
-   virtual void base_interfaces (
--      const IR::InterfaceDefSeq & base_interfaces,
-+      const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19572,14 +16331,14 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::AttributeDef_ptr create_attribute (
-+  virtual IR_AttributeDef_ptr create_attribute (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
--      IR::AttributeMode mode,
--      const IR::ExceptionDefSeq & get_exceptions,
--      const IR::ExceptionDefSeq & put_exceptions,
-+      IR_IDLType_ptr type,
-+      IR_AttributeMode mode,
-+      const IR_ExceptionDefSeq & get_exceptions,
-+      const IR_ExceptionDefSeq & put_exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19587,15 +16346,15 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::OperationDef_ptr create_operation (
-+  virtual IR_OperationDef_ptr create_operation (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr result,
--      IR::OperationMode mode,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
--      const IR::ContextIdSeq & contexts,
-+      IR_IDLType_ptr result,
-+      IR_OperationMode mode,
-+      const IR_ParDescriptionSeq & params,
-+      const IR_ExceptionDefSeq & exceptions,
-+      const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -19616,14 +16375,14 @@
-   _TAO_InterfaceDef_Proxy_Broker *the_TAO_InterfaceDef_Proxy_Broker_;
-   
- protected:
--  InterfaceDef (int collocated = 0);
-+  IR_InterfaceDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_InterfaceDef_setup_collocation (int collocated);
-     
--    InterfaceDef (
-+  IR_InterfaceDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -19633,10 +16392,10 @@
-     friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
-   
--  virtual ~InterfaceDef (void);
-+  virtual ~IR_InterfaceDef (void);
- private:
--  InterfaceDef (const InterfaceDef &);
--  void operator= (const InterfaceDef &);  
-+  IR_InterfaceDef (const IR_InterfaceDef &);
-+  void operator= (const IR_InterfaceDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -19646,7 +16405,7 @@
-   class TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::InterfaceDef;
-+    friend class IR_InterfaceDef;
-     
-     friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-     friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-@@ -19680,15 +16439,15 @@
- private:
-   TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get (const TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get &);
--  void result (IR::InterfaceDefSeq * result);
-+    void result (IR_InterfaceDefSeq * result);
-   // update the result 
--  IR::InterfaceDefSeq * _result;
-+    IR_InterfaceDefSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::InterfaceDef;
-+    friend class IR_InterfaceDef;
-   
-   friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-   friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-@@ -19697,7 +16456,7 @@
- TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::InterfaceDefSeq & base_interfaces,
-+        const IR_InterfaceDefSeq & base_interfaces,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -19723,14 +16482,14 @@
- private:
-   TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set (const TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set &);
--  const IR::InterfaceDefSeq & base_interfaces_;
-+    const IR_InterfaceDefSeq & base_interfaces_;
-   
- };
- 
- class TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::InterfaceDef;
-+    friend class IR_InterfaceDef;
-   
-   friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-   friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-@@ -19772,7 +16531,7 @@
- class TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::InterfaceDef;
-+    friend class IR_InterfaceDef;
-   
-   friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-   friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-@@ -19814,7 +16573,7 @@
- class TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::InterfaceDef;
-+    friend class IR_InterfaceDef;
-   
-   friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-   friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-@@ -19856,7 +16615,7 @@
- class TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::InterfaceDef;
-+    friend class IR_InterfaceDef;
-   
-   friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-   friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-@@ -19898,7 +16657,7 @@
- class TAO_ClientRequestInfo_IR_InterfaceDef_is_a : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::InterfaceDef;
-+    friend class IR_InterfaceDef;
-   
-   friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-   friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-@@ -19942,7 +16701,7 @@
- class TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::InterfaceDef;
-+    friend class IR_InterfaceDef;
-   
-   friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-   friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-@@ -19954,10 +16713,10 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode & mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+        IR_IDLType_ptr type,
-+        IR_AttributeMode & mode,
-+        const IR_ExceptionDefSeq & get_exceptions,
-+        const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -19986,19 +16745,19 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::IDLType_ptr type_;
--  const IR::AttributeMode & mode_;
--  const IR::ExceptionDefSeq & get_exceptions_;
--  const IR::ExceptionDefSeq & put_exceptions_;
--  void result (IR::AttributeDef_ptr result);
-+    IR_IDLType_ptr type_;
-+    const IR_AttributeMode & mode_;
-+    const IR_ExceptionDefSeq & get_exceptions_;
-+    const IR_ExceptionDefSeq & put_exceptions_;
-+    void result (IR_AttributeDef_ptr result);
-   // update the result 
--  IR::AttributeDef_ptr _result;
-+    IR_AttributeDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_InterfaceDef_create_operation : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::InterfaceDef;
-+    friend class IR_InterfaceDef;
-   
-   friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
-   friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
-@@ -20010,11 +16769,11 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode & mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+        IR_IDLType_ptr result,
-+        IR_OperationMode & mode,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-+        const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -20043,14 +16802,14 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::IDLType_ptr result_;
--  const IR::OperationMode & mode_;
--  const IR::ParDescriptionSeq & params_;
--  const IR::ExceptionDefSeq & exceptions_;
--  const IR::ContextIdSeq & contexts_;
--  void result (IR::OperationDef_ptr result);
-+    IR_IDLType_ptr result_;
-+    const IR_OperationMode & mode_;
-+    const IR_ParDescriptionSeq & params_;
-+    const IR_ExceptionDefSeq & exceptions_;
-+    const IR_ContextIdSeq & contexts_;
-+    void result (IR_OperationDef_ptr result);
-   // update the result 
--  IR::OperationDef_ptr _result;
-+    IR_OperationDef_ptr _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-@@ -20068,14 +16827,14 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_InterfaceDef_Proxy_Impl : 
--  public virtual IR::_TAO_Container_Proxy_Impl, 
--  public virtual IR::_TAO_Contained_Proxy_Impl, 
--  public virtual IR::_TAO_IDLType_Proxy_Impl
-+  public virtual _TAO_Container_Proxy_Impl,
-+  public virtual _TAO_Contained_Proxy_Impl,
-+  public virtual _TAO_IDLType_Proxy_Impl
- {
- public:
-   virtual ~_TAO_InterfaceDef_Proxy_Impl (void) { }
-   
--    virtual IR::InterfaceDefSeq * base_interfaces (
-+  virtual IR_InterfaceDefSeq * base_interfaces (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -20085,7 +16844,7 @@
- 
-   virtual void base_interfaces (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::InterfaceDefSeq & base_interfaces,
-+      const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -20135,31 +16894,31 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::AttributeDef_ptr create_attribute (
-+  virtual IR_AttributeDef_ptr create_attribute (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
--      IR::AttributeMode mode,
--      const IR::ExceptionDefSeq & get_exceptions,
--      const IR::ExceptionDefSeq & put_exceptions,
-+      IR_IDLType_ptr type,
-+      IR_AttributeMode mode,
-+      const IR_ExceptionDefSeq & get_exceptions,
-+      const IR_ExceptionDefSeq & put_exceptions,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::OperationDef_ptr create_operation (
-+  virtual IR_OperationDef_ptr create_operation (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr result,
--      IR::OperationMode mode,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
--      const IR::ContextIdSeq & contexts,
-+      IR_IDLType_ptr result,
-+      IR_OperationMode mode,
-+      const IR_ParDescriptionSeq & params,
-+      const IR_ExceptionDefSeq & exceptions,
-+      const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -20170,6 +16929,7 @@
-   _TAO_InterfaceDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -20182,9 +16942,9 @@
- class TAO_IFR_Client_Export _TAO_InterfaceDef_Remote_Proxy_Impl : 
-   public virtual _TAO_InterfaceDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_Container_Remote_Proxy_Impl, 
--  public virtual IR::_TAO_Contained_Remote_Proxy_Impl, 
--  public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
-+  public virtual _TAO_Container_Remote_Proxy_Impl,
-+  public virtual _TAO_Contained_Remote_Proxy_Impl,
-+  public virtual _TAO_IDLType_Remote_Proxy_Impl
-   
- {
- public:
-@@ -20192,7 +16952,7 @@
-   
-   virtual ~_TAO_InterfaceDef_Remote_Proxy_Impl (void) { }
-   
--    virtual IR::InterfaceDefSeq * base_interfaces (
-+  virtual IR_InterfaceDefSeq * base_interfaces (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -20202,7 +16962,7 @@
- 
-   virtual void base_interfaces (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::InterfaceDefSeq & base_interfaces,
-+      const IR_InterfaceDefSeq & base_interfaces,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -20252,31 +17012,31 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::AttributeDef_ptr create_attribute (
-+  virtual IR_AttributeDef_ptr create_attribute (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
--      IR::AttributeMode mode,
--      const IR::ExceptionDefSeq & get_exceptions,
--      const IR::ExceptionDefSeq & put_exceptions,
-+      IR_IDLType_ptr type,
-+      IR_AttributeMode mode,
-+      const IR_ExceptionDefSeq & get_exceptions,
-+      const IR_ExceptionDefSeq & put_exceptions,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::OperationDef_ptr create_operation (
-+  virtual IR_OperationDef_ptr create_operation (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr result,
--      IR::OperationMode mode,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
--      const IR::ContextIdSeq & contexts,
-+      IR_IDLType_ptr result,
-+      IR_OperationMode mode,
-+      const IR_ParDescriptionSeq & params,
-+      const IR_ExceptionDefSeq & exceptions,
-+      const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -20305,8 +17065,9 @@
- {
- public:
-   virtual ~_TAO_InterfaceDef_Proxy_Broker (void);
-+
-   virtual _TAO_InterfaceDef_Proxy_Impl &select_proxy (
--    InterfaceDef *object,
-+    IR_InterfaceDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -20315,6 +17076,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -20332,7 +17094,7 @@
-   virtual ~_TAO_InterfaceDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_InterfaceDef_Proxy_Impl &select_proxy (
--    InterfaceDef *object,
-+    IR_InterfaceDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -20346,24 +17108,15 @@
-   static _TAO_InterfaceDef_Remote_Proxy_Broker *the_TAO_InterfaceDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDef;
--
--struct InterfaceDescription;
--class InterfaceDescription_var;
--
--struct TAO_IFR_Client_Export InterfaceDescription
-+struct TAO_IFR_Client_Export IR_InterfaceDescription
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef InterfaceDescription_var _var_type;
-+  typedef IR_InterfaceDescription_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
-@@ -20372,71 +17125,66 @@
-   TAO_String_Manager id;
-   TAO_String_Manager defined_in;
-   TAO_String_Manager version;
--  ACE_NESTED_CLASS (IR, OpDescriptionSeq) operations;
--  ACE_NESTED_CLASS (IR, AttrDescriptionSeq) attributes;
--  ACE_NESTED_CLASS (IR, RepositoryIdSeq) base_interfaces;
-+  IR_OpDescriptionSeq operations;
-+  IR_AttrDescriptionSeq attributes;
-+  IR_RepositoryIdSeq base_interfaces;
-   CORBA::TypeCode_var type;
-   CORBA::Boolean is_abstract;
-   CORBA::Boolean is_local;
- };
- 
--class TAO_IFR_Client_Export InterfaceDescription_var
-+class TAO_IFR_Client_Export IR_InterfaceDescription_var
- {
- public:
--  InterfaceDescription_var (void); // default constructor
--  InterfaceDescription_var (InterfaceDescription *);
--  InterfaceDescription_var (const InterfaceDescription_var &); // copy constructor
--  ~InterfaceDescription_var (void); // destructor
-+  IR_InterfaceDescription_var (void); // default constructor
-+  IR_InterfaceDescription_var (IR_InterfaceDescription *);
-+  IR_InterfaceDescription_var (const IR_InterfaceDescription_var &); // copy constructor
-+  ~IR_InterfaceDescription_var (void); // destructor
-   
--  InterfaceDescription_var &operator= (InterfaceDescription *);
--  InterfaceDescription_var &operator= (const InterfaceDescription_var &);
--  InterfaceDescription *operator-> (void);
--  const InterfaceDescription *operator-> (void) const;
-+  IR_InterfaceDescription_var &operator= (IR_InterfaceDescription *);
-+  IR_InterfaceDescription_var &operator= (const IR_InterfaceDescription_var &);
-+  IR_InterfaceDescription *operator-> (void);
-+  const IR_InterfaceDescription *operator-> (void) const;
-   
--  operator const InterfaceDescription &() const;
--  operator InterfaceDescription &();
--  operator InterfaceDescription &() const;
--  operator InterfaceDescription *&(); // variable-size types only
-+  operator const IR_InterfaceDescription &() const;
-+  operator IR_InterfaceDescription &();
-+  operator IR_InterfaceDescription &() const;
-+  operator IR_InterfaceDescription *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const InterfaceDescription &in (void) const;
--  InterfaceDescription &inout (void);
--  InterfaceDescription *&out (void);
--  InterfaceDescription *_retn (void);
--  InterfaceDescription *ptr (void) const;
-+  const IR_InterfaceDescription &in (void) const;
-+  IR_InterfaceDescription &inout (void);
-+  IR_InterfaceDescription *&out (void);
-+  IR_InterfaceDescription *_retn (void);
-+  IR_InterfaceDescription *ptr (void) const;
- 
- private:
--  InterfaceDescription *ptr_;
-+  IR_InterfaceDescription *ptr_;
- };
- 
--class TAO_IFR_Client_Export InterfaceDescription_out
-+class TAO_IFR_Client_Export IR_InterfaceDescription_out
- {
- public:
--  InterfaceDescription_out (InterfaceDescription *&);
--  InterfaceDescription_out (InterfaceDescription_var &);
--  InterfaceDescription_out (const InterfaceDescription_out &);
--  InterfaceDescription_out &operator= (const InterfaceDescription_out &);
--  InterfaceDescription_out &operator= (InterfaceDescription *);
--  operator InterfaceDescription *&();
--  InterfaceDescription *&ptr (void);
--  InterfaceDescription *operator-> (void);
-+  IR_InterfaceDescription_out (IR_InterfaceDescription *&);
-+  IR_InterfaceDescription_out (IR_InterfaceDescription_var &);
-+  IR_InterfaceDescription_out (const IR_InterfaceDescription_out &);
-+  IR_InterfaceDescription_out &operator= (const IR_InterfaceDescription_out &);
-+  IR_InterfaceDescription_out &operator= (IR_InterfaceDescription *);
-+  operator IR_InterfaceDescription *&();
-+  IR_InterfaceDescription *&ptr (void);
-+  IR_InterfaceDescription *operator-> (void);
-   
- private:
--  InterfaceDescription *&ptr_;
-+  IR_InterfaceDescription *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const InterfaceDescription_var &);
-+  void operator= (const IR_InterfaceDescription_var &);
- };
- 
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDescription;
--
--struct ValueMember;
--class ValueMember_var;
--
--struct TAO_IFR_Client_Export ValueMember
-+struct TAO_IFR_Client_Export IR_ValueMember
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ValueMember_var _var_type;
-+  typedef IR_ValueMember_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
-@@ -20446,65 +17194,59 @@
-   TAO_String_Manager defined_in;
-   TAO_String_Manager version;
-   CORBA::TypeCode_var type;
--  ACE_NESTED_CLASS (IR, IDLType_var) type_def;
-+  IR_IDLType_var type_def;
-   CORBA::Visibility access;
- };
- 
--class TAO_IFR_Client_Export ValueMember_var
-+class TAO_IFR_Client_Export IR_ValueMember_var
- {
- public:
--  ValueMember_var (void); // default constructor
--  ValueMember_var (ValueMember *);
--  ValueMember_var (const ValueMember_var &); // copy constructor
--  ~ValueMember_var (void); // destructor
-+  IR_ValueMember_var (void); // default constructor
-+  IR_ValueMember_var (IR_ValueMember *);
-+  IR_ValueMember_var (const IR_ValueMember_var &); // copy constructor
-+  ~IR_ValueMember_var (void); // destructor
-   
--  ValueMember_var &operator= (ValueMember *);
--  ValueMember_var &operator= (const ValueMember_var &);
--  ValueMember *operator-> (void);
--  const ValueMember *operator-> (void) const;
-+  IR_ValueMember_var &operator= (IR_ValueMember *);
-+  IR_ValueMember_var &operator= (const IR_ValueMember_var &);
-+  IR_ValueMember *operator-> (void);
-+  const IR_ValueMember *operator-> (void) const;
-   
--  operator const ValueMember &() const;
--  operator ValueMember &();
--  operator ValueMember &() const;
--  operator ValueMember *&(); // variable-size types only
-+  operator const IR_ValueMember &() const;
-+  operator IR_ValueMember &();
-+  operator IR_ValueMember &() const;
-+  operator IR_ValueMember *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const ValueMember &in (void) const;
--  ValueMember &inout (void);
--  ValueMember *&out (void);
--  ValueMember *_retn (void);
--  ValueMember *ptr (void) const;
-+  const IR_ValueMember &in (void) const;
-+  IR_ValueMember &inout (void);
-+  IR_ValueMember *&out (void);
-+  IR_ValueMember *_retn (void);
-+  IR_ValueMember *ptr (void) const;
- 
- private:
--  ValueMember *ptr_;
-+  IR_ValueMember *ptr_;
- };
- 
--class TAO_IFR_Client_Export ValueMember_out
-+class TAO_IFR_Client_Export IR_ValueMember_out
- {
- public:
--  ValueMember_out (ValueMember *&);
--  ValueMember_out (ValueMember_var &);
--  ValueMember_out (const ValueMember_out &);
--  ValueMember_out &operator= (const ValueMember_out &);
--  ValueMember_out &operator= (ValueMember *);
--  operator ValueMember *&();
--  ValueMember *&ptr (void);
--  ValueMember *operator-> (void);
-+  IR_ValueMember_out (IR_ValueMember *&);
-+  IR_ValueMember_out (IR_ValueMember_var &);
-+  IR_ValueMember_out (const IR_ValueMember_out &);
-+  IR_ValueMember_out &operator= (const IR_ValueMember_out &);
-+  IR_ValueMember_out &operator= (IR_ValueMember *);
-+  operator IR_ValueMember *&();
-+  IR_ValueMember *&ptr (void);
-+  IR_ValueMember *operator-> (void);
-   
- private:
--  ValueMember *&ptr_;
-+  IR_ValueMember *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ValueMember_var &);
-+  void operator= (const IR_ValueMember_var &);
- };
- 
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueMember;
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CH_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CH_
--
-   class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_ValueMemberSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -20514,244 +17256,190 @@
-     _TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum); 
-     _TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      ValueMember *data,
-+      IR_ValueMember *data,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Sequence_IR_ValueMemberSeq (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs);
-     _TAO_Unbounded_Sequence_IR_ValueMemberSeq &operator= (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs);
-     virtual ~_TAO_Unbounded_Sequence_IR_ValueMemberSeq (void); // Dtor.
-     // = Accessors.
--    ValueMember &operator[] (CORBA::ULong i);
--    const ValueMember &operator[] (CORBA::ULong i) const;
-+    IR_ValueMember &operator[] (CORBA::ULong i);
-+    const IR_ValueMember &operator[] (CORBA::ULong i) const;
-     // = Static operations.
--    static ValueMember *allocbuf (CORBA::ULong size);
--    static void freebuf (ValueMember *buffer);
-+    static IR_ValueMember *allocbuf (CORBA::ULong size);
-+    static void freebuf (IR_ValueMember *buffer);
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
-     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-     
--    ValueMember *get_buffer (CORBA::Boolean orphan = 0);
--    const ValueMember *get_buffer (void) const;
-+    IR_ValueMember *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_ValueMember *get_buffer (void) const;
-     void replace (CORBA::ULong max,
-       CORBA::ULong length,
--      ValueMember *data,
-+      IR_ValueMember *data,
-       CORBA::Boolean release);
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_VALUEMEMBERSEQ_CH_)
--#define _IR_VALUEMEMBERSEQ_CH_
--
--class ValueMemberSeq;
--class ValueMemberSeq_var;
--
- // *************************************************************
--// ValueMemberSeq
-+// IR_ValueMemberSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export ValueMemberSeq : public 
-+class TAO_IFR_Client_Export IR_ValueMemberSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_ValueMemberSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<ValueMember>
-+  TAO_Unbounded_Sequence<IR_ValueMember>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  ValueMemberSeq (void); // default ctor
--  ValueMemberSeq (CORBA::ULong max); // uses max size
--  ValueMemberSeq (
-+  IR_ValueMemberSeq (void); // default ctor
-+  IR_ValueMemberSeq (CORBA::ULong max); // uses max size
-+  IR_ValueMemberSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    ValueMember *buffer, 
-+    IR_ValueMember *buffer,
-     CORBA::Boolean release = 0
-   );
--  ValueMemberSeq (const ValueMemberSeq &); // copy ctor
--  ~ValueMemberSeq (void);
-+  IR_ValueMemberSeq (const IR_ValueMemberSeq &); // copy ctor
-+  ~IR_ValueMemberSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ValueMemberSeq_var _var_type;
-+  typedef IR_ValueMemberSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEMEMBERSEQ___VAR_CH_)
--#define _IR_VALUEMEMBERSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::ValueMemberSeq_var
-+// class IR_ValueMemberSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export ValueMemberSeq_var
-+class TAO_IFR_Client_Export IR_ValueMemberSeq_var
- {
- public:
--  ValueMemberSeq_var (void); // default constructor
--  ValueMemberSeq_var (ValueMemberSeq *);
--  ValueMemberSeq_var (const ValueMemberSeq_var &); // copy constructor
--  ~ValueMemberSeq_var (void); // destructor
-+  IR_ValueMemberSeq_var (void); // default constructor
-+  IR_ValueMemberSeq_var (IR_ValueMemberSeq *);
-+  IR_ValueMemberSeq_var (const IR_ValueMemberSeq_var &); // copy constructor
-+  ~IR_ValueMemberSeq_var (void); // destructor
-   
--  ValueMemberSeq_var &operator= (ValueMemberSeq *);
--  ValueMemberSeq_var &operator= (const ValueMemberSeq_var &);
--  ValueMemberSeq *operator-> (void);
--  const ValueMemberSeq *operator-> (void) const;
-+  IR_ValueMemberSeq_var &operator= (IR_ValueMemberSeq *);
-+  IR_ValueMemberSeq_var &operator= (const IR_ValueMemberSeq_var &);
-+  IR_ValueMemberSeq *operator-> (void);
-+  const IR_ValueMemberSeq *operator-> (void) const;
-   
--  operator const ValueMemberSeq &() const;
--  operator ValueMemberSeq &();
--  operator ValueMemberSeq &() const;
--  operator ValueMemberSeq *&(); // variable-size base types only
-+  operator const IR_ValueMemberSeq &() const;
-+  operator IR_ValueMemberSeq &();
-+  operator IR_ValueMemberSeq &() const;
-+  operator IR_ValueMemberSeq *&(); // variable-size base types only
-   
--  ValueMember & operator[] (CORBA::ULong index);
--  const ValueMember & operator[] (CORBA::ULong index) const;
-+  IR_ValueMember & operator[] (CORBA::ULong index);
-+  const IR_ValueMember & operator[] (CORBA::ULong index) const;
-   
-   // in, inout, out, _retn 
--  const ValueMemberSeq &in (void) const;
--  ValueMemberSeq &inout (void);
--  ValueMemberSeq *&out (void);
--  ValueMemberSeq *_retn (void);
--  ValueMemberSeq *ptr (void) const;
-+  const IR_ValueMemberSeq &in (void) const;
-+  IR_ValueMemberSeq &inout (void);
-+  IR_ValueMemberSeq *&out (void);
-+  IR_ValueMemberSeq *_retn (void);
-+  IR_ValueMemberSeq *ptr (void) const;
- 
- private:
--  ValueMemberSeq *ptr_;
-+  IR_ValueMemberSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEMEMBERSEQ___OUT_CH_)
--#define _IR_VALUEMEMBERSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export ValueMemberSeq_out
-+class TAO_IFR_Client_Export IR_ValueMemberSeq_out
- {
- public:
--  ValueMemberSeq_out (ValueMemberSeq *&);
--  ValueMemberSeq_out (ValueMemberSeq_var &);
--  ValueMemberSeq_out (const ValueMemberSeq_out &);
--  ValueMemberSeq_out &operator= (const ValueMemberSeq_out &);
--  ValueMemberSeq_out &operator= (ValueMemberSeq *);
--  operator ValueMemberSeq *&();
--  ValueMemberSeq *&ptr (void);
--  ValueMemberSeq *operator-> (void);
--  ValueMember & operator[] (CORBA::ULong index);
-+  IR_ValueMemberSeq_out (IR_ValueMemberSeq *&);
-+  IR_ValueMemberSeq_out (IR_ValueMemberSeq_var &);
-+  IR_ValueMemberSeq_out (const IR_ValueMemberSeq_out &);
-+  IR_ValueMemberSeq_out &operator= (const IR_ValueMemberSeq_out &);
-+  IR_ValueMemberSeq_out &operator= (IR_ValueMemberSeq *);
-+  operator IR_ValueMemberSeq *&();
-+  IR_ValueMemberSeq *&ptr (void);
-+  IR_ValueMemberSeq *operator-> (void);
-+  IR_ValueMember & operator[] (CORBA::ULong index);
-   
- private:
--  ValueMemberSeq *&ptr_;
-+  IR_ValueMemberSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ValueMemberSeq_var &);
-+  void operator= (const IR_ValueMemberSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueMemberSeq;
--
--
--#if !defined (_IR_VALUEMEMBERDEF___PTR_CH_)
--#define _IR_VALUEMEMBERDEF___PTR_CH_
--
--class ValueMemberDef;
--typedef ValueMemberDef *ValueMemberDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEMEMBERDEF___VAR_CH_)
--#define _IR_VALUEMEMBERDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ValueMemberDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_ValueMemberDef_var : public TAO_Base_var
- {
- public:
--  ValueMemberDef_var (void); // default constructor
--  ValueMemberDef_var (ValueMemberDef_ptr p) : ptr_ (p) {} 
--  ValueMemberDef_var (const ValueMemberDef_var &); // copy constructor
--  ~ValueMemberDef_var (void); // destructor
-+  IR_ValueMemberDef_var (void); // default constructor
-+  IR_ValueMemberDef_var (IR_ValueMemberDef_ptr p) : ptr_ (p) {}
-+  IR_ValueMemberDef_var (const IR_ValueMemberDef_var &); // copy constructor
-+  ~IR_ValueMemberDef_var (void); // destructor
-   
--  ValueMemberDef_var &operator= (ValueMemberDef_ptr);
--  ValueMemberDef_var &operator= (const ValueMemberDef_var &);
--  ValueMemberDef_ptr operator-> (void) const;
-+  IR_ValueMemberDef_var &operator= (IR_ValueMemberDef_ptr);
-+  IR_ValueMemberDef_var &operator= (const IR_ValueMemberDef_var &);
-+  IR_ValueMemberDef_ptr operator-> (void) const;
-   
--  operator const ValueMemberDef_ptr &() const;
--  operator ValueMemberDef_ptr &();
-+  operator const IR_ValueMemberDef_ptr &() const;
-+  operator IR_ValueMemberDef_ptr &();
-   // in, inout, out, _retn 
--  ValueMemberDef_ptr in (void) const;
--  ValueMemberDef_ptr &inout (void);
--  ValueMemberDef_ptr &out (void);
--  ValueMemberDef_ptr _retn (void);
--  ValueMemberDef_ptr ptr (void) const;
-+  IR_ValueMemberDef_ptr in (void) const;
-+  IR_ValueMemberDef_ptr &inout (void);
-+  IR_ValueMemberDef_ptr &out (void);
-+  IR_ValueMemberDef_ptr _retn (void);
-+  IR_ValueMemberDef_ptr ptr (void) const;
- 
- private:
--  ValueMemberDef_ptr ptr_;
-+  IR_ValueMemberDef_ptr ptr_;
-   // Unimplemented - prevents widening assignment.
--  ValueMemberDef_var (const TAO_Base_var &rhs);
--  ValueMemberDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_ValueMemberDef_var (const TAO_Base_var &rhs);
-+  IR_ValueMemberDef_var &operator= (const TAO_Base_var &rhs);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEMEMBERDEF___OUT_CH_)
--#define _IR_VALUEMEMBERDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ValueMemberDef_out
-+class TAO_IFR_Client_Export IR_ValueMemberDef_out
- {
- public:
--  ValueMemberDef_out (ValueMemberDef_ptr &);
--  ValueMemberDef_out (ValueMemberDef_var &);
--  ValueMemberDef_out (const ValueMemberDef_out &);
--  ValueMemberDef_out &operator= (const ValueMemberDef_out &);
--  ValueMemberDef_out &operator= (const ValueMemberDef_var &);
--  ValueMemberDef_out &operator= (ValueMemberDef_ptr);
--  operator ValueMemberDef_ptr &();
--  ValueMemberDef_ptr &ptr (void);
--  ValueMemberDef_ptr operator-> (void);
-+  IR_ValueMemberDef_out (IR_ValueMemberDef_ptr &);
-+  IR_ValueMemberDef_out (IR_ValueMemberDef_var &);
-+  IR_ValueMemberDef_out (const IR_ValueMemberDef_out &);
-+  IR_ValueMemberDef_out &operator= (const IR_ValueMemberDef_out &);
-+  IR_ValueMemberDef_out &operator= (const IR_ValueMemberDef_var &);
-+  IR_ValueMemberDef_out &operator= (IR_ValueMemberDef_ptr);
-+  operator IR_ValueMemberDef_ptr &();
-+  IR_ValueMemberDef_ptr &ptr (void);
-+  IR_ValueMemberDef_ptr operator-> (void);
-   
- private:
--  ValueMemberDef_ptr &ptr_;
-+  IR_ValueMemberDef_ptr &ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEMEMBERDEF_CH_)
--#define _IR_VALUEMEMBERDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_ValueMemberDef_Proxy_Impl;
- class _TAO_ValueMemberDef_Remote_Proxy_Impl;
- class _TAO_ValueMemberDef_Proxy_Broker;
- class _TAO_ValueMemberDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ValueMemberDef: public virtual Contained
-+class TAO_IFR_Client_Export IR_ValueMemberDef: public virtual IR_Contained
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ValueMemberDef_ptr _ptr_type;
--  typedef ValueMemberDef_var _var_type;
-+  typedef IR_ValueMemberDef_ptr _ptr_type;
-+  typedef IR_ValueMemberDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static ValueMemberDef_ptr _duplicate (ValueMemberDef_ptr obj);
--  static ValueMemberDef_ptr _narrow (
-+  static IR_ValueMemberDef_ptr _duplicate (IR_ValueMemberDef_ptr obj);
-+  static IR_ValueMemberDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ValueMemberDef_ptr _unchecked_narrow (
-+  static IR_ValueMemberDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ValueMemberDef_ptr _nil (void)
-+  static IR_ValueMemberDef_ptr _nil (void)
-     {
--      return (ValueMemberDef_ptr)0;
-+      return (IR_ValueMemberDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -20764,7 +17452,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr type_def (
-+  virtual IR_IDLType_ptr type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -20773,7 +17461,7 @@
-     ));
- 
-   virtual void type_def (
--      IR::IDLType_ptr type_def,
-+      IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -20811,14 +17499,14 @@
-   _TAO_ValueMemberDef_Proxy_Broker *the_TAO_ValueMemberDef_Proxy_Broker_;
-   
- protected:
--  ValueMemberDef (int collocated = 0);
-+  IR_ValueMemberDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_ValueMemberDef_setup_collocation (int collocated);
-     
--    ValueMemberDef (
-+  IR_ValueMemberDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -20828,10 +17516,10 @@
-     friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
-   
--  virtual ~ValueMemberDef (void);
-+  virtual ~IR_ValueMemberDef (void);
- private:
--  ValueMemberDef (const ValueMemberDef &);
--  void operator= (const ValueMemberDef &);  
-+  IR_ValueMemberDef (const IR_ValueMemberDef &);
-+  void operator= (const IR_ValueMemberDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -20841,7 +17529,7 @@
-   class TAO_ClientRequestInfo_IR_ValueMemberDef_type_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::ValueMemberDef;
-+    friend class IR_ValueMemberDef;
-     
-     friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
-     friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
-@@ -20883,7 +17571,7 @@
- class TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueMemberDef;
-+    friend class IR_ValueMemberDef;
-   
-   friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
-@@ -20917,15 +17605,15 @@
- private:
-   TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get (const TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get &);
--  void result (IR::IDLType_ptr result);
-+    void result (IR_IDLType_ptr result);
-   // update the result 
--  IR::IDLType_ptr _result;
-+    IR_IDLType_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueMemberDef;
-+    friend class IR_ValueMemberDef;
-   
-   friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
-@@ -20934,7 +17622,7 @@
- TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr type_def,
-+        IR_IDLType_ptr type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -20960,14 +17648,14 @@
- private:
-   TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set (const TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set &);
--  IR::IDLType_ptr type_def_;
-+    IR_IDLType_ptr type_def_;
-   
- };
- 
- class TAO_ClientRequestInfo_IR_ValueMemberDef_access_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueMemberDef;
-+    friend class IR_ValueMemberDef;
-   
-   friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
-@@ -21009,7 +17697,7 @@
- class TAO_ClientRequestInfo_IR_ValueMemberDef_access_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueMemberDef;
-+    friend class IR_ValueMemberDef;
-   
-   friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
-@@ -21063,7 +17751,7 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_ValueMemberDef_Proxy_Impl : 
--  public virtual IR::_TAO_Contained_Proxy_Impl
-+  public virtual _TAO_Contained_Proxy_Impl
- {
- public:
-   virtual ~_TAO_ValueMemberDef_Proxy_Impl (void) { }
-@@ -21076,7 +17764,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::IDLType_ptr type_def (
-+  virtual IR_IDLType_ptr type_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -21086,7 +17774,7 @@
- 
-   virtual void type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr type_def,
-+      IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -21114,6 +17802,7 @@
-   _TAO_ValueMemberDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -21126,7 +17815,7 @@
- class TAO_IFR_Client_Export _TAO_ValueMemberDef_Remote_Proxy_Impl : 
-   public virtual _TAO_ValueMemberDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_Contained_Remote_Proxy_Impl
-+  public virtual _TAO_Contained_Remote_Proxy_Impl
-   
- {
- public:
-@@ -21142,7 +17831,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::IDLType_ptr type_def (
-+  virtual IR_IDLType_ptr type_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -21152,7 +17841,7 @@
- 
-   virtual void type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr type_def,
-+      IR_IDLType_ptr type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -21198,8 +17887,9 @@
- {
- public:
-   virtual ~_TAO_ValueMemberDef_Proxy_Broker (void);
-+
-   virtual _TAO_ValueMemberDef_Proxy_Impl &select_proxy (
--    ValueMemberDef *object,
-+    IR_ValueMemberDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -21208,6 +17898,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -21225,7 +17916,7 @@
-   virtual ~_TAO_ValueMemberDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_ValueMemberDef_Proxy_Impl &select_proxy (
--    ValueMemberDef *object,
-+    IR_ValueMemberDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -21239,122 +17930,44 @@
-   static _TAO_ValueMemberDef_Remote_Proxy_Broker *the_TAO_ValueMemberDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueMemberDef;
--
--
--#if !defined (_IR_VALUEDEF___PTR_CH_)
--#define _IR_VALUEDEF___PTR_CH_
--
--class ValueDef;
--typedef ValueDef *ValueDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEDEF___VAR_CH_)
--#define _IR_VALUEDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ValueDef_var : public TAO_Base_var
--{
--public:
--  ValueDef_var (void); // default constructor
--  ValueDef_var (ValueDef_ptr p) : ptr_ (p) {} 
--  ValueDef_var (const ValueDef_var &); // copy constructor
--  ~ValueDef_var (void); // destructor
--  
--  ValueDef_var &operator= (ValueDef_ptr);
--  ValueDef_var &operator= (const ValueDef_var &);
--  ValueDef_ptr operator-> (void) const;
--  
--  operator const ValueDef_ptr &() const;
--  operator ValueDef_ptr &();
--  // in, inout, out, _retn 
--  ValueDef_ptr in (void) const;
--  ValueDef_ptr &inout (void);
--  ValueDef_ptr &out (void);
--  ValueDef_ptr _retn (void);
--  ValueDef_ptr ptr (void) const;
--
--private:
--  ValueDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  ValueDef_var (const TAO_Base_var &rhs);
--  ValueDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEDEF___OUT_CH_)
--#define _IR_VALUEDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ValueDef_out
--{
--public:
--  ValueDef_out (ValueDef_ptr &);
--  ValueDef_out (ValueDef_var &);
--  ValueDef_out (const ValueDef_out &);
--  ValueDef_out &operator= (const ValueDef_out &);
--  ValueDef_out &operator= (const ValueDef_var &);
--  ValueDef_out &operator= (ValueDef_ptr);
--  operator ValueDef_ptr &();
--  ValueDef_ptr &ptr (void);
--  ValueDef_ptr operator-> (void);
--  
--private:
--  ValueDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEDEF_CH_)
--#define _IR_VALUEDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_ValueDef_Proxy_Impl;
- class _TAO_ValueDef_Remote_Proxy_Impl;
- class _TAO_ValueDef_Proxy_Broker;
- class _TAO_ValueDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ValueDef: public virtual Container, public virtual Contained, public virtual IDLType
-+class TAO_IFR_Client_Export IR_ValueDef: public virtual IR_Container, public virtual IR_Contained, public virtual IR_IDLType
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ValueDef_ptr _ptr_type;
--  typedef ValueDef_var _var_type;
-+  typedef IR_ValueDef_ptr _ptr_type;
-+  typedef IR_ValueDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static ValueDef_ptr _duplicate (ValueDef_ptr obj);
--  static ValueDef_ptr _narrow (
-+  static IR_ValueDef_ptr _duplicate (IR_ValueDef_ptr obj);
-+  static IR_ValueDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ValueDef_ptr _unchecked_narrow (
-+  static IR_ValueDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ValueDef_ptr _nil (void)
-+  static IR_ValueDef_ptr _nil (void)
-     {
--      return (ValueDef_ptr)0;
-+      return (IR_ValueDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
- 
--  virtual IR::InterfaceDefSeq * supported_interfaces (
-+  virtual IR_InterfaceDefSeq * supported_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21363,7 +17976,7 @@
-     ));
- 
-   virtual void supported_interfaces (
--      const IR::InterfaceDefSeq & supported_interfaces,
-+      const IR_InterfaceDefSeq & supported_interfaces,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21371,7 +17984,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::InitializerSeq * initializers (
-+  virtual IR_InitializerSeq * initializers (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21380,7 +17993,7 @@
-     ));
- 
-   virtual void initializers (
--      const IR::InitializerSeq & initializers,
-+      const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21388,7 +18001,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueDef_ptr base_value (
-+  virtual IR_ValueDef_ptr base_value (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21397,7 +18010,7 @@
-     ));
- 
-   virtual void base_value (
--      IR::ValueDef_ptr base_value,
-+      IR_ValueDef_ptr base_value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21405,7 +18018,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueDefSeq * abstract_base_values (
-+  virtual IR_ValueDefSeq * abstract_base_values (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21414,7 +18027,7 @@
-     ));
- 
-   virtual void abstract_base_values (
--      const IR::ValueDefSeq & abstract_base_values,
-+      const IR_ValueDefSeq & abstract_base_values,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21482,11 +18095,11 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueMemberDef_ptr create_value_member (
-+  virtual IR_ValueMemberDef_ptr create_value_member (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+      IR_IDLType_ptr type,
-       CORBA::Visibility access,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -21495,14 +18108,14 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::AttributeDef_ptr create_attribute (
-+  virtual IR_AttributeDef_ptr create_attribute (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
--      IR::AttributeMode mode,
--      const IR::ExceptionDefSeq & get_exceptions,
--      const IR::ExceptionDefSeq & put_exceptions,
-+      IR_IDLType_ptr type,
-+      IR_AttributeMode mode,
-+      const IR_ExceptionDefSeq & get_exceptions,
-+      const IR_ExceptionDefSeq & put_exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21510,15 +18123,15 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::OperationDef_ptr create_operation (
-+  virtual IR_OperationDef_ptr create_operation (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr result,
--      IR::OperationMode mode,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
--      const IR::ContextIdSeq & contexts,
-+      IR_IDLType_ptr result,
-+      IR_OperationMode mode,
-+      const IR_ParDescriptionSeq & params,
-+      const IR_ExceptionDefSeq & exceptions,
-+      const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -21539,14 +18152,14 @@
-   _TAO_ValueDef_Proxy_Broker *the_TAO_ValueDef_Proxy_Broker_;
-   
- protected:
--  ValueDef (int collocated = 0);
-+  IR_ValueDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_ValueDef_setup_collocation (int collocated);
-     
--    ValueDef (
-+  IR_ValueDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -21556,10 +18169,10 @@
-     friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_ValueDef_Direct_Proxy_Impl;
-   
--  virtual ~ValueDef (void);
-+  virtual ~IR_ValueDef (void);
- private:
--  ValueDef (const ValueDef &);
--  void operator= (const ValueDef &);  
-+  IR_ValueDef (const IR_ValueDef &);
-+  void operator= (const IR_ValueDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -21569,7 +18182,7 @@
-   class TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-     
-     friend class _TAO_ValueDef_Remote_Proxy_Impl;
-     friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -21603,15 +18216,15 @@
- private:
-   TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get (const TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get &);
--  void result (IR::InterfaceDefSeq * result);
-+    void result (IR_InterfaceDefSeq * result);
-   // update the result 
--  IR::InterfaceDefSeq * _result;
-+    IR_InterfaceDefSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -21620,7 +18233,7 @@
- TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::InterfaceDefSeq & supported_interfaces,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -21646,14 +18259,14 @@
- private:
-   TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set (const TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set &);
--  const IR::InterfaceDefSeq & supported_interfaces_;
-+    const IR_InterfaceDefSeq & supported_interfaces_;
-   
- };
- 
- class TAO_ClientRequestInfo_IR_ValueDef_initializers_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -21687,15 +18300,15 @@
- private:
-   TAO_ClientRequestInfo_IR_ValueDef_initializers_get (const TAO_ClientRequestInfo_IR_ValueDef_initializers_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ValueDef_initializers_get &);
--  void result (IR::InitializerSeq * result);
-+    void result (IR_InitializerSeq * result);
-   // update the result 
--  IR::InitializerSeq * _result;
-+    IR_InitializerSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ValueDef_initializers_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -21704,7 +18317,7 @@
- TAO_ClientRequestInfo_IR_ValueDef_initializers_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::InitializerSeq & initializers,
-+        const IR_InitializerSeq & initializers,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -21730,14 +18343,14 @@
- private:
-   TAO_ClientRequestInfo_IR_ValueDef_initializers_set (const TAO_ClientRequestInfo_IR_ValueDef_initializers_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_ValueDef_initializers_set &);
--  const IR::InitializerSeq & initializers_;
-+    const IR_InitializerSeq & initializers_;
-   
- };
- 
- class TAO_ClientRequestInfo_IR_ValueDef_base_value_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -21771,15 +18384,15 @@
- private:
-   TAO_ClientRequestInfo_IR_ValueDef_base_value_get (const TAO_ClientRequestInfo_IR_ValueDef_base_value_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ValueDef_base_value_get &);
--  void result (IR::ValueDef_ptr result);
-+    void result (IR_ValueDef_ptr result);
-   // update the result 
--  IR::ValueDef_ptr _result;
-+    IR_ValueDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ValueDef_base_value_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -21788,7 +18401,7 @@
- TAO_ClientRequestInfo_IR_ValueDef_base_value_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::ValueDef_ptr base_value,
-+        IR_ValueDef_ptr base_value,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -21814,14 +18427,14 @@
- private:
-   TAO_ClientRequestInfo_IR_ValueDef_base_value_set (const TAO_ClientRequestInfo_IR_ValueDef_base_value_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_ValueDef_base_value_set &);
--  IR::ValueDef_ptr base_value_;
-+    IR_ValueDef_ptr base_value_;
-   
- };
- 
- class TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -21855,15 +18468,15 @@
- private:
-   TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get (const TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get &);
--  void result (IR::ValueDefSeq * result);
-+    void result (IR_ValueDefSeq * result);
-   // update the result 
--  IR::ValueDefSeq * _result;
-+    IR_ValueDefSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -21872,7 +18485,7 @@
- TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::ValueDefSeq & abstract_base_values,
-+        const IR_ValueDefSeq & abstract_base_values,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -21898,14 +18511,14 @@
- private:
-   TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set (const TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set &);
--  const IR::ValueDefSeq & abstract_base_values_;
-+    const IR_ValueDefSeq & abstract_base_values_;
-   
- };
- 
- class TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -21947,7 +18560,7 @@
- class TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -21989,7 +18602,7 @@
- class TAO_ClientRequestInfo_IR_ValueDef_is_custom_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -22031,7 +18644,7 @@
- class TAO_ClientRequestInfo_IR_ValueDef_is_custom_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -22073,7 +18686,7 @@
- class TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -22115,7 +18728,7 @@
- class TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -22157,7 +18770,7 @@
- class TAO_ClientRequestInfo_IR_ValueDef_is_a : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -22201,7 +18814,7 @@
- class TAO_ClientRequestInfo_IR_ValueDef_create_value_member : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -22213,7 +18826,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
-+        IR_IDLType_ptr type,
-     const CORBA::Visibility & access,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-@@ -22243,17 +18856,17 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::IDLType_ptr type_;
-+    IR_IDLType_ptr type_;
-   const CORBA::Visibility & access_;
--  void result (IR::ValueMemberDef_ptr result);
-+    void result (IR_ValueMemberDef_ptr result);
-   // update the result 
--  IR::ValueMemberDef_ptr _result;
-+    IR_ValueMemberDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ValueDef_create_attribute : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -22265,10 +18878,10 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr type,
--    IR::AttributeMode & mode,
--    const IR::ExceptionDefSeq & get_exceptions,
--    const IR::ExceptionDefSeq & put_exceptions,
-+        IR_IDLType_ptr type,
-+        IR_AttributeMode & mode,
-+        const IR_ExceptionDefSeq & get_exceptions,
-+        const IR_ExceptionDefSeq & put_exceptions,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -22297,19 +18910,19 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::IDLType_ptr type_;
--  const IR::AttributeMode & mode_;
--  const IR::ExceptionDefSeq & get_exceptions_;
--  const IR::ExceptionDefSeq & put_exceptions_;
--  void result (IR::AttributeDef_ptr result);
-+    IR_IDLType_ptr type_;
-+    const IR_AttributeMode & mode_;
-+    const IR_ExceptionDefSeq & get_exceptions_;
-+    const IR_ExceptionDefSeq & put_exceptions_;
-+    void result (IR_AttributeDef_ptr result);
-   // update the result 
--  IR::AttributeDef_ptr _result;
-+    IR_AttributeDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ValueDef_create_operation : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueDef;
-+    friend class IR_ValueDef;
-   
-   friend class _TAO_ValueDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
-@@ -22321,11 +18934,11 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::IDLType_ptr result,
--    IR::OperationMode & mode,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
--    const IR::ContextIdSeq & contexts,
-+        IR_IDLType_ptr result,
-+        IR_OperationMode & mode,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-+        const IR_ContextIdSeq & contexts,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -22354,14 +18967,14 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::IDLType_ptr result_;
--  const IR::OperationMode & mode_;
--  const IR::ParDescriptionSeq & params_;
--  const IR::ExceptionDefSeq & exceptions_;
--  const IR::ContextIdSeq & contexts_;
--  void result (IR::OperationDef_ptr result);
-+    IR_IDLType_ptr result_;
-+    const IR_OperationMode & mode_;
-+    const IR_ParDescriptionSeq & params_;
-+    const IR_ExceptionDefSeq & exceptions_;
-+    const IR_ContextIdSeq & contexts_;
-+    void result (IR_OperationDef_ptr result);
-   // update the result 
--  IR::OperationDef_ptr _result;
-+    IR_OperationDef_ptr _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-@@ -22379,14 +18992,14 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_ValueDef_Proxy_Impl : 
--  public virtual IR::_TAO_Container_Proxy_Impl, 
--  public virtual IR::_TAO_Contained_Proxy_Impl, 
--  public virtual IR::_TAO_IDLType_Proxy_Impl
-+  public virtual _TAO_Container_Proxy_Impl,
-+  public virtual _TAO_Contained_Proxy_Impl,
-+  public virtual _TAO_IDLType_Proxy_Impl
- {
- public:
-   virtual ~_TAO_ValueDef_Proxy_Impl (void) { }
-   
--    virtual IR::InterfaceDefSeq * supported_interfaces (
-+  virtual IR_InterfaceDefSeq * supported_interfaces (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -22396,14 +19009,14 @@
- 
-   virtual void supported_interfaces (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::InterfaceDefSeq & supported_interfaces,
-+      const IR_InterfaceDefSeq & supported_interfaces,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::InitializerSeq * initializers (
-+  virtual IR_InitializerSeq * initializers (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -22413,14 +19026,14 @@
- 
-   virtual void initializers (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::InitializerSeq & initializers,
-+      const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ValueDef_ptr base_value (
-+  virtual IR_ValueDef_ptr base_value (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -22430,14 +19043,14 @@
- 
-   virtual void base_value (
-       CORBA_Object *_collocated_tao_target_,
--      IR::ValueDef_ptr base_value,
-+      IR_ValueDef_ptr base_value,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ValueDefSeq * abstract_base_values (
-+  virtual IR_ValueDefSeq * abstract_base_values (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -22447,7 +19060,7 @@
- 
-   virtual void abstract_base_values (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::ValueDefSeq & abstract_base_values,
-+      const IR_ValueDefSeq & abstract_base_values,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -22514,12 +19127,12 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ValueMemberDef_ptr create_value_member (
-+  virtual IR_ValueMemberDef_ptr create_value_member (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+      IR_IDLType_ptr type,
-       CORBA::Visibility access,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -22527,31 +19140,31 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::AttributeDef_ptr create_attribute (
-+  virtual IR_AttributeDef_ptr create_attribute (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
--      IR::AttributeMode mode,
--      const IR::ExceptionDefSeq & get_exceptions,
--      const IR::ExceptionDefSeq & put_exceptions,
-+      IR_IDLType_ptr type,
-+      IR_AttributeMode mode,
-+      const IR_ExceptionDefSeq & get_exceptions,
-+      const IR_ExceptionDefSeq & put_exceptions,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::OperationDef_ptr create_operation (
-+  virtual IR_OperationDef_ptr create_operation (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr result,
--      IR::OperationMode mode,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
--      const IR::ContextIdSeq & contexts,
-+      IR_IDLType_ptr result,
-+      IR_OperationMode mode,
-+      const IR_ParDescriptionSeq & params,
-+      const IR_ExceptionDefSeq & exceptions,
-+      const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -22562,6 +19175,7 @@
-   _TAO_ValueDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -22574,9 +19188,9 @@
- class TAO_IFR_Client_Export _TAO_ValueDef_Remote_Proxy_Impl : 
-   public virtual _TAO_ValueDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_Container_Remote_Proxy_Impl, 
--  public virtual IR::_TAO_Contained_Remote_Proxy_Impl, 
--  public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
-+  public virtual _TAO_Container_Remote_Proxy_Impl,
-+  public virtual _TAO_Contained_Remote_Proxy_Impl,
-+  public virtual _TAO_IDLType_Remote_Proxy_Impl
-   
- {
- public:
-@@ -22584,7 +19198,7 @@
-   
-   virtual ~_TAO_ValueDef_Remote_Proxy_Impl (void) { }
-   
--    virtual IR::InterfaceDefSeq * supported_interfaces (
-+  virtual IR_InterfaceDefSeq * supported_interfaces (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -22594,14 +19208,14 @@
- 
-   virtual void supported_interfaces (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::InterfaceDefSeq & supported_interfaces,
-+      const IR_InterfaceDefSeq & supported_interfaces,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::InitializerSeq * initializers (
-+  virtual IR_InitializerSeq * initializers (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -22611,14 +19225,14 @@
- 
-   virtual void initializers (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::InitializerSeq & initializers,
-+      const IR_InitializerSeq & initializers,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueDef_ptr base_value (
-+  virtual IR_ValueDef_ptr base_value (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -22628,14 +19242,14 @@
- 
-   virtual void base_value (
-       CORBA_Object *_collocated_tao_target_,
--      IR::ValueDef_ptr base_value,
-+      IR_ValueDef_ptr base_value,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueDefSeq * abstract_base_values (
-+  virtual IR_ValueDefSeq * abstract_base_values (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -22645,7 +19259,7 @@
- 
-   virtual void abstract_base_values (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::ValueDefSeq & abstract_base_values,
-+      const IR_ValueDefSeq & abstract_base_values,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -22712,12 +19326,12 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueMemberDef_ptr create_value_member (
-+  virtual IR_ValueMemberDef_ptr create_value_member (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
-+      IR_IDLType_ptr type,
-       CORBA::Visibility access,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -22725,31 +19339,31 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::AttributeDef_ptr create_attribute (
-+  virtual IR_AttributeDef_ptr create_attribute (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr type,
--      IR::AttributeMode mode,
--      const IR::ExceptionDefSeq & get_exceptions,
--      const IR::ExceptionDefSeq & put_exceptions,
-+      IR_IDLType_ptr type,
-+      IR_AttributeMode mode,
-+      const IR_ExceptionDefSeq & get_exceptions,
-+      const IR_ExceptionDefSeq & put_exceptions,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::OperationDef_ptr create_operation (
-+  virtual IR_OperationDef_ptr create_operation (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::IDLType_ptr result,
--      IR::OperationMode mode,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
--      const IR::ContextIdSeq & contexts,
-+      IR_IDLType_ptr result,
-+      IR_OperationMode mode,
-+      const IR_ParDescriptionSeq & params,
-+      const IR_ExceptionDefSeq & exceptions,
-+      const IR_ContextIdSeq & contexts,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -22778,8 +19392,9 @@
- {
- public:
-   virtual ~_TAO_ValueDef_Proxy_Broker (void);
-+
-   virtual _TAO_ValueDef_Proxy_Impl &select_proxy (
--    ValueDef *object,
-+    IR_ValueDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -22788,6 +19403,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -22805,7 +19421,7 @@
-   virtual ~_TAO_ValueDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_ValueDef_Proxy_Impl &select_proxy (
--    ValueDef *object,
-+    IR_ValueDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -22819,24 +19435,15 @@
-   static _TAO_ValueDef_Remote_Proxy_Broker *the_TAO_ValueDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueDef;
--
--struct ValueDescription;
--class ValueDescription_var;
--
--struct TAO_IFR_Client_Export ValueDescription
-+struct TAO_IFR_Client_Export IR_ValueDescription
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ValueDescription_var _var_type;
-+  typedef IR_ValueDescription_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
-@@ -22847,172 +19454,98 @@
-   CORBA::Boolean is_custom;
-   TAO_String_Manager defined_in;
-   TAO_String_Manager version;
--  ACE_NESTED_CLASS (IR, OpDescriptionSeq) operations;
--  ACE_NESTED_CLASS (IR, AttrDescriptionSeq) attributes;
--  ACE_NESTED_CLASS (IR, ValueMemberSeq) members;
--  ACE_NESTED_CLASS (IR, InitializerSeq) initializers;
--  ACE_NESTED_CLASS (IR, RepositoryIdSeq) supported_interfaces;
--  ACE_NESTED_CLASS (IR, RepositoryIdSeq) abstract_base_values;
-+  IR_OpDescriptionSeq operations;
-+  IR_AttrDescriptionSeq attributes;
-+  IR_ValueMemberSeq members;
-+  IR_InitializerSeq initializers;
-+  IR_RepositoryIdSeq supported_interfaces;
-+  IR_RepositoryIdSeq abstract_base_values;
-   CORBA::Boolean is_truncatable;
-   TAO_String_Manager base_value;
-   CORBA::TypeCode_var type;
- };
- 
--class TAO_IFR_Client_Export ValueDescription_var
-+class TAO_IFR_Client_Export IR_ValueDescription_var
- {
- public:
--  ValueDescription_var (void); // default constructor
--  ValueDescription_var (ValueDescription *);
--  ValueDescription_var (const ValueDescription_var &); // copy constructor
--  ~ValueDescription_var (void); // destructor
-+  IR_ValueDescription_var (void); // default constructor
-+  IR_ValueDescription_var (IR_ValueDescription *);
-+  IR_ValueDescription_var (const IR_ValueDescription_var &); // copy constructor
-+  ~IR_ValueDescription_var (void); // destructor
-   
--  ValueDescription_var &operator= (ValueDescription *);
--  ValueDescription_var &operator= (const ValueDescription_var &);
--  ValueDescription *operator-> (void);
--  const ValueDescription *operator-> (void) const;
-+  IR_ValueDescription_var &operator= (IR_ValueDescription *);
-+  IR_ValueDescription_var &operator= (const IR_ValueDescription_var &);
-+  IR_ValueDescription *operator-> (void);
-+  const IR_ValueDescription *operator-> (void) const;
-   
--  operator const ValueDescription &() const;
--  operator ValueDescription &();
--  operator ValueDescription &() const;
--  operator ValueDescription *&(); // variable-size types only
-+  operator const IR_ValueDescription &() const;
-+  operator IR_ValueDescription &();
-+  operator IR_ValueDescription &() const;
-+  operator IR_ValueDescription *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const ValueDescription &in (void) const;
--  ValueDescription &inout (void);
--  ValueDescription *&out (void);
--  ValueDescription *_retn (void);
--  ValueDescription *ptr (void) const;
-+  const IR_ValueDescription &in (void) const;
-+  IR_ValueDescription &inout (void);
-+  IR_ValueDescription *&out (void);
-+  IR_ValueDescription *_retn (void);
-+  IR_ValueDescription *ptr (void) const;
- 
- private:
--  ValueDescription *ptr_;
-+  IR_ValueDescription *ptr_;
- };
- 
--class TAO_IFR_Client_Export ValueDescription_out
-+class TAO_IFR_Client_Export IR_ValueDescription_out
- {
- public:
--  ValueDescription_out (ValueDescription *&);
--  ValueDescription_out (ValueDescription_var &);
--  ValueDescription_out (const ValueDescription_out &);
--  ValueDescription_out &operator= (const ValueDescription_out &);
--  ValueDescription_out &operator= (ValueDescription *);
--  operator ValueDescription *&();
--  ValueDescription *&ptr (void);
--  ValueDescription *operator-> (void);
-+  IR_ValueDescription_out (IR_ValueDescription *&);
-+  IR_ValueDescription_out (IR_ValueDescription_var &);
-+  IR_ValueDescription_out (const IR_ValueDescription_out &);
-+  IR_ValueDescription_out &operator= (const IR_ValueDescription_out &);
-+  IR_ValueDescription_out &operator= (IR_ValueDescription *);
-+  operator IR_ValueDescription *&();
-+  IR_ValueDescription *&ptr (void);
-+  IR_ValueDescription *operator-> (void);
-   
- private:
--  ValueDescription *&ptr_;
-+  IR_ValueDescription *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ValueDescription_var &);
--};
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueDescription;
--
--
--#if !defined (_IR_VALUEBOXDEF___PTR_CH_)
--#define _IR_VALUEBOXDEF___PTR_CH_
--
--class ValueBoxDef;
--typedef ValueBoxDef *ValueBoxDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEBOXDEF___VAR_CH_)
--#define _IR_VALUEBOXDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ValueBoxDef_var : public TAO_Base_var
--{
--public:
--  ValueBoxDef_var (void); // default constructor
--  ValueBoxDef_var (ValueBoxDef_ptr p) : ptr_ (p) {} 
--  ValueBoxDef_var (const ValueBoxDef_var &); // copy constructor
--  ~ValueBoxDef_var (void); // destructor
--  
--  ValueBoxDef_var &operator= (ValueBoxDef_ptr);
--  ValueBoxDef_var &operator= (const ValueBoxDef_var &);
--  ValueBoxDef_ptr operator-> (void) const;
--  
--  operator const ValueBoxDef_ptr &() const;
--  operator ValueBoxDef_ptr &();
--  // in, inout, out, _retn 
--  ValueBoxDef_ptr in (void) const;
--  ValueBoxDef_ptr &inout (void);
--  ValueBoxDef_ptr &out (void);
--  ValueBoxDef_ptr _retn (void);
--  ValueBoxDef_ptr ptr (void) const;
--
--private:
--  ValueBoxDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  ValueBoxDef_var (const TAO_Base_var &rhs);
--  ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEBOXDEF___OUT_CH_)
--#define _IR_VALUEBOXDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ValueBoxDef_out
--{
--public:
--  ValueBoxDef_out (ValueBoxDef_ptr &);
--  ValueBoxDef_out (ValueBoxDef_var &);
--  ValueBoxDef_out (const ValueBoxDef_out &);
--  ValueBoxDef_out &operator= (const ValueBoxDef_out &);
--  ValueBoxDef_out &operator= (const ValueBoxDef_var &);
--  ValueBoxDef_out &operator= (ValueBoxDef_ptr);
--  operator ValueBoxDef_ptr &();
--  ValueBoxDef_ptr &ptr (void);
--  ValueBoxDef_ptr operator-> (void);
--  
--private:
--  ValueBoxDef_ptr &ptr_;
-+  void operator= (const IR_ValueDescription_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEBOXDEF_CH_)
--#define _IR_VALUEBOXDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_ValueBoxDef_Proxy_Impl;
- class _TAO_ValueBoxDef_Remote_Proxy_Impl;
- class _TAO_ValueBoxDef_Proxy_Broker;
- class _TAO_ValueBoxDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ValueBoxDef: public virtual TypedefDef
-+class TAO_IFR_Client_Export IR_ValueBoxDef: public virtual IR_TypedefDef
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ValueBoxDef_ptr _ptr_type;
--  typedef ValueBoxDef_var _var_type;
-+  typedef IR_ValueBoxDef_ptr _ptr_type;
-+  typedef IR_ValueBoxDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static ValueBoxDef_ptr _duplicate (ValueBoxDef_ptr obj);
--  static ValueBoxDef_ptr _narrow (
-+  static IR_ValueBoxDef_ptr _duplicate (IR_ValueBoxDef_ptr obj);
-+  static IR_ValueBoxDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ValueBoxDef_ptr _unchecked_narrow (
-+  static IR_ValueBoxDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ValueBoxDef_ptr _nil (void)
-+  static IR_ValueBoxDef_ptr _nil (void)
-     {
--      return (ValueBoxDef_ptr)0;
-+      return (IR_ValueBoxDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
- 
--  virtual IR::IDLType_ptr original_type_def (
-+  virtual IR_IDLType_ptr original_type_def (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -23021,7 +19554,7 @@
-     ));
- 
-   virtual void original_type_def (
--      IR::IDLType_ptr original_type_def,
-+      IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -23042,14 +19575,14 @@
-   _TAO_ValueBoxDef_Proxy_Broker *the_TAO_ValueBoxDef_Proxy_Broker_;
-   
- protected:
--  ValueBoxDef (int collocated = 0);
-+  IR_ValueBoxDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_ValueBoxDef_setup_collocation (int collocated);
-     
--    ValueBoxDef (
-+  IR_ValueBoxDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -23059,10 +19592,10 @@
-     friend class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_ValueBoxDef_Direct_Proxy_Impl;
-   
--  virtual ~ValueBoxDef (void);
-+  virtual ~IR_ValueBoxDef (void);
- private:
--  ValueBoxDef (const ValueBoxDef &);
--  void operator= (const ValueBoxDef &);  
-+  IR_ValueBoxDef (const IR_ValueBoxDef &);
-+  void operator= (const IR_ValueBoxDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -23072,7 +19605,7 @@
-   class TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::ValueBoxDef;
-+    friend class IR_ValueBoxDef;
-     
-     friend class _TAO_ValueBoxDef_Remote_Proxy_Impl;
-     friend class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
-@@ -23106,15 +19639,15 @@
- private:
-   TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get (const TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get &);
--  void result (IR::IDLType_ptr result);
-+    void result (IR_IDLType_ptr result);
-   // update the result 
--  IR::IDLType_ptr _result;
-+    IR_IDLType_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ValueBoxDef;
-+    friend class IR_ValueBoxDef;
-   
-   friend class _TAO_ValueBoxDef_Remote_Proxy_Impl;
-   friend class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
-@@ -23123,7 +19656,7 @@
- TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    IR::IDLType_ptr original_type_def,
-+        IR_IDLType_ptr original_type_def,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -23149,7 +19682,7 @@
- private:
-   TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set (const TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set &);
--  IR::IDLType_ptr original_type_def_;
-+    IR_IDLType_ptr original_type_def_;
-   
- };
- 
-@@ -23168,12 +19701,12 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_ValueBoxDef_Proxy_Impl : 
--  public virtual IR::_TAO_TypedefDef_Proxy_Impl
-+  public virtual _TAO_TypedefDef_Proxy_Impl
- {
- public:
-   virtual ~_TAO_ValueBoxDef_Proxy_Impl (void) { }
-   
--    virtual IR::IDLType_ptr original_type_def (
-+  virtual IR_IDLType_ptr original_type_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -23183,7 +19716,7 @@
- 
-   virtual void original_type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr original_type_def,
-+      IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -23194,6 +19727,7 @@
-   _TAO_ValueBoxDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -23206,7 +19740,7 @@
- class TAO_IFR_Client_Export _TAO_ValueBoxDef_Remote_Proxy_Impl : 
-   public virtual _TAO_ValueBoxDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_TypedefDef_Remote_Proxy_Impl
-+  public virtual _TAO_TypedefDef_Remote_Proxy_Impl
-   
- {
- public:
-@@ -23214,7 +19748,7 @@
-   
-   virtual ~_TAO_ValueBoxDef_Remote_Proxy_Impl (void) { }
-   
--    virtual IR::IDLType_ptr original_type_def (
-+  virtual IR_IDLType_ptr original_type_def (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -23224,7 +19758,7 @@
- 
-   virtual void original_type_def (
-       CORBA_Object *_collocated_tao_target_,
--      IR::IDLType_ptr original_type_def,
-+      IR_IDLType_ptr original_type_def,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -23253,8 +19787,9 @@
- {
- public:
-   virtual ~_TAO_ValueBoxDef_Proxy_Broker (void);
-+
-   virtual _TAO_ValueBoxDef_Proxy_Impl &select_proxy (
--    ValueBoxDef *object,
-+    IR_ValueBoxDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -23263,6 +19798,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -23280,7 +19816,7 @@
-   virtual ~_TAO_ValueBoxDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_ValueBoxDef_Proxy_Impl &select_proxy (
--    ValueBoxDef *object,
-+    IR_ValueBoxDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -23294,122 +19830,44 @@
-   static _TAO_ValueBoxDef_Remote_Proxy_Broker *the_TAO_ValueBoxDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueBoxDef;
--
--
--#if !defined (_IR_PROVIDESDEF___PTR_CH_)
--#define _IR_PROVIDESDEF___PTR_CH_
--
--class ProvidesDef;
--typedef ProvidesDef *ProvidesDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PROVIDESDEF___VAR_CH_)
--#define _IR_PROVIDESDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ProvidesDef_var : public TAO_Base_var
--{
--public:
--  ProvidesDef_var (void); // default constructor
--  ProvidesDef_var (ProvidesDef_ptr p) : ptr_ (p) {} 
--  ProvidesDef_var (const ProvidesDef_var &); // copy constructor
--  ~ProvidesDef_var (void); // destructor
--  
--  ProvidesDef_var &operator= (ProvidesDef_ptr);
--  ProvidesDef_var &operator= (const ProvidesDef_var &);
--  ProvidesDef_ptr operator-> (void) const;
--  
--  operator const ProvidesDef_ptr &() const;
--  operator ProvidesDef_ptr &();
--  // in, inout, out, _retn 
--  ProvidesDef_ptr in (void) const;
--  ProvidesDef_ptr &inout (void);
--  ProvidesDef_ptr &out (void);
--  ProvidesDef_ptr _retn (void);
--  ProvidesDef_ptr ptr (void) const;
--
--private:
--  ProvidesDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  ProvidesDef_var (const TAO_Base_var &rhs);
--  ProvidesDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PROVIDESDEF___OUT_CH_)
--#define _IR_PROVIDESDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ProvidesDef_out
--{
--public:
--  ProvidesDef_out (ProvidesDef_ptr &);
--  ProvidesDef_out (ProvidesDef_var &);
--  ProvidesDef_out (const ProvidesDef_out &);
--  ProvidesDef_out &operator= (const ProvidesDef_out &);
--  ProvidesDef_out &operator= (const ProvidesDef_var &);
--  ProvidesDef_out &operator= (ProvidesDef_ptr);
--  operator ProvidesDef_ptr &();
--  ProvidesDef_ptr &ptr (void);
--  ProvidesDef_ptr operator-> (void);
--  
--private:
--  ProvidesDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PROVIDESDEF_CH_)
--#define _IR_PROVIDESDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_ProvidesDef_Proxy_Impl;
- class _TAO_ProvidesDef_Remote_Proxy_Impl;
- class _TAO_ProvidesDef_Proxy_Broker;
- class _TAO_ProvidesDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ProvidesDef: public virtual Contained
-+class TAO_IFR_Client_Export IR_ProvidesDef: public virtual IR_Contained
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ProvidesDef_ptr _ptr_type;
--  typedef ProvidesDef_var _var_type;
-+  typedef IR_ProvidesDef_ptr _ptr_type;
-+  typedef IR_ProvidesDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static ProvidesDef_ptr _duplicate (ProvidesDef_ptr obj);
--  static ProvidesDef_ptr _narrow (
-+  static IR_ProvidesDef_ptr _duplicate (IR_ProvidesDef_ptr obj);
-+  static IR_ProvidesDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ProvidesDef_ptr _unchecked_narrow (
-+  static IR_ProvidesDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ProvidesDef_ptr _nil (void)
-+  static IR_ProvidesDef_ptr _nil (void)
-     {
--      return (ProvidesDef_ptr)0;
-+      return (IR_ProvidesDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
- 
--  virtual IR::InterfaceDef_ptr interface_type (
-+  virtual IR_InterfaceDef_ptr interface_type (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -23430,14 +19888,14 @@
-   _TAO_ProvidesDef_Proxy_Broker *the_TAO_ProvidesDef_Proxy_Broker_;
-   
- protected:
--  ProvidesDef (int collocated = 0);
-+  IR_ProvidesDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_ProvidesDef_setup_collocation (int collocated);
-     
--    ProvidesDef (
-+  IR_ProvidesDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -23447,10 +19905,10 @@
-     friend class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_ProvidesDef_Direct_Proxy_Impl;
-   
--  virtual ~ProvidesDef (void);
-+  virtual ~IR_ProvidesDef (void);
- private:
--  ProvidesDef (const ProvidesDef &);
--  void operator= (const ProvidesDef &);  
-+  IR_ProvidesDef (const IR_ProvidesDef &);
-+  void operator= (const IR_ProvidesDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -23460,7 +19918,7 @@
-   class TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::ProvidesDef;
-+    friend class IR_ProvidesDef;
-     
-     friend class _TAO_ProvidesDef_Remote_Proxy_Impl;
-     friend class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
-@@ -23494,9 +19952,9 @@
- private:
-   TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (const TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get &);
--  void result (IR::InterfaceDef_ptr result);
-+    void result (IR_InterfaceDef_ptr result);
-   // update the result 
--  IR::InterfaceDef_ptr _result;
-+    IR_InterfaceDef_ptr _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-@@ -23514,12 +19972,12 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Impl : 
--  public virtual IR::_TAO_Contained_Proxy_Impl
-+  public virtual _TAO_Contained_Proxy_Impl
- {
- public:
-   virtual ~_TAO_ProvidesDef_Proxy_Impl (void) { }
-   
--    virtual IR::InterfaceDef_ptr interface_type (
-+  virtual IR_InterfaceDef_ptr interface_type (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -23531,6 +19989,7 @@
-   _TAO_ProvidesDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -23543,7 +20002,7 @@
- class TAO_IFR_Client_Export _TAO_ProvidesDef_Remote_Proxy_Impl : 
-   public virtual _TAO_ProvidesDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_Contained_Remote_Proxy_Impl
-+  public virtual _TAO_Contained_Remote_Proxy_Impl
-   
- {
- public:
-@@ -23551,7 +20010,7 @@
-   
-   virtual ~_TAO_ProvidesDef_Remote_Proxy_Impl (void) { }
-   
--    virtual IR::InterfaceDef_ptr interface_type (
-+  virtual IR_InterfaceDef_ptr interface_type (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -23581,8 +20040,9 @@
- {
- public:
-   virtual ~_TAO_ProvidesDef_Proxy_Broker (void);
-+
-   virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
--    ProvidesDef *object,
-+    IR_ProvidesDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -23591,6 +20051,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -23608,7 +20069,7 @@
-   virtual ~_TAO_ProvidesDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
--    ProvidesDef *object,
-+    IR_ProvidesDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -23622,190 +20083,107 @@
-   static _TAO_ProvidesDef_Remote_Proxy_Broker *the_TAO_ProvidesDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDef;
--
--struct ProvidesDescription;
--class ProvidesDescription_var;
--
--struct TAO_IFR_Client_Export ProvidesDescription
-+struct TAO_IFR_Client_Export IR_ProvidesDescription
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ProvidesDescription_var _var_type;
--#endif /* ! __GNUC__ || g++ >= 2.8 */
--
--  static void _tao_any_destructor (void*);
--
--  TAO_String_Manager name;
--  TAO_String_Manager id;
--  TAO_String_Manager defined_in;
--  TAO_String_Manager version;
--  ACE_NESTED_CLASS (IR, InterfaceDef_var) interface_type;
--};
--
--class TAO_IFR_Client_Export ProvidesDescription_var
--{
--public:
--  ProvidesDescription_var (void); // default constructor
--  ProvidesDescription_var (ProvidesDescription *);
--  ProvidesDescription_var (const ProvidesDescription_var &); // copy constructor
--  ~ProvidesDescription_var (void); // destructor
--  
--  ProvidesDescription_var &operator= (ProvidesDescription *);
--  ProvidesDescription_var &operator= (const ProvidesDescription_var &);
--  ProvidesDescription *operator-> (void);
--  const ProvidesDescription *operator-> (void) const;
--  
--  operator const ProvidesDescription &() const;
--  operator ProvidesDescription &();
--  operator ProvidesDescription &() const;
--  operator ProvidesDescription *&(); // variable-size types only
--  
--  // in, inout, out, _retn 
--  const ProvidesDescription &in (void) const;
--  ProvidesDescription &inout (void);
--  ProvidesDescription *&out (void);
--  ProvidesDescription *_retn (void);
--  ProvidesDescription *ptr (void) const;
--
--private:
--  ProvidesDescription *ptr_;
--};
--
--class TAO_IFR_Client_Export ProvidesDescription_out
--{
--public:
--  ProvidesDescription_out (ProvidesDescription *&);
--  ProvidesDescription_out (ProvidesDescription_var &);
--  ProvidesDescription_out (const ProvidesDescription_out &);
--  ProvidesDescription_out &operator= (const ProvidesDescription_out &);
--  ProvidesDescription_out &operator= (ProvidesDescription *);
--  operator ProvidesDescription *&();
--  ProvidesDescription *&ptr (void);
--  ProvidesDescription *operator-> (void);
--  
--private:
--  ProvidesDescription *&ptr_;
--  // assignment from T_var not allowed
--  void operator= (const ProvidesDescription_var &);
--};
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDescription;
--
--
--#if !defined (_IR_USESDEF___PTR_CH_)
--#define _IR_USESDEF___PTR_CH_
--
--class UsesDef;
--typedef UsesDef *UsesDef_ptr;
--
--#endif /* end #if !defined */
-+  typedef IR_ProvidesDescription_var _var_type;
-+#endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-+  static void _tao_any_destructor (void*);
- 
--#if !defined (_IR_USESDEF___VAR_CH_)
--#define _IR_USESDEF___VAR_CH_
-+  TAO_String_Manager name;
-+  TAO_String_Manager id;
-+  TAO_String_Manager defined_in;
-+  TAO_String_Manager version;
-+  IR_InterfaceDef_var interface_type;
-+};
- 
--class TAO_IFR_Client_Export UsesDef_var : public TAO_Base_var
-+class TAO_IFR_Client_Export IR_ProvidesDescription_var
- {
- public:
--  UsesDef_var (void); // default constructor
--  UsesDef_var (UsesDef_ptr p) : ptr_ (p) {} 
--  UsesDef_var (const UsesDef_var &); // copy constructor
--  ~UsesDef_var (void); // destructor
-+  IR_ProvidesDescription_var (void); // default constructor
-+  IR_ProvidesDescription_var (IR_ProvidesDescription *);
-+  IR_ProvidesDescription_var (const IR_ProvidesDescription_var &); // copy constructor
-+  ~IR_ProvidesDescription_var (void); // destructor
-+
-+  IR_ProvidesDescription_var &operator= (IR_ProvidesDescription *);
-+  IR_ProvidesDescription_var &operator= (const IR_ProvidesDescription_var &);
-+  IR_ProvidesDescription *operator-> (void);
-+  const IR_ProvidesDescription *operator-> (void) const;
-   
--  UsesDef_var &operator= (UsesDef_ptr);
--  UsesDef_var &operator= (const UsesDef_var &);
--  UsesDef_ptr operator-> (void) const;
-+  operator const IR_ProvidesDescription &() const;
-+  operator IR_ProvidesDescription &();
-+  operator IR_ProvidesDescription &() const;
-+  operator IR_ProvidesDescription *&(); // variable-size types only
-   
--  operator const UsesDef_ptr &() const;
--  operator UsesDef_ptr &();
-   // in, inout, out, _retn 
--  UsesDef_ptr in (void) const;
--  UsesDef_ptr &inout (void);
--  UsesDef_ptr &out (void);
--  UsesDef_ptr _retn (void);
--  UsesDef_ptr ptr (void) const;
-+  const IR_ProvidesDescription &in (void) const;
-+  IR_ProvidesDescription &inout (void);
-+  IR_ProvidesDescription *&out (void);
-+  IR_ProvidesDescription *_retn (void);
-+  IR_ProvidesDescription *ptr (void) const;
- 
- private:
--  UsesDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  UsesDef_var (const TAO_Base_var &rhs);
--  UsesDef_var &operator= (const TAO_Base_var &rhs);
-+  IR_ProvidesDescription *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_USESDEF___OUT_CH_)
--#define _IR_USESDEF___OUT_CH_
--
--class TAO_IFR_Client_Export UsesDef_out
-+class TAO_IFR_Client_Export IR_ProvidesDescription_out
- {
- public:
--  UsesDef_out (UsesDef_ptr &);
--  UsesDef_out (UsesDef_var &);
--  UsesDef_out (const UsesDef_out &);
--  UsesDef_out &operator= (const UsesDef_out &);
--  UsesDef_out &operator= (const UsesDef_var &);
--  UsesDef_out &operator= (UsesDef_ptr);
--  operator UsesDef_ptr &();
--  UsesDef_ptr &ptr (void);
--  UsesDef_ptr operator-> (void);
-+  IR_ProvidesDescription_out (IR_ProvidesDescription *&);
-+  IR_ProvidesDescription_out (IR_ProvidesDescription_var &);
-+  IR_ProvidesDescription_out (const IR_ProvidesDescription_out &);
-+  IR_ProvidesDescription_out &operator= (const IR_ProvidesDescription_out &);
-+  IR_ProvidesDescription_out &operator= (IR_ProvidesDescription *);
-+  operator IR_ProvidesDescription *&();
-+  IR_ProvidesDescription *&ptr (void);
-+  IR_ProvidesDescription *operator-> (void);
-   
- private:
--  UsesDef_ptr &ptr_;
-+  IR_ProvidesDescription *&ptr_;
-+  // assignment from T_var not allowed
-+  void operator= (const IR_ProvidesDescription_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_USESDEF_CH_)
--#define _IR_USESDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_UsesDef_Proxy_Impl;
- class _TAO_UsesDef_Remote_Proxy_Impl;
- class _TAO_UsesDef_Proxy_Broker;
- class _TAO_UsesDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export UsesDef: public virtual Contained
-+class TAO_IFR_Client_Export IR_UsesDef: public virtual IR_Contained
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef UsesDef_ptr _ptr_type;
--  typedef UsesDef_var _var_type;
-+  typedef IR_UsesDef_ptr _ptr_type;
-+  typedef IR_UsesDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static UsesDef_ptr _duplicate (UsesDef_ptr obj);
--  static UsesDef_ptr _narrow (
-+  static IR_UsesDef_ptr _duplicate (IR_UsesDef_ptr obj);
-+  static IR_UsesDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static UsesDef_ptr _unchecked_narrow (
-+  static IR_UsesDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static UsesDef_ptr _nil (void)
-+  static IR_UsesDef_ptr _nil (void)
-     {
--      return (UsesDef_ptr)0;
-+      return (IR_UsesDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
- 
--  virtual IR::InterfaceDef_ptr interface_type (
-+  virtual IR_InterfaceDef_ptr interface_type (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -23834,14 +20212,14 @@
-   _TAO_UsesDef_Proxy_Broker *the_TAO_UsesDef_Proxy_Broker_;
-   
- protected:
--  UsesDef (int collocated = 0);
-+  IR_UsesDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_UsesDef_setup_collocation (int collocated);
-     
--    UsesDef (
-+  IR_UsesDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -23851,10 +20229,10 @@
-     friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_UsesDef_Direct_Proxy_Impl;
-   
--  virtual ~UsesDef (void);
-+  virtual ~IR_UsesDef (void);
- private:
--  UsesDef (const UsesDef &);
--  void operator= (const UsesDef &);  
-+  IR_UsesDef (const IR_UsesDef &);
-+  void operator= (const IR_UsesDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -23864,7 +20242,7 @@
-   class TAO_ClientRequestInfo_IR_UsesDef_interface_type_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::UsesDef;
-+    friend class IR_UsesDef;
-     
-     friend class _TAO_UsesDef_Remote_Proxy_Impl;
-     friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
-@@ -23898,15 +20276,15 @@
- private:
-   TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (const TAO_ClientRequestInfo_IR_UsesDef_interface_type_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_UsesDef_interface_type_get &);
--  void result (IR::InterfaceDef_ptr result);
-+    void result (IR_InterfaceDef_ptr result);
-   // update the result 
--  IR::InterfaceDef_ptr _result;
-+    IR_InterfaceDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::UsesDef;
-+    friend class IR_UsesDef;
-   
-   friend class _TAO_UsesDef_Remote_Proxy_Impl;
-   friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
-@@ -23960,12 +20338,12 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Impl : 
--  public virtual IR::_TAO_Contained_Proxy_Impl
-+  public virtual _TAO_Contained_Proxy_Impl
- {
- public:
-   virtual ~_TAO_UsesDef_Proxy_Impl (void) { }
-   
--    virtual IR::InterfaceDef_ptr interface_type (
-+  virtual IR_InterfaceDef_ptr interface_type (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -23985,6 +20363,7 @@
-   _TAO_UsesDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -23997,7 +20376,7 @@
- class TAO_IFR_Client_Export _TAO_UsesDef_Remote_Proxy_Impl : 
-   public virtual _TAO_UsesDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_Contained_Remote_Proxy_Impl
-+  public virtual _TAO_Contained_Remote_Proxy_Impl
-   
- {
- public:
-@@ -24005,7 +20384,7 @@
-   
-   virtual ~_TAO_UsesDef_Remote_Proxy_Impl (void) { }
-   
--    virtual IR::InterfaceDef_ptr interface_type (
-+  virtual IR_InterfaceDef_ptr interface_type (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -24043,8 +20422,9 @@
- {
- public:
-   virtual ~_TAO_UsesDef_Proxy_Broker (void);
-+
-   virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
--    UsesDef *object,
-+    IR_UsesDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -24053,6 +20433,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -24070,7 +20451,7 @@
-   virtual ~_TAO_UsesDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
--    UsesDef *object,
-+    IR_UsesDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -24084,24 +20465,15 @@
-   static _TAO_UsesDef_Remote_Proxy_Broker *the_TAO_UsesDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDef;
--
--struct UsesDescription;
--class UsesDescription_var;
--
--struct TAO_IFR_Client_Export UsesDescription
-+struct TAO_IFR_Client_Export IR_UsesDescription
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef UsesDescription_var _var_type;
-+  typedef IR_UsesDescription_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
-@@ -24110,65 +20482,59 @@
-   TAO_String_Manager id;
-   TAO_String_Manager defined_in;
-   TAO_String_Manager version;
--  ACE_NESTED_CLASS (IR, InterfaceDef_var) interface_type;
-+  IR_InterfaceDef_var interface_type;
-   CORBA::Boolean is_multiple;
- };
- 
--class TAO_IFR_Client_Export UsesDescription_var
-+class TAO_IFR_Client_Export IR_UsesDescription_var
- {
- public:
--  UsesDescription_var (void); // default constructor
--  UsesDescription_var (UsesDescription *);
--  UsesDescription_var (const UsesDescription_var &); // copy constructor
--  ~UsesDescription_var (void); // destructor
-+  IR_UsesDescription_var (void); // default constructor
-+  IR_UsesDescription_var (IR_UsesDescription *);
-+  IR_UsesDescription_var (const IR_UsesDescription_var &); // copy constructor
-+  ~IR_UsesDescription_var (void); // destructor
-   
--  UsesDescription_var &operator= (UsesDescription *);
--  UsesDescription_var &operator= (const UsesDescription_var &);
--  UsesDescription *operator-> (void);
--  const UsesDescription *operator-> (void) const;
-+  IR_UsesDescription_var &operator= (IR_UsesDescription *);
-+  IR_UsesDescription_var &operator= (const IR_UsesDescription_var &);
-+  IR_UsesDescription *operator-> (void);
-+  const IR_UsesDescription *operator-> (void) const;
-   
--  operator const UsesDescription &() const;
--  operator UsesDescription &();
--  operator UsesDescription &() const;
--  operator UsesDescription *&(); // variable-size types only
-+  operator const IR_UsesDescription &() const;
-+  operator IR_UsesDescription &();
-+  operator IR_UsesDescription &() const;
-+  operator IR_UsesDescription *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const UsesDescription &in (void) const;
--  UsesDescription &inout (void);
--  UsesDescription *&out (void);
--  UsesDescription *_retn (void);
--  UsesDescription *ptr (void) const;
-+  const IR_UsesDescription &in (void) const;
-+  IR_UsesDescription &inout (void);
-+  IR_UsesDescription *&out (void);
-+  IR_UsesDescription *_retn (void);
-+  IR_UsesDescription *ptr (void) const;
- 
- private:
--  UsesDescription *ptr_;
-+  IR_UsesDescription *ptr_;
- };
- 
--class TAO_IFR_Client_Export UsesDescription_out
-+class TAO_IFR_Client_Export IR_UsesDescription_out
- {
- public:
--  UsesDescription_out (UsesDescription *&);
--  UsesDescription_out (UsesDescription_var &);
--  UsesDescription_out (const UsesDescription_out &);
--  UsesDescription_out &operator= (const UsesDescription_out &);
--  UsesDescription_out &operator= (UsesDescription *);
--  operator UsesDescription *&();
--  UsesDescription *&ptr (void);
--  UsesDescription *operator-> (void);
-+  IR_UsesDescription_out (IR_UsesDescription *&);
-+  IR_UsesDescription_out (IR_UsesDescription_var &);
-+  IR_UsesDescription_out (const IR_UsesDescription_out &);
-+  IR_UsesDescription_out &operator= (const IR_UsesDescription_out &);
-+  IR_UsesDescription_out &operator= (IR_UsesDescription *);
-+  operator IR_UsesDescription *&();
-+  IR_UsesDescription *&ptr (void);
-+  IR_UsesDescription *operator-> (void);
-   
- private:
--  UsesDescription *&ptr_;
-+  IR_UsesDescription *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const UsesDescription_var &);
-+  void operator= (const IR_UsesDescription_var &);
- };
- 
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDescription;
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CH_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CH_
--
-   class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_ProvidesDescSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -24178,149 +20544,118 @@
-     _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum); 
-     _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      ProvidesDescription *data,
-+      IR_ProvidesDescription *data,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs);
-     _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &operator= (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs);
-     virtual ~_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void); // Dtor.
-     // = Accessors.
--    ProvidesDescription &operator[] (CORBA::ULong i);
--    const ProvidesDescription &operator[] (CORBA::ULong i) const;
-+    IR_ProvidesDescription &operator[] (CORBA::ULong i);
-+    const IR_ProvidesDescription &operator[] (CORBA::ULong i) const;
-     // = Static operations.
--    static ProvidesDescription *allocbuf (CORBA::ULong size);
--    static void freebuf (ProvidesDescription *buffer);
-+    static IR_ProvidesDescription *allocbuf (CORBA::ULong size);
-+    static void freebuf (IR_ProvidesDescription *buffer);
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
-     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-     
--    ProvidesDescription *get_buffer (CORBA::Boolean orphan = 0);
--    const ProvidesDescription *get_buffer (void) const;
-+    IR_ProvidesDescription *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_ProvidesDescription *get_buffer (void) const;
-     void replace (CORBA::ULong max,
-       CORBA::ULong length,
--      ProvidesDescription *data,
-+      IR_ProvidesDescription *data,
-       CORBA::Boolean release);
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_PROVIDESDESCSEQ_CH_)
--#define _IR_PROVIDESDESCSEQ_CH_
--
--class ProvidesDescSeq;
--class ProvidesDescSeq_var;
--
- // *************************************************************
--// ProvidesDescSeq
-+// IR_ProvidesDescSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export ProvidesDescSeq : public 
-+class TAO_IFR_Client_Export IR_ProvidesDescSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<ProvidesDescription>
-+  TAO_Unbounded_Sequence<IR_ProvidesDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  ProvidesDescSeq (void); // default ctor
--  ProvidesDescSeq (CORBA::ULong max); // uses max size
--  ProvidesDescSeq (
-+  IR_ProvidesDescSeq (void); // default ctor
-+  IR_ProvidesDescSeq (CORBA::ULong max); // uses max size
-+  IR_ProvidesDescSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    ProvidesDescription *buffer, 
-+    IR_ProvidesDescription *buffer,
-     CORBA::Boolean release = 0
-   );
--  ProvidesDescSeq (const ProvidesDescSeq &); // copy ctor
--  ~ProvidesDescSeq (void);
-+  IR_ProvidesDescSeq (const IR_ProvidesDescSeq &); // copy ctor
-+  ~IR_ProvidesDescSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ProvidesDescSeq_var _var_type;
-+  typedef IR_ProvidesDescSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PROVIDESDESCSEQ___VAR_CH_)
--#define _IR_PROVIDESDESCSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::ProvidesDescSeq_var
-+// class IR_ProvidesDescSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export ProvidesDescSeq_var
-+class TAO_IFR_Client_Export IR_ProvidesDescSeq_var
- {
- public:
--  ProvidesDescSeq_var (void); // default constructor
--  ProvidesDescSeq_var (ProvidesDescSeq *);
--  ProvidesDescSeq_var (const ProvidesDescSeq_var &); // copy constructor
--  ~ProvidesDescSeq_var (void); // destructor
-+  IR_ProvidesDescSeq_var (void); // default constructor
-+  IR_ProvidesDescSeq_var (IR_ProvidesDescSeq *);
-+  IR_ProvidesDescSeq_var (const IR_ProvidesDescSeq_var &); // copy constructor
-+  ~IR_ProvidesDescSeq_var (void); // destructor
-   
--  ProvidesDescSeq_var &operator= (ProvidesDescSeq *);
--  ProvidesDescSeq_var &operator= (const ProvidesDescSeq_var &);
--  ProvidesDescSeq *operator-> (void);
--  const ProvidesDescSeq *operator-> (void) const;
-+  IR_ProvidesDescSeq_var &operator= (IR_ProvidesDescSeq *);
-+  IR_ProvidesDescSeq_var &operator= (const IR_ProvidesDescSeq_var &);
-+  IR_ProvidesDescSeq *operator-> (void);
-+  const IR_ProvidesDescSeq *operator-> (void) const;
-   
--  operator const ProvidesDescSeq &() const;
--  operator ProvidesDescSeq &();
--  operator ProvidesDescSeq &() const;
--  operator ProvidesDescSeq *&(); // variable-size base types only
-+  operator const IR_ProvidesDescSeq &() const;
-+  operator IR_ProvidesDescSeq &();
-+  operator IR_ProvidesDescSeq &() const;
-+  operator IR_ProvidesDescSeq *&(); // variable-size base types only
-   
--  ProvidesDescription & operator[] (CORBA::ULong index);
--  const ProvidesDescription & operator[] (CORBA::ULong index) const;
-+  IR_ProvidesDescription & operator[] (CORBA::ULong index);
-+  const IR_ProvidesDescription & operator[] (CORBA::ULong index) const;
-   
-   // in, inout, out, _retn 
--  const ProvidesDescSeq &in (void) const;
--  ProvidesDescSeq &inout (void);
--  ProvidesDescSeq *&out (void);
--  ProvidesDescSeq *_retn (void);
--  ProvidesDescSeq *ptr (void) const;
-+  const IR_ProvidesDescSeq &in (void) const;
-+  IR_ProvidesDescSeq &inout (void);
-+  IR_ProvidesDescSeq *&out (void);
-+  IR_ProvidesDescSeq *_retn (void);
-+  IR_ProvidesDescSeq *ptr (void) const;
- 
- private:
--  ProvidesDescSeq *ptr_;
-+  IR_ProvidesDescSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PROVIDESDESCSEQ___OUT_CH_)
--#define _IR_PROVIDESDESCSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export ProvidesDescSeq_out
-+class TAO_IFR_Client_Export IR_ProvidesDescSeq_out
- {
- public:
--  ProvidesDescSeq_out (ProvidesDescSeq *&);
--  ProvidesDescSeq_out (ProvidesDescSeq_var &);
--  ProvidesDescSeq_out (const ProvidesDescSeq_out &);
--  ProvidesDescSeq_out &operator= (const ProvidesDescSeq_out &);
--  ProvidesDescSeq_out &operator= (ProvidesDescSeq *);
--  operator ProvidesDescSeq *&();
--  ProvidesDescSeq *&ptr (void);
--  ProvidesDescSeq *operator-> (void);
--  ProvidesDescription & operator[] (CORBA::ULong index);
-+  IR_ProvidesDescSeq_out (IR_ProvidesDescSeq *&);
-+  IR_ProvidesDescSeq_out (IR_ProvidesDescSeq_var &);
-+  IR_ProvidesDescSeq_out (const IR_ProvidesDescSeq_out &);
-+  IR_ProvidesDescSeq_out &operator= (const IR_ProvidesDescSeq_out &);
-+  IR_ProvidesDescSeq_out &operator= (IR_ProvidesDescSeq *);
-+  operator IR_ProvidesDescSeq *&();
-+  IR_ProvidesDescSeq *&ptr (void);
-+  IR_ProvidesDescSeq *operator-> (void);
-+  IR_ProvidesDescription & operator[] (CORBA::ULong index);
-   
- private:
--  ProvidesDescSeq *&ptr_;
-+  IR_ProvidesDescSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ProvidesDescSeq_var &);
-+  void operator= (const IR_ProvidesDescSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDescSeq;
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CH_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CH_
--
-   class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_UsesDescSeq : public TAO_Unbounded_Base_Sequence
-   {
-   public:
-@@ -24330,244 +20665,145 @@
-     _TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum); 
-     _TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum,
-       CORBA::ULong length,
--      UsesDescription *data,
-+      IR_UsesDescription *data,
-       CORBA::Boolean release = 0);
-     _TAO_Unbounded_Sequence_IR_UsesDescSeq (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs);
-     _TAO_Unbounded_Sequence_IR_UsesDescSeq &operator= (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs);
-     virtual ~_TAO_Unbounded_Sequence_IR_UsesDescSeq (void); // Dtor.
-     // = Accessors.
--    UsesDescription &operator[] (CORBA::ULong i);
--    const UsesDescription &operator[] (CORBA::ULong i) const;
-+    IR_UsesDescription &operator[] (CORBA::ULong i);
-+    const IR_UsesDescription &operator[] (CORBA::ULong i) const;
-     // = Static operations.
--    static UsesDescription *allocbuf (CORBA::ULong size);
--    static void freebuf (UsesDescription *buffer);
-+    static IR_UsesDescription *allocbuf (CORBA::ULong size);
-+    static void freebuf (IR_UsesDescription *buffer);
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
-     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-     
--    UsesDescription *get_buffer (CORBA::Boolean orphan = 0);
--    const UsesDescription *get_buffer (void) const;
-+    IR_UsesDescription *get_buffer (CORBA::Boolean orphan = 0);
-+    const IR_UsesDescription *get_buffer (void) const;
-     void replace (CORBA::ULong max,
-       CORBA::ULong length,
--      UsesDescription *data,
-+      IR_UsesDescription *data,
-       CORBA::Boolean release);
-   };
- 
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_USESDESCSEQ_CH_)
--#define _IR_USESDESCSEQ_CH_
--
--class UsesDescSeq;
--class UsesDescSeq_var;
--
- // *************************************************************
--// UsesDescSeq
-+// IR_UsesDescSeq
- // *************************************************************
- 
--class TAO_IFR_Client_Export UsesDescSeq : public 
-+class TAO_IFR_Client_Export IR_UsesDescSeq : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_IR_UsesDescSeq
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
--  TAO_Unbounded_Sequence<UsesDescription>
-+  TAO_Unbounded_Sequence<IR_UsesDescription>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- {
- public:
--  UsesDescSeq (void); // default ctor
--  UsesDescSeq (CORBA::ULong max); // uses max size
--  UsesDescSeq (
-+  IR_UsesDescSeq (void); // default ctor
-+  IR_UsesDescSeq (CORBA::ULong max); // uses max size
-+  IR_UsesDescSeq (
-     CORBA::ULong max, 
-     CORBA::ULong length, 
--    UsesDescription *buffer, 
-+    IR_UsesDescription *buffer,
-     CORBA::Boolean release = 0
-   );
--  UsesDescSeq (const UsesDescSeq &); // copy ctor
--  ~UsesDescSeq (void);
-+  IR_UsesDescSeq (const IR_UsesDescSeq &); // copy ctor
-+  ~IR_UsesDescSeq (void);
-   static void _tao_any_destructor (void*);
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef UsesDescSeq_var _var_type;
-+  typedef IR_UsesDescSeq_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- };
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_USESDESCSEQ___VAR_CH_)
--#define _IR_USESDESCSEQ___VAR_CH_
--
- // *************************************************************
--// class IR::UsesDescSeq_var
-+// class IR_UsesDescSeq_var
- // *************************************************************
- 
--class TAO_IFR_Client_Export UsesDescSeq_var
-+class TAO_IFR_Client_Export IR_UsesDescSeq_var
- {
- public:
--  UsesDescSeq_var (void); // default constructor
--  UsesDescSeq_var (UsesDescSeq *);
--  UsesDescSeq_var (const UsesDescSeq_var &); // copy constructor
--  ~UsesDescSeq_var (void); // destructor
-+  IR_UsesDescSeq_var (void); // default constructor
-+  IR_UsesDescSeq_var (IR_UsesDescSeq *);
-+  IR_UsesDescSeq_var (const IR_UsesDescSeq_var &); // copy constructor
-+  ~IR_UsesDescSeq_var (void); // destructor
-   
--  UsesDescSeq_var &operator= (UsesDescSeq *);
--  UsesDescSeq_var &operator= (const UsesDescSeq_var &);
--  UsesDescSeq *operator-> (void);
--  const UsesDescSeq *operator-> (void) const;
-+  IR_UsesDescSeq_var &operator= (IR_UsesDescSeq *);
-+  IR_UsesDescSeq_var &operator= (const IR_UsesDescSeq_var &);
-+  IR_UsesDescSeq *operator-> (void);
-+  const IR_UsesDescSeq *operator-> (void) const;
-   
--  operator const UsesDescSeq &() const;
--  operator UsesDescSeq &();
--  operator UsesDescSeq &() const;
--  operator UsesDescSeq *&(); // variable-size base types only
-+  operator const IR_UsesDescSeq &() const;
-+  operator IR_UsesDescSeq &();
-+  operator IR_UsesDescSeq &() const;
-+  operator IR_UsesDescSeq *&(); // variable-size base types only
-   
--  UsesDescription & operator[] (CORBA::ULong index);
--  const UsesDescription & operator[] (CORBA::ULong index) const;
-+  IR_UsesDescription & operator[] (CORBA::ULong index);
-+  const IR_UsesDescription & operator[] (CORBA::ULong index) const;
-   
-   // in, inout, out, _retn 
--  const UsesDescSeq &in (void) const;
--  UsesDescSeq &inout (void);
--  UsesDescSeq *&out (void);
--  UsesDescSeq *_retn (void);
--  UsesDescSeq *ptr (void) const;
-+  const IR_UsesDescSeq &in (void) const;
-+  IR_UsesDescSeq &inout (void);
-+  IR_UsesDescSeq *&out (void);
-+  IR_UsesDescSeq *_retn (void);
-+  IR_UsesDescSeq *ptr (void) const;
- 
- private:
--  UsesDescSeq *ptr_;
-+  IR_UsesDescSeq *ptr_;
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_USESDESCSEQ___OUT_CH_)
--#define _IR_USESDESCSEQ___OUT_CH_
--
--class TAO_IFR_Client_Export UsesDescSeq_out
-+class TAO_IFR_Client_Export IR_UsesDescSeq_out
- {
- public:
--  UsesDescSeq_out (UsesDescSeq *&);
--  UsesDescSeq_out (UsesDescSeq_var &);
--  UsesDescSeq_out (const UsesDescSeq_out &);
--  UsesDescSeq_out &operator= (const UsesDescSeq_out &);
--  UsesDescSeq_out &operator= (UsesDescSeq *);
--  operator UsesDescSeq *&();
--  UsesDescSeq *&ptr (void);
--  UsesDescSeq *operator-> (void);
--  UsesDescription & operator[] (CORBA::ULong index);
-+  IR_UsesDescSeq_out (IR_UsesDescSeq *&);
-+  IR_UsesDescSeq_out (IR_UsesDescSeq_var &);
-+  IR_UsesDescSeq_out (const IR_UsesDescSeq_out &);
-+  IR_UsesDescSeq_out &operator= (const IR_UsesDescSeq_out &);
-+  IR_UsesDescSeq_out &operator= (IR_UsesDescSeq *);
-+  operator IR_UsesDescSeq *&();
-+  IR_UsesDescSeq *&ptr (void);
-+  IR_UsesDescSeq *operator-> (void);
-+  IR_UsesDescription & operator[] (CORBA::ULong index);
-   
- private:
--  UsesDescSeq *&ptr_;
-+  IR_UsesDescSeq *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const UsesDescSeq_var &);
--};
--
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDescSeq;
--
--
--#if !defined (_IR_EVENTDEF___PTR_CH_)
--#define _IR_EVENTDEF___PTR_CH_
--
--class EventDef;
--typedef EventDef *EventDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EVENTDEF___VAR_CH_)
--#define _IR_EVENTDEF___VAR_CH_
--
--class TAO_IFR_Client_Export EventDef_var : public TAO_Base_var
--{
--public:
--  EventDef_var (void); // default constructor
--  EventDef_var (EventDef_ptr p) : ptr_ (p) {} 
--  EventDef_var (const EventDef_var &); // copy constructor
--  ~EventDef_var (void); // destructor
--  
--  EventDef_var &operator= (EventDef_ptr);
--  EventDef_var &operator= (const EventDef_var &);
--  EventDef_ptr operator-> (void) const;
--  
--  operator const EventDef_ptr &() const;
--  operator EventDef_ptr &();
--  // in, inout, out, _retn 
--  EventDef_ptr in (void) const;
--  EventDef_ptr &inout (void);
--  EventDef_ptr &out (void);
--  EventDef_ptr _retn (void);
--  EventDef_ptr ptr (void) const;
--
--private:
--  EventDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  EventDef_var (const TAO_Base_var &rhs);
--  EventDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EVENTDEF___OUT_CH_)
--#define _IR_EVENTDEF___OUT_CH_
--
--class TAO_IFR_Client_Export EventDef_out
--{
--public:
--  EventDef_out (EventDef_ptr &);
--  EventDef_out (EventDef_var &);
--  EventDef_out (const EventDef_out &);
--  EventDef_out &operator= (const EventDef_out &);
--  EventDef_out &operator= (const EventDef_var &);
--  EventDef_out &operator= (EventDef_ptr);
--  operator EventDef_ptr &();
--  EventDef_ptr &ptr (void);
--  EventDef_ptr operator-> (void);
--  
--private:
--  EventDef_ptr &ptr_;
-+  void operator= (const IR_UsesDescSeq_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EVENTDEF_CH_)
--#define _IR_EVENTDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_EventDef_Proxy_Impl;
- class _TAO_EventDef_Remote_Proxy_Impl;
- class _TAO_EventDef_Proxy_Broker;
- class _TAO_EventDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export EventDef: public virtual Contained
-+class TAO_IFR_Client_Export IR_EventDef: public virtual IR_Contained
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef EventDef_ptr _ptr_type;
--  typedef EventDef_var _var_type;
-+  typedef IR_EventDef_ptr _ptr_type;
-+  typedef IR_EventDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static EventDef_ptr _duplicate (EventDef_ptr obj);
--  static EventDef_ptr _narrow (
-+  static IR_EventDef_ptr _duplicate (IR_EventDef_ptr obj);
-+  static IR_EventDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static EventDef_ptr _unchecked_narrow (
-+  static IR_EventDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static EventDef_ptr _nil (void)
-+  static IR_EventDef_ptr _nil (void)
-     {
--      return (EventDef_ptr)0;
-+      return (IR_EventDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -24581,7 +20817,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueDef_ptr event (
-+  virtual IR_ValueDef_ptr event (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -24602,14 +20838,14 @@
-   _TAO_EventDef_Proxy_Broker *the_TAO_EventDef_Proxy_Broker_;
-   
- protected:
--  EventDef (int collocated = 0);
-+  IR_EventDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_EventDef_setup_collocation (int collocated);
-     
--    EventDef (
-+  IR_EventDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -24619,10 +20855,10 @@
-     friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_EventDef_Direct_Proxy_Impl;
-   
--  virtual ~EventDef (void);
-+  virtual ~IR_EventDef (void);
- private:
--  EventDef (const EventDef &);
--  void operator= (const EventDef &);  
-+  IR_EventDef (const IR_EventDef &);
-+  void operator= (const IR_EventDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -24632,7 +20868,7 @@
-   class TAO_ClientRequestInfo_IR_EventDef_is_a : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::EventDef;
-+    friend class IR_EventDef;
-     
-     friend class _TAO_EventDef_Remote_Proxy_Impl;
-     friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
-@@ -24676,7 +20912,7 @@
- class TAO_ClientRequestInfo_IR_EventDef_event_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::EventDef;
-+    friend class IR_EventDef;
-   
-   friend class _TAO_EventDef_Remote_Proxy_Impl;
-   friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
-@@ -24710,9 +20946,9 @@
- private:
-   TAO_ClientRequestInfo_IR_EventDef_event_get (const TAO_ClientRequestInfo_IR_EventDef_event_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_EventDef_event_get &);
--  void result (IR::ValueDef_ptr result);
-+    void result (IR_ValueDef_ptr result);
-   // update the result 
--  IR::ValueDef_ptr _result;
-+    IR_ValueDef_ptr _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-@@ -24730,7 +20966,7 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_EventDef_Proxy_Impl : 
--  public virtual IR::_TAO_Contained_Proxy_Impl
-+  public virtual _TAO_Contained_Proxy_Impl
- {
- public:
-   virtual ~_TAO_EventDef_Proxy_Impl (void) { }
-@@ -24744,7 +20980,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ValueDef_ptr event (
-+  virtual IR_ValueDef_ptr event (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -24756,6 +20992,7 @@
-   _TAO_EventDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -24768,7 +21005,7 @@
- class TAO_IFR_Client_Export _TAO_EventDef_Remote_Proxy_Impl : 
-   public virtual _TAO_EventDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_Contained_Remote_Proxy_Impl
-+  public virtual _TAO_Contained_Remote_Proxy_Impl
-   
- {
- public:
-@@ -24785,7 +21022,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueDef_ptr event (
-+  virtual IR_ValueDef_ptr event (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -24815,8 +21052,9 @@
- {
- public:
-   virtual ~_TAO_EventDef_Proxy_Broker (void);
-+
-   virtual _TAO_EventDef_Proxy_Impl &select_proxy (
--    EventDef *object,
-+    IR_EventDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -24825,6 +21063,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -24842,7 +21081,7 @@
-   virtual ~_TAO_EventDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_EventDef_Proxy_Impl &select_proxy (
--    EventDef *object,
-+    IR_EventDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -24856,24 +21095,15 @@
-   static _TAO_EventDef_Remote_Proxy_Broker *the_TAO_EventDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EventDef;
--
--struct EventDescription;
--class EventDescription_var;
--
--struct TAO_IFR_Client_Export EventDescription
-+struct TAO_IFR_Client_Export IR_EventDescription
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef EventDescription_var _var_type;
-+  typedef IR_EventDescription_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
-@@ -24882,159 +21112,85 @@
-   TAO_String_Manager id;
-   TAO_String_Manager defined_in;
-   TAO_String_Manager version;
--  ACE_NESTED_CLASS (IR, ValueDef_var) value;
-+  IR_ValueDef_var value;
- };
- 
--class TAO_IFR_Client_Export EventDescription_var
-+class TAO_IFR_Client_Export IR_EventDescription_var
- {
- public:
--  EventDescription_var (void); // default constructor
--  EventDescription_var (EventDescription *);
--  EventDescription_var (const EventDescription_var &); // copy constructor
--  ~EventDescription_var (void); // destructor
-+  IR_EventDescription_var (void); // default constructor
-+  IR_EventDescription_var (IR_EventDescription *);
-+  IR_EventDescription_var (const IR_EventDescription_var &); // copy constructor
-+  ~IR_EventDescription_var (void); // destructor
-   
--  EventDescription_var &operator= (EventDescription *);
--  EventDescription_var &operator= (const EventDescription_var &);
--  EventDescription *operator-> (void);
--  const EventDescription *operator-> (void) const;
-+  IR_EventDescription_var &operator= (IR_EventDescription *);
-+  IR_EventDescription_var &operator= (const IR_EventDescription_var &);
-+  IR_EventDescription *operator-> (void);
-+  const IR_EventDescription *operator-> (void) const;
-   
--  operator const EventDescription &() const;
--  operator EventDescription &();
--  operator EventDescription &() const;
--  operator EventDescription *&(); // variable-size types only
-+  operator const IR_EventDescription &() const;
-+  operator IR_EventDescription &();
-+  operator IR_EventDescription &() const;
-+  operator IR_EventDescription *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const EventDescription &in (void) const;
--  EventDescription &inout (void);
--  EventDescription *&out (void);
--  EventDescription *_retn (void);
--  EventDescription *ptr (void) const;
-+  const IR_EventDescription &in (void) const;
-+  IR_EventDescription &inout (void);
-+  IR_EventDescription *&out (void);
-+  IR_EventDescription *_retn (void);
-+  IR_EventDescription *ptr (void) const;
- 
- private:
--  EventDescription *ptr_;
-+  IR_EventDescription *ptr_;
- };
- 
--class TAO_IFR_Client_Export EventDescription_out
-+class TAO_IFR_Client_Export IR_EventDescription_out
- {
- public:
--  EventDescription_out (EventDescription *&);
--  EventDescription_out (EventDescription_var &);
--  EventDescription_out (const EventDescription_out &);
--  EventDescription_out &operator= (const EventDescription_out &);
--  EventDescription_out &operator= (EventDescription *);
--  operator EventDescription *&();
--  EventDescription *&ptr (void);
--  EventDescription *operator-> (void);
-+  IR_EventDescription_out (IR_EventDescription *&);
-+  IR_EventDescription_out (IR_EventDescription_var &);
-+  IR_EventDescription_out (const IR_EventDescription_out &);
-+  IR_EventDescription_out &operator= (const IR_EventDescription_out &);
-+  IR_EventDescription_out &operator= (IR_EventDescription *);
-+  operator IR_EventDescription *&();
-+  IR_EventDescription *&ptr (void);
-+  IR_EventDescription *operator-> (void);
-   
- private:
--  EventDescription *&ptr_;
-+  IR_EventDescription *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const EventDescription_var &);
--};
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EventDescription;
--
--
--#if !defined (_IR_EMITSDEF___PTR_CH_)
--#define _IR_EMITSDEF___PTR_CH_
--
--class EmitsDef;
--typedef EmitsDef *EmitsDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EMITSDEF___VAR_CH_)
--#define _IR_EMITSDEF___VAR_CH_
--
--class TAO_IFR_Client_Export EmitsDef_var : public TAO_Base_var
--{
--public:
--  EmitsDef_var (void); // default constructor
--  EmitsDef_var (EmitsDef_ptr p) : ptr_ (p) {} 
--  EmitsDef_var (const EmitsDef_var &); // copy constructor
--  ~EmitsDef_var (void); // destructor
--  
--  EmitsDef_var &operator= (EmitsDef_ptr);
--  EmitsDef_var &operator= (const EmitsDef_var &);
--  EmitsDef_ptr operator-> (void) const;
--  
--  operator const EmitsDef_ptr &() const;
--  operator EmitsDef_ptr &();
--  // in, inout, out, _retn 
--  EmitsDef_ptr in (void) const;
--  EmitsDef_ptr &inout (void);
--  EmitsDef_ptr &out (void);
--  EmitsDef_ptr _retn (void);
--  EmitsDef_ptr ptr (void) const;
--
--private:
--  EmitsDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  EmitsDef_var (const TAO_Base_var &rhs);
--  EmitsDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EMITSDEF___OUT_CH_)
--#define _IR_EMITSDEF___OUT_CH_
--
--class TAO_IFR_Client_Export EmitsDef_out
--{
--public:
--  EmitsDef_out (EmitsDef_ptr &);
--  EmitsDef_out (EmitsDef_var &);
--  EmitsDef_out (const EmitsDef_out &);
--  EmitsDef_out &operator= (const EmitsDef_out &);
--  EmitsDef_out &operator= (const EmitsDef_var &);
--  EmitsDef_out &operator= (EmitsDef_ptr);
--  operator EmitsDef_ptr &();
--  EmitsDef_ptr &ptr (void);
--  EmitsDef_ptr operator-> (void);
--  
--private:
--  EmitsDef_ptr &ptr_;
-+  void operator= (const IR_EventDescription_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EMITSDEF_CH_)
--#define _IR_EMITSDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_EmitsDef_Proxy_Impl;
- class _TAO_EmitsDef_Remote_Proxy_Impl;
- class _TAO_EmitsDef_Proxy_Broker;
- class _TAO_EmitsDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export EmitsDef: public virtual EventDef
-+class TAO_IFR_Client_Export IR_EmitsDef: public virtual IR_EventDef
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef EmitsDef_ptr _ptr_type;
--  typedef EmitsDef_var _var_type;
-+  typedef IR_EmitsDef_ptr _ptr_type;
-+  typedef IR_EmitsDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static EmitsDef_ptr _duplicate (EmitsDef_ptr obj);
--  static EmitsDef_ptr _narrow (
-+  static IR_EmitsDef_ptr _duplicate (IR_EmitsDef_ptr obj);
-+  static IR_EmitsDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static EmitsDef_ptr _unchecked_narrow (
-+  static IR_EmitsDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static EmitsDef_ptr _nil (void)
-+  static IR_EmitsDef_ptr _nil (void)
-     {
--      return (EmitsDef_ptr)0;
-+      return (IR_EmitsDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -25052,14 +21208,14 @@
-   _TAO_EmitsDef_Proxy_Broker *the_TAO_EmitsDef_Proxy_Broker_;
-   
- protected:
--  EmitsDef (int collocated = 0);
-+  IR_EmitsDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_EmitsDef_setup_collocation (int collocated);
-     
--    EmitsDef (
-+  IR_EmitsDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -25069,10 +21225,10 @@
-     friend class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_EmitsDef_Direct_Proxy_Impl;
-   
--  virtual ~EmitsDef (void);
-+  virtual ~IR_EmitsDef (void);
- private:
--  EmitsDef (const EmitsDef &);
--  void operator= (const EmitsDef &);  
-+  IR_EmitsDef (const IR_EmitsDef &);
-+  void operator= (const IR_EmitsDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -25093,8 +21249,8 @@
- //                    Base  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Impl : 
--  public virtual IR::_TAO_EventDef_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Impl
-+  : public virtual _TAO_EventDef_Proxy_Impl
- {
- public:
-   virtual ~_TAO_EmitsDef_Proxy_Impl (void) { }
-@@ -25103,6 +21259,7 @@
-   _TAO_EmitsDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -25115,7 +21272,7 @@
- class TAO_IFR_Client_Export _TAO_EmitsDef_Remote_Proxy_Impl : 
-   public virtual _TAO_EmitsDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_EventDef_Remote_Proxy_Impl
-+  public virtual _TAO_EventDef_Remote_Proxy_Impl
-   
- {
- public:
-@@ -25145,8 +21302,9 @@
- {
- public:
-   virtual ~_TAO_EmitsDef_Proxy_Broker (void);
-+
-   virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
--    EmitsDef *object,
-+    IR_EmitsDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -25155,6 +21313,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -25172,7 +21331,7 @@
-   virtual ~_TAO_EmitsDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
--    EmitsDef *object,
-+    IR_EmitsDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -25186,117 +21345,38 @@
-   static _TAO_EmitsDef_Remote_Proxy_Broker *the_TAO_EmitsDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EmitsDef;
--
--
--#if !defined (_IR_PUBLISHESDEF___PTR_CH_)
--#define _IR_PUBLISHESDEF___PTR_CH_
--
--class PublishesDef;
--typedef PublishesDef *PublishesDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PUBLISHESDEF___VAR_CH_)
--#define _IR_PUBLISHESDEF___VAR_CH_
--
--class TAO_IFR_Client_Export PublishesDef_var : public TAO_Base_var
--{
--public:
--  PublishesDef_var (void); // default constructor
--  PublishesDef_var (PublishesDef_ptr p) : ptr_ (p) {} 
--  PublishesDef_var (const PublishesDef_var &); // copy constructor
--  ~PublishesDef_var (void); // destructor
--  
--  PublishesDef_var &operator= (PublishesDef_ptr);
--  PublishesDef_var &operator= (const PublishesDef_var &);
--  PublishesDef_ptr operator-> (void) const;
--  
--  operator const PublishesDef_ptr &() const;
--  operator PublishesDef_ptr &();
--  // in, inout, out, _retn 
--  PublishesDef_ptr in (void) const;
--  PublishesDef_ptr &inout (void);
--  PublishesDef_ptr &out (void);
--  PublishesDef_ptr _retn (void);
--  PublishesDef_ptr ptr (void) const;
--
--private:
--  PublishesDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  PublishesDef_var (const TAO_Base_var &rhs);
--  PublishesDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PUBLISHESDEF___OUT_CH_)
--#define _IR_PUBLISHESDEF___OUT_CH_
--
--class TAO_IFR_Client_Export PublishesDef_out
--{
--public:
--  PublishesDef_out (PublishesDef_ptr &);
--  PublishesDef_out (PublishesDef_var &);
--  PublishesDef_out (const PublishesDef_out &);
--  PublishesDef_out &operator= (const PublishesDef_out &);
--  PublishesDef_out &operator= (const PublishesDef_var &);
--  PublishesDef_out &operator= (PublishesDef_ptr);
--  operator PublishesDef_ptr &();
--  PublishesDef_ptr &ptr (void);
--  PublishesDef_ptr operator-> (void);
--  
--private:
--  PublishesDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PUBLISHESDEF_CH_)
--#define _IR_PUBLISHESDEF_CH_
--
--// Forward Classes Declaration
- class _TAO_PublishesDef_Proxy_Impl;
- class _TAO_PublishesDef_Remote_Proxy_Impl;
- class _TAO_PublishesDef_Proxy_Broker;
- class _TAO_PublishesDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export PublishesDef: public virtual EventDef
-+class TAO_IFR_Client_Export IR_PublishesDef: public virtual IR_EventDef
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef PublishesDef_ptr _ptr_type;
--  typedef PublishesDef_var _var_type;
-+  typedef IR_PublishesDef_ptr _ptr_type;
-+  typedef IR_PublishesDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static PublishesDef_ptr _duplicate (PublishesDef_ptr obj);
--  static PublishesDef_ptr _narrow (
-+  static IR_PublishesDef_ptr _duplicate (IR_PublishesDef_ptr obj);
-+  static IR_PublishesDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static PublishesDef_ptr _unchecked_narrow (
-+  static IR_PublishesDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static PublishesDef_ptr _nil (void)
-+  static IR_PublishesDef_ptr _nil (void)
-     {
--      return (PublishesDef_ptr)0;
-+      return (IR_PublishesDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -25314,14 +21394,14 @@
-   _TAO_PublishesDef_Proxy_Broker *the_TAO_PublishesDef_Proxy_Broker_;
-   
- protected:
--  PublishesDef (int collocated = 0);
-+  IR_PublishesDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_PublishesDef_setup_collocation (int collocated);
-     
--    PublishesDef (
-+  IR_PublishesDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -25331,10 +21411,10 @@
-     friend class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_PublishesDef_Direct_Proxy_Impl;
-   
--  virtual ~PublishesDef (void);
-+  virtual ~IR_PublishesDef (void);
- private:
--  PublishesDef (const PublishesDef &);
--  void operator= (const PublishesDef &);  
-+  IR_PublishesDef (const IR_PublishesDef &);
-+  void operator= (const IR_PublishesDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -25355,8 +21435,8 @@
- //                    Base  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Impl : 
--  public virtual IR::_TAO_EventDef_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Impl
-+  : public virtual _TAO_EventDef_Proxy_Impl
- {
- public:
-   virtual ~_TAO_PublishesDef_Proxy_Impl (void) { }
-@@ -25365,6 +21445,7 @@
-   _TAO_PublishesDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -25377,7 +21458,7 @@
- class TAO_IFR_Client_Export _TAO_PublishesDef_Remote_Proxy_Impl : 
-   public virtual _TAO_PublishesDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_EventDef_Remote_Proxy_Impl
-+  public virtual _TAO_EventDef_Remote_Proxy_Impl
-   
- {
- public:
-@@ -25407,8 +21488,9 @@
- {
- public:
-   virtual ~_TAO_PublishesDef_Proxy_Broker (void);
-+
-   virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
--    PublishesDef *object,
-+    IR_PublishesDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -25417,6 +21499,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -25434,7 +21517,7 @@
-   virtual ~_TAO_PublishesDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
--    PublishesDef *object,
-+    IR_PublishesDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -25448,117 +21531,39 @@
-   static _TAO_PublishesDef_Remote_Proxy_Broker *the_TAO_PublishesDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PublishesDef;
--
--
--#if !defined (_IR_CONSUMESDEF___PTR_CH_)
--#define _IR_CONSUMESDEF___PTR_CH_
--
--class ConsumesDef;
--typedef ConsumesDef *ConsumesDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSUMESDEF___VAR_CH_)
--#define _IR_CONSUMESDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ConsumesDef_var : public TAO_Base_var
--{
--public:
--  ConsumesDef_var (void); // default constructor
--  ConsumesDef_var (ConsumesDef_ptr p) : ptr_ (p) {} 
--  ConsumesDef_var (const ConsumesDef_var &); // copy constructor
--  ~ConsumesDef_var (void); // destructor
--  
--  ConsumesDef_var &operator= (ConsumesDef_ptr);
--  ConsumesDef_var &operator= (const ConsumesDef_var &);
--  ConsumesDef_ptr operator-> (void) const;
--  
--  operator const ConsumesDef_ptr &() const;
--  operator ConsumesDef_ptr &();
--  // in, inout, out, _retn 
--  ConsumesDef_ptr in (void) const;
--  ConsumesDef_ptr &inout (void);
--  ConsumesDef_ptr &out (void);
--  ConsumesDef_ptr _retn (void);
--  ConsumesDef_ptr ptr (void) const;
--
--private:
--  ConsumesDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  ConsumesDef_var (const TAO_Base_var &rhs);
--  ConsumesDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSUMESDEF___OUT_CH_)
--#define _IR_CONSUMESDEF___OUT_CH_
--
--class TAO_IFR_Client_Export ConsumesDef_out
--{
--public:
--  ConsumesDef_out (ConsumesDef_ptr &);
--  ConsumesDef_out (ConsumesDef_var &);
--  ConsumesDef_out (const ConsumesDef_out &);
--  ConsumesDef_out &operator= (const ConsumesDef_out &);
--  ConsumesDef_out &operator= (const ConsumesDef_var &);
--  ConsumesDef_out &operator= (ConsumesDef_ptr);
--  operator ConsumesDef_ptr &();
--  ConsumesDef_ptr &ptr (void);
--  ConsumesDef_ptr operator-> (void);
--  
--private:
--  ConsumesDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSUMESDEF_CH_)
--#define _IR_CONSUMESDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_ConsumesDef_Proxy_Impl;
- class _TAO_ConsumesDef_Remote_Proxy_Impl;
- class _TAO_ConsumesDef_Proxy_Broker;
- class _TAO_ConsumesDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ConsumesDef: public virtual EventDef
-+class TAO_IFR_Client_Export IR_ConsumesDef: public virtual IR_EventDef
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ConsumesDef_ptr _ptr_type;
--  typedef ConsumesDef_var _var_type;
-+  typedef IR_ConsumesDef_ptr _ptr_type;
-+  typedef IR_ConsumesDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static ConsumesDef_ptr _duplicate (ConsumesDef_ptr obj);
--  static ConsumesDef_ptr _narrow (
-+  static IR_ConsumesDef_ptr _duplicate (IR_ConsumesDef_ptr obj);
-+  static IR_ConsumesDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ConsumesDef_ptr _unchecked_narrow (
-+  static IR_ConsumesDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ConsumesDef_ptr _nil (void)
-+  static IR_ConsumesDef_ptr _nil (void)
-     {
--      return (ConsumesDef_ptr)0;
-+      return (IR_ConsumesDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -25576,14 +21581,14 @@
-   _TAO_ConsumesDef_Proxy_Broker *the_TAO_ConsumesDef_Proxy_Broker_;
-   
- protected:
--  ConsumesDef (int collocated = 0);
-+  IR_ConsumesDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_ConsumesDef_setup_collocation (int collocated);
-     
--    ConsumesDef (
-+  IR_ConsumesDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -25593,10 +21598,10 @@
-     friend class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_ConsumesDef_Direct_Proxy_Impl;
-   
--  virtual ~ConsumesDef (void);
-+  virtual ~IR_ConsumesDef (void);
- private:
--  ConsumesDef (const ConsumesDef &);
--  void operator= (const ConsumesDef &);  
-+  IR_ConsumesDef (const IR_ConsumesDef &);
-+  void operator= (const IR_ConsumesDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -25617,8 +21622,8 @@
- //                    Base  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Impl : 
--  public virtual IR::_TAO_EventDef_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Impl
-+  : public virtual _TAO_EventDef_Proxy_Impl
- {
- public:
-   virtual ~_TAO_ConsumesDef_Proxy_Impl (void) { }
-@@ -25627,6 +21632,7 @@
-   _TAO_ConsumesDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -25639,7 +21645,7 @@
- class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Impl : 
-   public virtual _TAO_ConsumesDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_EventDef_Remote_Proxy_Impl
-+  public virtual _TAO_EventDef_Remote_Proxy_Impl
-   
- {
- public:
-@@ -25669,8 +21675,9 @@
- {
- public:
-   virtual ~_TAO_ConsumesDef_Proxy_Broker (void);
-+
-   virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
--    ConsumesDef *object,
-+    IR_ConsumesDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -25679,6 +21686,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -25686,111 +21694,33 @@
- 
- ///////////////////////////////////////////////////////////////////////
- //                 Remote Proxy Broker Declaration 
--//
--
--class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Broker : public virtual _TAO_ConsumesDef_Proxy_Broker
--{
--public: 
--  _TAO_ConsumesDef_Remote_Proxy_Broker (void);
--  
--  virtual ~_TAO_ConsumesDef_Remote_Proxy_Broker (void);
--  
--  virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
--    ConsumesDef *object,
--    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
--  );
--
--private:
--  _TAO_ConsumesDef_Remote_Proxy_Impl remote_proxy_impl_;
--// This member function is used to get an handle to the unique instance
--// of the Remote Proxy Broker that is available for a given
--// interface.
--
--public:
--  static _TAO_ConsumesDef_Remote_Proxy_Broker *the_TAO_ConsumesDef_Remote_Proxy_Broker (void);
--};
--
--
--//
--//              End Remote Proxy Broker Declaration 
--///////////////////////////////////////////////////////////////////////
--
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConsumesDef;
--
--
--#if !defined (_IR_COMPONENTDEF___PTR_CH_)
--#define _IR_COMPONENTDEF___PTR_CH_
--
--class ComponentDef;
--typedef ComponentDef *ComponentDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_COMPONENTDEF___VAR_CH_)
--#define _IR_COMPONENTDEF___VAR_CH_
--
--class TAO_IFR_Client_Export ComponentDef_var : public TAO_Base_var
--{
--public:
--  ComponentDef_var (void); // default constructor
--  ComponentDef_var (ComponentDef_ptr p) : ptr_ (p) {} 
--  ComponentDef_var (const ComponentDef_var &); // copy constructor
--  ~ComponentDef_var (void); // destructor
--  
--  ComponentDef_var &operator= (ComponentDef_ptr);
--  ComponentDef_var &operator= (const ComponentDef_var &);
--  ComponentDef_ptr operator-> (void) const;
--  
--  operator const ComponentDef_ptr &() const;
--  operator ComponentDef_ptr &();
--  // in, inout, out, _retn 
--  ComponentDef_ptr in (void) const;
--  ComponentDef_ptr &inout (void);
--  ComponentDef_ptr &out (void);
--  ComponentDef_ptr _retn (void);
--  ComponentDef_ptr ptr (void) const;
--
--private:
--  ComponentDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  ComponentDef_var (const TAO_Base_var &rhs);
--  ComponentDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_COMPONENTDEF___OUT_CH_)
--#define _IR_COMPONENTDEF___OUT_CH_
-+//
- 
--class TAO_IFR_Client_Export ComponentDef_out
-+class TAO_IFR_Client_Export _TAO_ConsumesDef_Remote_Proxy_Broker : public virtual _TAO_ConsumesDef_Proxy_Broker
- {
- public:
--  ComponentDef_out (ComponentDef_ptr &);
--  ComponentDef_out (ComponentDef_var &);
--  ComponentDef_out (const ComponentDef_out &);
--  ComponentDef_out &operator= (const ComponentDef_out &);
--  ComponentDef_out &operator= (const ComponentDef_var &);
--  ComponentDef_out &operator= (ComponentDef_ptr);
--  operator ComponentDef_ptr &();
--  ComponentDef_ptr &ptr (void);
--  ComponentDef_ptr operator-> (void);
-+  _TAO_ConsumesDef_Remote_Proxy_Broker (void);
-   
--private:
--  ComponentDef_ptr &ptr_;
--};
-+  virtual ~_TAO_ConsumesDef_Remote_Proxy_Broker (void);
- 
-+  virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
-+    IR_ConsumesDef *object,
-+    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-+  );
- 
--#endif /* end #if !defined */
-+private:
-+  _TAO_ConsumesDef_Remote_Proxy_Impl remote_proxy_impl_;
-+// This member function is used to get an handle to the unique instance
-+// of the Remote Proxy Broker that is available for a given
-+// interface.
- 
-+public:
-+  static _TAO_ConsumesDef_Remote_Proxy_Broker *the_TAO_ConsumesDef_Remote_Proxy_Broker (void);
-+};
- 
--#if !defined (_IR_COMPONENTDEF_CH_)
--#define _IR_COMPONENTDEF_CH_
-+//
-+//              End Remote Proxy Broker Declaration
-+///////////////////////////////////////////////////////////////////////
- 
- // Forward Classes Declaration
- class _TAO_ComponentDef_Proxy_Impl;
-@@ -25798,34 +21728,34 @@
- class _TAO_ComponentDef_Proxy_Broker;
- class _TAO_ComponentDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export ComponentDef: public virtual InterfaceDef
-+class TAO_IFR_Client_Export IR_ComponentDef: public virtual IR_InterfaceDef
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ComponentDef_ptr _ptr_type;
--  typedef ComponentDef_var _var_type;
-+  typedef IR_ComponentDef_ptr _ptr_type;
-+  typedef IR_ComponentDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static ComponentDef_ptr _duplicate (ComponentDef_ptr obj);
--  static ComponentDef_ptr _narrow (
-+  static IR_ComponentDef_ptr _duplicate (IR_ComponentDef_ptr obj);
-+  static IR_ComponentDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ComponentDef_ptr _unchecked_narrow (
-+  static IR_ComponentDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static ComponentDef_ptr _nil (void)
-+  static IR_ComponentDef_ptr _nil (void)
-     {
--      return (ComponentDef_ptr)0;
-+      return (IR_ComponentDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
- 
--  virtual IR::InterfaceDefSeq * supported_interfaces (
-+  virtual IR_InterfaceDefSeq * supported_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25834,7 +21764,7 @@
-     ));
- 
-   virtual void supported_interfaces (
--      const IR::InterfaceDefSeq & supported_interfaces,
-+      const IR_InterfaceDefSeq & supported_interfaces,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25842,7 +21772,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ComponentDef_ptr base_component (
-+  virtual IR_ComponentDef_ptr base_component (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25850,7 +21780,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ProvidesDefSeq * provides_interfaces (
-+  virtual IR_ProvidesDefSeq * provides_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25858,7 +21788,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::UsesDefSeq * uses_interfaces (
-+  virtual IR_UsesDefSeq * uses_interfaces (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25866,7 +21796,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::EmitsDefSeq * emits_events (
-+  virtual IR_EmitsDefSeq * emits_events (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25874,7 +21804,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::PublishesDefSeq * publishes_events (
-+  virtual IR_PublishesDefSeq * publishes_events (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25882,7 +21812,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ConsumesDefSeq * consumes_events (
-+  virtual IR_ConsumesDefSeq * consumes_events (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25898,11 +21828,11 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ProvidesDef_ptr create_provides (
-+  virtual IR_ProvidesDef_ptr create_provides (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::InterfaceDef_ptr interface_type,
-+      IR_InterfaceDef_ptr interface_type,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25910,11 +21840,11 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::UsesDef_ptr create_uses (
-+  virtual IR_UsesDef_ptr create_uses (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::InterfaceDef_ptr interface_type,
-+      IR_InterfaceDef_ptr interface_type,
-       CORBA::Boolean is_multiple,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-@@ -25923,11 +21853,11 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::EmitsDef_ptr create_emits (
-+  virtual IR_EmitsDef_ptr create_emits (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+      IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25935,11 +21865,11 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::PublishesDef_ptr create_publishes (
-+  virtual IR_PublishesDef_ptr create_publishes (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+      IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25947,11 +21877,11 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ConsumesDef_ptr create_consumes (
-+  virtual IR_ConsumesDef_ptr create_consumes (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+      IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -25972,14 +21902,14 @@
-   _TAO_ComponentDef_Proxy_Broker *the_TAO_ComponentDef_Proxy_Broker_;
-   
- protected:
--  ComponentDef (int collocated = 0);
-+  IR_ComponentDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_ComponentDef_setup_collocation (int collocated);
-     
--    ComponentDef (
-+  IR_ComponentDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -25989,10 +21919,10 @@
-     friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_ComponentDef_Direct_Proxy_Impl;
-   
--  virtual ~ComponentDef (void);
-+  virtual ~IR_ComponentDef (void);
- private:
--  ComponentDef (const ComponentDef &);
--  void operator= (const ComponentDef &);  
-+  IR_ComponentDef (const IR_ComponentDef &);
-+  void operator= (const IR_ComponentDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -26002,7 +21932,7 @@
-   class TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::ComponentDef;
-+    friend class IR_ComponentDef;
-     
-     friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-     friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-@@ -26036,15 +21966,15 @@
- private:
-   TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get &);
--  void result (IR::InterfaceDefSeq * result);
-+    void result (IR_InterfaceDefSeq * result);
-   // update the result 
--  IR::InterfaceDefSeq * _result;
-+    IR_InterfaceDefSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ComponentDef;
-+    friend class IR_ComponentDef;
-   
-   friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-   friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-@@ -26053,7 +21983,7 @@
- TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const IR::InterfaceDefSeq & supported_interfaces,
-+        const IR_InterfaceDefSeq & supported_interfaces,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -26079,14 +22009,14 @@
- private:
-   TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set &);
-   void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set &);
--  const IR::InterfaceDefSeq & supported_interfaces_;
-+    const IR_InterfaceDefSeq & supported_interfaces_;
-   
- };
- 
- class TAO_ClientRequestInfo_IR_ComponentDef_base_component_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ComponentDef;
-+    friend class IR_ComponentDef;
-   
-   friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-   friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-@@ -26120,15 +22050,15 @@
- private:
-   TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (const TAO_ClientRequestInfo_IR_ComponentDef_base_component_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_base_component_get &);
--  void result (IR::ComponentDef_ptr result);
-+    void result (IR_ComponentDef_ptr result);
-   // update the result 
--  IR::ComponentDef_ptr _result;
-+    IR_ComponentDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ComponentDef;
-+    friend class IR_ComponentDef;
-   
-   friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-   friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-@@ -26162,15 +22092,15 @@
- private:
-   TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (const TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get &);
--  void result (IR::ProvidesDefSeq * result);
-+    void result (IR_ProvidesDefSeq * result);
-   // update the result 
--  IR::ProvidesDefSeq * _result;
-+    IR_ProvidesDefSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ComponentDef;
-+    friend class IR_ComponentDef;
-   
-   friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-   friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-@@ -26204,15 +22134,15 @@
- private:
-   TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (const TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get &);
--  void result (IR::UsesDefSeq * result);
-+    void result (IR_UsesDefSeq * result);
-   // update the result 
--  IR::UsesDefSeq * _result;
-+    IR_UsesDefSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ComponentDef;
-+    friend class IR_ComponentDef;
-   
-   friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-   friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-@@ -26246,15 +22176,15 @@
- private:
-   TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (const TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get &);
--  void result (IR::EmitsDefSeq * result);
-+    void result (IR_EmitsDefSeq * result);
-   // update the result 
--  IR::EmitsDefSeq * _result;
-+    IR_EmitsDefSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ComponentDef;
-+    friend class IR_ComponentDef;
-   
-   friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-   friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-@@ -26288,15 +22218,15 @@
- private:
-   TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (const TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get &);
--  void result (IR::PublishesDefSeq * result);
-+    void result (IR_PublishesDefSeq * result);
-   // update the result 
--  IR::PublishesDefSeq * _result;
-+    IR_PublishesDefSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ComponentDef;
-+    friend class IR_ComponentDef;
-   
-   friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-   friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-@@ -26330,15 +22260,15 @@
- private:
-   TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (const TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get &);
--  void result (IR::ConsumesDefSeq * result);
-+    void result (IR_ConsumesDefSeq * result);
-   // update the result 
--  IR::ConsumesDefSeq * _result;
-+    IR_ConsumesDefSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ComponentDef;
-+    friend class IR_ComponentDef;
-   
-   friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-   friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-@@ -26380,7 +22310,7 @@
- class TAO_ClientRequestInfo_IR_ComponentDef_create_provides : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ComponentDef;
-+    friend class IR_ComponentDef;
-   
-   friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-   friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-@@ -26392,7 +22322,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::InterfaceDef_ptr interface_type,
-+        IR_InterfaceDef_ptr interface_type,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -26421,16 +22351,16 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::InterfaceDef_ptr interface_type_;
--  void result (IR::ProvidesDef_ptr result);
-+    IR_InterfaceDef_ptr interface_type_;
-+    void result (IR_ProvidesDef_ptr result);
-   // update the result 
--  IR::ProvidesDef_ptr _result;
-+    IR_ProvidesDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ComponentDef_create_uses : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ComponentDef;
-+    friend class IR_ComponentDef;
-   
-   friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-   friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-@@ -26442,7 +22372,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::InterfaceDef_ptr interface_type,
-+        IR_InterfaceDef_ptr interface_type,
-     const CORBA::Boolean & is_multiple,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-@@ -26472,17 +22402,17 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::InterfaceDef_ptr interface_type_;
-+    IR_InterfaceDef_ptr interface_type_;
-   const CORBA::Boolean & is_multiple_;
--  void result (IR::UsesDef_ptr result);
-+    void result (IR_UsesDef_ptr result);
-   // update the result 
--  IR::UsesDef_ptr _result;
-+    IR_UsesDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ComponentDef_create_emits : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ComponentDef;
-+    friend class IR_ComponentDef;
-   
-   friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-   friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-@@ -26494,7 +22424,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+        IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -26523,16 +22453,16 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::ValueDef_ptr value_;
--  void result (IR::EmitsDef_ptr result);
-+    IR_ValueDef_ptr value_;
-+    void result (IR_EmitsDef_ptr result);
-   // update the result 
--  IR::EmitsDef_ptr _result;
-+    IR_EmitsDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ComponentDef_create_publishes : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ComponentDef;
-+    friend class IR_ComponentDef;
-   
-   friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-   friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-@@ -26544,7 +22474,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+        IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -26573,16 +22503,16 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::ValueDef_ptr value_;
--  void result (IR::PublishesDef_ptr result);
-+    IR_ValueDef_ptr value_;
-+    void result (IR_PublishesDef_ptr result);
-   // update the result 
--  IR::PublishesDef_ptr _result;
-+    IR_PublishesDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_ComponentDef_create_consumes : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::ComponentDef;
-+    friend class IR_ComponentDef;
-   
-   friend class _TAO_ComponentDef_Remote_Proxy_Impl;
-   friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
-@@ -26594,7 +22524,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr value,
-+        IR_ValueDef_ptr value,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -26623,17 +22553,16 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::ValueDef_ptr value_;
--  void result (IR::ConsumesDef_ptr result);
-+    IR_ValueDef_ptr value_;
-+    void result (IR_ConsumesDef_ptr result);
-   // update the result 
--  IR::ConsumesDef_ptr _result;
-+    IR_ConsumesDef_ptr _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
- 
- };
- 
--
- // The Proxy Implementations are used by each interface to
- // perform a call. Each different implementation encapsulate
- // an invocation logics.
-@@ -26644,12 +22573,12 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Impl : 
--  public virtual IR::_TAO_InterfaceDef_Proxy_Impl
-+  public virtual _TAO_InterfaceDef_Proxy_Impl
- {
- public:
-   virtual ~_TAO_ComponentDef_Proxy_Impl (void) { }
-   
--    virtual IR::InterfaceDefSeq * supported_interfaces (
-+  virtual IR_InterfaceDefSeq * supported_interfaces (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26659,14 +22588,14 @@
- 
-   virtual void supported_interfaces (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::InterfaceDefSeq & supported_interfaces,
-+      const IR_InterfaceDefSeq & supported_interfaces,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ComponentDef_ptr base_component (
-+  virtual IR_ComponentDef_ptr base_component (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26674,7 +22603,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ProvidesDefSeq * provides_interfaces (
-+  virtual IR_ProvidesDefSeq * provides_interfaces (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26682,7 +22611,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::UsesDefSeq * uses_interfaces (
-+  virtual IR_UsesDefSeq * uses_interfaces (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26690,7 +22619,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::EmitsDefSeq * emits_events (
-+  virtual IR_EmitsDefSeq * emits_events (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26698,7 +22627,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::PublishesDefSeq * publishes_events (
-+  virtual IR_PublishesDefSeq * publishes_events (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26706,7 +22635,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ConsumesDefSeq * consumes_events (
-+  virtual IR_ConsumesDefSeq * consumes_events (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26722,24 +22651,24 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ProvidesDef_ptr create_provides (
-+  virtual IR_ProvidesDef_ptr create_provides (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::InterfaceDef_ptr interface_type,
-+      IR_InterfaceDef_ptr interface_type,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::UsesDef_ptr create_uses (
-+  virtual IR_UsesDef_ptr create_uses (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::InterfaceDef_ptr interface_type,
-+      IR_InterfaceDef_ptr interface_type,
-       CORBA::Boolean is_multiple,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26747,36 +22676,36 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::EmitsDef_ptr create_emits (
-+  virtual IR_EmitsDef_ptr create_emits (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+      IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::PublishesDef_ptr create_publishes (
-+  virtual IR_PublishesDef_ptr create_publishes (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+      IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ConsumesDef_ptr create_consumes (
-+  virtual IR_ConsumesDef_ptr create_consumes (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+      IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -26787,6 +22716,7 @@
-   _TAO_ComponentDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -26799,7 +22729,7 @@
- class TAO_IFR_Client_Export _TAO_ComponentDef_Remote_Proxy_Impl : 
-   public virtual _TAO_ComponentDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_InterfaceDef_Remote_Proxy_Impl
-+  public virtual _TAO_InterfaceDef_Remote_Proxy_Impl
-   
- {
- public:
-@@ -26807,7 +22737,7 @@
-   
-   virtual ~_TAO_ComponentDef_Remote_Proxy_Impl (void) { }
-   
--    virtual IR::InterfaceDefSeq * supported_interfaces (
-+  virtual IR_InterfaceDefSeq * supported_interfaces (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26817,14 +22747,14 @@
- 
-   virtual void supported_interfaces (
-       CORBA_Object *_collocated_tao_target_,
--      const IR::InterfaceDefSeq & supported_interfaces,
-+      const IR_InterfaceDefSeq & supported_interfaces,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ComponentDef_ptr base_component (
-+  virtual IR_ComponentDef_ptr base_component (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26832,7 +22762,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ProvidesDefSeq * provides_interfaces (
-+  virtual IR_ProvidesDefSeq * provides_interfaces (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26840,7 +22770,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::UsesDefSeq * uses_interfaces (
-+  virtual IR_UsesDefSeq * uses_interfaces (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26848,7 +22778,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::EmitsDefSeq * emits_events (
-+  virtual IR_EmitsDefSeq * emits_events (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26856,7 +22786,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::PublishesDefSeq * publishes_events (
-+  virtual IR_PublishesDefSeq * publishes_events (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26864,7 +22794,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ConsumesDefSeq * consumes_events (
-+  virtual IR_ConsumesDefSeq * consumes_events (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26880,24 +22810,24 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ProvidesDef_ptr create_provides (
-+  virtual IR_ProvidesDef_ptr create_provides (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::InterfaceDef_ptr interface_type,
-+      IR_InterfaceDef_ptr interface_type,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::UsesDef_ptr create_uses (
-+  virtual IR_UsesDef_ptr create_uses (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::InterfaceDef_ptr interface_type,
-+      IR_InterfaceDef_ptr interface_type,
-       CORBA::Boolean is_multiple,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -26905,36 +22835,36 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::EmitsDef_ptr create_emits (
-+  virtual IR_EmitsDef_ptr create_emits (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+      IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::PublishesDef_ptr create_publishes (
-+  virtual IR_PublishesDef_ptr create_publishes (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+      IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ConsumesDef_ptr create_consumes (
-+  virtual IR_ConsumesDef_ptr create_consumes (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr value,
-+      IR_ValueDef_ptr value,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -26963,8 +22893,9 @@
- {
- public:
-   virtual ~_TAO_ComponentDef_Proxy_Broker (void);
-+
-   virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
--    ComponentDef *object,
-+    IR_ComponentDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -26973,6 +22904,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -26990,7 +22922,7 @@
-   virtual ~_TAO_ComponentDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
--    ComponentDef *object,
-+    IR_ComponentDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -27004,24 +22936,15 @@
-   static _TAO_ComponentDef_Remote_Proxy_Broker *the_TAO_ComponentDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentDef;
--
--struct ComponentDescription;
--class ComponentDescription_var;
--
--struct TAO_IFR_Client_Export ComponentDescription
-+struct TAO_IFR_Client_Export IR_ComponentDescription
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef ComponentDescription_var _var_type;
-+  typedef IR_ComponentDescription_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
-@@ -27031,166 +22954,92 @@
-   TAO_String_Manager defined_in;
-   TAO_String_Manager version;
-   TAO_String_Manager base_component;
--  ACE_NESTED_CLASS (IR, RepositoryIdSeq) supports_interfaces;
--  ACE_NESTED_CLASS (IR, ProvidesDefSeq) provides_interfaces;
--  ACE_NESTED_CLASS (IR, UsesDefSeq) uses_interfaces;
--  ACE_NESTED_CLASS (IR, AttrDescriptionSeq) attributes;
--  ACE_NESTED_CLASS (IR, EmitsDefSeq) emits_events;
--  ACE_NESTED_CLASS (IR, PublishesDefSeq) publishes_events;
--  ACE_NESTED_CLASS (IR, ConsumesDefSeq) consumes_events;
-+  IR_RepositoryIdSeq supports_interfaces;
-+  IR_ProvidesDefSeq provides_interfaces;
-+  IR_UsesDefSeq uses_interfaces;
-+  IR_AttrDescriptionSeq attributes;
-+  IR_EmitsDefSeq emits_events;
-+  IR_PublishesDefSeq publishes_events;
-+  IR_ConsumesDefSeq consumes_events;
-   CORBA::Boolean is_basic;
- };
- 
--class TAO_IFR_Client_Export ComponentDescription_var
-+class TAO_IFR_Client_Export IR_ComponentDescription_var
- {
- public:
--  ComponentDescription_var (void); // default constructor
--  ComponentDescription_var (ComponentDescription *);
--  ComponentDescription_var (const ComponentDescription_var &); // copy constructor
--  ~ComponentDescription_var (void); // destructor
-+  IR_ComponentDescription_var (void); // default constructor
-+  IR_ComponentDescription_var (IR_ComponentDescription *);
-+  IR_ComponentDescription_var (const IR_ComponentDescription_var &); // copy constructor
-+  ~IR_ComponentDescription_var (void); // destructor
-   
--  ComponentDescription_var &operator= (ComponentDescription *);
--  ComponentDescription_var &operator= (const ComponentDescription_var &);
--  ComponentDescription *operator-> (void);
--  const ComponentDescription *operator-> (void) const;
-+  IR_ComponentDescription_var &operator= (IR_ComponentDescription *);
-+  IR_ComponentDescription_var &operator= (const IR_ComponentDescription_var &);
-+  IR_ComponentDescription *operator-> (void);
-+  const IR_ComponentDescription *operator-> (void) const;
-   
--  operator const ComponentDescription &() const;
--  operator ComponentDescription &();
--  operator ComponentDescription &() const;
--  operator ComponentDescription *&(); // variable-size types only
-+  operator const IR_ComponentDescription &() const;
-+  operator IR_ComponentDescription &();
-+  operator IR_ComponentDescription &() const;
-+  operator IR_ComponentDescription *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const ComponentDescription &in (void) const;
--  ComponentDescription &inout (void);
--  ComponentDescription *&out (void);
--  ComponentDescription *_retn (void);
--  ComponentDescription *ptr (void) const;
-+  const IR_ComponentDescription &in (void) const;
-+  IR_ComponentDescription &inout (void);
-+  IR_ComponentDescription *&out (void);
-+  IR_ComponentDescription *_retn (void);
-+  IR_ComponentDescription *ptr (void) const;
- 
- private:
--  ComponentDescription *ptr_;
-+  IR_ComponentDescription *ptr_;
- };
- 
--class TAO_IFR_Client_Export ComponentDescription_out
-+class TAO_IFR_Client_Export IR_ComponentDescription_out
- {
- public:
--  ComponentDescription_out (ComponentDescription *&);
--  ComponentDescription_out (ComponentDescription_var &);
--  ComponentDescription_out (const ComponentDescription_out &);
--  ComponentDescription_out &operator= (const ComponentDescription_out &);
--  ComponentDescription_out &operator= (ComponentDescription *);
--  operator ComponentDescription *&();
--  ComponentDescription *&ptr (void);
--  ComponentDescription *operator-> (void);
-+  IR_ComponentDescription_out (IR_ComponentDescription *&);
-+  IR_ComponentDescription_out (IR_ComponentDescription_var &);
-+  IR_ComponentDescription_out (const IR_ComponentDescription_out &);
-+  IR_ComponentDescription_out &operator= (const IR_ComponentDescription_out &);
-+  IR_ComponentDescription_out &operator= (IR_ComponentDescription *);
-+  operator IR_ComponentDescription *&();
-+  IR_ComponentDescription *&ptr (void);
-+  IR_ComponentDescription *operator-> (void);
-   
- private:
--  ComponentDescription *&ptr_;
-+  IR_ComponentDescription *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const ComponentDescription_var &);
--};
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentDescription;
--
--
--#if !defined (_IR_PRIMARYKEYDEF___PTR_CH_)
--#define _IR_PRIMARYKEYDEF___PTR_CH_
--
--class PrimaryKeyDef;
--typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PRIMARYKEYDEF___VAR_CH_)
--#define _IR_PRIMARYKEYDEF___VAR_CH_
--
--class TAO_IFR_Client_Export PrimaryKeyDef_var : public TAO_Base_var
--{
--public:
--  PrimaryKeyDef_var (void); // default constructor
--  PrimaryKeyDef_var (PrimaryKeyDef_ptr p) : ptr_ (p) {} 
--  PrimaryKeyDef_var (const PrimaryKeyDef_var &); // copy constructor
--  ~PrimaryKeyDef_var (void); // destructor
--  
--  PrimaryKeyDef_var &operator= (PrimaryKeyDef_ptr);
--  PrimaryKeyDef_var &operator= (const PrimaryKeyDef_var &);
--  PrimaryKeyDef_ptr operator-> (void) const;
--  
--  operator const PrimaryKeyDef_ptr &() const;
--  operator PrimaryKeyDef_ptr &();
--  // in, inout, out, _retn 
--  PrimaryKeyDef_ptr in (void) const;
--  PrimaryKeyDef_ptr &inout (void);
--  PrimaryKeyDef_ptr &out (void);
--  PrimaryKeyDef_ptr _retn (void);
--  PrimaryKeyDef_ptr ptr (void) const;
--
--private:
--  PrimaryKeyDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  PrimaryKeyDef_var (const TAO_Base_var &rhs);
--  PrimaryKeyDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PRIMARYKEYDEF___OUT_CH_)
--#define _IR_PRIMARYKEYDEF___OUT_CH_
--
--class TAO_IFR_Client_Export PrimaryKeyDef_out
--{
--public:
--  PrimaryKeyDef_out (PrimaryKeyDef_ptr &);
--  PrimaryKeyDef_out (PrimaryKeyDef_var &);
--  PrimaryKeyDef_out (const PrimaryKeyDef_out &);
--  PrimaryKeyDef_out &operator= (const PrimaryKeyDef_out &);
--  PrimaryKeyDef_out &operator= (const PrimaryKeyDef_var &);
--  PrimaryKeyDef_out &operator= (PrimaryKeyDef_ptr);
--  operator PrimaryKeyDef_ptr &();
--  PrimaryKeyDef_ptr &ptr (void);
--  PrimaryKeyDef_ptr operator-> (void);
--  
--private:
--  PrimaryKeyDef_ptr &ptr_;
-+  void operator= (const IR_ComponentDescription_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PRIMARYKEYDEF_CH_)
--#define _IR_PRIMARYKEYDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_PrimaryKeyDef_Proxy_Impl;
- class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
- class _TAO_PrimaryKeyDef_Proxy_Broker;
- class _TAO_PrimaryKeyDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export PrimaryKeyDef: public virtual Contained
-+class TAO_IFR_Client_Export IR_PrimaryKeyDef: public virtual IR_Contained
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef PrimaryKeyDef_ptr _ptr_type;
--  typedef PrimaryKeyDef_var _var_type;
-+  typedef IR_PrimaryKeyDef_ptr _ptr_type;
-+  typedef IR_PrimaryKeyDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static PrimaryKeyDef_ptr _duplicate (PrimaryKeyDef_ptr obj);
--  static PrimaryKeyDef_ptr _narrow (
-+  static IR_PrimaryKeyDef_ptr _duplicate (IR_PrimaryKeyDef_ptr obj);
-+  static IR_PrimaryKeyDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static PrimaryKeyDef_ptr _unchecked_narrow (
-+  static IR_PrimaryKeyDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static PrimaryKeyDef_ptr _nil (void)
-+  static IR_PrimaryKeyDef_ptr _nil (void)
-     {
--      return (PrimaryKeyDef_ptr)0;
-+      return (IR_PrimaryKeyDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -27204,7 +23053,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueDef_ptr primary_key (
-+  virtual IR_ValueDef_ptr primary_key (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -27225,14 +23074,14 @@
-   _TAO_PrimaryKeyDef_Proxy_Broker *the_TAO_PrimaryKeyDef_Proxy_Broker_;
-   
- protected:
--  PrimaryKeyDef (int collocated = 0);
-+  IR_PrimaryKeyDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_PrimaryKeyDef_setup_collocation (int collocated);
-     
--    PrimaryKeyDef (
-+  IR_PrimaryKeyDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -27242,10 +23091,10 @@
-     friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_PrimaryKeyDef_Direct_Proxy_Impl;
-   
--  virtual ~PrimaryKeyDef (void);
-+  virtual ~IR_PrimaryKeyDef (void);
- private:
--  PrimaryKeyDef (const PrimaryKeyDef &);
--  void operator= (const PrimaryKeyDef &);  
-+  IR_PrimaryKeyDef (const IR_PrimaryKeyDef &);
-+  void operator= (const IR_PrimaryKeyDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -27255,7 +23104,7 @@
-   class TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::PrimaryKeyDef;
-+    friend class IR_PrimaryKeyDef;
-     
-     friend class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
-     friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
-@@ -27299,7 +23148,7 @@
- class TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::PrimaryKeyDef;
-+    friend class IR_PrimaryKeyDef;
-   
-   friend class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
-   friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
-@@ -27333,9 +23182,9 @@
- private:
-   TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
--  void result (IR::ValueDef_ptr result);
-+    void result (IR_ValueDef_ptr result);
-   // update the result 
--  IR::ValueDef_ptr _result;
-+    IR_ValueDef_ptr _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-@@ -27353,7 +23202,7 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Impl : 
--  public virtual IR::_TAO_Contained_Proxy_Impl
-+  public virtual _TAO_Contained_Proxy_Impl
- {
- public:
-   virtual ~_TAO_PrimaryKeyDef_Proxy_Impl (void) { }
-@@ -27367,7 +23216,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ValueDef_ptr primary_key (
-+  virtual IR_ValueDef_ptr primary_key (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -27379,6 +23228,7 @@
-   _TAO_PrimaryKeyDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -27391,7 +23241,7 @@
- class TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Remote_Proxy_Impl : 
-   public virtual _TAO_PrimaryKeyDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_Contained_Remote_Proxy_Impl
-+  public virtual _TAO_Contained_Remote_Proxy_Impl
-   
- {
- public:
-@@ -27408,7 +23258,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ValueDef_ptr primary_key (
-+  virtual IR_ValueDef_ptr primary_key (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -27438,8 +23288,9 @@
- {
- public:
-   virtual ~_TAO_PrimaryKeyDef_Proxy_Broker (void);
-+
-   virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
--    PrimaryKeyDef *object,
-+    IR_PrimaryKeyDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -27448,6 +23299,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -27465,7 +23317,7 @@
-   virtual ~_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
--    PrimaryKeyDef *object,
-+    IR_PrimaryKeyDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -27479,24 +23331,15 @@
-   static _TAO_PrimaryKeyDef_Remote_Proxy_Broker *the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimaryKeyDef;
--
--struct PrimaryKeyDescription;
--class PrimaryKeyDescription_var;
--
--struct TAO_IFR_Client_Export PrimaryKeyDescription
-+struct TAO_IFR_Client_Export IR_PrimaryKeyDescription
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef PrimaryKeyDescription_var _var_type;
-+  typedef IR_PrimaryKeyDescription_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
-@@ -27505,159 +23348,85 @@
-   TAO_String_Manager id;
-   TAO_String_Manager defined_in;
-   TAO_String_Manager version;
--  ACE_NESTED_CLASS (IR, ValueDef_var) primary_key;
-+  IR_ValueDef_var primary_key;
- };
- 
--class TAO_IFR_Client_Export PrimaryKeyDescription_var
-+class TAO_IFR_Client_Export IR_PrimaryKeyDescription_var
- {
- public:
--  PrimaryKeyDescription_var (void); // default constructor
--  PrimaryKeyDescription_var (PrimaryKeyDescription *);
--  PrimaryKeyDescription_var (const PrimaryKeyDescription_var &); // copy constructor
--  ~PrimaryKeyDescription_var (void); // destructor
-+  IR_PrimaryKeyDescription_var (void); // default constructor
-+  IR_PrimaryKeyDescription_var (IR_PrimaryKeyDescription *);
-+  IR_PrimaryKeyDescription_var (const IR_PrimaryKeyDescription_var &); // copy constructor
-+  ~IR_PrimaryKeyDescription_var (void); // destructor
-   
--  PrimaryKeyDescription_var &operator= (PrimaryKeyDescription *);
--  PrimaryKeyDescription_var &operator= (const PrimaryKeyDescription_var &);
--  PrimaryKeyDescription *operator-> (void);
--  const PrimaryKeyDescription *operator-> (void) const;
-+  IR_PrimaryKeyDescription_var &operator= (IR_PrimaryKeyDescription *);
-+  IR_PrimaryKeyDescription_var &operator= (const IR_PrimaryKeyDescription_var &);
-+  IR_PrimaryKeyDescription *operator-> (void);
-+  const IR_PrimaryKeyDescription *operator-> (void) const;
-   
--  operator const PrimaryKeyDescription &() const;
--  operator PrimaryKeyDescription &();
--  operator PrimaryKeyDescription &() const;
--  operator PrimaryKeyDescription *&(); // variable-size types only
-+  operator const IR_PrimaryKeyDescription &() const;
-+  operator IR_PrimaryKeyDescription &();
-+  operator IR_PrimaryKeyDescription &() const;
-+  operator IR_PrimaryKeyDescription *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const PrimaryKeyDescription &in (void) const;
--  PrimaryKeyDescription &inout (void);
--  PrimaryKeyDescription *&out (void);
--  PrimaryKeyDescription *_retn (void);
--  PrimaryKeyDescription *ptr (void) const;
-+  const IR_PrimaryKeyDescription &in (void) const;
-+  IR_PrimaryKeyDescription &inout (void);
-+  IR_PrimaryKeyDescription *&out (void);
-+  IR_PrimaryKeyDescription *_retn (void);
-+  IR_PrimaryKeyDescription *ptr (void) const;
- 
- private:
--  PrimaryKeyDescription *ptr_;
-+  IR_PrimaryKeyDescription *ptr_;
- };
- 
--class TAO_IFR_Client_Export PrimaryKeyDescription_out
-+class TAO_IFR_Client_Export IR_PrimaryKeyDescription_out
- {
- public:
--  PrimaryKeyDescription_out (PrimaryKeyDescription *&);
--  PrimaryKeyDescription_out (PrimaryKeyDescription_var &);
--  PrimaryKeyDescription_out (const PrimaryKeyDescription_out &);
--  PrimaryKeyDescription_out &operator= (const PrimaryKeyDescription_out &);
--  PrimaryKeyDescription_out &operator= (PrimaryKeyDescription *);
--  operator PrimaryKeyDescription *&();
--  PrimaryKeyDescription *&ptr (void);
--  PrimaryKeyDescription *operator-> (void);
-+  IR_PrimaryKeyDescription_out (IR_PrimaryKeyDescription *&);
-+  IR_PrimaryKeyDescription_out (IR_PrimaryKeyDescription_var &);
-+  IR_PrimaryKeyDescription_out (const IR_PrimaryKeyDescription_out &);
-+  IR_PrimaryKeyDescription_out &operator= (const IR_PrimaryKeyDescription_out &);
-+  IR_PrimaryKeyDescription_out &operator= (IR_PrimaryKeyDescription *);
-+  operator IR_PrimaryKeyDescription *&();
-+  IR_PrimaryKeyDescription *&ptr (void);
-+  IR_PrimaryKeyDescription *operator-> (void);
-   
- private:
--  PrimaryKeyDescription *&ptr_;
-+  IR_PrimaryKeyDescription *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const PrimaryKeyDescription_var &);
--};
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimaryKeyDescription;
--
--
--#if !defined (_IR_FACTORYDEF___PTR_CH_)
--#define _IR_FACTORYDEF___PTR_CH_
--
--class FactoryDef;
--typedef FactoryDef *FactoryDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FACTORYDEF___VAR_CH_)
--#define _IR_FACTORYDEF___VAR_CH_
--
--class TAO_IFR_Client_Export FactoryDef_var : public TAO_Base_var
--{
--public:
--  FactoryDef_var (void); // default constructor
--  FactoryDef_var (FactoryDef_ptr p) : ptr_ (p) {} 
--  FactoryDef_var (const FactoryDef_var &); // copy constructor
--  ~FactoryDef_var (void); // destructor
--  
--  FactoryDef_var &operator= (FactoryDef_ptr);
--  FactoryDef_var &operator= (const FactoryDef_var &);
--  FactoryDef_ptr operator-> (void) const;
--  
--  operator const FactoryDef_ptr &() const;
--  operator FactoryDef_ptr &();
--  // in, inout, out, _retn 
--  FactoryDef_ptr in (void) const;
--  FactoryDef_ptr &inout (void);
--  FactoryDef_ptr &out (void);
--  FactoryDef_ptr _retn (void);
--  FactoryDef_ptr ptr (void) const;
--
--private:
--  FactoryDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  FactoryDef_var (const TAO_Base_var &rhs);
--  FactoryDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FACTORYDEF___OUT_CH_)
--#define _IR_FACTORYDEF___OUT_CH_
--
--class TAO_IFR_Client_Export FactoryDef_out
--{
--public:
--  FactoryDef_out (FactoryDef_ptr &);
--  FactoryDef_out (FactoryDef_var &);
--  FactoryDef_out (const FactoryDef_out &);
--  FactoryDef_out &operator= (const FactoryDef_out &);
--  FactoryDef_out &operator= (const FactoryDef_var &);
--  FactoryDef_out &operator= (FactoryDef_ptr);
--  operator FactoryDef_ptr &();
--  FactoryDef_ptr &ptr (void);
--  FactoryDef_ptr operator-> (void);
--  
--private:
--  FactoryDef_ptr &ptr_;
-+  void operator= (const IR_PrimaryKeyDescription_var &);
- };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FACTORYDEF_CH_)
--#define _IR_FACTORYDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_FactoryDef_Proxy_Impl;
- class _TAO_FactoryDef_Remote_Proxy_Impl;
- class _TAO_FactoryDef_Proxy_Broker;
- class _TAO_FactoryDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export FactoryDef: public virtual OperationDef
-+class TAO_IFR_Client_Export IR_FactoryDef: public virtual IR_OperationDef
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef FactoryDef_ptr _ptr_type;
--  typedef FactoryDef_var _var_type;
-+  typedef IR_FactoryDef_ptr _ptr_type;
-+  typedef IR_FactoryDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static FactoryDef_ptr _duplicate (FactoryDef_ptr obj);
--  static FactoryDef_ptr _narrow (
-+  static IR_FactoryDef_ptr _duplicate (IR_FactoryDef_ptr obj);
-+  static IR_FactoryDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static FactoryDef_ptr _unchecked_narrow (
-+  static IR_FactoryDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static FactoryDef_ptr _nil (void)
-+  static IR_FactoryDef_ptr _nil (void)
-     {
--      return (FactoryDef_ptr)0;
-+      return (IR_FactoryDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -27675,14 +23444,14 @@
-   _TAO_FactoryDef_Proxy_Broker *the_TAO_FactoryDef_Proxy_Broker_;
-   
- protected:
--  FactoryDef (int collocated = 0);
-+  IR_FactoryDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_FactoryDef_setup_collocation (int collocated);
-     
--    FactoryDef (
-+  IR_FactoryDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -27692,10 +23461,10 @@
-     friend class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_FactoryDef_Direct_Proxy_Impl;
-   
--  virtual ~FactoryDef (void);
-+  virtual ~IR_FactoryDef (void);
- private:
--  FactoryDef (const FactoryDef &);
--  void operator= (const FactoryDef &);  
-+  IR_FactoryDef (const IR_FactoryDef &);
-+  void operator= (const IR_FactoryDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -27716,8 +23485,8 @@
- //                    Base  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Impl : 
--  public virtual IR::_TAO_OperationDef_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Impl
-+  : public virtual _TAO_OperationDef_Proxy_Impl
- {
- public:
-   virtual ~_TAO_FactoryDef_Proxy_Impl (void) { }
-@@ -27726,6 +23495,7 @@
-   _TAO_FactoryDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -27738,7 +23508,7 @@
- class TAO_IFR_Client_Export _TAO_FactoryDef_Remote_Proxy_Impl : 
-   public virtual _TAO_FactoryDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_OperationDef_Remote_Proxy_Impl
-+  public virtual _TAO_OperationDef_Remote_Proxy_Impl
-   
- {
- public:
-@@ -27768,8 +23538,9 @@
- {
- public:
-   virtual ~_TAO_FactoryDef_Proxy_Broker (void);
-+
-   virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
--    FactoryDef *object,
-+    IR_FactoryDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -27778,6 +23549,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -27795,7 +23567,7 @@
-   virtual ~_TAO_FactoryDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
--    FactoryDef *object,
-+    IR_FactoryDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -27809,117 +23581,39 @@
-   static _TAO_FactoryDef_Remote_Proxy_Broker *the_TAO_FactoryDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FactoryDef;
--
--
--#if !defined (_IR_FINDERDEF___PTR_CH_)
--#define _IR_FINDERDEF___PTR_CH_
--
--class FinderDef;
--typedef FinderDef *FinderDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FINDERDEF___VAR_CH_)
--#define _IR_FINDERDEF___VAR_CH_
--
--class TAO_IFR_Client_Export FinderDef_var : public TAO_Base_var
--{
--public:
--  FinderDef_var (void); // default constructor
--  FinderDef_var (FinderDef_ptr p) : ptr_ (p) {} 
--  FinderDef_var (const FinderDef_var &); // copy constructor
--  ~FinderDef_var (void); // destructor
--  
--  FinderDef_var &operator= (FinderDef_ptr);
--  FinderDef_var &operator= (const FinderDef_var &);
--  FinderDef_ptr operator-> (void) const;
--  
--  operator const FinderDef_ptr &() const;
--  operator FinderDef_ptr &();
--  // in, inout, out, _retn 
--  FinderDef_ptr in (void) const;
--  FinderDef_ptr &inout (void);
--  FinderDef_ptr &out (void);
--  FinderDef_ptr _retn (void);
--  FinderDef_ptr ptr (void) const;
--
--private:
--  FinderDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  FinderDef_var (const TAO_Base_var &rhs);
--  FinderDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FINDERDEF___OUT_CH_)
--#define _IR_FINDERDEF___OUT_CH_
--
--class TAO_IFR_Client_Export FinderDef_out
--{
--public:
--  FinderDef_out (FinderDef_ptr &);
--  FinderDef_out (FinderDef_var &);
--  FinderDef_out (const FinderDef_out &);
--  FinderDef_out &operator= (const FinderDef_out &);
--  FinderDef_out &operator= (const FinderDef_var &);
--  FinderDef_out &operator= (FinderDef_ptr);
--  operator FinderDef_ptr &();
--  FinderDef_ptr &ptr (void);
--  FinderDef_ptr operator-> (void);
--  
--private:
--  FinderDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FINDERDEF_CH_)
--#define _IR_FINDERDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_FinderDef_Proxy_Impl;
- class _TAO_FinderDef_Remote_Proxy_Impl;
- class _TAO_FinderDef_Proxy_Broker;
- class _TAO_FinderDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export FinderDef: public virtual OperationDef
-+class TAO_IFR_Client_Export IR_FinderDef: public virtual IR_OperationDef
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef FinderDef_ptr _ptr_type;
--  typedef FinderDef_var _var_type;
-+  typedef IR_FinderDef_ptr _ptr_type;
-+  typedef IR_FinderDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static FinderDef_ptr _duplicate (FinderDef_ptr obj);
--  static FinderDef_ptr _narrow (
-+  static IR_FinderDef_ptr _duplicate (IR_FinderDef_ptr obj);
-+  static IR_FinderDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static FinderDef_ptr _unchecked_narrow (
-+  static IR_FinderDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static FinderDef_ptr _nil (void)
-+  static IR_FinderDef_ptr _nil (void)
-     {
--      return (FinderDef_ptr)0;
-+      return (IR_FinderDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
-@@ -27937,14 +23631,14 @@
-   _TAO_FinderDef_Proxy_Broker *the_TAO_FinderDef_Proxy_Broker_;
-   
- protected:
--  FinderDef (int collocated = 0);
-+  IR_FinderDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_FinderDef_setup_collocation (int collocated);
-     
--    FinderDef (
-+  IR_FinderDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -27954,10 +23648,10 @@
-     friend class _TAO_FinderDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_FinderDef_Direct_Proxy_Impl;
-   
--  virtual ~FinderDef (void);
-+  virtual ~IR_FinderDef (void);
- private:
--  FinderDef (const FinderDef &);
--  void operator= (const FinderDef &);  
-+  IR_FinderDef (const IR_FinderDef &);
-+  void operator= (const IR_FinderDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -27978,8 +23672,8 @@
- //                    Base  Impl. Declaration
- //
- 
--class TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Impl : 
--  public virtual IR::_TAO_OperationDef_Proxy_Impl
-+class TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Impl
-+  : public virtual _TAO_OperationDef_Proxy_Impl
- {
- public:
-   virtual ~_TAO_FinderDef_Proxy_Impl (void) { }
-@@ -27988,6 +23682,7 @@
-   _TAO_FinderDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -28000,7 +23695,7 @@
- class TAO_IFR_Client_Export _TAO_FinderDef_Remote_Proxy_Impl : 
-   public virtual _TAO_FinderDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_OperationDef_Remote_Proxy_Impl
-+  public virtual _TAO_OperationDef_Remote_Proxy_Impl
-   
- {
- public:
-@@ -28030,8 +23725,9 @@
- {
- public:
-   virtual ~_TAO_FinderDef_Proxy_Broker (void);
-+
-   virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
--    FinderDef *object,
-+    IR_FinderDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -28040,6 +23736,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -28057,7 +23754,7 @@
-   virtual ~_TAO_FinderDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
--    FinderDef *object,
-+    IR_FinderDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -28071,122 +23768,44 @@
-   static _TAO_FinderDef_Remote_Proxy_Broker *the_TAO_FinderDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FinderDef;
--
--
--#if !defined (_IR_HOMEDEF___PTR_CH_)
--#define _IR_HOMEDEF___PTR_CH_
--
--class HomeDef;
--typedef HomeDef *HomeDef_ptr;
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_HOMEDEF___VAR_CH_)
--#define _IR_HOMEDEF___VAR_CH_
--
--class TAO_IFR_Client_Export HomeDef_var : public TAO_Base_var
--{
--public:
--  HomeDef_var (void); // default constructor
--  HomeDef_var (HomeDef_ptr p) : ptr_ (p) {} 
--  HomeDef_var (const HomeDef_var &); // copy constructor
--  ~HomeDef_var (void); // destructor
--  
--  HomeDef_var &operator= (HomeDef_ptr);
--  HomeDef_var &operator= (const HomeDef_var &);
--  HomeDef_ptr operator-> (void) const;
--  
--  operator const HomeDef_ptr &() const;
--  operator HomeDef_ptr &();
--  // in, inout, out, _retn 
--  HomeDef_ptr in (void) const;
--  HomeDef_ptr &inout (void);
--  HomeDef_ptr &out (void);
--  HomeDef_ptr _retn (void);
--  HomeDef_ptr ptr (void) const;
--
--private:
--  HomeDef_ptr ptr_;
--  // Unimplemented - prevents widening assignment.
--  HomeDef_var (const TAO_Base_var &rhs);
--  HomeDef_var &operator= (const TAO_Base_var &rhs);
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_HOMEDEF___OUT_CH_)
--#define _IR_HOMEDEF___OUT_CH_
--
--class TAO_IFR_Client_Export HomeDef_out
--{
--public:
--  HomeDef_out (HomeDef_ptr &);
--  HomeDef_out (HomeDef_var &);
--  HomeDef_out (const HomeDef_out &);
--  HomeDef_out &operator= (const HomeDef_out &);
--  HomeDef_out &operator= (const HomeDef_var &);
--  HomeDef_out &operator= (HomeDef_ptr);
--  operator HomeDef_ptr &();
--  HomeDef_ptr &ptr (void);
--  HomeDef_ptr operator-> (void);
--  
--private:
--  HomeDef_ptr &ptr_;
--};
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_HOMEDEF_CH_)
--#define _IR_HOMEDEF_CH_
--
- // Forward Classes Declaration
- class _TAO_HomeDef_Proxy_Impl;
- class _TAO_HomeDef_Remote_Proxy_Impl;
- class _TAO_HomeDef_Proxy_Broker;
- class _TAO_HomeDef_Remote_Proxy_Broker;
- 
--class TAO_IFR_Client_Export HomeDef: public virtual InterfaceDef
-+class TAO_IFR_Client_Export IR_HomeDef: public virtual IR_InterfaceDef
- {
- public:
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef HomeDef_ptr _ptr_type;
--  typedef HomeDef_var _var_type;
-+  typedef IR_HomeDef_ptr _ptr_type;
-+  typedef IR_HomeDef_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   // the static operations
--  static HomeDef_ptr _duplicate (HomeDef_ptr obj);
--  static HomeDef_ptr _narrow (
-+  static IR_HomeDef_ptr _duplicate (IR_HomeDef_ptr obj);
-+  static IR_HomeDef_ptr _narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static HomeDef_ptr _unchecked_narrow (
-+  static IR_HomeDef_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     );
--  static HomeDef_ptr _nil (void)
-+  static IR_HomeDef_ptr _nil (void)
-     {
--      return (HomeDef_ptr)0;
-+      return (IR_HomeDef_ptr)0;
-     }
- 
-   static void _tao_any_destructor (void*);
- 
--  virtual IR::HomeDef_ptr base_home (
-+  virtual IR_HomeDef_ptr base_home   (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28194,7 +23813,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ComponentDef_ptr managed_component (
-+  virtual IR_ComponentDef_ptr managed_component (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28202,7 +23821,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::PrimaryKeyDef_ptr primary_key (
-+  virtual IR_PrimaryKeyDef_ptr primary_key (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28210,7 +23829,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::FactoryDefSeq * factories (
-+  virtual IR_FactoryDefSeq * factories (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28218,7 +23837,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::FinderDefSeq * finders (
-+  virtual IR_FinderDefSeq * finders (
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28234,11 +23853,11 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::PrimaryKeyDef_ptr create_primary_key (
-+  virtual IR_PrimaryKeyDef_ptr create_primary_key (
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr primary_key,
-+      IR_ValueDef_ptr primary_key,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28246,12 +23865,12 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::FactoryDef_ptr create_factory (
-+  virtual IR_FactoryDef_ptr create_factory (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
-+      const IR_ParDescriptionSeq & params,
-+      const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28259,12 +23878,12 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::FinderDef_ptr create_finder (
-+  virtual IR_FinderDef_ptr create_finder (
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
-+      const IR_ParDescriptionSeq & params,
-+      const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV = 
-         TAO_default_environment ()
-     )
-@@ -28285,14 +23904,14 @@
-   _TAO_HomeDef_Proxy_Broker *the_TAO_HomeDef_Proxy_Broker_;
-   
- protected:
--  HomeDef (int collocated = 0);
-+  IR_HomeDef (int collocated = 0);
-   
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void IR_HomeDef_setup_collocation (int collocated);
-     
--    HomeDef (
-+  IR_HomeDef (
-       TAO_Stub *objref, 
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-@@ -28302,10 +23921,10 @@
-     friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-     friend class _TAO_HomeDef_Direct_Proxy_Impl;
-   
--  virtual ~HomeDef (void);
-+  virtual ~IR_HomeDef (void);
- private:
--  HomeDef (const HomeDef &);
--  void operator= (const HomeDef &);  
-+  IR_HomeDef (const IR_HomeDef &);
-+  void operator= (const IR_HomeDef &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -28315,7 +23934,7 @@
-   class TAO_ClientRequestInfo_IR_HomeDef_base_home_get : public TAO_ClientRequestInfo
-   {
-   public:
--    friend class IR::HomeDef;
-+    friend class IR_HomeDef;
-     
-     friend class _TAO_HomeDef_Remote_Proxy_Impl;
-     friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-@@ -28349,15 +23968,15 @@
- private:
-   TAO_ClientRequestInfo_IR_HomeDef_base_home_get (const TAO_ClientRequestInfo_IR_HomeDef_base_home_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_HomeDef_base_home_get &);
--  void result (IR::HomeDef_ptr result);
-+    void result (IR_HomeDef_ptr result);
-   // update the result 
--  IR::HomeDef_ptr _result;
-+    IR_HomeDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_HomeDef_managed_component_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::HomeDef;
-+    friend class IR_HomeDef;
-   
-   friend class _TAO_HomeDef_Remote_Proxy_Impl;
-   friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-@@ -28391,15 +24010,15 @@
- private:
-   TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (const TAO_ClientRequestInfo_IR_HomeDef_managed_component_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_HomeDef_managed_component_get &);
--  void result (IR::ComponentDef_ptr result);
-+    void result (IR_ComponentDef_ptr result);
-   // update the result 
--  IR::ComponentDef_ptr _result;
-+    IR_ComponentDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_HomeDef_primary_key_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::HomeDef;
-+    friend class IR_HomeDef;
-   
-   friend class _TAO_HomeDef_Remote_Proxy_Impl;
-   friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-@@ -28433,15 +24052,15 @@
- private:
-   TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (const TAO_ClientRequestInfo_IR_HomeDef_primary_key_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_HomeDef_primary_key_get &);
--  void result (IR::PrimaryKeyDef_ptr result);
-+    void result (IR_PrimaryKeyDef_ptr result);
-   // update the result 
--  IR::PrimaryKeyDef_ptr _result;
-+    IR_PrimaryKeyDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_HomeDef_factories_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::HomeDef;
-+    friend class IR_HomeDef;
-   
-   friend class _TAO_HomeDef_Remote_Proxy_Impl;
-   friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-@@ -28475,15 +24094,15 @@
- private:
-   TAO_ClientRequestInfo_IR_HomeDef_factories_get (const TAO_ClientRequestInfo_IR_HomeDef_factories_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_HomeDef_factories_get &);
--  void result (IR::FactoryDefSeq * result);
-+    void result (IR_FactoryDefSeq * result);
-   // update the result 
--  IR::FactoryDefSeq * _result;
-+    IR_FactoryDefSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_HomeDef_finders_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::HomeDef;
-+    friend class IR_HomeDef;
-   
-   friend class _TAO_HomeDef_Remote_Proxy_Impl;
-   friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-@@ -28517,15 +24136,15 @@
- private:
-   TAO_ClientRequestInfo_IR_HomeDef_finders_get (const TAO_ClientRequestInfo_IR_HomeDef_finders_get &);
-   void operator= (const TAO_ClientRequestInfo_IR_HomeDef_finders_get &);
--  void result (IR::FinderDefSeq * result);
-+    void result (IR_FinderDefSeq * result);
-   // update the result 
--  IR::FinderDefSeq * _result;
-+    IR_FinderDefSeq * _result;
- };
- 
- class TAO_ClientRequestInfo_IR_HomeDef_is_basic_get : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::HomeDef;
-+    friend class IR_HomeDef;
-   
-   friend class _TAO_HomeDef_Remote_Proxy_Impl;
-   friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-@@ -28567,7 +24186,7 @@
- class TAO_ClientRequestInfo_IR_HomeDef_create_primary_key : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::HomeDef;
-+    friend class IR_HomeDef;
-   
-   friend class _TAO_HomeDef_Remote_Proxy_Impl;
-   friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-@@ -28579,7 +24198,7 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    IR::ValueDef_ptr primary_key,
-+        IR_ValueDef_ptr primary_key,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -28608,16 +24227,16 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  IR::ValueDef_ptr primary_key_;
--  void result (IR::PrimaryKeyDef_ptr result);
-+    IR_ValueDef_ptr primary_key_;
-+    void result (IR_PrimaryKeyDef_ptr result);
-   // update the result 
--  IR::PrimaryKeyDef_ptr _result;
-+    IR_PrimaryKeyDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_HomeDef_create_factory : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::HomeDef;
-+    friend class IR_HomeDef;
-   
-   friend class _TAO_HomeDef_Remote_Proxy_Impl;
-   friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-@@ -28629,8 +24248,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -28659,17 +24278,17 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  const IR::ParDescriptionSeq & params_;
--  const IR::ExceptionDefSeq & exceptions_;
--  void result (IR::FactoryDef_ptr result);
-+    const IR_ParDescriptionSeq & params_;
-+    const IR_ExceptionDefSeq & exceptions_;
-+    void result (IR_FactoryDef_ptr result);
-   // update the result 
--  IR::FactoryDef_ptr _result;
-+    IR_FactoryDef_ptr _result;
- };
- 
- class TAO_ClientRequestInfo_IR_HomeDef_create_finder : public TAO_ClientRequestInfo
- {
- public:
--  friend class IR::HomeDef;
-+    friend class IR_HomeDef;
-   
-   friend class _TAO_HomeDef_Remote_Proxy_Impl;
-   friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
-@@ -28681,8 +24300,8 @@
-     const char * id,
-     const char * name,
-     const char * version,
--    const IR::ParDescriptionSeq & params,
--    const IR::ExceptionDefSeq & exceptions,
-+        const IR_ParDescriptionSeq & params,
-+        const IR_ExceptionDefSeq & exceptions,
-     CORBA::Environment &ACE_TRY_ENV = 
-       TAO_default_environment ()
-   );
-@@ -28711,11 +24330,11 @@
-   const char * id_;
-   const char * name_;
-   const char * version_;
--  const IR::ParDescriptionSeq & params_;
--  const IR::ExceptionDefSeq & exceptions_;
--  void result (IR::FinderDef_ptr result);
-+    const IR_ParDescriptionSeq & params_;
-+    const IR_ExceptionDefSeq & exceptions_;
-+    void result (IR_FinderDef_ptr result);
-   // update the result 
--  IR::FinderDef_ptr _result;
-+    IR_FinderDef_ptr _result;
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-@@ -28733,12 +24352,12 @@
- //
- 
- class TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Impl : 
--  public virtual IR::_TAO_InterfaceDef_Proxy_Impl
-+  public virtual _TAO_InterfaceDef_Proxy_Impl
- {
- public:
-   virtual ~_TAO_HomeDef_Proxy_Impl (void) { }
-   
--    virtual IR::HomeDef_ptr base_home (
-+  virtual IR_HomeDef_ptr base_home (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -28746,7 +24365,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::ComponentDef_ptr managed_component (
-+  virtual IR_ComponentDef_ptr managed_component (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -28754,7 +24373,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::PrimaryKeyDef_ptr primary_key (
-+  virtual IR_PrimaryKeyDef_ptr primary_key (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -28762,7 +24381,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::FactoryDefSeq * factories (
-+  virtual IR_FactoryDefSeq * factories (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -28770,7 +24389,7 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::FinderDefSeq * finders (
-+  virtual IR_FinderDefSeq * finders   (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -28786,38 +24405,38 @@
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::PrimaryKeyDef_ptr create_primary_key (
-+  virtual IR_PrimaryKeyDef_ptr create_primary_key   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr primary_key,
-+      IR_ValueDef_ptr primary_key,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::FactoryDef_ptr create_factory (
-+  virtual IR_FactoryDef_ptr create_factory   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
-+      const IR_ParDescriptionSeq & params,
-+      const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     )) = 0;
- 
--  virtual IR::FinderDef_ptr create_finder (
-+  virtual IR_FinderDef_ptr create_finder   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
-+      const IR_ParDescriptionSeq & params,
-+      const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -28828,6 +24447,7 @@
-   _TAO_HomeDef_Proxy_Impl (void);
- 
- };
-+
- //
- //                Base  Proxy Impl. Declaration
- ///////////////////////////////////////////////////////////////////////
-@@ -28840,7 +24460,7 @@
- class TAO_IFR_Client_Export _TAO_HomeDef_Remote_Proxy_Impl : 
-   public virtual _TAO_HomeDef_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual IR::_TAO_InterfaceDef_Remote_Proxy_Impl
-+  public virtual _TAO_InterfaceDef_Remote_Proxy_Impl
-   
- {
- public:
-@@ -28848,7 +24468,7 @@
-   
-   virtual ~_TAO_HomeDef_Remote_Proxy_Impl (void) { }
-   
--    virtual IR::HomeDef_ptr base_home (
-+  virtual IR_HomeDef_ptr base_home (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -28856,7 +24476,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::ComponentDef_ptr managed_component (
-+  virtual IR_ComponentDef_ptr managed_component (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -28864,7 +24484,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::PrimaryKeyDef_ptr primary_key (
-+  virtual IR_PrimaryKeyDef_ptr primary_key (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -28872,7 +24492,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::FactoryDefSeq * factories (
-+  virtual IR_FactoryDefSeq * factories (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -28880,7 +24500,7 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::FinderDefSeq * finders (
-+  virtual IR_FinderDefSeq * finders (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-@@ -28896,38 +24516,38 @@
-       CORBA::SystemException
-     ));
- 
--  virtual IR::PrimaryKeyDef_ptr create_primary_key (
-+  virtual IR_PrimaryKeyDef_ptr create_primary_key (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      IR::ValueDef_ptr primary_key,
-+      IR_ValueDef_ptr primary_key,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::FactoryDef_ptr create_factory (
-+  virtual IR_FactoryDef_ptr create_factory (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
-+      const IR_ParDescriptionSeq & params,
-+      const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-       CORBA::SystemException
-     ));
- 
--  virtual IR::FinderDef_ptr create_finder (
-+  virtual IR_FinderDef_ptr create_finder   (
-       CORBA_Object *_collocated_tao_target_,
-       const char * id,
-       const char * name,
-       const char * version,
--      const IR::ParDescriptionSeq & params,
--      const IR::ExceptionDefSeq & exceptions,
-+      const IR_ParDescriptionSeq & params,
-+      const IR_ExceptionDefSeq & exceptions,
-       CORBA::Environment &ACE_TRY_ENV
-     )
-     ACE_THROW_SPEC ((
-@@ -28956,8 +24576,9 @@
- {
- public:
-   virtual ~_TAO_HomeDef_Proxy_Broker (void);
-+
-   virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
--    HomeDef *object,
-+    IR_HomeDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   ) = 0;
- 
-@@ -28966,6 +24587,7 @@
-   
- };
- 
-+
- //
- //              End Base Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
-@@ -28983,7 +24605,7 @@
-   virtual ~_TAO_HomeDef_Remote_Proxy_Broker (void);
-   
-   virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
--    HomeDef *object,
-+    IR_HomeDef *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-   );
- 
-@@ -28997,24 +24619,15 @@
-   static _TAO_HomeDef_Remote_Proxy_Broker *the_TAO_HomeDef_Remote_Proxy_Broker (void);
- };
- 
--
- //
- //              End Remote Proxy Broker Declaration 
- ///////////////////////////////////////////////////////////////////////
- 
--
--#endif /* end #if !defined */
--
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_HomeDef;
--
--struct HomeDescription;
--class HomeDescription_var;
--
--struct TAO_IFR_Client_Export HomeDescription
-+struct TAO_IFR_Client_Export IR_HomeDescription
- {
- 
- #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--  typedef HomeDescription_var _var_type;
-+  typedef IR_HomeDescription_var _var_type;
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-   static void _tao_any_destructor (void*);
-@@ -29025,1073 +24638,914 @@
-   TAO_String_Manager version;
-   TAO_String_Manager base_home;
-   TAO_String_Manager managed_component;
--  ACE_NESTED_CLASS (IR, PrimaryKeyDef_var) primary_key_def;
--  ACE_NESTED_CLASS (IR, FactoryDefSeq) factories;
--  ACE_NESTED_CLASS (IR, FinderDefSeq) finders;
--  ACE_NESTED_CLASS (IR, OpDescriptionSeq) operations;
--  ACE_NESTED_CLASS (IR, AttrDescriptionSeq) attributes;
-+  IR_PrimaryKeyDef_var primary_key_def;
-+  IR_FactoryDefSeq factories;
-+  IR_FinderDefSeq finders;
-+  IR_OpDescriptionSeq operations;
-+  IR_AttrDescriptionSeq attributes;
-   CORBA::Boolean is_basic;
- };
- 
--class TAO_IFR_Client_Export HomeDescription_var
-+class TAO_IFR_Client_Export IR_HomeDescription_var
- {
- public:
--  HomeDescription_var (void); // default constructor
--  HomeDescription_var (HomeDescription *);
--  HomeDescription_var (const HomeDescription_var &); // copy constructor
--  ~HomeDescription_var (void); // destructor
-+  IR_HomeDescription_var (void); // default constructor
-+  IR_HomeDescription_var (IR_HomeDescription *);
-+  IR_HomeDescription_var (const IR_HomeDescription_var &); // copy constructor
-+  ~IR_HomeDescription_var (void); // destructor
-   
--  HomeDescription_var &operator= (HomeDescription *);
--  HomeDescription_var &operator= (const HomeDescription_var &);
--  HomeDescription *operator-> (void);
--  const HomeDescription *operator-> (void) const;
-+  IR_HomeDescription_var &operator= (IR_HomeDescription *);
-+  IR_HomeDescription_var &operator= (const IR_HomeDescription_var &);
-+  IR_HomeDescription *operator-> (void);
-+  const IR_HomeDescription *operator-> (void) const;
-   
--  operator const HomeDescription &() const;
--  operator HomeDescription &();
--  operator HomeDescription &() const;
--  operator HomeDescription *&(); // variable-size types only
-+  operator const IR_HomeDescription &() const;
-+  operator IR_HomeDescription &();
-+  operator IR_HomeDescription &() const;
-+  operator IR_HomeDescription *&(); // variable-size types only
-   
-   // in, inout, out, _retn 
--  const HomeDescription &in (void) const;
--  HomeDescription &inout (void);
--  HomeDescription *&out (void);
--  HomeDescription *_retn (void);
--  HomeDescription *ptr (void) const;
-+  const IR_HomeDescription &in (void) const;
-+  IR_HomeDescription &inout (void);
-+  IR_HomeDescription *&out (void);
-+  IR_HomeDescription *_retn (void);
-+  IR_HomeDescription *ptr (void) const;
- 
- private:
--  HomeDescription *ptr_;
-+  IR_HomeDescription *ptr_;
- };
- 
--class TAO_IFR_Client_Export HomeDescription_out
-+class TAO_IFR_Client_Export IR_HomeDescription_out
- {
- public:
--  HomeDescription_out (HomeDescription *&);
--  HomeDescription_out (HomeDescription_var &);
--  HomeDescription_out (const HomeDescription_out &);
--  HomeDescription_out &operator= (const HomeDescription_out &);
--  HomeDescription_out &operator= (HomeDescription *);
--  operator HomeDescription *&();
--  HomeDescription *&ptr (void);
--  HomeDescription *operator-> (void);
-+  IR_HomeDescription_out (IR_HomeDescription *&);
-+  IR_HomeDescription_out (IR_HomeDescription_var &);
-+  IR_HomeDescription_out (const IR_HomeDescription_out &);
-+  IR_HomeDescription_out &operator= (const IR_HomeDescription_out &);
-+  IR_HomeDescription_out &operator= (IR_HomeDescription *);
-+  operator IR_HomeDescription *&();
-+  IR_HomeDescription *&ptr (void);
-+  IR_HomeDescription *operator-> (void);
-   
- private:
--  HomeDescription *&ptr_;
-+  IR_HomeDescription *&ptr_;
-   // assignment from T_var not allowed
--  void operator= (const HomeDescription_var &);
-+  void operator= (const IR_HomeDescription_var &);
- };
- 
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_HomeDescription;
--
--
--}
--TAO_NAMESPACE_CLOSE // module IR
--
- // Proxy Broker Factory function pointer declarations.
- 
--extern TAO_IFR_Client_Export CORBA::_TAO_IRObject_Proxy_Broker * (*CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_IRObject_Proxy_Broker * (*_TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_Contained_Proxy_Broker * (*IR__TAO_Contained_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_Contained_Proxy_Broker * (*_TAO_Contained_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_Container_Proxy_Broker * (*IR__TAO_Container_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_Container_Proxy_Broker * (*_TAO_Container_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_IDLType_Proxy_Broker * (*IR__TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_IDLType_Proxy_Broker * (*_TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_Repository_Proxy_Broker * (*IR__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_Repository_Proxy_Broker * (*_TAO_Repository_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_ComponentRepository_Proxy_Broker * (*IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_ComponentRepository_Proxy_Broker * (*_TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_ModuleDef_Proxy_Broker * (*IR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_ModuleDef_Proxy_Broker * (*_TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_ConstantDef_Proxy_Broker * (*IR__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_ConstantDef_Proxy_Broker * (*_TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_TypedefDef_Proxy_Broker * (*IR__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_TypedefDef_Proxy_Broker * (*_TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_StructDef_Proxy_Broker * (*IR__TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_StructDef_Proxy_Broker * (*_TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_UnionDef_Proxy_Broker * (*IR__TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_UnionDef_Proxy_Broker * (*_TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_EnumDef_Proxy_Broker * (*IR__TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_EnumDef_Proxy_Broker * (*_TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_AliasDef_Proxy_Broker * (*IR__TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_AliasDef_Proxy_Broker * (*_TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_NativeDef_Proxy_Broker * (*IR__TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_NativeDef_Proxy_Broker * (*_TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_PrimitiveDef_Proxy_Broker * (*IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_PrimitiveDef_Proxy_Broker * (*_TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_StringDef_Proxy_Broker * (*IR__TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_StringDef_Proxy_Broker * (*_TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_WstringDef_Proxy_Broker * (*IR__TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_WstringDef_Proxy_Broker * (*_TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_FixedDef_Proxy_Broker * (*IR__TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_FixedDef_Proxy_Broker * (*_TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_SequenceDef_Proxy_Broker * (*IR__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_SequenceDef_Proxy_Broker * (*_TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_ArrayDef_Proxy_Broker * (*IR__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_ArrayDef_Proxy_Broker * (*_TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_ExceptionDef_Proxy_Broker * (*IR__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_ExceptionDef_Proxy_Broker * (*_TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_AttributeDef_Proxy_Broker * (*IR__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_AttributeDef_Proxy_Broker * (*_TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_OperationDef_Proxy_Broker * (*IR__TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_OperationDef_Proxy_Broker * (*_TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_InterfaceDef_Proxy_Broker * (*IR__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_InterfaceDef_Proxy_Broker * (*_TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_ValueMemberDef_Proxy_Broker * (*IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_ValueMemberDef_Proxy_Broker * (*_TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_ValueDef_Proxy_Broker * (*IR__TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_ValueDef_Proxy_Broker * (*_TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_ValueBoxDef_Proxy_Broker * (*IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_ValueBoxDef_Proxy_Broker * (*_TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_ProvidesDef_Proxy_Broker * (*IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_ProvidesDef_Proxy_Broker * (*_TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_UsesDef_Proxy_Broker * (*IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_UsesDef_Proxy_Broker * (*_TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_EventDef_Proxy_Broker * (*IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_EventDef_Proxy_Broker * (*_TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_EmitsDef_Proxy_Broker * (*IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_EmitsDef_Proxy_Broker * (*_TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_PublishesDef_Proxy_Broker * (*IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_PublishesDef_Proxy_Broker * (*_TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_ConsumesDef_Proxy_Broker * (*IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_ConsumesDef_Proxy_Broker * (*_TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_ComponentDef_Proxy_Broker * (*IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_ComponentDef_Proxy_Broker * (*_TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_PrimaryKeyDef_Proxy_Broker * (*IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_PrimaryKeyDef_Proxy_Broker * (*_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_FactoryDef_Proxy_Broker * (*IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_FactoryDef_Proxy_Broker * (*_TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_FinderDef_Proxy_Broker * (*IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_FinderDef_Proxy_Broker * (*_TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--extern TAO_IFR_Client_Export IR::_TAO_HomeDef_Proxy_Broker * (*IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
-+extern TAO_IFR_Client_Export _TAO_HomeDef_Proxy_Broker * (*_TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
- 
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::DefinitionKind);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::DefinitionKind &);
--// Any operators for interface CORBA::IRObject
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IRObject_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::IRObject *&);
--// Any operators for interface IR::Contained
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::Contained_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Contained *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::Contained::Description &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::Contained::Description*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Contained::Description *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::Contained::Description *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::InterfaceDefSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::InterfaceDefSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::InterfaceDefSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::InterfaceDefSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ValueDefSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueDefSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueDefSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ValueDefSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ComponentDefSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDefSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDefSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ComponentDefSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ProvidesDefSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDefSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDefSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ProvidesDefSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UsesDefSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDefSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDefSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UsesDefSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::HomeDefSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDefSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDefSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::HomeDefSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::EmitsDefSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EmitsDefSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EmitsDefSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::EmitsDefSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::PublishesDefSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PublishesDefSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PublishesDefSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::PublishesDefSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ConsumesDefSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConsumesDefSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConsumesDefSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ConsumesDefSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::FactoryDefSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FactoryDefSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FactoryDefSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::FactoryDefSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::FinderDefSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FinderDefSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FinderDefSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::FinderDefSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ContainedSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ContainedSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ContainedSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ContainedSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::StructMember &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::StructMember*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::StructMember *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::StructMember *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::StructMemberSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::StructMemberSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::StructMemberSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::StructMemberSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::Initializer &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::Initializer*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Initializer *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::Initializer *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::InitializerSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::InitializerSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::InitializerSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::InitializerSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UnionMember &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UnionMember*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UnionMember *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UnionMember *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UnionMemberSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UnionMemberSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UnionMemberSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UnionMemberSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::EnumMemberSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EnumMemberSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EnumMemberSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::EnumMemberSeq *&);
--// Any operators for interface IR::Container
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::Container_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Container *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::Container::Description &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::Container::Description*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Container::Description *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::Container::Description *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::Container::DescriptionSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::Container::DescriptionSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Container::DescriptionSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::Container::DescriptionSeq *&);
--// Any operators for interface IR::IDLType
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::IDLType_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::IDLType *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimitiveKind);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimitiveKind &);
--// Any operators for interface IR::Repository
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::Repository_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Repository *&);
--// Any operators for interface IR::ComponentRepository
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentRepository_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentRepository *&);
--// Any operators for interface IR::ModuleDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ModuleDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ModuleDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ModuleDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ModuleDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ModuleDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ModuleDescription *&);
--// Any operators for interface IR::ConstantDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConstantDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConstantDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ConstantDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConstantDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConstantDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ConstantDescription *&);
--// Any operators for interface IR::TypedefDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::TypedefDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::TypedefDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::TypeDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::TypeDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::TypeDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::TypeDescription *&);
--// Any operators for interface IR::StructDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::StructDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::StructDef *&);
--// Any operators for interface IR::UnionDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UnionDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UnionDef *&);
--// Any operators for interface IR::EnumDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EnumDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EnumDef *&);
--// Any operators for interface IR::AliasDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::AliasDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AliasDef *&);
--// Any operators for interface IR::NativeDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::NativeDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::NativeDef *&);
--// Any operators for interface IR::PrimitiveDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimitiveDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimitiveDef *&);
--// Any operators for interface IR::StringDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::StringDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::StringDef *&);
--// Any operators for interface IR::WstringDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::WstringDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::WstringDef *&);
--// Any operators for interface IR::FixedDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FixedDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FixedDef *&);
--// Any operators for interface IR::SequenceDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::SequenceDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::SequenceDef *&);
--// Any operators for interface IR::ArrayDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ArrayDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ArrayDef *&);
--// Any operators for interface IR::ExceptionDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ExceptionDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ExceptionDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ExceptionDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ExceptionDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ExceptionDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ExceptionDescription *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ExceptionDefSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ExceptionDefSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ExceptionDefSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ExceptionDefSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ExcDescriptionSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ExcDescriptionSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ExcDescriptionSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ExcDescriptionSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::AttributeMode);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttributeMode &);
--// Any operators for interface IR::AttributeDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::AttributeDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttributeDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::AttributeDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::AttributeDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttributeDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::AttributeDescription *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::OperationMode);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OperationMode &);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ParameterMode);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ParameterMode &);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ParameterDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ParameterDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ParameterDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ParameterDescription *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ParDescriptionSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ParDescriptionSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ParDescriptionSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ParDescriptionSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ContextIdSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ContextIdSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ContextIdSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ContextIdSeq *&);
--// Any operators for interface IR::OperationDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::OperationDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OperationDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::OperationDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::OperationDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OperationDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::OperationDescription *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::RepositoryIdSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::RepositoryIdSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::RepositoryIdSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::RepositoryIdSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::OpDescriptionSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::OpDescriptionSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OpDescriptionSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::OpDescriptionSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::AttrDescriptionSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::AttrDescriptionSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttrDescriptionSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::AttrDescriptionSeq *&);
--// Any operators for interface IR::InterfaceDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::InterfaceDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::InterfaceDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::InterfaceDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::InterfaceDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::InterfaceDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::InterfaceDescription *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ValueMember &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueMember*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueMember *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ValueMember *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ValueMemberSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueMemberSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueMemberSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ValueMemberSeq *&);
--// Any operators for interface IR::ValueMemberDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueMemberDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueMemberDef *&);
--// Any operators for interface IR::ValueDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ValueDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ValueDescription *&);
--// Any operators for interface IR::ValueBoxDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ValueBoxDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueBoxDef *&);
--// Any operators for interface IR::ProvidesDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ProvidesDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ProvidesDescription *&);
--// Any operators for interface IR::UsesDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UsesDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UsesDescription *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ProvidesDescSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ProvidesDescSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDescSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ProvidesDescSeq *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::UsesDescSeq &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::UsesDescSeq*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDescSeq *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UsesDescSeq *&);
--// Any operators for interface IR::EventDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EventDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EventDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::EventDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EventDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EventDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::EventDescription *&);
--// Any operators for interface IR::EmitsDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::EmitsDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EmitsDef *&);
--// Any operators for interface IR::PublishesDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PublishesDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PublishesDef *&);
--// Any operators for interface IR::ConsumesDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ConsumesDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConsumesDef *&);
--// Any operators for interface IR::ComponentDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::ComponentDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::ComponentDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ComponentDescription *&);
--// Any operators for interface IR::PrimaryKeyDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimaryKeyDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimaryKeyDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::PrimaryKeyDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::PrimaryKeyDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimaryKeyDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::PrimaryKeyDescription *&);
--// Any operators for interface IR::FactoryDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FactoryDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FactoryDef *&);
--// Any operators for interface IR::FinderDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::FinderDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FinderDef *&);
--// Any operators for interface IR::HomeDef
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDef_ptr);
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDef *&);
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR::HomeDescription &); // copying version
--TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR::HomeDescription*); // noncopying version
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDescription *&); // deprecated
--TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::HomeDescription *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_DefinitionKind);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_DefinitionKind &);
-+// Any operators for interface CORBA_IRObject
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA_IRObject_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_IRObject *&);
-+// Any operators for interface IR_Contained
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_Contained_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Contained *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_Contained::Description &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_Contained::Description*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Contained::Description *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_Contained::Description *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_InterfaceDefSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_InterfaceDefSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_InterfaceDefSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_InterfaceDefSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ValueDefSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueDefSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueDefSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ValueDefSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ComponentDefSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ComponentDefSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ComponentDefSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ComponentDefSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ProvidesDefSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ProvidesDefSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ProvidesDefSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ProvidesDefSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_UsesDefSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_UsesDefSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UsesDefSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_UsesDefSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_HomeDefSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_HomeDefSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_HomeDefSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_HomeDefSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_EmitsDefSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_EmitsDefSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EmitsDefSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_EmitsDefSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_PublishesDefSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_PublishesDefSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PublishesDefSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_PublishesDefSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ConsumesDefSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ConsumesDefSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ConsumesDefSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ConsumesDefSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_FactoryDefSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_FactoryDefSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FactoryDefSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_FactoryDefSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_FinderDefSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_FinderDefSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FinderDefSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_FinderDefSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ContainedSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ContainedSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ContainedSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ContainedSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_StructMember &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_StructMember*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_StructMember *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_StructMember *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_StructMemberSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_StructMemberSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_StructMemberSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_StructMemberSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_Initializer &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_Initializer*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Initializer *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_Initializer *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_InitializerSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_InitializerSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_InitializerSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_InitializerSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_UnionMember &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_UnionMember*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UnionMember *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_UnionMember *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_UnionMemberSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_UnionMemberSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UnionMemberSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_UnionMemberSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_EnumMemberSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_EnumMemberSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EnumMemberSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_EnumMemberSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_Container_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Container *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_Container::Description &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_Container::Description*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Container::Description *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_Container::Description *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_Container::DescriptionSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_Container::DescriptionSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Container::DescriptionSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_Container::DescriptionSeq *&);
-+// Any operators for interface IR_IDLType
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_IDLType_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_IDLType *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_PrimitiveKind);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimitiveKind &);
-+// Any operators for interface IR_Repository
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_Repository_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Repository *&);
-+// Any operators for interface IR_ComponentRepository
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ComponentRepository_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ComponentRepository *&);
-+// Any operators for interface IR_ModuleDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ModuleDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ModuleDef *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ModuleDescription &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ModuleDescription*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ModuleDescription *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ModuleDescription *&);
-+// Any operators for interface IR_ConstantDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ConstantDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ConstantDef *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ConstantDescription &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ConstantDescription*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ConstantDescription *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ConstantDescription *&);
-+// Any operators for interface IR_TypedefDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_TypedefDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_TypedefDef *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_TypeDescription &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_TypeDescription*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_TypeDescription *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_TypeDescription *&);
-+// Any operators for interface IR_StructDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_StructDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_StructDef *&);
-+// Any operators for interface IR_UnionDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_UnionDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UnionDef *&);
-+// Any operators for interface IR_EnumDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_EnumDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EnumDef *&);
-+// Any operators for interface IR_AliasDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_AliasDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AliasDef *&);
-+// Any operators for interface IR_NativeDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_NativeDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_NativeDef *&);
-+// Any operators for interface IR_PrimitiveDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_PrimitiveDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimitiveDef *&);
-+// Any operators for interface IR_StringDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_StringDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_StringDef *&);
-+// Any operators for interface IR_WstringDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_WstringDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_WstringDef *&);
-+// Any operators for interface IR_FixedDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_FixedDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FixedDef *&);
-+// Any operators for interface IR_SequenceDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_SequenceDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_SequenceDef *&);
-+// Any operators for interface IR_ArrayDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ArrayDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ArrayDef *&);
-+// Any operators for interface IR_ExceptionDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ExceptionDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ExceptionDef *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ExceptionDescription &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ExceptionDescription*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ExceptionDescription *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ExceptionDescription *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ExceptionDefSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ExceptionDefSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ExceptionDefSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ExceptionDefSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ExcDescriptionSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ExcDescriptionSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ExcDescriptionSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ExcDescriptionSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_AttributeMode);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttributeMode &);
-+// Any operators for interface IR_AttributeDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_AttributeDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttributeDef *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_AttributeDescription &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_AttributeDescription*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttributeDescription *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_AttributeDescription *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_OperationMode);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_OperationMode &);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ParameterMode);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ParameterMode &);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ParameterDescription &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ParameterDescription*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ParameterDescription *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ParameterDescription *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ParDescriptionSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ParDescriptionSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ParDescriptionSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ParDescriptionSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ContextIdSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ContextIdSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ContextIdSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ContextIdSeq *&);
-+// Any operators for interface IR_OperationDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_OperationDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_OperationDef *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_OperationDescription &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_OperationDescription*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_OperationDescription *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_OperationDescription *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_RepositoryIdSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_RepositoryIdSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_RepositoryIdSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_RepositoryIdSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_OpDescriptionSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_OpDescriptionSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_OpDescriptionSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_OpDescriptionSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_AttrDescriptionSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_AttrDescriptionSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttrDescriptionSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_AttrDescriptionSeq *&);
-+// Any operators for interface IR_InterfaceDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_InterfaceDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_InterfaceDef *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_InterfaceDescription &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_InterfaceDescription*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_InterfaceDescription *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_InterfaceDescription *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ValueMember &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueMember*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueMember *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ValueMember *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ValueMemberSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueMemberSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueMemberSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ValueMemberSeq *&);
-+// Any operators for interface IR_ValueMemberDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueMemberDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueMemberDef *&);
-+// Any operators for interface IR_ValueDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueDef *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ValueDescription &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueDescription*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueDescription *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ValueDescription *&);
-+// Any operators for interface IR_ValueBoxDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ValueBoxDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueBoxDef *&);
-+// Any operators for interface IR_ProvidesDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ProvidesDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ProvidesDef *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ProvidesDescription &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ProvidesDescription*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ProvidesDescription *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ProvidesDescription *&);
-+// Any operators for interface IR_UsesDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_UsesDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UsesDef *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_UsesDescription &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_UsesDescription*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UsesDescription *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_UsesDescription *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ProvidesDescSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ProvidesDescSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ProvidesDescSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ProvidesDescSeq *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_UsesDescSeq &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_UsesDescSeq*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UsesDescSeq *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_UsesDescSeq *&);
-+// Any operators for interface IR_EventDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_EventDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EventDef *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_EventDescription &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_EventDescription*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EventDescription *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_EventDescription *&);
-+// Any operators for interface IR_EmitsDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_EmitsDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EmitsDef *&);
-+// Any operators for interface IR_PublishesDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_PublishesDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PublishesDef *&);
-+// Any operators for interface IR_ConsumesDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ConsumesDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ConsumesDef *&);
-+// Any operators for interface IR_ComponentDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ComponentDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ComponentDef *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_ComponentDescription &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_ComponentDescription*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ComponentDescription *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ComponentDescription *&);
-+// Any operators for interface IR_PrimaryKeyDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_PrimaryKeyDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimaryKeyDef *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_PrimaryKeyDescription &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_PrimaryKeyDescription*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimaryKeyDescription *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_PrimaryKeyDescription *&);
-+// Any operators for interface IR_FactoryDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_FactoryDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FactoryDef *&);
-+// Any operators for interface IR_FinderDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_FinderDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FinderDef *&);
-+// Any operators for interface IR_HomeDef
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_HomeDef_ptr);
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_HomeDef *&);
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const IR_HomeDescription &); // copying version
-+TAO_IFR_Client_Export void operator<<= (CORBA::Any &, IR_HomeDescription*); // noncopying version
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_HomeDescription *&); // deprecated
-+TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_HomeDescription *&);
- 
- #ifndef __ACE_INLINE__
- 
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::DefinitionKind &); // 
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::DefinitionKind &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::IRObject_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::IRObject_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::Contained_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::Contained_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::Contained::Description &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::Contained::Description &);
--
--#if !defined _TAO_CDR_OP_IR_InterfaceDefSeq_H_
--#define _TAO_CDR_OP_IR_InterfaceDefSeq_H_
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_DefinitionKind &); //
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_DefinitionKind &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_IRObject_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_IRObject_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Contained_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Contained_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Contained::Description &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Contained::Description &);
- 
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::InterfaceDefSeq &
-+    const IR_InterfaceDefSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::InterfaceDefSeq &
-+    IR_InterfaceDefSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_InterfaceDefSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_ValueDefSeq_H_
--#define _TAO_CDR_OP_IR_ValueDefSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::ValueDefSeq &
-+    const IR_ValueDefSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::ValueDefSeq &
-+    IR_ValueDefSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_ValueDefSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_ComponentDefSeq_H_
--#define _TAO_CDR_OP_IR_ComponentDefSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::ComponentDefSeq &
-+    const IR_ComponentDefSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::ComponentDefSeq &
-+    IR_ComponentDefSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_ComponentDefSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_ProvidesDefSeq_H_
--#define _TAO_CDR_OP_IR_ProvidesDefSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::ProvidesDefSeq &
-+    const IR_ProvidesDefSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::ProvidesDefSeq &
-+    IR_ProvidesDefSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_ProvidesDefSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_UsesDefSeq_H_
--#define _TAO_CDR_OP_IR_UsesDefSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::UsesDefSeq &
-+    const IR_UsesDefSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::UsesDefSeq &
-+    IR_UsesDefSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_UsesDefSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_HomeDefSeq_H_
--#define _TAO_CDR_OP_IR_HomeDefSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::HomeDefSeq &
-+    const IR_HomeDefSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::HomeDefSeq &
-+    IR_HomeDefSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_HomeDefSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_EmitsDefSeq_H_
--#define _TAO_CDR_OP_IR_EmitsDefSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::EmitsDefSeq &
-+    const IR_EmitsDefSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::EmitsDefSeq &
-+    IR_EmitsDefSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_EmitsDefSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_PublishesDefSeq_H_
--#define _TAO_CDR_OP_IR_PublishesDefSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::PublishesDefSeq &
-+    const IR_PublishesDefSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::PublishesDefSeq &
-+    IR_PublishesDefSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_PublishesDefSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_ConsumesDefSeq_H_
--#define _TAO_CDR_OP_IR_ConsumesDefSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::ConsumesDefSeq &
-+    const IR_ConsumesDefSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::ConsumesDefSeq &
-+    IR_ConsumesDefSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_ConsumesDefSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_FactoryDefSeq_H_
--#define _TAO_CDR_OP_IR_FactoryDefSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::FactoryDefSeq &
-+    const IR_FactoryDefSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::FactoryDefSeq &
-+    IR_FactoryDefSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_FactoryDefSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_FinderDefSeq_H_
--#define _TAO_CDR_OP_IR_FinderDefSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::FinderDefSeq &
-+    const IR_FinderDefSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::FinderDefSeq &
-+    IR_FinderDefSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_FinderDefSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_ContainedSeq_H_
--#define _TAO_CDR_OP_IR_ContainedSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::ContainedSeq &
-+    const IR_ContainedSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::ContainedSeq &
-+    IR_ContainedSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_ContainedSeq_H_ */
--
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::StructMember &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::StructMember &);
--
--#if !defined _TAO_CDR_OP_IR_StructMemberSeq_H_
--#define _TAO_CDR_OP_IR_StructMemberSeq_H_
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_StructMember &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_StructMember &);
- 
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::StructMemberSeq &
-+    const IR_StructMemberSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::StructMemberSeq &
-+    IR_StructMemberSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_StructMemberSeq_H_ */
--
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::Initializer &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::Initializer &);
--
--#if !defined _TAO_CDR_OP_IR_InitializerSeq_H_
--#define _TAO_CDR_OP_IR_InitializerSeq_H_
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Initializer &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Initializer &);
- 
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::InitializerSeq &
-+    const IR_InitializerSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::InitializerSeq &
-+    IR_InitializerSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_InitializerSeq_H_ */
--
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::UnionMember &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::UnionMember &);
--
--#if !defined _TAO_CDR_OP_IR_UnionMemberSeq_H_
--#define _TAO_CDR_OP_IR_UnionMemberSeq_H_
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_UnionMember &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_UnionMember &);
- 
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::UnionMemberSeq &
-+    const IR_UnionMemberSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::UnionMemberSeq &
-+    IR_UnionMemberSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_UnionMemberSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_EnumMemberSeq_H_
--#define _TAO_CDR_OP_IR_EnumMemberSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::EnumMemberSeq &
-+    const IR_EnumMemberSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::EnumMemberSeq &
-+    IR_EnumMemberSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_EnumMemberSeq_H_ */
--
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::Container_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::Container_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::Container::Description &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::Container::Description &);
--
--#if !defined _TAO_CDR_OP_IR_Container_DescriptionSeq_H_
--#define _TAO_CDR_OP_IR_Container_DescriptionSeq_H_
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Container_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Container_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Container::Description &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Container::Description &);
- 
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::Container::DescriptionSeq &
-+    const IR_Container::DescriptionSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::Container::DescriptionSeq &
-+    IR_Container::DescriptionSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_Container_DescriptionSeq_H_ */
--
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::IDLType_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::IDLType_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PrimitiveKind &); // 
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PrimitiveKind &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::Repository_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::Repository_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ComponentRepository_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ComponentRepository_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ModuleDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ModuleDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ModuleDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ModuleDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ConstantDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ConstantDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ConstantDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ConstantDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::TypedefDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::TypedefDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::TypeDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::TypeDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::StructDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::StructDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::UnionDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::UnionDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EnumDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EnumDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::AliasDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::AliasDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::NativeDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::NativeDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PrimitiveDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PrimitiveDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::StringDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::StringDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::WstringDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::WstringDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::FixedDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::FixedDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::SequenceDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::SequenceDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ArrayDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ArrayDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ExceptionDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ExceptionDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ExceptionDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ExceptionDescription &);
--
--#if !defined _TAO_CDR_OP_IR_ExceptionDefSeq_H_
--#define _TAO_CDR_OP_IR_ExceptionDefSeq_H_
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_IDLType_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_IDLType_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_PrimitiveKind &); //
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_PrimitiveKind &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Repository_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Repository_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ComponentRepository_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ComponentRepository_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ModuleDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ModuleDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ModuleDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ModuleDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ConstantDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ConstantDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ConstantDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ConstantDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_TypedefDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_TypedefDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_TypeDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_TypeDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_StructDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_StructDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_UnionDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_UnionDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_EnumDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_EnumDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AliasDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AliasDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_NativeDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_NativeDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_PrimitiveDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_PrimitiveDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_StringDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_StringDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_WstringDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_WstringDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_FixedDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_FixedDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_SequenceDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_SequenceDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ArrayDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ArrayDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ExceptionDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ExceptionDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ExceptionDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ExceptionDescription &);
- 
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::ExceptionDefSeq &
-+    const IR_ExceptionDefSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::ExceptionDefSeq &
-+    IR_ExceptionDefSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_ExceptionDefSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_ExcDescriptionSeq_H_
--#define _TAO_CDR_OP_IR_ExcDescriptionSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::ExcDescriptionSeq &
-+    const IR_ExcDescriptionSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::ExcDescriptionSeq &
-+    IR_ExcDescriptionSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_ExcDescriptionSeq_H_ */
--
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::AttributeMode &); // 
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::AttributeMode &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::AttributeDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::AttributeDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::AttributeDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::AttributeDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::OperationMode &); // 
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::OperationMode &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ParameterMode &); // 
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ParameterMode &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ParameterDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ParameterDescription &);
--
--#if !defined _TAO_CDR_OP_IR_ParDescriptionSeq_H_
--#define _TAO_CDR_OP_IR_ParDescriptionSeq_H_
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeMode &); //
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AttributeMode &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AttributeDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AttributeDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_OperationMode &); //
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_OperationMode &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ParameterMode &); //
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ParameterMode &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ParameterDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ParameterDescription &);
- 
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::ParDescriptionSeq &
-+    const IR_ParDescriptionSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::ParDescriptionSeq &
-+    IR_ParDescriptionSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_ParDescriptionSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_ContextIdSeq_H_
--#define _TAO_CDR_OP_IR_ContextIdSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::ContextIdSeq &
-+    const IR_ContextIdSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::ContextIdSeq &
-+    IR_ContextIdSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_ContextIdSeq_H_ */
--
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::OperationDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::OperationDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::OperationDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::OperationDescription &);
--
--#if !defined _TAO_CDR_OP_IR_RepositoryIdSeq_H_
--#define _TAO_CDR_OP_IR_RepositoryIdSeq_H_
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_OperationDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_OperationDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_OperationDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_OperationDescription &);
- 
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::RepositoryIdSeq &
-+    const IR_RepositoryIdSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::RepositoryIdSeq &
-+    IR_RepositoryIdSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_RepositoryIdSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_OpDescriptionSeq_H_
--#define _TAO_CDR_OP_IR_OpDescriptionSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::OpDescriptionSeq &
-+    const IR_OpDescriptionSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::OpDescriptionSeq &
-+    IR_OpDescriptionSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_OpDescriptionSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_AttrDescriptionSeq_H_
--#define _TAO_CDR_OP_IR_AttrDescriptionSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::AttrDescriptionSeq &
-+    const IR_AttrDescriptionSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::AttrDescriptionSeq &
-+    IR_AttrDescriptionSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_AttrDescriptionSeq_H_ */
--
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::InterfaceDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::InterfaceDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::InterfaceDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::InterfaceDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ValueMember &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ValueMember &);
--
--#if !defined _TAO_CDR_OP_IR_ValueMemberSeq_H_
--#define _TAO_CDR_OP_IR_ValueMemberSeq_H_
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_InterfaceDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_InterfaceDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_InterfaceDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_InterfaceDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ValueMember &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ValueMember &);
- 
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::ValueMemberSeq &
-+    const IR_ValueMemberSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::ValueMemberSeq &
-+    IR_ValueMemberSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_ValueMemberSeq_H_ */
--
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ValueMemberDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ValueMemberDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ValueDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ValueDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ValueDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ValueDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ValueBoxDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ValueBoxDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ProvidesDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ProvidesDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ProvidesDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ProvidesDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::UsesDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::UsesDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::UsesDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::UsesDescription &);
--
--#if !defined _TAO_CDR_OP_IR_ProvidesDescSeq_H_
--#define _TAO_CDR_OP_IR_ProvidesDescSeq_H_
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ValueMemberDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ValueMemberDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ValueDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ValueDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ValueDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ValueDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ValueBoxDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ValueBoxDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ProvidesDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ProvidesDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ProvidesDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ProvidesDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_UsesDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_UsesDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_UsesDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_UsesDescription &);
- 
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::ProvidesDescSeq &
-+    const IR_ProvidesDescSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::ProvidesDescSeq &
-+    IR_ProvidesDescSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_ProvidesDescSeq_H_ */
--
--
--#if !defined _TAO_CDR_OP_IR_UsesDescSeq_H_
--#define _TAO_CDR_OP_IR_UsesDescSeq_H_
--
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
--    const IR::UsesDescSeq &
-+    const IR_UsesDescSeq &
-   );
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    IR::UsesDescSeq &
-+    IR_UsesDescSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_UsesDescSeq_H_ */
--
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EventDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EventDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EventDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EventDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EmitsDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EmitsDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PublishesDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PublishesDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ConsumesDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ConsumesDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ComponentDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ComponentDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ComponentDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ComponentDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PrimaryKeyDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PrimaryKeyDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PrimaryKeyDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PrimaryKeyDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::FactoryDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::FactoryDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::FinderDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::FinderDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::HomeDef_ptr );
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::HomeDef_ptr &);
--TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::HomeDescription &);
--TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::HomeDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_EventDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_EventDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_EventDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_EventDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_EmitsDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_EmitsDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_PublishesDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_PublishesDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ConsumesDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ConsumesDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ComponentDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ComponentDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ComponentDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ComponentDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_PrimaryKeyDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_PrimaryKeyDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_PrimaryKeyDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_PrimaryKeyDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_FactoryDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_FactoryDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_FinderDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_FinderDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_HomeDef_ptr );
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_HomeDef_ptr &);
-+TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_HomeDescription &);
-+TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_HomeDescription &);
- 
- #endif /* __ACE_INLINE__ */
- 
diff --git a/TAO/tao/IFR_Client/diffs/InterfaceC.i.diff b/TAO/tao/IFR_Client/diffs/InterfaceC.i.diff
deleted file mode 100644
index 657f739e77e..00000000000
--- a/TAO/tao/IFR_Client/diffs/InterfaceC.i.diff
+++ /dev/null
@@ -1,28070 +0,0 @@
---- orig/InterfaceC.i	Fri Mar 09 00:47:29 2001
-+++ InterfaceC.i	Thu Mar 01 15:34: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:
-@@ -19,12 +19,8 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
- 
--
--#if !defined (_CORBA_IROBJECT___CI_)
--#define _CORBA_IROBJECT___CI_
--
- ACE_INLINE
--CORBA::IRObject::IRObject (
-+CORBA_IRObject::CORBA_IRObject (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -34,184 +30,164 @@
-   this->CORBA_IRObject_setup_collocation (_tao_collocated);
- }
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_CORBA_IROBJECT___VAR_CI_)
--#define _CORBA_IROBJECT___VAR_CI_
--
- // *************************************************************
--// Inline operations for class CORBA::IRObject_var
-+// Inline operations for class CORBA_IRObject_var
- // *************************************************************
- 
- ACE_INLINE
--CORBA::IRObject_var::IRObject_var (void) // default constructor
--  : ptr_ (IRObject::_nil ())
-+CORBA_IRObject_var::CORBA_IRObject_var (void) // default constructor
-+  : ptr_ (CORBA_IRObject::_nil ())
- {}
- 
--ACE_INLINE ::CORBA::IRObject_ptr
--CORBA::IRObject_var::ptr (void) const
-+ACE_INLINE ::CORBA_IRObject_ptr
-+CORBA_IRObject_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--CORBA::IRObject_var::IRObject_var (const ::CORBA::IRObject_var &p) // copy constructor
-+CORBA_IRObject_var::CORBA_IRObject_var (const ::CORBA_IRObject_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (IRObject::_duplicate (p.ptr ()))
-+    ptr_ (CORBA_IRObject::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--CORBA::IRObject_var::~IRObject_var (void) // destructor
-+CORBA_IRObject_var::~CORBA_IRObject_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE CORBA::IRObject_var &
--CORBA::IRObject_var::operator= (IRObject_ptr p)
-+ACE_INLINE CORBA_IRObject_var &
-+CORBA_IRObject_var::operator= (CORBA_IRObject_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE CORBA::IRObject_var &
--CORBA::IRObject_var::operator= (const ::CORBA::IRObject_var &p)
-+ACE_INLINE CORBA_IRObject_var &
-+CORBA_IRObject_var::operator= (const CORBA_IRObject_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = ::CORBA::IRObject::_duplicate (p.ptr ());
-+    this->ptr_ = ::CORBA_IRObject::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--CORBA::IRObject_var::operator const ::CORBA::IRObject_ptr &() const // cast
-+CORBA_IRObject_var::operator const ::CORBA_IRObject_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--CORBA::IRObject_var::operator ::CORBA::IRObject_ptr &() // cast 
-+CORBA_IRObject_var::operator ::CORBA_IRObject_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::IRObject_ptr
--CORBA::IRObject_var::operator-> (void) const
-+ACE_INLINE ::CORBA_IRObject_ptr
-+CORBA_IRObject_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::IRObject_ptr
--CORBA::IRObject_var::in (void) const
-+ACE_INLINE ::CORBA_IRObject_ptr
-+CORBA_IRObject_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::IRObject_ptr &
--CORBA::IRObject_var::inout (void)
-+ACE_INLINE ::CORBA_IRObject_ptr &
-+CORBA_IRObject_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::IRObject_ptr &
--CORBA::IRObject_var::out (void)
-+ACE_INLINE ::CORBA_IRObject_ptr &
-+CORBA_IRObject_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = ::CORBA::IRObject::_nil ();
-+  this->ptr_ = ::CORBA_IRObject::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::IRObject_ptr
--CORBA::IRObject_var::_retn (void)
-+ACE_INLINE ::CORBA_IRObject_ptr
-+CORBA_IRObject_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  ::CORBA::IRObject_ptr val = this->ptr_;
--  this->ptr_ = ::CORBA::IRObject::_nil ();
-+  ::CORBA_IRObject_ptr val = this->ptr_;
-+  this->ptr_ = ::CORBA_IRObject::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_CORBA_IROBJECT___OUT_CI_)
--#define _CORBA_IROBJECT___OUT_CI_
--
- // *************************************************************
--// Inline operations for class CORBA::IRObject_out
-+// Inline operations for class CORBA_IRObject_out
- // *************************************************************
- 
- ACE_INLINE
--CORBA::IRObject_out::IRObject_out (IRObject_ptr &p)
-+CORBA_IRObject_out::CORBA_IRObject_out (CORBA_IRObject_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = ::CORBA::IRObject::_nil ();
-+  this->ptr_ = ::CORBA_IRObject::_nil ();
- }
- 
- ACE_INLINE
--CORBA::IRObject_out::IRObject_out (IRObject_var &p) // constructor from _var
-+CORBA_IRObject_out::CORBA_IRObject_out (CORBA_IRObject_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = ::CORBA::IRObject::_nil ();
-+  this->ptr_ = ::CORBA_IRObject::_nil ();
- }
- 
- ACE_INLINE
--CORBA::IRObject_out::IRObject_out (const ::CORBA::IRObject_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IRObject_out &, p).ptr_)
-+CORBA_IRObject_out::CORBA_IRObject_out (const ::CORBA_IRObject_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (CORBA_IRObject_out &, p).ptr_)
- {}
- 
--ACE_INLINE ::CORBA::IRObject_out &
--CORBA::IRObject_out::operator= (const ::CORBA::IRObject_out &p)
-+ACE_INLINE ::CORBA_IRObject_out &
-+CORBA_IRObject_out::operator= (const CORBA_IRObject_out &p)
- {
--  this->ptr_ = ACE_const_cast (IRObject_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (CORBA_IRObject_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE CORBA::IRObject_out &
--CORBA::IRObject_out::operator= (const ::CORBA::IRObject_var &p)
-+ACE_INLINE CORBA_IRObject_out &
-+CORBA_IRObject_out::operator= (const CORBA_IRObject_var &p)
- {
--  this->ptr_ = ::CORBA::IRObject::_duplicate (p.ptr ());
-+  this->ptr_ = ::CORBA_IRObject::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE CORBA::IRObject_out &
--CORBA::IRObject_out::operator= (IRObject_ptr p)
-+ACE_INLINE CORBA_IRObject_out &
-+CORBA_IRObject_out::operator= (CORBA_IRObject_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--CORBA::IRObject_out::operator ::CORBA::IRObject_ptr &() // cast
-+CORBA_IRObject_out::operator ::CORBA_IRObject_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::IRObject_ptr &
--CORBA::IRObject_out::ptr (void) // ptr
-+ACE_INLINE ::CORBA_IRObject_ptr &
-+CORBA_IRObject_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::IRObject_ptr
--CORBA::IRObject_out::operator-> (void)
-+ACE_INLINE ::CORBA_IRObject_ptr
-+CORBA_IRObject_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINED___CI_)
--#define _IR_CONTAINED___CI_
--
- ACE_INLINE
--IR::Contained::Contained (
-+IR_Contained::IR_Contained (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -221,185 +197,164 @@
-   this->IR_Contained_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINED___VAR_CI_)
--#define _IR_CONTAINED___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::Contained_var
-+// Inline operations for class IR_Contained_var
- // *************************************************************
- 
- ACE_INLINE
--IR::Contained_var::Contained_var (void) // default constructor
--  : ptr_ (IR::Contained::_nil ())
-+IR_Contained_var::IR_Contained_var (void) // default constructor
-+  : ptr_ (IR_Contained::_nil ())
- {}
- 
--ACE_INLINE IR::Contained_ptr 
--IR::Contained_var::ptr (void) const
-+ACE_INLINE IR_Contained_ptr 
-+IR_Contained_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::Contained_var::Contained_var (const IR::Contained_var &p) // copy constructor
-+IR_Contained_var::IR_Contained_var (const IR_Contained_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (Contained::_duplicate (p.ptr ()))
-+    ptr_ (IR_Contained::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::Contained_var::~Contained_var (void) // destructor
-+IR_Contained_var::~IR_Contained_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::Contained_var &
--IR::Contained_var::operator= (IR::Contained_ptr p)
-+ACE_INLINE IR_Contained_var &
-+IR_Contained_var::operator= (IR_Contained_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::Contained_var &
--IR::Contained_var::operator= (const IR::Contained_var &p)
-+ACE_INLINE IR_Contained_var &
-+IR_Contained_var::operator= (const IR_Contained_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::Contained::_duplicate (p.ptr ());
-+    this->ptr_ = IR_Contained::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::Contained_var::operator const IR::Contained_ptr &() const // cast
-+IR_Contained_var::operator const IR_Contained_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::Contained_var::operator IR::Contained_ptr &() // cast 
-+IR_Contained_var::operator IR_Contained_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Contained_ptr 
--IR::Contained_var::operator-> (void) const
-+ACE_INLINE IR_Contained_ptr 
-+IR_Contained_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Contained_ptr
--IR::Contained_var::in (void) const
-+ACE_INLINE IR_Contained_ptr
-+IR_Contained_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Contained_ptr &
--IR::Contained_var::inout (void)
-+ACE_INLINE IR_Contained_ptr &
-+IR_Contained_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Contained_ptr &
--IR::Contained_var::out (void)
-+ACE_INLINE IR_Contained_ptr &
-+IR_Contained_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::Contained::_nil ();
-+  this->ptr_ = IR_Contained::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Contained_ptr 
--IR::Contained_var::_retn (void)
-+ACE_INLINE IR_Contained_ptr 
-+IR_Contained_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::Contained_ptr val = this->ptr_;
--  this->ptr_ = IR::Contained::_nil ();
-+  IR_Contained_ptr val = this->ptr_;
-+  this->ptr_ = IR_Contained::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINED___OUT_CI_)
--#define _IR_CONTAINED___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::Contained_out
-+// Inline operations for class IR_Contained_out
- // *************************************************************
- 
- ACE_INLINE
--IR::Contained_out::Contained_out (IR::Contained_ptr &p)
-+IR_Contained_out::IR_Contained_out (IR_Contained_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::Contained::_nil ();
-+  this->ptr_ = IR_Contained::_nil ();
- }
- 
- ACE_INLINE
--IR::Contained_out::Contained_out (IR::Contained_var &p) // constructor from _var
-+IR_Contained_out::IR_Contained_out (IR_Contained_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::Contained::_nil ();
-+  this->ptr_ = IR_Contained::_nil ();
- }
- 
- ACE_INLINE
--IR::Contained_out::Contained_out (const IR::Contained_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::Contained_out&,p).ptr_)
-+IR_Contained_out::IR_Contained_out (const IR_Contained_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_Contained_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::Contained_out &
--IR::Contained_out::operator= (const IR::Contained_out &p)
-+ACE_INLINE IR_Contained_out &
-+IR_Contained_out::operator= (const IR_Contained_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::Contained_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_Contained_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::Contained_out &
--IR::Contained_out::operator= (const IR::Contained_var &p)
-+ACE_INLINE IR_Contained_out &
-+IR_Contained_out::operator= (const IR_Contained_var &p)
- {
--  this->ptr_ = IR::Contained::_duplicate (p.ptr ());
-+  this->ptr_ = IR_Contained::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::Contained_out &
--IR::Contained_out::operator= (IR::Contained_ptr p)
-+ACE_INLINE IR_Contained_out &
-+IR_Contained_out::operator= (IR_Contained_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::Contained_out::operator IR::Contained_ptr &() // cast
-+IR_Contained_out::operator IR_Contained_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Contained_ptr &
--IR::Contained_out::ptr (void) // ptr
-+ACE_INLINE IR_Contained_ptr &
-+IR_Contained_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Contained_ptr 
--IR::Contained_out::operator-> (void)
-+ACE_INLINE IR_Contained_ptr 
-+IR_Contained_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_REPOSITORY___CI_)
--#define _IR_REPOSITORY___CI_
--
- ACE_INLINE
--IR::Repository::Repository (
-+IR_Repository::IR_Repository (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -409,185 +364,164 @@
-   this->IR_Repository_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_REPOSITORY___VAR_CI_)
--#define _IR_REPOSITORY___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::Repository_var
-+// Inline operations for class IR_Repository_var
- // *************************************************************
- 
- ACE_INLINE
--IR::Repository_var::Repository_var (void) // default constructor
--  : ptr_ (IR::Repository::_nil ())
-+IR_Repository_var::IR_Repository_var (void) // default constructor
-+  : ptr_ (IR_Repository::_nil ())
- {}
- 
--ACE_INLINE IR::Repository_ptr 
--IR::Repository_var::ptr (void) const
-+ACE_INLINE IR_Repository_ptr 
-+IR_Repository_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::Repository_var::Repository_var (const IR::Repository_var &p) // copy constructor
-+IR_Repository_var::IR_Repository_var (const IR_Repository_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (Repository::_duplicate (p.ptr ()))
-+    ptr_ (IR_Repository::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::Repository_var::~Repository_var (void) // destructor
-+IR_Repository_var::~IR_Repository_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::Repository_var &
--IR::Repository_var::operator= (IR::Repository_ptr p)
-+ACE_INLINE IR_Repository_var &
-+IR_Repository_var::operator= (IR_Repository_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::Repository_var &
--IR::Repository_var::operator= (const IR::Repository_var &p)
-+ACE_INLINE IR_Repository_var &
-+IR_Repository_var::operator= (const IR_Repository_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::Repository::_duplicate (p.ptr ());
-+    this->ptr_ = IR_Repository::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::Repository_var::operator const IR::Repository_ptr &() const // cast
-+IR_Repository_var::operator const IR_Repository_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::Repository_var::operator IR::Repository_ptr &() // cast 
-+IR_Repository_var::operator IR_Repository_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Repository_ptr 
--IR::Repository_var::operator-> (void) const
-+ACE_INLINE IR_Repository_ptr 
-+IR_Repository_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Repository_ptr
--IR::Repository_var::in (void) const
-+ACE_INLINE IR_Repository_ptr
-+IR_Repository_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Repository_ptr &
--IR::Repository_var::inout (void)
-+ACE_INLINE IR_Repository_ptr &
-+IR_Repository_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Repository_ptr &
--IR::Repository_var::out (void)
-+ACE_INLINE IR_Repository_ptr &
-+IR_Repository_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::Repository::_nil ();
-+  this->ptr_ = IR_Repository::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Repository_ptr 
--IR::Repository_var::_retn (void)
-+ACE_INLINE IR_Repository_ptr 
-+IR_Repository_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::Repository_ptr val = this->ptr_;
--  this->ptr_ = IR::Repository::_nil ();
-+  IR_Repository_ptr val = this->ptr_;
-+  this->ptr_ = IR_Repository::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_REPOSITORY___OUT_CI_)
--#define _IR_REPOSITORY___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::Repository_out
-+// Inline operations for class IR_Repository_out
- // *************************************************************
- 
- ACE_INLINE
--IR::Repository_out::Repository_out (IR::Repository_ptr &p)
-+IR_Repository_out::IR_Repository_out (IR_Repository_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::Repository::_nil ();
-+  this->ptr_ = IR_Repository::_nil ();
- }
- 
- ACE_INLINE
--IR::Repository_out::Repository_out (IR::Repository_var &p) // constructor from _var
-+IR_Repository_out::IR_Repository_out (IR_Repository_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::Repository::_nil ();
-+  this->ptr_ = IR_Repository::_nil ();
- }
- 
- ACE_INLINE
--IR::Repository_out::Repository_out (const IR::Repository_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::Repository_out&,p).ptr_)
-+IR_Repository_out::IR_Repository_out (const IR_Repository_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_Repository_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::Repository_out &
--IR::Repository_out::operator= (const IR::Repository_out &p)
-+ACE_INLINE IR_Repository_out &
-+IR_Repository_out::operator= (const IR_Repository_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::Repository_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_Repository_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::Repository_out &
--IR::Repository_out::operator= (const IR::Repository_var &p)
-+ACE_INLINE IR_Repository_out &
-+IR_Repository_out::operator= (const IR_Repository_var &p)
- {
--  this->ptr_ = IR::Repository::_duplicate (p.ptr ());
-+  this->ptr_ = IR_Repository::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::Repository_out &
--IR::Repository_out::operator= (IR::Repository_ptr p)
-+ACE_INLINE IR_Repository_out &
-+IR_Repository_out::operator= (IR_Repository_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::Repository_out::operator IR::Repository_ptr &() // cast
-+IR_Repository_out::operator IR_Repository_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Repository_ptr &
--IR::Repository_out::ptr (void) // ptr
-+ACE_INLINE IR_Repository_ptr &
-+IR_Repository_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Repository_ptr 
--IR::Repository_out::operator-> (void)
-+ACE_INLINE IR_Repository_ptr 
-+IR_Repository_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINER___CI_)
--#define _IR_CONTAINER___CI_
--
- ACE_INLINE
--IR::Container::Container (
-+IR_Container::IR_Container (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -597,218 +531,201 @@
-   this->IR_Container_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINER___VAR_CI_)
--#define _IR_CONTAINER___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::Container_var
-+// Inline operations for class IR_Container_var
- // *************************************************************
- 
- ACE_INLINE
--IR::Container_var::Container_var (void) // default constructor
--  : ptr_ (IR::Container::_nil ())
-+IR_Container_var::IR_Container_var (void) // default constructor
-+  : ptr_ (IR_Container::_nil ())
- {}
- 
--ACE_INLINE IR::Container_ptr 
--IR::Container_var::ptr (void) const
-+ACE_INLINE IR_Container_ptr 
-+IR_Container_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::Container_var::Container_var (const IR::Container_var &p) // copy constructor
-+IR_Container_var::IR_Container_var (const IR_Container_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (Container::_duplicate (p.ptr ()))
-+    ptr_ (IR_Container::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::Container_var::~Container_var (void) // destructor
-+IR_Container_var::~IR_Container_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::Container_var &
--IR::Container_var::operator= (IR::Container_ptr p)
-+ACE_INLINE IR_Container_var &
-+IR_Container_var::operator= (IR_Container_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::Container_var &
--IR::Container_var::operator= (const IR::Container_var &p)
-+ACE_INLINE IR_Container_var &
-+IR_Container_var::operator= (const IR_Container_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::Container::_duplicate (p.ptr ());
-+    this->ptr_ = IR_Container::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::Container_var::operator const IR::Container_ptr &() const // cast
-+IR_Container_var::operator const IR_Container_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::Container_var::operator IR::Container_ptr &() // cast 
-+IR_Container_var::operator IR_Container_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Container_ptr 
--IR::Container_var::operator-> (void) const
-+ACE_INLINE IR_Container_ptr 
-+IR_Container_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Container_ptr
--IR::Container_var::in (void) const
-+ACE_INLINE IR_Container_ptr
-+IR_Container_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Container_ptr &
--IR::Container_var::inout (void)
-+ACE_INLINE IR_Container_ptr &
-+IR_Container_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Container_ptr &
--IR::Container_var::out (void)
-+ACE_INLINE IR_Container_ptr &
-+IR_Container_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::Container::_nil ();
-+  this->ptr_ = IR_Container::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Container_ptr 
--IR::Container_var::_retn (void)
-+ACE_INLINE IR_Container_ptr 
-+IR_Container_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::Container_ptr val = this->ptr_;
--  this->ptr_ = IR::Container::_nil ();
-+  IR_Container_ptr val = this->ptr_;
-+  this->ptr_ = IR_Container::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTAINER___OUT_CI_)
--#define _IR_CONTAINER___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::Container_out
-+// Inline operations for class IR_Container_out
- // *************************************************************
- 
- ACE_INLINE
--IR::Container_out::Container_out (IR::Container_ptr &p)
-+IR_Container_out::IR_Container_out (IR_Container_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::Container::_nil ();
-+  this->ptr_ = IR_Container::_nil ();
- }
- 
- ACE_INLINE
--IR::Container_out::Container_out (IR::Container_var &p) // constructor from _var
-+IR_Container_out::IR_Container_out (IR_Container_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::Container::_nil ();
-+  this->ptr_ = IR_Container::_nil ();
- }
- 
- ACE_INLINE
--IR::Container_out::Container_out (const IR::Container_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::Container_out&,p).ptr_)
-+IR_Container_out::IR_Container_out (const IR_Container_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_Container_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::Container_out &
--IR::Container_out::operator= (const IR::Container_out &p)
-+ACE_INLINE IR_Container_out &
-+IR_Container_out::operator= (const IR_Container_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::Container_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_Container_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::Container_out &
--IR::Container_out::operator= (const IR::Container_var &p)
-+ACE_INLINE IR_Container_out &
-+IR_Container_out::operator= (const IR_Container_var &p)
- {
--  this->ptr_ = IR::Container::_duplicate (p.ptr ());
-+  this->ptr_ = IR_Container::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::Container_out &
--IR::Container_out::operator= (IR::Container_ptr p)
-+ACE_INLINE IR_Container_out &
-+IR_Container_out::operator= (IR_Container_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::Container_out::operator IR::Container_ptr &() // cast
-+IR_Container_out::operator IR_Container_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Container_ptr &
--IR::Container_out::ptr (void) // ptr
-+ACE_INLINE IR_Container_ptr &
-+IR_Container_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Container_ptr 
--IR::Container_out::operator-> (void)
-+ACE_INLINE IR_Container_ptr 
-+IR_Container_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
- // *************************************************************
--// Inline operations for class IR::Contained::Description_var
-+// Inline operations for class IR_Contained::Description_var
- // *************************************************************
- 
- ACE_INLINE
--IR::Contained::Description_var::Description_var (void) // default constructor
-+IR_Contained::Description_var::Description_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::Contained::Description_var::Description_var (Description *p)
-+IR_Contained::Description_var::Description_var (Description *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::Contained::Description_var::Description_var (const ::IR::Contained::Description_var &p) // copy constructor
-+IR_Contained::Description_var::Description_var (const ::IR_Contained::Description_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::Contained::Description (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_Contained::Description (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::Contained::Description_var::~Description_var (void) // destructor
-+IR_Contained::Description_var::~Description_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::Contained::Description_var &
--IR::Contained::Description_var::operator= (Description *p)
-+ACE_INLINE IR_Contained::Description_var &
-+IR_Contained::Description_var::operator= (Description *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::Contained::Description_var &
--IR::Contained::Description_var::operator= (const ::IR::Contained::Description_var &p)
-+ACE_INLINE ::IR_Contained::Description_var &
-+IR_Contained::Description_var::operator= (const ::IR_Contained::Description_var &p)
- {
-   if (this != &p)
-     {
-@@ -819,12 +736,12 @@
-         }
-       else
-         {
--          Description *deep_copy =
--            new Description (*p.ptr_);
-+          IR_Contained::Description *deep_copy = 
-+            new IR_Contained::Description (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              Description *tmp = deep_copy;
-+              IR_Contained::Description *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -835,91 +752,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::Contained::Description *
--IR::Contained::Description_var::operator-> (void) const
-+ACE_INLINE const ::IR_Contained::Description *
-+IR_Contained::Description_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::Contained::Description *
--IR::Contained::Description_var::operator-> (void)
-+ACE_INLINE ::IR_Contained::Description *
-+IR_Contained::Description_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::Contained::Description_var::operator const ::IR::Contained::Description &() const // cast
-+IR_Contained::Description_var::operator const ::IR_Contained::Description &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::Contained::Description_var::operator ::IR::Contained::Description &() // cast 
-+IR_Contained::Description_var::operator ::IR_Contained::Description &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::Contained::Description_var::operator ::IR::Contained::Description &() const // cast 
-+IR_Contained::Description_var::operator ::IR_Contained::Description &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::Contained::Description_var::operator ::IR::Contained::Description *&() // cast 
-+IR_Contained::Description_var::operator ::IR_Contained::Description *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::Contained::Description &
--IR::Contained::Description_var::in (void) const
-+ACE_INLINE const ::IR_Contained::Description &
-+IR_Contained::Description_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::Contained::Description &
--IR::Contained::Description_var::inout (void)
-+ACE_INLINE ::IR_Contained::Description &
-+IR_Contained::Description_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::Contained::Description *&
--IR::Contained::Description_var::out (void)
-+ACE_INLINE ::IR_Contained::Description *&
-+IR_Contained::Description_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::Contained::Description *
--IR::Contained::Description_var::_retn (void)
-+ACE_INLINE ::IR_Contained::Description *
-+IR_Contained::Description_var::_retn (void)
- {
--  ::IR::Contained::Description *tmp = this->ptr_;
-+  ::IR_Contained::Description *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::Contained::Description *
--IR::Contained::Description_var::ptr (void) const
-+ACE_INLINE ::IR_Contained::Description *
-+IR_Contained::Description_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::Contained::Description_out
-+// Inline operations for class IR_Contained::Description_out
- // *************************************************************
- 
- ACE_INLINE
--IR::Contained::Description_out::Description_out (::IR::Contained::Description *&p)
-+IR_Contained::Description_out::Description_out (::IR_Contained::Description *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::Contained::Description_out::Description_out (Description_var &p) // constructor from _var
-+IR_Contained::Description_out::Description_out (Description_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -927,48 +844,44 @@
- }
- 
- ACE_INLINE
--IR::Contained::Description_out::Description_out (const ::IR::Contained::Description_out &p) // copy constructor
-+IR_Contained::Description_out::Description_out (const ::IR_Contained::Description_out &p) // copy constructor
-   : ptr_ (ACE_const_cast (Description_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::Contained::Description_out &
--IR::Contained::Description_out::operator= (const ::IR::Contained::Description_out &p)
-+ACE_INLINE IR_Contained::Description_out &
-+IR_Contained::Description_out::operator= (const ::IR_Contained::Description_out &p)
- {
-   this->ptr_ = ACE_const_cast (Description_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::Contained::Description_out &
--IR::Contained::Description_out::operator= (Description *p)
-+ACE_INLINE IR_Contained::Description_out &
-+IR_Contained::Description_out::operator= (Description *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::Contained::Description_out::operator ::IR::Contained::Description *&() // cast
-+IR_Contained::Description_out::operator ::IR_Contained::Description *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::Contained::Description *&
--IR::Contained::Description_out::ptr (void) // ptr
-+ACE_INLINE ::IR_Contained::Description *&
-+IR_Contained::Description_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::Contained::Description *
--IR::Contained::Description_out::operator-> (void)
-+ACE_INLINE ::IR_Contained::Description *
-+IR_Contained::Description_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#if !defined (_IR_MODULEDEF___CI_)
--#define _IR_MODULEDEF___CI_
--
- ACE_INLINE
--IR::ModuleDef::ModuleDef (
-+IR_ModuleDef::IR_ModuleDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -978,185 +891,164 @@
-   this->IR_ModuleDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_MODULEDEF___VAR_CI_)
--#define _IR_MODULEDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::ModuleDef_var
-+// Inline operations for class IR_ModuleDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ModuleDef_var::ModuleDef_var (void) // default constructor
--  : ptr_ (IR::ModuleDef::_nil ())
-+IR_ModuleDef_var::IR_ModuleDef_var (void) // default constructor
-+  : ptr_ (IR_ModuleDef::_nil ())
- {}
- 
--ACE_INLINE IR::ModuleDef_ptr 
--IR::ModuleDef_var::ptr (void) const
-+ACE_INLINE IR_ModuleDef_ptr 
-+IR_ModuleDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ModuleDef_var::ModuleDef_var (const IR::ModuleDef_var &p) // copy constructor
-+IR_ModuleDef_var::IR_ModuleDef_var (const IR_ModuleDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (ModuleDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_ModuleDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::ModuleDef_var::~ModuleDef_var (void) // destructor
-+IR_ModuleDef_var::~IR_ModuleDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::ModuleDef_var &
--IR::ModuleDef_var::operator= (IR::ModuleDef_ptr p)
-+ACE_INLINE IR_ModuleDef_var &
-+IR_ModuleDef_var::operator= (IR_ModuleDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::ModuleDef_var &
--IR::ModuleDef_var::operator= (const IR::ModuleDef_var &p)
-+ACE_INLINE IR_ModuleDef_var &
-+IR_ModuleDef_var::operator= (const IR_ModuleDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::ModuleDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_ModuleDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ModuleDef_var::operator const IR::ModuleDef_ptr &() const // cast
-+IR_ModuleDef_var::operator const IR_ModuleDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ModuleDef_var::operator IR::ModuleDef_ptr &() // cast 
-+IR_ModuleDef_var::operator IR_ModuleDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ModuleDef_ptr 
--IR::ModuleDef_var::operator-> (void) const
-+ACE_INLINE IR_ModuleDef_ptr 
-+IR_ModuleDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ModuleDef_ptr
--IR::ModuleDef_var::in (void) const
-+ACE_INLINE IR_ModuleDef_ptr
-+IR_ModuleDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ModuleDef_ptr &
--IR::ModuleDef_var::inout (void)
-+ACE_INLINE IR_ModuleDef_ptr &
-+IR_ModuleDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ModuleDef_ptr &
--IR::ModuleDef_var::out (void)
-+ACE_INLINE IR_ModuleDef_ptr &
-+IR_ModuleDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ModuleDef::_nil ();
-+  this->ptr_ = IR_ModuleDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ModuleDef_ptr 
--IR::ModuleDef_var::_retn (void)
-+ACE_INLINE IR_ModuleDef_ptr 
-+IR_ModuleDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::ModuleDef_ptr val = this->ptr_;
--  this->ptr_ = IR::ModuleDef::_nil ();
-+  IR_ModuleDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_ModuleDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_MODULEDEF___OUT_CI_)
--#define _IR_MODULEDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::ModuleDef_out
-+// Inline operations for class IR_ModuleDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ModuleDef_out::ModuleDef_out (IR::ModuleDef_ptr &p)
-+IR_ModuleDef_out::IR_ModuleDef_out (IR_ModuleDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::ModuleDef::_nil ();
-+  this->ptr_ = IR_ModuleDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ModuleDef_out::ModuleDef_out (IR::ModuleDef_var &p) // constructor from _var
-+IR_ModuleDef_out::IR_ModuleDef_out (IR_ModuleDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ModuleDef::_nil ();
-+  this->ptr_ = IR_ModuleDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ModuleDef_out::ModuleDef_out (const IR::ModuleDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::ModuleDef_out&,p).ptr_)
-+IR_ModuleDef_out::IR_ModuleDef_out (const IR_ModuleDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ModuleDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::ModuleDef_out &
--IR::ModuleDef_out::operator= (const IR::ModuleDef_out &p)
-+ACE_INLINE IR_ModuleDef_out &
-+IR_ModuleDef_out::operator= (const IR_ModuleDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::ModuleDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ModuleDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ModuleDef_out &
--IR::ModuleDef_out::operator= (const IR::ModuleDef_var &p)
-+ACE_INLINE IR_ModuleDef_out &
-+IR_ModuleDef_out::operator= (const IR_ModuleDef_var &p)
- {
--  this->ptr_ = IR::ModuleDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_ModuleDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::ModuleDef_out &
--IR::ModuleDef_out::operator= (IR::ModuleDef_ptr p)
-+ACE_INLINE IR_ModuleDef_out &
-+IR_ModuleDef_out::operator= (IR_ModuleDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ModuleDef_out::operator IR::ModuleDef_ptr &() // cast
-+IR_ModuleDef_out::operator IR_ModuleDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ModuleDef_ptr &
--IR::ModuleDef_out::ptr (void) // ptr
-+ACE_INLINE IR_ModuleDef_ptr &
-+IR_ModuleDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ModuleDef_ptr 
--IR::ModuleDef_out::operator-> (void)
-+ACE_INLINE IR_ModuleDef_ptr 
-+IR_ModuleDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSTANTDEF___CI_)
--#define _IR_CONSTANTDEF___CI_
--
- ACE_INLINE
--IR::ConstantDef::ConstantDef (
-+IR_ConstantDef::IR_ConstantDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -1166,185 +1058,164 @@
-   this->IR_ConstantDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSTANTDEF___VAR_CI_)
--#define _IR_CONSTANTDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::ConstantDef_var
-+// Inline operations for class IR_ConstantDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ConstantDef_var::ConstantDef_var (void) // default constructor
--  : ptr_ (IR::ConstantDef::_nil ())
-+IR_ConstantDef_var::IR_ConstantDef_var (void) // default constructor
-+  : ptr_ (IR_ConstantDef::_nil ())
- {}
- 
--ACE_INLINE IR::ConstantDef_ptr 
--IR::ConstantDef_var::ptr (void) const
-+ACE_INLINE IR_ConstantDef_ptr 
-+IR_ConstantDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ConstantDef_var::ConstantDef_var (const IR::ConstantDef_var &p) // copy constructor
-+IR_ConstantDef_var::IR_ConstantDef_var (const IR_ConstantDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (ConstantDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_ConstantDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::ConstantDef_var::~ConstantDef_var (void) // destructor
-+IR_ConstantDef_var::~IR_ConstantDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::ConstantDef_var &
--IR::ConstantDef_var::operator= (IR::ConstantDef_ptr p)
-+ACE_INLINE IR_ConstantDef_var &
-+IR_ConstantDef_var::operator= (IR_ConstantDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::ConstantDef_var &
--IR::ConstantDef_var::operator= (const IR::ConstantDef_var &p)
-+ACE_INLINE IR_ConstantDef_var &
-+IR_ConstantDef_var::operator= (const IR_ConstantDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::ConstantDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_ConstantDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ConstantDef_var::operator const IR::ConstantDef_ptr &() const // cast
-+IR_ConstantDef_var::operator const IR_ConstantDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ConstantDef_var::operator IR::ConstantDef_ptr &() // cast 
-+IR_ConstantDef_var::operator IR_ConstantDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ConstantDef_ptr 
--IR::ConstantDef_var::operator-> (void) const
-+ACE_INLINE IR_ConstantDef_ptr 
-+IR_ConstantDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ConstantDef_ptr
--IR::ConstantDef_var::in (void) const
-+ACE_INLINE IR_ConstantDef_ptr
-+IR_ConstantDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ConstantDef_ptr &
--IR::ConstantDef_var::inout (void)
-+ACE_INLINE IR_ConstantDef_ptr &
-+IR_ConstantDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ConstantDef_ptr &
--IR::ConstantDef_var::out (void)
-+ACE_INLINE IR_ConstantDef_ptr &
-+IR_ConstantDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ConstantDef::_nil ();
-+  this->ptr_ = IR_ConstantDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ConstantDef_ptr 
--IR::ConstantDef_var::_retn (void)
-+ACE_INLINE IR_ConstantDef_ptr 
-+IR_ConstantDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::ConstantDef_ptr val = this->ptr_;
--  this->ptr_ = IR::ConstantDef::_nil ();
-+  IR_ConstantDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_ConstantDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSTANTDEF___OUT_CI_)
--#define _IR_CONSTANTDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::ConstantDef_out
-+// Inline operations for class IR_ConstantDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ConstantDef_out::ConstantDef_out (IR::ConstantDef_ptr &p)
-+IR_ConstantDef_out::IR_ConstantDef_out (IR_ConstantDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::ConstantDef::_nil ();
-+  this->ptr_ = IR_ConstantDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ConstantDef_out::ConstantDef_out (IR::ConstantDef_var &p) // constructor from _var
-+IR_ConstantDef_out::IR_ConstantDef_out (IR_ConstantDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ConstantDef::_nil ();
-+  this->ptr_ = IR_ConstantDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ConstantDef_out::ConstantDef_out (const IR::ConstantDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::ConstantDef_out&,p).ptr_)
-+IR_ConstantDef_out::IR_ConstantDef_out (const IR_ConstantDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ConstantDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::ConstantDef_out &
--IR::ConstantDef_out::operator= (const IR::ConstantDef_out &p)
-+ACE_INLINE IR_ConstantDef_out &
-+IR_ConstantDef_out::operator= (const IR_ConstantDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::ConstantDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ConstantDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ConstantDef_out &
--IR::ConstantDef_out::operator= (const IR::ConstantDef_var &p)
-+ACE_INLINE IR_ConstantDef_out &
-+IR_ConstantDef_out::operator= (const IR_ConstantDef_var &p)
- {
--  this->ptr_ = IR::ConstantDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_ConstantDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::ConstantDef_out &
--IR::ConstantDef_out::operator= (IR::ConstantDef_ptr p)
-+ACE_INLINE IR_ConstantDef_out &
-+IR_ConstantDef_out::operator= (IR_ConstantDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ConstantDef_out::operator IR::ConstantDef_ptr &() // cast
-+IR_ConstantDef_out::operator IR_ConstantDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ConstantDef_ptr &
--IR::ConstantDef_out::ptr (void) // ptr
-+ACE_INLINE IR_ConstantDef_ptr &
-+IR_ConstantDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ConstantDef_ptr 
--IR::ConstantDef_out::operator-> (void)
-+ACE_INLINE IR_ConstantDef_ptr 
-+IR_ConstantDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_IDLTYPE___CI_)
--#define _IR_IDLTYPE___CI_
--
- ACE_INLINE
--IR::IDLType::IDLType (
-+IR_IDLType::IR_IDLType (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -1354,185 +1225,164 @@
-   this->IR_IDLType_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_IDLTYPE___VAR_CI_)
--#define _IR_IDLTYPE___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::IDLType_var
-+// Inline operations for class IR_IDLType_var
- // *************************************************************
- 
- ACE_INLINE
--IR::IDLType_var::IDLType_var (void) // default constructor
--  : ptr_ (IR::IDLType::_nil ())
-+IR_IDLType_var::IR_IDLType_var (void) // default constructor
-+  : ptr_ (IR_IDLType::_nil ())
- {}
- 
--ACE_INLINE IR::IDLType_ptr 
--IR::IDLType_var::ptr (void) const
-+ACE_INLINE IR_IDLType_ptr 
-+IR_IDLType_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::IDLType_var::IDLType_var (const IR::IDLType_var &p) // copy constructor
-+IR_IDLType_var::IR_IDLType_var (const IR_IDLType_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (IDLType::_duplicate (p.ptr ()))
-+    ptr_ (IR_IDLType::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::IDLType_var::~IDLType_var (void) // destructor
-+IR_IDLType_var::~IR_IDLType_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::IDLType_var &
--IR::IDLType_var::operator= (IR::IDLType_ptr p)
-+ACE_INLINE IR_IDLType_var &
-+IR_IDLType_var::operator= (IR_IDLType_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::IDLType_var &
--IR::IDLType_var::operator= (const IR::IDLType_var &p)
-+ACE_INLINE IR_IDLType_var &
-+IR_IDLType_var::operator= (const IR_IDLType_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::IDLType::_duplicate (p.ptr ());
-+    this->ptr_ = IR_IDLType::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::IDLType_var::operator const IR::IDLType_ptr &() const // cast
-+IR_IDLType_var::operator const IR_IDLType_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::IDLType_var::operator IR::IDLType_ptr &() // cast 
-+IR_IDLType_var::operator IR_IDLType_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::IDLType_ptr 
--IR::IDLType_var::operator-> (void) const
-+ACE_INLINE IR_IDLType_ptr 
-+IR_IDLType_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::IDLType_ptr
--IR::IDLType_var::in (void) const
-+ACE_INLINE IR_IDLType_ptr
-+IR_IDLType_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::IDLType_ptr &
--IR::IDLType_var::inout (void)
-+ACE_INLINE IR_IDLType_ptr &
-+IR_IDLType_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::IDLType_ptr &
--IR::IDLType_var::out (void)
-+ACE_INLINE IR_IDLType_ptr &
-+IR_IDLType_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::IDLType::_nil ();
-+  this->ptr_ = IR_IDLType::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::IDLType_ptr 
--IR::IDLType_var::_retn (void)
-+ACE_INLINE IR_IDLType_ptr 
-+IR_IDLType_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::IDLType_ptr val = this->ptr_;
--  this->ptr_ = IR::IDLType::_nil ();
-+  IR_IDLType_ptr val = this->ptr_;
-+  this->ptr_ = IR_IDLType::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_IDLTYPE___OUT_CI_)
--#define _IR_IDLTYPE___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::IDLType_out
-+// Inline operations for class IR_IDLType_out
- // *************************************************************
- 
- ACE_INLINE
--IR::IDLType_out::IDLType_out (IR::IDLType_ptr &p)
-+IR_IDLType_out::IR_IDLType_out (IR_IDLType_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::IDLType::_nil ();
-+  this->ptr_ = IR_IDLType::_nil ();
- }
- 
- ACE_INLINE
--IR::IDLType_out::IDLType_out (IR::IDLType_var &p) // constructor from _var
-+IR_IDLType_out::IR_IDLType_out (IR_IDLType_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::IDLType::_nil ();
-+  this->ptr_ = IR_IDLType::_nil ();
- }
- 
- ACE_INLINE
--IR::IDLType_out::IDLType_out (const IR::IDLType_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::IDLType_out&,p).ptr_)
-+IR_IDLType_out::IR_IDLType_out (const IR_IDLType_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_IDLType_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::IDLType_out &
--IR::IDLType_out::operator= (const IR::IDLType_out &p)
-+ACE_INLINE IR_IDLType_out &
-+IR_IDLType_out::operator= (const IR_IDLType_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::IDLType_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_IDLType_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::IDLType_out &
--IR::IDLType_out::operator= (const IR::IDLType_var &p)
-+ACE_INLINE IR_IDLType_out &
-+IR_IDLType_out::operator= (const IR_IDLType_var &p)
- {
--  this->ptr_ = IR::IDLType::_duplicate (p.ptr ());
-+  this->ptr_ = IR_IDLType::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::IDLType_out &
--IR::IDLType_out::operator= (IR::IDLType_ptr p)
-+ACE_INLINE IR_IDLType_out &
-+IR_IDLType_out::operator= (IR_IDLType_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::IDLType_out::operator IR::IDLType_ptr &() // cast
-+IR_IDLType_out::operator IR_IDLType_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::IDLType_ptr &
--IR::IDLType_out::ptr (void) // ptr
-+ACE_INLINE IR_IDLType_ptr &
-+IR_IDLType_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::IDLType_ptr 
--IR::IDLType_out::operator-> (void)
-+ACE_INLINE IR_IDLType_ptr 
-+IR_IDLType_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRUCTDEF___CI_)
--#define _IR_STRUCTDEF___CI_
--
- ACE_INLINE
--IR::StructDef::StructDef (
-+IR_StructDef::IR_StructDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -1542,185 +1392,164 @@
-   this->IR_StructDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRUCTDEF___VAR_CI_)
--#define _IR_STRUCTDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::StructDef_var
-+// Inline operations for class IR_StructDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::StructDef_var::StructDef_var (void) // default constructor
--  : ptr_ (IR::StructDef::_nil ())
-+IR_StructDef_var::IR_StructDef_var (void) // default constructor
-+  : ptr_ (IR_StructDef::_nil ())
- {}
- 
--ACE_INLINE IR::StructDef_ptr 
--IR::StructDef_var::ptr (void) const
-+ACE_INLINE IR_StructDef_ptr 
-+IR_StructDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::StructDef_var::StructDef_var (const IR::StructDef_var &p) // copy constructor
-+IR_StructDef_var::IR_StructDef_var (const IR_StructDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (StructDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_StructDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::StructDef_var::~StructDef_var (void) // destructor
-+IR_StructDef_var::~IR_StructDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::StructDef_var &
--IR::StructDef_var::operator= (IR::StructDef_ptr p)
-+ACE_INLINE IR_StructDef_var &
-+IR_StructDef_var::operator= (IR_StructDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::StructDef_var &
--IR::StructDef_var::operator= (const IR::StructDef_var &p)
-+ACE_INLINE IR_StructDef_var &
-+IR_StructDef_var::operator= (const IR_StructDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::StructDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_StructDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::StructDef_var::operator const IR::StructDef_ptr &() const // cast
-+IR_StructDef_var::operator const IR_StructDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::StructDef_var::operator IR::StructDef_ptr &() // cast 
-+IR_StructDef_var::operator IR_StructDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::StructDef_ptr 
--IR::StructDef_var::operator-> (void) const
-+ACE_INLINE IR_StructDef_ptr 
-+IR_StructDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::StructDef_ptr
--IR::StructDef_var::in (void) const
-+ACE_INLINE IR_StructDef_ptr
-+IR_StructDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::StructDef_ptr &
--IR::StructDef_var::inout (void)
-+ACE_INLINE IR_StructDef_ptr &
-+IR_StructDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::StructDef_ptr &
--IR::StructDef_var::out (void)
-+ACE_INLINE IR_StructDef_ptr &
-+IR_StructDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::StructDef::_nil ();
-+  this->ptr_ = IR_StructDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::StructDef_ptr 
--IR::StructDef_var::_retn (void)
-+ACE_INLINE IR_StructDef_ptr 
-+IR_StructDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::StructDef_ptr val = this->ptr_;
--  this->ptr_ = IR::StructDef::_nil ();
-+  IR_StructDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_StructDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRUCTDEF___OUT_CI_)
--#define _IR_STRUCTDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::StructDef_out
-+// Inline operations for class IR_StructDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::StructDef_out::StructDef_out (IR::StructDef_ptr &p)
-+IR_StructDef_out::IR_StructDef_out (IR_StructDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::StructDef::_nil ();
-+  this->ptr_ = IR_StructDef::_nil ();
- }
- 
- ACE_INLINE
--IR::StructDef_out::StructDef_out (IR::StructDef_var &p) // constructor from _var
-+IR_StructDef_out::IR_StructDef_out (IR_StructDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::StructDef::_nil ();
-+  this->ptr_ = IR_StructDef::_nil ();
- }
- 
- ACE_INLINE
--IR::StructDef_out::StructDef_out (const IR::StructDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::StructDef_out&,p).ptr_)
-+IR_StructDef_out::IR_StructDef_out (const IR_StructDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_StructDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::StructDef_out &
--IR::StructDef_out::operator= (const IR::StructDef_out &p)
-+ACE_INLINE IR_StructDef_out &
-+IR_StructDef_out::operator= (const IR_StructDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::StructDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_StructDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::StructDef_out &
--IR::StructDef_out::operator= (const IR::StructDef_var &p)
-+ACE_INLINE IR_StructDef_out &
-+IR_StructDef_out::operator= (const IR_StructDef_var &p)
- {
--  this->ptr_ = IR::StructDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_StructDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::StructDef_out &
--IR::StructDef_out::operator= (IR::StructDef_ptr p)
-+ACE_INLINE IR_StructDef_out &
-+IR_StructDef_out::operator= (IR_StructDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::StructDef_out::operator IR::StructDef_ptr &() // cast
-+IR_StructDef_out::operator IR_StructDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::StructDef_ptr &
--IR::StructDef_out::ptr (void) // ptr
-+ACE_INLINE IR_StructDef_ptr &
-+IR_StructDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::StructDef_ptr 
--IR::StructDef_out::operator-> (void)
-+ACE_INLINE IR_StructDef_ptr 
-+IR_StructDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_UNIONDEF___CI_)
--#define _IR_UNIONDEF___CI_
--
- ACE_INLINE
--IR::UnionDef::UnionDef (
-+IR_UnionDef::IR_UnionDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -1730,185 +1559,164 @@
-   this->IR_UnionDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_UNIONDEF___VAR_CI_)
--#define _IR_UNIONDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::UnionDef_var
-+// Inline operations for class IR_UnionDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::UnionDef_var::UnionDef_var (void) // default constructor
--  : ptr_ (IR::UnionDef::_nil ())
-+IR_UnionDef_var::IR_UnionDef_var (void) // default constructor
-+  : ptr_ (IR_UnionDef::_nil ())
- {}
- 
--ACE_INLINE IR::UnionDef_ptr 
--IR::UnionDef_var::ptr (void) const
-+ACE_INLINE IR_UnionDef_ptr 
-+IR_UnionDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::UnionDef_var::UnionDef_var (const IR::UnionDef_var &p) // copy constructor
-+IR_UnionDef_var::IR_UnionDef_var (const IR_UnionDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (UnionDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_UnionDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::UnionDef_var::~UnionDef_var (void) // destructor
-+IR_UnionDef_var::~IR_UnionDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::UnionDef_var &
--IR::UnionDef_var::operator= (IR::UnionDef_ptr p)
-+ACE_INLINE IR_UnionDef_var &
-+IR_UnionDef_var::operator= (IR_UnionDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::UnionDef_var &
--IR::UnionDef_var::operator= (const IR::UnionDef_var &p)
-+ACE_INLINE IR_UnionDef_var &
-+IR_UnionDef_var::operator= (const IR_UnionDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::UnionDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_UnionDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::UnionDef_var::operator const IR::UnionDef_ptr &() const // cast
-+IR_UnionDef_var::operator const IR_UnionDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::UnionDef_var::operator IR::UnionDef_ptr &() // cast 
-+IR_UnionDef_var::operator IR_UnionDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UnionDef_ptr 
--IR::UnionDef_var::operator-> (void) const
-+ACE_INLINE IR_UnionDef_ptr 
-+IR_UnionDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UnionDef_ptr
--IR::UnionDef_var::in (void) const
-+ACE_INLINE IR_UnionDef_ptr
-+IR_UnionDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UnionDef_ptr &
--IR::UnionDef_var::inout (void)
-+ACE_INLINE IR_UnionDef_ptr &
-+IR_UnionDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UnionDef_ptr &
--IR::UnionDef_var::out (void)
-+ACE_INLINE IR_UnionDef_ptr &
-+IR_UnionDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::UnionDef::_nil ();
-+  this->ptr_ = IR_UnionDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UnionDef_ptr 
--IR::UnionDef_var::_retn (void)
-+ACE_INLINE IR_UnionDef_ptr 
-+IR_UnionDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::UnionDef_ptr val = this->ptr_;
--  this->ptr_ = IR::UnionDef::_nil ();
-+  IR_UnionDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_UnionDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_UNIONDEF___OUT_CI_)
--#define _IR_UNIONDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::UnionDef_out
-+// Inline operations for class IR_UnionDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::UnionDef_out::UnionDef_out (IR::UnionDef_ptr &p)
-+IR_UnionDef_out::IR_UnionDef_out (IR_UnionDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::UnionDef::_nil ();
-+  this->ptr_ = IR_UnionDef::_nil ();
- }
- 
- ACE_INLINE
--IR::UnionDef_out::UnionDef_out (IR::UnionDef_var &p) // constructor from _var
-+IR_UnionDef_out::IR_UnionDef_out (IR_UnionDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::UnionDef::_nil ();
-+  this->ptr_ = IR_UnionDef::_nil ();
- }
- 
- ACE_INLINE
--IR::UnionDef_out::UnionDef_out (const IR::UnionDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::UnionDef_out&,p).ptr_)
-+IR_UnionDef_out::IR_UnionDef_out (const IR_UnionDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_UnionDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::UnionDef_out &
--IR::UnionDef_out::operator= (const IR::UnionDef_out &p)
-+ACE_INLINE IR_UnionDef_out &
-+IR_UnionDef_out::operator= (const IR_UnionDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::UnionDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_UnionDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::UnionDef_out &
--IR::UnionDef_out::operator= (const IR::UnionDef_var &p)
-+ACE_INLINE IR_UnionDef_out &
-+IR_UnionDef_out::operator= (const IR_UnionDef_var &p)
- {
--  this->ptr_ = IR::UnionDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_UnionDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::UnionDef_out &
--IR::UnionDef_out::operator= (IR::UnionDef_ptr p)
-+ACE_INLINE IR_UnionDef_out &
-+IR_UnionDef_out::operator= (IR_UnionDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::UnionDef_out::operator IR::UnionDef_ptr &() // cast
-+IR_UnionDef_out::operator IR_UnionDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UnionDef_ptr &
--IR::UnionDef_out::ptr (void) // ptr
-+ACE_INLINE IR_UnionDef_ptr &
-+IR_UnionDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UnionDef_ptr 
--IR::UnionDef_out::operator-> (void)
-+ACE_INLINE IR_UnionDef_ptr 
-+IR_UnionDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ENUMDEF___CI_)
--#define _IR_ENUMDEF___CI_
--
- ACE_INLINE
--IR::EnumDef::EnumDef (
-+IR_EnumDef::IR_EnumDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -1918,185 +1726,164 @@
-   this->IR_EnumDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ENUMDEF___VAR_CI_)
--#define _IR_ENUMDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::EnumDef_var
-+// Inline operations for class IR_EnumDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::EnumDef_var::EnumDef_var (void) // default constructor
--  : ptr_ (IR::EnumDef::_nil ())
-+IR_EnumDef_var::IR_EnumDef_var (void) // default constructor
-+  : ptr_ (IR_EnumDef::_nil ())
- {}
- 
--ACE_INLINE IR::EnumDef_ptr 
--IR::EnumDef_var::ptr (void) const
-+ACE_INLINE IR_EnumDef_ptr 
-+IR_EnumDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::EnumDef_var::EnumDef_var (const IR::EnumDef_var &p) // copy constructor
-+IR_EnumDef_var::IR_EnumDef_var (const IR_EnumDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (EnumDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_EnumDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::EnumDef_var::~EnumDef_var (void) // destructor
-+IR_EnumDef_var::~IR_EnumDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::EnumDef_var &
--IR::EnumDef_var::operator= (IR::EnumDef_ptr p)
-+ACE_INLINE IR_EnumDef_var &
-+IR_EnumDef_var::operator= (IR_EnumDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::EnumDef_var &
--IR::EnumDef_var::operator= (const IR::EnumDef_var &p)
-+ACE_INLINE IR_EnumDef_var &
-+IR_EnumDef_var::operator= (const IR_EnumDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::EnumDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_EnumDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::EnumDef_var::operator const IR::EnumDef_ptr &() const // cast
-+IR_EnumDef_var::operator const IR_EnumDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::EnumDef_var::operator IR::EnumDef_ptr &() // cast 
-+IR_EnumDef_var::operator IR_EnumDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EnumDef_ptr 
--IR::EnumDef_var::operator-> (void) const
-+ACE_INLINE IR_EnumDef_ptr 
-+IR_EnumDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EnumDef_ptr
--IR::EnumDef_var::in (void) const
-+ACE_INLINE IR_EnumDef_ptr
-+IR_EnumDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EnumDef_ptr &
--IR::EnumDef_var::inout (void)
-+ACE_INLINE IR_EnumDef_ptr &
-+IR_EnumDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EnumDef_ptr &
--IR::EnumDef_var::out (void)
-+ACE_INLINE IR_EnumDef_ptr &
-+IR_EnumDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::EnumDef::_nil ();
-+  this->ptr_ = IR_EnumDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EnumDef_ptr 
--IR::EnumDef_var::_retn (void)
-+ACE_INLINE IR_EnumDef_ptr 
-+IR_EnumDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::EnumDef_ptr val = this->ptr_;
--  this->ptr_ = IR::EnumDef::_nil ();
-+  IR_EnumDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_EnumDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ENUMDEF___OUT_CI_)
--#define _IR_ENUMDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::EnumDef_out
-+// Inline operations for class IR_EnumDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::EnumDef_out::EnumDef_out (IR::EnumDef_ptr &p)
-+IR_EnumDef_out::IR_EnumDef_out (IR_EnumDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::EnumDef::_nil ();
-+  this->ptr_ = IR_EnumDef::_nil ();
- }
- 
- ACE_INLINE
--IR::EnumDef_out::EnumDef_out (IR::EnumDef_var &p) // constructor from _var
-+IR_EnumDef_out::IR_EnumDef_out (IR_EnumDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::EnumDef::_nil ();
-+  this->ptr_ = IR_EnumDef::_nil ();
- }
- 
- ACE_INLINE
--IR::EnumDef_out::EnumDef_out (const IR::EnumDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::EnumDef_out&,p).ptr_)
-+IR_EnumDef_out::IR_EnumDef_out (const IR_EnumDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_EnumDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::EnumDef_out &
--IR::EnumDef_out::operator= (const IR::EnumDef_out &p)
-+ACE_INLINE IR_EnumDef_out &
-+IR_EnumDef_out::operator= (const IR_EnumDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::EnumDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_EnumDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::EnumDef_out &
--IR::EnumDef_out::operator= (const IR::EnumDef_var &p)
-+ACE_INLINE IR_EnumDef_out &
-+IR_EnumDef_out::operator= (const IR_EnumDef_var &p)
- {
--  this->ptr_ = IR::EnumDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_EnumDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::EnumDef_out &
--IR::EnumDef_out::operator= (IR::EnumDef_ptr p)
-+ACE_INLINE IR_EnumDef_out &
-+IR_EnumDef_out::operator= (IR_EnumDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::EnumDef_out::operator IR::EnumDef_ptr &() // cast
-+IR_EnumDef_out::operator IR_EnumDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EnumDef_ptr &
--IR::EnumDef_out::ptr (void) // ptr
-+ACE_INLINE IR_EnumDef_ptr &
-+IR_EnumDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EnumDef_ptr 
--IR::EnumDef_out::operator-> (void)
-+ACE_INLINE IR_EnumDef_ptr 
-+IR_EnumDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ALIASDEF___CI_)
--#define _IR_ALIASDEF___CI_
--
- ACE_INLINE
--IR::AliasDef::AliasDef (
-+IR_AliasDef::IR_AliasDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -2106,185 +1893,164 @@
-   this->IR_AliasDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ALIASDEF___VAR_CI_)
--#define _IR_ALIASDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::AliasDef_var
-+// Inline operations for class IR_AliasDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::AliasDef_var::AliasDef_var (void) // default constructor
--  : ptr_ (IR::AliasDef::_nil ())
-+IR_AliasDef_var::IR_AliasDef_var (void) // default constructor
-+  : ptr_ (IR_AliasDef::_nil ())
- {}
- 
--ACE_INLINE IR::AliasDef_ptr 
--IR::AliasDef_var::ptr (void) const
-+ACE_INLINE IR_AliasDef_ptr 
-+IR_AliasDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::AliasDef_var::AliasDef_var (const IR::AliasDef_var &p) // copy constructor
-+IR_AliasDef_var::IR_AliasDef_var (const IR_AliasDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (AliasDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_AliasDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::AliasDef_var::~AliasDef_var (void) // destructor
-+IR_AliasDef_var::~IR_AliasDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::AliasDef_var &
--IR::AliasDef_var::operator= (IR::AliasDef_ptr p)
-+ACE_INLINE IR_AliasDef_var &
-+IR_AliasDef_var::operator= (IR_AliasDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::AliasDef_var &
--IR::AliasDef_var::operator= (const IR::AliasDef_var &p)
-+ACE_INLINE IR_AliasDef_var &
-+IR_AliasDef_var::operator= (const IR_AliasDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::AliasDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_AliasDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::AliasDef_var::operator const IR::AliasDef_ptr &() const // cast
-+IR_AliasDef_var::operator const IR_AliasDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::AliasDef_var::operator IR::AliasDef_ptr &() // cast 
-+IR_AliasDef_var::operator IR_AliasDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::AliasDef_ptr 
--IR::AliasDef_var::operator-> (void) const
-+ACE_INLINE IR_AliasDef_ptr 
-+IR_AliasDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::AliasDef_ptr
--IR::AliasDef_var::in (void) const
-+ACE_INLINE IR_AliasDef_ptr
-+IR_AliasDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::AliasDef_ptr &
--IR::AliasDef_var::inout (void)
-+ACE_INLINE IR_AliasDef_ptr &
-+IR_AliasDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::AliasDef_ptr &
--IR::AliasDef_var::out (void)
-+ACE_INLINE IR_AliasDef_ptr &
-+IR_AliasDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::AliasDef::_nil ();
-+  this->ptr_ = IR_AliasDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::AliasDef_ptr 
--IR::AliasDef_var::_retn (void)
-+ACE_INLINE IR_AliasDef_ptr 
-+IR_AliasDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::AliasDef_ptr val = this->ptr_;
--  this->ptr_ = IR::AliasDef::_nil ();
-+  IR_AliasDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_AliasDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ALIASDEF___OUT_CI_)
--#define _IR_ALIASDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::AliasDef_out
-+// Inline operations for class IR_AliasDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::AliasDef_out::AliasDef_out (IR::AliasDef_ptr &p)
-+IR_AliasDef_out::IR_AliasDef_out (IR_AliasDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::AliasDef::_nil ();
-+  this->ptr_ = IR_AliasDef::_nil ();
- }
- 
- ACE_INLINE
--IR::AliasDef_out::AliasDef_out (IR::AliasDef_var &p) // constructor from _var
-+IR_AliasDef_out::IR_AliasDef_out (IR_AliasDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::AliasDef::_nil ();
-+  this->ptr_ = IR_AliasDef::_nil ();
- }
- 
- ACE_INLINE
--IR::AliasDef_out::AliasDef_out (const IR::AliasDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::AliasDef_out&,p).ptr_)
-+IR_AliasDef_out::IR_AliasDef_out (const IR_AliasDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_AliasDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::AliasDef_out &
--IR::AliasDef_out::operator= (const IR::AliasDef_out &p)
-+ACE_INLINE IR_AliasDef_out &
-+IR_AliasDef_out::operator= (const IR_AliasDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::AliasDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_AliasDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::AliasDef_out &
--IR::AliasDef_out::operator= (const IR::AliasDef_var &p)
-+ACE_INLINE IR_AliasDef_out &
-+IR_AliasDef_out::operator= (const IR_AliasDef_var &p)
- {
--  this->ptr_ = IR::AliasDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_AliasDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::AliasDef_out &
--IR::AliasDef_out::operator= (IR::AliasDef_ptr p)
-+ACE_INLINE IR_AliasDef_out &
-+IR_AliasDef_out::operator= (IR_AliasDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::AliasDef_out::operator IR::AliasDef_ptr &() // cast
-+IR_AliasDef_out::operator IR_AliasDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::AliasDef_ptr &
--IR::AliasDef_out::ptr (void) // ptr
-+ACE_INLINE IR_AliasDef_ptr &
-+IR_AliasDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::AliasDef_ptr 
--IR::AliasDef_out::operator-> (void)
-+ACE_INLINE IR_AliasDef_ptr 
-+IR_AliasDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_INTERFACEDEF___CI_)
--#define _IR_INTERFACEDEF___CI_
--
- ACE_INLINE
--IR::InterfaceDef::InterfaceDef (
-+IR_InterfaceDef::IR_InterfaceDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -2294,185 +2060,164 @@
-   this->IR_InterfaceDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_INTERFACEDEF___VAR_CI_)
--#define _IR_INTERFACEDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::InterfaceDef_var
-+// Inline operations for class IR_InterfaceDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::InterfaceDef_var::InterfaceDef_var (void) // default constructor
--  : ptr_ (IR::InterfaceDef::_nil ())
-+IR_InterfaceDef_var::IR_InterfaceDef_var (void) // default constructor
-+  : ptr_ (IR_InterfaceDef::_nil ())
- {}
- 
--ACE_INLINE IR::InterfaceDef_ptr 
--IR::InterfaceDef_var::ptr (void) const
-+ACE_INLINE IR_InterfaceDef_ptr 
-+IR_InterfaceDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::InterfaceDef_var::InterfaceDef_var (const IR::InterfaceDef_var &p) // copy constructor
-+IR_InterfaceDef_var::IR_InterfaceDef_var (const IR_InterfaceDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (InterfaceDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_InterfaceDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::InterfaceDef_var::~InterfaceDef_var (void) // destructor
-+IR_InterfaceDef_var::~IR_InterfaceDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::InterfaceDef_var &
--IR::InterfaceDef_var::operator= (IR::InterfaceDef_ptr p)
-+ACE_INLINE IR_InterfaceDef_var &
-+IR_InterfaceDef_var::operator= (IR_InterfaceDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::InterfaceDef_var &
--IR::InterfaceDef_var::operator= (const IR::InterfaceDef_var &p)
-+ACE_INLINE IR_InterfaceDef_var &
-+IR_InterfaceDef_var::operator= (const IR_InterfaceDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::InterfaceDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_InterfaceDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::InterfaceDef_var::operator const IR::InterfaceDef_ptr &() const // cast
-+IR_InterfaceDef_var::operator const IR_InterfaceDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::InterfaceDef_var::operator IR::InterfaceDef_ptr &() // cast 
-+IR_InterfaceDef_var::operator IR_InterfaceDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::InterfaceDef_ptr 
--IR::InterfaceDef_var::operator-> (void) const
-+ACE_INLINE IR_InterfaceDef_ptr 
-+IR_InterfaceDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::InterfaceDef_ptr
--IR::InterfaceDef_var::in (void) const
-+ACE_INLINE IR_InterfaceDef_ptr
-+IR_InterfaceDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::InterfaceDef_ptr &
--IR::InterfaceDef_var::inout (void)
-+ACE_INLINE IR_InterfaceDef_ptr &
-+IR_InterfaceDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::InterfaceDef_ptr &
--IR::InterfaceDef_var::out (void)
-+ACE_INLINE IR_InterfaceDef_ptr &
-+IR_InterfaceDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::InterfaceDef::_nil ();
-+  this->ptr_ = IR_InterfaceDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::InterfaceDef_ptr 
--IR::InterfaceDef_var::_retn (void)
-+ACE_INLINE IR_InterfaceDef_ptr 
-+IR_InterfaceDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::InterfaceDef_ptr val = this->ptr_;
--  this->ptr_ = IR::InterfaceDef::_nil ();
-+  IR_InterfaceDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_InterfaceDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_INTERFACEDEF___OUT_CI_)
--#define _IR_INTERFACEDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::InterfaceDef_out
-+// Inline operations for class IR_InterfaceDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::InterfaceDef_out::InterfaceDef_out (IR::InterfaceDef_ptr &p)
-+IR_InterfaceDef_out::IR_InterfaceDef_out (IR_InterfaceDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::InterfaceDef::_nil ();
-+  this->ptr_ = IR_InterfaceDef::_nil ();
- }
- 
- ACE_INLINE
--IR::InterfaceDef_out::InterfaceDef_out (IR::InterfaceDef_var &p) // constructor from _var
-+IR_InterfaceDef_out::IR_InterfaceDef_out (IR_InterfaceDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::InterfaceDef::_nil ();
-+  this->ptr_ = IR_InterfaceDef::_nil ();
- }
- 
- ACE_INLINE
--IR::InterfaceDef_out::InterfaceDef_out (const IR::InterfaceDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::InterfaceDef_out&,p).ptr_)
-+IR_InterfaceDef_out::IR_InterfaceDef_out (const IR_InterfaceDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_InterfaceDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::InterfaceDef_out &
--IR::InterfaceDef_out::operator= (const IR::InterfaceDef_out &p)
-+ACE_INLINE IR_InterfaceDef_out &
-+IR_InterfaceDef_out::operator= (const IR_InterfaceDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::InterfaceDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_InterfaceDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::InterfaceDef_out &
--IR::InterfaceDef_out::operator= (const IR::InterfaceDef_var &p)
-+ACE_INLINE IR_InterfaceDef_out &
-+IR_InterfaceDef_out::operator= (const IR_InterfaceDef_var &p)
- {
--  this->ptr_ = IR::InterfaceDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_InterfaceDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::InterfaceDef_out &
--IR::InterfaceDef_out::operator= (IR::InterfaceDef_ptr p)
-+ACE_INLINE IR_InterfaceDef_out &
-+IR_InterfaceDef_out::operator= (IR_InterfaceDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::InterfaceDef_out::operator IR::InterfaceDef_ptr &() // cast
-+IR_InterfaceDef_out::operator IR_InterfaceDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::InterfaceDef_ptr &
--IR::InterfaceDef_out::ptr (void) // ptr
-+ACE_INLINE IR_InterfaceDef_ptr &
-+IR_InterfaceDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::InterfaceDef_ptr 
--IR::InterfaceDef_out::operator-> (void)
-+ACE_INLINE IR_InterfaceDef_ptr 
-+IR_InterfaceDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EXCEPTIONDEF___CI_)
--#define _IR_EXCEPTIONDEF___CI_
--
- ACE_INLINE
--IR::ExceptionDef::ExceptionDef (
-+IR_ExceptionDef::IR_ExceptionDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -2482,185 +2227,164 @@
-   this->IR_ExceptionDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EXCEPTIONDEF___VAR_CI_)
--#define _IR_EXCEPTIONDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::ExceptionDef_var
-+// Inline operations for class IR_ExceptionDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ExceptionDef_var::ExceptionDef_var (void) // default constructor
--  : ptr_ (IR::ExceptionDef::_nil ())
-+IR_ExceptionDef_var::IR_ExceptionDef_var (void) // default constructor
-+  : ptr_ (IR_ExceptionDef::_nil ())
- {}
- 
--ACE_INLINE IR::ExceptionDef_ptr 
--IR::ExceptionDef_var::ptr (void) const
-+ACE_INLINE IR_ExceptionDef_ptr 
-+IR_ExceptionDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ExceptionDef_var::ExceptionDef_var (const IR::ExceptionDef_var &p) // copy constructor
-+IR_ExceptionDef_var::IR_ExceptionDef_var (const IR_ExceptionDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (ExceptionDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_ExceptionDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::ExceptionDef_var::~ExceptionDef_var (void) // destructor
-+IR_ExceptionDef_var::~IR_ExceptionDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::ExceptionDef_var &
--IR::ExceptionDef_var::operator= (IR::ExceptionDef_ptr p)
-+ACE_INLINE IR_ExceptionDef_var &
-+IR_ExceptionDef_var::operator= (IR_ExceptionDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::ExceptionDef_var &
--IR::ExceptionDef_var::operator= (const IR::ExceptionDef_var &p)
-+ACE_INLINE IR_ExceptionDef_var &
-+IR_ExceptionDef_var::operator= (const IR_ExceptionDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::ExceptionDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_ExceptionDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ExceptionDef_var::operator const IR::ExceptionDef_ptr &() const // cast
-+IR_ExceptionDef_var::operator const IR_ExceptionDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ExceptionDef_var::operator IR::ExceptionDef_ptr &() // cast 
-+IR_ExceptionDef_var::operator IR_ExceptionDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ExceptionDef_ptr 
--IR::ExceptionDef_var::operator-> (void) const
-+ACE_INLINE IR_ExceptionDef_ptr 
-+IR_ExceptionDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ExceptionDef_ptr
--IR::ExceptionDef_var::in (void) const
-+ACE_INLINE IR_ExceptionDef_ptr
-+IR_ExceptionDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ExceptionDef_ptr &
--IR::ExceptionDef_var::inout (void)
-+ACE_INLINE IR_ExceptionDef_ptr &
-+IR_ExceptionDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ExceptionDef_ptr &
--IR::ExceptionDef_var::out (void)
-+ACE_INLINE IR_ExceptionDef_ptr &
-+IR_ExceptionDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ExceptionDef::_nil ();
-+  this->ptr_ = IR_ExceptionDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ExceptionDef_ptr 
--IR::ExceptionDef_var::_retn (void)
-+ACE_INLINE IR_ExceptionDef_ptr 
-+IR_ExceptionDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::ExceptionDef_ptr val = this->ptr_;
--  this->ptr_ = IR::ExceptionDef::_nil ();
-+  IR_ExceptionDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_ExceptionDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EXCEPTIONDEF___OUT_CI_)
--#define _IR_EXCEPTIONDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::ExceptionDef_out
-+// Inline operations for class IR_ExceptionDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ExceptionDef_out::ExceptionDef_out (IR::ExceptionDef_ptr &p)
-+IR_ExceptionDef_out::IR_ExceptionDef_out (IR_ExceptionDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::ExceptionDef::_nil ();
-+  this->ptr_ = IR_ExceptionDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ExceptionDef_out::ExceptionDef_out (IR::ExceptionDef_var &p) // constructor from _var
-+IR_ExceptionDef_out::IR_ExceptionDef_out (IR_ExceptionDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ExceptionDef::_nil ();
-+  this->ptr_ = IR_ExceptionDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ExceptionDef_out::ExceptionDef_out (const IR::ExceptionDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::ExceptionDef_out&,p).ptr_)
-+IR_ExceptionDef_out::IR_ExceptionDef_out (const IR_ExceptionDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ExceptionDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::ExceptionDef_out &
--IR::ExceptionDef_out::operator= (const IR::ExceptionDef_out &p)
-+ACE_INLINE IR_ExceptionDef_out &
-+IR_ExceptionDef_out::operator= (const IR_ExceptionDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::ExceptionDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ExceptionDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ExceptionDef_out &
--IR::ExceptionDef_out::operator= (const IR::ExceptionDef_var &p)
-+ACE_INLINE IR_ExceptionDef_out &
-+IR_ExceptionDef_out::operator= (const IR_ExceptionDef_var &p)
- {
--  this->ptr_ = IR::ExceptionDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_ExceptionDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::ExceptionDef_out &
--IR::ExceptionDef_out::operator= (IR::ExceptionDef_ptr p)
-+ACE_INLINE IR_ExceptionDef_out &
-+IR_ExceptionDef_out::operator= (IR_ExceptionDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ExceptionDef_out::operator IR::ExceptionDef_ptr &() // cast
-+IR_ExceptionDef_out::operator IR_ExceptionDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ExceptionDef_ptr &
--IR::ExceptionDef_out::ptr (void) // ptr
-+ACE_INLINE IR_ExceptionDef_ptr &
-+IR_ExceptionDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ExceptionDef_ptr 
--IR::ExceptionDef_out::operator-> (void)
-+ACE_INLINE IR_ExceptionDef_ptr 
-+IR_ExceptionDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_NATIVEDEF___CI_)
--#define _IR_NATIVEDEF___CI_
--
- ACE_INLINE
--IR::NativeDef::NativeDef (
-+IR_NativeDef::IR_NativeDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -2670,200 +2394,179 @@
-   this->IR_NativeDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_NATIVEDEF___VAR_CI_)
--#define _IR_NATIVEDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::NativeDef_var
-+// Inline operations for class IR_NativeDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::NativeDef_var::NativeDef_var (void) // default constructor
--  : ptr_ (IR::NativeDef::_nil ())
-+IR_NativeDef_var::IR_NativeDef_var (void) // default constructor
-+  : ptr_ (IR_NativeDef::_nil ())
- {}
- 
--ACE_INLINE IR::NativeDef_ptr 
--IR::NativeDef_var::ptr (void) const
-+ACE_INLINE IR_NativeDef_ptr 
-+IR_NativeDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::NativeDef_var::NativeDef_var (const IR::NativeDef_var &p) // copy constructor
-+IR_NativeDef_var::IR_NativeDef_var (const IR_NativeDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (NativeDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_NativeDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::NativeDef_var::~NativeDef_var (void) // destructor
-+IR_NativeDef_var::~IR_NativeDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::NativeDef_var &
--IR::NativeDef_var::operator= (IR::NativeDef_ptr p)
-+ACE_INLINE IR_NativeDef_var &
-+IR_NativeDef_var::operator= (IR_NativeDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::NativeDef_var &
--IR::NativeDef_var::operator= (const IR::NativeDef_var &p)
-+ACE_INLINE IR_NativeDef_var &
-+IR_NativeDef_var::operator= (const IR_NativeDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::NativeDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_NativeDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::NativeDef_var::operator const IR::NativeDef_ptr &() const // cast
-+IR_NativeDef_var::operator const IR_NativeDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::NativeDef_var::operator IR::NativeDef_ptr &() // cast 
-+IR_NativeDef_var::operator IR_NativeDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::NativeDef_ptr 
--IR::NativeDef_var::operator-> (void) const
-+ACE_INLINE IR_NativeDef_ptr 
-+IR_NativeDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::NativeDef_ptr
--IR::NativeDef_var::in (void) const
-+ACE_INLINE IR_NativeDef_ptr
-+IR_NativeDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::NativeDef_ptr &
--IR::NativeDef_var::inout (void)
-+ACE_INLINE IR_NativeDef_ptr &
-+IR_NativeDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::NativeDef_ptr &
--IR::NativeDef_var::out (void)
-+ACE_INLINE IR_NativeDef_ptr &
-+IR_NativeDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::NativeDef::_nil ();
-+  this->ptr_ = IR_NativeDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::NativeDef_ptr 
--IR::NativeDef_var::_retn (void)
-+ACE_INLINE IR_NativeDef_ptr 
-+IR_NativeDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::NativeDef_ptr val = this->ptr_;
--  this->ptr_ = IR::NativeDef::_nil ();
-+  IR_NativeDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_NativeDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_NATIVEDEF___OUT_CI_)
--#define _IR_NATIVEDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::NativeDef_out
-+// Inline operations for class IR_NativeDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::NativeDef_out::NativeDef_out (IR::NativeDef_ptr &p)
-+IR_NativeDef_out::IR_NativeDef_out (IR_NativeDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::NativeDef::_nil ();
-+  this->ptr_ = IR_NativeDef::_nil ();
- }
- 
- ACE_INLINE
--IR::NativeDef_out::NativeDef_out (IR::NativeDef_var &p) // constructor from _var
-+IR_NativeDef_out::IR_NativeDef_out (IR_NativeDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::NativeDef::_nil ();
-+  this->ptr_ = IR_NativeDef::_nil ();
- }
- 
- ACE_INLINE
--IR::NativeDef_out::NativeDef_out (const IR::NativeDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::NativeDef_out&,p).ptr_)
-+IR_NativeDef_out::IR_NativeDef_out (const IR_NativeDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_NativeDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::NativeDef_out &
--IR::NativeDef_out::operator= (const IR::NativeDef_out &p)
-+ACE_INLINE IR_NativeDef_out &
-+IR_NativeDef_out::operator= (const IR_NativeDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::NativeDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_NativeDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::NativeDef_out &
--IR::NativeDef_out::operator= (const IR::NativeDef_var &p)
-+ACE_INLINE IR_NativeDef_out &
-+IR_NativeDef_out::operator= (const IR_NativeDef_var &p)
- {
--  this->ptr_ = IR::NativeDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_NativeDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::NativeDef_out &
--IR::NativeDef_out::operator= (IR::NativeDef_ptr p)
-+ACE_INLINE IR_NativeDef_out &
-+IR_NativeDef_out::operator= (IR_NativeDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::NativeDef_out::operator IR::NativeDef_ptr &() // cast
-+IR_NativeDef_out::operator IR_NativeDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::NativeDef_ptr &
--IR::NativeDef_out::ptr (void) // ptr
-+ACE_INLINE IR_NativeDef_ptr &
-+IR_NativeDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::NativeDef_ptr 
--IR::NativeDef_out::operator-> (void)
-+ACE_INLINE IR_NativeDef_ptr 
-+IR_NativeDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CI_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CI_
--
--  ACE_INLINE IR::InterfaceDef **
--  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (CORBA::ULong nelems)
-+  ACE_INLINE IR_InterfaceDef **
-+  _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (CORBA::ULong nelems)
-   {
--    IR::InterfaceDef **buf = 0;
-+    IR_InterfaceDef **buf = 0;
-     
--    ACE_NEW_RETURN (buf, IR::InterfaceDef*[nelems], 0);
-+    ACE_NEW_RETURN (buf, IR_InterfaceDef*[nelems], 0);
-     
-     for (CORBA::ULong i = 0; i < nelems; i++)
--      buf[i] = IR::InterfaceDef::_nil ();
-+      buf[i] = IR_InterfaceDef::_nil ();
-     
-     return buf;
-   }
-   
-   ACE_INLINE void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::freebuf (IR::InterfaceDef **buffer)
-+  _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::freebuf (IR_InterfaceDef **buffer)
-   {
-     if (buffer == 0)
-       return;
-@@ -2871,36 +2574,36 @@
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (void)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum)
-+  _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum)
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::InterfaceDef* *value,
-+    IR_InterfaceDef* *value,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs)
-+  _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs)
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::InterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (this->maximum_);
--      IR::InterfaceDef ** const tmp2 = ACE_reinterpret_cast (IR::InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-+      IR_InterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (this->maximum_);
-+      IR_InterfaceDef ** const tmp2 = ACE_reinterpret_cast (IR_InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--        tmp1[i] = IR::InterfaceDef::_duplicate (tmp2[i]);
-+        tmp1[i] = IR_InterfaceDef::_duplicate (tmp2[i]);
-       
-       this->buffer_ = tmp1;
-     }
-@@ -2910,20 +2613,20 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &
--  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &
-+  _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs)
-   {
-     if (this == &rhs)
-       return *this;
-     
-     if (this->release_)
-     {
--      IR::InterfaceDef **tmp = ACE_reinterpret_cast (IR::InterfaceDef **, this->buffer_);
-+      IR_InterfaceDef **tmp = ACE_reinterpret_cast (IR_InterfaceDef **, this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-       {
-         CORBA::release (tmp[i]);
--        tmp[i] = IR::InterfaceDef::_nil ();
-+        tmp[i] = IR_InterfaceDef::_nil ();
-       }
-       if (this->maximum_ < rhs.maximum_)
-       {
-@@ -2936,28 +2639,28 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::InterfaceDef **tmp1 = ACE_reinterpret_cast (IR::InterfaceDef **, this->buffer_);
--    IR::InterfaceDef ** const tmp2 = ACE_reinterpret_cast (IR::InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-+    IR_InterfaceDef **tmp1 = ACE_reinterpret_cast (IR_InterfaceDef **, this->buffer_);
-+    IR_InterfaceDef ** const tmp2 = ACE_reinterpret_cast (IR_InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--      tmp1[i] = IR::InterfaceDef::_duplicate (tmp2[i]);
-+      tmp1[i] = IR_InterfaceDef::_duplicate (tmp2[i]);
-     
-     return *this;
-   }
-   
--  ACE_INLINE TAO_Object_Manager<IR::InterfaceDef,IR::InterfaceDef_var>
--  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::operator[] (CORBA::ULong index) const
-+  ACE_INLINE TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var>
-+  _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::operator[] (CORBA::ULong index) const
-   // read-write accessor
-   {
-     ACE_ASSERT (index < this->maximum_);
--    IR::InterfaceDef ** const tmp = ACE_reinterpret_cast (IR::InterfaceDef ** ACE_CAST_CONST, this->buffer_);
--    return TAO_Object_Manager<IR::InterfaceDef,IR::InterfaceDef_var> (tmp + index, this->release_);
-+    IR_InterfaceDef ** const tmp = ACE_reinterpret_cast (IR_InterfaceDef ** ACE_CAST_CONST, this->buffer_);
-+    return TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var> (tmp + index, this->release_);
-   }
-   
--  ACE_INLINE IR::InterfaceDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_InterfaceDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::InterfaceDef **result = 0;
-+    IR_InterfaceDef **result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -2969,7 +2672,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::InterfaceDef**, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_InterfaceDef**, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -2978,7 +2681,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::InterfaceDef**,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_InterfaceDef**,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -2988,60 +2691,53 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::InterfaceDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::get_buffer (void) const
-+  ACE_INLINE const IR_InterfaceDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::InterfaceDef ** ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_InterfaceDef ** ACE_CAST_CONST, this->buffer_);
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_INTERFACEDEFSEQ_CI_)
--#define _IR_INTERFACEDEFSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::InterfaceDefSeq_var
-+// Inline operations for class IR_InterfaceDefSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::InterfaceDefSeq_var::InterfaceDefSeq_var (void) // default constructor
-+IR_InterfaceDefSeq_var::IR_InterfaceDefSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::InterfaceDefSeq_var::InterfaceDefSeq_var (InterfaceDefSeq *p)
-+IR_InterfaceDefSeq_var::IR_InterfaceDefSeq_var (IR_InterfaceDefSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::InterfaceDefSeq_var::InterfaceDefSeq_var (const ::IR::InterfaceDefSeq_var &p) // copy constructor
-+IR_InterfaceDefSeq_var::IR_InterfaceDefSeq_var (const ::IR_InterfaceDefSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::InterfaceDefSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_InterfaceDefSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::InterfaceDefSeq_var::~InterfaceDefSeq_var (void) // destructor
-+IR_InterfaceDefSeq_var::~IR_InterfaceDefSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::InterfaceDefSeq_var &
--IR::InterfaceDefSeq_var::operator= (InterfaceDefSeq *p)
-+ACE_INLINE IR_InterfaceDefSeq_var &
-+IR_InterfaceDefSeq_var::operator= (IR_InterfaceDefSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::InterfaceDefSeq_var &
--IR::InterfaceDefSeq_var::operator= (const ::IR::InterfaceDefSeq_var &p)
-+ACE_INLINE IR_InterfaceDefSeq_var &
-+IR_InterfaceDefSeq_var::operator= (const ::IR_InterfaceDefSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -3052,12 +2748,12 @@
-         }
-       else
-         {
--          InterfaceDefSeq *deep_copy =
--            new InterfaceDefSeq (*p.ptr_);
-+          IR_InterfaceDefSeq *deep_copy = 
-+            new IR_InterfaceDefSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              InterfaceDefSeq *tmp = deep_copy;
-+              IR_InterfaceDefSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -3068,97 +2764,97 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::InterfaceDefSeq *
--IR::InterfaceDefSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_InterfaceDefSeq *
-+IR_InterfaceDefSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::InterfaceDefSeq *
--IR::InterfaceDefSeq_var::operator-> (void)
-+ACE_INLINE ::IR_InterfaceDefSeq *
-+IR_InterfaceDefSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::InterfaceDefSeq_var::operator const ::IR::InterfaceDefSeq &() const // cast
-+IR_InterfaceDefSeq_var::operator const ::IR_InterfaceDefSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::InterfaceDefSeq_var::operator ::IR::InterfaceDefSeq &() // cast 
-+IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::InterfaceDefSeq_var::operator ::IR::InterfaceDefSeq &() const // cast 
-+IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::InterfaceDefSeq_var::operator ::IR::InterfaceDefSeq *&() // cast 
-+IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::InterfaceDef, IR::InterfaceDef_var>
--IR::InterfaceDefSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_InterfaceDef, IR_InterfaceDef_var>
-+IR_InterfaceDefSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::IR::InterfaceDefSeq &
--IR::InterfaceDefSeq_var::in (void) const
-+ACE_INLINE const ::IR_InterfaceDefSeq &
-+IR_InterfaceDefSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::InterfaceDefSeq &
--IR::InterfaceDefSeq_var::inout (void)
-+ACE_INLINE ::IR_InterfaceDefSeq &
-+IR_InterfaceDefSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::InterfaceDefSeq *&
--IR::InterfaceDefSeq_var::out (void)
-+ACE_INLINE ::IR_InterfaceDefSeq *&
-+IR_InterfaceDefSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::InterfaceDefSeq *
--IR::InterfaceDefSeq_var::_retn (void)
-+ACE_INLINE ::IR_InterfaceDefSeq *
-+IR_InterfaceDefSeq_var::_retn (void)
- {
--  ::IR::InterfaceDefSeq *tmp = this->ptr_;
-+  ::IR_InterfaceDefSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::InterfaceDefSeq *
--IR::InterfaceDefSeq_var::ptr (void) const
-+ACE_INLINE ::IR_InterfaceDefSeq *
-+IR_InterfaceDefSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::InterfaceDefSeq_out
-+// Inline operations for class IR_InterfaceDefSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::InterfaceDefSeq_out::InterfaceDefSeq_out (InterfaceDefSeq *&p)
-+IR_InterfaceDefSeq_out::IR_InterfaceDefSeq_out (IR_InterfaceDefSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::InterfaceDefSeq_out::InterfaceDefSeq_out (InterfaceDefSeq_var &p) // constructor from _var
-+IR_InterfaceDefSeq_out::IR_InterfaceDefSeq_out (IR_InterfaceDefSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -3166,57 +2862,50 @@
- }
- 
- ACE_INLINE
--IR::InterfaceDefSeq_out::InterfaceDefSeq_out (const ::IR::InterfaceDefSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (InterfaceDefSeq_out&, p).ptr_)
-+IR_InterfaceDefSeq_out::IR_InterfaceDefSeq_out (const ::IR_InterfaceDefSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_InterfaceDefSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::InterfaceDefSeq_out &
--IR::InterfaceDefSeq_out::operator= (const ::IR::InterfaceDefSeq_out &p)
-+ACE_INLINE ::IR_InterfaceDefSeq_out &
-+IR_InterfaceDefSeq_out::operator= (const ::IR_InterfaceDefSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (InterfaceDefSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_InterfaceDefSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::InterfaceDefSeq_out &
--IR::InterfaceDefSeq_out::operator= (InterfaceDefSeq *p)
-+ACE_INLINE ::IR_InterfaceDefSeq_out &
-+IR_InterfaceDefSeq_out::operator= (IR_InterfaceDefSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::InterfaceDefSeq_out::operator ::IR::InterfaceDefSeq *&() // cast
-+IR_InterfaceDefSeq_out::operator ::IR_InterfaceDefSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::InterfaceDefSeq *&
--IR::InterfaceDefSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_InterfaceDefSeq *&
-+IR_InterfaceDefSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::InterfaceDefSeq *
--IR::InterfaceDefSeq_out::operator-> (void)
-+ACE_INLINE ::IR_InterfaceDefSeq *
-+IR_InterfaceDefSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::InterfaceDef, IR::InterfaceDef_var>
--IR::InterfaceDefSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_InterfaceDef, IR_InterfaceDef_var>
-+IR_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEDEF___CI_)
--#define _IR_VALUEDEF___CI_
--
- ACE_INLINE
--IR::ValueDef::ValueDef (
-+IR_ValueDef::IR_ValueDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -3226,200 +2915,179 @@
-   this->IR_ValueDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEDEF___VAR_CI_)
--#define _IR_VALUEDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::ValueDef_var
-+// Inline operations for class IR_ValueDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ValueDef_var::ValueDef_var (void) // default constructor
--  : ptr_ (IR::ValueDef::_nil ())
-+IR_ValueDef_var::IR_ValueDef_var (void) // default constructor
-+  : ptr_ (IR_ValueDef::_nil ())
- {}
- 
--ACE_INLINE IR::ValueDef_ptr 
--IR::ValueDef_var::ptr (void) const
-+ACE_INLINE IR_ValueDef_ptr 
-+IR_ValueDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ValueDef_var::ValueDef_var (const IR::ValueDef_var &p) // copy constructor
-+IR_ValueDef_var::IR_ValueDef_var (const IR_ValueDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (ValueDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_ValueDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::ValueDef_var::~ValueDef_var (void) // destructor
-+IR_ValueDef_var::~IR_ValueDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::ValueDef_var &
--IR::ValueDef_var::operator= (IR::ValueDef_ptr p)
-+ACE_INLINE IR_ValueDef_var &
-+IR_ValueDef_var::operator= (IR_ValueDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::ValueDef_var &
--IR::ValueDef_var::operator= (const IR::ValueDef_var &p)
-+ACE_INLINE IR_ValueDef_var &
-+IR_ValueDef_var::operator= (const IR_ValueDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::ValueDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_ValueDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ValueDef_var::operator const IR::ValueDef_ptr &() const // cast
-+IR_ValueDef_var::operator const IR_ValueDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ValueDef_var::operator IR::ValueDef_ptr &() // cast 
-+IR_ValueDef_var::operator IR_ValueDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ValueDef_ptr 
--IR::ValueDef_var::operator-> (void) const
-+ACE_INLINE IR_ValueDef_ptr 
-+IR_ValueDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ValueDef_ptr
--IR::ValueDef_var::in (void) const
-+ACE_INLINE IR_ValueDef_ptr
-+IR_ValueDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ValueDef_ptr &
--IR::ValueDef_var::inout (void)
-+ACE_INLINE IR_ValueDef_ptr &
-+IR_ValueDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ValueDef_ptr &
--IR::ValueDef_var::out (void)
-+ACE_INLINE IR_ValueDef_ptr &
-+IR_ValueDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ValueDef::_nil ();
-+  this->ptr_ = IR_ValueDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ValueDef_ptr 
--IR::ValueDef_var::_retn (void)
-+ACE_INLINE IR_ValueDef_ptr 
-+IR_ValueDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::ValueDef_ptr val = this->ptr_;
--  this->ptr_ = IR::ValueDef::_nil ();
-+  IR_ValueDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_ValueDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEDEF___OUT_CI_)
--#define _IR_VALUEDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::ValueDef_out
-+// Inline operations for class IR_ValueDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ValueDef_out::ValueDef_out (IR::ValueDef_ptr &p)
-+IR_ValueDef_out::IR_ValueDef_out (IR_ValueDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::ValueDef::_nil ();
-+  this->ptr_ = IR_ValueDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ValueDef_out::ValueDef_out (IR::ValueDef_var &p) // constructor from _var
-+IR_ValueDef_out::IR_ValueDef_out (IR_ValueDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ValueDef::_nil ();
-+  this->ptr_ = IR_ValueDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ValueDef_out::ValueDef_out (const IR::ValueDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::ValueDef_out&,p).ptr_)
-+IR_ValueDef_out::IR_ValueDef_out (const IR_ValueDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ValueDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::ValueDef_out &
--IR::ValueDef_out::operator= (const IR::ValueDef_out &p)
-+ACE_INLINE IR_ValueDef_out &
-+IR_ValueDef_out::operator= (const IR_ValueDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::ValueDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ValueDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ValueDef_out &
--IR::ValueDef_out::operator= (const IR::ValueDef_var &p)
-+ACE_INLINE IR_ValueDef_out &
-+IR_ValueDef_out::operator= (const IR_ValueDef_var &p)
- {
--  this->ptr_ = IR::ValueDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_ValueDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::ValueDef_out &
--IR::ValueDef_out::operator= (IR::ValueDef_ptr p)
-+ACE_INLINE IR_ValueDef_out &
-+IR_ValueDef_out::operator= (IR_ValueDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ValueDef_out::operator IR::ValueDef_ptr &() // cast
-+IR_ValueDef_out::operator IR_ValueDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ValueDef_ptr &
--IR::ValueDef_out::ptr (void) // ptr
-+ACE_INLINE IR_ValueDef_ptr &
-+IR_ValueDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ValueDef_ptr 
--IR::ValueDef_out::operator-> (void)
-+ACE_INLINE IR_ValueDef_ptr 
-+IR_ValueDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CI_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CI_
--
--  ACE_INLINE IR::ValueDef **
--  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (CORBA::ULong nelems)
-+  ACE_INLINE IR_ValueDef **
-+  _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (CORBA::ULong nelems)
-   {
--    IR::ValueDef **buf = 0;
-+    IR_ValueDef **buf = 0;
-     
--    ACE_NEW_RETURN (buf, IR::ValueDef*[nelems], 0);
-+    ACE_NEW_RETURN (buf, IR_ValueDef*[nelems], 0);
-     
-     for (CORBA::ULong i = 0; i < nelems; i++)
--      buf[i] = IR::ValueDef::_nil ();
-+      buf[i] = IR_ValueDef::_nil ();
-     
-     return buf;
-   }
-   
-   ACE_INLINE void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::freebuf (IR::ValueDef **buffer)
-+  _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::freebuf (IR_ValueDef **buffer)
-   {
-     if (buffer == 0)
-       return;
-@@ -3427,36 +3095,36 @@
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (void)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum)
-+  _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum)
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::ValueDef* *value,
-+    IR_ValueDef* *value,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs)
-+  _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs)
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::ValueDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (this->maximum_);
--      IR::ValueDef ** const tmp2 = ACE_reinterpret_cast (IR::ValueDef ** ACE_CAST_CONST, rhs.buffer_);
-+      IR_ValueDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (this->maximum_);
-+      IR_ValueDef ** const tmp2 = ACE_reinterpret_cast (IR_ValueDef ** ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--        tmp1[i] = IR::ValueDef::_duplicate (tmp2[i]);
-+        tmp1[i] = IR_ValueDef::_duplicate (tmp2[i]);
-       
-       this->buffer_ = tmp1;
-     }
-@@ -3466,20 +3134,20 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &
--  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &
-+  _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs)
-   {
-     if (this == &rhs)
-       return *this;
-     
-     if (this->release_)
-     {
--      IR::ValueDef **tmp = ACE_reinterpret_cast (IR::ValueDef **, this->buffer_);
-+      IR_ValueDef **tmp = ACE_reinterpret_cast (IR_ValueDef **, this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-       {
-         CORBA::release (tmp[i]);
--        tmp[i] = IR::ValueDef::_nil ();
-+        tmp[i] = IR_ValueDef::_nil ();
-       }
-       if (this->maximum_ < rhs.maximum_)
-       {
-@@ -3492,28 +3160,28 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::ValueDef **tmp1 = ACE_reinterpret_cast (IR::ValueDef **, this->buffer_);
--    IR::ValueDef ** const tmp2 = ACE_reinterpret_cast (IR::ValueDef ** ACE_CAST_CONST, rhs.buffer_);
-+    IR_ValueDef **tmp1 = ACE_reinterpret_cast (IR_ValueDef **, this->buffer_);
-+    IR_ValueDef ** const tmp2 = ACE_reinterpret_cast (IR_ValueDef ** ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--      tmp1[i] = IR::ValueDef::_duplicate (tmp2[i]);
-+      tmp1[i] = IR_ValueDef::_duplicate (tmp2[i]);
-     
-     return *this;
-   }
-   
--  ACE_INLINE TAO_Object_Manager<IR::ValueDef,IR::ValueDef_var>
--  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::operator[] (CORBA::ULong index) const
-+  ACE_INLINE TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var>
-+  _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::operator[] (CORBA::ULong index) const
-   // read-write accessor
-   {
-     ACE_ASSERT (index < this->maximum_);
--    IR::ValueDef ** const tmp = ACE_reinterpret_cast (IR::ValueDef ** ACE_CAST_CONST, this->buffer_);
--    return TAO_Object_Manager<IR::ValueDef,IR::ValueDef_var> (tmp + index, this->release_);
-+    IR_ValueDef ** const tmp = ACE_reinterpret_cast (IR_ValueDef ** ACE_CAST_CONST, this->buffer_);
-+    return TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var> (tmp + index, this->release_);
-   }
-   
--  ACE_INLINE IR::ValueDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_ValueDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::ValueDef **result = 0;
-+    IR_ValueDef **result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -3525,7 +3193,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::ValueDef**, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_ValueDef**, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -3534,7 +3202,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::ValueDef**,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_ValueDef**,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -3544,60 +3212,53 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::ValueDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::get_buffer (void) const
-+  ACE_INLINE const IR_ValueDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::ValueDef ** ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_ValueDef ** ACE_CAST_CONST, this->buffer_);
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_VALUEDEFSEQ_CI_)
--#define _IR_VALUEDEFSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::ValueDefSeq_var
-+// Inline operations for class IR_ValueDefSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ValueDefSeq_var::ValueDefSeq_var (void) // default constructor
-+IR_ValueDefSeq_var::IR_ValueDefSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ValueDefSeq_var::ValueDefSeq_var (ValueDefSeq *p)
-+IR_ValueDefSeq_var::IR_ValueDefSeq_var (IR_ValueDefSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ValueDefSeq_var::ValueDefSeq_var (const ::IR::ValueDefSeq_var &p) // copy constructor
-+IR_ValueDefSeq_var::IR_ValueDefSeq_var (const ::IR_ValueDefSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ValueDefSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ValueDefSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ValueDefSeq_var::~ValueDefSeq_var (void) // destructor
-+IR_ValueDefSeq_var::~IR_ValueDefSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ValueDefSeq_var &
--IR::ValueDefSeq_var::operator= (ValueDefSeq *p)
-+ACE_INLINE IR_ValueDefSeq_var &
-+IR_ValueDefSeq_var::operator= (IR_ValueDefSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ValueDefSeq_var &
--IR::ValueDefSeq_var::operator= (const ::IR::ValueDefSeq_var &p)
-+ACE_INLINE IR_ValueDefSeq_var &
-+IR_ValueDefSeq_var::operator= (const ::IR_ValueDefSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -3608,12 +3269,12 @@
-         }
-       else
-         {
--          ValueDefSeq *deep_copy =
--            new ValueDefSeq (*p.ptr_);
-+          IR_ValueDefSeq *deep_copy = 
-+            new IR_ValueDefSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ValueDefSeq *tmp = deep_copy;
-+              IR_ValueDefSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -3624,97 +3285,97 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ValueDefSeq *
--IR::ValueDefSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_ValueDefSeq *
-+IR_ValueDefSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueDefSeq *
--IR::ValueDefSeq_var::operator-> (void)
-+ACE_INLINE ::IR_ValueDefSeq *
-+IR_ValueDefSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ValueDefSeq_var::operator const ::IR::ValueDefSeq &() const // cast
-+IR_ValueDefSeq_var::operator const ::IR_ValueDefSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ValueDefSeq_var::operator ::IR::ValueDefSeq &() // cast 
-+IR_ValueDefSeq_var::operator ::IR_ValueDefSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ValueDefSeq_var::operator ::IR::ValueDefSeq &() const // cast 
-+IR_ValueDefSeq_var::operator ::IR_ValueDefSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ValueDefSeq_var::operator ::IR::ValueDefSeq *&() // cast 
-+IR_ValueDefSeq_var::operator ::IR_ValueDefSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::ValueDef, IR::ValueDef_var>
--IR::ValueDefSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_ValueDef, IR_ValueDef_var>
-+IR_ValueDefSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::IR::ValueDefSeq &
--IR::ValueDefSeq_var::in (void) const
-+ACE_INLINE const ::IR_ValueDefSeq &
-+IR_ValueDefSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueDefSeq &
--IR::ValueDefSeq_var::inout (void)
-+ACE_INLINE ::IR_ValueDefSeq &
-+IR_ValueDefSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ValueDefSeq *&
--IR::ValueDefSeq_var::out (void)
-+ACE_INLINE ::IR_ValueDefSeq *&
-+IR_ValueDefSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueDefSeq *
--IR::ValueDefSeq_var::_retn (void)
-+ACE_INLINE ::IR_ValueDefSeq *
-+IR_ValueDefSeq_var::_retn (void)
- {
--  ::IR::ValueDefSeq *tmp = this->ptr_;
-+  ::IR_ValueDefSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ValueDefSeq *
--IR::ValueDefSeq_var::ptr (void) const
-+ACE_INLINE ::IR_ValueDefSeq *
-+IR_ValueDefSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ValueDefSeq_out
-+// Inline operations for class IR_ValueDefSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ValueDefSeq_out::ValueDefSeq_out (ValueDefSeq *&p)
-+IR_ValueDefSeq_out::IR_ValueDefSeq_out (IR_ValueDefSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ValueDefSeq_out::ValueDefSeq_out (ValueDefSeq_var &p) // constructor from _var
-+IR_ValueDefSeq_out::IR_ValueDefSeq_out (IR_ValueDefSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -3722,57 +3383,50 @@
- }
- 
- ACE_INLINE
--IR::ValueDefSeq_out::ValueDefSeq_out (const ::IR::ValueDefSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ValueDefSeq_out&, p).ptr_)
-+IR_ValueDefSeq_out::IR_ValueDefSeq_out (const ::IR_ValueDefSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ValueDefSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::ValueDefSeq_out &
--IR::ValueDefSeq_out::operator= (const ::IR::ValueDefSeq_out &p)
-+ACE_INLINE ::IR_ValueDefSeq_out &
-+IR_ValueDefSeq_out::operator= (const ::IR_ValueDefSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (ValueDefSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ValueDefSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ValueDefSeq_out &
--IR::ValueDefSeq_out::operator= (ValueDefSeq *p)
-+ACE_INLINE ::IR_ValueDefSeq_out &
-+IR_ValueDefSeq_out::operator= (IR_ValueDefSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ValueDefSeq_out::operator ::IR::ValueDefSeq *&() // cast
-+IR_ValueDefSeq_out::operator ::IR_ValueDefSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueDefSeq *&
--IR::ValueDefSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ValueDefSeq *&
-+IR_ValueDefSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueDefSeq *
--IR::ValueDefSeq_out::operator-> (void)
-+ACE_INLINE ::IR_ValueDefSeq *
-+IR_ValueDefSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::ValueDef, IR::ValueDef_var>
--IR::ValueDefSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_ValueDef, IR_ValueDef_var>
-+IR_ValueDefSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEBOXDEF___CI_)
--#define _IR_VALUEBOXDEF___CI_
--
- ACE_INLINE
--IR::ValueBoxDef::ValueBoxDef (
-+IR_ValueBoxDef::IR_ValueBoxDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -3782,185 +3436,164 @@
-   this->IR_ValueBoxDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEBOXDEF___VAR_CI_)
--#define _IR_VALUEBOXDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::ValueBoxDef_var
-+// Inline operations for class IR_ValueBoxDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ValueBoxDef_var::ValueBoxDef_var (void) // default constructor
--  : ptr_ (IR::ValueBoxDef::_nil ())
-+IR_ValueBoxDef_var::IR_ValueBoxDef_var (void) // default constructor
-+  : ptr_ (IR_ValueBoxDef::_nil ())
- {}
- 
--ACE_INLINE IR::ValueBoxDef_ptr 
--IR::ValueBoxDef_var::ptr (void) const
-+ACE_INLINE IR_ValueBoxDef_ptr 
-+IR_ValueBoxDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ValueBoxDef_var::ValueBoxDef_var (const IR::ValueBoxDef_var &p) // copy constructor
-+IR_ValueBoxDef_var::IR_ValueBoxDef_var (const IR_ValueBoxDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (ValueBoxDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_ValueBoxDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::ValueBoxDef_var::~ValueBoxDef_var (void) // destructor
-+IR_ValueBoxDef_var::~IR_ValueBoxDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::ValueBoxDef_var &
--IR::ValueBoxDef_var::operator= (IR::ValueBoxDef_ptr p)
-+ACE_INLINE IR_ValueBoxDef_var &
-+IR_ValueBoxDef_var::operator= (IR_ValueBoxDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::ValueBoxDef_var &
--IR::ValueBoxDef_var::operator= (const IR::ValueBoxDef_var &p)
-+ACE_INLINE IR_ValueBoxDef_var &
-+IR_ValueBoxDef_var::operator= (const IR_ValueBoxDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::ValueBoxDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_ValueBoxDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ValueBoxDef_var::operator const IR::ValueBoxDef_ptr &() const // cast
-+IR_ValueBoxDef_var::operator const IR_ValueBoxDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ValueBoxDef_var::operator IR::ValueBoxDef_ptr &() // cast 
-+IR_ValueBoxDef_var::operator IR_ValueBoxDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ValueBoxDef_ptr 
--IR::ValueBoxDef_var::operator-> (void) const
-+ACE_INLINE IR_ValueBoxDef_ptr 
-+IR_ValueBoxDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ValueBoxDef_ptr
--IR::ValueBoxDef_var::in (void) const
-+ACE_INLINE IR_ValueBoxDef_ptr
-+IR_ValueBoxDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ValueBoxDef_ptr &
--IR::ValueBoxDef_var::inout (void)
-+ACE_INLINE IR_ValueBoxDef_ptr &
-+IR_ValueBoxDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ValueBoxDef_ptr &
--IR::ValueBoxDef_var::out (void)
-+ACE_INLINE IR_ValueBoxDef_ptr &
-+IR_ValueBoxDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ValueBoxDef::_nil ();
-+  this->ptr_ = IR_ValueBoxDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ValueBoxDef_ptr 
--IR::ValueBoxDef_var::_retn (void)
-+ACE_INLINE IR_ValueBoxDef_ptr 
-+IR_ValueBoxDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::ValueBoxDef_ptr val = this->ptr_;
--  this->ptr_ = IR::ValueBoxDef::_nil ();
-+  IR_ValueBoxDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_ValueBoxDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEBOXDEF___OUT_CI_)
--#define _IR_VALUEBOXDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::ValueBoxDef_out
-+// Inline operations for class IR_ValueBoxDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ValueBoxDef_out::ValueBoxDef_out (IR::ValueBoxDef_ptr &p)
-+IR_ValueBoxDef_out::IR_ValueBoxDef_out (IR_ValueBoxDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::ValueBoxDef::_nil ();
-+  this->ptr_ = IR_ValueBoxDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ValueBoxDef_out::ValueBoxDef_out (IR::ValueBoxDef_var &p) // constructor from _var
-+IR_ValueBoxDef_out::IR_ValueBoxDef_out (IR_ValueBoxDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ValueBoxDef::_nil ();
-+  this->ptr_ = IR_ValueBoxDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ValueBoxDef_out::ValueBoxDef_out (const IR::ValueBoxDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::ValueBoxDef_out&,p).ptr_)
-+IR_ValueBoxDef_out::IR_ValueBoxDef_out (const IR_ValueBoxDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ValueBoxDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::ValueBoxDef_out &
--IR::ValueBoxDef_out::operator= (const IR::ValueBoxDef_out &p)
-+ACE_INLINE IR_ValueBoxDef_out &
-+IR_ValueBoxDef_out::operator= (const IR_ValueBoxDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::ValueBoxDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ValueBoxDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ValueBoxDef_out &
--IR::ValueBoxDef_out::operator= (const IR::ValueBoxDef_var &p)
-+ACE_INLINE IR_ValueBoxDef_out &
-+IR_ValueBoxDef_out::operator= (const IR_ValueBoxDef_var &p)
- {
--  this->ptr_ = IR::ValueBoxDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_ValueBoxDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::ValueBoxDef_out &
--IR::ValueBoxDef_out::operator= (IR::ValueBoxDef_ptr p)
-+ACE_INLINE IR_ValueBoxDef_out &
-+IR_ValueBoxDef_out::operator= (IR_ValueBoxDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ValueBoxDef_out::operator IR::ValueBoxDef_ptr &() // cast
-+IR_ValueBoxDef_out::operator IR_ValueBoxDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ValueBoxDef_ptr &
--IR::ValueBoxDef_out::ptr (void) // ptr
-+ACE_INLINE IR_ValueBoxDef_ptr &
-+IR_ValueBoxDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ValueBoxDef_ptr 
--IR::ValueBoxDef_out::operator-> (void)
-+ACE_INLINE IR_ValueBoxDef_ptr 
-+IR_ValueBoxDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_COMPONENTDEF___CI_)
--#define _IR_COMPONENTDEF___CI_
--
- ACE_INLINE
--IR::ComponentDef::ComponentDef (
-+IR_ComponentDef::IR_ComponentDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -3970,200 +3603,179 @@
-   this->IR_ComponentDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_COMPONENTDEF___VAR_CI_)
--#define _IR_COMPONENTDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::ComponentDef_var
-+// Inline operations for class IR_ComponentDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ComponentDef_var::ComponentDef_var (void) // default constructor
--  : ptr_ (IR::ComponentDef::_nil ())
-+IR_ComponentDef_var::IR_ComponentDef_var (void) // default constructor
-+  : ptr_ (IR_ComponentDef::_nil ())
- {}
- 
--ACE_INLINE IR::ComponentDef_ptr 
--IR::ComponentDef_var::ptr (void) const
-+ACE_INLINE IR_ComponentDef_ptr 
-+IR_ComponentDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ComponentDef_var::ComponentDef_var (const IR::ComponentDef_var &p) // copy constructor
-+IR_ComponentDef_var::IR_ComponentDef_var (const IR_ComponentDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (ComponentDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_ComponentDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::ComponentDef_var::~ComponentDef_var (void) // destructor
-+IR_ComponentDef_var::~IR_ComponentDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::ComponentDef_var &
--IR::ComponentDef_var::operator= (IR::ComponentDef_ptr p)
-+ACE_INLINE IR_ComponentDef_var &
-+IR_ComponentDef_var::operator= (IR_ComponentDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::ComponentDef_var &
--IR::ComponentDef_var::operator= (const IR::ComponentDef_var &p)
-+ACE_INLINE IR_ComponentDef_var &
-+IR_ComponentDef_var::operator= (const IR_ComponentDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::ComponentDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_ComponentDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ComponentDef_var::operator const IR::ComponentDef_ptr &() const // cast
-+IR_ComponentDef_var::operator const IR_ComponentDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ComponentDef_var::operator IR::ComponentDef_ptr &() // cast 
-+IR_ComponentDef_var::operator IR_ComponentDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ComponentDef_ptr 
--IR::ComponentDef_var::operator-> (void) const
-+ACE_INLINE IR_ComponentDef_ptr 
-+IR_ComponentDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ComponentDef_ptr
--IR::ComponentDef_var::in (void) const
-+ACE_INLINE IR_ComponentDef_ptr
-+IR_ComponentDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ComponentDef_ptr &
--IR::ComponentDef_var::inout (void)
-+ACE_INLINE IR_ComponentDef_ptr &
-+IR_ComponentDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ComponentDef_ptr &
--IR::ComponentDef_var::out (void)
-+ACE_INLINE IR_ComponentDef_ptr &
-+IR_ComponentDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ComponentDef::_nil ();
-+  this->ptr_ = IR_ComponentDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ComponentDef_ptr 
--IR::ComponentDef_var::_retn (void)
-+ACE_INLINE IR_ComponentDef_ptr 
-+IR_ComponentDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::ComponentDef_ptr val = this->ptr_;
--  this->ptr_ = IR::ComponentDef::_nil ();
-+  IR_ComponentDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_ComponentDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_COMPONENTDEF___OUT_CI_)
--#define _IR_COMPONENTDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::ComponentDef_out
-+// Inline operations for class IR_ComponentDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ComponentDef_out::ComponentDef_out (IR::ComponentDef_ptr &p)
-+IR_ComponentDef_out::IR_ComponentDef_out (IR_ComponentDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::ComponentDef::_nil ();
-+  this->ptr_ = IR_ComponentDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ComponentDef_out::ComponentDef_out (IR::ComponentDef_var &p) // constructor from _var
-+IR_ComponentDef_out::IR_ComponentDef_out (IR_ComponentDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ComponentDef::_nil ();
-+  this->ptr_ = IR_ComponentDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ComponentDef_out::ComponentDef_out (const IR::ComponentDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::ComponentDef_out&,p).ptr_)
-+IR_ComponentDef_out::IR_ComponentDef_out (const IR_ComponentDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ComponentDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::ComponentDef_out &
--IR::ComponentDef_out::operator= (const IR::ComponentDef_out &p)
-+ACE_INLINE IR_ComponentDef_out &
-+IR_ComponentDef_out::operator= (const IR_ComponentDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::ComponentDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ComponentDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ComponentDef_out &
--IR::ComponentDef_out::operator= (const IR::ComponentDef_var &p)
-+ACE_INLINE IR_ComponentDef_out &
-+IR_ComponentDef_out::operator= (const IR_ComponentDef_var &p)
- {
--  this->ptr_ = IR::ComponentDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_ComponentDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::ComponentDef_out &
--IR::ComponentDef_out::operator= (IR::ComponentDef_ptr p)
-+ACE_INLINE IR_ComponentDef_out &
-+IR_ComponentDef_out::operator= (IR_ComponentDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ComponentDef_out::operator IR::ComponentDef_ptr &() // cast
-+IR_ComponentDef_out::operator IR_ComponentDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ComponentDef_ptr &
--IR::ComponentDef_out::ptr (void) // ptr
-+ACE_INLINE IR_ComponentDef_ptr &
-+IR_ComponentDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ComponentDef_ptr 
--IR::ComponentDef_out::operator-> (void)
-+ACE_INLINE IR_ComponentDef_ptr 
-+IR_ComponentDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_
--
--  ACE_INLINE IR::ComponentDef **
--  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (CORBA::ULong nelems)
-+  ACE_INLINE IR_ComponentDef **
-+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (CORBA::ULong nelems)
-   {
--    IR::ComponentDef **buf = 0;
-+    IR_ComponentDef **buf = 0;
-     
--    ACE_NEW_RETURN (buf, IR::ComponentDef*[nelems], 0);
-+    ACE_NEW_RETURN (buf, IR_ComponentDef*[nelems], 0);
-     
-     for (CORBA::ULong i = 0; i < nelems; i++)
--      buf[i] = IR::ComponentDef::_nil ();
-+      buf[i] = IR_ComponentDef::_nil ();
-     
-     return buf;
-   }
-   
-   ACE_INLINE void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (IR::ComponentDef **buffer)
-+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (IR_ComponentDef **buffer)
-   {
-     if (buffer == 0)
-       return;
-@@ -4171,36 +3783,36 @@
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum)
-+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum)
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::ComponentDef* *value,
-+    IR_ComponentDef* *value,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
-+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::ComponentDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (this->maximum_);
--      IR::ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
-+      IR_ComponentDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (this->maximum_);
-+      IR_ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR_ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--        tmp1[i] = IR::ComponentDef::_duplicate (tmp2[i]);
-+        tmp1[i] = IR_ComponentDef::_duplicate (tmp2[i]);
-       
-       this->buffer_ = tmp1;
-     }
-@@ -4210,20 +3822,20 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &
--  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &
-+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
-   {
-     if (this == &rhs)
-       return *this;
-     
-     if (this->release_)
-     {
--      IR::ComponentDef **tmp = ACE_reinterpret_cast (IR::ComponentDef **, this->buffer_);
-+      IR_ComponentDef **tmp = ACE_reinterpret_cast (IR_ComponentDef **, this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-       {
-         CORBA::release (tmp[i]);
--        tmp[i] = IR::ComponentDef::_nil ();
-+        tmp[i] = IR_ComponentDef::_nil ();
-       }
-       if (this->maximum_ < rhs.maximum_)
-       {
-@@ -4236,28 +3848,28 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::ComponentDef **tmp1 = ACE_reinterpret_cast (IR::ComponentDef **, this->buffer_);
--    IR::ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
-+    IR_ComponentDef **tmp1 = ACE_reinterpret_cast (IR_ComponentDef **, this->buffer_);
-+    IR_ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR_ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--      tmp1[i] = IR::ComponentDef::_duplicate (tmp2[i]);
-+      tmp1[i] = IR_ComponentDef::_duplicate (tmp2[i]);
-     
-     return *this;
-   }
-   
--  ACE_INLINE TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var>
--  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator[] (CORBA::ULong index) const
-+  ACE_INLINE TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var>
-+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator[] (CORBA::ULong index) const
-   // read-write accessor
-   {
-     ACE_ASSERT (index < this->maximum_);
--    IR::ComponentDef ** const tmp = ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, this->buffer_);
--    return TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var> (tmp + index, this->release_);
-+    IR_ComponentDef ** const tmp = ACE_reinterpret_cast (IR_ComponentDef ** ACE_CAST_CONST, this->buffer_);
-+    return TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var> (tmp + index, this->release_);
-   }
-   
--  ACE_INLINE IR::ComponentDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_ComponentDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::ComponentDef **result = 0;
-+    IR_ComponentDef **result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -4269,7 +3881,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_ComponentDef**, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -4278,7 +3890,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::ComponentDef**,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_ComponentDef**,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -4288,60 +3900,53 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::ComponentDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (void) const
-+  ACE_INLINE const IR_ComponentDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::ComponentDef ** ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_ComponentDef ** ACE_CAST_CONST, this->buffer_);
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_COMPONENTDEFSEQ_CI_)
--#define _IR_COMPONENTDEFSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::ComponentDefSeq_var
-+// Inline operations for class IR_ComponentDefSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ComponentDefSeq_var::ComponentDefSeq_var (void) // default constructor
-+IR_ComponentDefSeq_var::IR_ComponentDefSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ComponentDefSeq_var::ComponentDefSeq_var (ComponentDefSeq *p)
-+IR_ComponentDefSeq_var::IR_ComponentDefSeq_var (IR_ComponentDefSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ComponentDefSeq_var::ComponentDefSeq_var (const ::IR::ComponentDefSeq_var &p) // copy constructor
-+IR_ComponentDefSeq_var::IR_ComponentDefSeq_var (const ::IR_ComponentDefSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ComponentDefSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ComponentDefSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ComponentDefSeq_var::~ComponentDefSeq_var (void) // destructor
-+IR_ComponentDefSeq_var::~IR_ComponentDefSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ComponentDefSeq_var &
--IR::ComponentDefSeq_var::operator= (ComponentDefSeq *p)
-+ACE_INLINE IR_ComponentDefSeq_var &
-+IR_ComponentDefSeq_var::operator= (IR_ComponentDefSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ComponentDefSeq_var &
--IR::ComponentDefSeq_var::operator= (const ::IR::ComponentDefSeq_var &p)
-+ACE_INLINE IR_ComponentDefSeq_var &
-+IR_ComponentDefSeq_var::operator= (const ::IR_ComponentDefSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -4352,12 +3957,12 @@
-         }
-       else
-         {
--          ComponentDefSeq *deep_copy =
--            new ComponentDefSeq (*p.ptr_);
-+          IR_ComponentDefSeq *deep_copy = 
-+            new IR_ComponentDefSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ComponentDefSeq *tmp = deep_copy;
-+              IR_ComponentDefSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -4368,97 +3973,97 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ComponentDefSeq *
--IR::ComponentDefSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_ComponentDefSeq *
-+IR_ComponentDefSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentDefSeq *
--IR::ComponentDefSeq_var::operator-> (void)
-+ACE_INLINE ::IR_ComponentDefSeq *
-+IR_ComponentDefSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ComponentDefSeq_var::operator const ::IR::ComponentDefSeq &() const // cast
-+IR_ComponentDefSeq_var::operator const ::IR_ComponentDefSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ComponentDefSeq_var::operator ::IR::ComponentDefSeq &() // cast 
-+IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ComponentDefSeq_var::operator ::IR::ComponentDefSeq &() const // cast 
-+IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ComponentDefSeq_var::operator ::IR::ComponentDefSeq *&() // cast 
-+IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::ComponentDef, IR::ComponentDef_var>
--IR::ComponentDefSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_ComponentDef, IR_ComponentDef_var>
-+IR_ComponentDefSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::IR::ComponentDefSeq &
--IR::ComponentDefSeq_var::in (void) const
-+ACE_INLINE const ::IR_ComponentDefSeq &
-+IR_ComponentDefSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentDefSeq &
--IR::ComponentDefSeq_var::inout (void)
-+ACE_INLINE ::IR_ComponentDefSeq &
-+IR_ComponentDefSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ComponentDefSeq *&
--IR::ComponentDefSeq_var::out (void)
-+ACE_INLINE ::IR_ComponentDefSeq *&
-+IR_ComponentDefSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentDefSeq *
--IR::ComponentDefSeq_var::_retn (void)
-+ACE_INLINE ::IR_ComponentDefSeq *
-+IR_ComponentDefSeq_var::_retn (void)
- {
--  ::IR::ComponentDefSeq *tmp = this->ptr_;
-+  ::IR_ComponentDefSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ComponentDefSeq *
--IR::ComponentDefSeq_var::ptr (void) const
-+ACE_INLINE ::IR_ComponentDefSeq *
-+IR_ComponentDefSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ComponentDefSeq_out
-+// Inline operations for class IR_ComponentDefSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ComponentDefSeq_out::ComponentDefSeq_out (ComponentDefSeq *&p)
-+IR_ComponentDefSeq_out::IR_ComponentDefSeq_out (IR_ComponentDefSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ComponentDefSeq_out::ComponentDefSeq_out (ComponentDefSeq_var &p) // constructor from _var
-+IR_ComponentDefSeq_out::IR_ComponentDefSeq_out (IR_ComponentDefSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -4466,57 +4071,50 @@
- }
- 
- ACE_INLINE
--IR::ComponentDefSeq_out::ComponentDefSeq_out (const ::IR::ComponentDefSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ComponentDefSeq_out&, p).ptr_)
-+IR_ComponentDefSeq_out::IR_ComponentDefSeq_out (const ::IR_ComponentDefSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ComponentDefSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::ComponentDefSeq_out &
--IR::ComponentDefSeq_out::operator= (const ::IR::ComponentDefSeq_out &p)
-+ACE_INLINE ::IR_ComponentDefSeq_out &
-+IR_ComponentDefSeq_out::operator= (const ::IR_ComponentDefSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (ComponentDefSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ComponentDefSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ComponentDefSeq_out &
--IR::ComponentDefSeq_out::operator= (ComponentDefSeq *p)
-+ACE_INLINE ::IR_ComponentDefSeq_out &
-+IR_ComponentDefSeq_out::operator= (IR_ComponentDefSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ComponentDefSeq_out::operator ::IR::ComponentDefSeq *&() // cast
-+IR_ComponentDefSeq_out::operator ::IR_ComponentDefSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentDefSeq *&
--IR::ComponentDefSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ComponentDefSeq *&
-+IR_ComponentDefSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentDefSeq *
--IR::ComponentDefSeq_out::operator-> (void)
-+ACE_INLINE ::IR_ComponentDefSeq *
-+IR_ComponentDefSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::ComponentDef, IR::ComponentDef_var>
--IR::ComponentDefSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_ComponentDef, IR_ComponentDef_var>
-+IR_ComponentDefSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PROVIDESDEF___CI_)
--#define _IR_PROVIDESDEF___CI_
--
- ACE_INLINE
--IR::ProvidesDef::ProvidesDef (
-+IR_ProvidesDef::IR_ProvidesDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -4526,200 +4124,179 @@
-   this->IR_ProvidesDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PROVIDESDEF___VAR_CI_)
--#define _IR_PROVIDESDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::ProvidesDef_var
-+// Inline operations for class IR_ProvidesDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ProvidesDef_var::ProvidesDef_var (void) // default constructor
--  : ptr_ (IR::ProvidesDef::_nil ())
-+IR_ProvidesDef_var::IR_ProvidesDef_var (void) // default constructor
-+  : ptr_ (IR_ProvidesDef::_nil ())
- {}
- 
--ACE_INLINE IR::ProvidesDef_ptr 
--IR::ProvidesDef_var::ptr (void) const
-+ACE_INLINE IR_ProvidesDef_ptr 
-+IR_ProvidesDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ProvidesDef_var::ProvidesDef_var (const IR::ProvidesDef_var &p) // copy constructor
-+IR_ProvidesDef_var::IR_ProvidesDef_var (const IR_ProvidesDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (ProvidesDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_ProvidesDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::ProvidesDef_var::~ProvidesDef_var (void) // destructor
-+IR_ProvidesDef_var::~IR_ProvidesDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::ProvidesDef_var &
--IR::ProvidesDef_var::operator= (IR::ProvidesDef_ptr p)
-+ACE_INLINE IR_ProvidesDef_var &
-+IR_ProvidesDef_var::operator= (IR_ProvidesDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::ProvidesDef_var &
--IR::ProvidesDef_var::operator= (const IR::ProvidesDef_var &p)
-+ACE_INLINE IR_ProvidesDef_var &
-+IR_ProvidesDef_var::operator= (const IR_ProvidesDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::ProvidesDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_ProvidesDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ProvidesDef_var::operator const IR::ProvidesDef_ptr &() const // cast
-+IR_ProvidesDef_var::operator const IR_ProvidesDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ProvidesDef_var::operator IR::ProvidesDef_ptr &() // cast 
-+IR_ProvidesDef_var::operator IR_ProvidesDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ProvidesDef_ptr 
--IR::ProvidesDef_var::operator-> (void) const
-+ACE_INLINE IR_ProvidesDef_ptr 
-+IR_ProvidesDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ProvidesDef_ptr
--IR::ProvidesDef_var::in (void) const
-+ACE_INLINE IR_ProvidesDef_ptr
-+IR_ProvidesDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ProvidesDef_ptr &
--IR::ProvidesDef_var::inout (void)
-+ACE_INLINE IR_ProvidesDef_ptr &
-+IR_ProvidesDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ProvidesDef_ptr &
--IR::ProvidesDef_var::out (void)
-+ACE_INLINE IR_ProvidesDef_ptr &
-+IR_ProvidesDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ProvidesDef::_nil ();
-+  this->ptr_ = IR_ProvidesDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ProvidesDef_ptr 
--IR::ProvidesDef_var::_retn (void)
-+ACE_INLINE IR_ProvidesDef_ptr 
-+IR_ProvidesDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::ProvidesDef_ptr val = this->ptr_;
--  this->ptr_ = IR::ProvidesDef::_nil ();
-+  IR_ProvidesDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_ProvidesDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PROVIDESDEF___OUT_CI_)
--#define _IR_PROVIDESDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::ProvidesDef_out
-+// Inline operations for class IR_ProvidesDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ProvidesDef_out::ProvidesDef_out (IR::ProvidesDef_ptr &p)
-+IR_ProvidesDef_out::IR_ProvidesDef_out (IR_ProvidesDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::ProvidesDef::_nil ();
-+  this->ptr_ = IR_ProvidesDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ProvidesDef_out::ProvidesDef_out (IR::ProvidesDef_var &p) // constructor from _var
-+IR_ProvidesDef_out::IR_ProvidesDef_out (IR_ProvidesDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ProvidesDef::_nil ();
-+  this->ptr_ = IR_ProvidesDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ProvidesDef_out::ProvidesDef_out (const IR::ProvidesDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::ProvidesDef_out&,p).ptr_)
-+IR_ProvidesDef_out::IR_ProvidesDef_out (const IR_ProvidesDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ProvidesDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::ProvidesDef_out &
--IR::ProvidesDef_out::operator= (const IR::ProvidesDef_out &p)
-+ACE_INLINE IR_ProvidesDef_out &
-+IR_ProvidesDef_out::operator= (const IR_ProvidesDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::ProvidesDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ProvidesDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ProvidesDef_out &
--IR::ProvidesDef_out::operator= (const IR::ProvidesDef_var &p)
-+ACE_INLINE IR_ProvidesDef_out &
-+IR_ProvidesDef_out::operator= (const IR_ProvidesDef_var &p)
- {
--  this->ptr_ = IR::ProvidesDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_ProvidesDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::ProvidesDef_out &
--IR::ProvidesDef_out::operator= (IR::ProvidesDef_ptr p)
-+ACE_INLINE IR_ProvidesDef_out &
-+IR_ProvidesDef_out::operator= (IR_ProvidesDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ProvidesDef_out::operator IR::ProvidesDef_ptr &() // cast
-+IR_ProvidesDef_out::operator IR_ProvidesDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ProvidesDef_ptr &
--IR::ProvidesDef_out::ptr (void) // ptr
-+ACE_INLINE IR_ProvidesDef_ptr &
-+IR_ProvidesDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ProvidesDef_ptr 
--IR::ProvidesDef_out::operator-> (void)
-+ACE_INLINE IR_ProvidesDef_ptr 
-+IR_ProvidesDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_
--
--  ACE_INLINE IR::ProvidesDef **
--  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (CORBA::ULong nelems)
-+  ACE_INLINE IR_ProvidesDef **
-+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (CORBA::ULong nelems)
-   {
--    IR::ProvidesDef **buf = 0;
-+    IR_ProvidesDef **buf = 0;
-     
--    ACE_NEW_RETURN (buf, IR::ProvidesDef*[nelems], 0);
-+    ACE_NEW_RETURN (buf, IR_ProvidesDef*[nelems], 0);
-     
-     for (CORBA::ULong i = 0; i < nelems; i++)
--      buf[i] = IR::ProvidesDef::_nil ();
-+      buf[i] = IR_ProvidesDef::_nil ();
-     
-     return buf;
-   }
-   
-   ACE_INLINE void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (IR::ProvidesDef **buffer)
-+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (IR_ProvidesDef **buffer)
-   {
-     if (buffer == 0)
-       return;
-@@ -4727,36 +4304,36 @@
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum)
-+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum)
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::ProvidesDef* *value,
-+    IR_ProvidesDef* *value,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
-+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::ProvidesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (this->maximum_);
--      IR::ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
-+      IR_ProvidesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (this->maximum_);
-+      IR_ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR_ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--        tmp1[i] = IR::ProvidesDef::_duplicate (tmp2[i]);
-+        tmp1[i] = IR_ProvidesDef::_duplicate (tmp2[i]);
-       
-       this->buffer_ = tmp1;
-     }
-@@ -4766,20 +4343,20 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &
--  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &
-+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
-   {
-     if (this == &rhs)
-       return *this;
-     
-     if (this->release_)
-     {
--      IR::ProvidesDef **tmp = ACE_reinterpret_cast (IR::ProvidesDef **, this->buffer_);
-+      IR_ProvidesDef **tmp = ACE_reinterpret_cast (IR_ProvidesDef **, this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-       {
-         CORBA::release (tmp[i]);
--        tmp[i] = IR::ProvidesDef::_nil ();
-+        tmp[i] = IR_ProvidesDef::_nil ();
-       }
-       if (this->maximum_ < rhs.maximum_)
-       {
-@@ -4792,28 +4369,28 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::ProvidesDef **tmp1 = ACE_reinterpret_cast (IR::ProvidesDef **, this->buffer_);
--    IR::ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
-+    IR_ProvidesDef **tmp1 = ACE_reinterpret_cast (IR_ProvidesDef **, this->buffer_);
-+    IR_ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR_ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--      tmp1[i] = IR::ProvidesDef::_duplicate (tmp2[i]);
-+      tmp1[i] = IR_ProvidesDef::_duplicate (tmp2[i]);
-     
-     return *this;
-   }
-   
--  ACE_INLINE TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var>
--  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator[] (CORBA::ULong index) const
-+  ACE_INLINE TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var>
-+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator[] (CORBA::ULong index) const
-   // read-write accessor
-   {
-     ACE_ASSERT (index < this->maximum_);
--    IR::ProvidesDef ** const tmp = ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, this->buffer_);
--    return TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var> (tmp + index, this->release_);
-+    IR_ProvidesDef ** const tmp = ACE_reinterpret_cast (IR_ProvidesDef ** ACE_CAST_CONST, this->buffer_);
-+    return TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var> (tmp + index, this->release_);
-   }
-   
--  ACE_INLINE IR::ProvidesDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_ProvidesDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::ProvidesDef **result = 0;
-+    IR_ProvidesDef **result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -4825,7 +4402,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_ProvidesDef**, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -4834,7 +4411,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::ProvidesDef**,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_ProvidesDef**,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -4844,60 +4421,53 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::ProvidesDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (void) const
-+  ACE_INLINE const IR_ProvidesDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::ProvidesDef ** ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_ProvidesDef ** ACE_CAST_CONST, this->buffer_);
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_PROVIDESDEFSEQ_CI_)
--#define _IR_PROVIDESDEFSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::ProvidesDefSeq_var
-+// Inline operations for class IR_ProvidesDefSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ProvidesDefSeq_var::ProvidesDefSeq_var (void) // default constructor
-+IR_ProvidesDefSeq_var::IR_ProvidesDefSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ProvidesDefSeq_var::ProvidesDefSeq_var (ProvidesDefSeq *p)
-+IR_ProvidesDefSeq_var::IR_ProvidesDefSeq_var (IR_ProvidesDefSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ProvidesDefSeq_var::ProvidesDefSeq_var (const ::IR::ProvidesDefSeq_var &p) // copy constructor
-+IR_ProvidesDefSeq_var::IR_ProvidesDefSeq_var (const ::IR_ProvidesDefSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ProvidesDefSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ProvidesDefSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ProvidesDefSeq_var::~ProvidesDefSeq_var (void) // destructor
-+IR_ProvidesDefSeq_var::~IR_ProvidesDefSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ProvidesDefSeq_var &
--IR::ProvidesDefSeq_var::operator= (ProvidesDefSeq *p)
-+ACE_INLINE IR_ProvidesDefSeq_var &
-+IR_ProvidesDefSeq_var::operator= (IR_ProvidesDefSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ProvidesDefSeq_var &
--IR::ProvidesDefSeq_var::operator= (const ::IR::ProvidesDefSeq_var &p)
-+ACE_INLINE IR_ProvidesDefSeq_var &
-+IR_ProvidesDefSeq_var::operator= (const ::IR_ProvidesDefSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -4908,12 +4478,12 @@
-         }
-       else
-         {
--          ProvidesDefSeq *deep_copy =
--            new ProvidesDefSeq (*p.ptr_);
-+          IR_ProvidesDefSeq *deep_copy = 
-+            new IR_ProvidesDefSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ProvidesDefSeq *tmp = deep_copy;
-+              IR_ProvidesDefSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -4924,97 +4494,97 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ProvidesDefSeq *
--IR::ProvidesDefSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_ProvidesDefSeq *
-+IR_ProvidesDefSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ProvidesDefSeq *
--IR::ProvidesDefSeq_var::operator-> (void)
-+ACE_INLINE ::IR_ProvidesDefSeq *
-+IR_ProvidesDefSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ProvidesDefSeq_var::operator const ::IR::ProvidesDefSeq &() const // cast
-+IR_ProvidesDefSeq_var::operator const ::IR_ProvidesDefSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ProvidesDefSeq_var::operator ::IR::ProvidesDefSeq &() // cast 
-+IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ProvidesDefSeq_var::operator ::IR::ProvidesDefSeq &() const // cast 
-+IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ProvidesDefSeq_var::operator ::IR::ProvidesDefSeq *&() // cast 
-+IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::ProvidesDef, IR::ProvidesDef_var>
--IR::ProvidesDefSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_ProvidesDef, IR_ProvidesDef_var>
-+IR_ProvidesDefSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::IR::ProvidesDefSeq &
--IR::ProvidesDefSeq_var::in (void) const
-+ACE_INLINE const ::IR_ProvidesDefSeq &
-+IR_ProvidesDefSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ProvidesDefSeq &
--IR::ProvidesDefSeq_var::inout (void)
-+ACE_INLINE ::IR_ProvidesDefSeq &
-+IR_ProvidesDefSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ProvidesDefSeq *&
--IR::ProvidesDefSeq_var::out (void)
-+ACE_INLINE ::IR_ProvidesDefSeq *&
-+IR_ProvidesDefSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ProvidesDefSeq *
--IR::ProvidesDefSeq_var::_retn (void)
-+ACE_INLINE ::IR_ProvidesDefSeq *
-+IR_ProvidesDefSeq_var::_retn (void)
- {
--  ::IR::ProvidesDefSeq *tmp = this->ptr_;
-+  ::IR_ProvidesDefSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ProvidesDefSeq *
--IR::ProvidesDefSeq_var::ptr (void) const
-+ACE_INLINE ::IR_ProvidesDefSeq *
-+IR_ProvidesDefSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ProvidesDefSeq_out
-+// Inline operations for class IR_ProvidesDefSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ProvidesDefSeq_out::ProvidesDefSeq_out (ProvidesDefSeq *&p)
-+IR_ProvidesDefSeq_out::IR_ProvidesDefSeq_out (IR_ProvidesDefSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ProvidesDefSeq_out::ProvidesDefSeq_out (ProvidesDefSeq_var &p) // constructor from _var
-+IR_ProvidesDefSeq_out::IR_ProvidesDefSeq_out (IR_ProvidesDefSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -5022,57 +4592,50 @@
- }
- 
- ACE_INLINE
--IR::ProvidesDefSeq_out::ProvidesDefSeq_out (const ::IR::ProvidesDefSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ProvidesDefSeq_out&, p).ptr_)
-+IR_ProvidesDefSeq_out::IR_ProvidesDefSeq_out (const ::IR_ProvidesDefSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ProvidesDefSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::ProvidesDefSeq_out &
--IR::ProvidesDefSeq_out::operator= (const ::IR::ProvidesDefSeq_out &p)
-+ACE_INLINE ::IR_ProvidesDefSeq_out &
-+IR_ProvidesDefSeq_out::operator= (const ::IR_ProvidesDefSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (ProvidesDefSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ProvidesDefSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ProvidesDefSeq_out &
--IR::ProvidesDefSeq_out::operator= (ProvidesDefSeq *p)
-+ACE_INLINE ::IR_ProvidesDefSeq_out &
-+IR_ProvidesDefSeq_out::operator= (IR_ProvidesDefSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ProvidesDefSeq_out::operator ::IR::ProvidesDefSeq *&() // cast
-+IR_ProvidesDefSeq_out::operator ::IR_ProvidesDefSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ProvidesDefSeq *&
--IR::ProvidesDefSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ProvidesDefSeq *&
-+IR_ProvidesDefSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ProvidesDefSeq *
--IR::ProvidesDefSeq_out::operator-> (void)
-+ACE_INLINE ::IR_ProvidesDefSeq *
-+IR_ProvidesDefSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::ProvidesDef, IR::ProvidesDef_var>
--IR::ProvidesDefSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_ProvidesDef, IR_ProvidesDef_var>
-+IR_ProvidesDefSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_USESDEF___CI_)
--#define _IR_USESDEF___CI_
--
- ACE_INLINE
--IR::UsesDef::UsesDef (
-+IR_UsesDef::IR_UsesDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -5082,200 +4645,179 @@
-   this->IR_UsesDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_USESDEF___VAR_CI_)
--#define _IR_USESDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::UsesDef_var
-+// Inline operations for class IR_UsesDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::UsesDef_var::UsesDef_var (void) // default constructor
--  : ptr_ (IR::UsesDef::_nil ())
-+IR_UsesDef_var::IR_UsesDef_var (void) // default constructor
-+  : ptr_ (IR_UsesDef::_nil ())
- {}
- 
--ACE_INLINE IR::UsesDef_ptr 
--IR::UsesDef_var::ptr (void) const
-+ACE_INLINE IR_UsesDef_ptr 
-+IR_UsesDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::UsesDef_var::UsesDef_var (const IR::UsesDef_var &p) // copy constructor
-+IR_UsesDef_var::IR_UsesDef_var (const IR_UsesDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (UsesDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_UsesDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::UsesDef_var::~UsesDef_var (void) // destructor
-+IR_UsesDef_var::~IR_UsesDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::UsesDef_var &
--IR::UsesDef_var::operator= (IR::UsesDef_ptr p)
-+ACE_INLINE IR_UsesDef_var &
-+IR_UsesDef_var::operator= (IR_UsesDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::UsesDef_var &
--IR::UsesDef_var::operator= (const IR::UsesDef_var &p)
-+ACE_INLINE IR_UsesDef_var &
-+IR_UsesDef_var::operator= (const IR_UsesDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::UsesDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_UsesDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::UsesDef_var::operator const IR::UsesDef_ptr &() const // cast
-+IR_UsesDef_var::operator const IR_UsesDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::UsesDef_var::operator IR::UsesDef_ptr &() // cast 
-+IR_UsesDef_var::operator IR_UsesDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UsesDef_ptr 
--IR::UsesDef_var::operator-> (void) const
-+ACE_INLINE IR_UsesDef_ptr 
-+IR_UsesDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UsesDef_ptr
--IR::UsesDef_var::in (void) const
-+ACE_INLINE IR_UsesDef_ptr
-+IR_UsesDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UsesDef_ptr &
--IR::UsesDef_var::inout (void)
-+ACE_INLINE IR_UsesDef_ptr &
-+IR_UsesDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UsesDef_ptr &
--IR::UsesDef_var::out (void)
-+ACE_INLINE IR_UsesDef_ptr &
-+IR_UsesDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::UsesDef::_nil ();
-+  this->ptr_ = IR_UsesDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UsesDef_ptr 
--IR::UsesDef_var::_retn (void)
-+ACE_INLINE IR_UsesDef_ptr 
-+IR_UsesDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::UsesDef_ptr val = this->ptr_;
--  this->ptr_ = IR::UsesDef::_nil ();
-+  IR_UsesDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_UsesDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_USESDEF___OUT_CI_)
--#define _IR_USESDEF___OUT_CI_
--
--// *************************************************************
--// Inline operations for class IR::UsesDef_out
--// *************************************************************
-+// *************************************************************
-+// Inline operations for class IR_UsesDef_out
-+// *************************************************************
- 
- ACE_INLINE
--IR::UsesDef_out::UsesDef_out (IR::UsesDef_ptr &p)
-+IR_UsesDef_out::IR_UsesDef_out (IR_UsesDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::UsesDef::_nil ();
-+  this->ptr_ = IR_UsesDef::_nil ();
- }
- 
- ACE_INLINE
--IR::UsesDef_out::UsesDef_out (IR::UsesDef_var &p) // constructor from _var
-+IR_UsesDef_out::IR_UsesDef_out (IR_UsesDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::UsesDef::_nil ();
-+  this->ptr_ = IR_UsesDef::_nil ();
- }
- 
- ACE_INLINE
--IR::UsesDef_out::UsesDef_out (const IR::UsesDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::UsesDef_out&,p).ptr_)
-+IR_UsesDef_out::IR_UsesDef_out (const IR_UsesDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_UsesDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::UsesDef_out &
--IR::UsesDef_out::operator= (const IR::UsesDef_out &p)
-+ACE_INLINE IR_UsesDef_out &
-+IR_UsesDef_out::operator= (const IR_UsesDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::UsesDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_UsesDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::UsesDef_out &
--IR::UsesDef_out::operator= (const IR::UsesDef_var &p)
-+ACE_INLINE IR_UsesDef_out &
-+IR_UsesDef_out::operator= (const IR_UsesDef_var &p)
- {
--  this->ptr_ = IR::UsesDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_UsesDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::UsesDef_out &
--IR::UsesDef_out::operator= (IR::UsesDef_ptr p)
-+ACE_INLINE IR_UsesDef_out &
-+IR_UsesDef_out::operator= (IR_UsesDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::UsesDef_out::operator IR::UsesDef_ptr &() // cast
-+IR_UsesDef_out::operator IR_UsesDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UsesDef_ptr &
--IR::UsesDef_out::ptr (void) // ptr
-+ACE_INLINE IR_UsesDef_ptr &
-+IR_UsesDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UsesDef_ptr 
--IR::UsesDef_out::operator-> (void)
-+ACE_INLINE IR_UsesDef_ptr 
-+IR_UsesDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_
--
--  ACE_INLINE IR::UsesDef **
--  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (CORBA::ULong nelems)
-+  ACE_INLINE IR_UsesDef **
-+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (CORBA::ULong nelems)
-   {
--    IR::UsesDef **buf = 0;
-+    IR_UsesDef **buf = 0;
-     
--    ACE_NEW_RETURN (buf, IR::UsesDef*[nelems], 0);
-+    ACE_NEW_RETURN (buf, IR_UsesDef*[nelems], 0);
-     
-     for (CORBA::ULong i = 0; i < nelems; i++)
--      buf[i] = IR::UsesDef::_nil ();
-+      buf[i] = IR_UsesDef::_nil ();
-     
-     return buf;
-   }
-   
-   ACE_INLINE void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (IR::UsesDef **buffer)
-+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (IR_UsesDef **buffer)
-   {
-     if (buffer == 0)
-       return;
-@@ -5283,36 +4825,36 @@
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum)
-+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum)
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::UsesDef* *value,
-+    IR_UsesDef* *value,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
-+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::UsesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (this->maximum_);
--      IR::UsesDef ** const tmp2 = ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, rhs.buffer_);
-+      IR_UsesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (this->maximum_);
-+      IR_UsesDef ** const tmp2 = ACE_reinterpret_cast (IR_UsesDef ** ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--        tmp1[i] = IR::UsesDef::_duplicate (tmp2[i]);
-+        tmp1[i] = IR_UsesDef::_duplicate (tmp2[i]);
-       
-       this->buffer_ = tmp1;
-     }
-@@ -5322,20 +4864,20 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &
--  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &
-+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
-   {
-     if (this == &rhs)
-       return *this;
-     
-     if (this->release_)
-     {
--      IR::UsesDef **tmp = ACE_reinterpret_cast (IR::UsesDef **, this->buffer_);
-+      IR_UsesDef **tmp = ACE_reinterpret_cast (IR_UsesDef **, this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-       {
-         CORBA::release (tmp[i]);
--        tmp[i] = IR::UsesDef::_nil ();
-+        tmp[i] = IR_UsesDef::_nil ();
-       }
-       if (this->maximum_ < rhs.maximum_)
-       {
-@@ -5348,28 +4890,28 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::UsesDef **tmp1 = ACE_reinterpret_cast (IR::UsesDef **, this->buffer_);
--    IR::UsesDef ** const tmp2 = ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, rhs.buffer_);
-+    IR_UsesDef **tmp1 = ACE_reinterpret_cast (IR_UsesDef **, this->buffer_);
-+    IR_UsesDef ** const tmp2 = ACE_reinterpret_cast (IR_UsesDef ** ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--      tmp1[i] = IR::UsesDef::_duplicate (tmp2[i]);
-+      tmp1[i] = IR_UsesDef::_duplicate (tmp2[i]);
-     
-     return *this;
-   }
-   
--  ACE_INLINE TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var>
--  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator[] (CORBA::ULong index) const
-+  ACE_INLINE TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var>
-+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator[] (CORBA::ULong index) const
-   // read-write accessor
-   {
-     ACE_ASSERT (index < this->maximum_);
--    IR::UsesDef ** const tmp = ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, this->buffer_);
--    return TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var> (tmp + index, this->release_);
-+    IR_UsesDef ** const tmp = ACE_reinterpret_cast (IR_UsesDef ** ACE_CAST_CONST, this->buffer_);
-+    return TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var> (tmp + index, this->release_);
-   }
-   
--  ACE_INLINE IR::UsesDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_UsesDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::UsesDef **result = 0;
-+    IR_UsesDef **result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -5381,7 +4923,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_UsesDef**, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -5390,7 +4932,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::UsesDef**,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_UsesDef**,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -5400,60 +4942,53 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::UsesDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (void) const
-+  ACE_INLINE const IR_UsesDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::UsesDef ** ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_UsesDef ** ACE_CAST_CONST, this->buffer_);
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_USESDEFSEQ_CI_)
--#define _IR_USESDEFSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::UsesDefSeq_var
-+// Inline operations for class IR_UsesDefSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::UsesDefSeq_var::UsesDefSeq_var (void) // default constructor
-+IR_UsesDefSeq_var::IR_UsesDefSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::UsesDefSeq_var::UsesDefSeq_var (UsesDefSeq *p)
-+IR_UsesDefSeq_var::IR_UsesDefSeq_var (IR_UsesDefSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::UsesDefSeq_var::UsesDefSeq_var (const ::IR::UsesDefSeq_var &p) // copy constructor
-+IR_UsesDefSeq_var::IR_UsesDefSeq_var (const ::IR_UsesDefSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::UsesDefSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_UsesDefSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::UsesDefSeq_var::~UsesDefSeq_var (void) // destructor
-+IR_UsesDefSeq_var::~IR_UsesDefSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::UsesDefSeq_var &
--IR::UsesDefSeq_var::operator= (UsesDefSeq *p)
-+ACE_INLINE IR_UsesDefSeq_var &
-+IR_UsesDefSeq_var::operator= (IR_UsesDefSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::UsesDefSeq_var &
--IR::UsesDefSeq_var::operator= (const ::IR::UsesDefSeq_var &p)
-+ACE_INLINE IR_UsesDefSeq_var &
-+IR_UsesDefSeq_var::operator= (const ::IR_UsesDefSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -5464,12 +4999,12 @@
-         }
-       else
-         {
--          UsesDefSeq *deep_copy =
--            new UsesDefSeq (*p.ptr_);
-+          IR_UsesDefSeq *deep_copy = 
-+            new IR_UsesDefSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              UsesDefSeq *tmp = deep_copy;
-+              IR_UsesDefSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -5480,97 +5015,97 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::UsesDefSeq *
--IR::UsesDefSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_UsesDefSeq *
-+IR_UsesDefSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UsesDefSeq *
--IR::UsesDefSeq_var::operator-> (void)
-+ACE_INLINE ::IR_UsesDefSeq *
-+IR_UsesDefSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::UsesDefSeq_var::operator const ::IR::UsesDefSeq &() const // cast
-+IR_UsesDefSeq_var::operator const ::IR_UsesDefSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::UsesDefSeq_var::operator ::IR::UsesDefSeq &() // cast 
-+IR_UsesDefSeq_var::operator ::IR_UsesDefSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::UsesDefSeq_var::operator ::IR::UsesDefSeq &() const // cast 
-+IR_UsesDefSeq_var::operator ::IR_UsesDefSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::UsesDefSeq_var::operator ::IR::UsesDefSeq *&() // cast 
-+IR_UsesDefSeq_var::operator ::IR_UsesDefSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::UsesDef, IR::UsesDef_var>
--IR::UsesDefSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_UsesDef, IR_UsesDef_var>
-+IR_UsesDefSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::IR::UsesDefSeq &
--IR::UsesDefSeq_var::in (void) const
-+ACE_INLINE const ::IR_UsesDefSeq &
-+IR_UsesDefSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::UsesDefSeq &
--IR::UsesDefSeq_var::inout (void)
-+ACE_INLINE ::IR_UsesDefSeq &
-+IR_UsesDefSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::UsesDefSeq *&
--IR::UsesDefSeq_var::out (void)
-+ACE_INLINE ::IR_UsesDefSeq *&
-+IR_UsesDefSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UsesDefSeq *
--IR::UsesDefSeq_var::_retn (void)
-+ACE_INLINE ::IR_UsesDefSeq *
-+IR_UsesDefSeq_var::_retn (void)
- {
--  ::IR::UsesDefSeq *tmp = this->ptr_;
-+  ::IR_UsesDefSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::UsesDefSeq *
--IR::UsesDefSeq_var::ptr (void) const
-+ACE_INLINE ::IR_UsesDefSeq *
-+IR_UsesDefSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::UsesDefSeq_out
-+// Inline operations for class IR_UsesDefSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::UsesDefSeq_out::UsesDefSeq_out (UsesDefSeq *&p)
-+IR_UsesDefSeq_out::IR_UsesDefSeq_out (IR_UsesDefSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::UsesDefSeq_out::UsesDefSeq_out (UsesDefSeq_var &p) // constructor from _var
-+IR_UsesDefSeq_out::IR_UsesDefSeq_out (IR_UsesDefSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -5578,57 +5113,50 @@
- }
- 
- ACE_INLINE
--IR::UsesDefSeq_out::UsesDefSeq_out (const ::IR::UsesDefSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (UsesDefSeq_out&, p).ptr_)
-+IR_UsesDefSeq_out::IR_UsesDefSeq_out (const ::IR_UsesDefSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_UsesDefSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::UsesDefSeq_out &
--IR::UsesDefSeq_out::operator= (const ::IR::UsesDefSeq_out &p)
-+ACE_INLINE ::IR_UsesDefSeq_out &
-+IR_UsesDefSeq_out::operator= (const ::IR_UsesDefSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (UsesDefSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_UsesDefSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::UsesDefSeq_out &
--IR::UsesDefSeq_out::operator= (UsesDefSeq *p)
-+ACE_INLINE ::IR_UsesDefSeq_out &
-+IR_UsesDefSeq_out::operator= (IR_UsesDefSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::UsesDefSeq_out::operator ::IR::UsesDefSeq *&() // cast
-+IR_UsesDefSeq_out::operator ::IR_UsesDefSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UsesDefSeq *&
--IR::UsesDefSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_UsesDefSeq *&
-+IR_UsesDefSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UsesDefSeq *
--IR::UsesDefSeq_out::operator-> (void)
-+ACE_INLINE ::IR_UsesDefSeq *
-+IR_UsesDefSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::UsesDef, IR::UsesDef_var>
--IR::UsesDefSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_UsesDef, IR_UsesDef_var>
-+IR_UsesDefSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_HOMEDEF___CI_)
--#define _IR_HOMEDEF___CI_
--
- ACE_INLINE
--IR::HomeDef::HomeDef (
-+IR_HomeDef::IR_HomeDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -5638,200 +5166,179 @@
-   this->IR_HomeDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_HOMEDEF___VAR_CI_)
--#define _IR_HOMEDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::HomeDef_var
-+// Inline operations for class IR_HomeDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::HomeDef_var::HomeDef_var (void) // default constructor
--  : ptr_ (IR::HomeDef::_nil ())
-+IR_HomeDef_var::IR_HomeDef_var (void) // default constructor
-+  : ptr_ (IR_HomeDef::_nil ())
- {}
- 
--ACE_INLINE IR::HomeDef_ptr 
--IR::HomeDef_var::ptr (void) const
-+ACE_INLINE IR_HomeDef_ptr 
-+IR_HomeDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::HomeDef_var::HomeDef_var (const IR::HomeDef_var &p) // copy constructor
-+IR_HomeDef_var::IR_HomeDef_var (const IR_HomeDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (HomeDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_HomeDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::HomeDef_var::~HomeDef_var (void) // destructor
-+IR_HomeDef_var::~IR_HomeDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::HomeDef_var &
--IR::HomeDef_var::operator= (IR::HomeDef_ptr p)
-+ACE_INLINE IR_HomeDef_var &
-+IR_HomeDef_var::operator= (IR_HomeDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::HomeDef_var &
--IR::HomeDef_var::operator= (const IR::HomeDef_var &p)
-+ACE_INLINE IR_HomeDef_var &
-+IR_HomeDef_var::operator= (const IR_HomeDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::HomeDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_HomeDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::HomeDef_var::operator const IR::HomeDef_ptr &() const // cast
-+IR_HomeDef_var::operator const IR_HomeDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::HomeDef_var::operator IR::HomeDef_ptr &() // cast 
-+IR_HomeDef_var::operator IR_HomeDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::HomeDef_ptr 
--IR::HomeDef_var::operator-> (void) const
-+ACE_INLINE IR_HomeDef_ptr 
-+IR_HomeDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::HomeDef_ptr
--IR::HomeDef_var::in (void) const
-+ACE_INLINE IR_HomeDef_ptr
-+IR_HomeDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::HomeDef_ptr &
--IR::HomeDef_var::inout (void)
-+ACE_INLINE IR_HomeDef_ptr &
-+IR_HomeDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::HomeDef_ptr &
--IR::HomeDef_var::out (void)
-+ACE_INLINE IR_HomeDef_ptr &
-+IR_HomeDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::HomeDef::_nil ();
-+  this->ptr_ = IR_HomeDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::HomeDef_ptr 
--IR::HomeDef_var::_retn (void)
-+ACE_INLINE IR_HomeDef_ptr 
-+IR_HomeDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::HomeDef_ptr val = this->ptr_;
--  this->ptr_ = IR::HomeDef::_nil ();
-+  IR_HomeDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_HomeDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_HOMEDEF___OUT_CI_)
--#define _IR_HOMEDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::HomeDef_out
-+// Inline operations for class IR_HomeDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::HomeDef_out::HomeDef_out (IR::HomeDef_ptr &p)
-+IR_HomeDef_out::IR_HomeDef_out (IR_HomeDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::HomeDef::_nil ();
-+  this->ptr_ = IR_HomeDef::_nil ();
- }
- 
- ACE_INLINE
--IR::HomeDef_out::HomeDef_out (IR::HomeDef_var &p) // constructor from _var
-+IR_HomeDef_out::IR_HomeDef_out (IR_HomeDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::HomeDef::_nil ();
-+  this->ptr_ = IR_HomeDef::_nil ();
- }
- 
- ACE_INLINE
--IR::HomeDef_out::HomeDef_out (const IR::HomeDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::HomeDef_out&,p).ptr_)
-+IR_HomeDef_out::IR_HomeDef_out (const IR_HomeDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_HomeDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::HomeDef_out &
--IR::HomeDef_out::operator= (const IR::HomeDef_out &p)
-+ACE_INLINE IR_HomeDef_out &
-+IR_HomeDef_out::operator= (const IR_HomeDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::HomeDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_HomeDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::HomeDef_out &
--IR::HomeDef_out::operator= (const IR::HomeDef_var &p)
-+ACE_INLINE IR_HomeDef_out &
-+IR_HomeDef_out::operator= (const IR_HomeDef_var &p)
- {
--  this->ptr_ = IR::HomeDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_HomeDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::HomeDef_out &
--IR::HomeDef_out::operator= (IR::HomeDef_ptr p)
-+ACE_INLINE IR_HomeDef_out &
-+IR_HomeDef_out::operator= (IR_HomeDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::HomeDef_out::operator IR::HomeDef_ptr &() // cast
-+IR_HomeDef_out::operator IR_HomeDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::HomeDef_ptr &
--IR::HomeDef_out::ptr (void) // ptr
-+ACE_INLINE IR_HomeDef_ptr &
-+IR_HomeDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::HomeDef_ptr 
--IR::HomeDef_out::operator-> (void)
-+ACE_INLINE IR_HomeDef_ptr 
-+IR_HomeDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_
--
--  ACE_INLINE IR::HomeDef **
--  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (CORBA::ULong nelems)
-+  ACE_INLINE IR_HomeDef **
-+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (CORBA::ULong nelems)
-   {
--    IR::HomeDef **buf = 0;
-+    IR_HomeDef **buf = 0;
-     
--    ACE_NEW_RETURN (buf, IR::HomeDef*[nelems], 0);
-+    ACE_NEW_RETURN (buf, IR_HomeDef*[nelems], 0);
-     
-     for (CORBA::ULong i = 0; i < nelems; i++)
--      buf[i] = IR::HomeDef::_nil ();
-+      buf[i] = IR_HomeDef::_nil ();
-     
-     return buf;
-   }
-   
-   ACE_INLINE void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (IR::HomeDef **buffer)
-+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (IR_HomeDef **buffer)
-   {
-     if (buffer == 0)
-       return;
-@@ -5839,36 +5346,36 @@
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum)
-+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum)
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::HomeDef* *value,
-+    IR_HomeDef* *value,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq(const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
-+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq(const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::HomeDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (this->maximum_);
--      IR::HomeDef ** const tmp2 = ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, rhs.buffer_);
-+      IR_HomeDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (this->maximum_);
-+      IR_HomeDef ** const tmp2 = ACE_reinterpret_cast (IR_HomeDef ** ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--        tmp1[i] = IR::HomeDef::_duplicate (tmp2[i]);
-+        tmp1[i] = IR_HomeDef::_duplicate (tmp2[i]);
-       
-       this->buffer_ = tmp1;
-     }
-@@ -5878,20 +5385,20 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &
--  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &
-+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
-   {
-     if (this == &rhs)
-       return *this;
-     
-     if (this->release_)
-     {
--      IR::HomeDef **tmp = ACE_reinterpret_cast (IR::HomeDef **, this->buffer_);
-+      IR_HomeDef **tmp = ACE_reinterpret_cast (IR_HomeDef **, this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-       {
-         CORBA::release (tmp[i]);
--        tmp[i] = IR::HomeDef::_nil ();
-+        tmp[i] = IR_HomeDef::_nil ();
-       }
-       if (this->maximum_ < rhs.maximum_)
-       {
-@@ -5904,28 +5411,28 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::HomeDef **tmp1 = ACE_reinterpret_cast (IR::HomeDef **, this->buffer_);
--    IR::HomeDef ** const tmp2 = ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, rhs.buffer_);
-+    IR_HomeDef **tmp1 = ACE_reinterpret_cast (IR_HomeDef **, this->buffer_);
-+    IR_HomeDef ** const tmp2 = ACE_reinterpret_cast (IR_HomeDef ** ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--      tmp1[i] = IR::HomeDef::_duplicate (tmp2[i]);
-+      tmp1[i] = IR_HomeDef::_duplicate (tmp2[i]);
-     
-     return *this;
-   }
-   
--  ACE_INLINE TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var>
--  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator[] (CORBA::ULong index) const
-+  ACE_INLINE TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var>
-+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator[] (CORBA::ULong index) const
-   // read-write accessor
-   {
-     ACE_ASSERT (index < this->maximum_);
--    IR::HomeDef ** const tmp = ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, this->buffer_);
--    return TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var> (tmp + index, this->release_);
-+    IR_HomeDef ** const tmp = ACE_reinterpret_cast (IR_HomeDef ** ACE_CAST_CONST, this->buffer_);
-+    return TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var> (tmp + index, this->release_);
-   }
-   
--  ACE_INLINE IR::HomeDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_HomeDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::HomeDef **result = 0;
-+    IR_HomeDef **result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -5937,7 +5444,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_HomeDef**, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -5946,7 +5453,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::HomeDef**,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_HomeDef**,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -5956,60 +5463,53 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::HomeDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (void) const
-+  ACE_INLINE const IR_HomeDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::HomeDef ** ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_HomeDef ** ACE_CAST_CONST, this->buffer_);
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_HOMEDEFSEQ_CI_)
--#define _IR_HOMEDEFSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::HomeDefSeq_var
-+// Inline operations for class IR_HomeDefSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::HomeDefSeq_var::HomeDefSeq_var (void) // default constructor
-+IR_HomeDefSeq_var::IR_HomeDefSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::HomeDefSeq_var::HomeDefSeq_var (HomeDefSeq *p)
-+IR_HomeDefSeq_var::IR_HomeDefSeq_var (IR_HomeDefSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::HomeDefSeq_var::HomeDefSeq_var (const ::IR::HomeDefSeq_var &p) // copy constructor
-+IR_HomeDefSeq_var::IR_HomeDefSeq_var (const ::IR_HomeDefSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::HomeDefSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_HomeDefSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::HomeDefSeq_var::~HomeDefSeq_var (void) // destructor
-+IR_HomeDefSeq_var::~IR_HomeDefSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::HomeDefSeq_var &
--IR::HomeDefSeq_var::operator= (HomeDefSeq *p)
-+ACE_INLINE IR_HomeDefSeq_var &
-+IR_HomeDefSeq_var::operator= (IR_HomeDefSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::HomeDefSeq_var &
--IR::HomeDefSeq_var::operator= (const ::IR::HomeDefSeq_var &p)
-+ACE_INLINE IR_HomeDefSeq_var &
-+IR_HomeDefSeq_var::operator= (const ::IR_HomeDefSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -6020,12 +5520,12 @@
-         }
-       else
-         {
--          HomeDefSeq *deep_copy =
--            new HomeDefSeq (*p.ptr_);
-+          IR_HomeDefSeq *deep_copy = 
-+            new IR_HomeDefSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              HomeDefSeq *tmp = deep_copy;
-+              IR_HomeDefSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -6036,97 +5536,97 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::HomeDefSeq *
--IR::HomeDefSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_HomeDefSeq *
-+IR_HomeDefSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::HomeDefSeq *
--IR::HomeDefSeq_var::operator-> (void)
-+ACE_INLINE ::IR_HomeDefSeq *
-+IR_HomeDefSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::HomeDefSeq_var::operator const ::IR::HomeDefSeq &() const // cast
-+IR_HomeDefSeq_var::operator const ::IR_HomeDefSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::HomeDefSeq_var::operator ::IR::HomeDefSeq &() // cast 
-+IR_HomeDefSeq_var::operator ::IR_HomeDefSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::HomeDefSeq_var::operator ::IR::HomeDefSeq &() const // cast 
-+IR_HomeDefSeq_var::operator ::IR_HomeDefSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::HomeDefSeq_var::operator ::IR::HomeDefSeq *&() // cast 
-+IR_HomeDefSeq_var::operator ::IR_HomeDefSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::HomeDef, IR::HomeDef_var>
--IR::HomeDefSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_HomeDef, IR_HomeDef_var>
-+IR_HomeDefSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::IR::HomeDefSeq &
--IR::HomeDefSeq_var::in (void) const
-+ACE_INLINE const ::IR_HomeDefSeq &
-+IR_HomeDefSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::HomeDefSeq &
--IR::HomeDefSeq_var::inout (void)
-+ACE_INLINE ::IR_HomeDefSeq &
-+IR_HomeDefSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::HomeDefSeq *&
--IR::HomeDefSeq_var::out (void)
-+ACE_INLINE ::IR_HomeDefSeq *&
-+IR_HomeDefSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::HomeDefSeq *
--IR::HomeDefSeq_var::_retn (void)
-+ACE_INLINE ::IR_HomeDefSeq *
-+IR_HomeDefSeq_var::_retn (void)
- {
--  ::IR::HomeDefSeq *tmp = this->ptr_;
-+  ::IR_HomeDefSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::HomeDefSeq *
--IR::HomeDefSeq_var::ptr (void) const
-+ACE_INLINE ::IR_HomeDefSeq *
-+IR_HomeDefSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::HomeDefSeq_out
-+// Inline operations for class IR_HomeDefSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::HomeDefSeq_out::HomeDefSeq_out (HomeDefSeq *&p)
-+IR_HomeDefSeq_out::IR_HomeDefSeq_out (IR_HomeDefSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::HomeDefSeq_out::HomeDefSeq_out (HomeDefSeq_var &p) // constructor from _var
-+IR_HomeDefSeq_out::IR_HomeDefSeq_out (IR_HomeDefSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -6134,57 +5634,50 @@
- }
- 
- ACE_INLINE
--IR::HomeDefSeq_out::HomeDefSeq_out (const ::IR::HomeDefSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (HomeDefSeq_out&, p).ptr_)
-+IR_HomeDefSeq_out::IR_HomeDefSeq_out (const ::IR_HomeDefSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_HomeDefSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::HomeDefSeq_out &
--IR::HomeDefSeq_out::operator= (const ::IR::HomeDefSeq_out &p)
-+ACE_INLINE ::IR_HomeDefSeq_out &
-+IR_HomeDefSeq_out::operator= (const ::IR_HomeDefSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (HomeDefSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_HomeDefSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::HomeDefSeq_out &
--IR::HomeDefSeq_out::operator= (HomeDefSeq *p)
-+ACE_INLINE ::IR_HomeDefSeq_out &
-+IR_HomeDefSeq_out::operator= (IR_HomeDefSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::HomeDefSeq_out::operator ::IR::HomeDefSeq *&() // cast
-+IR_HomeDefSeq_out::operator ::IR_HomeDefSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::HomeDefSeq *&
--IR::HomeDefSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_HomeDefSeq *&
-+IR_HomeDefSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::HomeDefSeq *
--IR::HomeDefSeq_out::operator-> (void)
-+ACE_INLINE ::IR_HomeDefSeq *
-+IR_HomeDefSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::HomeDef, IR::HomeDef_var>
--IR::HomeDefSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_HomeDef, IR_HomeDef_var>
-+IR_HomeDefSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EVENTDEF___CI_)
--#define _IR_EVENTDEF___CI_
--
- ACE_INLINE
--IR::EventDef::EventDef (
-+IR_EventDef::IR_EventDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -6194,185 +5687,164 @@
-   this->IR_EventDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EVENTDEF___VAR_CI_)
--#define _IR_EVENTDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::EventDef_var
-+// Inline operations for class IR_EventDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::EventDef_var::EventDef_var (void) // default constructor
--  : ptr_ (IR::EventDef::_nil ())
-+IR_EventDef_var::IR_EventDef_var (void) // default constructor
-+  : ptr_ (IR_EventDef::_nil ())
- {}
- 
--ACE_INLINE IR::EventDef_ptr 
--IR::EventDef_var::ptr (void) const
-+ACE_INLINE IR_EventDef_ptr 
-+IR_EventDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::EventDef_var::EventDef_var (const IR::EventDef_var &p) // copy constructor
-+IR_EventDef_var::IR_EventDef_var (const IR_EventDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (EventDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_EventDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::EventDef_var::~EventDef_var (void) // destructor
-+IR_EventDef_var::~IR_EventDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::EventDef_var &
--IR::EventDef_var::operator= (IR::EventDef_ptr p)
-+ACE_INLINE IR_EventDef_var &
-+IR_EventDef_var::operator= (IR_EventDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::EventDef_var &
--IR::EventDef_var::operator= (const IR::EventDef_var &p)
-+ACE_INLINE IR_EventDef_var &
-+IR_EventDef_var::operator= (const IR_EventDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::EventDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_EventDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::EventDef_var::operator const IR::EventDef_ptr &() const // cast
-+IR_EventDef_var::operator const IR_EventDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::EventDef_var::operator IR::EventDef_ptr &() // cast 
-+IR_EventDef_var::operator IR_EventDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EventDef_ptr 
--IR::EventDef_var::operator-> (void) const
-+ACE_INLINE IR_EventDef_ptr 
-+IR_EventDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EventDef_ptr
--IR::EventDef_var::in (void) const
-+ACE_INLINE IR_EventDef_ptr
-+IR_EventDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EventDef_ptr &
--IR::EventDef_var::inout (void)
-+ACE_INLINE IR_EventDef_ptr &
-+IR_EventDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EventDef_ptr &
--IR::EventDef_var::out (void)
-+ACE_INLINE IR_EventDef_ptr &
-+IR_EventDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::EventDef::_nil ();
-+  this->ptr_ = IR_EventDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EventDef_ptr 
--IR::EventDef_var::_retn (void)
-+ACE_INLINE IR_EventDef_ptr 
-+IR_EventDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::EventDef_ptr val = this->ptr_;
--  this->ptr_ = IR::EventDef::_nil ();
-+  IR_EventDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_EventDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EVENTDEF___OUT_CI_)
--#define _IR_EVENTDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::EventDef_out
-+// Inline operations for class IR_EventDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::EventDef_out::EventDef_out (IR::EventDef_ptr &p)
-+IR_EventDef_out::IR_EventDef_out (IR_EventDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::EventDef::_nil ();
-+  this->ptr_ = IR_EventDef::_nil ();
- }
- 
- ACE_INLINE
--IR::EventDef_out::EventDef_out (IR::EventDef_var &p) // constructor from _var
-+IR_EventDef_out::IR_EventDef_out (IR_EventDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::EventDef::_nil ();
-+  this->ptr_ = IR_EventDef::_nil ();
- }
- 
- ACE_INLINE
--IR::EventDef_out::EventDef_out (const IR::EventDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::EventDef_out&,p).ptr_)
-+IR_EventDef_out::IR_EventDef_out (const IR_EventDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_EventDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::EventDef_out &
--IR::EventDef_out::operator= (const IR::EventDef_out &p)
-+ACE_INLINE IR_EventDef_out &
-+IR_EventDef_out::operator= (const IR_EventDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::EventDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_EventDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::EventDef_out &
--IR::EventDef_out::operator= (const IR::EventDef_var &p)
-+ACE_INLINE IR_EventDef_out &
-+IR_EventDef_out::operator= (const IR_EventDef_var &p)
- {
--  this->ptr_ = IR::EventDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_EventDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::EventDef_out &
--IR::EventDef_out::operator= (IR::EventDef_ptr p)
-+ACE_INLINE IR_EventDef_out &
-+IR_EventDef_out::operator= (IR_EventDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::EventDef_out::operator IR::EventDef_ptr &() // cast
-+IR_EventDef_out::operator IR_EventDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EventDef_ptr &
--IR::EventDef_out::ptr (void) // ptr
-+ACE_INLINE IR_EventDef_ptr &
-+IR_EventDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EventDef_ptr 
--IR::EventDef_out::operator-> (void)
-+ACE_INLINE IR_EventDef_ptr 
-+IR_EventDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EMITSDEF___CI_)
--#define _IR_EMITSDEF___CI_
--
- ACE_INLINE
--IR::EmitsDef::EmitsDef (
-+IR_EmitsDef::IR_EmitsDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -6382,200 +5854,179 @@
-   this->IR_EmitsDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EMITSDEF___VAR_CI_)
--#define _IR_EMITSDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::EmitsDef_var
-+// Inline operations for class IR_EmitsDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::EmitsDef_var::EmitsDef_var (void) // default constructor
--  : ptr_ (IR::EmitsDef::_nil ())
-+IR_EmitsDef_var::IR_EmitsDef_var (void) // default constructor
-+  : ptr_ (IR_EmitsDef::_nil ())
- {}
- 
--ACE_INLINE IR::EmitsDef_ptr 
--IR::EmitsDef_var::ptr (void) const
-+ACE_INLINE IR_EmitsDef_ptr 
-+IR_EmitsDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::EmitsDef_var::EmitsDef_var (const IR::EmitsDef_var &p) // copy constructor
-+IR_EmitsDef_var::IR_EmitsDef_var (const IR_EmitsDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (EmitsDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_EmitsDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::EmitsDef_var::~EmitsDef_var (void) // destructor
-+IR_EmitsDef_var::~IR_EmitsDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::EmitsDef_var &
--IR::EmitsDef_var::operator= (IR::EmitsDef_ptr p)
-+ACE_INLINE IR_EmitsDef_var &
-+IR_EmitsDef_var::operator= (IR_EmitsDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::EmitsDef_var &
--IR::EmitsDef_var::operator= (const IR::EmitsDef_var &p)
-+ACE_INLINE IR_EmitsDef_var &
-+IR_EmitsDef_var::operator= (const IR_EmitsDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::EmitsDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_EmitsDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::EmitsDef_var::operator const IR::EmitsDef_ptr &() const // cast
-+IR_EmitsDef_var::operator const IR_EmitsDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::EmitsDef_var::operator IR::EmitsDef_ptr &() // cast 
-+IR_EmitsDef_var::operator IR_EmitsDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EmitsDef_ptr 
--IR::EmitsDef_var::operator-> (void) const
-+ACE_INLINE IR_EmitsDef_ptr 
-+IR_EmitsDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EmitsDef_ptr
--IR::EmitsDef_var::in (void) const
-+ACE_INLINE IR_EmitsDef_ptr
-+IR_EmitsDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EmitsDef_ptr &
--IR::EmitsDef_var::inout (void)
-+ACE_INLINE IR_EmitsDef_ptr &
-+IR_EmitsDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EmitsDef_ptr &
--IR::EmitsDef_var::out (void)
-+ACE_INLINE IR_EmitsDef_ptr &
-+IR_EmitsDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::EmitsDef::_nil ();
-+  this->ptr_ = IR_EmitsDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EmitsDef_ptr 
--IR::EmitsDef_var::_retn (void)
-+ACE_INLINE IR_EmitsDef_ptr 
-+IR_EmitsDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::EmitsDef_ptr val = this->ptr_;
--  this->ptr_ = IR::EmitsDef::_nil ();
-+  IR_EmitsDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_EmitsDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_EMITSDEF___OUT_CI_)
--#define _IR_EMITSDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::EmitsDef_out
-+// Inline operations for class IR_EmitsDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::EmitsDef_out::EmitsDef_out (IR::EmitsDef_ptr &p)
-+IR_EmitsDef_out::IR_EmitsDef_out (IR_EmitsDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::EmitsDef::_nil ();
-+  this->ptr_ = IR_EmitsDef::_nil ();
- }
- 
- ACE_INLINE
--IR::EmitsDef_out::EmitsDef_out (IR::EmitsDef_var &p) // constructor from _var
-+IR_EmitsDef_out::IR_EmitsDef_out (IR_EmitsDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::EmitsDef::_nil ();
-+  this->ptr_ = IR_EmitsDef::_nil ();
- }
- 
- ACE_INLINE
--IR::EmitsDef_out::EmitsDef_out (const IR::EmitsDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::EmitsDef_out&,p).ptr_)
-+IR_EmitsDef_out::IR_EmitsDef_out (const IR_EmitsDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_EmitsDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::EmitsDef_out &
--IR::EmitsDef_out::operator= (const IR::EmitsDef_out &p)
-+ACE_INLINE IR_EmitsDef_out &
-+IR_EmitsDef_out::operator= (const IR_EmitsDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::EmitsDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_EmitsDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::EmitsDef_out &
--IR::EmitsDef_out::operator= (const IR::EmitsDef_var &p)
-+ACE_INLINE IR_EmitsDef_out &
-+IR_EmitsDef_out::operator= (const IR_EmitsDef_var &p)
- {
--  this->ptr_ = IR::EmitsDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_EmitsDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::EmitsDef_out &
--IR::EmitsDef_out::operator= (IR::EmitsDef_ptr p)
-+ACE_INLINE IR_EmitsDef_out &
-+IR_EmitsDef_out::operator= (IR_EmitsDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::EmitsDef_out::operator IR::EmitsDef_ptr &() // cast
-+IR_EmitsDef_out::operator IR_EmitsDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EmitsDef_ptr &
--IR::EmitsDef_out::ptr (void) // ptr
-+ACE_INLINE IR_EmitsDef_ptr &
-+IR_EmitsDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::EmitsDef_ptr 
--IR::EmitsDef_out::operator-> (void)
-+ACE_INLINE IR_EmitsDef_ptr 
-+IR_EmitsDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_
--
--  ACE_INLINE IR::EmitsDef **
--  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (CORBA::ULong nelems)
-+  ACE_INLINE IR_EmitsDef **
-+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (CORBA::ULong nelems)
-   {
--    IR::EmitsDef **buf = 0;
-+    IR_EmitsDef **buf = 0;
-     
--    ACE_NEW_RETURN (buf, IR::EmitsDef*[nelems], 0);
-+    ACE_NEW_RETURN (buf, IR_EmitsDef*[nelems], 0);
-     
-     for (CORBA::ULong i = 0; i < nelems; i++)
--      buf[i] = IR::EmitsDef::_nil ();
-+      buf[i] = IR_EmitsDef::_nil ();
-     
-     return buf;
-   }
-   
-   ACE_INLINE void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (IR::EmitsDef **buffer)
-+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (IR_EmitsDef **buffer)
-   {
-     if (buffer == 0)
-       return;
-@@ -6583,36 +6034,36 @@
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum)
-+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum)
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::EmitsDef* *value,
-+    IR_EmitsDef* *value,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq(const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
-+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq(const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::EmitsDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (this->maximum_);
--      IR::EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
-+      IR_EmitsDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (this->maximum_);
-+      IR_EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR_EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--        tmp1[i] = IR::EmitsDef::_duplicate (tmp2[i]);
-+        tmp1[i] = IR_EmitsDef::_duplicate (tmp2[i]);
-       
-       this->buffer_ = tmp1;
-     }
-@@ -6622,20 +6073,20 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &
--  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &
-+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
-   {
-     if (this == &rhs)
-       return *this;
-     
-     if (this->release_)
-     {
--      IR::EmitsDef **tmp = ACE_reinterpret_cast (IR::EmitsDef **, this->buffer_);
-+      IR_EmitsDef **tmp = ACE_reinterpret_cast (IR_EmitsDef **, this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-       {
-         CORBA::release (tmp[i]);
--        tmp[i] = IR::EmitsDef::_nil ();
-+        tmp[i] = IR_EmitsDef::_nil ();
-       }
-       if (this->maximum_ < rhs.maximum_)
-       {
-@@ -6648,28 +6099,28 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::EmitsDef **tmp1 = ACE_reinterpret_cast (IR::EmitsDef **, this->buffer_);
--    IR::EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
-+    IR_EmitsDef **tmp1 = ACE_reinterpret_cast (IR_EmitsDef **, this->buffer_);
-+    IR_EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR_EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--      tmp1[i] = IR::EmitsDef::_duplicate (tmp2[i]);
-+      tmp1[i] = IR_EmitsDef::_duplicate (tmp2[i]);
-     
-     return *this;
-   }
-   
--  ACE_INLINE TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var>
--  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator[] (CORBA::ULong index) const
-+  ACE_INLINE TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var>
-+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator[] (CORBA::ULong index) const
-   // read-write accessor
-   {
-     ACE_ASSERT (index < this->maximum_);
--    IR::EmitsDef ** const tmp = ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, this->buffer_);
--    return TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var> (tmp + index, this->release_);
-+    IR_EmitsDef ** const tmp = ACE_reinterpret_cast (IR_EmitsDef ** ACE_CAST_CONST, this->buffer_);
-+    return TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var> (tmp + index, this->release_);
-   }
-   
--  ACE_INLINE IR::EmitsDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_EmitsDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::EmitsDef **result = 0;
-+    IR_EmitsDef **result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -6681,7 +6132,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_EmitsDef**, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -6690,7 +6141,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::EmitsDef**,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_EmitsDef**,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -6700,60 +6151,53 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::EmitsDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (void) const
-+  ACE_INLINE const IR_EmitsDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::EmitsDef ** ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_EmitsDef ** ACE_CAST_CONST, this->buffer_);
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_EMITSDEFSEQ_CI_)
--#define _IR_EMITSDEFSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::EmitsDefSeq_var
-+// Inline operations for class IR_EmitsDefSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::EmitsDefSeq_var::EmitsDefSeq_var (void) // default constructor
-+IR_EmitsDefSeq_var::IR_EmitsDefSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::EmitsDefSeq_var::EmitsDefSeq_var (EmitsDefSeq *p)
-+IR_EmitsDefSeq_var::IR_EmitsDefSeq_var (IR_EmitsDefSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::EmitsDefSeq_var::EmitsDefSeq_var (const ::IR::EmitsDefSeq_var &p) // copy constructor
-+IR_EmitsDefSeq_var::IR_EmitsDefSeq_var (const ::IR_EmitsDefSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::EmitsDefSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_EmitsDefSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::EmitsDefSeq_var::~EmitsDefSeq_var (void) // destructor
-+IR_EmitsDefSeq_var::~IR_EmitsDefSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::EmitsDefSeq_var &
--IR::EmitsDefSeq_var::operator= (EmitsDefSeq *p)
-+ACE_INLINE IR_EmitsDefSeq_var &
-+IR_EmitsDefSeq_var::operator= (IR_EmitsDefSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::EmitsDefSeq_var &
--IR::EmitsDefSeq_var::operator= (const ::IR::EmitsDefSeq_var &p)
-+ACE_INLINE IR_EmitsDefSeq_var &
-+IR_EmitsDefSeq_var::operator= (const ::IR_EmitsDefSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -6764,12 +6208,12 @@
-         }
-       else
-         {
--          EmitsDefSeq *deep_copy =
--            new EmitsDefSeq (*p.ptr_);
-+          IR_EmitsDefSeq *deep_copy = 
-+            new IR_EmitsDefSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              EmitsDefSeq *tmp = deep_copy;
-+              IR_EmitsDefSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -6780,97 +6224,97 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::EmitsDefSeq *
--IR::EmitsDefSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_EmitsDefSeq *
-+IR_EmitsDefSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::EmitsDefSeq *
--IR::EmitsDefSeq_var::operator-> (void)
-+ACE_INLINE ::IR_EmitsDefSeq *
-+IR_EmitsDefSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::EmitsDefSeq_var::operator const ::IR::EmitsDefSeq &() const // cast
-+IR_EmitsDefSeq_var::operator const ::IR_EmitsDefSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::EmitsDefSeq_var::operator ::IR::EmitsDefSeq &() // cast 
-+IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::EmitsDefSeq_var::operator ::IR::EmitsDefSeq &() const // cast 
-+IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::EmitsDefSeq_var::operator ::IR::EmitsDefSeq *&() // cast 
-+IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::EmitsDef, IR::EmitsDef_var>
--IR::EmitsDefSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_EmitsDef, IR_EmitsDef_var>
-+IR_EmitsDefSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::IR::EmitsDefSeq &
--IR::EmitsDefSeq_var::in (void) const
-+ACE_INLINE const ::IR_EmitsDefSeq &
-+IR_EmitsDefSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::EmitsDefSeq &
--IR::EmitsDefSeq_var::inout (void)
-+ACE_INLINE ::IR_EmitsDefSeq &
-+IR_EmitsDefSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::EmitsDefSeq *&
--IR::EmitsDefSeq_var::out (void)
-+ACE_INLINE ::IR_EmitsDefSeq *&
-+IR_EmitsDefSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::EmitsDefSeq *
--IR::EmitsDefSeq_var::_retn (void)
-+ACE_INLINE ::IR_EmitsDefSeq *
-+IR_EmitsDefSeq_var::_retn (void)
- {
--  ::IR::EmitsDefSeq *tmp = this->ptr_;
-+  ::IR_EmitsDefSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::EmitsDefSeq *
--IR::EmitsDefSeq_var::ptr (void) const
-+ACE_INLINE ::IR_EmitsDefSeq *
-+IR_EmitsDefSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::EmitsDefSeq_out
-+// Inline operations for class IR_EmitsDefSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::EmitsDefSeq_out::EmitsDefSeq_out (EmitsDefSeq *&p)
-+IR_EmitsDefSeq_out::IR_EmitsDefSeq_out (IR_EmitsDefSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::EmitsDefSeq_out::EmitsDefSeq_out (EmitsDefSeq_var &p) // constructor from _var
-+IR_EmitsDefSeq_out::IR_EmitsDefSeq_out (IR_EmitsDefSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -6878,57 +6322,50 @@
- }
- 
- ACE_INLINE
--IR::EmitsDefSeq_out::EmitsDefSeq_out (const ::IR::EmitsDefSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (EmitsDefSeq_out&, p).ptr_)
-+IR_EmitsDefSeq_out::IR_EmitsDefSeq_out (const ::IR_EmitsDefSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_EmitsDefSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::EmitsDefSeq_out &
--IR::EmitsDefSeq_out::operator= (const ::IR::EmitsDefSeq_out &p)
-+ACE_INLINE ::IR_EmitsDefSeq_out &
-+IR_EmitsDefSeq_out::operator= (const ::IR_EmitsDefSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (EmitsDefSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_EmitsDefSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::EmitsDefSeq_out &
--IR::EmitsDefSeq_out::operator= (EmitsDefSeq *p)
-+ACE_INLINE ::IR_EmitsDefSeq_out &
-+IR_EmitsDefSeq_out::operator= (IR_EmitsDefSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::EmitsDefSeq_out::operator ::IR::EmitsDefSeq *&() // cast
-+IR_EmitsDefSeq_out::operator ::IR_EmitsDefSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::EmitsDefSeq *&
--IR::EmitsDefSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_EmitsDefSeq *&
-+IR_EmitsDefSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::EmitsDefSeq *
--IR::EmitsDefSeq_out::operator-> (void)
-+ACE_INLINE ::IR_EmitsDefSeq *
-+IR_EmitsDefSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::EmitsDef, IR::EmitsDef_var>
--IR::EmitsDefSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_EmitsDef, IR_EmitsDef_var>
-+IR_EmitsDefSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PUBLISHESDEF___CI_)
--#define _IR_PUBLISHESDEF___CI_
--
- ACE_INLINE
--IR::PublishesDef::PublishesDef (
-+IR_PublishesDef::IR_PublishesDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -6938,200 +6375,179 @@
-   this->IR_PublishesDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PUBLISHESDEF___VAR_CI_)
--#define _IR_PUBLISHESDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::PublishesDef_var
-+// Inline operations for class IR_PublishesDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::PublishesDef_var::PublishesDef_var (void) // default constructor
--  : ptr_ (IR::PublishesDef::_nil ())
-+IR_PublishesDef_var::IR_PublishesDef_var (void) // default constructor
-+  : ptr_ (IR_PublishesDef::_nil ())
- {}
- 
--ACE_INLINE IR::PublishesDef_ptr 
--IR::PublishesDef_var::ptr (void) const
-+ACE_INLINE IR_PublishesDef_ptr 
-+IR_PublishesDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::PublishesDef_var::PublishesDef_var (const IR::PublishesDef_var &p) // copy constructor
-+IR_PublishesDef_var::IR_PublishesDef_var (const IR_PublishesDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (PublishesDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_PublishesDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::PublishesDef_var::~PublishesDef_var (void) // destructor
-+IR_PublishesDef_var::~IR_PublishesDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::PublishesDef_var &
--IR::PublishesDef_var::operator= (IR::PublishesDef_ptr p)
-+ACE_INLINE IR_PublishesDef_var &
-+IR_PublishesDef_var::operator= (IR_PublishesDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::PublishesDef_var &
--IR::PublishesDef_var::operator= (const IR::PublishesDef_var &p)
-+ACE_INLINE IR_PublishesDef_var &
-+IR_PublishesDef_var::operator= (const IR_PublishesDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::PublishesDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_PublishesDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::PublishesDef_var::operator const IR::PublishesDef_ptr &() const // cast
-+IR_PublishesDef_var::operator const IR_PublishesDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::PublishesDef_var::operator IR::PublishesDef_ptr &() // cast 
-+IR_PublishesDef_var::operator IR_PublishesDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PublishesDef_ptr 
--IR::PublishesDef_var::operator-> (void) const
-+ACE_INLINE IR_PublishesDef_ptr 
-+IR_PublishesDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PublishesDef_ptr
--IR::PublishesDef_var::in (void) const
-+ACE_INLINE IR_PublishesDef_ptr
-+IR_PublishesDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PublishesDef_ptr &
--IR::PublishesDef_var::inout (void)
-+ACE_INLINE IR_PublishesDef_ptr &
-+IR_PublishesDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PublishesDef_ptr &
--IR::PublishesDef_var::out (void)
-+ACE_INLINE IR_PublishesDef_ptr &
-+IR_PublishesDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::PublishesDef::_nil ();
-+  this->ptr_ = IR_PublishesDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PublishesDef_ptr 
--IR::PublishesDef_var::_retn (void)
-+ACE_INLINE IR_PublishesDef_ptr 
-+IR_PublishesDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::PublishesDef_ptr val = this->ptr_;
--  this->ptr_ = IR::PublishesDef::_nil ();
-+  IR_PublishesDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_PublishesDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PUBLISHESDEF___OUT_CI_)
--#define _IR_PUBLISHESDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::PublishesDef_out
-+// Inline operations for class IR_PublishesDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::PublishesDef_out::PublishesDef_out (IR::PublishesDef_ptr &p)
-+IR_PublishesDef_out::IR_PublishesDef_out (IR_PublishesDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::PublishesDef::_nil ();
-+  this->ptr_ = IR_PublishesDef::_nil ();
- }
- 
- ACE_INLINE
--IR::PublishesDef_out::PublishesDef_out (IR::PublishesDef_var &p) // constructor from _var
-+IR_PublishesDef_out::IR_PublishesDef_out (IR_PublishesDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::PublishesDef::_nil ();
-+  this->ptr_ = IR_PublishesDef::_nil ();
- }
- 
- ACE_INLINE
--IR::PublishesDef_out::PublishesDef_out (const IR::PublishesDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::PublishesDef_out&,p).ptr_)
-+IR_PublishesDef_out::IR_PublishesDef_out (const IR_PublishesDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_PublishesDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::PublishesDef_out &
--IR::PublishesDef_out::operator= (const IR::PublishesDef_out &p)
-+ACE_INLINE IR_PublishesDef_out &
-+IR_PublishesDef_out::operator= (const IR_PublishesDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::PublishesDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_PublishesDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::PublishesDef_out &
--IR::PublishesDef_out::operator= (const IR::PublishesDef_var &p)
-+ACE_INLINE IR_PublishesDef_out &
-+IR_PublishesDef_out::operator= (const IR_PublishesDef_var &p)
- {
--  this->ptr_ = IR::PublishesDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_PublishesDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::PublishesDef_out &
--IR::PublishesDef_out::operator= (IR::PublishesDef_ptr p)
-+ACE_INLINE IR_PublishesDef_out &
-+IR_PublishesDef_out::operator= (IR_PublishesDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::PublishesDef_out::operator IR::PublishesDef_ptr &() // cast
-+IR_PublishesDef_out::operator IR_PublishesDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PublishesDef_ptr &
--IR::PublishesDef_out::ptr (void) // ptr
-+ACE_INLINE IR_PublishesDef_ptr &
-+IR_PublishesDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PublishesDef_ptr 
--IR::PublishesDef_out::operator-> (void)
-+ACE_INLINE IR_PublishesDef_ptr 
-+IR_PublishesDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_
--
--  ACE_INLINE IR::PublishesDef **
--  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (CORBA::ULong nelems)
-+  ACE_INLINE IR_PublishesDef **
-+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (CORBA::ULong nelems)
-   {
--    IR::PublishesDef **buf = 0;
-+    IR_PublishesDef **buf = 0;
-     
--    ACE_NEW_RETURN (buf, IR::PublishesDef*[nelems], 0);
-+    ACE_NEW_RETURN (buf, IR_PublishesDef*[nelems], 0);
-     
-     for (CORBA::ULong i = 0; i < nelems; i++)
--      buf[i] = IR::PublishesDef::_nil ();
-+      buf[i] = IR_PublishesDef::_nil ();
-     
-     return buf;
-   }
-   
-   ACE_INLINE void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (IR::PublishesDef **buffer)
-+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (IR_PublishesDef **buffer)
-   {
-     if (buffer == 0)
-       return;
-@@ -7139,36 +6555,36 @@
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum)
-+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum)
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::PublishesDef* *value,
-+    IR_PublishesDef* *value,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
-+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::PublishesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (this->maximum_);
--      IR::PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
-+      IR_PublishesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (this->maximum_);
-+      IR_PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR_PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--        tmp1[i] = IR::PublishesDef::_duplicate (tmp2[i]);
-+        tmp1[i] = IR_PublishesDef::_duplicate (tmp2[i]);
-       
-       this->buffer_ = tmp1;
-     }
-@@ -7178,20 +6594,20 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &
--  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &
-+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
-   {
-     if (this == &rhs)
-       return *this;
-     
-     if (this->release_)
-     {
--      IR::PublishesDef **tmp = ACE_reinterpret_cast (IR::PublishesDef **, this->buffer_);
-+      IR_PublishesDef **tmp = ACE_reinterpret_cast (IR_PublishesDef **, this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-       {
-         CORBA::release (tmp[i]);
--        tmp[i] = IR::PublishesDef::_nil ();
-+        tmp[i] = IR_PublishesDef::_nil ();
-       }
-       if (this->maximum_ < rhs.maximum_)
-       {
-@@ -7204,28 +6620,28 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::PublishesDef **tmp1 = ACE_reinterpret_cast (IR::PublishesDef **, this->buffer_);
--    IR::PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
-+    IR_PublishesDef **tmp1 = ACE_reinterpret_cast (IR_PublishesDef **, this->buffer_);
-+    IR_PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR_PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--      tmp1[i] = IR::PublishesDef::_duplicate (tmp2[i]);
-+      tmp1[i] = IR_PublishesDef::_duplicate (tmp2[i]);
-     
-     return *this;
-   }
-   
--  ACE_INLINE TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var>
--  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator[] (CORBA::ULong index) const
-+  ACE_INLINE TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var>
-+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator[] (CORBA::ULong index) const
-   // read-write accessor
-   {
-     ACE_ASSERT (index < this->maximum_);
--    IR::PublishesDef ** const tmp = ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, this->buffer_);
--    return TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var> (tmp + index, this->release_);
-+    IR_PublishesDef ** const tmp = ACE_reinterpret_cast (IR_PublishesDef ** ACE_CAST_CONST, this->buffer_);
-+    return TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var> (tmp + index, this->release_);
-   }
-   
--  ACE_INLINE IR::PublishesDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_PublishesDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::PublishesDef **result = 0;
-+    IR_PublishesDef **result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -7237,7 +6653,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_PublishesDef**, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -7246,7 +6662,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::PublishesDef**,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_PublishesDef**,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -7256,60 +6672,53 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::PublishesDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (void) const
-+  ACE_INLINE const IR_PublishesDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::PublishesDef ** ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_PublishesDef ** ACE_CAST_CONST, this->buffer_);
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_PUBLISHESDEFSEQ_CI_)
--#define _IR_PUBLISHESDEFSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::PublishesDefSeq_var
-+// Inline operations for class IR_PublishesDefSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::PublishesDefSeq_var::PublishesDefSeq_var (void) // default constructor
-+IR_PublishesDefSeq_var::IR_PublishesDefSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::PublishesDefSeq_var::PublishesDefSeq_var (PublishesDefSeq *p)
-+IR_PublishesDefSeq_var::IR_PublishesDefSeq_var (IR_PublishesDefSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::PublishesDefSeq_var::PublishesDefSeq_var (const ::IR::PublishesDefSeq_var &p) // copy constructor
-+IR_PublishesDefSeq_var::IR_PublishesDefSeq_var (const ::IR_PublishesDefSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::PublishesDefSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_PublishesDefSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::PublishesDefSeq_var::~PublishesDefSeq_var (void) // destructor
-+IR_PublishesDefSeq_var::~IR_PublishesDefSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::PublishesDefSeq_var &
--IR::PublishesDefSeq_var::operator= (PublishesDefSeq *p)
-+ACE_INLINE IR_PublishesDefSeq_var &
-+IR_PublishesDefSeq_var::operator= (IR_PublishesDefSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::PublishesDefSeq_var &
--IR::PublishesDefSeq_var::operator= (const ::IR::PublishesDefSeq_var &p)
-+ACE_INLINE IR_PublishesDefSeq_var &
-+IR_PublishesDefSeq_var::operator= (const ::IR_PublishesDefSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -7320,12 +6729,12 @@
-         }
-       else
-         {
--          PublishesDefSeq *deep_copy =
--            new PublishesDefSeq (*p.ptr_);
-+          IR_PublishesDefSeq *deep_copy = 
-+            new IR_PublishesDefSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              PublishesDefSeq *tmp = deep_copy;
-+              IR_PublishesDefSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -7336,97 +6745,97 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::PublishesDefSeq *
--IR::PublishesDefSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_PublishesDefSeq *
-+IR_PublishesDefSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::PublishesDefSeq *
--IR::PublishesDefSeq_var::operator-> (void)
-+ACE_INLINE ::IR_PublishesDefSeq *
-+IR_PublishesDefSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::PublishesDefSeq_var::operator const ::IR::PublishesDefSeq &() const // cast
-+IR_PublishesDefSeq_var::operator const ::IR_PublishesDefSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::PublishesDefSeq_var::operator ::IR::PublishesDefSeq &() // cast 
-+IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::PublishesDefSeq_var::operator ::IR::PublishesDefSeq &() const // cast 
-+IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::PublishesDefSeq_var::operator ::IR::PublishesDefSeq *&() // cast 
-+IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::PublishesDef, IR::PublishesDef_var>
--IR::PublishesDefSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_PublishesDef, IR_PublishesDef_var>
-+IR_PublishesDefSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::IR::PublishesDefSeq &
--IR::PublishesDefSeq_var::in (void) const
-+ACE_INLINE const ::IR_PublishesDefSeq &
-+IR_PublishesDefSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::PublishesDefSeq &
--IR::PublishesDefSeq_var::inout (void)
-+ACE_INLINE ::IR_PublishesDefSeq &
-+IR_PublishesDefSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::PublishesDefSeq *&
--IR::PublishesDefSeq_var::out (void)
-+ACE_INLINE ::IR_PublishesDefSeq *&
-+IR_PublishesDefSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::PublishesDefSeq *
--IR::PublishesDefSeq_var::_retn (void)
-+ACE_INLINE ::IR_PublishesDefSeq *
-+IR_PublishesDefSeq_var::_retn (void)
- {
--  ::IR::PublishesDefSeq *tmp = this->ptr_;
-+  ::IR_PublishesDefSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::PublishesDefSeq *
--IR::PublishesDefSeq_var::ptr (void) const
-+ACE_INLINE ::IR_PublishesDefSeq *
-+IR_PublishesDefSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::PublishesDefSeq_out
-+// Inline operations for class IR_PublishesDefSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::PublishesDefSeq_out::PublishesDefSeq_out (PublishesDefSeq *&p)
-+IR_PublishesDefSeq_out::IR_PublishesDefSeq_out (IR_PublishesDefSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::PublishesDefSeq_out::PublishesDefSeq_out (PublishesDefSeq_var &p) // constructor from _var
-+IR_PublishesDefSeq_out::IR_PublishesDefSeq_out (IR_PublishesDefSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -7434,57 +6843,50 @@
- }
- 
- ACE_INLINE
--IR::PublishesDefSeq_out::PublishesDefSeq_out (const ::IR::PublishesDefSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (PublishesDefSeq_out&, p).ptr_)
-+IR_PublishesDefSeq_out::IR_PublishesDefSeq_out (const ::IR_PublishesDefSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_PublishesDefSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::PublishesDefSeq_out &
--IR::PublishesDefSeq_out::operator= (const ::IR::PublishesDefSeq_out &p)
-+ACE_INLINE ::IR_PublishesDefSeq_out &
-+IR_PublishesDefSeq_out::operator= (const ::IR_PublishesDefSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (PublishesDefSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_PublishesDefSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::PublishesDefSeq_out &
--IR::PublishesDefSeq_out::operator= (PublishesDefSeq *p)
-+ACE_INLINE ::IR_PublishesDefSeq_out &
-+IR_PublishesDefSeq_out::operator= (IR_PublishesDefSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::PublishesDefSeq_out::operator ::IR::PublishesDefSeq *&() // cast
-+IR_PublishesDefSeq_out::operator ::IR_PublishesDefSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::PublishesDefSeq *&
--IR::PublishesDefSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_PublishesDefSeq *&
-+IR_PublishesDefSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::PublishesDefSeq *
--IR::PublishesDefSeq_out::operator-> (void)
-+ACE_INLINE ::IR_PublishesDefSeq *
-+IR_PublishesDefSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::PublishesDef, IR::PublishesDef_var>
--IR::PublishesDefSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_PublishesDef, IR_PublishesDef_var>
-+IR_PublishesDefSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSUMESDEF___CI_)
--#define _IR_CONSUMESDEF___CI_
--
- ACE_INLINE
--IR::ConsumesDef::ConsumesDef (
-+IR_ConsumesDef::IR_ConsumesDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -7494,200 +6896,179 @@
-   this->IR_ConsumesDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSUMESDEF___VAR_CI_)
--#define _IR_CONSUMESDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::ConsumesDef_var
-+// Inline operations for class IR_ConsumesDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ConsumesDef_var::ConsumesDef_var (void) // default constructor
--  : ptr_ (IR::ConsumesDef::_nil ())
-+IR_ConsumesDef_var::IR_ConsumesDef_var (void) // default constructor
-+  : ptr_ (IR_ConsumesDef::_nil ())
- {}
- 
--ACE_INLINE IR::ConsumesDef_ptr 
--IR::ConsumesDef_var::ptr (void) const
-+ACE_INLINE IR_ConsumesDef_ptr 
-+IR_ConsumesDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ConsumesDef_var::ConsumesDef_var (const IR::ConsumesDef_var &p) // copy constructor
-+IR_ConsumesDef_var::IR_ConsumesDef_var (const IR_ConsumesDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (ConsumesDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_ConsumesDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::ConsumesDef_var::~ConsumesDef_var (void) // destructor
-+IR_ConsumesDef_var::~IR_ConsumesDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::ConsumesDef_var &
--IR::ConsumesDef_var::operator= (IR::ConsumesDef_ptr p)
-+ACE_INLINE IR_ConsumesDef_var &
-+IR_ConsumesDef_var::operator= (IR_ConsumesDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::ConsumesDef_var &
--IR::ConsumesDef_var::operator= (const IR::ConsumesDef_var &p)
-+ACE_INLINE IR_ConsumesDef_var &
-+IR_ConsumesDef_var::operator= (const IR_ConsumesDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::ConsumesDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_ConsumesDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ConsumesDef_var::operator const IR::ConsumesDef_ptr &() const // cast
-+IR_ConsumesDef_var::operator const IR_ConsumesDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ConsumesDef_var::operator IR::ConsumesDef_ptr &() // cast 
-+IR_ConsumesDef_var::operator IR_ConsumesDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ConsumesDef_ptr 
--IR::ConsumesDef_var::operator-> (void) const
-+ACE_INLINE IR_ConsumesDef_ptr 
-+IR_ConsumesDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ConsumesDef_ptr
--IR::ConsumesDef_var::in (void) const
-+ACE_INLINE IR_ConsumesDef_ptr
-+IR_ConsumesDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ConsumesDef_ptr &
--IR::ConsumesDef_var::inout (void)
-+ACE_INLINE IR_ConsumesDef_ptr &
-+IR_ConsumesDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ConsumesDef_ptr &
--IR::ConsumesDef_var::out (void)
-+ACE_INLINE IR_ConsumesDef_ptr &
-+IR_ConsumesDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ConsumesDef::_nil ();
-+  this->ptr_ = IR_ConsumesDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ConsumesDef_ptr 
--IR::ConsumesDef_var::_retn (void)
-+ACE_INLINE IR_ConsumesDef_ptr 
-+IR_ConsumesDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::ConsumesDef_ptr val = this->ptr_;
--  this->ptr_ = IR::ConsumesDef::_nil ();
-+  IR_ConsumesDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_ConsumesDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONSUMESDEF___OUT_CI_)
--#define _IR_CONSUMESDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::ConsumesDef_out
-+// Inline operations for class IR_ConsumesDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ConsumesDef_out::ConsumesDef_out (IR::ConsumesDef_ptr &p)
-+IR_ConsumesDef_out::IR_ConsumesDef_out (IR_ConsumesDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::ConsumesDef::_nil ();
-+  this->ptr_ = IR_ConsumesDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ConsumesDef_out::ConsumesDef_out (IR::ConsumesDef_var &p) // constructor from _var
-+IR_ConsumesDef_out::IR_ConsumesDef_out (IR_ConsumesDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ConsumesDef::_nil ();
-+  this->ptr_ = IR_ConsumesDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ConsumesDef_out::ConsumesDef_out (const IR::ConsumesDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::ConsumesDef_out&,p).ptr_)
-+IR_ConsumesDef_out::IR_ConsumesDef_out (const IR_ConsumesDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ConsumesDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::ConsumesDef_out &
--IR::ConsumesDef_out::operator= (const IR::ConsumesDef_out &p)
-+ACE_INLINE IR_ConsumesDef_out &
-+IR_ConsumesDef_out::operator= (const IR_ConsumesDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::ConsumesDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ConsumesDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ConsumesDef_out &
--IR::ConsumesDef_out::operator= (const IR::ConsumesDef_var &p)
-+ACE_INLINE IR_ConsumesDef_out &
-+IR_ConsumesDef_out::operator= (const IR_ConsumesDef_var &p)
- {
--  this->ptr_ = IR::ConsumesDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_ConsumesDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::ConsumesDef_out &
--IR::ConsumesDef_out::operator= (IR::ConsumesDef_ptr p)
-+ACE_INLINE IR_ConsumesDef_out &
-+IR_ConsumesDef_out::operator= (IR_ConsumesDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ConsumesDef_out::operator IR::ConsumesDef_ptr &() // cast
-+IR_ConsumesDef_out::operator IR_ConsumesDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ConsumesDef_ptr &
--IR::ConsumesDef_out::ptr (void) // ptr
-+ACE_INLINE IR_ConsumesDef_ptr &
-+IR_ConsumesDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ConsumesDef_ptr 
--IR::ConsumesDef_out::operator-> (void)
-+ACE_INLINE IR_ConsumesDef_ptr 
-+IR_ConsumesDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_
--
--  ACE_INLINE IR::ConsumesDef **
--  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (CORBA::ULong nelems)
-+  ACE_INLINE IR_ConsumesDef **
-+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (CORBA::ULong nelems)
-   {
--    IR::ConsumesDef **buf = 0;
-+    IR_ConsumesDef **buf = 0;
-     
--    ACE_NEW_RETURN (buf, IR::ConsumesDef*[nelems], 0);
-+    ACE_NEW_RETURN (buf, IR_ConsumesDef*[nelems], 0);
-     
-     for (CORBA::ULong i = 0; i < nelems; i++)
--      buf[i] = IR::ConsumesDef::_nil ();
-+      buf[i] = IR_ConsumesDef::_nil ();
-     
-     return buf;
-   }
-   
-   ACE_INLINE void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (IR::ConsumesDef **buffer)
-+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (IR_ConsumesDef **buffer)
-   {
-     if (buffer == 0)
-       return;
-@@ -7695,36 +7076,36 @@
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum)
-+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum)
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::ConsumesDef* *value,
-+    IR_ConsumesDef* *value,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
-+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::ConsumesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (this->maximum_);
--      IR::ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
-+      IR_ConsumesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (this->maximum_);
-+      IR_ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR_ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--        tmp1[i] = IR::ConsumesDef::_duplicate (tmp2[i]);
-+        tmp1[i] = IR_ConsumesDef::_duplicate (tmp2[i]);
-       
-       this->buffer_ = tmp1;
-     }
-@@ -7734,20 +7115,20 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &
--  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &
-+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
-   {
-     if (this == &rhs)
-       return *this;
-     
-     if (this->release_)
-     {
--      IR::ConsumesDef **tmp = ACE_reinterpret_cast (IR::ConsumesDef **, this->buffer_);
-+      IR_ConsumesDef **tmp = ACE_reinterpret_cast (IR_ConsumesDef **, this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-       {
-         CORBA::release (tmp[i]);
--        tmp[i] = IR::ConsumesDef::_nil ();
-+        tmp[i] = IR_ConsumesDef::_nil ();
-       }
-       if (this->maximum_ < rhs.maximum_)
-       {
-@@ -7760,28 +7141,28 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::ConsumesDef **tmp1 = ACE_reinterpret_cast (IR::ConsumesDef **, this->buffer_);
--    IR::ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
-+    IR_ConsumesDef **tmp1 = ACE_reinterpret_cast (IR_ConsumesDef **, this->buffer_);
-+    IR_ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR_ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--      tmp1[i] = IR::ConsumesDef::_duplicate (tmp2[i]);
-+      tmp1[i] = IR_ConsumesDef::_duplicate (tmp2[i]);
-     
-     return *this;
-   }
-   
--  ACE_INLINE TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var>
--  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator[] (CORBA::ULong index) const
-+  ACE_INLINE TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var>
-+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator[] (CORBA::ULong index) const
-   // read-write accessor
-   {
-     ACE_ASSERT (index < this->maximum_);
--    IR::ConsumesDef ** const tmp = ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, this->buffer_);
--    return TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var> (tmp + index, this->release_);
-+    IR_ConsumesDef ** const tmp = ACE_reinterpret_cast (IR_ConsumesDef ** ACE_CAST_CONST, this->buffer_);
-+    return TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var> (tmp + index, this->release_);
-   }
-   
--  ACE_INLINE IR::ConsumesDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_ConsumesDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::ConsumesDef **result = 0;
-+    IR_ConsumesDef **result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -7793,7 +7174,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_ConsumesDef**, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -7802,7 +7183,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::ConsumesDef**,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_ConsumesDef**,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -7812,60 +7193,53 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::ConsumesDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (void) const
-+  ACE_INLINE const IR_ConsumesDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::ConsumesDef ** ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_ConsumesDef ** ACE_CAST_CONST, this->buffer_);
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_CONSUMESDEFSEQ_CI_)
--#define _IR_CONSUMESDEFSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::ConsumesDefSeq_var
-+// Inline operations for class IR_ConsumesDefSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ConsumesDefSeq_var::ConsumesDefSeq_var (void) // default constructor
-+IR_ConsumesDefSeq_var::IR_ConsumesDefSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ConsumesDefSeq_var::ConsumesDefSeq_var (ConsumesDefSeq *p)
-+IR_ConsumesDefSeq_var::IR_ConsumesDefSeq_var (IR_ConsumesDefSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ConsumesDefSeq_var::ConsumesDefSeq_var (const ::IR::ConsumesDefSeq_var &p) // copy constructor
-+IR_ConsumesDefSeq_var::IR_ConsumesDefSeq_var (const ::IR_ConsumesDefSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ConsumesDefSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ConsumesDefSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ConsumesDefSeq_var::~ConsumesDefSeq_var (void) // destructor
-+IR_ConsumesDefSeq_var::~IR_ConsumesDefSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ConsumesDefSeq_var &
--IR::ConsumesDefSeq_var::operator= (ConsumesDefSeq *p)
-+ACE_INLINE IR_ConsumesDefSeq_var &
-+IR_ConsumesDefSeq_var::operator= (IR_ConsumesDefSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ConsumesDefSeq_var &
--IR::ConsumesDefSeq_var::operator= (const ::IR::ConsumesDefSeq_var &p)
-+ACE_INLINE IR_ConsumesDefSeq_var &
-+IR_ConsumesDefSeq_var::operator= (const ::IR_ConsumesDefSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -7876,12 +7250,12 @@
-         }
-       else
-         {
--          ConsumesDefSeq *deep_copy =
--            new ConsumesDefSeq (*p.ptr_);
-+          IR_ConsumesDefSeq *deep_copy = 
-+            new IR_ConsumesDefSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ConsumesDefSeq *tmp = deep_copy;
-+              IR_ConsumesDefSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -7892,97 +7266,97 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ConsumesDefSeq *
--IR::ConsumesDefSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_ConsumesDefSeq *
-+IR_ConsumesDefSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ConsumesDefSeq *
--IR::ConsumesDefSeq_var::operator-> (void)
-+ACE_INLINE ::IR_ConsumesDefSeq *
-+IR_ConsumesDefSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ConsumesDefSeq_var::operator const ::IR::ConsumesDefSeq &() const // cast
-+IR_ConsumesDefSeq_var::operator const ::IR_ConsumesDefSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ConsumesDefSeq_var::operator ::IR::ConsumesDefSeq &() // cast 
-+IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ConsumesDefSeq_var::operator ::IR::ConsumesDefSeq &() const // cast 
-+IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ConsumesDefSeq_var::operator ::IR::ConsumesDefSeq *&() // cast 
-+IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::ConsumesDef, IR::ConsumesDef_var>
--IR::ConsumesDefSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_ConsumesDef, IR_ConsumesDef_var>
-+IR_ConsumesDefSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::IR::ConsumesDefSeq &
--IR::ConsumesDefSeq_var::in (void) const
-+ACE_INLINE const ::IR_ConsumesDefSeq &
-+IR_ConsumesDefSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ConsumesDefSeq &
--IR::ConsumesDefSeq_var::inout (void)
-+ACE_INLINE ::IR_ConsumesDefSeq &
-+IR_ConsumesDefSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ConsumesDefSeq *&
--IR::ConsumesDefSeq_var::out (void)
-+ACE_INLINE ::IR_ConsumesDefSeq *&
-+IR_ConsumesDefSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ConsumesDefSeq *
--IR::ConsumesDefSeq_var::_retn (void)
-+ACE_INLINE ::IR_ConsumesDefSeq *
-+IR_ConsumesDefSeq_var::_retn (void)
- {
--  ::IR::ConsumesDefSeq *tmp = this->ptr_;
-+  ::IR_ConsumesDefSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ConsumesDefSeq *
--IR::ConsumesDefSeq_var::ptr (void) const
-+ACE_INLINE ::IR_ConsumesDefSeq *
-+IR_ConsumesDefSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ConsumesDefSeq_out
-+// Inline operations for class IR_ConsumesDefSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ConsumesDefSeq_out::ConsumesDefSeq_out (ConsumesDefSeq *&p)
-+IR_ConsumesDefSeq_out::IR_ConsumesDefSeq_out (IR_ConsumesDefSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ConsumesDefSeq_out::ConsumesDefSeq_out (ConsumesDefSeq_var &p) // constructor from _var
-+IR_ConsumesDefSeq_out::IR_ConsumesDefSeq_out (IR_ConsumesDefSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -7990,57 +7364,50 @@
- }
- 
- ACE_INLINE
--IR::ConsumesDefSeq_out::ConsumesDefSeq_out (const ::IR::ConsumesDefSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ConsumesDefSeq_out&, p).ptr_)
-+IR_ConsumesDefSeq_out::IR_ConsumesDefSeq_out (const ::IR_ConsumesDefSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ConsumesDefSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::ConsumesDefSeq_out &
--IR::ConsumesDefSeq_out::operator= (const ::IR::ConsumesDefSeq_out &p)
-+ACE_INLINE ::IR_ConsumesDefSeq_out &
-+IR_ConsumesDefSeq_out::operator= (const ::IR_ConsumesDefSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (ConsumesDefSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ConsumesDefSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ConsumesDefSeq_out &
--IR::ConsumesDefSeq_out::operator= (ConsumesDefSeq *p)
-+ACE_INLINE ::IR_ConsumesDefSeq_out &
-+IR_ConsumesDefSeq_out::operator= (IR_ConsumesDefSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ConsumesDefSeq_out::operator ::IR::ConsumesDefSeq *&() // cast
-+IR_ConsumesDefSeq_out::operator ::IR_ConsumesDefSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ConsumesDefSeq *&
--IR::ConsumesDefSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ConsumesDefSeq *&
-+IR_ConsumesDefSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ConsumesDefSeq *
--IR::ConsumesDefSeq_out::operator-> (void)
-+ACE_INLINE ::IR_ConsumesDefSeq *
-+IR_ConsumesDefSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::ConsumesDef, IR::ConsumesDef_var>
--IR::ConsumesDefSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_ConsumesDef, IR_ConsumesDef_var>
-+IR_ConsumesDefSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FACTORYDEF___CI_)
--#define _IR_FACTORYDEF___CI_
--
- ACE_INLINE
--IR::FactoryDef::FactoryDef (
-+IR_FactoryDef::IR_FactoryDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -8050,200 +7417,179 @@
-   this->IR_FactoryDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FACTORYDEF___VAR_CI_)
--#define _IR_FACTORYDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::FactoryDef_var
-+// Inline operations for class IR_FactoryDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::FactoryDef_var::FactoryDef_var (void) // default constructor
--  : ptr_ (IR::FactoryDef::_nil ())
-+IR_FactoryDef_var::IR_FactoryDef_var (void) // default constructor
-+  : ptr_ (IR_FactoryDef::_nil ())
- {}
- 
--ACE_INLINE IR::FactoryDef_ptr 
--IR::FactoryDef_var::ptr (void) const
-+ACE_INLINE IR_FactoryDef_ptr 
-+IR_FactoryDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::FactoryDef_var::FactoryDef_var (const IR::FactoryDef_var &p) // copy constructor
-+IR_FactoryDef_var::IR_FactoryDef_var (const IR_FactoryDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (FactoryDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_FactoryDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::FactoryDef_var::~FactoryDef_var (void) // destructor
-+IR_FactoryDef_var::~IR_FactoryDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::FactoryDef_var &
--IR::FactoryDef_var::operator= (IR::FactoryDef_ptr p)
-+ACE_INLINE IR_FactoryDef_var &
-+IR_FactoryDef_var::operator= (IR_FactoryDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::FactoryDef_var &
--IR::FactoryDef_var::operator= (const IR::FactoryDef_var &p)
-+ACE_INLINE IR_FactoryDef_var &
-+IR_FactoryDef_var::operator= (const IR_FactoryDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::FactoryDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_FactoryDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::FactoryDef_var::operator const IR::FactoryDef_ptr &() const // cast
-+IR_FactoryDef_var::operator const IR_FactoryDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::FactoryDef_var::operator IR::FactoryDef_ptr &() // cast 
-+IR_FactoryDef_var::operator IR_FactoryDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FactoryDef_ptr 
--IR::FactoryDef_var::operator-> (void) const
-+ACE_INLINE IR_FactoryDef_ptr 
-+IR_FactoryDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FactoryDef_ptr
--IR::FactoryDef_var::in (void) const
-+ACE_INLINE IR_FactoryDef_ptr
-+IR_FactoryDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FactoryDef_ptr &
--IR::FactoryDef_var::inout (void)
-+ACE_INLINE IR_FactoryDef_ptr &
-+IR_FactoryDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FactoryDef_ptr &
--IR::FactoryDef_var::out (void)
-+ACE_INLINE IR_FactoryDef_ptr &
-+IR_FactoryDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::FactoryDef::_nil ();
-+  this->ptr_ = IR_FactoryDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FactoryDef_ptr 
--IR::FactoryDef_var::_retn (void)
-+ACE_INLINE IR_FactoryDef_ptr 
-+IR_FactoryDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::FactoryDef_ptr val = this->ptr_;
--  this->ptr_ = IR::FactoryDef::_nil ();
-+  IR_FactoryDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_FactoryDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FACTORYDEF___OUT_CI_)
--#define _IR_FACTORYDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::FactoryDef_out
-+// Inline operations for class IR_FactoryDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::FactoryDef_out::FactoryDef_out (IR::FactoryDef_ptr &p)
-+IR_FactoryDef_out::IR_FactoryDef_out (IR_FactoryDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::FactoryDef::_nil ();
-+  this->ptr_ = IR_FactoryDef::_nil ();
- }
- 
- ACE_INLINE
--IR::FactoryDef_out::FactoryDef_out (IR::FactoryDef_var &p) // constructor from _var
-+IR_FactoryDef_out::IR_FactoryDef_out (IR_FactoryDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::FactoryDef::_nil ();
-+  this->ptr_ = IR_FactoryDef::_nil ();
- }
- 
- ACE_INLINE
--IR::FactoryDef_out::FactoryDef_out (const IR::FactoryDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::FactoryDef_out&,p).ptr_)
-+IR_FactoryDef_out::IR_FactoryDef_out (const IR_FactoryDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_FactoryDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::FactoryDef_out &
--IR::FactoryDef_out::operator= (const IR::FactoryDef_out &p)
-+ACE_INLINE IR_FactoryDef_out &
-+IR_FactoryDef_out::operator= (const IR_FactoryDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::FactoryDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_FactoryDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::FactoryDef_out &
--IR::FactoryDef_out::operator= (const IR::FactoryDef_var &p)
-+ACE_INLINE IR_FactoryDef_out &
-+IR_FactoryDef_out::operator= (const IR_FactoryDef_var &p)
- {
--  this->ptr_ = IR::FactoryDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_FactoryDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::FactoryDef_out &
--IR::FactoryDef_out::operator= (IR::FactoryDef_ptr p)
-+ACE_INLINE IR_FactoryDef_out &
-+IR_FactoryDef_out::operator= (IR_FactoryDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::FactoryDef_out::operator IR::FactoryDef_ptr &() // cast
-+IR_FactoryDef_out::operator IR_FactoryDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FactoryDef_ptr &
--IR::FactoryDef_out::ptr (void) // ptr
-+ACE_INLINE IR_FactoryDef_ptr &
-+IR_FactoryDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FactoryDef_ptr 
--IR::FactoryDef_out::operator-> (void)
-+ACE_INLINE IR_FactoryDef_ptr 
-+IR_FactoryDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_
--
--  ACE_INLINE IR::FactoryDef **
--  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (CORBA::ULong nelems)
-+  ACE_INLINE IR_FactoryDef **
-+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (CORBA::ULong nelems)
-   {
--    IR::FactoryDef **buf = 0;
-+    IR_FactoryDef **buf = 0;
-     
--    ACE_NEW_RETURN (buf, IR::FactoryDef*[nelems], 0);
-+    ACE_NEW_RETURN (buf, IR_FactoryDef*[nelems], 0);
-     
-     for (CORBA::ULong i = 0; i < nelems; i++)
--      buf[i] = IR::FactoryDef::_nil ();
-+      buf[i] = IR_FactoryDef::_nil ();
-     
-     return buf;
-   }
-   
-   ACE_INLINE void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (IR::FactoryDef **buffer)
-+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (IR_FactoryDef **buffer)
-   {
-     if (buffer == 0)
-       return;
-@@ -8251,36 +7597,36 @@
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum)
-+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum)
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::FactoryDef* *value,
-+    IR_FactoryDef* *value,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
-+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::FactoryDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (this->maximum_);
--      IR::FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
-+      IR_FactoryDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (this->maximum_);
-+      IR_FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR_FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--        tmp1[i] = IR::FactoryDef::_duplicate (tmp2[i]);
-+        tmp1[i] = IR_FactoryDef::_duplicate (tmp2[i]);
-       
-       this->buffer_ = tmp1;
-     }
-@@ -8290,20 +7636,20 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &
--  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &
-+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
-   {
-     if (this == &rhs)
-       return *this;
-     
-     if (this->release_)
-     {
--      IR::FactoryDef **tmp = ACE_reinterpret_cast (IR::FactoryDef **, this->buffer_);
-+      IR_FactoryDef **tmp = ACE_reinterpret_cast (IR_FactoryDef **, this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-       {
-         CORBA::release (tmp[i]);
--        tmp[i] = IR::FactoryDef::_nil ();
-+        tmp[i] = IR_FactoryDef::_nil ();
-       }
-       if (this->maximum_ < rhs.maximum_)
-       {
-@@ -8316,28 +7662,28 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::FactoryDef **tmp1 = ACE_reinterpret_cast (IR::FactoryDef **, this->buffer_);
--    IR::FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
-+    IR_FactoryDef **tmp1 = ACE_reinterpret_cast (IR_FactoryDef **, this->buffer_);
-+    IR_FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR_FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--      tmp1[i] = IR::FactoryDef::_duplicate (tmp2[i]);
-+      tmp1[i] = IR_FactoryDef::_duplicate (tmp2[i]);
-     
-     return *this;
-   }
-   
--  ACE_INLINE TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var>
--  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator[] (CORBA::ULong index) const
-+  ACE_INLINE TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var>
-+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator[] (CORBA::ULong index) const
-   // read-write accessor
-   {
-     ACE_ASSERT (index < this->maximum_);
--    IR::FactoryDef ** const tmp = ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, this->buffer_);
--    return TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var> (tmp + index, this->release_);
-+    IR_FactoryDef ** const tmp = ACE_reinterpret_cast (IR_FactoryDef ** ACE_CAST_CONST, this->buffer_);
-+    return TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var> (tmp + index, this->release_);
-   }
-   
--  ACE_INLINE IR::FactoryDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_FactoryDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::FactoryDef **result = 0;
-+    IR_FactoryDef **result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -8349,7 +7695,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_FactoryDef**, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -8358,7 +7704,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::FactoryDef**,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_FactoryDef**,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -8368,60 +7714,53 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::FactoryDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (void) const
-+  ACE_INLINE const IR_FactoryDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::FactoryDef ** ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_FactoryDef ** ACE_CAST_CONST, this->buffer_);
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_FACTORYDEFSEQ_CI_)
--#define _IR_FACTORYDEFSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::FactoryDefSeq_var
-+// Inline operations for class IR_FactoryDefSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::FactoryDefSeq_var::FactoryDefSeq_var (void) // default constructor
-+IR_FactoryDefSeq_var::IR_FactoryDefSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::FactoryDefSeq_var::FactoryDefSeq_var (FactoryDefSeq *p)
-+IR_FactoryDefSeq_var::IR_FactoryDefSeq_var (IR_FactoryDefSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::FactoryDefSeq_var::FactoryDefSeq_var (const ::IR::FactoryDefSeq_var &p) // copy constructor
-+IR_FactoryDefSeq_var::IR_FactoryDefSeq_var (const ::IR_FactoryDefSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::FactoryDefSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_FactoryDefSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::FactoryDefSeq_var::~FactoryDefSeq_var (void) // destructor
-+IR_FactoryDefSeq_var::~IR_FactoryDefSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::FactoryDefSeq_var &
--IR::FactoryDefSeq_var::operator= (FactoryDefSeq *p)
-+ACE_INLINE IR_FactoryDefSeq_var &
-+IR_FactoryDefSeq_var::operator= (IR_FactoryDefSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::FactoryDefSeq_var &
--IR::FactoryDefSeq_var::operator= (const ::IR::FactoryDefSeq_var &p)
-+ACE_INLINE IR_FactoryDefSeq_var &
-+IR_FactoryDefSeq_var::operator= (const ::IR_FactoryDefSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -8432,12 +7771,12 @@
-         }
-       else
-         {
--          FactoryDefSeq *deep_copy =
--            new FactoryDefSeq (*p.ptr_);
-+          IR_FactoryDefSeq *deep_copy = 
-+            new IR_FactoryDefSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              FactoryDefSeq *tmp = deep_copy;
-+              IR_FactoryDefSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -8448,97 +7787,97 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::FactoryDefSeq *
--IR::FactoryDefSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_FactoryDefSeq *
-+IR_FactoryDefSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::FactoryDefSeq *
--IR::FactoryDefSeq_var::operator-> (void)
-+ACE_INLINE ::IR_FactoryDefSeq *
-+IR_FactoryDefSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::FactoryDefSeq_var::operator const ::IR::FactoryDefSeq &() const // cast
-+IR_FactoryDefSeq_var::operator const ::IR_FactoryDefSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::FactoryDefSeq_var::operator ::IR::FactoryDefSeq &() // cast 
-+IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::FactoryDefSeq_var::operator ::IR::FactoryDefSeq &() const // cast 
-+IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::FactoryDefSeq_var::operator ::IR::FactoryDefSeq *&() // cast 
-+IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::FactoryDef, IR::FactoryDef_var>
--IR::FactoryDefSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_FactoryDef, IR_FactoryDef_var>
-+IR_FactoryDefSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::IR::FactoryDefSeq &
--IR::FactoryDefSeq_var::in (void) const
-+ACE_INLINE const ::IR_FactoryDefSeq &
-+IR_FactoryDefSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::FactoryDefSeq &
--IR::FactoryDefSeq_var::inout (void)
-+ACE_INLINE ::IR_FactoryDefSeq &
-+IR_FactoryDefSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::FactoryDefSeq *&
--IR::FactoryDefSeq_var::out (void)
-+ACE_INLINE ::IR_FactoryDefSeq *&
-+IR_FactoryDefSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::FactoryDefSeq *
--IR::FactoryDefSeq_var::_retn (void)
-+ACE_INLINE ::IR_FactoryDefSeq *
-+IR_FactoryDefSeq_var::_retn (void)
- {
--  ::IR::FactoryDefSeq *tmp = this->ptr_;
-+  ::IR_FactoryDefSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::FactoryDefSeq *
--IR::FactoryDefSeq_var::ptr (void) const
-+ACE_INLINE ::IR_FactoryDefSeq *
-+IR_FactoryDefSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::FactoryDefSeq_out
-+// Inline operations for class IR_FactoryDefSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::FactoryDefSeq_out::FactoryDefSeq_out (FactoryDefSeq *&p)
-+IR_FactoryDefSeq_out::IR_FactoryDefSeq_out (IR_FactoryDefSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::FactoryDefSeq_out::FactoryDefSeq_out (FactoryDefSeq_var &p) // constructor from _var
-+IR_FactoryDefSeq_out::IR_FactoryDefSeq_out (IR_FactoryDefSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -8546,57 +7885,50 @@
- }
- 
- ACE_INLINE
--IR::FactoryDefSeq_out::FactoryDefSeq_out (const ::IR::FactoryDefSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (FactoryDefSeq_out&, p).ptr_)
-+IR_FactoryDefSeq_out::IR_FactoryDefSeq_out (const ::IR_FactoryDefSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_FactoryDefSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::FactoryDefSeq_out &
--IR::FactoryDefSeq_out::operator= (const ::IR::FactoryDefSeq_out &p)
-+ACE_INLINE ::IR_FactoryDefSeq_out &
-+IR_FactoryDefSeq_out::operator= (const ::IR_FactoryDefSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (FactoryDefSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_FactoryDefSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::FactoryDefSeq_out &
--IR::FactoryDefSeq_out::operator= (FactoryDefSeq *p)
-+ACE_INLINE ::IR_FactoryDefSeq_out &
-+IR_FactoryDefSeq_out::operator= (IR_FactoryDefSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::FactoryDefSeq_out::operator ::IR::FactoryDefSeq *&() // cast
-+IR_FactoryDefSeq_out::operator ::IR_FactoryDefSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::FactoryDefSeq *&
--IR::FactoryDefSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_FactoryDefSeq *&
-+IR_FactoryDefSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::FactoryDefSeq *
--IR::FactoryDefSeq_out::operator-> (void)
-+ACE_INLINE ::IR_FactoryDefSeq *
-+IR_FactoryDefSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::FactoryDef, IR::FactoryDef_var>
--IR::FactoryDefSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_FactoryDef, IR_FactoryDef_var>
-+IR_FactoryDefSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FINDERDEF___CI_)
--#define _IR_FINDERDEF___CI_
--
- ACE_INLINE
--IR::FinderDef::FinderDef (
-+IR_FinderDef::IR_FinderDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -8606,200 +7938,179 @@
-   this->IR_FinderDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FINDERDEF___VAR_CI_)
--#define _IR_FINDERDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::FinderDef_var
-+// Inline operations for class IR_FinderDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::FinderDef_var::FinderDef_var (void) // default constructor
--  : ptr_ (IR::FinderDef::_nil ())
-+IR_FinderDef_var::IR_FinderDef_var (void) // default constructor
-+  : ptr_ (IR_FinderDef::_nil ())
- {}
- 
--ACE_INLINE IR::FinderDef_ptr 
--IR::FinderDef_var::ptr (void) const
-+ACE_INLINE IR_FinderDef_ptr 
-+IR_FinderDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::FinderDef_var::FinderDef_var (const IR::FinderDef_var &p) // copy constructor
-+IR_FinderDef_var::IR_FinderDef_var (const IR_FinderDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (FinderDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_FinderDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::FinderDef_var::~FinderDef_var (void) // destructor
-+IR_FinderDef_var::~IR_FinderDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::FinderDef_var &
--IR::FinderDef_var::operator= (IR::FinderDef_ptr p)
-+ACE_INLINE IR_FinderDef_var &
-+IR_FinderDef_var::operator= (IR_FinderDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::FinderDef_var &
--IR::FinderDef_var::operator= (const IR::FinderDef_var &p)
-+ACE_INLINE IR_FinderDef_var &
-+IR_FinderDef_var::operator= (const IR_FinderDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::FinderDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_FinderDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::FinderDef_var::operator const IR::FinderDef_ptr &() const // cast
-+IR_FinderDef_var::operator const IR_FinderDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::FinderDef_var::operator IR::FinderDef_ptr &() // cast 
-+IR_FinderDef_var::operator IR_FinderDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FinderDef_ptr 
--IR::FinderDef_var::operator-> (void) const
-+ACE_INLINE IR_FinderDef_ptr 
-+IR_FinderDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FinderDef_ptr
--IR::FinderDef_var::in (void) const
-+ACE_INLINE IR_FinderDef_ptr
-+IR_FinderDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FinderDef_ptr &
--IR::FinderDef_var::inout (void)
-+ACE_INLINE IR_FinderDef_ptr &
-+IR_FinderDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FinderDef_ptr &
--IR::FinderDef_var::out (void)
-+ACE_INLINE IR_FinderDef_ptr &
-+IR_FinderDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::FinderDef::_nil ();
-+  this->ptr_ = IR_FinderDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FinderDef_ptr 
--IR::FinderDef_var::_retn (void)
-+ACE_INLINE IR_FinderDef_ptr 
-+IR_FinderDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::FinderDef_ptr val = this->ptr_;
--  this->ptr_ = IR::FinderDef::_nil ();
-+  IR_FinderDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_FinderDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FINDERDEF___OUT_CI_)
--#define _IR_FINDERDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::FinderDef_out
-+// Inline operations for class IR_FinderDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::FinderDef_out::FinderDef_out (IR::FinderDef_ptr &p)
-+IR_FinderDef_out::IR_FinderDef_out (IR_FinderDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::FinderDef::_nil ();
-+  this->ptr_ = IR_FinderDef::_nil ();
- }
- 
- ACE_INLINE
--IR::FinderDef_out::FinderDef_out (IR::FinderDef_var &p) // constructor from _var
-+IR_FinderDef_out::IR_FinderDef_out (IR_FinderDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::FinderDef::_nil ();
-+  this->ptr_ = IR_FinderDef::_nil ();
- }
- 
- ACE_INLINE
--IR::FinderDef_out::FinderDef_out (const IR::FinderDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::FinderDef_out&,p).ptr_)
-+IR_FinderDef_out::IR_FinderDef_out (const IR_FinderDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_FinderDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::FinderDef_out &
--IR::FinderDef_out::operator= (const IR::FinderDef_out &p)
-+ACE_INLINE IR_FinderDef_out &
-+IR_FinderDef_out::operator= (const IR_FinderDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::FinderDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_FinderDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::FinderDef_out &
--IR::FinderDef_out::operator= (const IR::FinderDef_var &p)
-+ACE_INLINE IR_FinderDef_out &
-+IR_FinderDef_out::operator= (const IR_FinderDef_var &p)
- {
--  this->ptr_ = IR::FinderDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_FinderDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::FinderDef_out &
--IR::FinderDef_out::operator= (IR::FinderDef_ptr p)
-+ACE_INLINE IR_FinderDef_out &
-+IR_FinderDef_out::operator= (IR_FinderDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::FinderDef_out::operator IR::FinderDef_ptr &() // cast
-+IR_FinderDef_out::operator IR_FinderDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FinderDef_ptr &
--IR::FinderDef_out::ptr (void) // ptr
-+ACE_INLINE IR_FinderDef_ptr &
-+IR_FinderDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FinderDef_ptr 
--IR::FinderDef_out::operator-> (void)
-+ACE_INLINE IR_FinderDef_ptr 
-+IR_FinderDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_
--
--  ACE_INLINE IR::FinderDef **
--  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (CORBA::ULong nelems)
-+  ACE_INLINE IR_FinderDef **
-+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (CORBA::ULong nelems)
-   {
--    IR::FinderDef **buf = 0;
-+    IR_FinderDef **buf = 0;
-     
--    ACE_NEW_RETURN (buf, IR::FinderDef*[nelems], 0);
-+    ACE_NEW_RETURN (buf, IR_FinderDef*[nelems], 0);
-     
-     for (CORBA::ULong i = 0; i < nelems; i++)
--      buf[i] = IR::FinderDef::_nil ();
-+      buf[i] = IR_FinderDef::_nil ();
-     
-     return buf;
-   }
-   
-   ACE_INLINE void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (IR::FinderDef **buffer)
-+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (IR_FinderDef **buffer)
-   {
-     if (buffer == 0)
-       return;
-@@ -8807,36 +8118,36 @@
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum)
-+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum)
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::FinderDef* *value,
-+    IR_FinderDef* *value,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
-+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::FinderDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (this->maximum_);
--      IR::FinderDef ** const tmp2 = ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, rhs.buffer_);
-+      IR_FinderDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (this->maximum_);
-+      IR_FinderDef ** const tmp2 = ACE_reinterpret_cast (IR_FinderDef ** ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--        tmp1[i] = IR::FinderDef::_duplicate (tmp2[i]);
-+        tmp1[i] = IR_FinderDef::_duplicate (tmp2[i]);
-       
-       this->buffer_ = tmp1;
-     }
-@@ -8846,20 +8157,20 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &
--  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &
-+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
-   {
-     if (this == &rhs)
-       return *this;
-     
-     if (this->release_)
-     {
--      IR::FinderDef **tmp = ACE_reinterpret_cast (IR::FinderDef **, this->buffer_);
-+      IR_FinderDef **tmp = ACE_reinterpret_cast (IR_FinderDef **, this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-       {
-         CORBA::release (tmp[i]);
--        tmp[i] = IR::FinderDef::_nil ();
-+        tmp[i] = IR_FinderDef::_nil ();
-       }
-       if (this->maximum_ < rhs.maximum_)
-       {
-@@ -8872,28 +8183,28 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::FinderDef **tmp1 = ACE_reinterpret_cast (IR::FinderDef **, this->buffer_);
--    IR::FinderDef ** const tmp2 = ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, rhs.buffer_);
-+    IR_FinderDef **tmp1 = ACE_reinterpret_cast (IR_FinderDef **, this->buffer_);
-+    IR_FinderDef ** const tmp2 = ACE_reinterpret_cast (IR_FinderDef ** ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--      tmp1[i] = IR::FinderDef::_duplicate (tmp2[i]);
-+      tmp1[i] = IR_FinderDef::_duplicate (tmp2[i]);
-     
-     return *this;
-   }
-   
--  ACE_INLINE TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var>
--  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator[] (CORBA::ULong index) const
-+  ACE_INLINE TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var>
-+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator[] (CORBA::ULong index) const
-   // read-write accessor
-   {
-     ACE_ASSERT (index < this->maximum_);
--    IR::FinderDef ** const tmp = ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, this->buffer_);
--    return TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var> (tmp + index, this->release_);
-+    IR_FinderDef ** const tmp = ACE_reinterpret_cast (IR_FinderDef ** ACE_CAST_CONST, this->buffer_);
-+    return TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var> (tmp + index, this->release_);
-   }
-   
--  ACE_INLINE IR::FinderDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_FinderDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::FinderDef **result = 0;
-+    IR_FinderDef **result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -8905,7 +8216,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_FinderDef**, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -8914,7 +8225,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::FinderDef**,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_FinderDef**,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -8924,60 +8235,53 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::FinderDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (void) const
-+  ACE_INLINE const IR_FinderDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::FinderDef ** ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_FinderDef ** ACE_CAST_CONST, this->buffer_);
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_FINDERDEFSEQ_CI_)
--#define _IR_FINDERDEFSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::FinderDefSeq_var
-+// Inline operations for class IR_FinderDefSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::FinderDefSeq_var::FinderDefSeq_var (void) // default constructor
-+IR_FinderDefSeq_var::IR_FinderDefSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::FinderDefSeq_var::FinderDefSeq_var (FinderDefSeq *p)
-+IR_FinderDefSeq_var::IR_FinderDefSeq_var (IR_FinderDefSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::FinderDefSeq_var::FinderDefSeq_var (const ::IR::FinderDefSeq_var &p) // copy constructor
-+IR_FinderDefSeq_var::IR_FinderDefSeq_var (const ::IR_FinderDefSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::FinderDefSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_FinderDefSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::FinderDefSeq_var::~FinderDefSeq_var (void) // destructor
-+IR_FinderDefSeq_var::~IR_FinderDefSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::FinderDefSeq_var &
--IR::FinderDefSeq_var::operator= (FinderDefSeq *p)
-+ACE_INLINE IR_FinderDefSeq_var &
-+IR_FinderDefSeq_var::operator= (IR_FinderDefSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::FinderDefSeq_var &
--IR::FinderDefSeq_var::operator= (const ::IR::FinderDefSeq_var &p)
-+ACE_INLINE IR_FinderDefSeq_var &
-+IR_FinderDefSeq_var::operator= (const ::IR_FinderDefSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -8988,12 +8292,12 @@
-         }
-       else
-         {
--          FinderDefSeq *deep_copy =
--            new FinderDefSeq (*p.ptr_);
-+          IR_FinderDefSeq *deep_copy = 
-+            new IR_FinderDefSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              FinderDefSeq *tmp = deep_copy;
-+              IR_FinderDefSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -9004,97 +8308,97 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::FinderDefSeq *
--IR::FinderDefSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_FinderDefSeq *
-+IR_FinderDefSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::FinderDefSeq *
--IR::FinderDefSeq_var::operator-> (void)
-+ACE_INLINE ::IR_FinderDefSeq *
-+IR_FinderDefSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::FinderDefSeq_var::operator const ::IR::FinderDefSeq &() const // cast
-+IR_FinderDefSeq_var::operator const ::IR_FinderDefSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::FinderDefSeq_var::operator ::IR::FinderDefSeq &() // cast 
-+IR_FinderDefSeq_var::operator ::IR_FinderDefSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::FinderDefSeq_var::operator ::IR::FinderDefSeq &() const // cast 
-+IR_FinderDefSeq_var::operator ::IR_FinderDefSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::FinderDefSeq_var::operator ::IR::FinderDefSeq *&() // cast 
-+IR_FinderDefSeq_var::operator ::IR_FinderDefSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::FinderDef, IR::FinderDef_var>
--IR::FinderDefSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_FinderDef, IR_FinderDef_var>
-+IR_FinderDefSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::IR::FinderDefSeq &
--IR::FinderDefSeq_var::in (void) const
-+ACE_INLINE const ::IR_FinderDefSeq &
-+IR_FinderDefSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::FinderDefSeq &
--IR::FinderDefSeq_var::inout (void)
-+ACE_INLINE ::IR_FinderDefSeq &
-+IR_FinderDefSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::FinderDefSeq *&
--IR::FinderDefSeq_var::out (void)
-+ACE_INLINE ::IR_FinderDefSeq *&
-+IR_FinderDefSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::FinderDefSeq *
--IR::FinderDefSeq_var::_retn (void)
-+ACE_INLINE ::IR_FinderDefSeq *
-+IR_FinderDefSeq_var::_retn (void)
- {
--  ::IR::FinderDefSeq *tmp = this->ptr_;
-+  ::IR_FinderDefSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::FinderDefSeq *
--IR::FinderDefSeq_var::ptr (void) const
-+ACE_INLINE ::IR_FinderDefSeq *
-+IR_FinderDefSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::FinderDefSeq_out
-+// Inline operations for class IR_FinderDefSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::FinderDefSeq_out::FinderDefSeq_out (FinderDefSeq *&p)
-+IR_FinderDefSeq_out::IR_FinderDefSeq_out (IR_FinderDefSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::FinderDefSeq_out::FinderDefSeq_out (FinderDefSeq_var &p) // constructor from _var
-+IR_FinderDefSeq_out::IR_FinderDefSeq_out (IR_FinderDefSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -9102,57 +8406,50 @@
- }
- 
- ACE_INLINE
--IR::FinderDefSeq_out::FinderDefSeq_out (const ::IR::FinderDefSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (FinderDefSeq_out&, p).ptr_)
-+IR_FinderDefSeq_out::IR_FinderDefSeq_out (const ::IR_FinderDefSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_FinderDefSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::FinderDefSeq_out &
--IR::FinderDefSeq_out::operator= (const ::IR::FinderDefSeq_out &p)
-+ACE_INLINE ::IR_FinderDefSeq_out &
-+IR_FinderDefSeq_out::operator= (const ::IR_FinderDefSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (FinderDefSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_FinderDefSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::FinderDefSeq_out &
--IR::FinderDefSeq_out::operator= (FinderDefSeq *p)
-+ACE_INLINE ::IR_FinderDefSeq_out &
-+IR_FinderDefSeq_out::operator= (IR_FinderDefSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::FinderDefSeq_out::operator ::IR::FinderDefSeq *&() // cast
-+IR_FinderDefSeq_out::operator ::IR_FinderDefSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::FinderDefSeq *&
--IR::FinderDefSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_FinderDefSeq *&
-+IR_FinderDefSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::FinderDefSeq *
--IR::FinderDefSeq_out::operator-> (void)
-+ACE_INLINE ::IR_FinderDefSeq *
-+IR_FinderDefSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::FinderDef, IR::FinderDef_var>
--IR::FinderDefSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_FinderDef, IR_FinderDef_var>
-+IR_FinderDefSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PRIMARYKEYDEF___CI_)
--#define _IR_PRIMARYKEYDEF___CI_
--
- ACE_INLINE
--IR::PrimaryKeyDef::PrimaryKeyDef (
-+IR_PrimaryKeyDef::IR_PrimaryKeyDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -9162,200 +8459,179 @@
-   this->IR_PrimaryKeyDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PRIMARYKEYDEF___VAR_CI_)
--#define _IR_PRIMARYKEYDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::PrimaryKeyDef_var
-+// Inline operations for class IR_PrimaryKeyDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::PrimaryKeyDef_var::PrimaryKeyDef_var (void) // default constructor
--  : ptr_ (IR::PrimaryKeyDef::_nil ())
-+IR_PrimaryKeyDef_var::IR_PrimaryKeyDef_var (void) // default constructor
-+  : ptr_ (IR_PrimaryKeyDef::_nil ())
- {}
- 
--ACE_INLINE IR::PrimaryKeyDef_ptr 
--IR::PrimaryKeyDef_var::ptr (void) const
-+ACE_INLINE IR_PrimaryKeyDef_ptr 
-+IR_PrimaryKeyDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::PrimaryKeyDef_var::PrimaryKeyDef_var (const IR::PrimaryKeyDef_var &p) // copy constructor
-+IR_PrimaryKeyDef_var::IR_PrimaryKeyDef_var (const IR_PrimaryKeyDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (PrimaryKeyDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_PrimaryKeyDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::PrimaryKeyDef_var::~PrimaryKeyDef_var (void) // destructor
-+IR_PrimaryKeyDef_var::~IR_PrimaryKeyDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::PrimaryKeyDef_var &
--IR::PrimaryKeyDef_var::operator= (IR::PrimaryKeyDef_ptr p)
-+ACE_INLINE IR_PrimaryKeyDef_var &
-+IR_PrimaryKeyDef_var::operator= (IR_PrimaryKeyDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::PrimaryKeyDef_var &
--IR::PrimaryKeyDef_var::operator= (const IR::PrimaryKeyDef_var &p)
-+ACE_INLINE IR_PrimaryKeyDef_var &
-+IR_PrimaryKeyDef_var::operator= (const IR_PrimaryKeyDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::PrimaryKeyDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_PrimaryKeyDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::PrimaryKeyDef_var::operator const IR::PrimaryKeyDef_ptr &() const // cast
-+IR_PrimaryKeyDef_var::operator const IR_PrimaryKeyDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::PrimaryKeyDef_var::operator IR::PrimaryKeyDef_ptr &() // cast 
-+IR_PrimaryKeyDef_var::operator IR_PrimaryKeyDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PrimaryKeyDef_ptr 
--IR::PrimaryKeyDef_var::operator-> (void) const
-+ACE_INLINE IR_PrimaryKeyDef_ptr 
-+IR_PrimaryKeyDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PrimaryKeyDef_ptr
--IR::PrimaryKeyDef_var::in (void) const
-+ACE_INLINE IR_PrimaryKeyDef_ptr
-+IR_PrimaryKeyDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PrimaryKeyDef_ptr &
--IR::PrimaryKeyDef_var::inout (void)
-+ACE_INLINE IR_PrimaryKeyDef_ptr &
-+IR_PrimaryKeyDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PrimaryKeyDef_ptr &
--IR::PrimaryKeyDef_var::out (void)
-+ACE_INLINE IR_PrimaryKeyDef_ptr &
-+IR_PrimaryKeyDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::PrimaryKeyDef::_nil ();
-+  this->ptr_ = IR_PrimaryKeyDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PrimaryKeyDef_ptr 
--IR::PrimaryKeyDef_var::_retn (void)
-+ACE_INLINE IR_PrimaryKeyDef_ptr 
-+IR_PrimaryKeyDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::PrimaryKeyDef_ptr val = this->ptr_;
--  this->ptr_ = IR::PrimaryKeyDef::_nil ();
-+  IR_PrimaryKeyDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_PrimaryKeyDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PRIMARYKEYDEF___OUT_CI_)
--#define _IR_PRIMARYKEYDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::PrimaryKeyDef_out
-+// Inline operations for class IR_PrimaryKeyDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::PrimaryKeyDef_out::PrimaryKeyDef_out (IR::PrimaryKeyDef_ptr &p)
-+IR_PrimaryKeyDef_out::IR_PrimaryKeyDef_out (IR_PrimaryKeyDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::PrimaryKeyDef::_nil ();
-+  this->ptr_ = IR_PrimaryKeyDef::_nil ();
- }
- 
- ACE_INLINE
--IR::PrimaryKeyDef_out::PrimaryKeyDef_out (IR::PrimaryKeyDef_var &p) // constructor from _var
-+IR_PrimaryKeyDef_out::IR_PrimaryKeyDef_out (IR_PrimaryKeyDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::PrimaryKeyDef::_nil ();
-+  this->ptr_ = IR_PrimaryKeyDef::_nil ();
- }
- 
- ACE_INLINE
--IR::PrimaryKeyDef_out::PrimaryKeyDef_out (const IR::PrimaryKeyDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::PrimaryKeyDef_out&,p).ptr_)
-+IR_PrimaryKeyDef_out::IR_PrimaryKeyDef_out (const IR_PrimaryKeyDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_PrimaryKeyDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::PrimaryKeyDef_out &
--IR::PrimaryKeyDef_out::operator= (const IR::PrimaryKeyDef_out &p)
-+ACE_INLINE IR_PrimaryKeyDef_out &
-+IR_PrimaryKeyDef_out::operator= (const IR_PrimaryKeyDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::PrimaryKeyDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_PrimaryKeyDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::PrimaryKeyDef_out &
--IR::PrimaryKeyDef_out::operator= (const IR::PrimaryKeyDef_var &p)
-+ACE_INLINE IR_PrimaryKeyDef_out &
-+IR_PrimaryKeyDef_out::operator= (const IR_PrimaryKeyDef_var &p)
- {
--  this->ptr_ = IR::PrimaryKeyDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_PrimaryKeyDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::PrimaryKeyDef_out &
--IR::PrimaryKeyDef_out::operator= (IR::PrimaryKeyDef_ptr p)
-+ACE_INLINE IR_PrimaryKeyDef_out &
-+IR_PrimaryKeyDef_out::operator= (IR_PrimaryKeyDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::PrimaryKeyDef_out::operator IR::PrimaryKeyDef_ptr &() // cast
-+IR_PrimaryKeyDef_out::operator IR_PrimaryKeyDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PrimaryKeyDef_ptr &
--IR::PrimaryKeyDef_out::ptr (void) // ptr
-+ACE_INLINE IR_PrimaryKeyDef_ptr &
-+IR_PrimaryKeyDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PrimaryKeyDef_ptr 
--IR::PrimaryKeyDef_out::operator-> (void)
-+ACE_INLINE IR_PrimaryKeyDef_ptr 
-+IR_PrimaryKeyDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CI_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CI_
--
--  ACE_INLINE IR::Contained **
--  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (CORBA::ULong nelems)
-+  ACE_INLINE IR_Contained **
-+  _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (CORBA::ULong nelems)
-   {
--    IR::Contained **buf = 0;
-+    IR_Contained **buf = 0;
-     
--    ACE_NEW_RETURN (buf, IR::Contained*[nelems], 0);
-+    ACE_NEW_RETURN (buf, IR_Contained*[nelems], 0);
-     
-     for (CORBA::ULong i = 0; i < nelems; i++)
--      buf[i] = IR::Contained::_nil ();
-+      buf[i] = IR_Contained::_nil ();
-     
-     return buf;
-   }
-   
-   ACE_INLINE void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::freebuf (IR::Contained **buffer)
-+  _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::freebuf (IR_Contained **buffer)
-   {
-     if (buffer == 0)
-       return;
-@@ -9363,36 +8639,36 @@
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (void)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum)
-+  _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum)
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::Contained* *value,
-+    IR_Contained* *value,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq(const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs)
-+  _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq(const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs)
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::Contained **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (this->maximum_);
--      IR::Contained ** const tmp2 = ACE_reinterpret_cast (IR::Contained ** ACE_CAST_CONST, rhs.buffer_);
-+      IR_Contained **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (this->maximum_);
-+      IR_Contained ** const tmp2 = ACE_reinterpret_cast (IR_Contained ** ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--        tmp1[i] = IR::Contained::_duplicate (tmp2[i]);
-+        tmp1[i] = IR_Contained::_duplicate (tmp2[i]);
-       
-       this->buffer_ = tmp1;
-     }
-@@ -9402,20 +8678,20 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq &
--  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &
-+  _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs)
-   {
-     if (this == &rhs)
-       return *this;
-     
-     if (this->release_)
-     {
--      IR::Contained **tmp = ACE_reinterpret_cast (IR::Contained **, this->buffer_);
-+      IR_Contained **tmp = ACE_reinterpret_cast (IR_Contained **, this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-       {
-         CORBA::release (tmp[i]);
--        tmp[i] = IR::Contained::_nil ();
-+        tmp[i] = IR_Contained::_nil ();
-       }
-       if (this->maximum_ < rhs.maximum_)
-       {
-@@ -9428,28 +8704,28 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::Contained **tmp1 = ACE_reinterpret_cast (IR::Contained **, this->buffer_);
--    IR::Contained ** const tmp2 = ACE_reinterpret_cast (IR::Contained ** ACE_CAST_CONST, rhs.buffer_);
-+    IR_Contained **tmp1 = ACE_reinterpret_cast (IR_Contained **, this->buffer_);
-+    IR_Contained ** const tmp2 = ACE_reinterpret_cast (IR_Contained ** ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--      tmp1[i] = IR::Contained::_duplicate (tmp2[i]);
-+      tmp1[i] = IR_Contained::_duplicate (tmp2[i]);
-     
-     return *this;
-   }
-   
--  ACE_INLINE TAO_Object_Manager<IR::Contained,IR::Contained_var>
--  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::operator[] (CORBA::ULong index) const
-+  ACE_INLINE TAO_Object_Manager<IR_Contained,IR_Contained_var>
-+  _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::operator[] (CORBA::ULong index) const
-   // read-write accessor
-   {
-     ACE_ASSERT (index < this->maximum_);
--    IR::Contained ** const tmp = ACE_reinterpret_cast (IR::Contained ** ACE_CAST_CONST, this->buffer_);
--    return TAO_Object_Manager<IR::Contained,IR::Contained_var> (tmp + index, this->release_);
-+    IR_Contained ** const tmp = ACE_reinterpret_cast (IR_Contained ** ACE_CAST_CONST, this->buffer_);
-+    return TAO_Object_Manager<IR_Contained,IR_Contained_var> (tmp + index, this->release_);
-   }
-   
--  ACE_INLINE IR::Contained* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_Contained* *
-+  _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::Contained **result = 0;
-+    IR_Contained **result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -9461,7 +8737,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::Contained**, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_Contained**, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -9470,7 +8746,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::Contained**,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_Contained**,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -9480,60 +8756,53 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::Contained* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::get_buffer (void) const
-+  ACE_INLINE const IR_Contained* *
-+  _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::Contained ** ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_Contained ** ACE_CAST_CONST, this->buffer_);
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_CONTAINEDSEQ_CI_)
--#define _IR_CONTAINEDSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::ContainedSeq_var
-+// Inline operations for class IR_ContainedSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ContainedSeq_var::ContainedSeq_var (void) // default constructor
-+IR_ContainedSeq_var::IR_ContainedSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ContainedSeq_var::ContainedSeq_var (ContainedSeq *p)
-+IR_ContainedSeq_var::IR_ContainedSeq_var (IR_ContainedSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ContainedSeq_var::ContainedSeq_var (const ::IR::ContainedSeq_var &p) // copy constructor
-+IR_ContainedSeq_var::IR_ContainedSeq_var (const ::IR_ContainedSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ContainedSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ContainedSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ContainedSeq_var::~ContainedSeq_var (void) // destructor
-+IR_ContainedSeq_var::~IR_ContainedSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ContainedSeq_var &
--IR::ContainedSeq_var::operator= (ContainedSeq *p)
-+ACE_INLINE IR_ContainedSeq_var &
-+IR_ContainedSeq_var::operator= (IR_ContainedSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ContainedSeq_var &
--IR::ContainedSeq_var::operator= (const ::IR::ContainedSeq_var &p)
-+ACE_INLINE IR_ContainedSeq_var &
-+IR_ContainedSeq_var::operator= (const ::IR_ContainedSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -9544,12 +8813,12 @@
-         }
-       else
-         {
--          ContainedSeq *deep_copy =
--            new ContainedSeq (*p.ptr_);
-+          IR_ContainedSeq *deep_copy = 
-+            new IR_ContainedSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ContainedSeq *tmp = deep_copy;
-+              IR_ContainedSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -9560,97 +8829,97 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ContainedSeq *
--IR::ContainedSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_ContainedSeq *
-+IR_ContainedSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ContainedSeq *
--IR::ContainedSeq_var::operator-> (void)
-+ACE_INLINE ::IR_ContainedSeq *
-+IR_ContainedSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ContainedSeq_var::operator const ::IR::ContainedSeq &() const // cast
-+IR_ContainedSeq_var::operator const ::IR_ContainedSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ContainedSeq_var::operator ::IR::ContainedSeq &() // cast 
-+IR_ContainedSeq_var::operator ::IR_ContainedSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ContainedSeq_var::operator ::IR::ContainedSeq &() const // cast 
-+IR_ContainedSeq_var::operator ::IR_ContainedSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ContainedSeq_var::operator ::IR::ContainedSeq *&() // cast 
-+IR_ContainedSeq_var::operator ::IR_ContainedSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::Contained, IR::Contained_var>
--IR::ContainedSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_Contained, IR_Contained_var>
-+IR_ContainedSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::IR::ContainedSeq &
--IR::ContainedSeq_var::in (void) const
-+ACE_INLINE const ::IR_ContainedSeq &
-+IR_ContainedSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ContainedSeq &
--IR::ContainedSeq_var::inout (void)
-+ACE_INLINE ::IR_ContainedSeq &
-+IR_ContainedSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ContainedSeq *&
--IR::ContainedSeq_var::out (void)
-+ACE_INLINE ::IR_ContainedSeq *&
-+IR_ContainedSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ContainedSeq *
--IR::ContainedSeq_var::_retn (void)
-+ACE_INLINE ::IR_ContainedSeq *
-+IR_ContainedSeq_var::_retn (void)
- {
--  ::IR::ContainedSeq *tmp = this->ptr_;
-+  ::IR_ContainedSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ContainedSeq *
--IR::ContainedSeq_var::ptr (void) const
-+ACE_INLINE ::IR_ContainedSeq *
-+IR_ContainedSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ContainedSeq_out
-+// Inline operations for class IR_ContainedSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ContainedSeq_out::ContainedSeq_out (ContainedSeq *&p)
-+IR_ContainedSeq_out::IR_ContainedSeq_out (IR_ContainedSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ContainedSeq_out::ContainedSeq_out (ContainedSeq_var &p) // constructor from _var
-+IR_ContainedSeq_out::IR_ContainedSeq_out (IR_ContainedSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -9658,90 +8927,87 @@
- }
- 
- ACE_INLINE
--IR::ContainedSeq_out::ContainedSeq_out (const ::IR::ContainedSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ContainedSeq_out&, p).ptr_)
-+IR_ContainedSeq_out::IR_ContainedSeq_out (const ::IR_ContainedSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ContainedSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::ContainedSeq_out &
--IR::ContainedSeq_out::operator= (const ::IR::ContainedSeq_out &p)
-+ACE_INLINE ::IR_ContainedSeq_out &
-+IR_ContainedSeq_out::operator= (const ::IR_ContainedSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (ContainedSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ContainedSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ContainedSeq_out &
--IR::ContainedSeq_out::operator= (ContainedSeq *p)
-+ACE_INLINE ::IR_ContainedSeq_out &
-+IR_ContainedSeq_out::operator= (IR_ContainedSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ContainedSeq_out::operator ::IR::ContainedSeq *&() // cast
-+IR_ContainedSeq_out::operator ::IR_ContainedSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ContainedSeq *&
--IR::ContainedSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ContainedSeq *&
-+IR_ContainedSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ContainedSeq *
--IR::ContainedSeq_out::operator-> (void)
-+ACE_INLINE ::IR_ContainedSeq *
-+IR_ContainedSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::Contained, IR::Contained_var>
--IR::ContainedSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_Contained, IR_Contained_var>
-+IR_ContainedSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
- // *************************************************************
--// Inline operations for class IR::StructMember_var
-+// Inline operations for class IR_StructMember_var
- // *************************************************************
- 
- ACE_INLINE
--IR::StructMember_var::StructMember_var (void) // default constructor
-+IR_StructMember_var::IR_StructMember_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::StructMember_var::StructMember_var (StructMember *p)
-+IR_StructMember_var::IR_StructMember_var (IR_StructMember *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::StructMember_var::StructMember_var (const ::IR::StructMember_var &p) // copy constructor
-+IR_StructMember_var::IR_StructMember_var (const ::IR_StructMember_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::StructMember (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_StructMember (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::StructMember_var::~StructMember_var (void) // destructor
-+IR_StructMember_var::~IR_StructMember_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::StructMember_var &
--IR::StructMember_var::operator= (StructMember *p)
-+ACE_INLINE IR_StructMember_var &
-+IR_StructMember_var::operator= (IR_StructMember *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::StructMember_var &
--IR::StructMember_var::operator= (const ::IR::StructMember_var &p)
-+ACE_INLINE ::IR_StructMember_var &
-+IR_StructMember_var::operator= (const ::IR_StructMember_var &p)
- {
-   if (this != &p)
-     {
-@@ -9752,12 +9018,12 @@
-         }
-       else
-         {
--          StructMember *deep_copy =
--            new StructMember (*p.ptr_);
-+          IR_StructMember *deep_copy = 
-+            new IR_StructMember (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              StructMember *tmp = deep_copy;
-+              IR_StructMember *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -9768,91 +9034,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::StructMember *
--IR::StructMember_var::operator-> (void) const
-+ACE_INLINE const ::IR_StructMember *
-+IR_StructMember_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::StructMember *
--IR::StructMember_var::operator-> (void)
-+ACE_INLINE ::IR_StructMember *
-+IR_StructMember_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::StructMember_var::operator const ::IR::StructMember &() const // cast
-+IR_StructMember_var::operator const ::IR_StructMember &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::StructMember_var::operator ::IR::StructMember &() // cast 
-+IR_StructMember_var::operator ::IR_StructMember &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::StructMember_var::operator ::IR::StructMember &() const // cast 
-+IR_StructMember_var::operator ::IR_StructMember &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::StructMember_var::operator ::IR::StructMember *&() // cast 
-+IR_StructMember_var::operator ::IR_StructMember *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::StructMember &
--IR::StructMember_var::in (void) const
-+ACE_INLINE const ::IR_StructMember &
-+IR_StructMember_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::StructMember &
--IR::StructMember_var::inout (void)
-+ACE_INLINE ::IR_StructMember &
-+IR_StructMember_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::StructMember *&
--IR::StructMember_var::out (void)
-+ACE_INLINE ::IR_StructMember *&
-+IR_StructMember_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::StructMember *
--IR::StructMember_var::_retn (void)
-+ACE_INLINE ::IR_StructMember *
-+IR_StructMember_var::_retn (void)
- {
--  ::IR::StructMember *tmp = this->ptr_;
-+  ::IR_StructMember *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::StructMember *
--IR::StructMember_var::ptr (void) const
-+ACE_INLINE ::IR_StructMember *
-+IR_StructMember_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::StructMember_out
-+// Inline operations for class IR_StructMember_out
- // *************************************************************
- 
- ACE_INLINE
--IR::StructMember_out::StructMember_out (::IR::StructMember *&p)
-+IR_StructMember_out::IR_StructMember_out (::IR_StructMember *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::StructMember_out::StructMember_out (StructMember_var &p) // constructor from _var
-+IR_StructMember_out::IR_StructMember_out (IR_StructMember_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -9860,38 +9126,38 @@
- }
- 
- ACE_INLINE
--IR::StructMember_out::StructMember_out (const ::IR::StructMember_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (StructMember_out&, p).ptr_)
-+IR_StructMember_out::IR_StructMember_out (const ::IR_StructMember_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_StructMember_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::StructMember_out &
--IR::StructMember_out::operator= (const ::IR::StructMember_out &p)
-+ACE_INLINE IR_StructMember_out &
-+IR_StructMember_out::operator= (const ::IR_StructMember_out &p)
- {
--  this->ptr_ = ACE_const_cast (StructMember_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_StructMember_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::StructMember_out &
--IR::StructMember_out::operator= (StructMember *p)
-+ACE_INLINE IR_StructMember_out &
-+IR_StructMember_out::operator= (IR_StructMember *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::StructMember_out::operator ::IR::StructMember *&() // cast
-+IR_StructMember_out::operator ::IR_StructMember *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::StructMember *&
--IR::StructMember_out::ptr (void) // ptr
-+ACE_INLINE ::IR_StructMember *&
-+IR_StructMember_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::StructMember *
--IR::StructMember_out::operator-> (void)
-+ACE_INLINE ::IR_StructMember *
-+IR_StructMember_out::operator-> (void)
- {
-   return this->ptr_;
- }
-@@ -9899,54 +9165,51 @@
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CI_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CI_
--
-   // = Static operations.
--  ACE_INLINE IR::StructMember *
--  IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (CORBA::ULong size)
-+  ACE_INLINE IR_StructMember *
-+  _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (CORBA::ULong size)
-   // Allocate storage for the sequence.
-   {
--    IR::StructMember *retval = 0;
--    ACE_NEW_RETURN (retval, IR::StructMember[size], 0);
-+    IR_StructMember *retval = 0;
-+    ACE_NEW_RETURN (retval, IR_StructMember[size], 0);
-     return retval;
-   }
-   
--  ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::freebuf (IR::StructMember *buffer)
-+  ACE_INLINE void _TAO_Unbounded_Sequence_IR_StructMemberSeq::freebuf (IR_StructMember *buffer)
-   // Free the sequence.
-   {
-     delete [] buffer;
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (void) // Default constructor.
-+  _TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (void) // Default constructor.
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-+  _TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::StructMember *data,
-+    IR_StructMember *data,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs)
-+  _TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs)
-   // Copy constructor.
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::StructMember *tmp1 = _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (this->maximum_);
--      IR::StructMember * const tmp2 = ACE_reinterpret_cast (IR::StructMember * ACE_CAST_CONST, rhs.buffer_);
-+      IR_StructMember *tmp1 = _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (this->maximum_);
-+      IR_StructMember * const tmp2 = ACE_reinterpret_cast (IR_StructMember * ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp1[i] = tmp2[i];
-@@ -9959,8 +9222,8 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq &
--  IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Sequence_IR_StructMemberSeq &
-+  _TAO_Unbounded_Sequence_IR_StructMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs)
-   // Assignment operator.
-   {
-     if (this == &rhs)
-@@ -9971,7 +9234,7 @@
-       if (this->maximum_ < rhs.maximum_)
-       {
-         // free the old buffer
--        IR::StructMember *tmp = ACE_reinterpret_cast (IR::StructMember *, this->buffer_);
-+        IR_StructMember *tmp = ACE_reinterpret_cast (IR_StructMember *, this->buffer_);
-         _TAO_Unbounded_Sequence_IR_StructMemberSeq::freebuf (tmp);
-         this->buffer_ = _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (rhs.maximum_);
-       }
-@@ -9981,8 +9244,8 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::StructMember *tmp1 = ACE_reinterpret_cast (IR::StructMember *, this->buffer_);
--    IR::StructMember * const tmp2 = ACE_reinterpret_cast (IR::StructMember * ACE_CAST_CONST, rhs.buffer_);
-+    IR_StructMember *tmp1 = ACE_reinterpret_cast (IR_StructMember *, this->buffer_);
-+    IR_StructMember * const tmp2 = ACE_reinterpret_cast (IR_StructMember * ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-       tmp1[i] = tmp2[i];
-@@ -9991,30 +9254,30 @@
-   }
-   
-   // = Accessors.
--  ACE_INLINE IR::StructMember &
--  IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::operator[] (CORBA::ULong i)
-+  ACE_INLINE IR_StructMember &
-+  _TAO_Unbounded_Sequence_IR_StructMemberSeq::operator[] (CORBA::ULong i)
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::StructMember* tmp = ACE_reinterpret_cast(IR::StructMember*,this->buffer_);
-+    IR_StructMember* tmp = ACE_reinterpret_cast(IR_StructMember*,this->buffer_);
-     return tmp[i];
-   }
-   
--  ACE_INLINE const IR::StructMember &
--  IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::operator[] (CORBA::ULong i) const
-+  ACE_INLINE const IR_StructMember &
-+  _TAO_Unbounded_Sequence_IR_StructMemberSeq::operator[] (CORBA::ULong i) const
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::StructMember * const tmp = ACE_reinterpret_cast (IR::StructMember* ACE_CAST_CONST, this->buffer_);
-+    IR_StructMember * const tmp = ACE_reinterpret_cast (IR_StructMember* ACE_CAST_CONST, this->buffer_);
-     return tmp[i];
-   }
-   
-   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-   
--  ACE_INLINE IR::StructMember *
--  IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_StructMember *
-+  _TAO_Unbounded_Sequence_IR_StructMemberSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::StructMember *result = 0;
-+    IR_StructMember *result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -10026,7 +9289,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::StructMember*, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_StructMember*, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -10035,7 +9298,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::StructMember*,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_StructMember*,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -10045,76 +9308,70 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::StructMember *
--  IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::get_buffer (void) const
-+  ACE_INLINE const IR_StructMember *
-+  _TAO_Unbounded_Sequence_IR_StructMemberSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::StructMember * ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_StructMember * ACE_CAST_CONST, this->buffer_);
-   }
-   
-   ACE_INLINE void
--  IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::replace (CORBA::ULong max,
-+  _TAO_Unbounded_Sequence_IR_StructMemberSeq::replace (CORBA::ULong max,
-   CORBA::ULong length,
--  IR::StructMember *data,
-+  IR_StructMember *data,
-   CORBA::Boolean release)
-   {
-     this->maximum_ = max;
-     this->length_ = length;
-     if (this->buffer_ && this->release_ == 1)
-     {
--      IR::StructMember *tmp = ACE_reinterpret_cast(IR::StructMember*,this->buffer_);
-+      IR_StructMember *tmp = ACE_reinterpret_cast(IR_StructMember*,this->buffer_);
-       _TAO_Unbounded_Sequence_IR_StructMemberSeq::freebuf (tmp);
-     }
-     this->buffer_ = data;
-     this->release_ = release;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_STRUCTMEMBERSEQ_CI_)
--#define _IR_STRUCTMEMBERSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::StructMemberSeq_var
-+// Inline operations for class IR_StructMemberSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::StructMemberSeq_var::StructMemberSeq_var (void) // default constructor
-+IR_StructMemberSeq_var::IR_StructMemberSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::StructMemberSeq_var::StructMemberSeq_var (StructMemberSeq *p)
-+IR_StructMemberSeq_var::IR_StructMemberSeq_var (IR_StructMemberSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::StructMemberSeq_var::StructMemberSeq_var (const ::IR::StructMemberSeq_var &p) // copy constructor
-+IR_StructMemberSeq_var::IR_StructMemberSeq_var (const ::IR_StructMemberSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::StructMemberSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_StructMemberSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::StructMemberSeq_var::~StructMemberSeq_var (void) // destructor
-+IR_StructMemberSeq_var::~IR_StructMemberSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::StructMemberSeq_var &
--IR::StructMemberSeq_var::operator= (StructMemberSeq *p)
-+ACE_INLINE IR_StructMemberSeq_var &
-+IR_StructMemberSeq_var::operator= (IR_StructMemberSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::StructMemberSeq_var &
--IR::StructMemberSeq_var::operator= (const ::IR::StructMemberSeq_var &p)
-+ACE_INLINE IR_StructMemberSeq_var &
-+IR_StructMemberSeq_var::operator= (const ::IR_StructMemberSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -10125,12 +9382,12 @@
-         }
-       else
-         {
--          StructMemberSeq *deep_copy =
--            new StructMemberSeq (*p.ptr_);
-+          IR_StructMemberSeq *deep_copy = 
-+            new IR_StructMemberSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              StructMemberSeq *tmp = deep_copy;
-+              IR_StructMemberSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -10141,103 +9398,103 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::StructMemberSeq *
--IR::StructMemberSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_StructMemberSeq *
-+IR_StructMemberSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::StructMemberSeq *
--IR::StructMemberSeq_var::operator-> (void)
-+ACE_INLINE ::IR_StructMemberSeq *
-+IR_StructMemberSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::StructMemberSeq_var::operator const ::IR::StructMemberSeq &() const // cast
-+IR_StructMemberSeq_var::operator const ::IR_StructMemberSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::StructMemberSeq_var::operator ::IR::StructMemberSeq &() // cast 
-+IR_StructMemberSeq_var::operator ::IR_StructMemberSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::StructMemberSeq_var::operator ::IR::StructMemberSeq &() const // cast 
-+IR_StructMemberSeq_var::operator ::IR_StructMemberSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::StructMemberSeq_var::operator ::IR::StructMemberSeq *&() // cast 
-+IR_StructMemberSeq_var::operator ::IR_StructMemberSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::StructMember &
--IR::StructMemberSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_StructMember &
-+IR_StructMemberSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const IR::StructMember &
--IR::StructMemberSeq_var::operator[] (CORBA::ULong index) const
-+ACE_INLINE const IR_StructMember &
-+IR_StructMemberSeq_var::operator[] (CORBA::ULong index) const
- {
--  return ACE_const_cast (const IR::StructMember &, this->ptr_->operator[] (index));
-+  return ACE_const_cast (const IR_StructMember &, this->ptr_->operator[] (index));
- }
- 
--ACE_INLINE const ::IR::StructMemberSeq &
--IR::StructMemberSeq_var::in (void) const
-+ACE_INLINE const ::IR_StructMemberSeq &
-+IR_StructMemberSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::StructMemberSeq &
--IR::StructMemberSeq_var::inout (void)
-+ACE_INLINE ::IR_StructMemberSeq &
-+IR_StructMemberSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::StructMemberSeq *&
--IR::StructMemberSeq_var::out (void)
-+ACE_INLINE ::IR_StructMemberSeq *&
-+IR_StructMemberSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::StructMemberSeq *
--IR::StructMemberSeq_var::_retn (void)
-+ACE_INLINE ::IR_StructMemberSeq *
-+IR_StructMemberSeq_var::_retn (void)
- {
--  ::IR::StructMemberSeq *tmp = this->ptr_;
-+  ::IR_StructMemberSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::StructMemberSeq *
--IR::StructMemberSeq_var::ptr (void) const
-+ACE_INLINE ::IR_StructMemberSeq *
-+IR_StructMemberSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::StructMemberSeq_out
-+// Inline operations for class IR_StructMemberSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::StructMemberSeq_out::StructMemberSeq_out (StructMemberSeq *&p)
-+IR_StructMemberSeq_out::IR_StructMemberSeq_out (IR_StructMemberSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::StructMemberSeq_out::StructMemberSeq_out (StructMemberSeq_var &p) // constructor from _var
-+IR_StructMemberSeq_out::IR_StructMemberSeq_out (IR_StructMemberSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -10245,90 +9502,87 @@
- }
- 
- ACE_INLINE
--IR::StructMemberSeq_out::StructMemberSeq_out (const ::IR::StructMemberSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (StructMemberSeq_out&, p).ptr_)
-+IR_StructMemberSeq_out::IR_StructMemberSeq_out (const ::IR_StructMemberSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_StructMemberSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::StructMemberSeq_out &
--IR::StructMemberSeq_out::operator= (const ::IR::StructMemberSeq_out &p)
-+ACE_INLINE ::IR_StructMemberSeq_out &
-+IR_StructMemberSeq_out::operator= (const ::IR_StructMemberSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (StructMemberSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_StructMemberSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::StructMemberSeq_out &
--IR::StructMemberSeq_out::operator= (StructMemberSeq *p)
-+ACE_INLINE ::IR_StructMemberSeq_out &
-+IR_StructMemberSeq_out::operator= (IR_StructMemberSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::StructMemberSeq_out::operator ::IR::StructMemberSeq *&() // cast
-+IR_StructMemberSeq_out::operator ::IR_StructMemberSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::StructMemberSeq *&
--IR::StructMemberSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_StructMemberSeq *&
-+IR_StructMemberSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::StructMemberSeq *
--IR::StructMemberSeq_out::operator-> (void)
-+ACE_INLINE ::IR_StructMemberSeq *
-+IR_StructMemberSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::StructMember &
--IR::StructMemberSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_StructMember &
-+IR_StructMemberSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
- // *************************************************************
--// Inline operations for class IR::Initializer_var
-+// Inline operations for class IR_Initializer_var
- // *************************************************************
- 
- ACE_INLINE
--IR::Initializer_var::Initializer_var (void) // default constructor
-+IR_Initializer_var::IR_Initializer_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::Initializer_var::Initializer_var (Initializer *p)
-+IR_Initializer_var::IR_Initializer_var (IR_Initializer *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::Initializer_var::Initializer_var (const ::IR::Initializer_var &p) // copy constructor
-+IR_Initializer_var::IR_Initializer_var (const ::IR_Initializer_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::Initializer (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_Initializer (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::Initializer_var::~Initializer_var (void) // destructor
-+IR_Initializer_var::~IR_Initializer_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::Initializer_var &
--IR::Initializer_var::operator= (Initializer *p)
-+ACE_INLINE IR_Initializer_var &
-+IR_Initializer_var::operator= (IR_Initializer *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::Initializer_var &
--IR::Initializer_var::operator= (const ::IR::Initializer_var &p)
-+ACE_INLINE ::IR_Initializer_var &
-+IR_Initializer_var::operator= (const ::IR_Initializer_var &p)
- {
-   if (this != &p)
-     {
-@@ -10339,12 +9593,12 @@
-         }
-       else
-         {
--          Initializer *deep_copy =
--            new Initializer (*p.ptr_);
-+          IR_Initializer *deep_copy = 
-+            new IR_Initializer (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              Initializer *tmp = deep_copy;
-+              IR_Initializer *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -10355,91 +9609,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::Initializer *
--IR::Initializer_var::operator-> (void) const
-+ACE_INLINE const ::IR_Initializer *
-+IR_Initializer_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::Initializer *
--IR::Initializer_var::operator-> (void)
-+ACE_INLINE ::IR_Initializer *
-+IR_Initializer_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::Initializer_var::operator const ::IR::Initializer &() const // cast
-+IR_Initializer_var::operator const ::IR_Initializer &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::Initializer_var::operator ::IR::Initializer &() // cast 
-+IR_Initializer_var::operator ::IR_Initializer &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::Initializer_var::operator ::IR::Initializer &() const // cast 
-+IR_Initializer_var::operator ::IR_Initializer &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::Initializer_var::operator ::IR::Initializer *&() // cast 
-+IR_Initializer_var::operator ::IR_Initializer *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::Initializer &
--IR::Initializer_var::in (void) const
-+ACE_INLINE const ::IR_Initializer &
-+IR_Initializer_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::Initializer &
--IR::Initializer_var::inout (void)
-+ACE_INLINE ::IR_Initializer &
-+IR_Initializer_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::Initializer *&
--IR::Initializer_var::out (void)
-+ACE_INLINE ::IR_Initializer *&
-+IR_Initializer_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::Initializer *
--IR::Initializer_var::_retn (void)
-+ACE_INLINE ::IR_Initializer *
-+IR_Initializer_var::_retn (void)
- {
--  ::IR::Initializer *tmp = this->ptr_;
-+  ::IR_Initializer *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::Initializer *
--IR::Initializer_var::ptr (void) const
-+ACE_INLINE ::IR_Initializer *
-+IR_Initializer_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::Initializer_out
-+// Inline operations for class IR_Initializer_out
- // *************************************************************
- 
- ACE_INLINE
--IR::Initializer_out::Initializer_out (::IR::Initializer *&p)
-+IR_Initializer_out::IR_Initializer_out (::IR_Initializer *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::Initializer_out::Initializer_out (Initializer_var &p) // constructor from _var
-+IR_Initializer_out::IR_Initializer_out (IR_Initializer_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -10447,93 +9701,89 @@
- }
- 
- ACE_INLINE
--IR::Initializer_out::Initializer_out (const ::IR::Initializer_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (Initializer_out&, p).ptr_)
-+IR_Initializer_out::IR_Initializer_out (const ::IR_Initializer_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_Initializer_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::Initializer_out &
--IR::Initializer_out::operator= (const ::IR::Initializer_out &p)
-+ACE_INLINE IR_Initializer_out &
-+IR_Initializer_out::operator= (const ::IR_Initializer_out &p)
- {
--  this->ptr_ = ACE_const_cast (Initializer_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_Initializer_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::Initializer_out &
--IR::Initializer_out::operator= (Initializer *p)
-+ACE_INLINE IR_Initializer_out &
-+IR_Initializer_out::operator= (IR_Initializer *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::Initializer_out::operator ::IR::Initializer *&() // cast
-+IR_Initializer_out::operator ::IR_Initializer *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::Initializer *&
--IR::Initializer_out::ptr (void) // ptr
-+ACE_INLINE ::IR_Initializer *&
-+IR_Initializer_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::Initializer *
--IR::Initializer_out::operator-> (void)
-+ACE_INLINE ::IR_Initializer *
-+IR_Initializer_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CI_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CI_
--
-   // = Static operations.
--  ACE_INLINE IR::Initializer *
--  IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (CORBA::ULong size)
-+  ACE_INLINE IR_Initializer *
-+  _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (CORBA::ULong size)
-   // Allocate storage for the sequence.
-   {
--    IR::Initializer *retval = 0;
--    ACE_NEW_RETURN (retval, IR::Initializer[size], 0);
-+    IR_Initializer *retval = 0;
-+    ACE_NEW_RETURN (retval, IR_Initializer[size], 0);
-     return retval;
-   }
-   
--  ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::freebuf (IR::Initializer *buffer)
-+  ACE_INLINE void _TAO_Unbounded_Sequence_IR_InitializerSeq::freebuf (IR_Initializer *buffer)
-   // Free the sequence.
-   {
-     delete [] buffer;
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (void) // Default constructor.
-+  _TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (void) // Default constructor.
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-+  _TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::Initializer *data,
-+    IR_Initializer *data,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs)
-+  _TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs)
-   // Copy constructor.
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::Initializer *tmp1 = _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (this->maximum_);
--      IR::Initializer * const tmp2 = ACE_reinterpret_cast (IR::Initializer * ACE_CAST_CONST, rhs.buffer_);
-+      IR_Initializer *tmp1 = _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (this->maximum_);
-+      IR_Initializer * const tmp2 = ACE_reinterpret_cast (IR_Initializer * ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp1[i] = tmp2[i];
-@@ -10546,8 +9796,8 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_InitializerSeq &
--  IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::operator= (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Sequence_IR_InitializerSeq &
-+  _TAO_Unbounded_Sequence_IR_InitializerSeq::operator= (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs)
-   // Assignment operator.
-   {
-     if (this == &rhs)
-@@ -10558,7 +9808,7 @@
-       if (this->maximum_ < rhs.maximum_)
-       {
-         // free the old buffer
--        IR::Initializer *tmp = ACE_reinterpret_cast (IR::Initializer *, this->buffer_);
-+        IR_Initializer *tmp = ACE_reinterpret_cast (IR_Initializer *, this->buffer_);
-         _TAO_Unbounded_Sequence_IR_InitializerSeq::freebuf (tmp);
-         this->buffer_ = _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (rhs.maximum_);
-       }
-@@ -10568,8 +9818,8 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::Initializer *tmp1 = ACE_reinterpret_cast (IR::Initializer *, this->buffer_);
--    IR::Initializer * const tmp2 = ACE_reinterpret_cast (IR::Initializer * ACE_CAST_CONST, rhs.buffer_);
-+    IR_Initializer *tmp1 = ACE_reinterpret_cast (IR_Initializer *, this->buffer_);
-+    IR_Initializer * const tmp2 = ACE_reinterpret_cast (IR_Initializer * ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-       tmp1[i] = tmp2[i];
-@@ -10578,30 +9828,30 @@
-   }
-   
-   // = Accessors.
--  ACE_INLINE IR::Initializer &
--  IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::operator[] (CORBA::ULong i)
-+  ACE_INLINE IR_Initializer &
-+  _TAO_Unbounded_Sequence_IR_InitializerSeq::operator[] (CORBA::ULong i)
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::Initializer* tmp = ACE_reinterpret_cast(IR::Initializer*,this->buffer_);
-+    IR_Initializer* tmp = ACE_reinterpret_cast(IR_Initializer*,this->buffer_);
-     return tmp[i];
-   }
-   
--  ACE_INLINE const IR::Initializer &
--  IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::operator[] (CORBA::ULong i) const
-+  ACE_INLINE const IR_Initializer &
-+  _TAO_Unbounded_Sequence_IR_InitializerSeq::operator[] (CORBA::ULong i) const
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::Initializer * const tmp = ACE_reinterpret_cast (IR::Initializer* ACE_CAST_CONST, this->buffer_);
-+    IR_Initializer * const tmp = ACE_reinterpret_cast (IR_Initializer* ACE_CAST_CONST, this->buffer_);
-     return tmp[i];
-   }
-   
-   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-   
--  ACE_INLINE IR::Initializer *
--  IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_Initializer *
-+  _TAO_Unbounded_Sequence_IR_InitializerSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::Initializer *result = 0;
-+    IR_Initializer *result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -10613,7 +9863,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::Initializer*, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_Initializer*, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -10622,7 +9872,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::Initializer*,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_Initializer*,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -10632,76 +9882,70 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::Initializer *
--  IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::get_buffer (void) const
-+  ACE_INLINE const IR_Initializer *
-+  _TAO_Unbounded_Sequence_IR_InitializerSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::Initializer * ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_Initializer * ACE_CAST_CONST, this->buffer_);
-   }
-   
-   ACE_INLINE void
--  IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::replace (CORBA::ULong max,
-+  _TAO_Unbounded_Sequence_IR_InitializerSeq::replace (CORBA::ULong max,
-   CORBA::ULong length,
--  IR::Initializer *data,
-+  IR_Initializer *data,
-   CORBA::Boolean release)
-   {
-     this->maximum_ = max;
-     this->length_ = length;
-     if (this->buffer_ && this->release_ == 1)
-     {
--      IR::Initializer *tmp = ACE_reinterpret_cast(IR::Initializer*,this->buffer_);
-+      IR_Initializer *tmp = ACE_reinterpret_cast(IR_Initializer*,this->buffer_);
-       _TAO_Unbounded_Sequence_IR_InitializerSeq::freebuf (tmp);
-     }
-     this->buffer_ = data;
-     this->release_ = release;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_INITIALIZERSEQ_CI_)
--#define _IR_INITIALIZERSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::InitializerSeq_var
-+// Inline operations for class IR_InitializerSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::InitializerSeq_var::InitializerSeq_var (void) // default constructor
-+IR_InitializerSeq_var::IR_InitializerSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::InitializerSeq_var::InitializerSeq_var (InitializerSeq *p)
-+IR_InitializerSeq_var::IR_InitializerSeq_var (IR_InitializerSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::InitializerSeq_var::InitializerSeq_var (const ::IR::InitializerSeq_var &p) // copy constructor
-+IR_InitializerSeq_var::IR_InitializerSeq_var (const ::IR_InitializerSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::InitializerSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_InitializerSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::InitializerSeq_var::~InitializerSeq_var (void) // destructor
-+IR_InitializerSeq_var::~IR_InitializerSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::InitializerSeq_var &
--IR::InitializerSeq_var::operator= (InitializerSeq *p)
-+ACE_INLINE IR_InitializerSeq_var &
-+IR_InitializerSeq_var::operator= (IR_InitializerSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::InitializerSeq_var &
--IR::InitializerSeq_var::operator= (const ::IR::InitializerSeq_var &p)
-+ACE_INLINE IR_InitializerSeq_var &
-+IR_InitializerSeq_var::operator= (const ::IR_InitializerSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -10712,12 +9956,12 @@
-         }
-       else
-         {
--          InitializerSeq *deep_copy =
--            new InitializerSeq (*p.ptr_);
-+          IR_InitializerSeq *deep_copy = 
-+            new IR_InitializerSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              InitializerSeq *tmp = deep_copy;
-+              IR_InitializerSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -10728,103 +9972,103 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::InitializerSeq *
--IR::InitializerSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_InitializerSeq *
-+IR_InitializerSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::InitializerSeq *
--IR::InitializerSeq_var::operator-> (void)
-+ACE_INLINE ::IR_InitializerSeq *
-+IR_InitializerSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::InitializerSeq_var::operator const ::IR::InitializerSeq &() const // cast
-+IR_InitializerSeq_var::operator const ::IR_InitializerSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::InitializerSeq_var::operator ::IR::InitializerSeq &() // cast 
-+IR_InitializerSeq_var::operator ::IR_InitializerSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::InitializerSeq_var::operator ::IR::InitializerSeq &() const // cast 
-+IR_InitializerSeq_var::operator ::IR_InitializerSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::InitializerSeq_var::operator ::IR::InitializerSeq *&() // cast 
-+IR_InitializerSeq_var::operator ::IR_InitializerSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Initializer &
--IR::InitializerSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_Initializer &
-+IR_InitializerSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const IR::Initializer &
--IR::InitializerSeq_var::operator[] (CORBA::ULong index) const
-+ACE_INLINE const IR_Initializer &
-+IR_InitializerSeq_var::operator[] (CORBA::ULong index) const
- {
--  return ACE_const_cast (const IR::Initializer &, this->ptr_->operator[] (index));
-+  return ACE_const_cast (const IR_Initializer &, this->ptr_->operator[] (index));
- }
- 
--ACE_INLINE const ::IR::InitializerSeq &
--IR::InitializerSeq_var::in (void) const
-+ACE_INLINE const ::IR_InitializerSeq &
-+IR_InitializerSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::InitializerSeq &
--IR::InitializerSeq_var::inout (void)
-+ACE_INLINE ::IR_InitializerSeq &
-+IR_InitializerSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::InitializerSeq *&
--IR::InitializerSeq_var::out (void)
-+ACE_INLINE ::IR_InitializerSeq *&
-+IR_InitializerSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::InitializerSeq *
--IR::InitializerSeq_var::_retn (void)
-+ACE_INLINE ::IR_InitializerSeq *
-+IR_InitializerSeq_var::_retn (void)
- {
--  ::IR::InitializerSeq *tmp = this->ptr_;
-+  ::IR_InitializerSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::InitializerSeq *
--IR::InitializerSeq_var::ptr (void) const
-+ACE_INLINE ::IR_InitializerSeq *
-+IR_InitializerSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::InitializerSeq_out
-+// Inline operations for class IR_InitializerSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::InitializerSeq_out::InitializerSeq_out (InitializerSeq *&p)
-+IR_InitializerSeq_out::IR_InitializerSeq_out (IR_InitializerSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::InitializerSeq_out::InitializerSeq_out (InitializerSeq_var &p) // constructor from _var
-+IR_InitializerSeq_out::IR_InitializerSeq_out (IR_InitializerSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -10832,90 +10076,87 @@
- }
- 
- ACE_INLINE
--IR::InitializerSeq_out::InitializerSeq_out (const ::IR::InitializerSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (InitializerSeq_out&, p).ptr_)
-+IR_InitializerSeq_out::IR_InitializerSeq_out (const ::IR_InitializerSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_InitializerSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::InitializerSeq_out &
--IR::InitializerSeq_out::operator= (const ::IR::InitializerSeq_out &p)
-+ACE_INLINE ::IR_InitializerSeq_out &
-+IR_InitializerSeq_out::operator= (const ::IR_InitializerSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (InitializerSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_InitializerSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::InitializerSeq_out &
--IR::InitializerSeq_out::operator= (InitializerSeq *p)
-+ACE_INLINE ::IR_InitializerSeq_out &
-+IR_InitializerSeq_out::operator= (IR_InitializerSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::InitializerSeq_out::operator ::IR::InitializerSeq *&() // cast
-+IR_InitializerSeq_out::operator ::IR_InitializerSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::InitializerSeq *&
--IR::InitializerSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_InitializerSeq *&
-+IR_InitializerSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::InitializerSeq *
--IR::InitializerSeq_out::operator-> (void)
-+ACE_INLINE ::IR_InitializerSeq *
-+IR_InitializerSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Initializer &
--IR::InitializerSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_Initializer &
-+IR_InitializerSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
- // *************************************************************
--// Inline operations for class IR::UnionMember_var
-+// Inline operations for class IR_UnionMember_var
- // *************************************************************
- 
- ACE_INLINE
--IR::UnionMember_var::UnionMember_var (void) // default constructor
-+IR_UnionMember_var::IR_UnionMember_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::UnionMember_var::UnionMember_var (UnionMember *p)
-+IR_UnionMember_var::IR_UnionMember_var (IR_UnionMember *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::UnionMember_var::UnionMember_var (const ::IR::UnionMember_var &p) // copy constructor
-+IR_UnionMember_var::IR_UnionMember_var (const ::IR_UnionMember_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::UnionMember (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_UnionMember (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::UnionMember_var::~UnionMember_var (void) // destructor
-+IR_UnionMember_var::~IR_UnionMember_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::UnionMember_var &
--IR::UnionMember_var::operator= (UnionMember *p)
-+ACE_INLINE IR_UnionMember_var &
-+IR_UnionMember_var::operator= (IR_UnionMember *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::UnionMember_var &
--IR::UnionMember_var::operator= (const ::IR::UnionMember_var &p)
-+ACE_INLINE ::IR_UnionMember_var &
-+IR_UnionMember_var::operator= (const ::IR_UnionMember_var &p)
- {
-   if (this != &p)
-     {
-@@ -10926,12 +10167,12 @@
-         }
-       else
-         {
--          UnionMember *deep_copy =
--            new UnionMember (*p.ptr_);
-+          IR_UnionMember *deep_copy = 
-+            new IR_UnionMember (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              UnionMember *tmp = deep_copy;
-+              IR_UnionMember *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -10942,91 +10183,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::UnionMember *
--IR::UnionMember_var::operator-> (void) const
-+ACE_INLINE const ::IR_UnionMember *
-+IR_UnionMember_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UnionMember *
--IR::UnionMember_var::operator-> (void)
-+ACE_INLINE ::IR_UnionMember *
-+IR_UnionMember_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::UnionMember_var::operator const ::IR::UnionMember &() const // cast
-+IR_UnionMember_var::operator const ::IR_UnionMember &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::UnionMember_var::operator ::IR::UnionMember &() // cast 
-+IR_UnionMember_var::operator ::IR_UnionMember &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::UnionMember_var::operator ::IR::UnionMember &() const // cast 
-+IR_UnionMember_var::operator ::IR_UnionMember &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::UnionMember_var::operator ::IR::UnionMember *&() // cast 
-+IR_UnionMember_var::operator ::IR_UnionMember *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::UnionMember &
--IR::UnionMember_var::in (void) const
-+ACE_INLINE const ::IR_UnionMember &
-+IR_UnionMember_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::UnionMember &
--IR::UnionMember_var::inout (void)
-+ACE_INLINE ::IR_UnionMember &
-+IR_UnionMember_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::UnionMember *&
--IR::UnionMember_var::out (void)
-+ACE_INLINE ::IR_UnionMember *&
-+IR_UnionMember_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UnionMember *
--IR::UnionMember_var::_retn (void)
-+ACE_INLINE ::IR_UnionMember *
-+IR_UnionMember_var::_retn (void)
- {
--  ::IR::UnionMember *tmp = this->ptr_;
-+  ::IR_UnionMember *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::UnionMember *
--IR::UnionMember_var::ptr (void) const
-+ACE_INLINE ::IR_UnionMember *
-+IR_UnionMember_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::UnionMember_out
-+// Inline operations for class IR_UnionMember_out
- // *************************************************************
- 
- ACE_INLINE
--IR::UnionMember_out::UnionMember_out (::IR::UnionMember *&p)
-+IR_UnionMember_out::IR_UnionMember_out (::IR_UnionMember *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::UnionMember_out::UnionMember_out (UnionMember_var &p) // constructor from _var
-+IR_UnionMember_out::IR_UnionMember_out (IR_UnionMember_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -11034,93 +10275,89 @@
- }
- 
- ACE_INLINE
--IR::UnionMember_out::UnionMember_out (const ::IR::UnionMember_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (UnionMember_out&, p).ptr_)
-+IR_UnionMember_out::IR_UnionMember_out (const ::IR_UnionMember_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_UnionMember_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::UnionMember_out &
--IR::UnionMember_out::operator= (const ::IR::UnionMember_out &p)
-+ACE_INLINE IR_UnionMember_out &
-+IR_UnionMember_out::operator= (const ::IR_UnionMember_out &p)
- {
--  this->ptr_ = ACE_const_cast (UnionMember_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_UnionMember_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::UnionMember_out &
--IR::UnionMember_out::operator= (UnionMember *p)
-+ACE_INLINE IR_UnionMember_out &
-+IR_UnionMember_out::operator= (IR_UnionMember *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::UnionMember_out::operator ::IR::UnionMember *&() // cast
-+IR_UnionMember_out::operator ::IR_UnionMember *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UnionMember *&
--IR::UnionMember_out::ptr (void) // ptr
-+ACE_INLINE ::IR_UnionMember *&
-+IR_UnionMember_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UnionMember *
--IR::UnionMember_out::operator-> (void)
-+ACE_INLINE ::IR_UnionMember *
-+IR_UnionMember_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CI_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CI_
--
-   // = Static operations.
--  ACE_INLINE IR::UnionMember *
--  IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (CORBA::ULong size)
-+  ACE_INLINE IR_UnionMember *
-+  _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (CORBA::ULong size)
-   // Allocate storage for the sequence.
-   {
--    IR::UnionMember *retval = 0;
--    ACE_NEW_RETURN (retval, IR::UnionMember[size], 0);
-+    IR_UnionMember *retval = 0;
-+    ACE_NEW_RETURN (retval, IR_UnionMember[size], 0);
-     return retval;
-   }
-   
--  ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::freebuf (IR::UnionMember *buffer)
-+  ACE_INLINE void _TAO_Unbounded_Sequence_IR_UnionMemberSeq::freebuf (IR_UnionMember *buffer)
-   // Free the sequence.
-   {
-     delete [] buffer;
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (void) // Default constructor.
-+  _TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (void) // Default constructor.
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-+  _TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::UnionMember *data,
-+    IR_UnionMember *data,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs)
-+  _TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs)
-   // Copy constructor.
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::UnionMember *tmp1 = _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (this->maximum_);
--      IR::UnionMember * const tmp2 = ACE_reinterpret_cast (IR::UnionMember * ACE_CAST_CONST, rhs.buffer_);
-+      IR_UnionMember *tmp1 = _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (this->maximum_);
-+      IR_UnionMember * const tmp2 = ACE_reinterpret_cast (IR_UnionMember * ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp1[i] = tmp2[i];
-@@ -11133,8 +10370,8 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq &
--  IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Sequence_IR_UnionMemberSeq &
-+  _TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs)
-   // Assignment operator.
-   {
-     if (this == &rhs)
-@@ -11145,7 +10382,7 @@
-       if (this->maximum_ < rhs.maximum_)
-       {
-         // free the old buffer
--        IR::UnionMember *tmp = ACE_reinterpret_cast (IR::UnionMember *, this->buffer_);
-+        IR_UnionMember *tmp = ACE_reinterpret_cast (IR_UnionMember *, this->buffer_);
-         _TAO_Unbounded_Sequence_IR_UnionMemberSeq::freebuf (tmp);
-         this->buffer_ = _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (rhs.maximum_);
-       }
-@@ -11155,8 +10392,8 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::UnionMember *tmp1 = ACE_reinterpret_cast (IR::UnionMember *, this->buffer_);
--    IR::UnionMember * const tmp2 = ACE_reinterpret_cast (IR::UnionMember * ACE_CAST_CONST, rhs.buffer_);
-+    IR_UnionMember *tmp1 = ACE_reinterpret_cast (IR_UnionMember *, this->buffer_);
-+    IR_UnionMember * const tmp2 = ACE_reinterpret_cast (IR_UnionMember * ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-       tmp1[i] = tmp2[i];
-@@ -11165,30 +10402,30 @@
-   }
-   
-   // = Accessors.
--  ACE_INLINE IR::UnionMember &
--  IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator[] (CORBA::ULong i)
-+  ACE_INLINE IR_UnionMember &
-+  _TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator[] (CORBA::ULong i)
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::UnionMember* tmp = ACE_reinterpret_cast(IR::UnionMember*,this->buffer_);
-+    IR_UnionMember* tmp = ACE_reinterpret_cast(IR_UnionMember*,this->buffer_);
-     return tmp[i];
-   }
-   
--  ACE_INLINE const IR::UnionMember &
--  IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator[] (CORBA::ULong i) const
-+  ACE_INLINE const IR_UnionMember &
-+  _TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator[] (CORBA::ULong i) const
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::UnionMember * const tmp = ACE_reinterpret_cast (IR::UnionMember* ACE_CAST_CONST, this->buffer_);
-+    IR_UnionMember * const tmp = ACE_reinterpret_cast (IR_UnionMember* ACE_CAST_CONST, this->buffer_);
-     return tmp[i];
-   }
-   
-   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-   
--  ACE_INLINE IR::UnionMember *
--  IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_UnionMember *
-+  _TAO_Unbounded_Sequence_IR_UnionMemberSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::UnionMember *result = 0;
-+    IR_UnionMember *result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -11200,7 +10437,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::UnionMember*, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_UnionMember*, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -11209,7 +10446,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::UnionMember*,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_UnionMember*,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -11219,76 +10456,70 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::UnionMember *
--  IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::get_buffer (void) const
-+  ACE_INLINE const IR_UnionMember *
-+  _TAO_Unbounded_Sequence_IR_UnionMemberSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::UnionMember * ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_UnionMember * ACE_CAST_CONST, this->buffer_);
-   }
-   
-   ACE_INLINE void
--  IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::replace (CORBA::ULong max,
-+  _TAO_Unbounded_Sequence_IR_UnionMemberSeq::replace (CORBA::ULong max,
-   CORBA::ULong length,
--  IR::UnionMember *data,
-+  IR_UnionMember *data,
-   CORBA::Boolean release)
-   {
-     this->maximum_ = max;
-     this->length_ = length;
-     if (this->buffer_ && this->release_ == 1)
-     {
--      IR::UnionMember *tmp = ACE_reinterpret_cast(IR::UnionMember*,this->buffer_);
-+      IR_UnionMember *tmp = ACE_reinterpret_cast(IR_UnionMember*,this->buffer_);
-       _TAO_Unbounded_Sequence_IR_UnionMemberSeq::freebuf (tmp);
-     }
-     this->buffer_ = data;
-     this->release_ = release;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_UNIONMEMBERSEQ_CI_)
--#define _IR_UNIONMEMBERSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::UnionMemberSeq_var
-+// Inline operations for class IR_UnionMemberSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::UnionMemberSeq_var::UnionMemberSeq_var (void) // default constructor
-+IR_UnionMemberSeq_var::IR_UnionMemberSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::UnionMemberSeq_var::UnionMemberSeq_var (UnionMemberSeq *p)
-+IR_UnionMemberSeq_var::IR_UnionMemberSeq_var (IR_UnionMemberSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::UnionMemberSeq_var::UnionMemberSeq_var (const ::IR::UnionMemberSeq_var &p) // copy constructor
-+IR_UnionMemberSeq_var::IR_UnionMemberSeq_var (const ::IR_UnionMemberSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::UnionMemberSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_UnionMemberSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::UnionMemberSeq_var::~UnionMemberSeq_var (void) // destructor
-+IR_UnionMemberSeq_var::~IR_UnionMemberSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::UnionMemberSeq_var &
--IR::UnionMemberSeq_var::operator= (UnionMemberSeq *p)
-+ACE_INLINE IR_UnionMemberSeq_var &
-+IR_UnionMemberSeq_var::operator= (IR_UnionMemberSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::UnionMemberSeq_var &
--IR::UnionMemberSeq_var::operator= (const ::IR::UnionMemberSeq_var &p)
-+ACE_INLINE IR_UnionMemberSeq_var &
-+IR_UnionMemberSeq_var::operator= (const ::IR_UnionMemberSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -11299,12 +10530,12 @@
-         }
-       else
-         {
--          UnionMemberSeq *deep_copy =
--            new UnionMemberSeq (*p.ptr_);
-+          IR_UnionMemberSeq *deep_copy = 
-+            new IR_UnionMemberSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              UnionMemberSeq *tmp = deep_copy;
-+              IR_UnionMemberSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -11315,103 +10546,103 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::UnionMemberSeq *
--IR::UnionMemberSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_UnionMemberSeq *
-+IR_UnionMemberSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UnionMemberSeq *
--IR::UnionMemberSeq_var::operator-> (void)
-+ACE_INLINE ::IR_UnionMemberSeq *
-+IR_UnionMemberSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::UnionMemberSeq_var::operator const ::IR::UnionMemberSeq &() const // cast
-+IR_UnionMemberSeq_var::operator const ::IR_UnionMemberSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::UnionMemberSeq_var::operator ::IR::UnionMemberSeq &() // cast 
-+IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::UnionMemberSeq_var::operator ::IR::UnionMemberSeq &() const // cast 
-+IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::UnionMemberSeq_var::operator ::IR::UnionMemberSeq *&() // cast 
-+IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UnionMember &
--IR::UnionMemberSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_UnionMember &
-+IR_UnionMemberSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const IR::UnionMember &
--IR::UnionMemberSeq_var::operator[] (CORBA::ULong index) const
-+ACE_INLINE const IR_UnionMember &
-+IR_UnionMemberSeq_var::operator[] (CORBA::ULong index) const
- {
--  return ACE_const_cast (const IR::UnionMember &, this->ptr_->operator[] (index));
-+  return ACE_const_cast (const IR_UnionMember &, this->ptr_->operator[] (index));
- }
- 
--ACE_INLINE const ::IR::UnionMemberSeq &
--IR::UnionMemberSeq_var::in (void) const
-+ACE_INLINE const ::IR_UnionMemberSeq &
-+IR_UnionMemberSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::UnionMemberSeq &
--IR::UnionMemberSeq_var::inout (void)
-+ACE_INLINE ::IR_UnionMemberSeq &
-+IR_UnionMemberSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::UnionMemberSeq *&
--IR::UnionMemberSeq_var::out (void)
-+ACE_INLINE ::IR_UnionMemberSeq *&
-+IR_UnionMemberSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UnionMemberSeq *
--IR::UnionMemberSeq_var::_retn (void)
-+ACE_INLINE ::IR_UnionMemberSeq *
-+IR_UnionMemberSeq_var::_retn (void)
- {
--  ::IR::UnionMemberSeq *tmp = this->ptr_;
-+  ::IR_UnionMemberSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::UnionMemberSeq *
--IR::UnionMemberSeq_var::ptr (void) const
-+ACE_INLINE ::IR_UnionMemberSeq *
-+IR_UnionMemberSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::UnionMemberSeq_out
-+// Inline operations for class IR_UnionMemberSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::UnionMemberSeq_out::UnionMemberSeq_out (UnionMemberSeq *&p)
-+IR_UnionMemberSeq_out::IR_UnionMemberSeq_out (IR_UnionMemberSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::UnionMemberSeq_out::UnionMemberSeq_out (UnionMemberSeq_var &p) // constructor from _var
-+IR_UnionMemberSeq_out::IR_UnionMemberSeq_out (IR_UnionMemberSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -11419,94 +10650,87 @@
- }
- 
- ACE_INLINE
--IR::UnionMemberSeq_out::UnionMemberSeq_out (const ::IR::UnionMemberSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (UnionMemberSeq_out&, p).ptr_)
-+IR_UnionMemberSeq_out::IR_UnionMemberSeq_out (const ::IR_UnionMemberSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_UnionMemberSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::UnionMemberSeq_out &
--IR::UnionMemberSeq_out::operator= (const ::IR::UnionMemberSeq_out &p)
-+ACE_INLINE ::IR_UnionMemberSeq_out &
-+IR_UnionMemberSeq_out::operator= (const ::IR_UnionMemberSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (UnionMemberSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_UnionMemberSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::UnionMemberSeq_out &
--IR::UnionMemberSeq_out::operator= (UnionMemberSeq *p)
-+ACE_INLINE ::IR_UnionMemberSeq_out &
-+IR_UnionMemberSeq_out::operator= (IR_UnionMemberSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::UnionMemberSeq_out::operator ::IR::UnionMemberSeq *&() // cast
-+IR_UnionMemberSeq_out::operator ::IR_UnionMemberSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UnionMemberSeq *&
--IR::UnionMemberSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_UnionMemberSeq *&
-+IR_UnionMemberSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UnionMemberSeq *
--IR::UnionMemberSeq_out::operator-> (void)
-+ACE_INLINE ::IR_UnionMemberSeq *
-+IR_UnionMemberSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UnionMember &
--IR::UnionMemberSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_UnionMember &
-+IR_UnionMemberSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ENUMMEMBERSEQ_CI_)
--#define _IR_ENUMMEMBERSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::EnumMemberSeq_var
-+// Inline operations for class IR_EnumMemberSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::EnumMemberSeq_var::EnumMemberSeq_var (void) // default constructor
-+IR_EnumMemberSeq_var::IR_EnumMemberSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::EnumMemberSeq_var::EnumMemberSeq_var (EnumMemberSeq *p)
-+IR_EnumMemberSeq_var::IR_EnumMemberSeq_var (IR_EnumMemberSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::EnumMemberSeq_var::EnumMemberSeq_var (const ::IR::EnumMemberSeq_var &p) // copy constructor
-+IR_EnumMemberSeq_var::IR_EnumMemberSeq_var (const ::IR_EnumMemberSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::EnumMemberSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_EnumMemberSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::EnumMemberSeq_var::~EnumMemberSeq_var (void) // destructor
-+IR_EnumMemberSeq_var::~IR_EnumMemberSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::EnumMemberSeq_var &
--IR::EnumMemberSeq_var::operator= (EnumMemberSeq *p)
-+ACE_INLINE IR_EnumMemberSeq_var &
-+IR_EnumMemberSeq_var::operator= (IR_EnumMemberSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::EnumMemberSeq_var &
--IR::EnumMemberSeq_var::operator= (const ::IR::EnumMemberSeq_var &p)
-+ACE_INLINE IR_EnumMemberSeq_var &
-+IR_EnumMemberSeq_var::operator= (const ::IR_EnumMemberSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -11517,12 +10741,12 @@
-         }
-       else
-         {
--          EnumMemberSeq *deep_copy =
--            new EnumMemberSeq (*p.ptr_);
-+          IR_EnumMemberSeq *deep_copy = 
-+            new IR_EnumMemberSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              EnumMemberSeq *tmp = deep_copy;
-+              IR_EnumMemberSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -11533,97 +10757,97 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::EnumMemberSeq *
--IR::EnumMemberSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_EnumMemberSeq *
-+IR_EnumMemberSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::EnumMemberSeq *
--IR::EnumMemberSeq_var::operator-> (void)
-+ACE_INLINE ::IR_EnumMemberSeq *
-+IR_EnumMemberSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::EnumMemberSeq_var::operator const ::IR::EnumMemberSeq &() const // cast
-+IR_EnumMemberSeq_var::operator const ::IR_EnumMemberSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::EnumMemberSeq_var::operator ::IR::EnumMemberSeq &() // cast 
-+IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::EnumMemberSeq_var::operator ::IR::EnumMemberSeq &() const // cast 
-+IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::EnumMemberSeq_var::operator ::IR::EnumMemberSeq *&() // cast 
-+IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE TAO_SeqElem_String_Manager
--IR::EnumMemberSeq_var::operator[] (CORBA::ULong index)
-+IR_EnumMemberSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::IR::EnumMemberSeq &
--IR::EnumMemberSeq_var::in (void) const
-+ACE_INLINE const ::IR_EnumMemberSeq &
-+IR_EnumMemberSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::EnumMemberSeq &
--IR::EnumMemberSeq_var::inout (void)
-+ACE_INLINE ::IR_EnumMemberSeq &
-+IR_EnumMemberSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::EnumMemberSeq *&
--IR::EnumMemberSeq_var::out (void)
-+ACE_INLINE ::IR_EnumMemberSeq *&
-+IR_EnumMemberSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::EnumMemberSeq *
--IR::EnumMemberSeq_var::_retn (void)
-+ACE_INLINE ::IR_EnumMemberSeq *
-+IR_EnumMemberSeq_var::_retn (void)
- {
--  ::IR::EnumMemberSeq *tmp = this->ptr_;
-+  ::IR_EnumMemberSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::EnumMemberSeq *
--IR::EnumMemberSeq_var::ptr (void) const
-+ACE_INLINE ::IR_EnumMemberSeq *
-+IR_EnumMemberSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::EnumMemberSeq_out
-+// Inline operations for class IR_EnumMemberSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::EnumMemberSeq_out::EnumMemberSeq_out (EnumMemberSeq *&p)
-+IR_EnumMemberSeq_out::IR_EnumMemberSeq_out (IR_EnumMemberSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::EnumMemberSeq_out::EnumMemberSeq_out (EnumMemberSeq_var &p) // constructor from _var
-+IR_EnumMemberSeq_out::IR_EnumMemberSeq_out (IR_EnumMemberSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -11631,90 +10855,87 @@
- }
- 
- ACE_INLINE
--IR::EnumMemberSeq_out::EnumMemberSeq_out (const ::IR::EnumMemberSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (EnumMemberSeq_out&, p).ptr_)
-+IR_EnumMemberSeq_out::IR_EnumMemberSeq_out (const ::IR_EnumMemberSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_EnumMemberSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::EnumMemberSeq_out &
--IR::EnumMemberSeq_out::operator= (const ::IR::EnumMemberSeq_out &p)
-+ACE_INLINE ::IR_EnumMemberSeq_out &
-+IR_EnumMemberSeq_out::operator= (const ::IR_EnumMemberSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (EnumMemberSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_EnumMemberSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::EnumMemberSeq_out &
--IR::EnumMemberSeq_out::operator= (EnumMemberSeq *p)
-+ACE_INLINE ::IR_EnumMemberSeq_out &
-+IR_EnumMemberSeq_out::operator= (IR_EnumMemberSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::EnumMemberSeq_out::operator ::IR::EnumMemberSeq *&() // cast
-+IR_EnumMemberSeq_out::operator ::IR_EnumMemberSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::EnumMemberSeq *&
--IR::EnumMemberSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_EnumMemberSeq *&
-+IR_EnumMemberSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::EnumMemberSeq *
--IR::EnumMemberSeq_out::operator-> (void)
-+ACE_INLINE ::IR_EnumMemberSeq *
-+IR_EnumMemberSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE TAO_SeqElem_String_Manager
--IR::EnumMemberSeq_out::operator[] (CORBA::ULong index)
-+IR_EnumMemberSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
- // *************************************************************
--// Inline operations for class IR::Container::Description_var
-+// Inline operations for class IR_Container::Description_var
- // *************************************************************
- 
- ACE_INLINE
--IR::Container::Description_var::Description_var (void) // default constructor
-+IR_Container::Description_var::Description_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::Container::Description_var::Description_var (Description *p)
-+IR_Container::Description_var::Description_var (Description *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::Container::Description_var::Description_var (const ::IR::Container::Description_var &p) // copy constructor
-+IR_Container::Description_var::Description_var (const ::IR_Container::Description_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::Container::Description (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_Container::Description (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::Container::Description_var::~Description_var (void) // destructor
-+IR_Container::Description_var::~Description_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::Container::Description_var &
--IR::Container::Description_var::operator= (Description *p)
-+ACE_INLINE IR_Container::Description_var &
-+IR_Container::Description_var::operator= (Description *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::Container::Description_var &
--IR::Container::Description_var::operator= (const ::IR::Container::Description_var &p)
-+ACE_INLINE ::IR_Container::Description_var &
-+IR_Container::Description_var::operator= (const ::IR_Container::Description_var &p)
- {
-   if (this != &p)
-     {
-@@ -11725,12 +10946,12 @@
-         }
-       else
-         {
--          Description *deep_copy =
--            new Description (*p.ptr_);
-+          IR_Container::Description *deep_copy = 
-+            new IR_Container::Description (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              Description *tmp = deep_copy;
-+              IR_Container::Description *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -11741,91 +10962,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::Container::Description *
--IR::Container::Description_var::operator-> (void) const
-+ACE_INLINE const ::IR_Container::Description *
-+IR_Container::Description_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::Container::Description *
--IR::Container::Description_var::operator-> (void)
-+ACE_INLINE ::IR_Container::Description *
-+IR_Container::Description_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::Container::Description_var::operator const ::IR::Container::Description &() const // cast
-+IR_Container::Description_var::operator const ::IR_Container::Description &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::Container::Description_var::operator ::IR::Container::Description &() // cast 
-+IR_Container::Description_var::operator ::IR_Container::Description &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::Container::Description_var::operator ::IR::Container::Description &() const // cast 
-+IR_Container::Description_var::operator ::IR_Container::Description &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::Container::Description_var::operator ::IR::Container::Description *&() // cast 
-+IR_Container::Description_var::operator ::IR_Container::Description *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::Container::Description &
--IR::Container::Description_var::in (void) const
-+ACE_INLINE const ::IR_Container::Description &
-+IR_Container::Description_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::Container::Description &
--IR::Container::Description_var::inout (void)
-+ACE_INLINE ::IR_Container::Description &
-+IR_Container::Description_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::Container::Description *&
--IR::Container::Description_var::out (void)
-+ACE_INLINE ::IR_Container::Description *&
-+IR_Container::Description_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::Container::Description *
--IR::Container::Description_var::_retn (void)
-+ACE_INLINE ::IR_Container::Description *
-+IR_Container::Description_var::_retn (void)
- {
--  ::IR::Container::Description *tmp = this->ptr_;
-+  ::IR_Container::Description *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::Container::Description *
--IR::Container::Description_var::ptr (void) const
-+ACE_INLINE ::IR_Container::Description *
-+IR_Container::Description_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::Container::Description_out
-+// Inline operations for class IR_Container::Description_out
- // *************************************************************
- 
- ACE_INLINE
--IR::Container::Description_out::Description_out (::IR::Container::Description *&p)
-+IR_Container::Description_out::Description_out (::IR_Container::Description *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::Container::Description_out::Description_out (Description_var &p) // constructor from _var
-+IR_Container::Description_out::Description_out (Description_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -11833,93 +11054,89 @@
- }
- 
- ACE_INLINE
--IR::Container::Description_out::Description_out (const ::IR::Container::Description_out &p) // copy constructor
-+IR_Container::Description_out::Description_out (const ::IR_Container::Description_out &p) // copy constructor
-   : ptr_ (ACE_const_cast (Description_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::Container::Description_out &
--IR::Container::Description_out::operator= (const ::IR::Container::Description_out &p)
-+ACE_INLINE IR_Container::Description_out &
-+IR_Container::Description_out::operator= (const ::IR_Container::Description_out &p)
- {
-   this->ptr_ = ACE_const_cast (Description_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::Container::Description_out &
--IR::Container::Description_out::operator= (Description *p)
-+ACE_INLINE IR_Container::Description_out &
-+IR_Container::Description_out::operator= (Description *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::Container::Description_out::operator ::IR::Container::Description *&() // cast
-+IR_Container::Description_out::operator ::IR_Container::Description *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::Container::Description *&
--IR::Container::Description_out::ptr (void) // ptr
-+ACE_INLINE ::IR_Container::Description *&
-+IR_Container::Description_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::Container::Description *
--IR::Container::Description_out::operator-> (void)
-+ACE_INLINE ::IR_Container::Description *
-+IR_Container::Description_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CI_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CI_
--
-   // = Static operations.
--  ACE_INLINE IR::Container::Description *
--  IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (CORBA::ULong size)
-+  ACE_INLINE IR_Container::Description *
-+  IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (CORBA::ULong size)
-   // Allocate storage for the sequence.
-   {
--    IR::Container::Description *retval = 0;
--    ACE_NEW_RETURN (retval, IR::Container::Description[size], 0);
-+    IR_Container::Description *retval = 0;
-+    ACE_NEW_RETURN (retval, IR_Container::Description[size], 0);
-     return retval;
-   }
-   
--  ACE_INLINE void IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (IR::Container::Description *buffer)
-+  ACE_INLINE void IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (IR_Container::Description *buffer)
-   // Free the sequence.
-   {
-     delete [] buffer;
-   }
-   
-   ACE_INLINE
--  IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (void) // Default constructor.
-+  IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (void) // Default constructor.
-   {
-   }
-   
-   ACE_INLINE
--  IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-+  IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (CORBA::ULong maximum,
-+  IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::Container::Description *data,
-+    IR_Container::Description *data,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (const _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &rhs)
-+  IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (const _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &rhs)
-   // Copy constructor.
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::Container::Description *tmp1 = _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (this->maximum_);
--      IR::Container::Description * const tmp2 = ACE_reinterpret_cast (IR::Container::Description * ACE_CAST_CONST, rhs.buffer_);
-+      IR_Container::Description *tmp1 = _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (this->maximum_);
-+      IR_Container::Description * const tmp2 = ACE_reinterpret_cast (IR_Container::Description * ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp1[i] = tmp2[i];
-@@ -11932,8 +11149,8 @@
-     }
-   }
-   
--  ACE_INLINE IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &
--  IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &rhs)
-+  ACE_INLINE IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &
-+  IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &rhs)
-   // Assignment operator.
-   {
-     if (this == &rhs)
-@@ -11944,7 +11161,7 @@
-       if (this->maximum_ < rhs.maximum_)
-       {
-         // free the old buffer
--        IR::Container::Description *tmp = ACE_reinterpret_cast (IR::Container::Description *, this->buffer_);
-+        IR_Container::Description *tmp = ACE_reinterpret_cast (IR_Container::Description *, this->buffer_);
-         _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (tmp);
-         this->buffer_ = _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (rhs.maximum_);
-       }
-@@ -11954,8 +11171,8 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::Container::Description *tmp1 = ACE_reinterpret_cast (IR::Container::Description *, this->buffer_);
--    IR::Container::Description * const tmp2 = ACE_reinterpret_cast (IR::Container::Description * ACE_CAST_CONST, rhs.buffer_);
-+    IR_Container::Description *tmp1 = ACE_reinterpret_cast (IR_Container::Description *, this->buffer_);
-+    IR_Container::Description * const tmp2 = ACE_reinterpret_cast (IR_Container::Description * ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-       tmp1[i] = tmp2[i];
-@@ -11964,30 +11181,30 @@
-   }
-   
-   // = Accessors.
--  ACE_INLINE IR::Container::Description &
--  IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator[] (CORBA::ULong i)
-+  ACE_INLINE IR_Container::Description &
-+  IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator[] (CORBA::ULong i)
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::Container::Description* tmp = ACE_reinterpret_cast(IR::Container::Description*,this->buffer_);
-+    IR_Container::Description* tmp = ACE_reinterpret_cast(IR_Container::Description*,this->buffer_);
-     return tmp[i];
-   }
-   
--  ACE_INLINE const IR::Container::Description &
--  IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator[] (CORBA::ULong i) const
-+  ACE_INLINE const IR_Container::Description &
-+  IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator[] (CORBA::ULong i) const
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::Container::Description * const tmp = ACE_reinterpret_cast (IR::Container::Description* ACE_CAST_CONST, this->buffer_);
-+    IR_Container::Description * const tmp = ACE_reinterpret_cast (IR_Container::Description* ACE_CAST_CONST, this->buffer_);
-     return tmp[i];
-   }
-   
-   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-   
--  ACE_INLINE IR::Container::Description *
--  IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_Container::Description *
-+  IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::Container::Description *result = 0;
-+    IR_Container::Description *result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -11999,7 +11216,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::Container::Description*, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_Container::Description*, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -12008,7 +11225,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::Container::Description*,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_Container::Description*,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -12018,76 +11235,70 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::Container::Description *
--  IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::get_buffer (void) const
-+  ACE_INLINE const IR_Container::Description *
-+  IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::Container::Description * ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_Container::Description * ACE_CAST_CONST, this->buffer_);
-   }
-   
-   ACE_INLINE void
--  IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::replace (CORBA::ULong max,
-+  IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::replace (CORBA::ULong max,
-   CORBA::ULong length,
--  IR::Container::Description *data,
-+  IR_Container::Description *data,
-   CORBA::Boolean release)
-   {
-     this->maximum_ = max;
-     this->length_ = length;
-     if (this->buffer_ && this->release_ == 1)
-     {
--      IR::Container::Description *tmp = ACE_reinterpret_cast(IR::Container::Description*,this->buffer_);
-+      IR_Container::Description *tmp = ACE_reinterpret_cast(IR_Container::Description*,this->buffer_);
-       _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (tmp);
-     }
-     this->buffer_ = data;
-     this->release_ = release;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_CONTAINER_DESCRIPTIONSEQ_CI_)
--#define _IR_CONTAINER_DESCRIPTIONSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::Container::DescriptionSeq_var
-+// Inline operations for class IR_Container::DescriptionSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::Container::DescriptionSeq_var::DescriptionSeq_var (void) // default constructor
-+IR_Container::DescriptionSeq_var::DescriptionSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::Container::DescriptionSeq_var::DescriptionSeq_var (DescriptionSeq *p)
-+IR_Container::DescriptionSeq_var::DescriptionSeq_var (DescriptionSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::Container::DescriptionSeq_var::DescriptionSeq_var (const ::IR::Container::DescriptionSeq_var &p) // copy constructor
-+IR_Container::DescriptionSeq_var::DescriptionSeq_var (const ::IR_Container::DescriptionSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::Container::DescriptionSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_Container::DescriptionSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::Container::DescriptionSeq_var::~DescriptionSeq_var (void) // destructor
-+IR_Container::DescriptionSeq_var::~DescriptionSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::Container::DescriptionSeq_var &
--IR::Container::DescriptionSeq_var::operator= (DescriptionSeq *p)
-+ACE_INLINE IR_Container::DescriptionSeq_var &
-+IR_Container::DescriptionSeq_var::operator= (DescriptionSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::Container::DescriptionSeq_var &
--IR::Container::DescriptionSeq_var::operator= (const ::IR::Container::DescriptionSeq_var &p)
-+ACE_INLINE IR_Container::DescriptionSeq_var &
-+IR_Container::DescriptionSeq_var::operator= (const ::IR_Container::DescriptionSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -12098,12 +11309,12 @@
-         }
-       else
-         {
--          DescriptionSeq *deep_copy =
--            new DescriptionSeq (*p.ptr_);
-+          IR_Container::DescriptionSeq *deep_copy = 
-+            new IR_Container::DescriptionSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              DescriptionSeq *tmp = deep_copy;
-+              IR_Container::DescriptionSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -12114,103 +11325,103 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::Container::DescriptionSeq *
--IR::Container::DescriptionSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_Container::DescriptionSeq *
-+IR_Container::DescriptionSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::Container::DescriptionSeq *
--IR::Container::DescriptionSeq_var::operator-> (void)
-+ACE_INLINE ::IR_Container::DescriptionSeq *
-+IR_Container::DescriptionSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::Container::DescriptionSeq_var::operator const ::IR::Container::DescriptionSeq &() const // cast
-+IR_Container::DescriptionSeq_var::operator const ::IR_Container::DescriptionSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::Container::DescriptionSeq_var::operator ::IR::Container::DescriptionSeq &() // cast 
-+IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::Container::DescriptionSeq_var::operator ::IR::Container::DescriptionSeq &() const // cast 
-+IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::Container::DescriptionSeq_var::operator ::IR::Container::DescriptionSeq *&() // cast 
-+IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Container::Description &
--IR::Container::DescriptionSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_Container::Description &
-+IR_Container::DescriptionSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const IR::Container::Description &
--IR::Container::DescriptionSeq_var::operator[] (CORBA::ULong index) const
-+ACE_INLINE const IR_Container::Description &
-+IR_Container::DescriptionSeq_var::operator[] (CORBA::ULong index) const
- {
--  return ACE_const_cast (const IR::Container::Description &, this->ptr_->operator[] (index));
-+  return ACE_const_cast (const IR_Container::Description &, this->ptr_->operator[] (index));
- }
- 
--ACE_INLINE const ::IR::Container::DescriptionSeq &
--IR::Container::DescriptionSeq_var::in (void) const
-+ACE_INLINE const ::IR_Container::DescriptionSeq &
-+IR_Container::DescriptionSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::Container::DescriptionSeq &
--IR::Container::DescriptionSeq_var::inout (void)
-+ACE_INLINE ::IR_Container::DescriptionSeq &
-+IR_Container::DescriptionSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::Container::DescriptionSeq *&
--IR::Container::DescriptionSeq_var::out (void)
-+ACE_INLINE ::IR_Container::DescriptionSeq *&
-+IR_Container::DescriptionSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::Container::DescriptionSeq *
--IR::Container::DescriptionSeq_var::_retn (void)
-+ACE_INLINE ::IR_Container::DescriptionSeq *
-+IR_Container::DescriptionSeq_var::_retn (void)
- {
--  ::IR::Container::DescriptionSeq *tmp = this->ptr_;
-+  ::IR_Container::DescriptionSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::Container::DescriptionSeq *
--IR::Container::DescriptionSeq_var::ptr (void) const
-+ACE_INLINE ::IR_Container::DescriptionSeq *
-+IR_Container::DescriptionSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::Container::DescriptionSeq_out
-+// Inline operations for class IR_Container::DescriptionSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::Container::DescriptionSeq_out::DescriptionSeq_out (DescriptionSeq *&p)
-+IR_Container::DescriptionSeq_out::DescriptionSeq_out (DescriptionSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::Container::DescriptionSeq_out::DescriptionSeq_out (DescriptionSeq_var &p) // constructor from _var
-+IR_Container::DescriptionSeq_out::DescriptionSeq_out (DescriptionSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -12218,57 +11429,50 @@
- }
- 
- ACE_INLINE
--IR::Container::DescriptionSeq_out::DescriptionSeq_out (const ::IR::Container::DescriptionSeq_out &p) // copy constructor
-+IR_Container::DescriptionSeq_out::DescriptionSeq_out (const ::IR_Container::DescriptionSeq_out &p) // copy constructor
-   : ptr_ (ACE_const_cast (DescriptionSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::Container::DescriptionSeq_out &
--IR::Container::DescriptionSeq_out::operator= (const ::IR::Container::DescriptionSeq_out &p)
-+ACE_INLINE ::IR_Container::DescriptionSeq_out &
-+IR_Container::DescriptionSeq_out::operator= (const ::IR_Container::DescriptionSeq_out &p)
- {
-   this->ptr_ = ACE_const_cast (DescriptionSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::Container::DescriptionSeq_out &
--IR::Container::DescriptionSeq_out::operator= (DescriptionSeq *p)
-+ACE_INLINE ::IR_Container::DescriptionSeq_out &
-+IR_Container::DescriptionSeq_out::operator= (DescriptionSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::Container::DescriptionSeq_out::operator ::IR::Container::DescriptionSeq *&() // cast
-+IR_Container::DescriptionSeq_out::operator ::IR_Container::DescriptionSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::Container::DescriptionSeq *&
--IR::Container::DescriptionSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_Container::DescriptionSeq *&
-+IR_Container::DescriptionSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::Container::DescriptionSeq *
--IR::Container::DescriptionSeq_out::operator-> (void)
-+ACE_INLINE ::IR_Container::DescriptionSeq *
-+IR_Container::DescriptionSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::Container::Description &
--IR::Container::DescriptionSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_Container::Description &
-+IR_Container::DescriptionSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PRIMITIVEDEF___CI_)
--#define _IR_PRIMITIVEDEF___CI_
--
- ACE_INLINE
--IR::PrimitiveDef::PrimitiveDef (
-+IR_PrimitiveDef::IR_PrimitiveDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -12278,185 +11482,164 @@
-   this->IR_PrimitiveDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PRIMITIVEDEF___VAR_CI_)
--#define _IR_PRIMITIVEDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::PrimitiveDef_var
-+// Inline operations for class IR_PrimitiveDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::PrimitiveDef_var::PrimitiveDef_var (void) // default constructor
--  : ptr_ (IR::PrimitiveDef::_nil ())
-+IR_PrimitiveDef_var::IR_PrimitiveDef_var (void) // default constructor
-+  : ptr_ (IR_PrimitiveDef::_nil ())
- {}
- 
--ACE_INLINE IR::PrimitiveDef_ptr 
--IR::PrimitiveDef_var::ptr (void) const
-+ACE_INLINE IR_PrimitiveDef_ptr 
-+IR_PrimitiveDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::PrimitiveDef_var::PrimitiveDef_var (const IR::PrimitiveDef_var &p) // copy constructor
-+IR_PrimitiveDef_var::IR_PrimitiveDef_var (const IR_PrimitiveDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (PrimitiveDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_PrimitiveDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::PrimitiveDef_var::~PrimitiveDef_var (void) // destructor
-+IR_PrimitiveDef_var::~IR_PrimitiveDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::PrimitiveDef_var &
--IR::PrimitiveDef_var::operator= (IR::PrimitiveDef_ptr p)
-+ACE_INLINE IR_PrimitiveDef_var &
-+IR_PrimitiveDef_var::operator= (IR_PrimitiveDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::PrimitiveDef_var &
--IR::PrimitiveDef_var::operator= (const IR::PrimitiveDef_var &p)
-+ACE_INLINE IR_PrimitiveDef_var &
-+IR_PrimitiveDef_var::operator= (const IR_PrimitiveDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::PrimitiveDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_PrimitiveDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::PrimitiveDef_var::operator const IR::PrimitiveDef_ptr &() const // cast
-+IR_PrimitiveDef_var::operator const IR_PrimitiveDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::PrimitiveDef_var::operator IR::PrimitiveDef_ptr &() // cast 
-+IR_PrimitiveDef_var::operator IR_PrimitiveDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PrimitiveDef_ptr 
--IR::PrimitiveDef_var::operator-> (void) const
-+ACE_INLINE IR_PrimitiveDef_ptr 
-+IR_PrimitiveDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PrimitiveDef_ptr
--IR::PrimitiveDef_var::in (void) const
-+ACE_INLINE IR_PrimitiveDef_ptr
-+IR_PrimitiveDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PrimitiveDef_ptr &
--IR::PrimitiveDef_var::inout (void)
-+ACE_INLINE IR_PrimitiveDef_ptr &
-+IR_PrimitiveDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PrimitiveDef_ptr &
--IR::PrimitiveDef_var::out (void)
-+ACE_INLINE IR_PrimitiveDef_ptr &
-+IR_PrimitiveDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::PrimitiveDef::_nil ();
-+  this->ptr_ = IR_PrimitiveDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PrimitiveDef_ptr 
--IR::PrimitiveDef_var::_retn (void)
-+ACE_INLINE IR_PrimitiveDef_ptr 
-+IR_PrimitiveDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::PrimitiveDef_ptr val = this->ptr_;
--  this->ptr_ = IR::PrimitiveDef::_nil ();
-+  IR_PrimitiveDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_PrimitiveDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_PRIMITIVEDEF___OUT_CI_)
--#define _IR_PRIMITIVEDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::PrimitiveDef_out
-+// Inline operations for class IR_PrimitiveDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::PrimitiveDef_out::PrimitiveDef_out (IR::PrimitiveDef_ptr &p)
-+IR_PrimitiveDef_out::IR_PrimitiveDef_out (IR_PrimitiveDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::PrimitiveDef::_nil ();
-+  this->ptr_ = IR_PrimitiveDef::_nil ();
- }
- 
- ACE_INLINE
--IR::PrimitiveDef_out::PrimitiveDef_out (IR::PrimitiveDef_var &p) // constructor from _var
-+IR_PrimitiveDef_out::IR_PrimitiveDef_out (IR_PrimitiveDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::PrimitiveDef::_nil ();
-+  this->ptr_ = IR_PrimitiveDef::_nil ();
- }
- 
- ACE_INLINE
--IR::PrimitiveDef_out::PrimitiveDef_out (const IR::PrimitiveDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::PrimitiveDef_out&,p).ptr_)
-+IR_PrimitiveDef_out::IR_PrimitiveDef_out (const IR_PrimitiveDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_PrimitiveDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::PrimitiveDef_out &
--IR::PrimitiveDef_out::operator= (const IR::PrimitiveDef_out &p)
-+ACE_INLINE IR_PrimitiveDef_out &
-+IR_PrimitiveDef_out::operator= (const IR_PrimitiveDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::PrimitiveDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_PrimitiveDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::PrimitiveDef_out &
--IR::PrimitiveDef_out::operator= (const IR::PrimitiveDef_var &p)
-+ACE_INLINE IR_PrimitiveDef_out &
-+IR_PrimitiveDef_out::operator= (const IR_PrimitiveDef_var &p)
- {
--  this->ptr_ = IR::PrimitiveDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_PrimitiveDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::PrimitiveDef_out &
--IR::PrimitiveDef_out::operator= (IR::PrimitiveDef_ptr p)
-+ACE_INLINE IR_PrimitiveDef_out &
-+IR_PrimitiveDef_out::operator= (IR_PrimitiveDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::PrimitiveDef_out::operator IR::PrimitiveDef_ptr &() // cast
-+IR_PrimitiveDef_out::operator IR_PrimitiveDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PrimitiveDef_ptr &
--IR::PrimitiveDef_out::ptr (void) // ptr
-+ACE_INLINE IR_PrimitiveDef_ptr &
-+IR_PrimitiveDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::PrimitiveDef_ptr 
--IR::PrimitiveDef_out::operator-> (void)
-+ACE_INLINE IR_PrimitiveDef_ptr 
-+IR_PrimitiveDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRINGDEF___CI_)
--#define _IR_STRINGDEF___CI_
--
- ACE_INLINE
--IR::StringDef::StringDef (
-+IR_StringDef::IR_StringDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -12466,185 +11649,164 @@
-   this->IR_StringDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRINGDEF___VAR_CI_)
--#define _IR_STRINGDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::StringDef_var
-+// Inline operations for class IR_StringDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::StringDef_var::StringDef_var (void) // default constructor
--  : ptr_ (IR::StringDef::_nil ())
-+IR_StringDef_var::IR_StringDef_var (void) // default constructor
-+  : ptr_ (IR_StringDef::_nil ())
- {}
- 
--ACE_INLINE IR::StringDef_ptr 
--IR::StringDef_var::ptr (void) const
-+ACE_INLINE IR_StringDef_ptr 
-+IR_StringDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::StringDef_var::StringDef_var (const IR::StringDef_var &p) // copy constructor
-+IR_StringDef_var::IR_StringDef_var (const IR_StringDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (StringDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_StringDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::StringDef_var::~StringDef_var (void) // destructor
-+IR_StringDef_var::~IR_StringDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::StringDef_var &
--IR::StringDef_var::operator= (IR::StringDef_ptr p)
-+ACE_INLINE IR_StringDef_var &
-+IR_StringDef_var::operator= (IR_StringDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::StringDef_var &
--IR::StringDef_var::operator= (const IR::StringDef_var &p)
-+ACE_INLINE IR_StringDef_var &
-+IR_StringDef_var::operator= (const IR_StringDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::StringDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_StringDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::StringDef_var::operator const IR::StringDef_ptr &() const // cast
-+IR_StringDef_var::operator const IR_StringDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::StringDef_var::operator IR::StringDef_ptr &() // cast 
-+IR_StringDef_var::operator IR_StringDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::StringDef_ptr 
--IR::StringDef_var::operator-> (void) const
-+ACE_INLINE IR_StringDef_ptr 
-+IR_StringDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::StringDef_ptr
--IR::StringDef_var::in (void) const
-+ACE_INLINE IR_StringDef_ptr
-+IR_StringDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::StringDef_ptr &
--IR::StringDef_var::inout (void)
-+ACE_INLINE IR_StringDef_ptr &
-+IR_StringDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::StringDef_ptr &
--IR::StringDef_var::out (void)
-+ACE_INLINE IR_StringDef_ptr &
-+IR_StringDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::StringDef::_nil ();
-+  this->ptr_ = IR_StringDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::StringDef_ptr 
--IR::StringDef_var::_retn (void)
-+ACE_INLINE IR_StringDef_ptr 
-+IR_StringDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::StringDef_ptr val = this->ptr_;
--  this->ptr_ = IR::StringDef::_nil ();
-+  IR_StringDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_StringDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_STRINGDEF___OUT_CI_)
--#define _IR_STRINGDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::StringDef_out
-+// Inline operations for class IR_StringDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::StringDef_out::StringDef_out (IR::StringDef_ptr &p)
-+IR_StringDef_out::IR_StringDef_out (IR_StringDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::StringDef::_nil ();
-+  this->ptr_ = IR_StringDef::_nil ();
- }
- 
- ACE_INLINE
--IR::StringDef_out::StringDef_out (IR::StringDef_var &p) // constructor from _var
-+IR_StringDef_out::IR_StringDef_out (IR_StringDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::StringDef::_nil ();
-+  this->ptr_ = IR_StringDef::_nil ();
- }
- 
- ACE_INLINE
--IR::StringDef_out::StringDef_out (const IR::StringDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::StringDef_out&,p).ptr_)
-+IR_StringDef_out::IR_StringDef_out (const IR_StringDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_StringDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::StringDef_out &
--IR::StringDef_out::operator= (const IR::StringDef_out &p)
-+ACE_INLINE IR_StringDef_out &
-+IR_StringDef_out::operator= (const IR_StringDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::StringDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_StringDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::StringDef_out &
--IR::StringDef_out::operator= (const IR::StringDef_var &p)
-+ACE_INLINE IR_StringDef_out &
-+IR_StringDef_out::operator= (const IR_StringDef_var &p)
- {
--  this->ptr_ = IR::StringDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_StringDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::StringDef_out &
--IR::StringDef_out::operator= (IR::StringDef_ptr p)
-+ACE_INLINE IR_StringDef_out &
-+IR_StringDef_out::operator= (IR_StringDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::StringDef_out::operator IR::StringDef_ptr &() // cast
-+IR_StringDef_out::operator IR_StringDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::StringDef_ptr &
--IR::StringDef_out::ptr (void) // ptr
-+ACE_INLINE IR_StringDef_ptr &
-+IR_StringDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::StringDef_ptr 
--IR::StringDef_out::operator-> (void)
-+ACE_INLINE IR_StringDef_ptr 
-+IR_StringDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_SEQUENCEDEF___CI_)
--#define _IR_SEQUENCEDEF___CI_
--
- ACE_INLINE
--IR::SequenceDef::SequenceDef (
-+IR_SequenceDef::IR_SequenceDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -12654,185 +11816,164 @@
-   this->IR_SequenceDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_SEQUENCEDEF___VAR_CI_)
--#define _IR_SEQUENCEDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::SequenceDef_var
-+// Inline operations for class IR_SequenceDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::SequenceDef_var::SequenceDef_var (void) // default constructor
--  : ptr_ (IR::SequenceDef::_nil ())
-+IR_SequenceDef_var::IR_SequenceDef_var (void) // default constructor
-+  : ptr_ (IR_SequenceDef::_nil ())
- {}
- 
--ACE_INLINE IR::SequenceDef_ptr 
--IR::SequenceDef_var::ptr (void) const
-+ACE_INLINE IR_SequenceDef_ptr 
-+IR_SequenceDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::SequenceDef_var::SequenceDef_var (const IR::SequenceDef_var &p) // copy constructor
-+IR_SequenceDef_var::IR_SequenceDef_var (const IR_SequenceDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (SequenceDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_SequenceDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::SequenceDef_var::~SequenceDef_var (void) // destructor
-+IR_SequenceDef_var::~IR_SequenceDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::SequenceDef_var &
--IR::SequenceDef_var::operator= (IR::SequenceDef_ptr p)
-+ACE_INLINE IR_SequenceDef_var &
-+IR_SequenceDef_var::operator= (IR_SequenceDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::SequenceDef_var &
--IR::SequenceDef_var::operator= (const IR::SequenceDef_var &p)
-+ACE_INLINE IR_SequenceDef_var &
-+IR_SequenceDef_var::operator= (const IR_SequenceDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::SequenceDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_SequenceDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::SequenceDef_var::operator const IR::SequenceDef_ptr &() const // cast
-+IR_SequenceDef_var::operator const IR_SequenceDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::SequenceDef_var::operator IR::SequenceDef_ptr &() // cast 
-+IR_SequenceDef_var::operator IR_SequenceDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::SequenceDef_ptr 
--IR::SequenceDef_var::operator-> (void) const
-+ACE_INLINE IR_SequenceDef_ptr 
-+IR_SequenceDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::SequenceDef_ptr
--IR::SequenceDef_var::in (void) const
-+ACE_INLINE IR_SequenceDef_ptr
-+IR_SequenceDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::SequenceDef_ptr &
--IR::SequenceDef_var::inout (void)
-+ACE_INLINE IR_SequenceDef_ptr &
-+IR_SequenceDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::SequenceDef_ptr &
--IR::SequenceDef_var::out (void)
-+ACE_INLINE IR_SequenceDef_ptr &
-+IR_SequenceDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::SequenceDef::_nil ();
-+  this->ptr_ = IR_SequenceDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::SequenceDef_ptr 
--IR::SequenceDef_var::_retn (void)
-+ACE_INLINE IR_SequenceDef_ptr 
-+IR_SequenceDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::SequenceDef_ptr val = this->ptr_;
--  this->ptr_ = IR::SequenceDef::_nil ();
-+  IR_SequenceDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_SequenceDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_SEQUENCEDEF___OUT_CI_)
--#define _IR_SEQUENCEDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::SequenceDef_out
-+// Inline operations for class IR_SequenceDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::SequenceDef_out::SequenceDef_out (IR::SequenceDef_ptr &p)
-+IR_SequenceDef_out::IR_SequenceDef_out (IR_SequenceDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::SequenceDef::_nil ();
-+  this->ptr_ = IR_SequenceDef::_nil ();
- }
- 
- ACE_INLINE
--IR::SequenceDef_out::SequenceDef_out (IR::SequenceDef_var &p) // constructor from _var
-+IR_SequenceDef_out::IR_SequenceDef_out (IR_SequenceDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::SequenceDef::_nil ();
-+  this->ptr_ = IR_SequenceDef::_nil ();
- }
- 
- ACE_INLINE
--IR::SequenceDef_out::SequenceDef_out (const IR::SequenceDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::SequenceDef_out&,p).ptr_)
-+IR_SequenceDef_out::IR_SequenceDef_out (const IR_SequenceDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_SequenceDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::SequenceDef_out &
--IR::SequenceDef_out::operator= (const IR::SequenceDef_out &p)
-+ACE_INLINE IR_SequenceDef_out &
-+IR_SequenceDef_out::operator= (const IR_SequenceDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::SequenceDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_SequenceDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::SequenceDef_out &
--IR::SequenceDef_out::operator= (const IR::SequenceDef_var &p)
-+ACE_INLINE IR_SequenceDef_out &
-+IR_SequenceDef_out::operator= (const IR_SequenceDef_var &p)
- {
--  this->ptr_ = IR::SequenceDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_SequenceDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::SequenceDef_out &
--IR::SequenceDef_out::operator= (IR::SequenceDef_ptr p)
-+ACE_INLINE IR_SequenceDef_out &
-+IR_SequenceDef_out::operator= (IR_SequenceDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::SequenceDef_out::operator IR::SequenceDef_ptr &() // cast
-+IR_SequenceDef_out::operator IR_SequenceDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::SequenceDef_ptr &
--IR::SequenceDef_out::ptr (void) // ptr
-+ACE_INLINE IR_SequenceDef_ptr &
-+IR_SequenceDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::SequenceDef_ptr 
--IR::SequenceDef_out::operator-> (void)
-+ACE_INLINE IR_SequenceDef_ptr 
-+IR_SequenceDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ARRAYDEF___CI_)
--#define _IR_ARRAYDEF___CI_
--
- ACE_INLINE
--IR::ArrayDef::ArrayDef (
-+IR_ArrayDef::IR_ArrayDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -12842,185 +11983,164 @@
-   this->IR_ArrayDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ARRAYDEF___VAR_CI_)
--#define _IR_ARRAYDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::ArrayDef_var
-+// Inline operations for class IR_ArrayDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ArrayDef_var::ArrayDef_var (void) // default constructor
--  : ptr_ (IR::ArrayDef::_nil ())
-+IR_ArrayDef_var::IR_ArrayDef_var (void) // default constructor
-+  : ptr_ (IR_ArrayDef::_nil ())
- {}
- 
--ACE_INLINE IR::ArrayDef_ptr 
--IR::ArrayDef_var::ptr (void) const
-+ACE_INLINE IR_ArrayDef_ptr 
-+IR_ArrayDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ArrayDef_var::ArrayDef_var (const IR::ArrayDef_var &p) // copy constructor
-+IR_ArrayDef_var::IR_ArrayDef_var (const IR_ArrayDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (ArrayDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_ArrayDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::ArrayDef_var::~ArrayDef_var (void) // destructor
-+IR_ArrayDef_var::~IR_ArrayDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::ArrayDef_var &
--IR::ArrayDef_var::operator= (IR::ArrayDef_ptr p)
-+ACE_INLINE IR_ArrayDef_var &
-+IR_ArrayDef_var::operator= (IR_ArrayDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::ArrayDef_var &
--IR::ArrayDef_var::operator= (const IR::ArrayDef_var &p)
-+ACE_INLINE IR_ArrayDef_var &
-+IR_ArrayDef_var::operator= (const IR_ArrayDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::ArrayDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_ArrayDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ArrayDef_var::operator const IR::ArrayDef_ptr &() const // cast
-+IR_ArrayDef_var::operator const IR_ArrayDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ArrayDef_var::operator IR::ArrayDef_ptr &() // cast 
-+IR_ArrayDef_var::operator IR_ArrayDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ArrayDef_ptr 
--IR::ArrayDef_var::operator-> (void) const
-+ACE_INLINE IR_ArrayDef_ptr 
-+IR_ArrayDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ArrayDef_ptr
--IR::ArrayDef_var::in (void) const
-+ACE_INLINE IR_ArrayDef_ptr
-+IR_ArrayDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ArrayDef_ptr &
--IR::ArrayDef_var::inout (void)
-+ACE_INLINE IR_ArrayDef_ptr &
-+IR_ArrayDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ArrayDef_ptr &
--IR::ArrayDef_var::out (void)
-+ACE_INLINE IR_ArrayDef_ptr &
-+IR_ArrayDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ArrayDef::_nil ();
-+  this->ptr_ = IR_ArrayDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ArrayDef_ptr 
--IR::ArrayDef_var::_retn (void)
-+ACE_INLINE IR_ArrayDef_ptr 
-+IR_ArrayDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::ArrayDef_ptr val = this->ptr_;
--  this->ptr_ = IR::ArrayDef::_nil ();
-+  IR_ArrayDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_ArrayDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ARRAYDEF___OUT_CI_)
--#define _IR_ARRAYDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::ArrayDef_out
-+// Inline operations for class IR_ArrayDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ArrayDef_out::ArrayDef_out (IR::ArrayDef_ptr &p)
-+IR_ArrayDef_out::IR_ArrayDef_out (IR_ArrayDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::ArrayDef::_nil ();
-+  this->ptr_ = IR_ArrayDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ArrayDef_out::ArrayDef_out (IR::ArrayDef_var &p) // constructor from _var
-+IR_ArrayDef_out::IR_ArrayDef_out (IR_ArrayDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::ArrayDef::_nil ();
-+  this->ptr_ = IR_ArrayDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ArrayDef_out::ArrayDef_out (const IR::ArrayDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::ArrayDef_out&,p).ptr_)
-+IR_ArrayDef_out::IR_ArrayDef_out (const IR_ArrayDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ArrayDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::ArrayDef_out &
--IR::ArrayDef_out::operator= (const IR::ArrayDef_out &p)
-+ACE_INLINE IR_ArrayDef_out &
-+IR_ArrayDef_out::operator= (const IR_ArrayDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::ArrayDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ArrayDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ArrayDef_out &
--IR::ArrayDef_out::operator= (const IR::ArrayDef_var &p)
-+ACE_INLINE IR_ArrayDef_out &
-+IR_ArrayDef_out::operator= (const IR_ArrayDef_var &p)
- {
--  this->ptr_ = IR::ArrayDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_ArrayDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::ArrayDef_out &
--IR::ArrayDef_out::operator= (IR::ArrayDef_ptr p)
-+ACE_INLINE IR_ArrayDef_out &
-+IR_ArrayDef_out::operator= (IR_ArrayDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ArrayDef_out::operator IR::ArrayDef_ptr &() // cast
-+IR_ArrayDef_out::operator IR_ArrayDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ArrayDef_ptr &
--IR::ArrayDef_out::ptr (void) // ptr
-+ACE_INLINE IR_ArrayDef_ptr &
-+IR_ArrayDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ArrayDef_ptr 
--IR::ArrayDef_out::operator-> (void)
-+ACE_INLINE IR_ArrayDef_ptr 
-+IR_ArrayDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_WSTRINGDEF___CI_)
--#define _IR_WSTRINGDEF___CI_
--
- ACE_INLINE
--IR::WstringDef::WstringDef (
-+IR_WstringDef::IR_WstringDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -13030,185 +12150,164 @@
-   this->IR_WstringDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_WSTRINGDEF___VAR_CI_)
--#define _IR_WSTRINGDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::WstringDef_var
-+// Inline operations for class IR_WstringDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::WstringDef_var::WstringDef_var (void) // default constructor
--  : ptr_ (IR::WstringDef::_nil ())
-+IR_WstringDef_var::IR_WstringDef_var (void) // default constructor
-+  : ptr_ (IR_WstringDef::_nil ())
- {}
- 
--ACE_INLINE IR::WstringDef_ptr 
--IR::WstringDef_var::ptr (void) const
-+ACE_INLINE IR_WstringDef_ptr 
-+IR_WstringDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::WstringDef_var::WstringDef_var (const IR::WstringDef_var &p) // copy constructor
-+IR_WstringDef_var::IR_WstringDef_var (const IR_WstringDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (WstringDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_WstringDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::WstringDef_var::~WstringDef_var (void) // destructor
-+IR_WstringDef_var::~IR_WstringDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::WstringDef_var &
--IR::WstringDef_var::operator= (IR::WstringDef_ptr p)
-+ACE_INLINE IR_WstringDef_var &
-+IR_WstringDef_var::operator= (IR_WstringDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::WstringDef_var &
--IR::WstringDef_var::operator= (const IR::WstringDef_var &p)
-+ACE_INLINE IR_WstringDef_var &
-+IR_WstringDef_var::operator= (const IR_WstringDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::WstringDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_WstringDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::WstringDef_var::operator const IR::WstringDef_ptr &() const // cast
-+IR_WstringDef_var::operator const IR_WstringDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::WstringDef_var::operator IR::WstringDef_ptr &() // cast 
-+IR_WstringDef_var::operator IR_WstringDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::WstringDef_ptr 
--IR::WstringDef_var::operator-> (void) const
-+ACE_INLINE IR_WstringDef_ptr 
-+IR_WstringDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::WstringDef_ptr
--IR::WstringDef_var::in (void) const
-+ACE_INLINE IR_WstringDef_ptr
-+IR_WstringDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::WstringDef_ptr &
--IR::WstringDef_var::inout (void)
-+ACE_INLINE IR_WstringDef_ptr &
-+IR_WstringDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::WstringDef_ptr &
--IR::WstringDef_var::out (void)
-+ACE_INLINE IR_WstringDef_ptr &
-+IR_WstringDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::WstringDef::_nil ();
-+  this->ptr_ = IR_WstringDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::WstringDef_ptr 
--IR::WstringDef_var::_retn (void)
-+ACE_INLINE IR_WstringDef_ptr 
-+IR_WstringDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::WstringDef_ptr val = this->ptr_;
--  this->ptr_ = IR::WstringDef::_nil ();
-+  IR_WstringDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_WstringDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_WSTRINGDEF___OUT_CI_)
--#define _IR_WSTRINGDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::WstringDef_out
-+// Inline operations for class IR_WstringDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::WstringDef_out::WstringDef_out (IR::WstringDef_ptr &p)
-+IR_WstringDef_out::IR_WstringDef_out (IR_WstringDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::WstringDef::_nil ();
-+  this->ptr_ = IR_WstringDef::_nil ();
- }
- 
- ACE_INLINE
--IR::WstringDef_out::WstringDef_out (IR::WstringDef_var &p) // constructor from _var
-+IR_WstringDef_out::IR_WstringDef_out (IR_WstringDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::WstringDef::_nil ();
-+  this->ptr_ = IR_WstringDef::_nil ();
- }
- 
- ACE_INLINE
--IR::WstringDef_out::WstringDef_out (const IR::WstringDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::WstringDef_out&,p).ptr_)
-+IR_WstringDef_out::IR_WstringDef_out (const IR_WstringDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_WstringDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::WstringDef_out &
--IR::WstringDef_out::operator= (const IR::WstringDef_out &p)
-+ACE_INLINE IR_WstringDef_out &
-+IR_WstringDef_out::operator= (const IR_WstringDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::WstringDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_WstringDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::WstringDef_out &
--IR::WstringDef_out::operator= (const IR::WstringDef_var &p)
-+ACE_INLINE IR_WstringDef_out &
-+IR_WstringDef_out::operator= (const IR_WstringDef_var &p)
- {
--  this->ptr_ = IR::WstringDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_WstringDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::WstringDef_out &
--IR::WstringDef_out::operator= (IR::WstringDef_ptr p)
-+ACE_INLINE IR_WstringDef_out &
-+IR_WstringDef_out::operator= (IR_WstringDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::WstringDef_out::operator IR::WstringDef_ptr &() // cast
-+IR_WstringDef_out::operator IR_WstringDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::WstringDef_ptr &
--IR::WstringDef_out::ptr (void) // ptr
-+ACE_INLINE IR_WstringDef_ptr &
-+IR_WstringDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::WstringDef_ptr 
--IR::WstringDef_out::operator-> (void)
-+ACE_INLINE IR_WstringDef_ptr 
-+IR_WstringDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FIXEDDEF___CI_)
--#define _IR_FIXEDDEF___CI_
--
- ACE_INLINE
--IR::FixedDef::FixedDef (
-+IR_FixedDef::IR_FixedDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -13218,185 +12317,164 @@
-   this->IR_FixedDef_setup_collocation (_tao_collocated);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FIXEDDEF___VAR_CI_)
--#define _IR_FIXEDDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::FixedDef_var
-+// Inline operations for class IR_FixedDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::FixedDef_var::FixedDef_var (void) // default constructor
--  : ptr_ (IR::FixedDef::_nil ())
-+IR_FixedDef_var::IR_FixedDef_var (void) // default constructor
-+  : ptr_ (IR_FixedDef::_nil ())
- {}
- 
--ACE_INLINE IR::FixedDef_ptr 
--IR::FixedDef_var::ptr (void) const
-+ACE_INLINE IR_FixedDef_ptr 
-+IR_FixedDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::FixedDef_var::FixedDef_var (const IR::FixedDef_var &p) // copy constructor
-+IR_FixedDef_var::IR_FixedDef_var (const IR_FixedDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (FixedDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_FixedDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::FixedDef_var::~FixedDef_var (void) // destructor
-+IR_FixedDef_var::~IR_FixedDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::FixedDef_var &
--IR::FixedDef_var::operator= (IR::FixedDef_ptr p)
-+ACE_INLINE IR_FixedDef_var &
-+IR_FixedDef_var::operator= (IR_FixedDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::FixedDef_var &
--IR::FixedDef_var::operator= (const IR::FixedDef_var &p)
-+ACE_INLINE IR_FixedDef_var &
-+IR_FixedDef_var::operator= (const IR_FixedDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = IR::FixedDef::_duplicate (p.ptr ());
-+    this->ptr_ = IR_FixedDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::FixedDef_var::operator const IR::FixedDef_ptr &() const // cast
-+IR_FixedDef_var::operator const IR_FixedDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::FixedDef_var::operator IR::FixedDef_ptr &() // cast 
-+IR_FixedDef_var::operator IR_FixedDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FixedDef_ptr 
--IR::FixedDef_var::operator-> (void) const
-+ACE_INLINE IR_FixedDef_ptr 
-+IR_FixedDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FixedDef_ptr
--IR::FixedDef_var::in (void) const
-+ACE_INLINE IR_FixedDef_ptr
-+IR_FixedDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FixedDef_ptr &
--IR::FixedDef_var::inout (void)
-+ACE_INLINE IR_FixedDef_ptr &
-+IR_FixedDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FixedDef_ptr &
--IR::FixedDef_var::out (void)
-+ACE_INLINE IR_FixedDef_ptr &
-+IR_FixedDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::FixedDef::_nil ();
-+  this->ptr_ = IR_FixedDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FixedDef_ptr 
--IR::FixedDef_var::_retn (void)
-+ACE_INLINE IR_FixedDef_ptr 
-+IR_FixedDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  IR::FixedDef_ptr val = this->ptr_;
--  this->ptr_ = IR::FixedDef::_nil ();
-+  IR_FixedDef_ptr val = this->ptr_;
-+  this->ptr_ = IR_FixedDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_FIXEDDEF___OUT_CI_)
--#define _IR_FIXEDDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::FixedDef_out
-+// Inline operations for class IR_FixedDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::FixedDef_out::FixedDef_out (IR::FixedDef_ptr &p)
-+IR_FixedDef_out::IR_FixedDef_out (IR_FixedDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = IR::FixedDef::_nil ();
-+  this->ptr_ = IR_FixedDef::_nil ();
- }
- 
- ACE_INLINE
--IR::FixedDef_out::FixedDef_out (IR::FixedDef_var &p) // constructor from _var
-+IR_FixedDef_out::IR_FixedDef_out (IR_FixedDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = IR::FixedDef::_nil ();
-+  this->ptr_ = IR_FixedDef::_nil ();
- }
- 
- ACE_INLINE
--IR::FixedDef_out::FixedDef_out (const IR::FixedDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (IR::FixedDef_out&,p).ptr_)
-+IR_FixedDef_out::IR_FixedDef_out (const IR_FixedDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_FixedDef_out&,p).ptr_)
- {}
- 
--ACE_INLINE IR::FixedDef_out &
--IR::FixedDef_out::operator= (const IR::FixedDef_out &p)
-+ACE_INLINE IR_FixedDef_out &
-+IR_FixedDef_out::operator= (const IR_FixedDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (IR::FixedDef_out&,p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_FixedDef_out&,p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::FixedDef_out &
--IR::FixedDef_out::operator= (const IR::FixedDef_var &p)
-+ACE_INLINE IR_FixedDef_out &
-+IR_FixedDef_out::operator= (const IR_FixedDef_var &p)
- {
--  this->ptr_ = IR::FixedDef::_duplicate (p.ptr ());
-+  this->ptr_ = IR_FixedDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::FixedDef_out &
--IR::FixedDef_out::operator= (IR::FixedDef_ptr p)
-+ACE_INLINE IR_FixedDef_out &
-+IR_FixedDef_out::operator= (IR_FixedDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::FixedDef_out::operator IR::FixedDef_ptr &() // cast
-+IR_FixedDef_out::operator IR_FixedDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FixedDef_ptr &
--IR::FixedDef_out::ptr (void) // ptr
-+ACE_INLINE IR_FixedDef_ptr &
-+IR_FixedDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::FixedDef_ptr 
--IR::FixedDef_out::operator-> (void)
-+ACE_INLINE IR_FixedDef_ptr 
-+IR_FixedDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_COMPONENTREPOSITORY___CI_)
--#define _IR_COMPONENTREPOSITORY___CI_
--
- ACE_INLINE
--IR::ComponentRepository::ComponentRepository (
-+IR_ComponentRepository::IR_ComponentRepository (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -13406,217 +12484,201 @@
-   this->IR_ComponentRepository_setup_collocation (_tao_collocated);
- }
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_COMPONENTREPOSITORY___VAR_CI_)
--#define _IR_COMPONENTREPOSITORY___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::ComponentRepository_var
-+// Inline operations for class IR_ComponentRepository_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ComponentRepository_var::ComponentRepository_var (void) // default constructor
--  : ptr_ (ComponentRepository::_nil ())
-+IR_ComponentRepository_var::IR_ComponentRepository_var (void) // default constructor
-+  : ptr_ (IR_ComponentRepository::_nil ())
- {}
- 
--ACE_INLINE ::IR::ComponentRepository_ptr
--IR::ComponentRepository_var::ptr (void) const
-+ACE_INLINE ::IR_ComponentRepository_ptr
-+IR_ComponentRepository_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ComponentRepository_var::ComponentRepository_var (const ::IR::ComponentRepository_var &p) // copy constructor
-+IR_ComponentRepository_var::IR_ComponentRepository_var (const ::IR_ComponentRepository_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (ComponentRepository::_duplicate (p.ptr ()))
-+    ptr_ (IR_ComponentRepository::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::ComponentRepository_var::~ComponentRepository_var (void) // destructor
-+IR_ComponentRepository_var::~IR_ComponentRepository_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::ComponentRepository_var &
--IR::ComponentRepository_var::operator= (ComponentRepository_ptr p)
-+ACE_INLINE IR_ComponentRepository_var &
-+IR_ComponentRepository_var::operator= (IR_ComponentRepository_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::ComponentRepository_var &
--IR::ComponentRepository_var::operator= (const ::IR::ComponentRepository_var &p)
-+ACE_INLINE IR_ComponentRepository_var &
-+IR_ComponentRepository_var::operator= (const ::IR_ComponentRepository_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = ::IR::ComponentRepository::_duplicate (p.ptr ());
-+    this->ptr_ = ::IR_ComponentRepository::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ComponentRepository_var::operator const ::IR::ComponentRepository_ptr &() const // cast
-+IR_ComponentRepository_var::operator const ::IR_ComponentRepository_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ComponentRepository_var::operator ::IR::ComponentRepository_ptr &() // cast 
-+IR_ComponentRepository_var::operator ::IR_ComponentRepository_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentRepository_ptr
--IR::ComponentRepository_var::operator-> (void) const
-+ACE_INLINE ::IR_ComponentRepository_ptr
-+IR_ComponentRepository_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentRepository_ptr
--IR::ComponentRepository_var::in (void) const
-+ACE_INLINE ::IR_ComponentRepository_ptr
-+IR_ComponentRepository_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentRepository_ptr &
--IR::ComponentRepository_var::inout (void)
-+ACE_INLINE ::IR_ComponentRepository_ptr &
-+IR_ComponentRepository_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentRepository_ptr &
--IR::ComponentRepository_var::out (void)
-+ACE_INLINE ::IR_ComponentRepository_ptr &
-+IR_ComponentRepository_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = ::IR::ComponentRepository::_nil ();
-+  this->ptr_ = ::IR_ComponentRepository::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentRepository_ptr
--IR::ComponentRepository_var::_retn (void)
-+ACE_INLINE ::IR_ComponentRepository_ptr
-+IR_ComponentRepository_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  ::IR::ComponentRepository_ptr val = this->ptr_;
--  this->ptr_ = ::IR::ComponentRepository::_nil ();
-+  ::IR_ComponentRepository_ptr val = this->ptr_;
-+  this->ptr_ = ::IR_ComponentRepository::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_COMPONENTREPOSITORY___OUT_CI_)
--#define _IR_COMPONENTREPOSITORY___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::ComponentRepository_out
-+// Inline operations for class IR_ComponentRepository_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ComponentRepository_out::ComponentRepository_out (ComponentRepository_ptr &p)
-+IR_ComponentRepository_out::IR_ComponentRepository_out (IR_ComponentRepository_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = ::IR::ComponentRepository::_nil ();
-+  this->ptr_ = ::IR_ComponentRepository::_nil ();
- }
- 
- ACE_INLINE
--IR::ComponentRepository_out::ComponentRepository_out (ComponentRepository_var &p) // constructor from _var
-+IR_ComponentRepository_out::IR_ComponentRepository_out (IR_ComponentRepository_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = ::IR::ComponentRepository::_nil ();
-+  this->ptr_ = ::IR_ComponentRepository::_nil ();
- }
- 
- ACE_INLINE
--IR::ComponentRepository_out::ComponentRepository_out (const ::IR::ComponentRepository_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ComponentRepository_out &, p).ptr_)
-+IR_ComponentRepository_out::IR_ComponentRepository_out (const ::IR_ComponentRepository_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ComponentRepository_out &, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::ComponentRepository_out &
--IR::ComponentRepository_out::operator= (const ::IR::ComponentRepository_out &p)
-+ACE_INLINE ::IR_ComponentRepository_out &
-+IR_ComponentRepository_out::operator= (const ::IR_ComponentRepository_out &p)
- {
--  this->ptr_ = ACE_const_cast (ComponentRepository_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ComponentRepository_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ComponentRepository_out &
--IR::ComponentRepository_out::operator= (const ::IR::ComponentRepository_var &p)
-+ACE_INLINE IR_ComponentRepository_out &
-+IR_ComponentRepository_out::operator= (const ::IR_ComponentRepository_var &p)
- {
--  this->ptr_ = ::IR::ComponentRepository::_duplicate (p.ptr ());
-+  this->ptr_ = ::IR_ComponentRepository::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::ComponentRepository_out &
--IR::ComponentRepository_out::operator= (ComponentRepository_ptr p)
-+ACE_INLINE IR_ComponentRepository_out &
-+IR_ComponentRepository_out::operator= (IR_ComponentRepository_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ComponentRepository_out::operator ::IR::ComponentRepository_ptr &() // cast
-+IR_ComponentRepository_out::operator ::IR_ComponentRepository_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentRepository_ptr &
--IR::ComponentRepository_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ComponentRepository_ptr &
-+IR_ComponentRepository_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentRepository_ptr
--IR::ComponentRepository_out::operator-> (void)
-+ACE_INLINE ::IR_ComponentRepository_ptr
-+IR_ComponentRepository_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
- // *************************************************************
--// Inline operations for class IR::ModuleDescription_var
-+// Inline operations for class IR_ModuleDescription_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ModuleDescription_var::ModuleDescription_var (void) // default constructor
-+IR_ModuleDescription_var::IR_ModuleDescription_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ModuleDescription_var::ModuleDescription_var (ModuleDescription *p)
-+IR_ModuleDescription_var::IR_ModuleDescription_var (IR_ModuleDescription *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ModuleDescription_var::ModuleDescription_var (const ::IR::ModuleDescription_var &p) // copy constructor
-+IR_ModuleDescription_var::IR_ModuleDescription_var (const ::IR_ModuleDescription_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ModuleDescription (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ModuleDescription (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ModuleDescription_var::~ModuleDescription_var (void) // destructor
-+IR_ModuleDescription_var::~IR_ModuleDescription_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ModuleDescription_var &
--IR::ModuleDescription_var::operator= (ModuleDescription *p)
-+ACE_INLINE IR_ModuleDescription_var &
-+IR_ModuleDescription_var::operator= (IR_ModuleDescription *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ModuleDescription_var &
--IR::ModuleDescription_var::operator= (const ::IR::ModuleDescription_var &p)
-+ACE_INLINE ::IR_ModuleDescription_var &
-+IR_ModuleDescription_var::operator= (const ::IR_ModuleDescription_var &p)
- {
-   if (this != &p)
-     {
-@@ -13627,12 +12689,12 @@
-         }
-       else
-         {
--          ModuleDescription *deep_copy =
--            new ModuleDescription (*p.ptr_);
-+          IR_ModuleDescription *deep_copy = 
-+            new IR_ModuleDescription (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ModuleDescription *tmp = deep_copy;
-+              IR_ModuleDescription *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -13643,91 +12705,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ModuleDescription *
--IR::ModuleDescription_var::operator-> (void) const
-+ACE_INLINE const ::IR_ModuleDescription *
-+IR_ModuleDescription_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ModuleDescription *
--IR::ModuleDescription_var::operator-> (void)
-+ACE_INLINE ::IR_ModuleDescription *
-+IR_ModuleDescription_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ModuleDescription_var::operator const ::IR::ModuleDescription &() const // cast
-+IR_ModuleDescription_var::operator const ::IR_ModuleDescription &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::ModuleDescription_var::operator ::IR::ModuleDescription &() // cast 
-+IR_ModuleDescription_var::operator ::IR_ModuleDescription &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::ModuleDescription_var::operator ::IR::ModuleDescription &() const // cast 
-+IR_ModuleDescription_var::operator ::IR_ModuleDescription &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ModuleDescription_var::operator ::IR::ModuleDescription *&() // cast 
-+IR_ModuleDescription_var::operator ::IR_ModuleDescription *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::ModuleDescription &
--IR::ModuleDescription_var::in (void) const
-+ACE_INLINE const ::IR_ModuleDescription &
-+IR_ModuleDescription_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ModuleDescription &
--IR::ModuleDescription_var::inout (void)
-+ACE_INLINE ::IR_ModuleDescription &
-+IR_ModuleDescription_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ModuleDescription *&
--IR::ModuleDescription_var::out (void)
-+ACE_INLINE ::IR_ModuleDescription *&
-+IR_ModuleDescription_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ModuleDescription *
--IR::ModuleDescription_var::_retn (void)
-+ACE_INLINE ::IR_ModuleDescription *
-+IR_ModuleDescription_var::_retn (void)
- {
--  ::IR::ModuleDescription *tmp = this->ptr_;
-+  ::IR_ModuleDescription *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ModuleDescription *
--IR::ModuleDescription_var::ptr (void) const
-+ACE_INLINE ::IR_ModuleDescription *
-+IR_ModuleDescription_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ModuleDescription_out
-+// Inline operations for class IR_ModuleDescription_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ModuleDescription_out::ModuleDescription_out (::IR::ModuleDescription *&p)
-+IR_ModuleDescription_out::IR_ModuleDescription_out (::IR_ModuleDescription *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ModuleDescription_out::ModuleDescription_out (ModuleDescription_var &p) // constructor from _var
-+IR_ModuleDescription_out::IR_ModuleDescription_out (IR_ModuleDescription_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -13735,81 +12797,81 @@
- }
- 
- ACE_INLINE
--IR::ModuleDescription_out::ModuleDescription_out (const ::IR::ModuleDescription_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ModuleDescription_out&, p).ptr_)
-+IR_ModuleDescription_out::IR_ModuleDescription_out (const ::IR_ModuleDescription_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ModuleDescription_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::ModuleDescription_out &
--IR::ModuleDescription_out::operator= (const ::IR::ModuleDescription_out &p)
-+ACE_INLINE IR_ModuleDescription_out &
-+IR_ModuleDescription_out::operator= (const ::IR_ModuleDescription_out &p)
- {
--  this->ptr_ = ACE_const_cast (ModuleDescription_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ModuleDescription_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ModuleDescription_out &
--IR::ModuleDescription_out::operator= (ModuleDescription *p)
-+ACE_INLINE IR_ModuleDescription_out &
-+IR_ModuleDescription_out::operator= (IR_ModuleDescription *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ModuleDescription_out::operator ::IR::ModuleDescription *&() // cast
-+IR_ModuleDescription_out::operator ::IR_ModuleDescription *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ModuleDescription *&
--IR::ModuleDescription_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ModuleDescription *&
-+IR_ModuleDescription_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ModuleDescription *
--IR::ModuleDescription_out::operator-> (void)
-+ACE_INLINE ::IR_ModuleDescription *
-+IR_ModuleDescription_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ConstantDescription_var
-+// Inline operations for class IR_ConstantDescription_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ConstantDescription_var::ConstantDescription_var (void) // default constructor
-+IR_ConstantDescription_var::IR_ConstantDescription_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ConstantDescription_var::ConstantDescription_var (ConstantDescription *p)
-+IR_ConstantDescription_var::IR_ConstantDescription_var (IR_ConstantDescription *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ConstantDescription_var::ConstantDescription_var (const ::IR::ConstantDescription_var &p) // copy constructor
-+IR_ConstantDescription_var::IR_ConstantDescription_var (const ::IR_ConstantDescription_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ConstantDescription (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ConstantDescription (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ConstantDescription_var::~ConstantDescription_var (void) // destructor
-+IR_ConstantDescription_var::~IR_ConstantDescription_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ConstantDescription_var &
--IR::ConstantDescription_var::operator= (ConstantDescription *p)
-+ACE_INLINE IR_ConstantDescription_var &
-+IR_ConstantDescription_var::operator= (IR_ConstantDescription *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ConstantDescription_var &
--IR::ConstantDescription_var::operator= (const ::IR::ConstantDescription_var &p)
-+ACE_INLINE ::IR_ConstantDescription_var &
-+IR_ConstantDescription_var::operator= (const ::IR_ConstantDescription_var &p)
- {
-   if (this != &p)
-     {
-@@ -13820,12 +12882,12 @@
-         }
-       else
-         {
--          ConstantDescription *deep_copy =
--            new ConstantDescription (*p.ptr_);
-+          IR_ConstantDescription *deep_copy = 
-+            new IR_ConstantDescription (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ConstantDescription *tmp = deep_copy;
-+              IR_ConstantDescription *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -13836,91 +12898,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ConstantDescription *
--IR::ConstantDescription_var::operator-> (void) const
-+ACE_INLINE const ::IR_ConstantDescription *
-+IR_ConstantDescription_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ConstantDescription *
--IR::ConstantDescription_var::operator-> (void)
-+ACE_INLINE ::IR_ConstantDescription *
-+IR_ConstantDescription_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ConstantDescription_var::operator const ::IR::ConstantDescription &() const // cast
-+IR_ConstantDescription_var::operator const ::IR_ConstantDescription &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::ConstantDescription_var::operator ::IR::ConstantDescription &() // cast 
-+IR_ConstantDescription_var::operator ::IR_ConstantDescription &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::ConstantDescription_var::operator ::IR::ConstantDescription &() const // cast 
-+IR_ConstantDescription_var::operator ::IR_ConstantDescription &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ConstantDescription_var::operator ::IR::ConstantDescription *&() // cast 
-+IR_ConstantDescription_var::operator ::IR_ConstantDescription *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::ConstantDescription &
--IR::ConstantDescription_var::in (void) const
-+ACE_INLINE const ::IR_ConstantDescription &
-+IR_ConstantDescription_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ConstantDescription &
--IR::ConstantDescription_var::inout (void)
-+ACE_INLINE ::IR_ConstantDescription &
-+IR_ConstantDescription_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ConstantDescription *&
--IR::ConstantDescription_var::out (void)
-+ACE_INLINE ::IR_ConstantDescription *&
-+IR_ConstantDescription_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ConstantDescription *
--IR::ConstantDescription_var::_retn (void)
-+ACE_INLINE ::IR_ConstantDescription *
-+IR_ConstantDescription_var::_retn (void)
- {
--  ::IR::ConstantDescription *tmp = this->ptr_;
-+  ::IR_ConstantDescription *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ConstantDescription *
--IR::ConstantDescription_var::ptr (void) const
-+ACE_INLINE ::IR_ConstantDescription *
-+IR_ConstantDescription_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ConstantDescription_out
-+// Inline operations for class IR_ConstantDescription_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ConstantDescription_out::ConstantDescription_out (::IR::ConstantDescription *&p)
-+IR_ConstantDescription_out::IR_ConstantDescription_out (::IR_ConstantDescription *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ConstantDescription_out::ConstantDescription_out (ConstantDescription_var &p) // constructor from _var
-+IR_ConstantDescription_out::IR_ConstantDescription_out (IR_ConstantDescription_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -13928,48 +12990,44 @@
- }
- 
- ACE_INLINE
--IR::ConstantDescription_out::ConstantDescription_out (const ::IR::ConstantDescription_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ConstantDescription_out&, p).ptr_)
-+IR_ConstantDescription_out::IR_ConstantDescription_out (const ::IR_ConstantDescription_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ConstantDescription_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::ConstantDescription_out &
--IR::ConstantDescription_out::operator= (const ::IR::ConstantDescription_out &p)
-+ACE_INLINE IR_ConstantDescription_out &
-+IR_ConstantDescription_out::operator= (const ::IR_ConstantDescription_out &p)
- {
--  this->ptr_ = ACE_const_cast (ConstantDescription_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ConstantDescription_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ConstantDescription_out &
--IR::ConstantDescription_out::operator= (ConstantDescription *p)
-+ACE_INLINE IR_ConstantDescription_out &
-+IR_ConstantDescription_out::operator= (IR_ConstantDescription *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ConstantDescription_out::operator ::IR::ConstantDescription *&() // cast
-+IR_ConstantDescription_out::operator ::IR_ConstantDescription *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ConstantDescription *&
--IR::ConstantDescription_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ConstantDescription *&
-+IR_ConstantDescription_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ConstantDescription *
--IR::ConstantDescription_out::operator-> (void)
-+ACE_INLINE ::IR_ConstantDescription *
-+IR_ConstantDescription_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#if !defined (_IR_TYPEDEFDEF___CI_)
--#define _IR_TYPEDEFDEF___CI_
--
- ACE_INLINE
--IR::TypedefDef::TypedefDef (
-+IR_TypedefDef::IR_TypedefDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -13979,217 +13037,201 @@
-   this->IR_TypedefDef_setup_collocation (_tao_collocated);
- }
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_TYPEDEFDEF___VAR_CI_)
--#define _IR_TYPEDEFDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::TypedefDef_var
-+// Inline operations for class IR_TypedefDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::TypedefDef_var::TypedefDef_var (void) // default constructor
--  : ptr_ (TypedefDef::_nil ())
-+IR_TypedefDef_var::IR_TypedefDef_var (void) // default constructor
-+  : ptr_ (IR_TypedefDef::_nil ())
- {}
- 
--ACE_INLINE ::IR::TypedefDef_ptr
--IR::TypedefDef_var::ptr (void) const
-+ACE_INLINE ::IR_TypedefDef_ptr
-+IR_TypedefDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::TypedefDef_var::TypedefDef_var (const ::IR::TypedefDef_var &p) // copy constructor
-+IR_TypedefDef_var::IR_TypedefDef_var (const ::IR_TypedefDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (TypedefDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_TypedefDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::TypedefDef_var::~TypedefDef_var (void) // destructor
-+IR_TypedefDef_var::~IR_TypedefDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::TypedefDef_var &
--IR::TypedefDef_var::operator= (TypedefDef_ptr p)
-+ACE_INLINE IR_TypedefDef_var &
-+IR_TypedefDef_var::operator= (IR_TypedefDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::TypedefDef_var &
--IR::TypedefDef_var::operator= (const ::IR::TypedefDef_var &p)
-+ACE_INLINE IR_TypedefDef_var &
-+IR_TypedefDef_var::operator= (const ::IR_TypedefDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = ::IR::TypedefDef::_duplicate (p.ptr ());
-+    this->ptr_ = ::IR_TypedefDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::TypedefDef_var::operator const ::IR::TypedefDef_ptr &() const // cast
-+IR_TypedefDef_var::operator const ::IR_TypedefDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::TypedefDef_var::operator ::IR::TypedefDef_ptr &() // cast 
-+IR_TypedefDef_var::operator ::IR_TypedefDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::TypedefDef_ptr
--IR::TypedefDef_var::operator-> (void) const
-+ACE_INLINE ::IR_TypedefDef_ptr
-+IR_TypedefDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::TypedefDef_ptr
--IR::TypedefDef_var::in (void) const
-+ACE_INLINE ::IR_TypedefDef_ptr
-+IR_TypedefDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::TypedefDef_ptr &
--IR::TypedefDef_var::inout (void)
-+ACE_INLINE ::IR_TypedefDef_ptr &
-+IR_TypedefDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::TypedefDef_ptr &
--IR::TypedefDef_var::out (void)
-+ACE_INLINE ::IR_TypedefDef_ptr &
-+IR_TypedefDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = ::IR::TypedefDef::_nil ();
-+  this->ptr_ = ::IR_TypedefDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::TypedefDef_ptr
--IR::TypedefDef_var::_retn (void)
-+ACE_INLINE ::IR_TypedefDef_ptr
-+IR_TypedefDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  ::IR::TypedefDef_ptr val = this->ptr_;
--  this->ptr_ = ::IR::TypedefDef::_nil ();
-+  ::IR_TypedefDef_ptr val = this->ptr_;
-+  this->ptr_ = ::IR_TypedefDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_TYPEDEFDEF___OUT_CI_)
--#define _IR_TYPEDEFDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::TypedefDef_out
-+// Inline operations for class IR_TypedefDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::TypedefDef_out::TypedefDef_out (TypedefDef_ptr &p)
-+IR_TypedefDef_out::IR_TypedefDef_out (IR_TypedefDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = ::IR::TypedefDef::_nil ();
-+  this->ptr_ = ::IR_TypedefDef::_nil ();
- }
- 
- ACE_INLINE
--IR::TypedefDef_out::TypedefDef_out (TypedefDef_var &p) // constructor from _var
-+IR_TypedefDef_out::IR_TypedefDef_out (IR_TypedefDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = ::IR::TypedefDef::_nil ();
-+  this->ptr_ = ::IR_TypedefDef::_nil ();
- }
- 
- ACE_INLINE
--IR::TypedefDef_out::TypedefDef_out (const ::IR::TypedefDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (TypedefDef_out &, p).ptr_)
-+IR_TypedefDef_out::IR_TypedefDef_out (const ::IR_TypedefDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_TypedefDef_out &, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::TypedefDef_out &
--IR::TypedefDef_out::operator= (const ::IR::TypedefDef_out &p)
-+ACE_INLINE ::IR_TypedefDef_out &
-+IR_TypedefDef_out::operator= (const ::IR_TypedefDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (TypedefDef_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_TypedefDef_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::TypedefDef_out &
--IR::TypedefDef_out::operator= (const ::IR::TypedefDef_var &p)
-+ACE_INLINE IR_TypedefDef_out &
-+IR_TypedefDef_out::operator= (const ::IR_TypedefDef_var &p)
- {
--  this->ptr_ = ::IR::TypedefDef::_duplicate (p.ptr ());
-+  this->ptr_ = ::IR_TypedefDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::TypedefDef_out &
--IR::TypedefDef_out::operator= (TypedefDef_ptr p)
-+ACE_INLINE IR_TypedefDef_out &
-+IR_TypedefDef_out::operator= (IR_TypedefDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::TypedefDef_out::operator ::IR::TypedefDef_ptr &() // cast
-+IR_TypedefDef_out::operator ::IR_TypedefDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::TypedefDef_ptr &
--IR::TypedefDef_out::ptr (void) // ptr
-+ACE_INLINE ::IR_TypedefDef_ptr &
-+IR_TypedefDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::TypedefDef_ptr
--IR::TypedefDef_out::operator-> (void)
-+ACE_INLINE ::IR_TypedefDef_ptr
-+IR_TypedefDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
- // *************************************************************
--// Inline operations for class IR::TypeDescription_var
-+// Inline operations for class IR_TypeDescription_var
- // *************************************************************
- 
- ACE_INLINE
--IR::TypeDescription_var::TypeDescription_var (void) // default constructor
-+IR_TypeDescription_var::IR_TypeDescription_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::TypeDescription_var::TypeDescription_var (TypeDescription *p)
-+IR_TypeDescription_var::IR_TypeDescription_var (IR_TypeDescription *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::TypeDescription_var::TypeDescription_var (const ::IR::TypeDescription_var &p) // copy constructor
-+IR_TypeDescription_var::IR_TypeDescription_var (const ::IR_TypeDescription_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::TypeDescription (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_TypeDescription (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::TypeDescription_var::~TypeDescription_var (void) // destructor
-+IR_TypeDescription_var::~IR_TypeDescription_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::TypeDescription_var &
--IR::TypeDescription_var::operator= (TypeDescription *p)
-+ACE_INLINE IR_TypeDescription_var &
-+IR_TypeDescription_var::operator= (IR_TypeDescription *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::TypeDescription_var &
--IR::TypeDescription_var::operator= (const ::IR::TypeDescription_var &p)
-+ACE_INLINE ::IR_TypeDescription_var &
-+IR_TypeDescription_var::operator= (const ::IR_TypeDescription_var &p)
- {
-   if (this != &p)
-     {
-@@ -14200,12 +13242,12 @@
-         }
-       else
-         {
--          TypeDescription *deep_copy =
--            new TypeDescription (*p.ptr_);
-+          IR_TypeDescription *deep_copy = 
-+            new IR_TypeDescription (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              TypeDescription *tmp = deep_copy;
-+              IR_TypeDescription *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -14216,91 +13258,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::TypeDescription *
--IR::TypeDescription_var::operator-> (void) const
-+ACE_INLINE const ::IR_TypeDescription *
-+IR_TypeDescription_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::TypeDescription *
--IR::TypeDescription_var::operator-> (void)
-+ACE_INLINE ::IR_TypeDescription *
-+IR_TypeDescription_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::TypeDescription_var::operator const ::IR::TypeDescription &() const // cast
-+IR_TypeDescription_var::operator const ::IR_TypeDescription &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::TypeDescription_var::operator ::IR::TypeDescription &() // cast 
-+IR_TypeDescription_var::operator ::IR_TypeDescription &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::TypeDescription_var::operator ::IR::TypeDescription &() const // cast 
-+IR_TypeDescription_var::operator ::IR_TypeDescription &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::TypeDescription_var::operator ::IR::TypeDescription *&() // cast 
-+IR_TypeDescription_var::operator ::IR_TypeDescription *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::TypeDescription &
--IR::TypeDescription_var::in (void) const
-+ACE_INLINE const ::IR_TypeDescription &
-+IR_TypeDescription_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::TypeDescription &
--IR::TypeDescription_var::inout (void)
-+ACE_INLINE ::IR_TypeDescription &
-+IR_TypeDescription_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::TypeDescription *&
--IR::TypeDescription_var::out (void)
-+ACE_INLINE ::IR_TypeDescription *&
-+IR_TypeDescription_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::TypeDescription *
--IR::TypeDescription_var::_retn (void)
-+ACE_INLINE ::IR_TypeDescription *
-+IR_TypeDescription_var::_retn (void)
- {
--  ::IR::TypeDescription *tmp = this->ptr_;
-+  ::IR_TypeDescription *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::TypeDescription *
--IR::TypeDescription_var::ptr (void) const
-+ACE_INLINE ::IR_TypeDescription *
-+IR_TypeDescription_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::TypeDescription_out
-+// Inline operations for class IR_TypeDescription_out
- // *************************************************************
- 
- ACE_INLINE
--IR::TypeDescription_out::TypeDescription_out (::IR::TypeDescription *&p)
-+IR_TypeDescription_out::IR_TypeDescription_out (::IR_TypeDescription *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::TypeDescription_out::TypeDescription_out (TypeDescription_var &p) // constructor from _var
-+IR_TypeDescription_out::IR_TypeDescription_out (IR_TypeDescription_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -14308,81 +13350,81 @@
- }
- 
- ACE_INLINE
--IR::TypeDescription_out::TypeDescription_out (const ::IR::TypeDescription_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (TypeDescription_out&, p).ptr_)
-+IR_TypeDescription_out::IR_TypeDescription_out (const ::IR_TypeDescription_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_TypeDescription_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::TypeDescription_out &
--IR::TypeDescription_out::operator= (const ::IR::TypeDescription_out &p)
-+ACE_INLINE IR_TypeDescription_out &
-+IR_TypeDescription_out::operator= (const ::IR_TypeDescription_out &p)
- {
--  this->ptr_ = ACE_const_cast (TypeDescription_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_TypeDescription_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::TypeDescription_out &
--IR::TypeDescription_out::operator= (TypeDescription *p)
-+ACE_INLINE IR_TypeDescription_out &
-+IR_TypeDescription_out::operator= (IR_TypeDescription *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::TypeDescription_out::operator ::IR::TypeDescription *&() // cast
-+IR_TypeDescription_out::operator ::IR_TypeDescription *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::TypeDescription *&
--IR::TypeDescription_out::ptr (void) // ptr
-+ACE_INLINE ::IR_TypeDescription *&
-+IR_TypeDescription_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::TypeDescription *
--IR::TypeDescription_out::operator-> (void)
-+ACE_INLINE ::IR_TypeDescription *
-+IR_TypeDescription_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ExceptionDescription_var
-+// Inline operations for class IR_ExceptionDescription_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ExceptionDescription_var::ExceptionDescription_var (void) // default constructor
-+IR_ExceptionDescription_var::IR_ExceptionDescription_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ExceptionDescription_var::ExceptionDescription_var (ExceptionDescription *p)
-+IR_ExceptionDescription_var::IR_ExceptionDescription_var (IR_ExceptionDescription *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ExceptionDescription_var::ExceptionDescription_var (const ::IR::ExceptionDescription_var &p) // copy constructor
-+IR_ExceptionDescription_var::IR_ExceptionDescription_var (const ::IR_ExceptionDescription_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ExceptionDescription (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ExceptionDescription (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ExceptionDescription_var::~ExceptionDescription_var (void) // destructor
-+IR_ExceptionDescription_var::~IR_ExceptionDescription_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ExceptionDescription_var &
--IR::ExceptionDescription_var::operator= (ExceptionDescription *p)
-+ACE_INLINE IR_ExceptionDescription_var &
-+IR_ExceptionDescription_var::operator= (IR_ExceptionDescription *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ExceptionDescription_var &
--IR::ExceptionDescription_var::operator= (const ::IR::ExceptionDescription_var &p)
-+ACE_INLINE ::IR_ExceptionDescription_var &
-+IR_ExceptionDescription_var::operator= (const ::IR_ExceptionDescription_var &p)
- {
-   if (this != &p)
-     {
-@@ -14393,12 +13435,12 @@
-         }
-       else
-         {
--          ExceptionDescription *deep_copy =
--            new ExceptionDescription (*p.ptr_);
-+          IR_ExceptionDescription *deep_copy = 
-+            new IR_ExceptionDescription (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ExceptionDescription *tmp = deep_copy;
-+              IR_ExceptionDescription *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -14409,91 +13451,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ExceptionDescription *
--IR::ExceptionDescription_var::operator-> (void) const
-+ACE_INLINE const ::IR_ExceptionDescription *
-+IR_ExceptionDescription_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ExceptionDescription *
--IR::ExceptionDescription_var::operator-> (void)
-+ACE_INLINE ::IR_ExceptionDescription *
-+IR_ExceptionDescription_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ExceptionDescription_var::operator const ::IR::ExceptionDescription &() const // cast
-+IR_ExceptionDescription_var::operator const ::IR_ExceptionDescription &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::ExceptionDescription_var::operator ::IR::ExceptionDescription &() // cast 
-+IR_ExceptionDescription_var::operator ::IR_ExceptionDescription &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::ExceptionDescription_var::operator ::IR::ExceptionDescription &() const // cast 
-+IR_ExceptionDescription_var::operator ::IR_ExceptionDescription &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ExceptionDescription_var::operator ::IR::ExceptionDescription *&() // cast 
-+IR_ExceptionDescription_var::operator ::IR_ExceptionDescription *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::ExceptionDescription &
--IR::ExceptionDescription_var::in (void) const
-+ACE_INLINE const ::IR_ExceptionDescription &
-+IR_ExceptionDescription_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ExceptionDescription &
--IR::ExceptionDescription_var::inout (void)
-+ACE_INLINE ::IR_ExceptionDescription &
-+IR_ExceptionDescription_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ExceptionDescription *&
--IR::ExceptionDescription_var::out (void)
-+ACE_INLINE ::IR_ExceptionDescription *&
-+IR_ExceptionDescription_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ExceptionDescription *
--IR::ExceptionDescription_var::_retn (void)
-+ACE_INLINE ::IR_ExceptionDescription *
-+IR_ExceptionDescription_var::_retn (void)
- {
--  ::IR::ExceptionDescription *tmp = this->ptr_;
-+  ::IR_ExceptionDescription *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ExceptionDescription *
--IR::ExceptionDescription_var::ptr (void) const
-+ACE_INLINE ::IR_ExceptionDescription *
-+IR_ExceptionDescription_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ExceptionDescription_out
-+// Inline operations for class IR_ExceptionDescription_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ExceptionDescription_out::ExceptionDescription_out (::IR::ExceptionDescription *&p)
-+IR_ExceptionDescription_out::IR_ExceptionDescription_out (::IR_ExceptionDescription *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ExceptionDescription_out::ExceptionDescription_out (ExceptionDescription_var &p) // constructor from _var
-+IR_ExceptionDescription_out::IR_ExceptionDescription_out (IR_ExceptionDescription_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -14501,63 +13543,59 @@
- }
- 
- ACE_INLINE
--IR::ExceptionDescription_out::ExceptionDescription_out (const ::IR::ExceptionDescription_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ExceptionDescription_out&, p).ptr_)
-+IR_ExceptionDescription_out::IR_ExceptionDescription_out (const ::IR_ExceptionDescription_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ExceptionDescription_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::ExceptionDescription_out &
--IR::ExceptionDescription_out::operator= (const ::IR::ExceptionDescription_out &p)
-+ACE_INLINE IR_ExceptionDescription_out &
-+IR_ExceptionDescription_out::operator= (const ::IR_ExceptionDescription_out &p)
- {
--  this->ptr_ = ACE_const_cast (ExceptionDescription_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ExceptionDescription_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ExceptionDescription_out &
--IR::ExceptionDescription_out::operator= (ExceptionDescription *p)
-+ACE_INLINE IR_ExceptionDescription_out &
-+IR_ExceptionDescription_out::operator= (IR_ExceptionDescription *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ExceptionDescription_out::operator ::IR::ExceptionDescription *&() // cast
-+IR_ExceptionDescription_out::operator ::IR_ExceptionDescription *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ExceptionDescription *&
--IR::ExceptionDescription_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ExceptionDescription *&
-+IR_ExceptionDescription_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ExceptionDescription *
--IR::ExceptionDescription_out::operator-> (void)
-+ACE_INLINE ::IR_ExceptionDescription *
-+IR_ExceptionDescription_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CI_)
--#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CI_
--
--  ACE_INLINE IR::ExceptionDef **
--  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (CORBA::ULong nelems)
-+  ACE_INLINE IR_ExceptionDef **
-+  _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (CORBA::ULong nelems)
-   {
--    IR::ExceptionDef **buf = 0;
-+    IR_ExceptionDef **buf = 0;
-     
--    ACE_NEW_RETURN (buf, IR::ExceptionDef*[nelems], 0);
-+    ACE_NEW_RETURN (buf, IR_ExceptionDef*[nelems], 0);
-     
-     for (CORBA::ULong i = 0; i < nelems; i++)
--      buf[i] = IR::ExceptionDef::_nil ();
-+      buf[i] = IR_ExceptionDef::_nil ();
-     
-     return buf;
-   }
-   
-   ACE_INLINE void 
--  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::freebuf (IR::ExceptionDef **buffer)
-+  _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::freebuf (IR_ExceptionDef **buffer)
-   {
-     if (buffer == 0)
-       return;
-@@ -14565,36 +13603,36 @@
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (void)
-+  _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (void)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum)
-+  _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum)
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::ExceptionDef* *value,
-+    IR_ExceptionDef* *value,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs)
-+  _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs)
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::ExceptionDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (this->maximum_);
--      IR::ExceptionDef ** const tmp2 = ACE_reinterpret_cast (IR::ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
-+      IR_ExceptionDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (this->maximum_);
-+      IR_ExceptionDef ** const tmp2 = ACE_reinterpret_cast (IR_ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--        tmp1[i] = IR::ExceptionDef::_duplicate (tmp2[i]);
-+        tmp1[i] = IR_ExceptionDef::_duplicate (tmp2[i]);
-       
-       this->buffer_ = tmp1;
-     }
-@@ -14604,20 +13642,20 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &
--  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &
-+  _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs)
-   {
-     if (this == &rhs)
-       return *this;
-     
-     if (this->release_)
-     {
--      IR::ExceptionDef **tmp = ACE_reinterpret_cast (IR::ExceptionDef **, this->buffer_);
-+      IR_ExceptionDef **tmp = ACE_reinterpret_cast (IR_ExceptionDef **, this->buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-       {
-         CORBA::release (tmp[i]);
--        tmp[i] = IR::ExceptionDef::_nil ();
-+        tmp[i] = IR_ExceptionDef::_nil ();
-       }
-       if (this->maximum_ < rhs.maximum_)
-       {
-@@ -14630,28 +13668,28 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::ExceptionDef **tmp1 = ACE_reinterpret_cast (IR::ExceptionDef **, this->buffer_);
--    IR::ExceptionDef ** const tmp2 = ACE_reinterpret_cast (IR::ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
-+    IR_ExceptionDef **tmp1 = ACE_reinterpret_cast (IR_ExceptionDef **, this->buffer_);
-+    IR_ExceptionDef ** const tmp2 = ACE_reinterpret_cast (IR_ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
--      tmp1[i] = IR::ExceptionDef::_duplicate (tmp2[i]);
-+      tmp1[i] = IR_ExceptionDef::_duplicate (tmp2[i]);
-     
-     return *this;
-   }
-   
--  ACE_INLINE TAO_Object_Manager<IR::ExceptionDef,IR::ExceptionDef_var>
--  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::operator[] (CORBA::ULong index) const
-+  ACE_INLINE TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var>
-+  _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::operator[] (CORBA::ULong index) const
-   // read-write accessor
-   {
-     ACE_ASSERT (index < this->maximum_);
--    IR::ExceptionDef ** const tmp = ACE_reinterpret_cast (IR::ExceptionDef ** ACE_CAST_CONST, this->buffer_);
--    return TAO_Object_Manager<IR::ExceptionDef,IR::ExceptionDef_var> (tmp + index, this->release_);
-+    IR_ExceptionDef ** const tmp = ACE_reinterpret_cast (IR_ExceptionDef ** ACE_CAST_CONST, this->buffer_);
-+    return TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var> (tmp + index, this->release_);
-   }
-   
--  ACE_INLINE IR::ExceptionDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_ExceptionDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::ExceptionDef **result = 0;
-+    IR_ExceptionDef **result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -14663,7 +13701,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::ExceptionDef**, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_ExceptionDef**, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -14672,7 +13710,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::ExceptionDef**,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_ExceptionDef**,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -14682,60 +13720,53 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::ExceptionDef* *
--  IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::get_buffer (void) const
-+  ACE_INLINE const IR_ExceptionDef* *
-+  _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::ExceptionDef ** ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_ExceptionDef ** ACE_CAST_CONST, this->buffer_);
-   }
-   
--  
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_EXCEPTIONDEFSEQ_CI_)
--#define _IR_EXCEPTIONDEFSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::ExceptionDefSeq_var
-+// Inline operations for class IR_ExceptionDefSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ExceptionDefSeq_var::ExceptionDefSeq_var (void) // default constructor
-+IR_ExceptionDefSeq_var::IR_ExceptionDefSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ExceptionDefSeq_var::ExceptionDefSeq_var (ExceptionDefSeq *p)
-+IR_ExceptionDefSeq_var::IR_ExceptionDefSeq_var (IR_ExceptionDefSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ExceptionDefSeq_var::ExceptionDefSeq_var (const ::IR::ExceptionDefSeq_var &p) // copy constructor
-+IR_ExceptionDefSeq_var::IR_ExceptionDefSeq_var (const ::IR_ExceptionDefSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ExceptionDefSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ExceptionDefSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ExceptionDefSeq_var::~ExceptionDefSeq_var (void) // destructor
-+IR_ExceptionDefSeq_var::~IR_ExceptionDefSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ExceptionDefSeq_var &
--IR::ExceptionDefSeq_var::operator= (ExceptionDefSeq *p)
-+ACE_INLINE IR_ExceptionDefSeq_var &
-+IR_ExceptionDefSeq_var::operator= (IR_ExceptionDefSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ExceptionDefSeq_var &
--IR::ExceptionDefSeq_var::operator= (const ::IR::ExceptionDefSeq_var &p)
-+ACE_INLINE IR_ExceptionDefSeq_var &
-+IR_ExceptionDefSeq_var::operator= (const ::IR_ExceptionDefSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -14746,12 +13777,12 @@
-         }
-       else
-         {
--          ExceptionDefSeq *deep_copy =
--            new ExceptionDefSeq (*p.ptr_);
-+          IR_ExceptionDefSeq *deep_copy = 
-+            new IR_ExceptionDefSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ExceptionDefSeq *tmp = deep_copy;
-+              IR_ExceptionDefSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -14762,97 +13793,97 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ExceptionDefSeq *
--IR::ExceptionDefSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_ExceptionDefSeq *
-+IR_ExceptionDefSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ExceptionDefSeq *
--IR::ExceptionDefSeq_var::operator-> (void)
-+ACE_INLINE ::IR_ExceptionDefSeq *
-+IR_ExceptionDefSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ExceptionDefSeq_var::operator const ::IR::ExceptionDefSeq &() const // cast
-+IR_ExceptionDefSeq_var::operator const ::IR_ExceptionDefSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ExceptionDefSeq_var::operator ::IR::ExceptionDefSeq &() // cast 
-+IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ExceptionDefSeq_var::operator ::IR::ExceptionDefSeq &() const // cast 
-+IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ExceptionDefSeq_var::operator ::IR::ExceptionDefSeq *&() // cast 
-+IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::ExceptionDef, IR::ExceptionDef_var>
--IR::ExceptionDefSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_ExceptionDef, IR_ExceptionDef_var>
-+IR_ExceptionDefSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::IR::ExceptionDefSeq &
--IR::ExceptionDefSeq_var::in (void) const
-+ACE_INLINE const ::IR_ExceptionDefSeq &
-+IR_ExceptionDefSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ExceptionDefSeq &
--IR::ExceptionDefSeq_var::inout (void)
-+ACE_INLINE ::IR_ExceptionDefSeq &
-+IR_ExceptionDefSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ExceptionDefSeq *&
--IR::ExceptionDefSeq_var::out (void)
-+ACE_INLINE ::IR_ExceptionDefSeq *&
-+IR_ExceptionDefSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ExceptionDefSeq *
--IR::ExceptionDefSeq_var::_retn (void)
-+ACE_INLINE ::IR_ExceptionDefSeq *
-+IR_ExceptionDefSeq_var::_retn (void)
- {
--  ::IR::ExceptionDefSeq *tmp = this->ptr_;
-+  ::IR_ExceptionDefSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ExceptionDefSeq *
--IR::ExceptionDefSeq_var::ptr (void) const
-+ACE_INLINE ::IR_ExceptionDefSeq *
-+IR_ExceptionDefSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ExceptionDefSeq_out
-+// Inline operations for class IR_ExceptionDefSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ExceptionDefSeq_out::ExceptionDefSeq_out (ExceptionDefSeq *&p)
-+IR_ExceptionDefSeq_out::IR_ExceptionDefSeq_out (IR_ExceptionDefSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ExceptionDefSeq_out::ExceptionDefSeq_out (ExceptionDefSeq_var &p) // constructor from _var
-+IR_ExceptionDefSeq_out::IR_ExceptionDefSeq_out (IR_ExceptionDefSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -14860,102 +13891,95 @@
- }
- 
- ACE_INLINE
--IR::ExceptionDefSeq_out::ExceptionDefSeq_out (const ::IR::ExceptionDefSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ExceptionDefSeq_out&, p).ptr_)
-+IR_ExceptionDefSeq_out::IR_ExceptionDefSeq_out (const ::IR_ExceptionDefSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ExceptionDefSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::ExceptionDefSeq_out &
--IR::ExceptionDefSeq_out::operator= (const ::IR::ExceptionDefSeq_out &p)
-+ACE_INLINE ::IR_ExceptionDefSeq_out &
-+IR_ExceptionDefSeq_out::operator= (const ::IR_ExceptionDefSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (ExceptionDefSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ExceptionDefSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ExceptionDefSeq_out &
--IR::ExceptionDefSeq_out::operator= (ExceptionDefSeq *p)
-+ACE_INLINE ::IR_ExceptionDefSeq_out &
-+IR_ExceptionDefSeq_out::operator= (IR_ExceptionDefSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ExceptionDefSeq_out::operator ::IR::ExceptionDefSeq *&() // cast
-+IR_ExceptionDefSeq_out::operator ::IR_ExceptionDefSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ExceptionDefSeq *&
--IR::ExceptionDefSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ExceptionDefSeq *&
-+IR_ExceptionDefSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ExceptionDefSeq *
--IR::ExceptionDefSeq_out::operator-> (void)
-+ACE_INLINE ::IR_ExceptionDefSeq *
-+IR_ExceptionDefSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE TAO_Object_Manager<IR::ExceptionDef, IR::ExceptionDef_var>
--IR::ExceptionDefSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE TAO_Object_Manager<IR_ExceptionDef, IR_ExceptionDef_var>
-+IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CI_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CI_
--
-   // = Static operations.
--  ACE_INLINE IR::ExceptionDescription *
--  IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (CORBA::ULong size)
-+  ACE_INLINE IR_ExceptionDescription *
-+  _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (CORBA::ULong size)
-   // Allocate storage for the sequence.
-   {
--    IR::ExceptionDescription *retval = 0;
--    ACE_NEW_RETURN (retval, IR::ExceptionDescription[size], 0);
-+    IR_ExceptionDescription *retval = 0;
-+    ACE_NEW_RETURN (retval, IR_ExceptionDescription[size], 0);
-     return retval;
-   }
-   
--  ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (IR::ExceptionDescription *buffer)
-+  ACE_INLINE void _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (IR_ExceptionDescription *buffer)
-   // Free the sequence.
-   {
-     delete [] buffer;
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (void) // Default constructor.
-+  _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (void) // Default constructor.
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-+  _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::ExceptionDescription *data,
-+    IR_ExceptionDescription *data,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs)
-+  _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs)
-   // Copy constructor.
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::ExceptionDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (this->maximum_);
--      IR::ExceptionDescription * const tmp2 = ACE_reinterpret_cast (IR::ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
-+      IR_ExceptionDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (this->maximum_);
-+      IR_ExceptionDescription * const tmp2 = ACE_reinterpret_cast (IR_ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp1[i] = tmp2[i];
-@@ -14968,8 +13992,8 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &
--  IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &
-+  _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs)
-   // Assignment operator.
-   {
-     if (this == &rhs)
-@@ -14980,7 +14004,7 @@
-       if (this->maximum_ < rhs.maximum_)
-       {
-         // free the old buffer
--        IR::ExceptionDescription *tmp = ACE_reinterpret_cast (IR::ExceptionDescription *, this->buffer_);
-+        IR_ExceptionDescription *tmp = ACE_reinterpret_cast (IR_ExceptionDescription *, this->buffer_);
-         _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (tmp);
-         this->buffer_ = _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (rhs.maximum_);
-       }
-@@ -14990,8 +14014,8 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::ExceptionDescription *tmp1 = ACE_reinterpret_cast (IR::ExceptionDescription *, this->buffer_);
--    IR::ExceptionDescription * const tmp2 = ACE_reinterpret_cast (IR::ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
-+    IR_ExceptionDescription *tmp1 = ACE_reinterpret_cast (IR_ExceptionDescription *, this->buffer_);
-+    IR_ExceptionDescription * const tmp2 = ACE_reinterpret_cast (IR_ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-       tmp1[i] = tmp2[i];
-@@ -15000,30 +14024,30 @@
-   }
-   
-   // = Accessors.
--  ACE_INLINE IR::ExceptionDescription &
--  IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator[] (CORBA::ULong i)
-+  ACE_INLINE IR_ExceptionDescription &
-+  _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator[] (CORBA::ULong i)
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::ExceptionDescription* tmp = ACE_reinterpret_cast(IR::ExceptionDescription*,this->buffer_);
-+    IR_ExceptionDescription* tmp = ACE_reinterpret_cast(IR_ExceptionDescription*,this->buffer_);
-     return tmp[i];
-   }
-   
--  ACE_INLINE const IR::ExceptionDescription &
--  IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator[] (CORBA::ULong i) const
-+  ACE_INLINE const IR_ExceptionDescription &
-+  _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator[] (CORBA::ULong i) const
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::ExceptionDescription * const tmp = ACE_reinterpret_cast (IR::ExceptionDescription* ACE_CAST_CONST, this->buffer_);
-+    IR_ExceptionDescription * const tmp = ACE_reinterpret_cast (IR_ExceptionDescription* ACE_CAST_CONST, this->buffer_);
-     return tmp[i];
-   }
-   
-   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-   
--  ACE_INLINE IR::ExceptionDescription *
--  IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_ExceptionDescription *
-+  _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::ExceptionDescription *result = 0;
-+    IR_ExceptionDescription *result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -15035,7 +14059,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::ExceptionDescription*, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_ExceptionDescription*, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -15044,7 +14068,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::ExceptionDescription*,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_ExceptionDescription*,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -15054,76 +14078,70 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::ExceptionDescription *
--  IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::get_buffer (void) const
-+  ACE_INLINE const IR_ExceptionDescription *
-+  _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::ExceptionDescription * ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_ExceptionDescription * ACE_CAST_CONST, this->buffer_);
-   }
-   
-   ACE_INLINE void
--  IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::replace (CORBA::ULong max,
-+  _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::replace (CORBA::ULong max,
-   CORBA::ULong length,
--  IR::ExceptionDescription *data,
-+  IR_ExceptionDescription *data,
-   CORBA::Boolean release)
-   {
-     this->maximum_ = max;
-     this->length_ = length;
-     if (this->buffer_ && this->release_ == 1)
-     {
--      IR::ExceptionDescription *tmp = ACE_reinterpret_cast(IR::ExceptionDescription*,this->buffer_);
-+      IR_ExceptionDescription *tmp = ACE_reinterpret_cast(IR_ExceptionDescription*,this->buffer_);
-       _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (tmp);
-     }
-     this->buffer_ = data;
-     this->release_ = release;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_EXCDESCRIPTIONSEQ_CI_)
--#define _IR_EXCDESCRIPTIONSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::ExcDescriptionSeq_var
-+// Inline operations for class IR_ExcDescriptionSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ExcDescriptionSeq_var::ExcDescriptionSeq_var (void) // default constructor
-+IR_ExcDescriptionSeq_var::IR_ExcDescriptionSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ExcDescriptionSeq_var::ExcDescriptionSeq_var (ExcDescriptionSeq *p)
-+IR_ExcDescriptionSeq_var::IR_ExcDescriptionSeq_var (IR_ExcDescriptionSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ExcDescriptionSeq_var::ExcDescriptionSeq_var (const ::IR::ExcDescriptionSeq_var &p) // copy constructor
-+IR_ExcDescriptionSeq_var::IR_ExcDescriptionSeq_var (const ::IR_ExcDescriptionSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ExcDescriptionSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ExcDescriptionSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ExcDescriptionSeq_var::~ExcDescriptionSeq_var (void) // destructor
-+IR_ExcDescriptionSeq_var::~IR_ExcDescriptionSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ExcDescriptionSeq_var &
--IR::ExcDescriptionSeq_var::operator= (ExcDescriptionSeq *p)
-+ACE_INLINE IR_ExcDescriptionSeq_var &
-+IR_ExcDescriptionSeq_var::operator= (IR_ExcDescriptionSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ExcDescriptionSeq_var &
--IR::ExcDescriptionSeq_var::operator= (const ::IR::ExcDescriptionSeq_var &p)
-+ACE_INLINE IR_ExcDescriptionSeq_var &
-+IR_ExcDescriptionSeq_var::operator= (const ::IR_ExcDescriptionSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -15134,12 +14152,12 @@
-         }
-       else
-         {
--          ExcDescriptionSeq *deep_copy =
--            new ExcDescriptionSeq (*p.ptr_);
-+          IR_ExcDescriptionSeq *deep_copy = 
-+            new IR_ExcDescriptionSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ExcDescriptionSeq *tmp = deep_copy;
-+              IR_ExcDescriptionSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -15150,103 +14168,103 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ExcDescriptionSeq *
--IR::ExcDescriptionSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_ExcDescriptionSeq *
-+IR_ExcDescriptionSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ExcDescriptionSeq *
--IR::ExcDescriptionSeq_var::operator-> (void)
-+ACE_INLINE ::IR_ExcDescriptionSeq *
-+IR_ExcDescriptionSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ExcDescriptionSeq_var::operator const ::IR::ExcDescriptionSeq &() const // cast
-+IR_ExcDescriptionSeq_var::operator const ::IR_ExcDescriptionSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ExcDescriptionSeq_var::operator ::IR::ExcDescriptionSeq &() // cast 
-+IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ExcDescriptionSeq_var::operator ::IR::ExcDescriptionSeq &() const // cast 
-+IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ExcDescriptionSeq_var::operator ::IR::ExcDescriptionSeq *&() // cast 
-+IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ExceptionDescription &
--IR::ExcDescriptionSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_ExceptionDescription &
-+IR_ExcDescriptionSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const IR::ExceptionDescription &
--IR::ExcDescriptionSeq_var::operator[] (CORBA::ULong index) const
-+ACE_INLINE const IR_ExceptionDescription &
-+IR_ExcDescriptionSeq_var::operator[] (CORBA::ULong index) const
- {
--  return ACE_const_cast (const IR::ExceptionDescription &, this->ptr_->operator[] (index));
-+  return ACE_const_cast (const IR_ExceptionDescription &, this->ptr_->operator[] (index));
- }
- 
--ACE_INLINE const ::IR::ExcDescriptionSeq &
--IR::ExcDescriptionSeq_var::in (void) const
-+ACE_INLINE const ::IR_ExcDescriptionSeq &
-+IR_ExcDescriptionSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ExcDescriptionSeq &
--IR::ExcDescriptionSeq_var::inout (void)
-+ACE_INLINE ::IR_ExcDescriptionSeq &
-+IR_ExcDescriptionSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ExcDescriptionSeq *&
--IR::ExcDescriptionSeq_var::out (void)
-+ACE_INLINE ::IR_ExcDescriptionSeq *&
-+IR_ExcDescriptionSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ExcDescriptionSeq *
--IR::ExcDescriptionSeq_var::_retn (void)
-+ACE_INLINE ::IR_ExcDescriptionSeq *
-+IR_ExcDescriptionSeq_var::_retn (void)
- {
--  ::IR::ExcDescriptionSeq *tmp = this->ptr_;
-+  ::IR_ExcDescriptionSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ExcDescriptionSeq *
--IR::ExcDescriptionSeq_var::ptr (void) const
-+ACE_INLINE ::IR_ExcDescriptionSeq *
-+IR_ExcDescriptionSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ExcDescriptionSeq_out
-+// Inline operations for class IR_ExcDescriptionSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ExcDescriptionSeq_out::ExcDescriptionSeq_out (ExcDescriptionSeq *&p)
-+IR_ExcDescriptionSeq_out::IR_ExcDescriptionSeq_out (IR_ExcDescriptionSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ExcDescriptionSeq_out::ExcDescriptionSeq_out (ExcDescriptionSeq_var &p) // constructor from _var
-+IR_ExcDescriptionSeq_out::IR_ExcDescriptionSeq_out (IR_ExcDescriptionSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -15254,57 +14272,50 @@
- }
- 
- ACE_INLINE
--IR::ExcDescriptionSeq_out::ExcDescriptionSeq_out (const ::IR::ExcDescriptionSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ExcDescriptionSeq_out&, p).ptr_)
-+IR_ExcDescriptionSeq_out::IR_ExcDescriptionSeq_out (const ::IR_ExcDescriptionSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ExcDescriptionSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::ExcDescriptionSeq_out &
--IR::ExcDescriptionSeq_out::operator= (const ::IR::ExcDescriptionSeq_out &p)
-+ACE_INLINE ::IR_ExcDescriptionSeq_out &
-+IR_ExcDescriptionSeq_out::operator= (const ::IR_ExcDescriptionSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (ExcDescriptionSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ExcDescriptionSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ExcDescriptionSeq_out &
--IR::ExcDescriptionSeq_out::operator= (ExcDescriptionSeq *p)
-+ACE_INLINE ::IR_ExcDescriptionSeq_out &
-+IR_ExcDescriptionSeq_out::operator= (IR_ExcDescriptionSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ExcDescriptionSeq_out::operator ::IR::ExcDescriptionSeq *&() // cast
-+IR_ExcDescriptionSeq_out::operator ::IR_ExcDescriptionSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ExcDescriptionSeq *&
--IR::ExcDescriptionSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ExcDescriptionSeq *&
-+IR_ExcDescriptionSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ExcDescriptionSeq *
--IR::ExcDescriptionSeq_out::operator-> (void)
-+ACE_INLINE ::IR_ExcDescriptionSeq *
-+IR_ExcDescriptionSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ExceptionDescription &
--IR::ExcDescriptionSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_ExceptionDescription &
-+IR_ExcDescriptionSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ATTRIBUTEDEF___CI_)
--#define _IR_ATTRIBUTEDEF___CI_
--
- ACE_INLINE
--IR::AttributeDef::AttributeDef (
-+IR_AttributeDef::IR_AttributeDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -15314,217 +14325,201 @@
-   this->IR_AttributeDef_setup_collocation (_tao_collocated);
- }
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ATTRIBUTEDEF___VAR_CI_)
--#define _IR_ATTRIBUTEDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::AttributeDef_var
-+// Inline operations for class IR_AttributeDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::AttributeDef_var::AttributeDef_var (void) // default constructor
--  : ptr_ (AttributeDef::_nil ())
-+IR_AttributeDef_var::IR_AttributeDef_var (void) // default constructor
-+  : ptr_ (IR_AttributeDef::_nil ())
- {}
- 
--ACE_INLINE ::IR::AttributeDef_ptr
--IR::AttributeDef_var::ptr (void) const
-+ACE_INLINE ::IR_AttributeDef_ptr
-+IR_AttributeDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::AttributeDef_var::AttributeDef_var (const ::IR::AttributeDef_var &p) // copy constructor
-+IR_AttributeDef_var::IR_AttributeDef_var (const ::IR_AttributeDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (AttributeDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_AttributeDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::AttributeDef_var::~AttributeDef_var (void) // destructor
-+IR_AttributeDef_var::~IR_AttributeDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::AttributeDef_var &
--IR::AttributeDef_var::operator= (AttributeDef_ptr p)
-+ACE_INLINE IR_AttributeDef_var &
-+IR_AttributeDef_var::operator= (IR_AttributeDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::AttributeDef_var &
--IR::AttributeDef_var::operator= (const ::IR::AttributeDef_var &p)
-+ACE_INLINE IR_AttributeDef_var &
-+IR_AttributeDef_var::operator= (const ::IR_AttributeDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = ::IR::AttributeDef::_duplicate (p.ptr ());
-+    this->ptr_ = ::IR_AttributeDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::AttributeDef_var::operator const ::IR::AttributeDef_ptr &() const // cast
-+IR_AttributeDef_var::operator const ::IR_AttributeDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::AttributeDef_var::operator ::IR::AttributeDef_ptr &() // cast 
-+IR_AttributeDef_var::operator ::IR_AttributeDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttributeDef_ptr
--IR::AttributeDef_var::operator-> (void) const
-+ACE_INLINE ::IR_AttributeDef_ptr
-+IR_AttributeDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttributeDef_ptr
--IR::AttributeDef_var::in (void) const
-+ACE_INLINE ::IR_AttributeDef_ptr
-+IR_AttributeDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttributeDef_ptr &
--IR::AttributeDef_var::inout (void)
-+ACE_INLINE ::IR_AttributeDef_ptr &
-+IR_AttributeDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttributeDef_ptr &
--IR::AttributeDef_var::out (void)
-+ACE_INLINE ::IR_AttributeDef_ptr &
-+IR_AttributeDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = ::IR::AttributeDef::_nil ();
-+  this->ptr_ = ::IR_AttributeDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttributeDef_ptr
--IR::AttributeDef_var::_retn (void)
-+ACE_INLINE ::IR_AttributeDef_ptr
-+IR_AttributeDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  ::IR::AttributeDef_ptr val = this->ptr_;
--  this->ptr_ = ::IR::AttributeDef::_nil ();
-+  ::IR_AttributeDef_ptr val = this->ptr_;
-+  this->ptr_ = ::IR_AttributeDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_ATTRIBUTEDEF___OUT_CI_)
--#define _IR_ATTRIBUTEDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::AttributeDef_out
-+// Inline operations for class IR_AttributeDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::AttributeDef_out::AttributeDef_out (AttributeDef_ptr &p)
-+IR_AttributeDef_out::IR_AttributeDef_out (IR_AttributeDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = ::IR::AttributeDef::_nil ();
-+  this->ptr_ = ::IR_AttributeDef::_nil ();
- }
- 
- ACE_INLINE
--IR::AttributeDef_out::AttributeDef_out (AttributeDef_var &p) // constructor from _var
-+IR_AttributeDef_out::IR_AttributeDef_out (IR_AttributeDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = ::IR::AttributeDef::_nil ();
-+  this->ptr_ = ::IR_AttributeDef::_nil ();
- }
- 
- ACE_INLINE
--IR::AttributeDef_out::AttributeDef_out (const ::IR::AttributeDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (AttributeDef_out &, p).ptr_)
-+IR_AttributeDef_out::IR_AttributeDef_out (const ::IR_AttributeDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_AttributeDef_out &, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::AttributeDef_out &
--IR::AttributeDef_out::operator= (const ::IR::AttributeDef_out &p)
-+ACE_INLINE ::IR_AttributeDef_out &
-+IR_AttributeDef_out::operator= (const ::IR_AttributeDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (AttributeDef_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_AttributeDef_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::AttributeDef_out &
--IR::AttributeDef_out::operator= (const ::IR::AttributeDef_var &p)
-+ACE_INLINE IR_AttributeDef_out &
-+IR_AttributeDef_out::operator= (const ::IR_AttributeDef_var &p)
- {
--  this->ptr_ = ::IR::AttributeDef::_duplicate (p.ptr ());
-+  this->ptr_ = ::IR_AttributeDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::AttributeDef_out &
--IR::AttributeDef_out::operator= (AttributeDef_ptr p)
-+ACE_INLINE IR_AttributeDef_out &
-+IR_AttributeDef_out::operator= (IR_AttributeDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::AttributeDef_out::operator ::IR::AttributeDef_ptr &() // cast
-+IR_AttributeDef_out::operator ::IR_AttributeDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttributeDef_ptr &
--IR::AttributeDef_out::ptr (void) // ptr
-+ACE_INLINE ::IR_AttributeDef_ptr &
-+IR_AttributeDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttributeDef_ptr
--IR::AttributeDef_out::operator-> (void)
-+ACE_INLINE ::IR_AttributeDef_ptr
-+IR_AttributeDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
- // *************************************************************
--// Inline operations for class IR::AttributeDescription_var
-+// Inline operations for class IR_AttributeDescription_var
- // *************************************************************
- 
- ACE_INLINE
--IR::AttributeDescription_var::AttributeDescription_var (void) // default constructor
-+IR_AttributeDescription_var::IR_AttributeDescription_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::AttributeDescription_var::AttributeDescription_var (AttributeDescription *p)
-+IR_AttributeDescription_var::IR_AttributeDescription_var (IR_AttributeDescription *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::AttributeDescription_var::AttributeDescription_var (const ::IR::AttributeDescription_var &p) // copy constructor
-+IR_AttributeDescription_var::IR_AttributeDescription_var (const ::IR_AttributeDescription_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::AttributeDescription (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_AttributeDescription (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::AttributeDescription_var::~AttributeDescription_var (void) // destructor
-+IR_AttributeDescription_var::~IR_AttributeDescription_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::AttributeDescription_var &
--IR::AttributeDescription_var::operator= (AttributeDescription *p)
-+ACE_INLINE IR_AttributeDescription_var &
-+IR_AttributeDescription_var::operator= (IR_AttributeDescription *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::AttributeDescription_var &
--IR::AttributeDescription_var::operator= (const ::IR::AttributeDescription_var &p)
-+ACE_INLINE ::IR_AttributeDescription_var &
-+IR_AttributeDescription_var::operator= (const ::IR_AttributeDescription_var &p)
- {
-   if (this != &p)
-     {
-@@ -15535,12 +14530,12 @@
-         }
-       else
-         {
--          AttributeDescription *deep_copy =
--            new AttributeDescription (*p.ptr_);
-+          IR_AttributeDescription *deep_copy = 
-+            new IR_AttributeDescription (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              AttributeDescription *tmp = deep_copy;
-+              IR_AttributeDescription *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -15551,91 +14546,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::AttributeDescription *
--IR::AttributeDescription_var::operator-> (void) const
-+ACE_INLINE const ::IR_AttributeDescription *
-+IR_AttributeDescription_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttributeDescription *
--IR::AttributeDescription_var::operator-> (void)
-+ACE_INLINE ::IR_AttributeDescription *
-+IR_AttributeDescription_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::AttributeDescription_var::operator const ::IR::AttributeDescription &() const // cast
-+IR_AttributeDescription_var::operator const ::IR_AttributeDescription &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::AttributeDescription_var::operator ::IR::AttributeDescription &() // cast 
-+IR_AttributeDescription_var::operator ::IR_AttributeDescription &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::AttributeDescription_var::operator ::IR::AttributeDescription &() const // cast 
-+IR_AttributeDescription_var::operator ::IR_AttributeDescription &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::AttributeDescription_var::operator ::IR::AttributeDescription *&() // cast 
-+IR_AttributeDescription_var::operator ::IR_AttributeDescription *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::AttributeDescription &
--IR::AttributeDescription_var::in (void) const
-+ACE_INLINE const ::IR_AttributeDescription &
-+IR_AttributeDescription_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttributeDescription &
--IR::AttributeDescription_var::inout (void)
-+ACE_INLINE ::IR_AttributeDescription &
-+IR_AttributeDescription_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::AttributeDescription *&
--IR::AttributeDescription_var::out (void)
-+ACE_INLINE ::IR_AttributeDescription *&
-+IR_AttributeDescription_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttributeDescription *
--IR::AttributeDescription_var::_retn (void)
-+ACE_INLINE ::IR_AttributeDescription *
-+IR_AttributeDescription_var::_retn (void)
- {
--  ::IR::AttributeDescription *tmp = this->ptr_;
-+  ::IR_AttributeDescription *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::AttributeDescription *
--IR::AttributeDescription_var::ptr (void) const
-+ACE_INLINE ::IR_AttributeDescription *
-+IR_AttributeDescription_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::AttributeDescription_out
-+// Inline operations for class IR_AttributeDescription_out
- // *************************************************************
- 
- ACE_INLINE
--IR::AttributeDescription_out::AttributeDescription_out (::IR::AttributeDescription *&p)
-+IR_AttributeDescription_out::IR_AttributeDescription_out (::IR_AttributeDescription *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::AttributeDescription_out::AttributeDescription_out (AttributeDescription_var &p) // constructor from _var
-+IR_AttributeDescription_out::IR_AttributeDescription_out (IR_AttributeDescription_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -15643,81 +14638,81 @@
- }
- 
- ACE_INLINE
--IR::AttributeDescription_out::AttributeDescription_out (const ::IR::AttributeDescription_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (AttributeDescription_out&, p).ptr_)
-+IR_AttributeDescription_out::IR_AttributeDescription_out (const ::IR_AttributeDescription_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_AttributeDescription_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::AttributeDescription_out &
--IR::AttributeDescription_out::operator= (const ::IR::AttributeDescription_out &p)
-+ACE_INLINE IR_AttributeDescription_out &
-+IR_AttributeDescription_out::operator= (const ::IR_AttributeDescription_out &p)
- {
--  this->ptr_ = ACE_const_cast (AttributeDescription_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_AttributeDescription_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::AttributeDescription_out &
--IR::AttributeDescription_out::operator= (AttributeDescription *p)
-+ACE_INLINE IR_AttributeDescription_out &
-+IR_AttributeDescription_out::operator= (IR_AttributeDescription *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::AttributeDescription_out::operator ::IR::AttributeDescription *&() // cast
-+IR_AttributeDescription_out::operator ::IR_AttributeDescription *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttributeDescription *&
--IR::AttributeDescription_out::ptr (void) // ptr
-+ACE_INLINE ::IR_AttributeDescription *&
-+IR_AttributeDescription_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttributeDescription *
--IR::AttributeDescription_out::operator-> (void)
-+ACE_INLINE ::IR_AttributeDescription *
-+IR_AttributeDescription_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ParameterDescription_var
-+// Inline operations for class IR_ParameterDescription_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ParameterDescription_var::ParameterDescription_var (void) // default constructor
-+IR_ParameterDescription_var::IR_ParameterDescription_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ParameterDescription_var::ParameterDescription_var (ParameterDescription *p)
-+IR_ParameterDescription_var::IR_ParameterDescription_var (IR_ParameterDescription *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ParameterDescription_var::ParameterDescription_var (const ::IR::ParameterDescription_var &p) // copy constructor
-+IR_ParameterDescription_var::IR_ParameterDescription_var (const ::IR_ParameterDescription_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ParameterDescription (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ParameterDescription (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ParameterDescription_var::~ParameterDescription_var (void) // destructor
-+IR_ParameterDescription_var::~IR_ParameterDescription_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ParameterDescription_var &
--IR::ParameterDescription_var::operator= (ParameterDescription *p)
-+ACE_INLINE IR_ParameterDescription_var &
-+IR_ParameterDescription_var::operator= (IR_ParameterDescription *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ParameterDescription_var &
--IR::ParameterDescription_var::operator= (const ::IR::ParameterDescription_var &p)
-+ACE_INLINE ::IR_ParameterDescription_var &
-+IR_ParameterDescription_var::operator= (const ::IR_ParameterDescription_var &p)
- {
-   if (this != &p)
-     {
-@@ -15728,12 +14723,12 @@
-         }
-       else
-         {
--          ParameterDescription *deep_copy =
--            new ParameterDescription (*p.ptr_);
-+          IR_ParameterDescription *deep_copy = 
-+            new IR_ParameterDescription (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ParameterDescription *tmp = deep_copy;
-+              IR_ParameterDescription *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -15744,91 +14739,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ParameterDescription *
--IR::ParameterDescription_var::operator-> (void) const
-+ACE_INLINE const ::IR_ParameterDescription *
-+IR_ParameterDescription_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ParameterDescription *
--IR::ParameterDescription_var::operator-> (void)
-+ACE_INLINE ::IR_ParameterDescription *
-+IR_ParameterDescription_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ParameterDescription_var::operator const ::IR::ParameterDescription &() const // cast
-+IR_ParameterDescription_var::operator const ::IR_ParameterDescription &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::ParameterDescription_var::operator ::IR::ParameterDescription &() // cast 
-+IR_ParameterDescription_var::operator ::IR_ParameterDescription &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::ParameterDescription_var::operator ::IR::ParameterDescription &() const // cast 
-+IR_ParameterDescription_var::operator ::IR_ParameterDescription &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ParameterDescription_var::operator ::IR::ParameterDescription *&() // cast 
-+IR_ParameterDescription_var::operator ::IR_ParameterDescription *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::ParameterDescription &
--IR::ParameterDescription_var::in (void) const
-+ACE_INLINE const ::IR_ParameterDescription &
-+IR_ParameterDescription_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ParameterDescription &
--IR::ParameterDescription_var::inout (void)
-+ACE_INLINE ::IR_ParameterDescription &
-+IR_ParameterDescription_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ParameterDescription *&
--IR::ParameterDescription_var::out (void)
-+ACE_INLINE ::IR_ParameterDescription *&
-+IR_ParameterDescription_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ParameterDescription *
--IR::ParameterDescription_var::_retn (void)
-+ACE_INLINE ::IR_ParameterDescription *
-+IR_ParameterDescription_var::_retn (void)
- {
--  ::IR::ParameterDescription *tmp = this->ptr_;
-+  ::IR_ParameterDescription *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ParameterDescription *
--IR::ParameterDescription_var::ptr (void) const
-+ACE_INLINE ::IR_ParameterDescription *
-+IR_ParameterDescription_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ParameterDescription_out
-+// Inline operations for class IR_ParameterDescription_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ParameterDescription_out::ParameterDescription_out (::IR::ParameterDescription *&p)
-+IR_ParameterDescription_out::IR_ParameterDescription_out (::IR_ParameterDescription *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ParameterDescription_out::ParameterDescription_out (ParameterDescription_var &p) // constructor from _var
-+IR_ParameterDescription_out::IR_ParameterDescription_out (IR_ParameterDescription_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -15836,93 +14831,89 @@
- }
- 
- ACE_INLINE
--IR::ParameterDescription_out::ParameterDescription_out (const ::IR::ParameterDescription_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ParameterDescription_out&, p).ptr_)
-+IR_ParameterDescription_out::IR_ParameterDescription_out (const ::IR_ParameterDescription_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ParameterDescription_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::ParameterDescription_out &
--IR::ParameterDescription_out::operator= (const ::IR::ParameterDescription_out &p)
-+ACE_INLINE IR_ParameterDescription_out &
-+IR_ParameterDescription_out::operator= (const ::IR_ParameterDescription_out &p)
- {
--  this->ptr_ = ACE_const_cast (ParameterDescription_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ParameterDescription_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ParameterDescription_out &
--IR::ParameterDescription_out::operator= (ParameterDescription *p)
-+ACE_INLINE IR_ParameterDescription_out &
-+IR_ParameterDescription_out::operator= (IR_ParameterDescription *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ParameterDescription_out::operator ::IR::ParameterDescription *&() // cast
-+IR_ParameterDescription_out::operator ::IR_ParameterDescription *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ParameterDescription *&
--IR::ParameterDescription_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ParameterDescription *&
-+IR_ParameterDescription_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ParameterDescription *
--IR::ParameterDescription_out::operator-> (void)
-+ACE_INLINE ::IR_ParameterDescription *
-+IR_ParameterDescription_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CI_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CI_
--
-   // = Static operations.
--  ACE_INLINE IR::ParameterDescription *
--  IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (CORBA::ULong size)
-+  ACE_INLINE IR_ParameterDescription *
-+  _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (CORBA::ULong size)
-   // Allocate storage for the sequence.
-   {
--    IR::ParameterDescription *retval = 0;
--    ACE_NEW_RETURN (retval, IR::ParameterDescription[size], 0);
-+    IR_ParameterDescription *retval = 0;
-+    ACE_NEW_RETURN (retval, IR_ParameterDescription[size], 0);
-     return retval;
-   }
-   
--  ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (IR::ParameterDescription *buffer)
-+  ACE_INLINE void _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (IR_ParameterDescription *buffer)
-   // Free the sequence.
-   {
-     delete [] buffer;
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void) // Default constructor.
-+  _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void) // Default constructor.
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-+  _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::ParameterDescription *data,
-+    IR_ParameterDescription *data,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs)
-+  _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs)
-   // Copy constructor.
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::ParameterDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (this->maximum_);
--      IR::ParameterDescription * const tmp2 = ACE_reinterpret_cast (IR::ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
-+      IR_ParameterDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (this->maximum_);
-+      IR_ParameterDescription * const tmp2 = ACE_reinterpret_cast (IR_ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp1[i] = tmp2[i];
-@@ -15935,8 +14926,8 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq &
--  IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &
-+  _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs)
-   // Assignment operator.
-   {
-     if (this == &rhs)
-@@ -15947,7 +14938,7 @@
-       if (this->maximum_ < rhs.maximum_)
-       {
-         // free the old buffer
--        IR::ParameterDescription *tmp = ACE_reinterpret_cast (IR::ParameterDescription *, this->buffer_);
-+        IR_ParameterDescription *tmp = ACE_reinterpret_cast (IR_ParameterDescription *, this->buffer_);
-         _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (tmp);
-         this->buffer_ = _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (rhs.maximum_);
-       }
-@@ -15957,8 +14948,8 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::ParameterDescription *tmp1 = ACE_reinterpret_cast (IR::ParameterDescription *, this->buffer_);
--    IR::ParameterDescription * const tmp2 = ACE_reinterpret_cast (IR::ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
-+    IR_ParameterDescription *tmp1 = ACE_reinterpret_cast (IR_ParameterDescription *, this->buffer_);
-+    IR_ParameterDescription * const tmp2 = ACE_reinterpret_cast (IR_ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-       tmp1[i] = tmp2[i];
-@@ -15967,30 +14958,30 @@
-   }
-   
-   // = Accessors.
--  ACE_INLINE IR::ParameterDescription &
--  IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator[] (CORBA::ULong i)
-+  ACE_INLINE IR_ParameterDescription &
-+  _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator[] (CORBA::ULong i)
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::ParameterDescription* tmp = ACE_reinterpret_cast(IR::ParameterDescription*,this->buffer_);
-+    IR_ParameterDescription* tmp = ACE_reinterpret_cast(IR_ParameterDescription*,this->buffer_);
-     return tmp[i];
-   }
-   
--  ACE_INLINE const IR::ParameterDescription &
--  IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator[] (CORBA::ULong i) const
-+  ACE_INLINE const IR_ParameterDescription &
-+  _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator[] (CORBA::ULong i) const
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::ParameterDescription * const tmp = ACE_reinterpret_cast (IR::ParameterDescription* ACE_CAST_CONST, this->buffer_);
-+    IR_ParameterDescription * const tmp = ACE_reinterpret_cast (IR_ParameterDescription* ACE_CAST_CONST, this->buffer_);
-     return tmp[i];
-   }
-   
-   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-   
--  ACE_INLINE IR::ParameterDescription *
--  IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_ParameterDescription *
-+  _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::ParameterDescription *result = 0;
-+    IR_ParameterDescription *result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -16002,7 +14993,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::ParameterDescription*, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_ParameterDescription*, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -16011,7 +15002,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::ParameterDescription*,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_ParameterDescription*,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -16021,76 +15012,70 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::ParameterDescription *
--  IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::get_buffer (void) const
-+  ACE_INLINE const IR_ParameterDescription *
-+  _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::ParameterDescription * ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_ParameterDescription * ACE_CAST_CONST, this->buffer_);
-   }
-   
-   ACE_INLINE void
--  IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::replace (CORBA::ULong max,
-+  _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::replace (CORBA::ULong max,
-   CORBA::ULong length,
--  IR::ParameterDescription *data,
-+  IR_ParameterDescription *data,
-   CORBA::Boolean release)
-   {
-     this->maximum_ = max;
-     this->length_ = length;
-     if (this->buffer_ && this->release_ == 1)
-     {
--      IR::ParameterDescription *tmp = ACE_reinterpret_cast(IR::ParameterDescription*,this->buffer_);
-+      IR_ParameterDescription *tmp = ACE_reinterpret_cast(IR_ParameterDescription*,this->buffer_);
-       _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (tmp);
-     }
-     this->buffer_ = data;
-     this->release_ = release;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_PARDESCRIPTIONSEQ_CI_)
--#define _IR_PARDESCRIPTIONSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::ParDescriptionSeq_var
-+// Inline operations for class IR_ParDescriptionSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ParDescriptionSeq_var::ParDescriptionSeq_var (void) // default constructor
-+IR_ParDescriptionSeq_var::IR_ParDescriptionSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ParDescriptionSeq_var::ParDescriptionSeq_var (ParDescriptionSeq *p)
-+IR_ParDescriptionSeq_var::IR_ParDescriptionSeq_var (IR_ParDescriptionSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ParDescriptionSeq_var::ParDescriptionSeq_var (const ::IR::ParDescriptionSeq_var &p) // copy constructor
-+IR_ParDescriptionSeq_var::IR_ParDescriptionSeq_var (const ::IR_ParDescriptionSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ParDescriptionSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ParDescriptionSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ParDescriptionSeq_var::~ParDescriptionSeq_var (void) // destructor
-+IR_ParDescriptionSeq_var::~IR_ParDescriptionSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ParDescriptionSeq_var &
--IR::ParDescriptionSeq_var::operator= (ParDescriptionSeq *p)
-+ACE_INLINE IR_ParDescriptionSeq_var &
-+IR_ParDescriptionSeq_var::operator= (IR_ParDescriptionSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ParDescriptionSeq_var &
--IR::ParDescriptionSeq_var::operator= (const ::IR::ParDescriptionSeq_var &p)
-+ACE_INLINE IR_ParDescriptionSeq_var &
-+IR_ParDescriptionSeq_var::operator= (const ::IR_ParDescriptionSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -16101,12 +15086,12 @@
-         }
-       else
-         {
--          ParDescriptionSeq *deep_copy =
--            new ParDescriptionSeq (*p.ptr_);
-+          IR_ParDescriptionSeq *deep_copy = 
-+            new IR_ParDescriptionSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ParDescriptionSeq *tmp = deep_copy;
-+              IR_ParDescriptionSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -16117,103 +15102,103 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ParDescriptionSeq *
--IR::ParDescriptionSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_ParDescriptionSeq *
-+IR_ParDescriptionSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ParDescriptionSeq *
--IR::ParDescriptionSeq_var::operator-> (void)
-+ACE_INLINE ::IR_ParDescriptionSeq *
-+IR_ParDescriptionSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ParDescriptionSeq_var::operator const ::IR::ParDescriptionSeq &() const // cast
-+IR_ParDescriptionSeq_var::operator const ::IR_ParDescriptionSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ParDescriptionSeq_var::operator ::IR::ParDescriptionSeq &() // cast 
-+IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ParDescriptionSeq_var::operator ::IR::ParDescriptionSeq &() const // cast 
-+IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ParDescriptionSeq_var::operator ::IR::ParDescriptionSeq *&() // cast 
-+IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ParameterDescription &
--IR::ParDescriptionSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_ParameterDescription &
-+IR_ParDescriptionSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const IR::ParameterDescription &
--IR::ParDescriptionSeq_var::operator[] (CORBA::ULong index) const
-+ACE_INLINE const IR_ParameterDescription &
-+IR_ParDescriptionSeq_var::operator[] (CORBA::ULong index) const
- {
--  return ACE_const_cast (const IR::ParameterDescription &, this->ptr_->operator[] (index));
-+  return ACE_const_cast (const IR_ParameterDescription &, this->ptr_->operator[] (index));
- }
- 
--ACE_INLINE const ::IR::ParDescriptionSeq &
--IR::ParDescriptionSeq_var::in (void) const
-+ACE_INLINE const ::IR_ParDescriptionSeq &
-+IR_ParDescriptionSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ParDescriptionSeq &
--IR::ParDescriptionSeq_var::inout (void)
-+ACE_INLINE ::IR_ParDescriptionSeq &
-+IR_ParDescriptionSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ParDescriptionSeq *&
--IR::ParDescriptionSeq_var::out (void)
-+ACE_INLINE ::IR_ParDescriptionSeq *&
-+IR_ParDescriptionSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ParDescriptionSeq *
--IR::ParDescriptionSeq_var::_retn (void)
-+ACE_INLINE ::IR_ParDescriptionSeq *
-+IR_ParDescriptionSeq_var::_retn (void)
- {
--  ::IR::ParDescriptionSeq *tmp = this->ptr_;
-+  ::IR_ParDescriptionSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ParDescriptionSeq *
--IR::ParDescriptionSeq_var::ptr (void) const
-+ACE_INLINE ::IR_ParDescriptionSeq *
-+IR_ParDescriptionSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ParDescriptionSeq_out
-+// Inline operations for class IR_ParDescriptionSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ParDescriptionSeq_out::ParDescriptionSeq_out (ParDescriptionSeq *&p)
-+IR_ParDescriptionSeq_out::IR_ParDescriptionSeq_out (IR_ParDescriptionSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ParDescriptionSeq_out::ParDescriptionSeq_out (ParDescriptionSeq_var &p) // constructor from _var
-+IR_ParDescriptionSeq_out::IR_ParDescriptionSeq_out (IR_ParDescriptionSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -16221,94 +15206,87 @@
- }
- 
- ACE_INLINE
--IR::ParDescriptionSeq_out::ParDescriptionSeq_out (const ::IR::ParDescriptionSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ParDescriptionSeq_out&, p).ptr_)
-+IR_ParDescriptionSeq_out::IR_ParDescriptionSeq_out (const ::IR_ParDescriptionSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ParDescriptionSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::ParDescriptionSeq_out &
--IR::ParDescriptionSeq_out::operator= (const ::IR::ParDescriptionSeq_out &p)
-+ACE_INLINE ::IR_ParDescriptionSeq_out &
-+IR_ParDescriptionSeq_out::operator= (const ::IR_ParDescriptionSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (ParDescriptionSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ParDescriptionSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ParDescriptionSeq_out &
--IR::ParDescriptionSeq_out::operator= (ParDescriptionSeq *p)
-+ACE_INLINE ::IR_ParDescriptionSeq_out &
-+IR_ParDescriptionSeq_out::operator= (IR_ParDescriptionSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ParDescriptionSeq_out::operator ::IR::ParDescriptionSeq *&() // cast
-+IR_ParDescriptionSeq_out::operator ::IR_ParDescriptionSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ParDescriptionSeq *&
--IR::ParDescriptionSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ParDescriptionSeq *&
-+IR_ParDescriptionSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ParDescriptionSeq *
--IR::ParDescriptionSeq_out::operator-> (void)
-+ACE_INLINE ::IR_ParDescriptionSeq *
-+IR_ParDescriptionSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ParameterDescription &
--IR::ParDescriptionSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_ParameterDescription &
-+IR_ParDescriptionSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_CONTEXTIDSEQ_CI_)
--#define _IR_CONTEXTIDSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::ContextIdSeq_var
-+// Inline operations for class IR_ContextIdSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ContextIdSeq_var::ContextIdSeq_var (void) // default constructor
-+IR_ContextIdSeq_var::IR_ContextIdSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ContextIdSeq_var::ContextIdSeq_var (ContextIdSeq *p)
-+IR_ContextIdSeq_var::IR_ContextIdSeq_var (IR_ContextIdSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ContextIdSeq_var::ContextIdSeq_var (const ::IR::ContextIdSeq_var &p) // copy constructor
-+IR_ContextIdSeq_var::IR_ContextIdSeq_var (const ::IR_ContextIdSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ContextIdSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ContextIdSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ContextIdSeq_var::~ContextIdSeq_var (void) // destructor
-+IR_ContextIdSeq_var::~IR_ContextIdSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ContextIdSeq_var &
--IR::ContextIdSeq_var::operator= (ContextIdSeq *p)
-+ACE_INLINE IR_ContextIdSeq_var &
-+IR_ContextIdSeq_var::operator= (IR_ContextIdSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ContextIdSeq_var &
--IR::ContextIdSeq_var::operator= (const ::IR::ContextIdSeq_var &p)
-+ACE_INLINE IR_ContextIdSeq_var &
-+IR_ContextIdSeq_var::operator= (const ::IR_ContextIdSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -16319,12 +15297,12 @@
-         }
-       else
-         {
--          ContextIdSeq *deep_copy =
--            new ContextIdSeq (*p.ptr_);
-+          IR_ContextIdSeq *deep_copy = 
-+            new IR_ContextIdSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ContextIdSeq *tmp = deep_copy;
-+              IR_ContextIdSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -16335,97 +15313,97 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ContextIdSeq *
--IR::ContextIdSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_ContextIdSeq *
-+IR_ContextIdSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ContextIdSeq *
--IR::ContextIdSeq_var::operator-> (void)
-+ACE_INLINE ::IR_ContextIdSeq *
-+IR_ContextIdSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ContextIdSeq_var::operator const ::IR::ContextIdSeq &() const // cast
-+IR_ContextIdSeq_var::operator const ::IR_ContextIdSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ContextIdSeq_var::operator ::IR::ContextIdSeq &() // cast 
-+IR_ContextIdSeq_var::operator ::IR_ContextIdSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ContextIdSeq_var::operator ::IR::ContextIdSeq &() const // cast 
-+IR_ContextIdSeq_var::operator ::IR_ContextIdSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ContextIdSeq_var::operator ::IR::ContextIdSeq *&() // cast 
-+IR_ContextIdSeq_var::operator ::IR_ContextIdSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE TAO_SeqElem_String_Manager
--IR::ContextIdSeq_var::operator[] (CORBA::ULong index)
-+IR_ContextIdSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::IR::ContextIdSeq &
--IR::ContextIdSeq_var::in (void) const
-+ACE_INLINE const ::IR_ContextIdSeq &
-+IR_ContextIdSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ContextIdSeq &
--IR::ContextIdSeq_var::inout (void)
-+ACE_INLINE ::IR_ContextIdSeq &
-+IR_ContextIdSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ContextIdSeq *&
--IR::ContextIdSeq_var::out (void)
-+ACE_INLINE ::IR_ContextIdSeq *&
-+IR_ContextIdSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ContextIdSeq *
--IR::ContextIdSeq_var::_retn (void)
-+ACE_INLINE ::IR_ContextIdSeq *
-+IR_ContextIdSeq_var::_retn (void)
- {
--  ::IR::ContextIdSeq *tmp = this->ptr_;
-+  ::IR_ContextIdSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ContextIdSeq *
--IR::ContextIdSeq_var::ptr (void) const
-+ACE_INLINE ::IR_ContextIdSeq *
-+IR_ContextIdSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ContextIdSeq_out
-+// Inline operations for class IR_ContextIdSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ContextIdSeq_out::ContextIdSeq_out (ContextIdSeq *&p)
-+IR_ContextIdSeq_out::IR_ContextIdSeq_out (IR_ContextIdSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ContextIdSeq_out::ContextIdSeq_out (ContextIdSeq_var &p) // constructor from _var
-+IR_ContextIdSeq_out::IR_ContextIdSeq_out (IR_ContextIdSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -16433,57 +15411,50 @@
- }
- 
- ACE_INLINE
--IR::ContextIdSeq_out::ContextIdSeq_out (const ::IR::ContextIdSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ContextIdSeq_out&, p).ptr_)
-+IR_ContextIdSeq_out::IR_ContextIdSeq_out (const ::IR_ContextIdSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ContextIdSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::ContextIdSeq_out &
--IR::ContextIdSeq_out::operator= (const ::IR::ContextIdSeq_out &p)
-+ACE_INLINE ::IR_ContextIdSeq_out &
-+IR_ContextIdSeq_out::operator= (const ::IR_ContextIdSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (ContextIdSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ContextIdSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ContextIdSeq_out &
--IR::ContextIdSeq_out::operator= (ContextIdSeq *p)
-+ACE_INLINE ::IR_ContextIdSeq_out &
-+IR_ContextIdSeq_out::operator= (IR_ContextIdSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ContextIdSeq_out::operator ::IR::ContextIdSeq *&() // cast
-+IR_ContextIdSeq_out::operator ::IR_ContextIdSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ContextIdSeq *&
--IR::ContextIdSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ContextIdSeq *&
-+IR_ContextIdSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ContextIdSeq *
--IR::ContextIdSeq_out::operator-> (void)
-+ACE_INLINE ::IR_ContextIdSeq *
-+IR_ContextIdSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE TAO_SeqElem_String_Manager
--IR::ContextIdSeq_out::operator[] (CORBA::ULong index)
-+IR_ContextIdSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_OPERATIONDEF___CI_)
--#define _IR_OPERATIONDEF___CI_
--
- ACE_INLINE
--IR::OperationDef::OperationDef (
-+IR_OperationDef::IR_OperationDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -16493,217 +15464,201 @@
-   this->IR_OperationDef_setup_collocation (_tao_collocated);
- }
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_OPERATIONDEF___VAR_CI_)
--#define _IR_OPERATIONDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::OperationDef_var
-+// Inline operations for class IR_OperationDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::OperationDef_var::OperationDef_var (void) // default constructor
--  : ptr_ (OperationDef::_nil ())
-+IR_OperationDef_var::IR_OperationDef_var (void) // default constructor
-+  : ptr_ (IR_OperationDef::_nil ())
- {}
- 
--ACE_INLINE ::IR::OperationDef_ptr
--IR::OperationDef_var::ptr (void) const
-+ACE_INLINE ::IR_OperationDef_ptr
-+IR_OperationDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::OperationDef_var::OperationDef_var (const ::IR::OperationDef_var &p) // copy constructor
-+IR_OperationDef_var::IR_OperationDef_var (const ::IR_OperationDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (OperationDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_OperationDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::OperationDef_var::~OperationDef_var (void) // destructor
-+IR_OperationDef_var::~IR_OperationDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::OperationDef_var &
--IR::OperationDef_var::operator= (OperationDef_ptr p)
-+ACE_INLINE IR_OperationDef_var &
-+IR_OperationDef_var::operator= (IR_OperationDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::OperationDef_var &
--IR::OperationDef_var::operator= (const ::IR::OperationDef_var &p)
-+ACE_INLINE IR_OperationDef_var &
-+IR_OperationDef_var::operator= (const ::IR_OperationDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = ::IR::OperationDef::_duplicate (p.ptr ());
-+    this->ptr_ = ::IR_OperationDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::OperationDef_var::operator const ::IR::OperationDef_ptr &() const // cast
-+IR_OperationDef_var::operator const ::IR_OperationDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::OperationDef_var::operator ::IR::OperationDef_ptr &() // cast 
-+IR_OperationDef_var::operator ::IR_OperationDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::OperationDef_ptr
--IR::OperationDef_var::operator-> (void) const
-+ACE_INLINE ::IR_OperationDef_ptr
-+IR_OperationDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::OperationDef_ptr
--IR::OperationDef_var::in (void) const
-+ACE_INLINE ::IR_OperationDef_ptr
-+IR_OperationDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::OperationDef_ptr &
--IR::OperationDef_var::inout (void)
-+ACE_INLINE ::IR_OperationDef_ptr &
-+IR_OperationDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::OperationDef_ptr &
--IR::OperationDef_var::out (void)
-+ACE_INLINE ::IR_OperationDef_ptr &
-+IR_OperationDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = ::IR::OperationDef::_nil ();
-+  this->ptr_ = ::IR_OperationDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::OperationDef_ptr
--IR::OperationDef_var::_retn (void)
-+ACE_INLINE ::IR_OperationDef_ptr
-+IR_OperationDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  ::IR::OperationDef_ptr val = this->ptr_;
--  this->ptr_ = ::IR::OperationDef::_nil ();
-+  ::IR_OperationDef_ptr val = this->ptr_;
-+  this->ptr_ = ::IR_OperationDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_OPERATIONDEF___OUT_CI_)
--#define _IR_OPERATIONDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::OperationDef_out
-+// Inline operations for class IR_OperationDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::OperationDef_out::OperationDef_out (OperationDef_ptr &p)
-+IR_OperationDef_out::IR_OperationDef_out (IR_OperationDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = ::IR::OperationDef::_nil ();
-+  this->ptr_ = ::IR_OperationDef::_nil ();
- }
- 
- ACE_INLINE
--IR::OperationDef_out::OperationDef_out (OperationDef_var &p) // constructor from _var
-+IR_OperationDef_out::IR_OperationDef_out (IR_OperationDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = ::IR::OperationDef::_nil ();
-+  this->ptr_ = ::IR_OperationDef::_nil ();
- }
- 
- ACE_INLINE
--IR::OperationDef_out::OperationDef_out (const ::IR::OperationDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (OperationDef_out &, p).ptr_)
-+IR_OperationDef_out::IR_OperationDef_out (const ::IR_OperationDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_OperationDef_out &, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::OperationDef_out &
--IR::OperationDef_out::operator= (const ::IR::OperationDef_out &p)
-+ACE_INLINE ::IR_OperationDef_out &
-+IR_OperationDef_out::operator= (const ::IR_OperationDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (OperationDef_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_OperationDef_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::OperationDef_out &
--IR::OperationDef_out::operator= (const ::IR::OperationDef_var &p)
-+ACE_INLINE IR_OperationDef_out &
-+IR_OperationDef_out::operator= (const ::IR_OperationDef_var &p)
- {
--  this->ptr_ = ::IR::OperationDef::_duplicate (p.ptr ());
-+  this->ptr_ = ::IR_OperationDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::OperationDef_out &
--IR::OperationDef_out::operator= (OperationDef_ptr p)
-+ACE_INLINE IR_OperationDef_out &
-+IR_OperationDef_out::operator= (IR_OperationDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::OperationDef_out::operator ::IR::OperationDef_ptr &() // cast
-+IR_OperationDef_out::operator ::IR_OperationDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::OperationDef_ptr &
--IR::OperationDef_out::ptr (void) // ptr
-+ACE_INLINE ::IR_OperationDef_ptr &
-+IR_OperationDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::OperationDef_ptr
--IR::OperationDef_out::operator-> (void)
-+ACE_INLINE ::IR_OperationDef_ptr
-+IR_OperationDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
- // *************************************************************
--// Inline operations for class IR::OperationDescription_var
-+// Inline operations for class IR_OperationDescription_var
- // *************************************************************
- 
- ACE_INLINE
--IR::OperationDescription_var::OperationDescription_var (void) // default constructor
-+IR_OperationDescription_var::IR_OperationDescription_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::OperationDescription_var::OperationDescription_var (OperationDescription *p)
-+IR_OperationDescription_var::IR_OperationDescription_var (IR_OperationDescription *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::OperationDescription_var::OperationDescription_var (const ::IR::OperationDescription_var &p) // copy constructor
-+IR_OperationDescription_var::IR_OperationDescription_var (const ::IR_OperationDescription_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::OperationDescription (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_OperationDescription (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::OperationDescription_var::~OperationDescription_var (void) // destructor
-+IR_OperationDescription_var::~IR_OperationDescription_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::OperationDescription_var &
--IR::OperationDescription_var::operator= (OperationDescription *p)
-+ACE_INLINE IR_OperationDescription_var &
-+IR_OperationDescription_var::operator= (IR_OperationDescription *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::OperationDescription_var &
--IR::OperationDescription_var::operator= (const ::IR::OperationDescription_var &p)
-+ACE_INLINE ::IR_OperationDescription_var &
-+IR_OperationDescription_var::operator= (const ::IR_OperationDescription_var &p)
- {
-   if (this != &p)
-     {
-@@ -16714,12 +15669,12 @@
-         }
-       else
-         {
--          OperationDescription *deep_copy =
--            new OperationDescription (*p.ptr_);
-+          IR_OperationDescription *deep_copy = 
-+            new IR_OperationDescription (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              OperationDescription *tmp = deep_copy;
-+              IR_OperationDescription *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -16730,91 +15685,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::OperationDescription *
--IR::OperationDescription_var::operator-> (void) const
-+ACE_INLINE const ::IR_OperationDescription *
-+IR_OperationDescription_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::OperationDescription *
--IR::OperationDescription_var::operator-> (void)
-+ACE_INLINE ::IR_OperationDescription *
-+IR_OperationDescription_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::OperationDescription_var::operator const ::IR::OperationDescription &() const // cast
-+IR_OperationDescription_var::operator const ::IR_OperationDescription &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::OperationDescription_var::operator ::IR::OperationDescription &() // cast 
-+IR_OperationDescription_var::operator ::IR_OperationDescription &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::OperationDescription_var::operator ::IR::OperationDescription &() const // cast 
-+IR_OperationDescription_var::operator ::IR_OperationDescription &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::OperationDescription_var::operator ::IR::OperationDescription *&() // cast 
-+IR_OperationDescription_var::operator ::IR_OperationDescription *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::OperationDescription &
--IR::OperationDescription_var::in (void) const
-+ACE_INLINE const ::IR_OperationDescription &
-+IR_OperationDescription_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::OperationDescription &
--IR::OperationDescription_var::inout (void)
-+ACE_INLINE ::IR_OperationDescription &
-+IR_OperationDescription_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::OperationDescription *&
--IR::OperationDescription_var::out (void)
-+ACE_INLINE ::IR_OperationDescription *&
-+IR_OperationDescription_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::OperationDescription *
--IR::OperationDescription_var::_retn (void)
-+ACE_INLINE ::IR_OperationDescription *
-+IR_OperationDescription_var::_retn (void)
- {
--  ::IR::OperationDescription *tmp = this->ptr_;
-+  ::IR_OperationDescription *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::OperationDescription *
--IR::OperationDescription_var::ptr (void) const
-+ACE_INLINE ::IR_OperationDescription *
-+IR_OperationDescription_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::OperationDescription_out
-+// Inline operations for class IR_OperationDescription_out
- // *************************************************************
- 
- ACE_INLINE
--IR::OperationDescription_out::OperationDescription_out (::IR::OperationDescription *&p)
-+IR_OperationDescription_out::IR_OperationDescription_out (::IR_OperationDescription *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::OperationDescription_out::OperationDescription_out (OperationDescription_var &p) // constructor from _var
-+IR_OperationDescription_out::IR_OperationDescription_out (IR_OperationDescription_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -16822,85 +15777,81 @@
- }
- 
- ACE_INLINE
--IR::OperationDescription_out::OperationDescription_out (const ::IR::OperationDescription_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (OperationDescription_out&, p).ptr_)
-+IR_OperationDescription_out::IR_OperationDescription_out (const ::IR_OperationDescription_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_OperationDescription_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::OperationDescription_out &
--IR::OperationDescription_out::operator= (const ::IR::OperationDescription_out &p)
-+ACE_INLINE IR_OperationDescription_out &
-+IR_OperationDescription_out::operator= (const ::IR_OperationDescription_out &p)
- {
--  this->ptr_ = ACE_const_cast (OperationDescription_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_OperationDescription_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::OperationDescription_out &
--IR::OperationDescription_out::operator= (OperationDescription *p)
-+ACE_INLINE IR_OperationDescription_out &
-+IR_OperationDescription_out::operator= (IR_OperationDescription *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::OperationDescription_out::operator ::IR::OperationDescription *&() // cast
-+IR_OperationDescription_out::operator ::IR_OperationDescription *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::OperationDescription *&
--IR::OperationDescription_out::ptr (void) // ptr
-+ACE_INLINE ::IR_OperationDescription *&
-+IR_OperationDescription_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::OperationDescription *
--IR::OperationDescription_out::operator-> (void)
-+ACE_INLINE ::IR_OperationDescription *
-+IR_OperationDescription_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#if !defined (_IR_REPOSITORYIDSEQ_CI_)
--#define _IR_REPOSITORYIDSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::RepositoryIdSeq_var
-+// Inline operations for class IR_RepositoryIdSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::RepositoryIdSeq_var::RepositoryIdSeq_var (void) // default constructor
-+IR_RepositoryIdSeq_var::IR_RepositoryIdSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::RepositoryIdSeq_var::RepositoryIdSeq_var (RepositoryIdSeq *p)
-+IR_RepositoryIdSeq_var::IR_RepositoryIdSeq_var (IR_RepositoryIdSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::RepositoryIdSeq_var::RepositoryIdSeq_var (const ::IR::RepositoryIdSeq_var &p) // copy constructor
-+IR_RepositoryIdSeq_var::IR_RepositoryIdSeq_var (const ::IR_RepositoryIdSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::RepositoryIdSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_RepositoryIdSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::RepositoryIdSeq_var::~RepositoryIdSeq_var (void) // destructor
-+IR_RepositoryIdSeq_var::~IR_RepositoryIdSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::RepositoryIdSeq_var &
--IR::RepositoryIdSeq_var::operator= (RepositoryIdSeq *p)
-+ACE_INLINE IR_RepositoryIdSeq_var &
-+IR_RepositoryIdSeq_var::operator= (IR_RepositoryIdSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::RepositoryIdSeq_var &
--IR::RepositoryIdSeq_var::operator= (const ::IR::RepositoryIdSeq_var &p)
-+ACE_INLINE IR_RepositoryIdSeq_var &
-+IR_RepositoryIdSeq_var::operator= (const ::IR_RepositoryIdSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -16911,12 +15862,12 @@
-         }
-       else
-         {
--          RepositoryIdSeq *deep_copy =
--            new RepositoryIdSeq (*p.ptr_);
-+          IR_RepositoryIdSeq *deep_copy = 
-+            new IR_RepositoryIdSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              RepositoryIdSeq *tmp = deep_copy;
-+              IR_RepositoryIdSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -16927,97 +15878,97 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::RepositoryIdSeq *
--IR::RepositoryIdSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_RepositoryIdSeq *
-+IR_RepositoryIdSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::RepositoryIdSeq *
--IR::RepositoryIdSeq_var::operator-> (void)
-+ACE_INLINE ::IR_RepositoryIdSeq *
-+IR_RepositoryIdSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::RepositoryIdSeq_var::operator const ::IR::RepositoryIdSeq &() const // cast
-+IR_RepositoryIdSeq_var::operator const ::IR_RepositoryIdSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::RepositoryIdSeq_var::operator ::IR::RepositoryIdSeq &() // cast 
-+IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::RepositoryIdSeq_var::operator ::IR::RepositoryIdSeq &() const // cast 
-+IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::RepositoryIdSeq_var::operator ::IR::RepositoryIdSeq *&() // cast 
-+IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE TAO_SeqElem_String_Manager
--IR::RepositoryIdSeq_var::operator[] (CORBA::ULong index)
-+IR_RepositoryIdSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const ::IR::RepositoryIdSeq &
--IR::RepositoryIdSeq_var::in (void) const
-+ACE_INLINE const ::IR_RepositoryIdSeq &
-+IR_RepositoryIdSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::RepositoryIdSeq &
--IR::RepositoryIdSeq_var::inout (void)
-+ACE_INLINE ::IR_RepositoryIdSeq &
-+IR_RepositoryIdSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::RepositoryIdSeq *&
--IR::RepositoryIdSeq_var::out (void)
-+ACE_INLINE ::IR_RepositoryIdSeq *&
-+IR_RepositoryIdSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::RepositoryIdSeq *
--IR::RepositoryIdSeq_var::_retn (void)
-+ACE_INLINE ::IR_RepositoryIdSeq *
-+IR_RepositoryIdSeq_var::_retn (void)
- {
--  ::IR::RepositoryIdSeq *tmp = this->ptr_;
-+  ::IR_RepositoryIdSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::RepositoryIdSeq *
--IR::RepositoryIdSeq_var::ptr (void) const
-+ACE_INLINE ::IR_RepositoryIdSeq *
-+IR_RepositoryIdSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::RepositoryIdSeq_out
-+// Inline operations for class IR_RepositoryIdSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::RepositoryIdSeq_out::RepositoryIdSeq_out (RepositoryIdSeq *&p)
-+IR_RepositoryIdSeq_out::IR_RepositoryIdSeq_out (IR_RepositoryIdSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::RepositoryIdSeq_out::RepositoryIdSeq_out (RepositoryIdSeq_var &p) // constructor from _var
-+IR_RepositoryIdSeq_out::IR_RepositoryIdSeq_out (IR_RepositoryIdSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -17025,102 +15976,95 @@
- }
- 
- ACE_INLINE
--IR::RepositoryIdSeq_out::RepositoryIdSeq_out (const ::IR::RepositoryIdSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (RepositoryIdSeq_out&, p).ptr_)
-+IR_RepositoryIdSeq_out::IR_RepositoryIdSeq_out (const ::IR_RepositoryIdSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_RepositoryIdSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::RepositoryIdSeq_out &
--IR::RepositoryIdSeq_out::operator= (const ::IR::RepositoryIdSeq_out &p)
-+ACE_INLINE ::IR_RepositoryIdSeq_out &
-+IR_RepositoryIdSeq_out::operator= (const ::IR_RepositoryIdSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (RepositoryIdSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_RepositoryIdSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::RepositoryIdSeq_out &
--IR::RepositoryIdSeq_out::operator= (RepositoryIdSeq *p)
-+ACE_INLINE ::IR_RepositoryIdSeq_out &
-+IR_RepositoryIdSeq_out::operator= (IR_RepositoryIdSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::RepositoryIdSeq_out::operator ::IR::RepositoryIdSeq *&() // cast
-+IR_RepositoryIdSeq_out::operator ::IR_RepositoryIdSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::RepositoryIdSeq *&
--IR::RepositoryIdSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_RepositoryIdSeq *&
-+IR_RepositoryIdSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::RepositoryIdSeq *
--IR::RepositoryIdSeq_out::operator-> (void)
-+ACE_INLINE ::IR_RepositoryIdSeq *
-+IR_RepositoryIdSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE TAO_SeqElem_String_Manager
--IR::RepositoryIdSeq_out::operator[] (CORBA::ULong index)
-+IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CI_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CI_
--
-   // = Static operations.
--  ACE_INLINE IR::OperationDescription *
--  IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (CORBA::ULong size)
-+  ACE_INLINE IR_OperationDescription *
-+  _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (CORBA::ULong size)
-   // Allocate storage for the sequence.
-   {
--    IR::OperationDescription *retval = 0;
--    ACE_NEW_RETURN (retval, IR::OperationDescription[size], 0);
-+    IR_OperationDescription *retval = 0;
-+    ACE_NEW_RETURN (retval, IR_OperationDescription[size], 0);
-     return retval;
-   }
-   
--  ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (IR::OperationDescription *buffer)
-+  ACE_INLINE void _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (IR_OperationDescription *buffer)
-   // Free the sequence.
-   {
-     delete [] buffer;
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void) // Default constructor.
-+  _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void) // Default constructor.
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-+  _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::OperationDescription *data,
-+    IR_OperationDescription *data,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs)
-+  _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs)
-   // Copy constructor.
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::OperationDescription *tmp1 = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (this->maximum_);
--      IR::OperationDescription * const tmp2 = ACE_reinterpret_cast (IR::OperationDescription * ACE_CAST_CONST, rhs.buffer_);
-+      IR_OperationDescription *tmp1 = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (this->maximum_);
-+      IR_OperationDescription * const tmp2 = ACE_reinterpret_cast (IR_OperationDescription * ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp1[i] = tmp2[i];
-@@ -17133,8 +16077,8 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq &
--  IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &
-+  _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs)
-   // Assignment operator.
-   {
-     if (this == &rhs)
-@@ -17145,7 +16089,7 @@
-       if (this->maximum_ < rhs.maximum_)
-       {
-         // free the old buffer
--        IR::OperationDescription *tmp = ACE_reinterpret_cast (IR::OperationDescription *, this->buffer_);
-+        IR_OperationDescription *tmp = ACE_reinterpret_cast (IR_OperationDescription *, this->buffer_);
-         _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (tmp);
-         this->buffer_ = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (rhs.maximum_);
-       }
-@@ -17155,8 +16099,8 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::OperationDescription *tmp1 = ACE_reinterpret_cast (IR::OperationDescription *, this->buffer_);
--    IR::OperationDescription * const tmp2 = ACE_reinterpret_cast (IR::OperationDescription * ACE_CAST_CONST, rhs.buffer_);
-+    IR_OperationDescription *tmp1 = ACE_reinterpret_cast (IR_OperationDescription *, this->buffer_);
-+    IR_OperationDescription * const tmp2 = ACE_reinterpret_cast (IR_OperationDescription * ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-       tmp1[i] = tmp2[i];
-@@ -17165,30 +16109,30 @@
-   }
-   
-   // = Accessors.
--  ACE_INLINE IR::OperationDescription &
--  IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator[] (CORBA::ULong i)
-+  ACE_INLINE IR_OperationDescription &
-+  _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator[] (CORBA::ULong i)
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::OperationDescription* tmp = ACE_reinterpret_cast(IR::OperationDescription*,this->buffer_);
-+    IR_OperationDescription* tmp = ACE_reinterpret_cast(IR_OperationDescription*,this->buffer_);
-     return tmp[i];
-   }
-   
--  ACE_INLINE const IR::OperationDescription &
--  IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator[] (CORBA::ULong i) const
-+  ACE_INLINE const IR_OperationDescription &
-+  _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator[] (CORBA::ULong i) const
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::OperationDescription * const tmp = ACE_reinterpret_cast (IR::OperationDescription* ACE_CAST_CONST, this->buffer_);
-+    IR_OperationDescription * const tmp = ACE_reinterpret_cast (IR_OperationDescription* ACE_CAST_CONST, this->buffer_);
-     return tmp[i];
-   }
-   
-   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-   
--  ACE_INLINE IR::OperationDescription *
--  IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_OperationDescription *
-+  _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::OperationDescription *result = 0;
-+    IR_OperationDescription *result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -17200,7 +16144,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::OperationDescription*, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_OperationDescription*, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -17209,7 +16153,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::OperationDescription*,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_OperationDescription*,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -17219,76 +16163,70 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::OperationDescription *
--  IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::get_buffer (void) const
-+  ACE_INLINE const IR_OperationDescription *
-+  _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::OperationDescription * ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_OperationDescription * ACE_CAST_CONST, this->buffer_);
-   }
-   
-   ACE_INLINE void
--  IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::replace (CORBA::ULong max,
-+  _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::replace (CORBA::ULong max,
-   CORBA::ULong length,
--  IR::OperationDescription *data,
-+  IR_OperationDescription *data,
-   CORBA::Boolean release)
-   {
-     this->maximum_ = max;
-     this->length_ = length;
-     if (this->buffer_ && this->release_ == 1)
-     {
--      IR::OperationDescription *tmp = ACE_reinterpret_cast(IR::OperationDescription*,this->buffer_);
-+      IR_OperationDescription *tmp = ACE_reinterpret_cast(IR_OperationDescription*,this->buffer_);
-       _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (tmp);
-     }
-     this->buffer_ = data;
-     this->release_ = release;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_OPDESCRIPTIONSEQ_CI_)
--#define _IR_OPDESCRIPTIONSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::OpDescriptionSeq_var
-+// Inline operations for class IR_OpDescriptionSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::OpDescriptionSeq_var::OpDescriptionSeq_var (void) // default constructor
-+IR_OpDescriptionSeq_var::IR_OpDescriptionSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::OpDescriptionSeq_var::OpDescriptionSeq_var (OpDescriptionSeq *p)
-+IR_OpDescriptionSeq_var::IR_OpDescriptionSeq_var (IR_OpDescriptionSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::OpDescriptionSeq_var::OpDescriptionSeq_var (const ::IR::OpDescriptionSeq_var &p) // copy constructor
-+IR_OpDescriptionSeq_var::IR_OpDescriptionSeq_var (const ::IR_OpDescriptionSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::OpDescriptionSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_OpDescriptionSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::OpDescriptionSeq_var::~OpDescriptionSeq_var (void) // destructor
-+IR_OpDescriptionSeq_var::~IR_OpDescriptionSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::OpDescriptionSeq_var &
--IR::OpDescriptionSeq_var::operator= (OpDescriptionSeq *p)
-+ACE_INLINE IR_OpDescriptionSeq_var &
-+IR_OpDescriptionSeq_var::operator= (IR_OpDescriptionSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::OpDescriptionSeq_var &
--IR::OpDescriptionSeq_var::operator= (const ::IR::OpDescriptionSeq_var &p)
-+ACE_INLINE IR_OpDescriptionSeq_var &
-+IR_OpDescriptionSeq_var::operator= (const ::IR_OpDescriptionSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -17299,12 +16237,12 @@
-         }
-       else
-         {
--          OpDescriptionSeq *deep_copy =
--            new OpDescriptionSeq (*p.ptr_);
-+          IR_OpDescriptionSeq *deep_copy = 
-+            new IR_OpDescriptionSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              OpDescriptionSeq *tmp = deep_copy;
-+              IR_OpDescriptionSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -17315,103 +16253,103 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::OpDescriptionSeq *
--IR::OpDescriptionSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_OpDescriptionSeq *
-+IR_OpDescriptionSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::OpDescriptionSeq *
--IR::OpDescriptionSeq_var::operator-> (void)
-+ACE_INLINE ::IR_OpDescriptionSeq *
-+IR_OpDescriptionSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::OpDescriptionSeq_var::operator const ::IR::OpDescriptionSeq &() const // cast
-+IR_OpDescriptionSeq_var::operator const ::IR_OpDescriptionSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::OpDescriptionSeq_var::operator ::IR::OpDescriptionSeq &() // cast 
-+IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::OpDescriptionSeq_var::operator ::IR::OpDescriptionSeq &() const // cast 
-+IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::OpDescriptionSeq_var::operator ::IR::OpDescriptionSeq *&() // cast 
-+IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::OperationDescription &
--IR::OpDescriptionSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_OperationDescription &
-+IR_OpDescriptionSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const IR::OperationDescription &
--IR::OpDescriptionSeq_var::operator[] (CORBA::ULong index) const
-+ACE_INLINE const IR_OperationDescription &
-+IR_OpDescriptionSeq_var::operator[] (CORBA::ULong index) const
- {
--  return ACE_const_cast (const IR::OperationDescription &, this->ptr_->operator[] (index));
-+  return ACE_const_cast (const IR_OperationDescription &, this->ptr_->operator[] (index));
- }
- 
--ACE_INLINE const ::IR::OpDescriptionSeq &
--IR::OpDescriptionSeq_var::in (void) const
-+ACE_INLINE const ::IR_OpDescriptionSeq &
-+IR_OpDescriptionSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::OpDescriptionSeq &
--IR::OpDescriptionSeq_var::inout (void)
-+ACE_INLINE ::IR_OpDescriptionSeq &
-+IR_OpDescriptionSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::OpDescriptionSeq *&
--IR::OpDescriptionSeq_var::out (void)
-+ACE_INLINE ::IR_OpDescriptionSeq *&
-+IR_OpDescriptionSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::OpDescriptionSeq *
--IR::OpDescriptionSeq_var::_retn (void)
-+ACE_INLINE ::IR_OpDescriptionSeq *
-+IR_OpDescriptionSeq_var::_retn (void)
- {
--  ::IR::OpDescriptionSeq *tmp = this->ptr_;
-+  ::IR_OpDescriptionSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::OpDescriptionSeq *
--IR::OpDescriptionSeq_var::ptr (void) const
-+ACE_INLINE ::IR_OpDescriptionSeq *
-+IR_OpDescriptionSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::OpDescriptionSeq_out
-+// Inline operations for class IR_OpDescriptionSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::OpDescriptionSeq_out::OpDescriptionSeq_out (OpDescriptionSeq *&p)
-+IR_OpDescriptionSeq_out::IR_OpDescriptionSeq_out (IR_OpDescriptionSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::OpDescriptionSeq_out::OpDescriptionSeq_out (OpDescriptionSeq_var &p) // constructor from _var
-+IR_OpDescriptionSeq_out::IR_OpDescriptionSeq_out (IR_OpDescriptionSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -17419,102 +16357,95 @@
- }
- 
- ACE_INLINE
--IR::OpDescriptionSeq_out::OpDescriptionSeq_out (const ::IR::OpDescriptionSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (OpDescriptionSeq_out&, p).ptr_)
-+IR_OpDescriptionSeq_out::IR_OpDescriptionSeq_out (const ::IR_OpDescriptionSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_OpDescriptionSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::OpDescriptionSeq_out &
--IR::OpDescriptionSeq_out::operator= (const ::IR::OpDescriptionSeq_out &p)
-+ACE_INLINE ::IR_OpDescriptionSeq_out &
-+IR_OpDescriptionSeq_out::operator= (const ::IR_OpDescriptionSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (OpDescriptionSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_OpDescriptionSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::OpDescriptionSeq_out &
--IR::OpDescriptionSeq_out::operator= (OpDescriptionSeq *p)
-+ACE_INLINE ::IR_OpDescriptionSeq_out &
-+IR_OpDescriptionSeq_out::operator= (IR_OpDescriptionSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::OpDescriptionSeq_out::operator ::IR::OpDescriptionSeq *&() // cast
-+IR_OpDescriptionSeq_out::operator ::IR_OpDescriptionSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::OpDescriptionSeq *&
--IR::OpDescriptionSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_OpDescriptionSeq *&
-+IR_OpDescriptionSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::OpDescriptionSeq *
--IR::OpDescriptionSeq_out::operator-> (void)
-+ACE_INLINE ::IR_OpDescriptionSeq *
-+IR_OpDescriptionSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::OperationDescription &
--IR::OpDescriptionSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_OperationDescription &
-+IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CI_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CI_
--
-   // = Static operations.
--  ACE_INLINE IR::AttributeDescription *
--  IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (CORBA::ULong size)
-+  ACE_INLINE IR_AttributeDescription *
-+  _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (CORBA::ULong size)
-   // Allocate storage for the sequence.
-   {
--    IR::AttributeDescription *retval = 0;
--    ACE_NEW_RETURN (retval, IR::AttributeDescription[size], 0);
-+    IR_AttributeDescription *retval = 0;
-+    ACE_NEW_RETURN (retval, IR_AttributeDescription[size], 0);
-     return retval;
-   }
-   
--  ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (IR::AttributeDescription *buffer)
-+  ACE_INLINE void _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (IR_AttributeDescription *buffer)
-   // Free the sequence.
-   {
-     delete [] buffer;
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (void) // Default constructor.
-+  _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (void) // Default constructor.
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-+  _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::AttributeDescription *data,
-+    IR_AttributeDescription *data,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs)
-+  _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs)
-   // Copy constructor.
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::AttributeDescription *tmp1 = _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (this->maximum_);
--      IR::AttributeDescription * const tmp2 = ACE_reinterpret_cast (IR::AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
-+      IR_AttributeDescription *tmp1 = _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (this->maximum_);
-+      IR_AttributeDescription * const tmp2 = ACE_reinterpret_cast (IR_AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp1[i] = tmp2[i];
-@@ -17527,8 +16458,8 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &
--  IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &
-+  _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs)
-   // Assignment operator.
-   {
-     if (this == &rhs)
-@@ -17539,7 +16470,7 @@
-       if (this->maximum_ < rhs.maximum_)
-       {
-         // free the old buffer
--        IR::AttributeDescription *tmp = ACE_reinterpret_cast (IR::AttributeDescription *, this->buffer_);
-+        IR_AttributeDescription *tmp = ACE_reinterpret_cast (IR_AttributeDescription *, this->buffer_);
-         _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (tmp);
-         this->buffer_ = _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (rhs.maximum_);
-       }
-@@ -17549,8 +16480,8 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::AttributeDescription *tmp1 = ACE_reinterpret_cast (IR::AttributeDescription *, this->buffer_);
--    IR::AttributeDescription * const tmp2 = ACE_reinterpret_cast (IR::AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
-+    IR_AttributeDescription *tmp1 = ACE_reinterpret_cast (IR_AttributeDescription *, this->buffer_);
-+    IR_AttributeDescription * const tmp2 = ACE_reinterpret_cast (IR_AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-       tmp1[i] = tmp2[i];
-@@ -17559,30 +16490,30 @@
-   }
-   
-   // = Accessors.
--  ACE_INLINE IR::AttributeDescription &
--  IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator[] (CORBA::ULong i)
-+  ACE_INLINE IR_AttributeDescription &
-+  _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator[] (CORBA::ULong i)
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::AttributeDescription* tmp = ACE_reinterpret_cast(IR::AttributeDescription*,this->buffer_);
-+    IR_AttributeDescription* tmp = ACE_reinterpret_cast(IR_AttributeDescription*,this->buffer_);
-     return tmp[i];
-   }
-   
--  ACE_INLINE const IR::AttributeDescription &
--  IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator[] (CORBA::ULong i) const
-+  ACE_INLINE const IR_AttributeDescription &
-+  _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator[] (CORBA::ULong i) const
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::AttributeDescription * const tmp = ACE_reinterpret_cast (IR::AttributeDescription* ACE_CAST_CONST, this->buffer_);
-+    IR_AttributeDescription * const tmp = ACE_reinterpret_cast (IR_AttributeDescription* ACE_CAST_CONST, this->buffer_);
-     return tmp[i];
-   }
-   
-   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-   
--  ACE_INLINE IR::AttributeDescription *
--  IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_AttributeDescription *
-+  _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::AttributeDescription *result = 0;
-+    IR_AttributeDescription *result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -17594,7 +16525,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::AttributeDescription*, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_AttributeDescription*, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -17603,7 +16534,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::AttributeDescription*,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_AttributeDescription*,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -17613,76 +16544,70 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::AttributeDescription *
--  IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::get_buffer (void) const
-+  ACE_INLINE const IR_AttributeDescription *
-+  _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::AttributeDescription * ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_AttributeDescription * ACE_CAST_CONST, this->buffer_);
-   }
-   
-   ACE_INLINE void
--  IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::replace (CORBA::ULong max,
-+  _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::replace (CORBA::ULong max,
-   CORBA::ULong length,
--  IR::AttributeDescription *data,
-+  IR_AttributeDescription *data,
-   CORBA::Boolean release)
-   {
-     this->maximum_ = max;
-     this->length_ = length;
-     if (this->buffer_ && this->release_ == 1)
-     {
--      IR::AttributeDescription *tmp = ACE_reinterpret_cast(IR::AttributeDescription*,this->buffer_);
-+      IR_AttributeDescription *tmp = ACE_reinterpret_cast(IR_AttributeDescription*,this->buffer_);
-       _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (tmp);
-     }
-     this->buffer_ = data;
-     this->release_ = release;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_ATTRDESCRIPTIONSEQ_CI_)
--#define _IR_ATTRDESCRIPTIONSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::AttrDescriptionSeq_var
-+// Inline operations for class IR_AttrDescriptionSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::AttrDescriptionSeq_var::AttrDescriptionSeq_var (void) // default constructor
-+IR_AttrDescriptionSeq_var::IR_AttrDescriptionSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::AttrDescriptionSeq_var::AttrDescriptionSeq_var (AttrDescriptionSeq *p)
-+IR_AttrDescriptionSeq_var::IR_AttrDescriptionSeq_var (IR_AttrDescriptionSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::AttrDescriptionSeq_var::AttrDescriptionSeq_var (const ::IR::AttrDescriptionSeq_var &p) // copy constructor
-+IR_AttrDescriptionSeq_var::IR_AttrDescriptionSeq_var (const ::IR_AttrDescriptionSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::AttrDescriptionSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_AttrDescriptionSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::AttrDescriptionSeq_var::~AttrDescriptionSeq_var (void) // destructor
-+IR_AttrDescriptionSeq_var::~IR_AttrDescriptionSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::AttrDescriptionSeq_var &
--IR::AttrDescriptionSeq_var::operator= (AttrDescriptionSeq *p)
-+ACE_INLINE IR_AttrDescriptionSeq_var &
-+IR_AttrDescriptionSeq_var::operator= (IR_AttrDescriptionSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::AttrDescriptionSeq_var &
--IR::AttrDescriptionSeq_var::operator= (const ::IR::AttrDescriptionSeq_var &p)
-+ACE_INLINE IR_AttrDescriptionSeq_var &
-+IR_AttrDescriptionSeq_var::operator= (const ::IR_AttrDescriptionSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -17693,12 +16618,12 @@
-         }
-       else
-         {
--          AttrDescriptionSeq *deep_copy =
--            new AttrDescriptionSeq (*p.ptr_);
-+          IR_AttrDescriptionSeq *deep_copy = 
-+            new IR_AttrDescriptionSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              AttrDescriptionSeq *tmp = deep_copy;
-+              IR_AttrDescriptionSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -17709,103 +16634,103 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::AttrDescriptionSeq *
--IR::AttrDescriptionSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_AttrDescriptionSeq *
-+IR_AttrDescriptionSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttrDescriptionSeq *
--IR::AttrDescriptionSeq_var::operator-> (void)
-+ACE_INLINE ::IR_AttrDescriptionSeq *
-+IR_AttrDescriptionSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::AttrDescriptionSeq_var::operator const ::IR::AttrDescriptionSeq &() const // cast
-+IR_AttrDescriptionSeq_var::operator const ::IR_AttrDescriptionSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::AttrDescriptionSeq_var::operator ::IR::AttrDescriptionSeq &() // cast 
-+IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::AttrDescriptionSeq_var::operator ::IR::AttrDescriptionSeq &() const // cast 
-+IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::AttrDescriptionSeq_var::operator ::IR::AttrDescriptionSeq *&() // cast 
-+IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::AttributeDescription &
--IR::AttrDescriptionSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_AttributeDescription &
-+IR_AttrDescriptionSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const IR::AttributeDescription &
--IR::AttrDescriptionSeq_var::operator[] (CORBA::ULong index) const
-+ACE_INLINE const IR_AttributeDescription &
-+IR_AttrDescriptionSeq_var::operator[] (CORBA::ULong index) const
- {
--  return ACE_const_cast (const IR::AttributeDescription &, this->ptr_->operator[] (index));
-+  return ACE_const_cast (const IR_AttributeDescription &, this->ptr_->operator[] (index));
- }
- 
--ACE_INLINE const ::IR::AttrDescriptionSeq &
--IR::AttrDescriptionSeq_var::in (void) const
-+ACE_INLINE const ::IR_AttrDescriptionSeq &
-+IR_AttrDescriptionSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttrDescriptionSeq &
--IR::AttrDescriptionSeq_var::inout (void)
-+ACE_INLINE ::IR_AttrDescriptionSeq &
-+IR_AttrDescriptionSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::AttrDescriptionSeq *&
--IR::AttrDescriptionSeq_var::out (void)
-+ACE_INLINE ::IR_AttrDescriptionSeq *&
-+IR_AttrDescriptionSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttrDescriptionSeq *
--IR::AttrDescriptionSeq_var::_retn (void)
-+ACE_INLINE ::IR_AttrDescriptionSeq *
-+IR_AttrDescriptionSeq_var::_retn (void)
- {
--  ::IR::AttrDescriptionSeq *tmp = this->ptr_;
-+  ::IR_AttrDescriptionSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::AttrDescriptionSeq *
--IR::AttrDescriptionSeq_var::ptr (void) const
-+ACE_INLINE ::IR_AttrDescriptionSeq *
-+IR_AttrDescriptionSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::AttrDescriptionSeq_out
-+// Inline operations for class IR_AttrDescriptionSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::AttrDescriptionSeq_out::AttrDescriptionSeq_out (AttrDescriptionSeq *&p)
-+IR_AttrDescriptionSeq_out::IR_AttrDescriptionSeq_out (IR_AttrDescriptionSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::AttrDescriptionSeq_out::AttrDescriptionSeq_out (AttrDescriptionSeq_var &p) // constructor from _var
-+IR_AttrDescriptionSeq_out::IR_AttrDescriptionSeq_out (IR_AttrDescriptionSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -17813,90 +16738,87 @@
- }
- 
- ACE_INLINE
--IR::AttrDescriptionSeq_out::AttrDescriptionSeq_out (const ::IR::AttrDescriptionSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (AttrDescriptionSeq_out&, p).ptr_)
-+IR_AttrDescriptionSeq_out::IR_AttrDescriptionSeq_out (const ::IR_AttrDescriptionSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_AttrDescriptionSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::AttrDescriptionSeq_out &
--IR::AttrDescriptionSeq_out::operator= (const ::IR::AttrDescriptionSeq_out &p)
-+ACE_INLINE ::IR_AttrDescriptionSeq_out &
-+IR_AttrDescriptionSeq_out::operator= (const ::IR_AttrDescriptionSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (AttrDescriptionSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_AttrDescriptionSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::AttrDescriptionSeq_out &
--IR::AttrDescriptionSeq_out::operator= (AttrDescriptionSeq *p)
-+ACE_INLINE ::IR_AttrDescriptionSeq_out &
-+IR_AttrDescriptionSeq_out::operator= (IR_AttrDescriptionSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::AttrDescriptionSeq_out::operator ::IR::AttrDescriptionSeq *&() // cast
-+IR_AttrDescriptionSeq_out::operator ::IR_AttrDescriptionSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttrDescriptionSeq *&
--IR::AttrDescriptionSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_AttrDescriptionSeq *&
-+IR_AttrDescriptionSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::AttrDescriptionSeq *
--IR::AttrDescriptionSeq_out::operator-> (void)
-+ACE_INLINE ::IR_AttrDescriptionSeq *
-+IR_AttrDescriptionSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::AttributeDescription &
--IR::AttrDescriptionSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_AttributeDescription &
-+IR_AttrDescriptionSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
- // *************************************************************
--// Inline operations for class IR::InterfaceDescription_var
-+// Inline operations for class IR_InterfaceDescription_var
- // *************************************************************
- 
- ACE_INLINE
--IR::InterfaceDescription_var::InterfaceDescription_var (void) // default constructor
-+IR_InterfaceDescription_var::IR_InterfaceDescription_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::InterfaceDescription_var::InterfaceDescription_var (InterfaceDescription *p)
-+IR_InterfaceDescription_var::IR_InterfaceDescription_var (IR_InterfaceDescription *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::InterfaceDescription_var::InterfaceDescription_var (const ::IR::InterfaceDescription_var &p) // copy constructor
-+IR_InterfaceDescription_var::IR_InterfaceDescription_var (const ::IR_InterfaceDescription_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::InterfaceDescription (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_InterfaceDescription (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::InterfaceDescription_var::~InterfaceDescription_var (void) // destructor
-+IR_InterfaceDescription_var::~IR_InterfaceDescription_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::InterfaceDescription_var &
--IR::InterfaceDescription_var::operator= (InterfaceDescription *p)
-+ACE_INLINE IR_InterfaceDescription_var &
-+IR_InterfaceDescription_var::operator= (IR_InterfaceDescription *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::InterfaceDescription_var &
--IR::InterfaceDescription_var::operator= (const ::IR::InterfaceDescription_var &p)
-+ACE_INLINE ::IR_InterfaceDescription_var &
-+IR_InterfaceDescription_var::operator= (const ::IR_InterfaceDescription_var &p)
- {
-   if (this != &p)
-     {
-@@ -17907,12 +16829,12 @@
-         }
-       else
-         {
--          InterfaceDescription *deep_copy =
--            new InterfaceDescription (*p.ptr_);
-+          IR_InterfaceDescription *deep_copy = 
-+            new IR_InterfaceDescription (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              InterfaceDescription *tmp = deep_copy;
-+              IR_InterfaceDescription *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -17923,91 +16845,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::InterfaceDescription *
--IR::InterfaceDescription_var::operator-> (void) const
-+ACE_INLINE const ::IR_InterfaceDescription *
-+IR_InterfaceDescription_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::InterfaceDescription *
--IR::InterfaceDescription_var::operator-> (void)
-+ACE_INLINE ::IR_InterfaceDescription *
-+IR_InterfaceDescription_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::InterfaceDescription_var::operator const ::IR::InterfaceDescription &() const // cast
-+IR_InterfaceDescription_var::operator const ::IR_InterfaceDescription &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::InterfaceDescription_var::operator ::IR::InterfaceDescription &() // cast 
-+IR_InterfaceDescription_var::operator ::IR_InterfaceDescription &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::InterfaceDescription_var::operator ::IR::InterfaceDescription &() const // cast 
-+IR_InterfaceDescription_var::operator ::IR_InterfaceDescription &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::InterfaceDescription_var::operator ::IR::InterfaceDescription *&() // cast 
-+IR_InterfaceDescription_var::operator ::IR_InterfaceDescription *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::InterfaceDescription &
--IR::InterfaceDescription_var::in (void) const
-+ACE_INLINE const ::IR_InterfaceDescription &
-+IR_InterfaceDescription_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::InterfaceDescription &
--IR::InterfaceDescription_var::inout (void)
-+ACE_INLINE ::IR_InterfaceDescription &
-+IR_InterfaceDescription_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::InterfaceDescription *&
--IR::InterfaceDescription_var::out (void)
-+ACE_INLINE ::IR_InterfaceDescription *&
-+IR_InterfaceDescription_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::InterfaceDescription *
--IR::InterfaceDescription_var::_retn (void)
-+ACE_INLINE ::IR_InterfaceDescription *
-+IR_InterfaceDescription_var::_retn (void)
- {
--  ::IR::InterfaceDescription *tmp = this->ptr_;
-+  ::IR_InterfaceDescription *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::InterfaceDescription *
--IR::InterfaceDescription_var::ptr (void) const
-+ACE_INLINE ::IR_InterfaceDescription *
-+IR_InterfaceDescription_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::InterfaceDescription_out
-+// Inline operations for class IR_InterfaceDescription_out
- // *************************************************************
- 
- ACE_INLINE
--IR::InterfaceDescription_out::InterfaceDescription_out (::IR::InterfaceDescription *&p)
-+IR_InterfaceDescription_out::IR_InterfaceDescription_out (::IR_InterfaceDescription *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::InterfaceDescription_out::InterfaceDescription_out (InterfaceDescription_var &p) // constructor from _var
-+IR_InterfaceDescription_out::IR_InterfaceDescription_out (IR_InterfaceDescription_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -18015,81 +16937,81 @@
- }
- 
- ACE_INLINE
--IR::InterfaceDescription_out::InterfaceDescription_out (const ::IR::InterfaceDescription_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (InterfaceDescription_out&, p).ptr_)
-+IR_InterfaceDescription_out::IR_InterfaceDescription_out (const ::IR_InterfaceDescription_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_InterfaceDescription_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::InterfaceDescription_out &
--IR::InterfaceDescription_out::operator= (const ::IR::InterfaceDescription_out &p)
-+ACE_INLINE IR_InterfaceDescription_out &
-+IR_InterfaceDescription_out::operator= (const ::IR_InterfaceDescription_out &p)
- {
--  this->ptr_ = ACE_const_cast (InterfaceDescription_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_InterfaceDescription_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::InterfaceDescription_out &
--IR::InterfaceDescription_out::operator= (InterfaceDescription *p)
-+ACE_INLINE IR_InterfaceDescription_out &
-+IR_InterfaceDescription_out::operator= (IR_InterfaceDescription *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::InterfaceDescription_out::operator ::IR::InterfaceDescription *&() // cast
-+IR_InterfaceDescription_out::operator ::IR_InterfaceDescription *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::InterfaceDescription *&
--IR::InterfaceDescription_out::ptr (void) // ptr
-+ACE_INLINE ::IR_InterfaceDescription *&
-+IR_InterfaceDescription_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::InterfaceDescription *
--IR::InterfaceDescription_out::operator-> (void)
-+ACE_INLINE ::IR_InterfaceDescription *
-+IR_InterfaceDescription_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ValueMember_var
-+// Inline operations for class IR_ValueMember_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ValueMember_var::ValueMember_var (void) // default constructor
-+IR_ValueMember_var::IR_ValueMember_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ValueMember_var::ValueMember_var (ValueMember *p)
-+IR_ValueMember_var::IR_ValueMember_var (IR_ValueMember *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ValueMember_var::ValueMember_var (const ::IR::ValueMember_var &p) // copy constructor
-+IR_ValueMember_var::IR_ValueMember_var (const ::IR_ValueMember_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ValueMember (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ValueMember (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ValueMember_var::~ValueMember_var (void) // destructor
-+IR_ValueMember_var::~IR_ValueMember_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ValueMember_var &
--IR::ValueMember_var::operator= (ValueMember *p)
-+ACE_INLINE IR_ValueMember_var &
-+IR_ValueMember_var::operator= (IR_ValueMember *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ValueMember_var &
--IR::ValueMember_var::operator= (const ::IR::ValueMember_var &p)
-+ACE_INLINE ::IR_ValueMember_var &
-+IR_ValueMember_var::operator= (const ::IR_ValueMember_var &p)
- {
-   if (this != &p)
-     {
-@@ -18100,12 +17022,12 @@
-         }
-       else
-         {
--          ValueMember *deep_copy =
--            new ValueMember (*p.ptr_);
-+          IR_ValueMember *deep_copy = 
-+            new IR_ValueMember (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ValueMember *tmp = deep_copy;
-+              IR_ValueMember *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -18116,91 +17038,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ValueMember *
--IR::ValueMember_var::operator-> (void) const
-+ACE_INLINE const ::IR_ValueMember *
-+IR_ValueMember_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMember *
--IR::ValueMember_var::operator-> (void)
-+ACE_INLINE ::IR_ValueMember *
-+IR_ValueMember_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ValueMember_var::operator const ::IR::ValueMember &() const // cast
-+IR_ValueMember_var::operator const ::IR_ValueMember &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::ValueMember_var::operator ::IR::ValueMember &() // cast 
-+IR_ValueMember_var::operator ::IR_ValueMember &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::ValueMember_var::operator ::IR::ValueMember &() const // cast 
-+IR_ValueMember_var::operator ::IR_ValueMember &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ValueMember_var::operator ::IR::ValueMember *&() // cast 
-+IR_ValueMember_var::operator ::IR_ValueMember *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::ValueMember &
--IR::ValueMember_var::in (void) const
-+ACE_INLINE const ::IR_ValueMember &
-+IR_ValueMember_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMember &
--IR::ValueMember_var::inout (void)
-+ACE_INLINE ::IR_ValueMember &
-+IR_ValueMember_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ValueMember *&
--IR::ValueMember_var::out (void)
-+ACE_INLINE ::IR_ValueMember *&
-+IR_ValueMember_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMember *
--IR::ValueMember_var::_retn (void)
-+ACE_INLINE ::IR_ValueMember *
-+IR_ValueMember_var::_retn (void)
- {
--  ::IR::ValueMember *tmp = this->ptr_;
-+  ::IR_ValueMember *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ValueMember *
--IR::ValueMember_var::ptr (void) const
-+ACE_INLINE ::IR_ValueMember *
-+IR_ValueMember_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ValueMember_out
-+// Inline operations for class IR_ValueMember_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ValueMember_out::ValueMember_out (::IR::ValueMember *&p)
-+IR_ValueMember_out::IR_ValueMember_out (::IR_ValueMember *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ValueMember_out::ValueMember_out (ValueMember_var &p) // constructor from _var
-+IR_ValueMember_out::IR_ValueMember_out (IR_ValueMember_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -18208,93 +17130,89 @@
- }
- 
- ACE_INLINE
--IR::ValueMember_out::ValueMember_out (const ::IR::ValueMember_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ValueMember_out&, p).ptr_)
-+IR_ValueMember_out::IR_ValueMember_out (const ::IR_ValueMember_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ValueMember_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::ValueMember_out &
--IR::ValueMember_out::operator= (const ::IR::ValueMember_out &p)
-+ACE_INLINE IR_ValueMember_out &
-+IR_ValueMember_out::operator= (const ::IR_ValueMember_out &p)
- {
--  this->ptr_ = ACE_const_cast (ValueMember_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ValueMember_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ValueMember_out &
--IR::ValueMember_out::operator= (ValueMember *p)
-+ACE_INLINE IR_ValueMember_out &
-+IR_ValueMember_out::operator= (IR_ValueMember *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ValueMember_out::operator ::IR::ValueMember *&() // cast
-+IR_ValueMember_out::operator ::IR_ValueMember *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMember *&
--IR::ValueMember_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ValueMember *&
-+IR_ValueMember_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMember *
--IR::ValueMember_out::operator-> (void)
-+ACE_INLINE ::IR_ValueMember *
-+IR_ValueMember_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CI_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CI_
--
-   // = Static operations.
--  ACE_INLINE IR::ValueMember *
--  IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (CORBA::ULong size)
-+  ACE_INLINE IR_ValueMember *
-+  _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (CORBA::ULong size)
-   // Allocate storage for the sequence.
-   {
--    IR::ValueMember *retval = 0;
--    ACE_NEW_RETURN (retval, IR::ValueMember[size], 0);
-+    IR_ValueMember *retval = 0;
-+    ACE_NEW_RETURN (retval, IR_ValueMember[size], 0);
-     return retval;
-   }
-   
--  ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::freebuf (IR::ValueMember *buffer)
-+  ACE_INLINE void _TAO_Unbounded_Sequence_IR_ValueMemberSeq::freebuf (IR_ValueMember *buffer)
-   // Free the sequence.
-   {
-     delete [] buffer;
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (void) // Default constructor.
-+  _TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (void) // Default constructor.
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-+  _TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::ValueMember *data,
-+    IR_ValueMember *data,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs)
-+  _TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs)
-   // Copy constructor.
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::ValueMember *tmp1 = _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (this->maximum_);
--      IR::ValueMember * const tmp2 = ACE_reinterpret_cast (IR::ValueMember * ACE_CAST_CONST, rhs.buffer_);
-+      IR_ValueMember *tmp1 = _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (this->maximum_);
-+      IR_ValueMember * const tmp2 = ACE_reinterpret_cast (IR_ValueMember * ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp1[i] = tmp2[i];
-@@ -18307,8 +17225,8 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq &
--  IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Sequence_IR_ValueMemberSeq &
-+  _TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs)
-   // Assignment operator.
-   {
-     if (this == &rhs)
-@@ -18319,7 +17237,7 @@
-       if (this->maximum_ < rhs.maximum_)
-       {
-         // free the old buffer
--        IR::ValueMember *tmp = ACE_reinterpret_cast (IR::ValueMember *, this->buffer_);
-+        IR_ValueMember *tmp = ACE_reinterpret_cast (IR_ValueMember *, this->buffer_);
-         _TAO_Unbounded_Sequence_IR_ValueMemberSeq::freebuf (tmp);
-         this->buffer_ = _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (rhs.maximum_);
-       }
-@@ -18329,8 +17247,8 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::ValueMember *tmp1 = ACE_reinterpret_cast (IR::ValueMember *, this->buffer_);
--    IR::ValueMember * const tmp2 = ACE_reinterpret_cast (IR::ValueMember * ACE_CAST_CONST, rhs.buffer_);
-+    IR_ValueMember *tmp1 = ACE_reinterpret_cast (IR_ValueMember *, this->buffer_);
-+    IR_ValueMember * const tmp2 = ACE_reinterpret_cast (IR_ValueMember * ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-       tmp1[i] = tmp2[i];
-@@ -18339,30 +17257,30 @@
-   }
-   
-   // = Accessors.
--  ACE_INLINE IR::ValueMember &
--  IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator[] (CORBA::ULong i)
-+  ACE_INLINE IR_ValueMember &
-+  _TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator[] (CORBA::ULong i)
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::ValueMember* tmp = ACE_reinterpret_cast(IR::ValueMember*,this->buffer_);
-+    IR_ValueMember* tmp = ACE_reinterpret_cast(IR_ValueMember*,this->buffer_);
-     return tmp[i];
-   }
-   
--  ACE_INLINE const IR::ValueMember &
--  IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator[] (CORBA::ULong i) const
-+  ACE_INLINE const IR_ValueMember &
-+  _TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator[] (CORBA::ULong i) const
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::ValueMember * const tmp = ACE_reinterpret_cast (IR::ValueMember* ACE_CAST_CONST, this->buffer_);
-+    IR_ValueMember * const tmp = ACE_reinterpret_cast (IR_ValueMember* ACE_CAST_CONST, this->buffer_);
-     return tmp[i];
-   }
-   
-   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-   
--  ACE_INLINE IR::ValueMember *
--  IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_ValueMember *
-+  _TAO_Unbounded_Sequence_IR_ValueMemberSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::ValueMember *result = 0;
-+    IR_ValueMember *result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -18374,7 +17292,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::ValueMember*, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_ValueMember*, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -18383,7 +17301,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::ValueMember*,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_ValueMember*,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -18393,76 +17311,70 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::ValueMember *
--  IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::get_buffer (void) const
-+  ACE_INLINE const IR_ValueMember *
-+  _TAO_Unbounded_Sequence_IR_ValueMemberSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::ValueMember * ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_ValueMember * ACE_CAST_CONST, this->buffer_);
-   }
-   
-   ACE_INLINE void
--  IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::replace (CORBA::ULong max,
-+  _TAO_Unbounded_Sequence_IR_ValueMemberSeq::replace (CORBA::ULong max,
-   CORBA::ULong length,
--  IR::ValueMember *data,
-+  IR_ValueMember *data,
-   CORBA::Boolean release)
-   {
-     this->maximum_ = max;
-     this->length_ = length;
-     if (this->buffer_ && this->release_ == 1)
-     {
--      IR::ValueMember *tmp = ACE_reinterpret_cast(IR::ValueMember*,this->buffer_);
-+      IR_ValueMember *tmp = ACE_reinterpret_cast(IR_ValueMember*,this->buffer_);
-       _TAO_Unbounded_Sequence_IR_ValueMemberSeq::freebuf (tmp);
-     }
-     this->buffer_ = data;
-     this->release_ = release;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_VALUEMEMBERSEQ_CI_)
--#define _IR_VALUEMEMBERSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::ValueMemberSeq_var
-+// Inline operations for class IR_ValueMemberSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ValueMemberSeq_var::ValueMemberSeq_var (void) // default constructor
-+IR_ValueMemberSeq_var::IR_ValueMemberSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ValueMemberSeq_var::ValueMemberSeq_var (ValueMemberSeq *p)
-+IR_ValueMemberSeq_var::IR_ValueMemberSeq_var (IR_ValueMemberSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ValueMemberSeq_var::ValueMemberSeq_var (const ::IR::ValueMemberSeq_var &p) // copy constructor
-+IR_ValueMemberSeq_var::IR_ValueMemberSeq_var (const ::IR_ValueMemberSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ValueMemberSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ValueMemberSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ValueMemberSeq_var::~ValueMemberSeq_var (void) // destructor
-+IR_ValueMemberSeq_var::~IR_ValueMemberSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ValueMemberSeq_var &
--IR::ValueMemberSeq_var::operator= (ValueMemberSeq *p)
-+ACE_INLINE IR_ValueMemberSeq_var &
-+IR_ValueMemberSeq_var::operator= (IR_ValueMemberSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ValueMemberSeq_var &
--IR::ValueMemberSeq_var::operator= (const ::IR::ValueMemberSeq_var &p)
-+ACE_INLINE IR_ValueMemberSeq_var &
-+IR_ValueMemberSeq_var::operator= (const ::IR_ValueMemberSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -18473,12 +17385,12 @@
-         }
-       else
-         {
--          ValueMemberSeq *deep_copy =
--            new ValueMemberSeq (*p.ptr_);
-+          IR_ValueMemberSeq *deep_copy = 
-+            new IR_ValueMemberSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ValueMemberSeq *tmp = deep_copy;
-+              IR_ValueMemberSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -18489,103 +17401,103 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ValueMemberSeq *
--IR::ValueMemberSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_ValueMemberSeq *
-+IR_ValueMemberSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMemberSeq *
--IR::ValueMemberSeq_var::operator-> (void)
-+ACE_INLINE ::IR_ValueMemberSeq *
-+IR_ValueMemberSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ValueMemberSeq_var::operator const ::IR::ValueMemberSeq &() const // cast
-+IR_ValueMemberSeq_var::operator const ::IR_ValueMemberSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ValueMemberSeq_var::operator ::IR::ValueMemberSeq &() // cast 
-+IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ValueMemberSeq_var::operator ::IR::ValueMemberSeq &() const // cast 
-+IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ValueMemberSeq_var::operator ::IR::ValueMemberSeq *&() // cast 
-+IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ValueMember &
--IR::ValueMemberSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_ValueMember &
-+IR_ValueMemberSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const IR::ValueMember &
--IR::ValueMemberSeq_var::operator[] (CORBA::ULong index) const
-+ACE_INLINE const IR_ValueMember &
-+IR_ValueMemberSeq_var::operator[] (CORBA::ULong index) const
- {
--  return ACE_const_cast (const IR::ValueMember &, this->ptr_->operator[] (index));
-+  return ACE_const_cast (const IR_ValueMember &, this->ptr_->operator[] (index));
- }
- 
--ACE_INLINE const ::IR::ValueMemberSeq &
--IR::ValueMemberSeq_var::in (void) const
-+ACE_INLINE const ::IR_ValueMemberSeq &
-+IR_ValueMemberSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMemberSeq &
--IR::ValueMemberSeq_var::inout (void)
-+ACE_INLINE ::IR_ValueMemberSeq &
-+IR_ValueMemberSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ValueMemberSeq *&
--IR::ValueMemberSeq_var::out (void)
-+ACE_INLINE ::IR_ValueMemberSeq *&
-+IR_ValueMemberSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMemberSeq *
--IR::ValueMemberSeq_var::_retn (void)
-+ACE_INLINE ::IR_ValueMemberSeq *
-+IR_ValueMemberSeq_var::_retn (void)
- {
--  ::IR::ValueMemberSeq *tmp = this->ptr_;
-+  ::IR_ValueMemberSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ValueMemberSeq *
--IR::ValueMemberSeq_var::ptr (void) const
-+ACE_INLINE ::IR_ValueMemberSeq *
-+IR_ValueMemberSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ValueMemberSeq_out
-+// Inline operations for class IR_ValueMemberSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ValueMemberSeq_out::ValueMemberSeq_out (ValueMemberSeq *&p)
-+IR_ValueMemberSeq_out::IR_ValueMemberSeq_out (IR_ValueMemberSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ValueMemberSeq_out::ValueMemberSeq_out (ValueMemberSeq_var &p) // constructor from _var
-+IR_ValueMemberSeq_out::IR_ValueMemberSeq_out (IR_ValueMemberSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -18593,57 +17505,50 @@
- }
- 
- ACE_INLINE
--IR::ValueMemberSeq_out::ValueMemberSeq_out (const ::IR::ValueMemberSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ValueMemberSeq_out&, p).ptr_)
-+IR_ValueMemberSeq_out::IR_ValueMemberSeq_out (const ::IR_ValueMemberSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ValueMemberSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::ValueMemberSeq_out &
--IR::ValueMemberSeq_out::operator= (const ::IR::ValueMemberSeq_out &p)
-+ACE_INLINE ::IR_ValueMemberSeq_out &
-+IR_ValueMemberSeq_out::operator= (const ::IR_ValueMemberSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (ValueMemberSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ValueMemberSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ValueMemberSeq_out &
--IR::ValueMemberSeq_out::operator= (ValueMemberSeq *p)
-+ACE_INLINE ::IR_ValueMemberSeq_out &
-+IR_ValueMemberSeq_out::operator= (IR_ValueMemberSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ValueMemberSeq_out::operator ::IR::ValueMemberSeq *&() // cast
-+IR_ValueMemberSeq_out::operator ::IR_ValueMemberSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMemberSeq *&
--IR::ValueMemberSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ValueMemberSeq *&
-+IR_ValueMemberSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMemberSeq *
--IR::ValueMemberSeq_out::operator-> (void)
-+ACE_INLINE ::IR_ValueMemberSeq *
-+IR_ValueMemberSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ValueMember &
--IR::ValueMemberSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_ValueMember &
-+IR_ValueMemberSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEMEMBERDEF___CI_)
--#define _IR_VALUEMEMBERDEF___CI_
--
- ACE_INLINE
--IR::ValueMemberDef::ValueMemberDef (
-+IR_ValueMemberDef::IR_ValueMemberDef (
-     TAO_Stub *objref,
-     CORBA::Boolean _tao_collocated,
-     TAO_Abstract_ServantBase *servant
-@@ -18653,217 +17558,201 @@
-   this->IR_ValueMemberDef_setup_collocation (_tao_collocated);
- }
- 
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEMEMBERDEF___VAR_CI_)
--#define _IR_VALUEMEMBERDEF___VAR_CI_
--
- // *************************************************************
--// Inline operations for class IR::ValueMemberDef_var
-+// Inline operations for class IR_ValueMemberDef_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ValueMemberDef_var::ValueMemberDef_var (void) // default constructor
--  : ptr_ (ValueMemberDef::_nil ())
-+IR_ValueMemberDef_var::IR_ValueMemberDef_var (void) // default constructor
-+  : ptr_ (IR_ValueMemberDef::_nil ())
- {}
- 
--ACE_INLINE ::IR::ValueMemberDef_ptr
--IR::ValueMemberDef_var::ptr (void) const
-+ACE_INLINE ::IR_ValueMemberDef_ptr
-+IR_ValueMemberDef_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ValueMemberDef_var::ValueMemberDef_var (const ::IR::ValueMemberDef_var &p) // copy constructor
-+IR_ValueMemberDef_var::IR_ValueMemberDef_var (const ::IR_ValueMemberDef_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (ValueMemberDef::_duplicate (p.ptr ()))
-+    ptr_ (IR_ValueMemberDef::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--IR::ValueMemberDef_var::~ValueMemberDef_var (void) // destructor
-+IR_ValueMemberDef_var::~IR_ValueMemberDef_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE IR::ValueMemberDef_var &
--IR::ValueMemberDef_var::operator= (ValueMemberDef_ptr p)
-+ACE_INLINE IR_ValueMemberDef_var &
-+IR_ValueMemberDef_var::operator= (IR_ValueMemberDef_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE IR::ValueMemberDef_var &
--IR::ValueMemberDef_var::operator= (const ::IR::ValueMemberDef_var &p)
-+ACE_INLINE IR_ValueMemberDef_var &
-+IR_ValueMemberDef_var::operator= (const ::IR_ValueMemberDef_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = ::IR::ValueMemberDef::_duplicate (p.ptr ());
-+    this->ptr_ = ::IR_ValueMemberDef::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ValueMemberDef_var::operator const ::IR::ValueMemberDef_ptr &() const // cast
-+IR_ValueMemberDef_var::operator const ::IR_ValueMemberDef_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ValueMemberDef_var::operator ::IR::ValueMemberDef_ptr &() // cast 
-+IR_ValueMemberDef_var::operator ::IR_ValueMemberDef_ptr &() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMemberDef_ptr
--IR::ValueMemberDef_var::operator-> (void) const
-+ACE_INLINE ::IR_ValueMemberDef_ptr
-+IR_ValueMemberDef_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMemberDef_ptr
--IR::ValueMemberDef_var::in (void) const
-+ACE_INLINE ::IR_ValueMemberDef_ptr
-+IR_ValueMemberDef_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMemberDef_ptr &
--IR::ValueMemberDef_var::inout (void)
-+ACE_INLINE ::IR_ValueMemberDef_ptr &
-+IR_ValueMemberDef_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMemberDef_ptr &
--IR::ValueMemberDef_var::out (void)
-+ACE_INLINE ::IR_ValueMemberDef_ptr &
-+IR_ValueMemberDef_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = ::IR::ValueMemberDef::_nil ();
-+  this->ptr_ = ::IR_ValueMemberDef::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMemberDef_ptr
--IR::ValueMemberDef_var::_retn (void)
-+ACE_INLINE ::IR_ValueMemberDef_ptr
-+IR_ValueMemberDef_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  ::IR::ValueMemberDef_ptr val = this->ptr_;
--  this->ptr_ = ::IR::ValueMemberDef::_nil ();
-+  ::IR_ValueMemberDef_ptr val = this->ptr_;
-+  this->ptr_ = ::IR_ValueMemberDef::_nil ();
-   return val;
- }
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_IR_VALUEMEMBERDEF___OUT_CI_)
--#define _IR_VALUEMEMBERDEF___OUT_CI_
--
- // *************************************************************
--// Inline operations for class IR::ValueMemberDef_out
-+// Inline operations for class IR_ValueMemberDef_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ValueMemberDef_out::ValueMemberDef_out (ValueMemberDef_ptr &p)
-+IR_ValueMemberDef_out::IR_ValueMemberDef_out (IR_ValueMemberDef_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = ::IR::ValueMemberDef::_nil ();
-+  this->ptr_ = ::IR_ValueMemberDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ValueMemberDef_out::ValueMemberDef_out (ValueMemberDef_var &p) // constructor from _var
-+IR_ValueMemberDef_out::IR_ValueMemberDef_out (IR_ValueMemberDef_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = ::IR::ValueMemberDef::_nil ();
-+  this->ptr_ = ::IR_ValueMemberDef::_nil ();
- }
- 
- ACE_INLINE
--IR::ValueMemberDef_out::ValueMemberDef_out (const ::IR::ValueMemberDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ValueMemberDef_out &, p).ptr_)
-+IR_ValueMemberDef_out::IR_ValueMemberDef_out (const ::IR_ValueMemberDef_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ValueMemberDef_out &, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::ValueMemberDef_out &
--IR::ValueMemberDef_out::operator= (const ::IR::ValueMemberDef_out &p)
-+ACE_INLINE ::IR_ValueMemberDef_out &
-+IR_ValueMemberDef_out::operator= (const ::IR_ValueMemberDef_out &p)
- {
--  this->ptr_ = ACE_const_cast (ValueMemberDef_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ValueMemberDef_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ValueMemberDef_out &
--IR::ValueMemberDef_out::operator= (const ::IR::ValueMemberDef_var &p)
-+ACE_INLINE IR_ValueMemberDef_out &
-+IR_ValueMemberDef_out::operator= (const ::IR_ValueMemberDef_var &p)
- {
--  this->ptr_ = ::IR::ValueMemberDef::_duplicate (p.ptr ());
-+  this->ptr_ = ::IR_ValueMemberDef::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE IR::ValueMemberDef_out &
--IR::ValueMemberDef_out::operator= (ValueMemberDef_ptr p)
-+ACE_INLINE IR_ValueMemberDef_out &
-+IR_ValueMemberDef_out::operator= (IR_ValueMemberDef_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ValueMemberDef_out::operator ::IR::ValueMemberDef_ptr &() // cast
-+IR_ValueMemberDef_out::operator ::IR_ValueMemberDef_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMemberDef_ptr &
--IR::ValueMemberDef_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ValueMemberDef_ptr &
-+IR_ValueMemberDef_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueMemberDef_ptr
--IR::ValueMemberDef_out::operator-> (void)
-+ACE_INLINE ::IR_ValueMemberDef_ptr
-+IR_ValueMemberDef_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
--#endif /* end #if !defined */
--
- // *************************************************************
--// Inline operations for class IR::ValueDescription_var
-+// Inline operations for class IR_ValueDescription_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ValueDescription_var::ValueDescription_var (void) // default constructor
-+IR_ValueDescription_var::IR_ValueDescription_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ValueDescription_var::ValueDescription_var (ValueDescription *p)
-+IR_ValueDescription_var::IR_ValueDescription_var (IR_ValueDescription *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ValueDescription_var::ValueDescription_var (const ::IR::ValueDescription_var &p) // copy constructor
-+IR_ValueDescription_var::IR_ValueDescription_var (const ::IR_ValueDescription_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ValueDescription (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ValueDescription (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ValueDescription_var::~ValueDescription_var (void) // destructor
-+IR_ValueDescription_var::~IR_ValueDescription_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ValueDescription_var &
--IR::ValueDescription_var::operator= (ValueDescription *p)
-+ACE_INLINE IR_ValueDescription_var &
-+IR_ValueDescription_var::operator= (IR_ValueDescription *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ValueDescription_var &
--IR::ValueDescription_var::operator= (const ::IR::ValueDescription_var &p)
-+ACE_INLINE ::IR_ValueDescription_var &
-+IR_ValueDescription_var::operator= (const ::IR_ValueDescription_var &p)
- {
-   if (this != &p)
-     {
-@@ -18874,12 +17763,12 @@
-         }
-       else
-         {
--          ValueDescription *deep_copy =
--            new ValueDescription (*p.ptr_);
-+          IR_ValueDescription *deep_copy = 
-+            new IR_ValueDescription (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ValueDescription *tmp = deep_copy;
-+              IR_ValueDescription *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -18890,91 +17779,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ValueDescription *
--IR::ValueDescription_var::operator-> (void) const
-+ACE_INLINE const ::IR_ValueDescription *
-+IR_ValueDescription_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueDescription *
--IR::ValueDescription_var::operator-> (void)
-+ACE_INLINE ::IR_ValueDescription *
-+IR_ValueDescription_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ValueDescription_var::operator const ::IR::ValueDescription &() const // cast
-+IR_ValueDescription_var::operator const ::IR_ValueDescription &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::ValueDescription_var::operator ::IR::ValueDescription &() // cast 
-+IR_ValueDescription_var::operator ::IR_ValueDescription &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::ValueDescription_var::operator ::IR::ValueDescription &() const // cast 
-+IR_ValueDescription_var::operator ::IR_ValueDescription &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ValueDescription_var::operator ::IR::ValueDescription *&() // cast 
-+IR_ValueDescription_var::operator ::IR_ValueDescription *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::ValueDescription &
--IR::ValueDescription_var::in (void) const
-+ACE_INLINE const ::IR_ValueDescription &
-+IR_ValueDescription_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueDescription &
--IR::ValueDescription_var::inout (void)
-+ACE_INLINE ::IR_ValueDescription &
-+IR_ValueDescription_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ValueDescription *&
--IR::ValueDescription_var::out (void)
-+ACE_INLINE ::IR_ValueDescription *&
-+IR_ValueDescription_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueDescription *
--IR::ValueDescription_var::_retn (void)
-+ACE_INLINE ::IR_ValueDescription *
-+IR_ValueDescription_var::_retn (void)
- {
--  ::IR::ValueDescription *tmp = this->ptr_;
-+  ::IR_ValueDescription *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ValueDescription *
--IR::ValueDescription_var::ptr (void) const
-+ACE_INLINE ::IR_ValueDescription *
-+IR_ValueDescription_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ValueDescription_out
-+// Inline operations for class IR_ValueDescription_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ValueDescription_out::ValueDescription_out (::IR::ValueDescription *&p)
-+IR_ValueDescription_out::IR_ValueDescription_out (::IR_ValueDescription *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ValueDescription_out::ValueDescription_out (ValueDescription_var &p) // constructor from _var
-+IR_ValueDescription_out::IR_ValueDescription_out (IR_ValueDescription_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -18982,81 +17871,81 @@
- }
- 
- ACE_INLINE
--IR::ValueDescription_out::ValueDescription_out (const ::IR::ValueDescription_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ValueDescription_out&, p).ptr_)
-+IR_ValueDescription_out::IR_ValueDescription_out (const ::IR_ValueDescription_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ValueDescription_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::ValueDescription_out &
--IR::ValueDescription_out::operator= (const ::IR::ValueDescription_out &p)
-+ACE_INLINE IR_ValueDescription_out &
-+IR_ValueDescription_out::operator= (const ::IR_ValueDescription_out &p)
- {
--  this->ptr_ = ACE_const_cast (ValueDescription_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ValueDescription_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ValueDescription_out &
--IR::ValueDescription_out::operator= (ValueDescription *p)
-+ACE_INLINE IR_ValueDescription_out &
-+IR_ValueDescription_out::operator= (IR_ValueDescription *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ValueDescription_out::operator ::IR::ValueDescription *&() // cast
-+IR_ValueDescription_out::operator ::IR_ValueDescription *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueDescription *&
--IR::ValueDescription_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ValueDescription *&
-+IR_ValueDescription_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ValueDescription *
--IR::ValueDescription_out::operator-> (void)
-+ACE_INLINE ::IR_ValueDescription *
-+IR_ValueDescription_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ProvidesDescription_var
-+// Inline operations for class IR_ProvidesDescription_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ProvidesDescription_var::ProvidesDescription_var (void) // default constructor
-+IR_ProvidesDescription_var::IR_ProvidesDescription_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ProvidesDescription_var::ProvidesDescription_var (ProvidesDescription *p)
-+IR_ProvidesDescription_var::IR_ProvidesDescription_var (IR_ProvidesDescription *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ProvidesDescription_var::ProvidesDescription_var (const ::IR::ProvidesDescription_var &p) // copy constructor
-+IR_ProvidesDescription_var::IR_ProvidesDescription_var (const ::IR_ProvidesDescription_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ProvidesDescription (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ProvidesDescription (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ProvidesDescription_var::~ProvidesDescription_var (void) // destructor
-+IR_ProvidesDescription_var::~IR_ProvidesDescription_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ProvidesDescription_var &
--IR::ProvidesDescription_var::operator= (ProvidesDescription *p)
-+ACE_INLINE IR_ProvidesDescription_var &
-+IR_ProvidesDescription_var::operator= (IR_ProvidesDescription *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ProvidesDescription_var &
--IR::ProvidesDescription_var::operator= (const ::IR::ProvidesDescription_var &p)
-+ACE_INLINE ::IR_ProvidesDescription_var &
-+IR_ProvidesDescription_var::operator= (const ::IR_ProvidesDescription_var &p)
- {
-   if (this != &p)
-     {
-@@ -19067,12 +17956,12 @@
-         }
-       else
-         {
--          ProvidesDescription *deep_copy =
--            new ProvidesDescription (*p.ptr_);
-+          IR_ProvidesDescription *deep_copy = 
-+            new IR_ProvidesDescription (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ProvidesDescription *tmp = deep_copy;
-+              IR_ProvidesDescription *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -19083,91 +17972,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ProvidesDescription *
--IR::ProvidesDescription_var::operator-> (void) const
-+ACE_INLINE const ::IR_ProvidesDescription *
-+IR_ProvidesDescription_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ProvidesDescription *
--IR::ProvidesDescription_var::operator-> (void)
-+ACE_INLINE ::IR_ProvidesDescription *
-+IR_ProvidesDescription_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ProvidesDescription_var::operator const ::IR::ProvidesDescription &() const // cast
-+IR_ProvidesDescription_var::operator const ::IR_ProvidesDescription &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::ProvidesDescription_var::operator ::IR::ProvidesDescription &() // cast 
-+IR_ProvidesDescription_var::operator ::IR_ProvidesDescription &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::ProvidesDescription_var::operator ::IR::ProvidesDescription &() const // cast 
-+IR_ProvidesDescription_var::operator ::IR_ProvidesDescription &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ProvidesDescription_var::operator ::IR::ProvidesDescription *&() // cast 
-+IR_ProvidesDescription_var::operator ::IR_ProvidesDescription *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::ProvidesDescription &
--IR::ProvidesDescription_var::in (void) const
-+ACE_INLINE const ::IR_ProvidesDescription &
-+IR_ProvidesDescription_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ProvidesDescription &
--IR::ProvidesDescription_var::inout (void)
-+ACE_INLINE ::IR_ProvidesDescription &
-+IR_ProvidesDescription_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ProvidesDescription *&
--IR::ProvidesDescription_var::out (void)
-+ACE_INLINE ::IR_ProvidesDescription *&
-+IR_ProvidesDescription_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ProvidesDescription *
--IR::ProvidesDescription_var::_retn (void)
-+ACE_INLINE ::IR_ProvidesDescription *
-+IR_ProvidesDescription_var::_retn (void)
- {
--  ::IR::ProvidesDescription *tmp = this->ptr_;
-+  ::IR_ProvidesDescription *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ProvidesDescription *
--IR::ProvidesDescription_var::ptr (void) const
-+ACE_INLINE ::IR_ProvidesDescription *
-+IR_ProvidesDescription_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ProvidesDescription_out
-+// Inline operations for class IR_ProvidesDescription_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ProvidesDescription_out::ProvidesDescription_out (::IR::ProvidesDescription *&p)
-+IR_ProvidesDescription_out::IR_ProvidesDescription_out (::IR_ProvidesDescription *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ProvidesDescription_out::ProvidesDescription_out (ProvidesDescription_var &p) // constructor from _var
-+IR_ProvidesDescription_out::IR_ProvidesDescription_out (IR_ProvidesDescription_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -19175,81 +18064,81 @@
- }
- 
- ACE_INLINE
--IR::ProvidesDescription_out::ProvidesDescription_out (const ::IR::ProvidesDescription_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ProvidesDescription_out&, p).ptr_)
-+IR_ProvidesDescription_out::IR_ProvidesDescription_out (const ::IR_ProvidesDescription_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ProvidesDescription_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::ProvidesDescription_out &
--IR::ProvidesDescription_out::operator= (const ::IR::ProvidesDescription_out &p)
-+ACE_INLINE IR_ProvidesDescription_out &
-+IR_ProvidesDescription_out::operator= (const ::IR_ProvidesDescription_out &p)
- {
--  this->ptr_ = ACE_const_cast (ProvidesDescription_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ProvidesDescription_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ProvidesDescription_out &
--IR::ProvidesDescription_out::operator= (ProvidesDescription *p)
-+ACE_INLINE IR_ProvidesDescription_out &
-+IR_ProvidesDescription_out::operator= (IR_ProvidesDescription *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ProvidesDescription_out::operator ::IR::ProvidesDescription *&() // cast
-+IR_ProvidesDescription_out::operator ::IR_ProvidesDescription *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ProvidesDescription *&
--IR::ProvidesDescription_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ProvidesDescription *&
-+IR_ProvidesDescription_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ProvidesDescription *
--IR::ProvidesDescription_out::operator-> (void)
-+ACE_INLINE ::IR_ProvidesDescription *
-+IR_ProvidesDescription_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::UsesDescription_var
-+// Inline operations for class IR_UsesDescription_var
- // *************************************************************
- 
- ACE_INLINE
--IR::UsesDescription_var::UsesDescription_var (void) // default constructor
-+IR_UsesDescription_var::IR_UsesDescription_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::UsesDescription_var::UsesDescription_var (UsesDescription *p)
-+IR_UsesDescription_var::IR_UsesDescription_var (IR_UsesDescription *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::UsesDescription_var::UsesDescription_var (const ::IR::UsesDescription_var &p) // copy constructor
-+IR_UsesDescription_var::IR_UsesDescription_var (const ::IR_UsesDescription_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::UsesDescription (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_UsesDescription (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::UsesDescription_var::~UsesDescription_var (void) // destructor
-+IR_UsesDescription_var::~IR_UsesDescription_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::UsesDescription_var &
--IR::UsesDescription_var::operator= (UsesDescription *p)
-+ACE_INLINE IR_UsesDescription_var &
-+IR_UsesDescription_var::operator= (IR_UsesDescription *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::UsesDescription_var &
--IR::UsesDescription_var::operator= (const ::IR::UsesDescription_var &p)
-+ACE_INLINE ::IR_UsesDescription_var &
-+IR_UsesDescription_var::operator= (const ::IR_UsesDescription_var &p)
- {
-   if (this != &p)
-     {
-@@ -19260,12 +18149,12 @@
-         }
-       else
-         {
--          UsesDescription *deep_copy =
--            new UsesDescription (*p.ptr_);
-+          IR_UsesDescription *deep_copy = 
-+            new IR_UsesDescription (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              UsesDescription *tmp = deep_copy;
-+              IR_UsesDescription *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -19276,91 +18165,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::UsesDescription *
--IR::UsesDescription_var::operator-> (void) const
-+ACE_INLINE const ::IR_UsesDescription *
-+IR_UsesDescription_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UsesDescription *
--IR::UsesDescription_var::operator-> (void)
-+ACE_INLINE ::IR_UsesDescription *
-+IR_UsesDescription_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::UsesDescription_var::operator const ::IR::UsesDescription &() const // cast
-+IR_UsesDescription_var::operator const ::IR_UsesDescription &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::UsesDescription_var::operator ::IR::UsesDescription &() // cast 
-+IR_UsesDescription_var::operator ::IR_UsesDescription &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::UsesDescription_var::operator ::IR::UsesDescription &() const // cast 
-+IR_UsesDescription_var::operator ::IR_UsesDescription &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::UsesDescription_var::operator ::IR::UsesDescription *&() // cast 
-+IR_UsesDescription_var::operator ::IR_UsesDescription *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::UsesDescription &
--IR::UsesDescription_var::in (void) const
-+ACE_INLINE const ::IR_UsesDescription &
-+IR_UsesDescription_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::UsesDescription &
--IR::UsesDescription_var::inout (void)
-+ACE_INLINE ::IR_UsesDescription &
-+IR_UsesDescription_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::UsesDescription *&
--IR::UsesDescription_var::out (void)
-+ACE_INLINE ::IR_UsesDescription *&
-+IR_UsesDescription_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UsesDescription *
--IR::UsesDescription_var::_retn (void)
-+ACE_INLINE ::IR_UsesDescription *
-+IR_UsesDescription_var::_retn (void)
- {
--  ::IR::UsesDescription *tmp = this->ptr_;
-+  ::IR_UsesDescription *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::UsesDescription *
--IR::UsesDescription_var::ptr (void) const
-+ACE_INLINE ::IR_UsesDescription *
-+IR_UsesDescription_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::UsesDescription_out
-+// Inline operations for class IR_UsesDescription_out
- // *************************************************************
- 
- ACE_INLINE
--IR::UsesDescription_out::UsesDescription_out (::IR::UsesDescription *&p)
-+IR_UsesDescription_out::IR_UsesDescription_out (::IR_UsesDescription *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::UsesDescription_out::UsesDescription_out (UsesDescription_var &p) // constructor from _var
-+IR_UsesDescription_out::IR_UsesDescription_out (IR_UsesDescription_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -19368,93 +18257,89 @@
- }
- 
- ACE_INLINE
--IR::UsesDescription_out::UsesDescription_out (const ::IR::UsesDescription_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (UsesDescription_out&, p).ptr_)
-+IR_UsesDescription_out::IR_UsesDescription_out (const ::IR_UsesDescription_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_UsesDescription_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::UsesDescription_out &
--IR::UsesDescription_out::operator= (const ::IR::UsesDescription_out &p)
-+ACE_INLINE IR_UsesDescription_out &
-+IR_UsesDescription_out::operator= (const ::IR_UsesDescription_out &p)
- {
--  this->ptr_ = ACE_const_cast (UsesDescription_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_UsesDescription_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::UsesDescription_out &
--IR::UsesDescription_out::operator= (UsesDescription *p)
-+ACE_INLINE IR_UsesDescription_out &
-+IR_UsesDescription_out::operator= (IR_UsesDescription *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::UsesDescription_out::operator ::IR::UsesDescription *&() // cast
-+IR_UsesDescription_out::operator ::IR_UsesDescription *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UsesDescription *&
--IR::UsesDescription_out::ptr (void) // ptr
-+ACE_INLINE ::IR_UsesDescription *&
-+IR_UsesDescription_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UsesDescription *
--IR::UsesDescription_out::operator-> (void)
-+ACE_INLINE ::IR_UsesDescription *
-+IR_UsesDescription_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CI_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CI_
--
-   // = Static operations.
--  ACE_INLINE IR::ProvidesDescription *
--  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (CORBA::ULong size)
-+  ACE_INLINE IR_ProvidesDescription *
-+  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (CORBA::ULong size)
-   // Allocate storage for the sequence.
-   {
--    IR::ProvidesDescription *retval = 0;
--    ACE_NEW_RETURN (retval, IR::ProvidesDescription[size], 0);
-+    IR_ProvidesDescription *retval = 0;
-+    ACE_NEW_RETURN (retval, IR_ProvidesDescription[size], 0);
-     return retval;
-   }
-   
--  ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (IR::ProvidesDescription *buffer)
-+  ACE_INLINE void _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (IR_ProvidesDescription *buffer)
-   // Free the sequence.
-   {
-     delete [] buffer;
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Default constructor.
-+  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Default constructor.
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-+  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::ProvidesDescription *data,
-+    IR_ProvidesDescription *data,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
-+  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
-   // Copy constructor.
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::ProvidesDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (this->maximum_);
--      IR::ProvidesDescription * const tmp2 = ACE_reinterpret_cast (IR::ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
-+      IR_ProvidesDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (this->maximum_);
-+      IR_ProvidesDescription * const tmp2 = ACE_reinterpret_cast (IR_ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp1[i] = tmp2[i];
-@@ -19467,8 +18352,8 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq &
--  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &
-+  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
-   // Assignment operator.
-   {
-     if (this == &rhs)
-@@ -19479,7 +18364,7 @@
-       if (this->maximum_ < rhs.maximum_)
-       {
-         // free the old buffer
--        IR::ProvidesDescription *tmp = ACE_reinterpret_cast (IR::ProvidesDescription *, this->buffer_);
-+        IR_ProvidesDescription *tmp = ACE_reinterpret_cast (IR_ProvidesDescription *, this->buffer_);
-         _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
-         this->buffer_ = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (rhs.maximum_);
-       }
-@@ -19489,8 +18374,8 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::ProvidesDescription *tmp1 = ACE_reinterpret_cast (IR::ProvidesDescription *, this->buffer_);
--    IR::ProvidesDescription * const tmp2 = ACE_reinterpret_cast (IR::ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
-+    IR_ProvidesDescription *tmp1 = ACE_reinterpret_cast (IR_ProvidesDescription *, this->buffer_);
-+    IR_ProvidesDescription * const tmp2 = ACE_reinterpret_cast (IR_ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-       tmp1[i] = tmp2[i];
-@@ -19499,30 +18384,30 @@
-   }
-   
-   // = Accessors.
--  ACE_INLINE IR::ProvidesDescription &
--  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i)
-+  ACE_INLINE IR_ProvidesDescription &
-+  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i)
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::ProvidesDescription* tmp = ACE_reinterpret_cast(IR::ProvidesDescription*,this->buffer_);
-+    IR_ProvidesDescription* tmp = ACE_reinterpret_cast(IR_ProvidesDescription*,this->buffer_);
-     return tmp[i];
-   }
-   
--  ACE_INLINE const IR::ProvidesDescription &
--  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i) const
-+  ACE_INLINE const IR_ProvidesDescription &
-+  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i) const
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::ProvidesDescription * const tmp = ACE_reinterpret_cast (IR::ProvidesDescription* ACE_CAST_CONST, this->buffer_);
-+    IR_ProvidesDescription * const tmp = ACE_reinterpret_cast (IR_ProvidesDescription* ACE_CAST_CONST, this->buffer_);
-     return tmp[i];
-   }
-   
-   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-   
--  ACE_INLINE IR::ProvidesDescription *
--  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_ProvidesDescription *
-+  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::ProvidesDescription *result = 0;
-+    IR_ProvidesDescription *result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -19534,7 +18419,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::ProvidesDescription*, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_ProvidesDescription*, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -19543,7 +18428,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::ProvidesDescription*,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_ProvidesDescription*,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -19553,76 +18438,70 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::ProvidesDescription *
--  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (void) const
-+  ACE_INLINE const IR_ProvidesDescription *
-+  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::ProvidesDescription * ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_ProvidesDescription * ACE_CAST_CONST, this->buffer_);
-   }
-   
-   ACE_INLINE void
--  IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::replace (CORBA::ULong max,
-+  _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::replace (CORBA::ULong max,
-   CORBA::ULong length,
--  IR::ProvidesDescription *data,
-+  IR_ProvidesDescription *data,
-   CORBA::Boolean release)
-   {
-     this->maximum_ = max;
-     this->length_ = length;
-     if (this->buffer_ && this->release_ == 1)
-     {
--      IR::ProvidesDescription *tmp = ACE_reinterpret_cast(IR::ProvidesDescription*,this->buffer_);
-+      IR_ProvidesDescription *tmp = ACE_reinterpret_cast(IR_ProvidesDescription*,this->buffer_);
-       _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
-     }
-     this->buffer_ = data;
-     this->release_ = release;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_PROVIDESDESCSEQ_CI_)
--#define _IR_PROVIDESDESCSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::ProvidesDescSeq_var
-+// Inline operations for class IR_ProvidesDescSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ProvidesDescSeq_var::ProvidesDescSeq_var (void) // default constructor
-+IR_ProvidesDescSeq_var::IR_ProvidesDescSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ProvidesDescSeq_var::ProvidesDescSeq_var (ProvidesDescSeq *p)
-+IR_ProvidesDescSeq_var::IR_ProvidesDescSeq_var (IR_ProvidesDescSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ProvidesDescSeq_var::ProvidesDescSeq_var (const ::IR::ProvidesDescSeq_var &p) // copy constructor
-+IR_ProvidesDescSeq_var::IR_ProvidesDescSeq_var (const ::IR_ProvidesDescSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ProvidesDescSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ProvidesDescSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ProvidesDescSeq_var::~ProvidesDescSeq_var (void) // destructor
-+IR_ProvidesDescSeq_var::~IR_ProvidesDescSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ProvidesDescSeq_var &
--IR::ProvidesDescSeq_var::operator= (ProvidesDescSeq *p)
-+ACE_INLINE IR_ProvidesDescSeq_var &
-+IR_ProvidesDescSeq_var::operator= (IR_ProvidesDescSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ProvidesDescSeq_var &
--IR::ProvidesDescSeq_var::operator= (const ::IR::ProvidesDescSeq_var &p)
-+ACE_INLINE IR_ProvidesDescSeq_var &
-+IR_ProvidesDescSeq_var::operator= (const ::IR_ProvidesDescSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -19633,12 +18512,12 @@
-         }
-       else
-         {
--          ProvidesDescSeq *deep_copy =
--            new ProvidesDescSeq (*p.ptr_);
-+          IR_ProvidesDescSeq *deep_copy = 
-+            new IR_ProvidesDescSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ProvidesDescSeq *tmp = deep_copy;
-+              IR_ProvidesDescSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -19649,103 +18528,103 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ProvidesDescSeq *
--IR::ProvidesDescSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_ProvidesDescSeq *
-+IR_ProvidesDescSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ProvidesDescSeq *
--IR::ProvidesDescSeq_var::operator-> (void)
-+ACE_INLINE ::IR_ProvidesDescSeq *
-+IR_ProvidesDescSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ProvidesDescSeq_var::operator const ::IR::ProvidesDescSeq &() const // cast
-+IR_ProvidesDescSeq_var::operator const ::IR_ProvidesDescSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ProvidesDescSeq_var::operator ::IR::ProvidesDescSeq &() // cast 
-+IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::ProvidesDescSeq_var::operator ::IR::ProvidesDescSeq &() const // cast 
-+IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ProvidesDescSeq_var::operator ::IR::ProvidesDescSeq *&() // cast 
-+IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ProvidesDescription &
--IR::ProvidesDescSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_ProvidesDescription &
-+IR_ProvidesDescSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const IR::ProvidesDescription &
--IR::ProvidesDescSeq_var::operator[] (CORBA::ULong index) const
-+ACE_INLINE const IR_ProvidesDescription &
-+IR_ProvidesDescSeq_var::operator[] (CORBA::ULong index) const
- {
--  return ACE_const_cast (const IR::ProvidesDescription &, this->ptr_->operator[] (index));
-+  return ACE_const_cast (const IR_ProvidesDescription &, this->ptr_->operator[] (index));
- }
- 
--ACE_INLINE const ::IR::ProvidesDescSeq &
--IR::ProvidesDescSeq_var::in (void) const
-+ACE_INLINE const ::IR_ProvidesDescSeq &
-+IR_ProvidesDescSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ProvidesDescSeq &
--IR::ProvidesDescSeq_var::inout (void)
-+ACE_INLINE ::IR_ProvidesDescSeq &
-+IR_ProvidesDescSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ProvidesDescSeq *&
--IR::ProvidesDescSeq_var::out (void)
-+ACE_INLINE ::IR_ProvidesDescSeq *&
-+IR_ProvidesDescSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ProvidesDescSeq *
--IR::ProvidesDescSeq_var::_retn (void)
-+ACE_INLINE ::IR_ProvidesDescSeq *
-+IR_ProvidesDescSeq_var::_retn (void)
- {
--  ::IR::ProvidesDescSeq *tmp = this->ptr_;
-+  ::IR_ProvidesDescSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ProvidesDescSeq *
--IR::ProvidesDescSeq_var::ptr (void) const
-+ACE_INLINE ::IR_ProvidesDescSeq *
-+IR_ProvidesDescSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ProvidesDescSeq_out
-+// Inline operations for class IR_ProvidesDescSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ProvidesDescSeq_out::ProvidesDescSeq_out (ProvidesDescSeq *&p)
-+IR_ProvidesDescSeq_out::IR_ProvidesDescSeq_out (IR_ProvidesDescSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ProvidesDescSeq_out::ProvidesDescSeq_out (ProvidesDescSeq_var &p) // constructor from _var
-+IR_ProvidesDescSeq_out::IR_ProvidesDescSeq_out (IR_ProvidesDescSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -19753,102 +18632,95 @@
- }
- 
- ACE_INLINE
--IR::ProvidesDescSeq_out::ProvidesDescSeq_out (const ::IR::ProvidesDescSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ProvidesDescSeq_out&, p).ptr_)
-+IR_ProvidesDescSeq_out::IR_ProvidesDescSeq_out (const ::IR_ProvidesDescSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ProvidesDescSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::ProvidesDescSeq_out &
--IR::ProvidesDescSeq_out::operator= (const ::IR::ProvidesDescSeq_out &p)
-+ACE_INLINE ::IR_ProvidesDescSeq_out &
-+IR_ProvidesDescSeq_out::operator= (const ::IR_ProvidesDescSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (ProvidesDescSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ProvidesDescSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ProvidesDescSeq_out &
--IR::ProvidesDescSeq_out::operator= (ProvidesDescSeq *p)
-+ACE_INLINE ::IR_ProvidesDescSeq_out &
-+IR_ProvidesDescSeq_out::operator= (IR_ProvidesDescSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ProvidesDescSeq_out::operator ::IR::ProvidesDescSeq *&() // cast
-+IR_ProvidesDescSeq_out::operator ::IR_ProvidesDescSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ProvidesDescSeq *&
--IR::ProvidesDescSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ProvidesDescSeq *&
-+IR_ProvidesDescSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ProvidesDescSeq *
--IR::ProvidesDescSeq_out::operator-> (void)
-+ACE_INLINE ::IR_ProvidesDescSeq *
-+IR_ProvidesDescSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::ProvidesDescription &
--IR::ProvidesDescSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_ProvidesDescription &
-+IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
--
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CI_)
--#define __TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CI_
--
-   // = Static operations.
--  ACE_INLINE IR::UsesDescription *
--  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (CORBA::ULong size)
-+  ACE_INLINE IR_UsesDescription *
-+  _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (CORBA::ULong size)
-   // Allocate storage for the sequence.
-   {
--    IR::UsesDescription *retval = 0;
--    ACE_NEW_RETURN (retval, IR::UsesDescription[size], 0);
-+    IR_UsesDescription *retval = 0;
-+    ACE_NEW_RETURN (retval, IR_UsesDescription[size], 0);
-     return retval;
-   }
-   
--  ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (IR::UsesDescription *buffer)
-+  ACE_INLINE void _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (IR_UsesDescription *buffer)
-   // Free the sequence.
-   {
-     delete [] buffer;
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Default constructor.
-+  _TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Default constructor.
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-+  _TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (maximum))
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum,
-+  _TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum,
-     CORBA::ULong length,
--    IR::UsesDescription *data,
-+    IR_UsesDescription *data,
-     CORBA::Boolean release)
-   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-   {
-   }
-   
-   ACE_INLINE
--  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
-+  _TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
-   // Copy constructor.
-     : TAO_Unbounded_Base_Sequence (rhs)
-   {
-     if (rhs.buffer_ != 0)
-     {
--      IR::UsesDescription *tmp1 = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (this->maximum_);
--      IR::UsesDescription * const tmp2 = ACE_reinterpret_cast (IR::UsesDescription * ACE_CAST_CONST, rhs.buffer_);
-+      IR_UsesDescription *tmp1 = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (this->maximum_);
-+      IR_UsesDescription * const tmp2 = ACE_reinterpret_cast (IR_UsesDescription * ACE_CAST_CONST, rhs.buffer_);
-       
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp1[i] = tmp2[i];
-@@ -19861,8 +18733,8 @@
-     }
-   }
-   
--  ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq &
--  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
-+  ACE_INLINE _TAO_Unbounded_Sequence_IR_UsesDescSeq &
-+  _TAO_Unbounded_Sequence_IR_UsesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
-   // Assignment operator.
-   {
-     if (this == &rhs)
-@@ -19873,7 +18745,7 @@
-       if (this->maximum_ < rhs.maximum_)
-       {
-         // free the old buffer
--        IR::UsesDescription *tmp = ACE_reinterpret_cast (IR::UsesDescription *, this->buffer_);
-+        IR_UsesDescription *tmp = ACE_reinterpret_cast (IR_UsesDescription *, this->buffer_);
-         _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
-         this->buffer_ = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (rhs.maximum_);
-       }
-@@ -19883,8 +18755,8 @@
-     
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
-     
--    IR::UsesDescription *tmp1 = ACE_reinterpret_cast (IR::UsesDescription *, this->buffer_);
--    IR::UsesDescription * const tmp2 = ACE_reinterpret_cast (IR::UsesDescription * ACE_CAST_CONST, rhs.buffer_);
-+    IR_UsesDescription *tmp1 = ACE_reinterpret_cast (IR_UsesDescription *, this->buffer_);
-+    IR_UsesDescription * const tmp2 = ACE_reinterpret_cast (IR_UsesDescription * ACE_CAST_CONST, rhs.buffer_);
-     
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-       tmp1[i] = tmp2[i];
-@@ -19893,30 +18765,30 @@
-   }
-   
-   // = Accessors.
--  ACE_INLINE IR::UsesDescription &
--  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i)
-+  ACE_INLINE IR_UsesDescription &
-+  _TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i)
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::UsesDescription* tmp = ACE_reinterpret_cast(IR::UsesDescription*,this->buffer_);
-+    IR_UsesDescription* tmp = ACE_reinterpret_cast(IR_UsesDescription*,this->buffer_);
-     return tmp[i];
-   }
-   
--  ACE_INLINE const IR::UsesDescription &
--  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i) const
-+  ACE_INLINE const IR_UsesDescription &
-+  _TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i) const
-   // operator []
-   {
-     ACE_ASSERT (i < this->maximum_);
--    IR::UsesDescription * const tmp = ACE_reinterpret_cast (IR::UsesDescription* ACE_CAST_CONST, this->buffer_);
-+    IR_UsesDescription * const tmp = ACE_reinterpret_cast (IR_UsesDescription* ACE_CAST_CONST, this->buffer_);
-     return tmp[i];
-   }
-   
-   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-   
--  ACE_INLINE IR::UsesDescription *
--  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (CORBA::Boolean orphan)
-+  ACE_INLINE IR_UsesDescription *
-+  _TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (CORBA::Boolean orphan)
-   {
--    IR::UsesDescription *result = 0;
-+    IR_UsesDescription *result = 0;
-     if (orphan == 0)
-     {
-       // We retain ownership.
-@@ -19928,7 +18800,7 @@
-       }
-       else
-       {
--        result = ACE_reinterpret_cast (IR::UsesDescription*, this->buffer_);
-+        result = ACE_reinterpret_cast (IR_UsesDescription*, this->buffer_);
-       }
-     }
-     else // if (orphan == 1)
-@@ -19937,7 +18809,7 @@
-       {
-         // We set the state back to default and relinquish
-         // ownership.
--        result = ACE_reinterpret_cast(IR::UsesDescription*,this->buffer_);
-+        result = ACE_reinterpret_cast(IR_UsesDescription*,this->buffer_);
-         this->maximum_ = 0;
-         this->length_ = 0;
-         this->buffer_ = 0;
-@@ -19947,76 +18819,70 @@
-     return result;
-   }
-   
--  ACE_INLINE const IR::UsesDescription *
--  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (void) const
-+  ACE_INLINE const IR_UsesDescription *
-+  _TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (void) const
-   {
--    return ACE_reinterpret_cast(const IR::UsesDescription * ACE_CAST_CONST, this->buffer_);
-+    return ACE_reinterpret_cast(const IR_UsesDescription * ACE_CAST_CONST, this->buffer_);
-   }
-   
-   ACE_INLINE void
--  IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::replace (CORBA::ULong max,
-+  _TAO_Unbounded_Sequence_IR_UsesDescSeq::replace (CORBA::ULong max,
-   CORBA::ULong length,
--  IR::UsesDescription *data,
-+  IR_UsesDescription *data,
-   CORBA::Boolean release)
-   {
-     this->maximum_ = max;
-     this->length_ = length;
-     if (this->buffer_ && this->release_ == 1)
-     {
--      IR::UsesDescription *tmp = ACE_reinterpret_cast(IR::UsesDescription*,this->buffer_);
-+      IR_UsesDescription *tmp = ACE_reinterpret_cast(IR_UsesDescription*,this->buffer_);
-       _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
-     }
-     this->buffer_ = data;
-     this->release_ = release;
-   }
-   
--#endif /* end #if !defined */
--
--
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- 
--#if !defined (_IR_USESDESCSEQ_CI_)
--#define _IR_USESDESCSEQ_CI_
--
- // *************************************************************
--// Inline operations for class IR::UsesDescSeq_var
-+// Inline operations for class IR_UsesDescSeq_var
- // *************************************************************
- 
- ACE_INLINE
--IR::UsesDescSeq_var::UsesDescSeq_var (void) // default constructor
-+IR_UsesDescSeq_var::IR_UsesDescSeq_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::UsesDescSeq_var::UsesDescSeq_var (UsesDescSeq *p)
-+IR_UsesDescSeq_var::IR_UsesDescSeq_var (IR_UsesDescSeq *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::UsesDescSeq_var::UsesDescSeq_var (const ::IR::UsesDescSeq_var &p) // copy constructor
-+IR_UsesDescSeq_var::IR_UsesDescSeq_var (const ::IR_UsesDescSeq_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::UsesDescSeq (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_UsesDescSeq (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::UsesDescSeq_var::~UsesDescSeq_var (void) // destructor
-+IR_UsesDescSeq_var::~IR_UsesDescSeq_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::UsesDescSeq_var &
--IR::UsesDescSeq_var::operator= (UsesDescSeq *p)
-+ACE_INLINE IR_UsesDescSeq_var &
-+IR_UsesDescSeq_var::operator= (IR_UsesDescSeq *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::UsesDescSeq_var &
--IR::UsesDescSeq_var::operator= (const ::IR::UsesDescSeq_var &p)
-+ACE_INLINE IR_UsesDescSeq_var &
-+IR_UsesDescSeq_var::operator= (const ::IR_UsesDescSeq_var &p) // deep copy
- {
-   if (this != &p)
-     {
-@@ -20027,12 +18893,12 @@
-         }
-       else
-         {
--          UsesDescSeq *deep_copy =
--            new UsesDescSeq (*p.ptr_);
-+          IR_UsesDescSeq *deep_copy = 
-+            new IR_UsesDescSeq (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              UsesDescSeq *tmp = deep_copy;
-+              IR_UsesDescSeq *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -20043,103 +18909,103 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::UsesDescSeq *
--IR::UsesDescSeq_var::operator-> (void) const
-+ACE_INLINE const ::IR_UsesDescSeq *
-+IR_UsesDescSeq_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UsesDescSeq *
--IR::UsesDescSeq_var::operator-> (void)
-+ACE_INLINE ::IR_UsesDescSeq *
-+IR_UsesDescSeq_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--IR::UsesDescSeq_var::operator const ::IR::UsesDescSeq &() const // cast
-+IR_UsesDescSeq_var::operator const ::IR_UsesDescSeq &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::UsesDescSeq_var::operator ::IR::UsesDescSeq &() // cast 
-+IR_UsesDescSeq_var::operator ::IR_UsesDescSeq &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE 
--IR::UsesDescSeq_var::operator ::IR::UsesDescSeq &() const // cast 
-+IR_UsesDescSeq_var::operator ::IR_UsesDescSeq &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::UsesDescSeq_var::operator ::IR::UsesDescSeq *&() // cast 
-+IR_UsesDescSeq_var::operator ::IR_UsesDescSeq *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UsesDescription &
--IR::UsesDescSeq_var::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_UsesDescription &
-+IR_UsesDescSeq_var::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--ACE_INLINE const IR::UsesDescription &
--IR::UsesDescSeq_var::operator[] (CORBA::ULong index) const
-+ACE_INLINE const IR_UsesDescription &
-+IR_UsesDescSeq_var::operator[] (CORBA::ULong index) const
- {
--  return ACE_const_cast (const IR::UsesDescription &, this->ptr_->operator[] (index));
-+  return ACE_const_cast (const IR_UsesDescription &, this->ptr_->operator[] (index));
- }
- 
--ACE_INLINE const ::IR::UsesDescSeq &
--IR::UsesDescSeq_var::in (void) const
-+ACE_INLINE const ::IR_UsesDescSeq &
-+IR_UsesDescSeq_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::UsesDescSeq &
--IR::UsesDescSeq_var::inout (void)
-+ACE_INLINE ::IR_UsesDescSeq &
-+IR_UsesDescSeq_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::UsesDescSeq *&
--IR::UsesDescSeq_var::out (void)
-+ACE_INLINE ::IR_UsesDescSeq *&
-+IR_UsesDescSeq_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UsesDescSeq *
--IR::UsesDescSeq_var::_retn (void)
-+ACE_INLINE ::IR_UsesDescSeq *
-+IR_UsesDescSeq_var::_retn (void)
- {
--  ::IR::UsesDescSeq *tmp = this->ptr_;
-+  ::IR_UsesDescSeq *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::UsesDescSeq *
--IR::UsesDescSeq_var::ptr (void) const
-+ACE_INLINE ::IR_UsesDescSeq *
-+IR_UsesDescSeq_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::UsesDescSeq_out
-+// Inline operations for class IR_UsesDescSeq_out
- // *************************************************************
- 
- ACE_INLINE
--IR::UsesDescSeq_out::UsesDescSeq_out (UsesDescSeq *&p)
-+IR_UsesDescSeq_out::IR_UsesDescSeq_out (IR_UsesDescSeq *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::UsesDescSeq_out::UsesDescSeq_out (UsesDescSeq_var &p) // constructor from _var
-+IR_UsesDescSeq_out::IR_UsesDescSeq_out (IR_UsesDescSeq_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -20147,90 +19013,87 @@
- }
- 
- ACE_INLINE
--IR::UsesDescSeq_out::UsesDescSeq_out (const ::IR::UsesDescSeq_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (UsesDescSeq_out&, p).ptr_)
-+IR_UsesDescSeq_out::IR_UsesDescSeq_out (const ::IR_UsesDescSeq_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_UsesDescSeq_out&, p).ptr_)
- {}
- 
--ACE_INLINE ::IR::UsesDescSeq_out &
--IR::UsesDescSeq_out::operator= (const ::IR::UsesDescSeq_out &p)
-+ACE_INLINE ::IR_UsesDescSeq_out &
-+IR_UsesDescSeq_out::operator= (const ::IR_UsesDescSeq_out &p)
- {
--  this->ptr_ = ACE_const_cast (UsesDescSeq_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_UsesDescSeq_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE ::IR::UsesDescSeq_out &
--IR::UsesDescSeq_out::operator= (UsesDescSeq *p)
-+ACE_INLINE ::IR_UsesDescSeq_out &
-+IR_UsesDescSeq_out::operator= (IR_UsesDescSeq *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::UsesDescSeq_out::operator ::IR::UsesDescSeq *&() // cast
-+IR_UsesDescSeq_out::operator ::IR_UsesDescSeq *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UsesDescSeq *&
--IR::UsesDescSeq_out::ptr (void) // ptr
-+ACE_INLINE ::IR_UsesDescSeq *&
-+IR_UsesDescSeq_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::UsesDescSeq *
--IR::UsesDescSeq_out::operator-> (void)
-+ACE_INLINE ::IR_UsesDescSeq *
-+IR_UsesDescSeq_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE IR::UsesDescription &
--IR::UsesDescSeq_out::operator[] (CORBA::ULong index)
-+ACE_INLINE IR_UsesDescription &
-+IR_UsesDescSeq_out::operator[] (CORBA::ULong index)
- {
-   return this->ptr_->operator[] (index);
- }
- 
--
--#endif /* end #if !defined */
--
- // *************************************************************
--// Inline operations for class IR::EventDescription_var
-+// Inline operations for class IR_EventDescription_var
- // *************************************************************
- 
- ACE_INLINE
--IR::EventDescription_var::EventDescription_var (void) // default constructor
-+IR_EventDescription_var::IR_EventDescription_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::EventDescription_var::EventDescription_var (EventDescription *p)
-+IR_EventDescription_var::IR_EventDescription_var (IR_EventDescription *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::EventDescription_var::EventDescription_var (const ::IR::EventDescription_var &p) // copy constructor
-+IR_EventDescription_var::IR_EventDescription_var (const ::IR_EventDescription_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::EventDescription (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_EventDescription (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::EventDescription_var::~EventDescription_var (void) // destructor
-+IR_EventDescription_var::~IR_EventDescription_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::EventDescription_var &
--IR::EventDescription_var::operator= (EventDescription *p)
-+ACE_INLINE IR_EventDescription_var &
-+IR_EventDescription_var::operator= (IR_EventDescription *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::EventDescription_var &
--IR::EventDescription_var::operator= (const ::IR::EventDescription_var &p)
-+ACE_INLINE ::IR_EventDescription_var &
-+IR_EventDescription_var::operator= (const ::IR_EventDescription_var &p)
- {
-   if (this != &p)
-     {
-@@ -20241,12 +19104,12 @@
-         }
-       else
-         {
--          EventDescription *deep_copy =
--            new EventDescription (*p.ptr_);
-+          IR_EventDescription *deep_copy = 
-+            new IR_EventDescription (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              EventDescription *tmp = deep_copy;
-+              IR_EventDescription *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -20257,91 +19120,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::EventDescription *
--IR::EventDescription_var::operator-> (void) const
-+ACE_INLINE const ::IR_EventDescription *
-+IR_EventDescription_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::EventDescription *
--IR::EventDescription_var::operator-> (void)
-+ACE_INLINE ::IR_EventDescription *
-+IR_EventDescription_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::EventDescription_var::operator const ::IR::EventDescription &() const // cast
-+IR_EventDescription_var::operator const ::IR_EventDescription &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::EventDescription_var::operator ::IR::EventDescription &() // cast 
-+IR_EventDescription_var::operator ::IR_EventDescription &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::EventDescription_var::operator ::IR::EventDescription &() const // cast 
-+IR_EventDescription_var::operator ::IR_EventDescription &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::EventDescription_var::operator ::IR::EventDescription *&() // cast 
-+IR_EventDescription_var::operator ::IR_EventDescription *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::EventDescription &
--IR::EventDescription_var::in (void) const
-+ACE_INLINE const ::IR_EventDescription &
-+IR_EventDescription_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::EventDescription &
--IR::EventDescription_var::inout (void)
-+ACE_INLINE ::IR_EventDescription &
-+IR_EventDescription_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::EventDescription *&
--IR::EventDescription_var::out (void)
-+ACE_INLINE ::IR_EventDescription *&
-+IR_EventDescription_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::EventDescription *
--IR::EventDescription_var::_retn (void)
-+ACE_INLINE ::IR_EventDescription *
-+IR_EventDescription_var::_retn (void)
- {
--  ::IR::EventDescription *tmp = this->ptr_;
-+  ::IR_EventDescription *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::EventDescription *
--IR::EventDescription_var::ptr (void) const
-+ACE_INLINE ::IR_EventDescription *
-+IR_EventDescription_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::EventDescription_out
-+// Inline operations for class IR_EventDescription_out
- // *************************************************************
- 
- ACE_INLINE
--IR::EventDescription_out::EventDescription_out (::IR::EventDescription *&p)
-+IR_EventDescription_out::IR_EventDescription_out (::IR_EventDescription *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::EventDescription_out::EventDescription_out (EventDescription_var &p) // constructor from _var
-+IR_EventDescription_out::IR_EventDescription_out (IR_EventDescription_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -20349,81 +19212,81 @@
- }
- 
- ACE_INLINE
--IR::EventDescription_out::EventDescription_out (const ::IR::EventDescription_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (EventDescription_out&, p).ptr_)
-+IR_EventDescription_out::IR_EventDescription_out (const ::IR_EventDescription_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_EventDescription_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::EventDescription_out &
--IR::EventDescription_out::operator= (const ::IR::EventDescription_out &p)
-+ACE_INLINE IR_EventDescription_out &
-+IR_EventDescription_out::operator= (const ::IR_EventDescription_out &p)
- {
--  this->ptr_ = ACE_const_cast (EventDescription_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_EventDescription_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::EventDescription_out &
--IR::EventDescription_out::operator= (EventDescription *p)
-+ACE_INLINE IR_EventDescription_out &
-+IR_EventDescription_out::operator= (IR_EventDescription *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::EventDescription_out::operator ::IR::EventDescription *&() // cast
-+IR_EventDescription_out::operator ::IR_EventDescription *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::EventDescription *&
--IR::EventDescription_out::ptr (void) // ptr
-+ACE_INLINE ::IR_EventDescription *&
-+IR_EventDescription_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::EventDescription *
--IR::EventDescription_out::operator-> (void)
-+ACE_INLINE ::IR_EventDescription *
-+IR_EventDescription_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ComponentDescription_var
-+// Inline operations for class IR_ComponentDescription_var
- // *************************************************************
- 
- ACE_INLINE
--IR::ComponentDescription_var::ComponentDescription_var (void) // default constructor
-+IR_ComponentDescription_var::IR_ComponentDescription_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::ComponentDescription_var::ComponentDescription_var (ComponentDescription *p)
-+IR_ComponentDescription_var::IR_ComponentDescription_var (IR_ComponentDescription *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::ComponentDescription_var::ComponentDescription_var (const ::IR::ComponentDescription_var &p) // copy constructor
-+IR_ComponentDescription_var::IR_ComponentDescription_var (const ::IR_ComponentDescription_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::ComponentDescription (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_ComponentDescription (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ComponentDescription_var::~ComponentDescription_var (void) // destructor
-+IR_ComponentDescription_var::~IR_ComponentDescription_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::ComponentDescription_var &
--IR::ComponentDescription_var::operator= (ComponentDescription *p)
-+ACE_INLINE IR_ComponentDescription_var &
-+IR_ComponentDescription_var::operator= (IR_ComponentDescription *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::ComponentDescription_var &
--IR::ComponentDescription_var::operator= (const ::IR::ComponentDescription_var &p)
-+ACE_INLINE ::IR_ComponentDescription_var &
-+IR_ComponentDescription_var::operator= (const ::IR_ComponentDescription_var &p)
- {
-   if (this != &p)
-     {
-@@ -20434,12 +19297,12 @@
-         }
-       else
-         {
--          ComponentDescription *deep_copy =
--            new ComponentDescription (*p.ptr_);
-+          IR_ComponentDescription *deep_copy = 
-+            new IR_ComponentDescription (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              ComponentDescription *tmp = deep_copy;
-+              IR_ComponentDescription *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -20450,91 +19313,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::ComponentDescription *
--IR::ComponentDescription_var::operator-> (void) const
-+ACE_INLINE const ::IR_ComponentDescription *
-+IR_ComponentDescription_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentDescription *
--IR::ComponentDescription_var::operator-> (void)
-+ACE_INLINE ::IR_ComponentDescription *
-+IR_ComponentDescription_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::ComponentDescription_var::operator const ::IR::ComponentDescription &() const // cast
-+IR_ComponentDescription_var::operator const ::IR_ComponentDescription &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::ComponentDescription_var::operator ::IR::ComponentDescription &() // cast 
-+IR_ComponentDescription_var::operator ::IR_ComponentDescription &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::ComponentDescription_var::operator ::IR::ComponentDescription &() const // cast 
-+IR_ComponentDescription_var::operator ::IR_ComponentDescription &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::ComponentDescription_var::operator ::IR::ComponentDescription *&() // cast 
-+IR_ComponentDescription_var::operator ::IR_ComponentDescription *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::ComponentDescription &
--IR::ComponentDescription_var::in (void) const
-+ACE_INLINE const ::IR_ComponentDescription &
-+IR_ComponentDescription_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentDescription &
--IR::ComponentDescription_var::inout (void)
-+ACE_INLINE ::IR_ComponentDescription &
-+IR_ComponentDescription_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::ComponentDescription *&
--IR::ComponentDescription_var::out (void)
-+ACE_INLINE ::IR_ComponentDescription *&
-+IR_ComponentDescription_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentDescription *
--IR::ComponentDescription_var::_retn (void)
-+ACE_INLINE ::IR_ComponentDescription *
-+IR_ComponentDescription_var::_retn (void)
- {
--  ::IR::ComponentDescription *tmp = this->ptr_;
-+  ::IR_ComponentDescription *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::ComponentDescription *
--IR::ComponentDescription_var::ptr (void) const
-+ACE_INLINE ::IR_ComponentDescription *
-+IR_ComponentDescription_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::ComponentDescription_out
-+// Inline operations for class IR_ComponentDescription_out
- // *************************************************************
- 
- ACE_INLINE
--IR::ComponentDescription_out::ComponentDescription_out (::IR::ComponentDescription *&p)
-+IR_ComponentDescription_out::IR_ComponentDescription_out (::IR_ComponentDescription *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::ComponentDescription_out::ComponentDescription_out (ComponentDescription_var &p) // constructor from _var
-+IR_ComponentDescription_out::IR_ComponentDescription_out (IR_ComponentDescription_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -20542,81 +19405,81 @@
- }
- 
- ACE_INLINE
--IR::ComponentDescription_out::ComponentDescription_out (const ::IR::ComponentDescription_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (ComponentDescription_out&, p).ptr_)
-+IR_ComponentDescription_out::IR_ComponentDescription_out (const ::IR_ComponentDescription_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_ComponentDescription_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::ComponentDescription_out &
--IR::ComponentDescription_out::operator= (const ::IR::ComponentDescription_out &p)
-+ACE_INLINE IR_ComponentDescription_out &
-+IR_ComponentDescription_out::operator= (const ::IR_ComponentDescription_out &p)
- {
--  this->ptr_ = ACE_const_cast (ComponentDescription_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_ComponentDescription_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::ComponentDescription_out &
--IR::ComponentDescription_out::operator= (ComponentDescription *p)
-+ACE_INLINE IR_ComponentDescription_out &
-+IR_ComponentDescription_out::operator= (IR_ComponentDescription *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::ComponentDescription_out::operator ::IR::ComponentDescription *&() // cast
-+IR_ComponentDescription_out::operator ::IR_ComponentDescription *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentDescription *&
--IR::ComponentDescription_out::ptr (void) // ptr
-+ACE_INLINE ::IR_ComponentDescription *&
-+IR_ComponentDescription_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::ComponentDescription *
--IR::ComponentDescription_out::operator-> (void)
-+ACE_INLINE ::IR_ComponentDescription *
-+IR_ComponentDescription_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::PrimaryKeyDescription_var
-+// Inline operations for class IR_PrimaryKeyDescription_var
- // *************************************************************
- 
- ACE_INLINE
--IR::PrimaryKeyDescription_var::PrimaryKeyDescription_var (void) // default constructor
-+IR_PrimaryKeyDescription_var::IR_PrimaryKeyDescription_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::PrimaryKeyDescription_var::PrimaryKeyDescription_var (PrimaryKeyDescription *p)
-+IR_PrimaryKeyDescription_var::IR_PrimaryKeyDescription_var (IR_PrimaryKeyDescription *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::PrimaryKeyDescription_var::PrimaryKeyDescription_var (const ::IR::PrimaryKeyDescription_var &p) // copy constructor
-+IR_PrimaryKeyDescription_var::IR_PrimaryKeyDescription_var (const ::IR_PrimaryKeyDescription_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::PrimaryKeyDescription (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_PrimaryKeyDescription (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::PrimaryKeyDescription_var::~PrimaryKeyDescription_var (void) // destructor
-+IR_PrimaryKeyDescription_var::~IR_PrimaryKeyDescription_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::PrimaryKeyDescription_var &
--IR::PrimaryKeyDescription_var::operator= (PrimaryKeyDescription *p)
-+ACE_INLINE IR_PrimaryKeyDescription_var &
-+IR_PrimaryKeyDescription_var::operator= (IR_PrimaryKeyDescription *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::PrimaryKeyDescription_var &
--IR::PrimaryKeyDescription_var::operator= (const ::IR::PrimaryKeyDescription_var &p)
-+ACE_INLINE ::IR_PrimaryKeyDescription_var &
-+IR_PrimaryKeyDescription_var::operator= (const ::IR_PrimaryKeyDescription_var &p)
- {
-   if (this != &p)
-     {
-@@ -20627,12 +19490,12 @@
-         }
-       else
-         {
--          PrimaryKeyDescription *deep_copy =
--            new PrimaryKeyDescription (*p.ptr_);
-+          IR_PrimaryKeyDescription *deep_copy = 
-+            new IR_PrimaryKeyDescription (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              PrimaryKeyDescription *tmp = deep_copy;
-+              IR_PrimaryKeyDescription *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -20643,91 +19506,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::PrimaryKeyDescription *
--IR::PrimaryKeyDescription_var::operator-> (void) const
-+ACE_INLINE const ::IR_PrimaryKeyDescription *
-+IR_PrimaryKeyDescription_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::PrimaryKeyDescription *
--IR::PrimaryKeyDescription_var::operator-> (void)
-+ACE_INLINE ::IR_PrimaryKeyDescription *
-+IR_PrimaryKeyDescription_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::PrimaryKeyDescription_var::operator const ::IR::PrimaryKeyDescription &() const // cast
-+IR_PrimaryKeyDescription_var::operator const ::IR_PrimaryKeyDescription &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::PrimaryKeyDescription_var::operator ::IR::PrimaryKeyDescription &() // cast 
-+IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::PrimaryKeyDescription_var::operator ::IR::PrimaryKeyDescription &() const // cast 
-+IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::PrimaryKeyDescription_var::operator ::IR::PrimaryKeyDescription *&() // cast 
-+IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::PrimaryKeyDescription &
--IR::PrimaryKeyDescription_var::in (void) const
-+ACE_INLINE const ::IR_PrimaryKeyDescription &
-+IR_PrimaryKeyDescription_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::PrimaryKeyDescription &
--IR::PrimaryKeyDescription_var::inout (void)
-+ACE_INLINE ::IR_PrimaryKeyDescription &
-+IR_PrimaryKeyDescription_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::PrimaryKeyDescription *&
--IR::PrimaryKeyDescription_var::out (void)
-+ACE_INLINE ::IR_PrimaryKeyDescription *&
-+IR_PrimaryKeyDescription_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::PrimaryKeyDescription *
--IR::PrimaryKeyDescription_var::_retn (void)
-+ACE_INLINE ::IR_PrimaryKeyDescription *
-+IR_PrimaryKeyDescription_var::_retn (void)
- {
--  ::IR::PrimaryKeyDescription *tmp = this->ptr_;
-+  ::IR_PrimaryKeyDescription *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::PrimaryKeyDescription *
--IR::PrimaryKeyDescription_var::ptr (void) const
-+ACE_INLINE ::IR_PrimaryKeyDescription *
-+IR_PrimaryKeyDescription_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::PrimaryKeyDescription_out
-+// Inline operations for class IR_PrimaryKeyDescription_out
- // *************************************************************
- 
- ACE_INLINE
--IR::PrimaryKeyDescription_out::PrimaryKeyDescription_out (::IR::PrimaryKeyDescription *&p)
-+IR_PrimaryKeyDescription_out::IR_PrimaryKeyDescription_out (::IR_PrimaryKeyDescription *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::PrimaryKeyDescription_out::PrimaryKeyDescription_out (PrimaryKeyDescription_var &p) // constructor from _var
-+IR_PrimaryKeyDescription_out::IR_PrimaryKeyDescription_out (IR_PrimaryKeyDescription_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -20735,81 +19598,81 @@
- }
- 
- ACE_INLINE
--IR::PrimaryKeyDescription_out::PrimaryKeyDescription_out (const ::IR::PrimaryKeyDescription_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (PrimaryKeyDescription_out&, p).ptr_)
-+IR_PrimaryKeyDescription_out::IR_PrimaryKeyDescription_out (const ::IR_PrimaryKeyDescription_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_PrimaryKeyDescription_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::PrimaryKeyDescription_out &
--IR::PrimaryKeyDescription_out::operator= (const ::IR::PrimaryKeyDescription_out &p)
-+ACE_INLINE IR_PrimaryKeyDescription_out &
-+IR_PrimaryKeyDescription_out::operator= (const ::IR_PrimaryKeyDescription_out &p)
- {
--  this->ptr_ = ACE_const_cast (PrimaryKeyDescription_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_PrimaryKeyDescription_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::PrimaryKeyDescription_out &
--IR::PrimaryKeyDescription_out::operator= (PrimaryKeyDescription *p)
-+ACE_INLINE IR_PrimaryKeyDescription_out &
-+IR_PrimaryKeyDescription_out::operator= (IR_PrimaryKeyDescription *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::PrimaryKeyDescription_out::operator ::IR::PrimaryKeyDescription *&() // cast
-+IR_PrimaryKeyDescription_out::operator ::IR_PrimaryKeyDescription *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::PrimaryKeyDescription *&
--IR::PrimaryKeyDescription_out::ptr (void) // ptr
-+ACE_INLINE ::IR_PrimaryKeyDescription *&
-+IR_PrimaryKeyDescription_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::PrimaryKeyDescription *
--IR::PrimaryKeyDescription_out::operator-> (void)
-+ACE_INLINE ::IR_PrimaryKeyDescription *
-+IR_PrimaryKeyDescription_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::HomeDescription_var
-+// Inline operations for class IR_HomeDescription_var
- // *************************************************************
- 
- ACE_INLINE
--IR::HomeDescription_var::HomeDescription_var (void) // default constructor
-+IR_HomeDescription_var::IR_HomeDescription_var (void) // default constructor
-   : ptr_ (0)
- {}
- 
- ACE_INLINE
--IR::HomeDescription_var::HomeDescription_var (HomeDescription *p)
-+IR_HomeDescription_var::IR_HomeDescription_var (IR_HomeDescription *p)
-   : ptr_ (p)
- {}
- 
- ACE_INLINE
--IR::HomeDescription_var::HomeDescription_var (const ::IR::HomeDescription_var &p) // copy constructor
-+IR_HomeDescription_var::IR_HomeDescription_var (const ::IR_HomeDescription_var &p) // copy constructor
- {
-   if (p.ptr_)
--    ACE_NEW (this->ptr_, ::IR::HomeDescription (*p.ptr_));
-+    ACE_NEW (this->ptr_, ::IR_HomeDescription (*p.ptr_));
-   else
-     this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::HomeDescription_var::~HomeDescription_var (void) // destructor
-+IR_HomeDescription_var::~IR_HomeDescription_var (void) // destructor
- {
-   delete this->ptr_;
- }
- 
--ACE_INLINE IR::HomeDescription_var &
--IR::HomeDescription_var::operator= (HomeDescription *p)
-+ACE_INLINE IR_HomeDescription_var &
-+IR_HomeDescription_var::operator= (IR_HomeDescription *p)
- {
-   delete this->ptr_;
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE ::IR::HomeDescription_var &
--IR::HomeDescription_var::operator= (const ::IR::HomeDescription_var &p)
-+ACE_INLINE ::IR_HomeDescription_var &
-+IR_HomeDescription_var::operator= (const ::IR_HomeDescription_var &p)
- {
-   if (this != &p)
-     {
-@@ -20820,12 +19683,12 @@
-         }
-       else
-         {
--          HomeDescription *deep_copy =
--            new HomeDescription (*p.ptr_);
-+          IR_HomeDescription *deep_copy = 
-+            new IR_HomeDescription (*p.ptr_);
-           
-           if (deep_copy != 0)
-             {
--              HomeDescription *tmp = deep_copy;
-+              IR_HomeDescription *tmp = deep_copy;
-               deep_copy = this->ptr_;
-               this->ptr_ = tmp;
-               delete deep_copy;
-@@ -20836,91 +19699,91 @@
-   return *this;
- }
- 
--ACE_INLINE const ::IR::HomeDescription *
--IR::HomeDescription_var::operator-> (void) const
-+ACE_INLINE const ::IR_HomeDescription *
-+IR_HomeDescription_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::HomeDescription *
--IR::HomeDescription_var::operator-> (void)
-+ACE_INLINE ::IR_HomeDescription *
-+IR_HomeDescription_var::operator-> (void)
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--IR::HomeDescription_var::operator const ::IR::HomeDescription &() const // cast
-+IR_HomeDescription_var::operator const ::IR_HomeDescription &() const // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::HomeDescription_var::operator ::IR::HomeDescription &() // cast 
-+IR_HomeDescription_var::operator ::IR_HomeDescription &() // cast 
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--IR::HomeDescription_var::operator ::IR::HomeDescription &() const // cast 
-+IR_HomeDescription_var::operator ::IR_HomeDescription &() const // cast 
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--IR::HomeDescription_var::operator ::IR::HomeDescription *&() // cast 
-+IR_HomeDescription_var::operator ::IR_HomeDescription *&() // cast 
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE const ::IR::HomeDescription &
--IR::HomeDescription_var::in (void) const
-+ACE_INLINE const ::IR_HomeDescription &
-+IR_HomeDescription_var::in (void) const
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE ::IR::HomeDescription &
--IR::HomeDescription_var::inout (void)
-+ACE_INLINE ::IR_HomeDescription &
-+IR_HomeDescription_var::inout (void)
- {
-   return *this->ptr_;
- }
- 
- // mapping for variable size 
--ACE_INLINE ::IR::HomeDescription *&
--IR::HomeDescription_var::out (void)
-+ACE_INLINE ::IR_HomeDescription *&
-+IR_HomeDescription_var::out (void)
- {
-   delete this->ptr_;
-   this->ptr_ = 0;
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::HomeDescription *
--IR::HomeDescription_var::_retn (void)
-+ACE_INLINE ::IR_HomeDescription *
-+IR_HomeDescription_var::_retn (void)
- {
--  ::IR::HomeDescription *tmp = this->ptr_;
-+  ::IR_HomeDescription *tmp = this->ptr_;
-   this->ptr_ = 0;
-   return tmp;
- }
- 
--ACE_INLINE ::IR::HomeDescription *
--IR::HomeDescription_var::ptr (void) const
-+ACE_INLINE ::IR_HomeDescription *
-+IR_HomeDescription_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- // *************************************************************
--// Inline operations for class IR::HomeDescription_out
-+// Inline operations for class IR_HomeDescription_out
- // *************************************************************
- 
- ACE_INLINE
--IR::HomeDescription_out::HomeDescription_out (::IR::HomeDescription *&p)
-+IR_HomeDescription_out::IR_HomeDescription_out (::IR_HomeDescription *&p)
-   : ptr_ (p)
- {
-   this->ptr_ = 0;
- }
- 
- ACE_INLINE
--IR::HomeDescription_out::HomeDescription_out (HomeDescription_var &p) // constructor from _var
-+IR_HomeDescription_out::IR_HomeDescription_out (IR_HomeDescription_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   delete this->ptr_;
-@@ -20928,56 +19791,56 @@
- }
- 
- ACE_INLINE
--IR::HomeDescription_out::HomeDescription_out (const ::IR::HomeDescription_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (HomeDescription_out&, p).ptr_)
-+IR_HomeDescription_out::IR_HomeDescription_out (const ::IR_HomeDescription_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (IR_HomeDescription_out&, p).ptr_)
- {}
- 
--ACE_INLINE IR::HomeDescription_out &
--IR::HomeDescription_out::operator= (const ::IR::HomeDescription_out &p)
-+ACE_INLINE IR_HomeDescription_out &
-+IR_HomeDescription_out::operator= (const ::IR_HomeDescription_out &p)
- {
--  this->ptr_ = ACE_const_cast (HomeDescription_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (IR_HomeDescription_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE IR::HomeDescription_out &
--IR::HomeDescription_out::operator= (HomeDescription *p)
-+ACE_INLINE IR_HomeDescription_out &
-+IR_HomeDescription_out::operator= (IR_HomeDescription *p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--IR::HomeDescription_out::operator ::IR::HomeDescription *&() // cast
-+IR_HomeDescription_out::operator ::IR_HomeDescription *&() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::HomeDescription *&
--IR::HomeDescription_out::ptr (void) // ptr
-+ACE_INLINE ::IR_HomeDescription *&
-+IR_HomeDescription_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::IR::HomeDescription *
--IR::HomeDescription_out::operator-> (void)
-+ACE_INLINE ::IR_HomeDescription *
-+IR_HomeDescription_out::operator-> (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::DefinitionKind &_tao_enumval)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_DefinitionKind &_tao_enumval)
- {
-   CORBA::ULong _tao_temp = _tao_enumval;
-   return strm << _tao_temp;
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::DefinitionKind &_tao_enumval)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_DefinitionKind &_tao_enumval)
- {
-   CORBA::ULong _tao_temp = 0;
-   CORBA::Boolean _tao_result = strm >> _tao_temp;
-   
-   if (_tao_result == 1)
-     {
--      _tao_enumval = ACE_static_cast (IR::DefinitionKind, _tao_temp);
-+      _tao_enumval = ACE_static_cast (IR_DefinitionKind, _tao_temp);
-     }
-   
-   return _tao_result;
-@@ -20985,19 +19848,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const CORBA::IRObject_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    CORBA::IRObject_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const CORBA::IRObject_ptr _tao_objref
-+    const CORBA_IRObject_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21007,7 +19859,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    CORBA::IRObject_ptr &_tao_objref
-+    CORBA_IRObject_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -21017,7 +19869,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      CORBA::IRObject::_unchecked_narrow (
-+      CORBA_IRObject::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -21032,48 +19884,7 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::Contained_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::Contained_ptr &
--  );
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::Repository_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::Repository_ptr &
--  );
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::Container_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::Container_ptr &
--  );
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::Contained_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::Contained_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::Contained::Description &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_Contained::Description &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.kind) &&
-@@ -21085,7 +19896,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::Contained::Description &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Contained::Description &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.kind) &&
-@@ -21100,7 +19911,7 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &strm,
--    const IR::Contained_ptr _tao_objref
-+    const IR_Contained_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21110,7 +19921,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::Contained_ptr &_tao_objref
-+    IR_Contained_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -21120,7 +19931,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::Contained::_unchecked_narrow (
-+      IR_Contained::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -21135,417 +19946,133 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean
--operator<< (
-+CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::ModuleDef_ptr
-+    const IR_InterfaceDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator>> (
-+
-+CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::ModuleDef_ptr &
-+    IR_InterfaceDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator<< (
-+
-+CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::ConstantDef_ptr
-+    const IR_ValueDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator>> (
-+
-+CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::ConstantDef_ptr &
-+    IR_ValueDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator<< (
-+
-+CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::IDLType_ptr
-+    const IR_ComponentDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator>> (
-+
-+CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::IDLType_ptr &
-+    IR_ComponentDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator<< (
-+
-+CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::StructDef_ptr
-+    const IR_ProvidesDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator>> (
-+
-+CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::StructDef_ptr &
-+    IR_ProvidesDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator<< (
-+
-+CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::UnionDef_ptr
-+    const IR_UsesDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator>> (
-+
-+CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::UnionDef_ptr &
-+    IR_UsesDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator<< (
-+
-+CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::EnumDef_ptr
-+    const IR_HomeDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator>> (
-+
-+CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::EnumDef_ptr &
-+    IR_HomeDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator<< (
-+
-+CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::AliasDef_ptr
-+    const IR_EmitsDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator>> (
-+CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::AliasDef_ptr &
-+    IR_EmitsDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator<< (
-+
-+CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::InterfaceDef_ptr
-+    const IR_PublishesDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator>> (
-+CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::InterfaceDef_ptr &
-+    IR_PublishesDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator<< (
-+
-+CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::ExceptionDef_ptr
-+    const IR_ConsumesDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator>> (
-+CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::ExceptionDef_ptr &
-+    IR_ConsumesDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator<< (
-+
-+CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::NativeDef_ptr
-+    const IR_FactoryDefSeq &
-   );
--ACE_INLINE CORBA::Boolean
--operator>> (
-+CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::NativeDef_ptr &
-+    IR_FactoryDefSeq &
-   );
- 
--#if !defined _TAO_CDR_OP_IR_InterfaceDefSeq_I_
--#define _TAO_CDR_OP_IR_InterfaceDefSeq_I_
--
- CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::InterfaceDefSeq &
-+    const IR_FinderDefSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::InterfaceDefSeq &
-+    IR_FinderDefSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_InterfaceDefSeq_I_ */
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-+CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::ValueDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ValueDef_ptr &
--  );
--
--#if !defined _TAO_CDR_OP_IR_ValueDefSeq_I_
--#define _TAO_CDR_OP_IR_ValueDefSeq_I_
--
--CORBA::Boolean TAO_IFR_Client_Export operator<< (
--    TAO_OutputCDR &,
--    const IR::ValueDefSeq &
--  );
--CORBA::Boolean TAO_IFR_Client_Export operator>> (
--    TAO_InputCDR &,
--    IR::ValueDefSeq &
--  );
--
--#endif /* _TAO_CDR_OP_IR_ValueDefSeq_I_ */
--
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::ValueBoxDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ValueBoxDef_ptr &
--  );
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::ComponentDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ComponentDef_ptr &
--  );
--
--#if !defined _TAO_CDR_OP_IR_ComponentDefSeq_I_
--#define _TAO_CDR_OP_IR_ComponentDefSeq_I_
--
--CORBA::Boolean TAO_IFR_Client_Export operator<< (
--    TAO_OutputCDR &,
--    const IR::ComponentDefSeq &
--  );
--CORBA::Boolean TAO_IFR_Client_Export operator>> (
--    TAO_InputCDR &,
--    IR::ComponentDefSeq &
--  );
--
--#endif /* _TAO_CDR_OP_IR_ComponentDefSeq_I_ */
--
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::ProvidesDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ProvidesDef_ptr &
--  );
--
--#if !defined _TAO_CDR_OP_IR_ProvidesDefSeq_I_
--#define _TAO_CDR_OP_IR_ProvidesDefSeq_I_
--
--CORBA::Boolean TAO_IFR_Client_Export operator<< (
--    TAO_OutputCDR &,
--    const IR::ProvidesDefSeq &
--  );
--CORBA::Boolean TAO_IFR_Client_Export operator>> (
--    TAO_InputCDR &,
--    IR::ProvidesDefSeq &
--  );
--
--#endif /* _TAO_CDR_OP_IR_ProvidesDefSeq_I_ */
--
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::UsesDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::UsesDef_ptr &
--  );
--
--#if !defined _TAO_CDR_OP_IR_UsesDefSeq_I_
--#define _TAO_CDR_OP_IR_UsesDefSeq_I_
--
--CORBA::Boolean TAO_IFR_Client_Export operator<< (
--    TAO_OutputCDR &,
--    const IR::UsesDefSeq &
--  );
--CORBA::Boolean TAO_IFR_Client_Export operator>> (
--    TAO_InputCDR &,
--    IR::UsesDefSeq &
--  );
--
--#endif /* _TAO_CDR_OP_IR_UsesDefSeq_I_ */
--
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::HomeDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::HomeDef_ptr &
--  );
--
--#if !defined _TAO_CDR_OP_IR_HomeDefSeq_I_
--#define _TAO_CDR_OP_IR_HomeDefSeq_I_
--
--CORBA::Boolean TAO_IFR_Client_Export operator<< (
--    TAO_OutputCDR &,
--    const IR::HomeDefSeq &
--  );
--CORBA::Boolean TAO_IFR_Client_Export operator>> (
--    TAO_InputCDR &,
--    IR::HomeDefSeq &
--  );
--
--#endif /* _TAO_CDR_OP_IR_HomeDefSeq_I_ */
--
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::EventDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::EventDef_ptr &
--  );
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::EmitsDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::EmitsDef_ptr &
--  );
--
--#if !defined _TAO_CDR_OP_IR_EmitsDefSeq_I_
--#define _TAO_CDR_OP_IR_EmitsDefSeq_I_
--
--CORBA::Boolean TAO_IFR_Client_Export operator<< (
--    TAO_OutputCDR &,
--    const IR::EmitsDefSeq &
--  );
--CORBA::Boolean TAO_IFR_Client_Export operator>> (
--    TAO_InputCDR &,
--    IR::EmitsDefSeq &
--  );
--
--#endif /* _TAO_CDR_OP_IR_EmitsDefSeq_I_ */
--
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::PublishesDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::PublishesDef_ptr &
--  );
--
--#if !defined _TAO_CDR_OP_IR_PublishesDefSeq_I_
--#define _TAO_CDR_OP_IR_PublishesDefSeq_I_
--
--CORBA::Boolean TAO_IFR_Client_Export operator<< (
--    TAO_OutputCDR &,
--    const IR::PublishesDefSeq &
--  );
--CORBA::Boolean TAO_IFR_Client_Export operator>> (
--    TAO_InputCDR &,
--    IR::PublishesDefSeq &
--  );
--
--#endif /* _TAO_CDR_OP_IR_PublishesDefSeq_I_ */
--
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::ConsumesDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ConsumesDef_ptr &
--  );
--
--#if !defined _TAO_CDR_OP_IR_ConsumesDefSeq_I_
--#define _TAO_CDR_OP_IR_ConsumesDefSeq_I_
--
--CORBA::Boolean TAO_IFR_Client_Export operator<< (
--    TAO_OutputCDR &,
--    const IR::ConsumesDefSeq &
-+    const IR_ContainedSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::ConsumesDefSeq &
-+    IR_ContainedSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_ConsumesDefSeq_I_ */
--
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
--    const IR::FactoryDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::FactoryDef_ptr &
-+    const IR_IDLType_ptr
-   );
- 
--#if !defined _TAO_CDR_OP_IR_FactoryDefSeq_I_
--#define _TAO_CDR_OP_IR_FactoryDefSeq_I_
--
--CORBA::Boolean TAO_IFR_Client_Export operator<< (
--    TAO_OutputCDR &,
--    const IR::FactoryDefSeq &
--  );
--CORBA::Boolean TAO_IFR_Client_Export operator>> (
--    TAO_InputCDR &,
--    IR::FactoryDefSeq &
--  );
--
--#endif /* _TAO_CDR_OP_IR_FactoryDefSeq_I_ */
--
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::FinderDef_ptr
--  );
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &,
--    IR::FinderDef_ptr &
-+    IR_IDLType_ptr &
-   );
- 
--#if !defined _TAO_CDR_OP_IR_FinderDefSeq_I_
--#define _TAO_CDR_OP_IR_FinderDefSeq_I_
--
--CORBA::Boolean TAO_IFR_Client_Export operator<< (
--    TAO_OutputCDR &,
--    const IR::FinderDefSeq &
--  );
--CORBA::Boolean TAO_IFR_Client_Export operator>> (
--    TAO_InputCDR &,
--    IR::FinderDefSeq &
--  );
--
--#endif /* _TAO_CDR_OP_IR_FinderDefSeq_I_ */
--
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::PrimaryKeyDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::PrimaryKeyDef_ptr &
--  );
--
--#if !defined _TAO_CDR_OP_IR_ContainedSeq_I_
--#define _TAO_CDR_OP_IR_ContainedSeq_I_
--
--CORBA::Boolean TAO_IFR_Client_Export operator<< (
--    TAO_OutputCDR &,
--    const IR::ContainedSeq &
--  );
--CORBA::Boolean TAO_IFR_Client_Export operator>> (
--    TAO_InputCDR &,
--    IR::ContainedSeq &
--  );
--
--#endif /* _TAO_CDR_OP_IR_ContainedSeq_I_ */
--
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::StructMember &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_StructMember &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -21558,7 +20085,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::StructMember &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_StructMember &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -21571,22 +20098,16 @@
-   
- }
- 
--
--#if !defined _TAO_CDR_OP_IR_StructMemberSeq_I_
--#define _TAO_CDR_OP_IR_StructMemberSeq_I_
--
- CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::StructMemberSeq &
-+    const IR_StructMemberSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::StructMemberSeq &
-+    IR_StructMemberSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_StructMemberSeq_I_ */
--
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::Initializer &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_Initializer &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.members) &&
-@@ -21598,7 +20119,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::Initializer &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Initializer &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.members) &&
-@@ -21610,22 +20131,16 @@
-   
- }
- 
--
--#if !defined _TAO_CDR_OP_IR_InitializerSeq_I_
--#define _TAO_CDR_OP_IR_InitializerSeq_I_
--
- CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::InitializerSeq &
-+    const IR_InitializerSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::InitializerSeq &
-+    IR_InitializerSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_InitializerSeq_I_ */
--
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::UnionMember &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_UnionMember &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -21639,7 +20154,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::UnionMember &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_UnionMember &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -21653,48 +20168,25 @@
-   
- }
- 
--
--#if !defined _TAO_CDR_OP_IR_UnionMemberSeq_I_
--#define _TAO_CDR_OP_IR_UnionMemberSeq_I_
--
- CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::UnionMemberSeq &
-+    const IR_UnionMemberSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::UnionMemberSeq &
-+    IR_UnionMemberSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_UnionMemberSeq_I_ */
--
--
--#if !defined _TAO_CDR_OP_IR_EnumMemberSeq_I_
--#define _TAO_CDR_OP_IR_EnumMemberSeq_I_
--
- CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::EnumMemberSeq &
-+    const IR_EnumMemberSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::EnumMemberSeq &
--  );
--
--#endif /* _TAO_CDR_OP_IR_EnumMemberSeq_I_ */
--
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::Container_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::Container_ptr &
-+    IR_EnumMemberSeq &
-   );
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::Container::Description &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_Container::Description &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.contained_object.in ()) &&
-@@ -21707,7 +20199,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::Container::Description &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Container::Description &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.contained_object.out ()) &&
-@@ -21720,25 +20212,19 @@
-   
- }
- 
--
--#if !defined _TAO_CDR_OP_IR_Container_DescriptionSeq_I_
--#define _TAO_CDR_OP_IR_Container_DescriptionSeq_I_
--
- CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::Container::DescriptionSeq &
-+    const IR_Container::DescriptionSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::Container::DescriptionSeq &
-+    IR_Container::DescriptionSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_Container_DescriptionSeq_I_ */
--
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &strm,
--    const IR::Container_ptr _tao_objref
-+    const IR_Container_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21748,7 +20234,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::Container_ptr &_tao_objref
-+    IR_Container_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -21758,7 +20244,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::Container::_unchecked_narrow (
-+      IR_Container::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -21775,19 +20261,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::IDLType_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::IDLType_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::IDLType_ptr _tao_objref
-+    const IR_IDLType_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21797,7 +20272,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::IDLType_ptr &_tao_objref
-+    IR_IDLType_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -21807,7 +20282,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::IDLType::_unchecked_narrow (
-+      IR_IDLType::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -21822,80 +20297,20 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::PrimitiveDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::PrimitiveDef_ptr &
--  );
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::StringDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::StringDef_ptr &
--  );
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::SequenceDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::SequenceDef_ptr &
--  );
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::ArrayDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ArrayDef_ptr &
--  );
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::WstringDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::WstringDef_ptr &
--  );
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::FixedDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::FixedDef_ptr &
--  );
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::PrimitiveKind &_tao_enumval)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_PrimitiveKind &_tao_enumval)
- {
-   CORBA::ULong _tao_temp = _tao_enumval;
-   return strm << _tao_temp;
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::PrimitiveKind &_tao_enumval)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_PrimitiveKind &_tao_enumval)
- {
-   CORBA::ULong _tao_temp = 0;
-   CORBA::Boolean _tao_result = strm >> _tao_temp;
-   
-   if (_tao_result == 1)
-     {
--      _tao_enumval = ACE_static_cast (IR::PrimitiveKind, _tao_temp);
-+      _tao_enumval = ACE_static_cast (IR_PrimitiveKind, _tao_temp);
-     }
-   
-   return _tao_result;
-@@ -21903,19 +20318,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::Repository_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::Repository_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::Repository_ptr _tao_objref
-+    const IR_Repository_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21925,7 +20329,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::Repository_ptr &_tao_objref
-+    IR_Repository_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -21935,7 +20339,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::Repository::_unchecked_narrow (
-+      IR_Repository::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -21952,19 +20356,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::ComponentRepository_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ComponentRepository_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ComponentRepository_ptr _tao_objref
-+    const IR_ComponentRepository_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -21974,7 +20367,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::ComponentRepository_ptr &_tao_objref
-+    IR_ComponentRepository_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -21984,7 +20377,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::ComponentRepository::_unchecked_narrow (
-+      IR_ComponentRepository::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22001,19 +20394,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::ModuleDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ModuleDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ModuleDef_ptr _tao_objref
-+    const IR_ModuleDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22023,7 +20405,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::ModuleDef_ptr &_tao_objref
-+    IR_ModuleDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -22033,7 +20415,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::ModuleDef::_unchecked_narrow (
-+      IR_ModuleDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22048,7 +20430,7 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ModuleDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ModuleDescription &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -22062,7 +20444,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ModuleDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ModuleDescription &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -22078,19 +20460,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::ConstantDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ConstantDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ConstantDef_ptr _tao_objref
-+    const IR_ConstantDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22100,7 +20471,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::ConstantDef_ptr &_tao_objref
-+    IR_ConstantDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -22110,7 +20481,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::ConstantDef::_unchecked_narrow (
-+      IR_ConstantDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22125,7 +20496,7 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ConstantDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ConstantDescription &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -22141,7 +20512,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ConstantDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ConstantDescription &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -22159,19 +20530,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::TypedefDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::TypedefDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::TypedefDef_ptr _tao_objref
-+    const IR_TypedefDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22181,7 +20541,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::TypedefDef_ptr &_tao_objref
-+    IR_TypedefDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -22191,7 +20551,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::TypedefDef::_unchecked_narrow (
-+      IR_TypedefDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22206,7 +20566,7 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::TypeDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_TypeDescription &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -22221,7 +20581,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::TypeDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_TypeDescription &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -22238,19 +20598,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::StructDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::StructDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::StructDef_ptr _tao_objref
-+    const IR_StructDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22260,7 +20609,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::StructDef_ptr &_tao_objref
-+    IR_StructDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -22270,7 +20619,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::StructDef::_unchecked_narrow (
-+      IR_StructDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22287,19 +20636,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::UnionDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::UnionDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::UnionDef_ptr _tao_objref
-+    const IR_UnionDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22309,7 +20647,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::UnionDef_ptr &_tao_objref
-+    IR_UnionDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -22319,7 +20657,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::UnionDef::_unchecked_narrow (
-+      IR_UnionDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22336,19 +20674,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::EnumDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::EnumDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::EnumDef_ptr _tao_objref
-+    const IR_EnumDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22358,7 +20685,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::EnumDef_ptr &_tao_objref
-+    IR_EnumDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -22368,7 +20695,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::EnumDef::_unchecked_narrow (
-+      IR_EnumDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22381,23 +20708,12 @@
-   }
-   ACE_ENDTRY;
-   return 0;
--}
--
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::AliasDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::AliasDef_ptr &
--  );
-+}
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &strm,
--    const IR::AliasDef_ptr _tao_objref
-+    const IR_AliasDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22407,7 +20723,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::AliasDef_ptr &_tao_objref
-+    IR_AliasDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -22417,7 +20733,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::AliasDef::_unchecked_narrow (
-+      IR_AliasDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22434,19 +20750,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::NativeDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::NativeDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::NativeDef_ptr _tao_objref
-+    const IR_NativeDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22456,7 +20761,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::NativeDef_ptr &_tao_objref
-+    IR_NativeDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -22466,7 +20771,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::NativeDef::_unchecked_narrow (
-+      IR_NativeDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22483,19 +20788,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::PrimitiveDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::PrimitiveDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::PrimitiveDef_ptr _tao_objref
-+    const IR_PrimitiveDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22505,7 +20799,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::PrimitiveDef_ptr &_tao_objref
-+    IR_PrimitiveDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -22515,7 +20809,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::PrimitiveDef::_unchecked_narrow (
-+      IR_PrimitiveDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22532,19 +20826,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::StringDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::StringDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::StringDef_ptr _tao_objref
-+    const IR_StringDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22554,7 +20837,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::StringDef_ptr &_tao_objref
-+    IR_StringDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -22564,7 +20847,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::StringDef::_unchecked_narrow (
-+      IR_StringDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22581,19 +20864,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::WstringDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::WstringDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::WstringDef_ptr _tao_objref
-+    const IR_WstringDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22603,7 +20875,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::WstringDef_ptr &_tao_objref
-+    IR_WstringDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -22613,7 +20885,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::WstringDef::_unchecked_narrow (
-+      IR_WstringDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22630,19 +20902,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::FixedDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::FixedDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::FixedDef_ptr _tao_objref
-+    const IR_FixedDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22652,7 +20913,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::FixedDef_ptr &_tao_objref
-+    IR_FixedDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -22662,7 +20923,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::FixedDef::_unchecked_narrow (
-+      IR_FixedDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22679,19 +20940,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::SequenceDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::SequenceDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::SequenceDef_ptr _tao_objref
-+    const IR_SequenceDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22701,7 +20951,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::SequenceDef_ptr &_tao_objref
-+    IR_SequenceDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -22711,7 +20961,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::SequenceDef::_unchecked_narrow (
-+      IR_SequenceDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22728,19 +20978,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::ArrayDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ArrayDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ArrayDef_ptr _tao_objref
-+    const IR_ArrayDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22750,7 +20989,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::ArrayDef_ptr &_tao_objref
-+    IR_ArrayDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -22760,7 +20999,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::ArrayDef::_unchecked_narrow (
-+      IR_ArrayDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22777,19 +21016,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::ExceptionDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ExceptionDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ExceptionDef_ptr _tao_objref
-+    const IR_ExceptionDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22799,7 +21027,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::ExceptionDef_ptr &_tao_objref
-+    IR_ExceptionDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -22809,7 +21037,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::ExceptionDef::_unchecked_narrow (
-+      IR_ExceptionDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22824,7 +21052,7 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ExceptionDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ExceptionDescription &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -22839,7 +21067,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ExceptionDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ExceptionDescription &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -22854,50 +21082,38 @@
-   
- }
- 
--
--#if !defined _TAO_CDR_OP_IR_ExceptionDefSeq_I_
--#define _TAO_CDR_OP_IR_ExceptionDefSeq_I_
--
- CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::ExceptionDefSeq &
-+    const IR_ExceptionDefSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::ExceptionDefSeq &
-+    IR_ExceptionDefSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_ExceptionDefSeq_I_ */
--
--
--#if !defined _TAO_CDR_OP_IR_ExcDescriptionSeq_I_
--#define _TAO_CDR_OP_IR_ExcDescriptionSeq_I_
--
- CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::ExcDescriptionSeq &
-+    const IR_ExcDescriptionSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::ExcDescriptionSeq &
-+    IR_ExcDescriptionSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_ExcDescriptionSeq_I_ */
--
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::AttributeMode &_tao_enumval)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_AttributeMode &_tao_enumval)
- {
-   CORBA::ULong _tao_temp = _tao_enumval;
-   return strm << _tao_temp;
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::AttributeMode &_tao_enumval)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_AttributeMode &_tao_enumval)
- {
-   CORBA::ULong _tao_temp = 0;
-   CORBA::Boolean _tao_result = strm >> _tao_temp;
-   
-   if (_tao_result == 1)
-     {
--      _tao_enumval = ACE_static_cast (IR::AttributeMode, _tao_temp);
-+      _tao_enumval = ACE_static_cast (IR_AttributeMode, _tao_temp);
-     }
-   
-   return _tao_result;
-@@ -22905,19 +21121,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::AttributeDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::AttributeDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::AttributeDef_ptr _tao_objref
-+    const IR_AttributeDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -22927,7 +21132,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::AttributeDef_ptr &_tao_objref
-+    IR_AttributeDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -22937,7 +21142,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::AttributeDef::_unchecked_narrow (
-+      IR_AttributeDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -22952,7 +21157,7 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::AttributeDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_AttributeDescription &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -22970,7 +21175,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::AttributeDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_AttributeDescription &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -22988,45 +21193,45 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::OperationMode &_tao_enumval)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_OperationMode &_tao_enumval)
- {
-   CORBA::ULong _tao_temp = _tao_enumval;
-   return strm << _tao_temp;
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::OperationMode &_tao_enumval)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_OperationMode &_tao_enumval)
- {
-   CORBA::ULong _tao_temp = 0;
-   CORBA::Boolean _tao_result = strm >> _tao_temp;
-   
-   if (_tao_result == 1)
-     {
--      _tao_enumval = ACE_static_cast (IR::OperationMode, _tao_temp);
-+      _tao_enumval = ACE_static_cast (IR_OperationMode, _tao_temp);
-     }
-   
-   return _tao_result;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ParameterMode &_tao_enumval)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ParameterMode &_tao_enumval)
- {
-   CORBA::ULong _tao_temp = _tao_enumval;
-   return strm << _tao_temp;
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ParameterMode &_tao_enumval)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ParameterMode &_tao_enumval)
- {
-   CORBA::ULong _tao_temp = 0;
-   CORBA::Boolean _tao_result = strm >> _tao_temp;
-   
-   if (_tao_result == 1)
-     {
--      _tao_enumval = ACE_static_cast (IR::ParameterMode, _tao_temp);
-+      _tao_enumval = ACE_static_cast (IR_ParameterMode, _tao_temp);
-     }
-   
-   return _tao_result;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ParameterDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ParameterDescription &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -23040,7 +21245,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ParameterDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ParameterDescription &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -23054,51 +21259,28 @@
-   
- }
- 
--
--#if !defined _TAO_CDR_OP_IR_ParDescriptionSeq_I_
--#define _TAO_CDR_OP_IR_ParDescriptionSeq_I_
--
- CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::ParDescriptionSeq &
-+    const IR_ParDescriptionSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::ParDescriptionSeq &
-+    IR_ParDescriptionSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_ParDescriptionSeq_I_ */
--
--
--#if !defined _TAO_CDR_OP_IR_ContextIdSeq_I_
--#define _TAO_CDR_OP_IR_ContextIdSeq_I_
--
- CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::ContextIdSeq &
-+    const IR_ContextIdSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::ContextIdSeq &
--  );
--
--#endif /* _TAO_CDR_OP_IR_ContextIdSeq_I_ */
--
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::OperationDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::OperationDef_ptr &
-+    IR_ContextIdSeq &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &strm,
--    const IR::OperationDef_ptr _tao_objref
-+    const IR_OperationDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23108,7 +21290,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::OperationDef_ptr &_tao_objref
-+    IR_OperationDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -23118,7 +21300,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::OperationDef::_unchecked_narrow (
-+      IR_OperationDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -23133,7 +21315,7 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::OperationDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_OperationDescription &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -23152,7 +21334,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::OperationDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_OperationDescription &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -23171,66 +21353,37 @@
-   
- }
- 
--
--#if !defined _TAO_CDR_OP_IR_RepositoryIdSeq_I_
--#define _TAO_CDR_OP_IR_RepositoryIdSeq_I_
--
- CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::RepositoryIdSeq &
-+    const IR_RepositoryIdSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::RepositoryIdSeq &
-+    IR_RepositoryIdSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_RepositoryIdSeq_I_ */
--
--
--#if !defined _TAO_CDR_OP_IR_OpDescriptionSeq_I_
--#define _TAO_CDR_OP_IR_OpDescriptionSeq_I_
--
- CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::OpDescriptionSeq &
-+    const IR_OpDescriptionSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::OpDescriptionSeq &
-+    IR_OpDescriptionSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_OpDescriptionSeq_I_ */
--
--
--#if !defined _TAO_CDR_OP_IR_AttrDescriptionSeq_I_
--#define _TAO_CDR_OP_IR_AttrDescriptionSeq_I_
--
- CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::AttrDescriptionSeq &
-+    const IR_AttrDescriptionSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::AttrDescriptionSeq &
--  );
--
--#endif /* _TAO_CDR_OP_IR_AttrDescriptionSeq_I_ */
--
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::InterfaceDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::InterfaceDef_ptr &
-+    IR_AttrDescriptionSeq &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &strm,
--    const IR::InterfaceDef_ptr _tao_objref
-+    const IR_InterfaceDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23240,7 +21393,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::InterfaceDef_ptr &_tao_objref
-+    IR_InterfaceDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -23250,7 +21403,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::InterfaceDef::_unchecked_narrow (
-+      IR_InterfaceDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -23265,7 +21418,7 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::InterfaceDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_InterfaceDescription &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -23285,7 +21438,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::InterfaceDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_InterfaceDescription &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -23305,7 +21458,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ValueMember &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ValueMember &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -23322,7 +21475,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ValueMember &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ValueMember &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -23339,36 +21492,19 @@
-   
- }
- 
--
--#if !defined _TAO_CDR_OP_IR_ValueMemberSeq_I_
--#define _TAO_CDR_OP_IR_ValueMemberSeq_I_
--
- CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::ValueMemberSeq &
-+    const IR_ValueMemberSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::ValueMemberSeq &
--  );
--
--#endif /* _TAO_CDR_OP_IR_ValueMemberSeq_I_ */
--
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::ValueMemberDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ValueMemberDef_ptr &
-+    IR_ValueMemberSeq &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ValueMemberDef_ptr _tao_objref
-+    const IR_ValueMemberDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23378,7 +21514,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::ValueMemberDef_ptr &_tao_objref
-+    IR_ValueMemberDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -23388,7 +21524,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::ValueMemberDef::_unchecked_narrow (
-+      IR_ValueMemberDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -23405,19 +21541,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::ValueDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ValueDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ValueDef_ptr _tao_objref
-+    const IR_ValueDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23427,7 +21552,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::ValueDef_ptr &_tao_objref
-+    IR_ValueDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -23437,7 +21562,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::ValueDef::_unchecked_narrow (
-+      IR_ValueDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -23452,7 +21577,7 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ValueDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ValueDescription &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -23477,7 +21602,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ValueDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ValueDescription &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -23504,19 +21629,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::ValueBoxDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ValueBoxDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ValueBoxDef_ptr _tao_objref
-+    const IR_ValueBoxDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23526,7 +21640,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::ValueBoxDef_ptr &_tao_objref
-+    IR_ValueBoxDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -23536,7 +21650,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::ValueBoxDef::_unchecked_narrow (
-+      IR_ValueBoxDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -23553,19 +21667,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::ProvidesDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ProvidesDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ProvidesDef_ptr _tao_objref
-+    const IR_ProvidesDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23575,7 +21678,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::ProvidesDef_ptr &_tao_objref
-+    IR_ProvidesDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -23585,7 +21688,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::ProvidesDef::_unchecked_narrow (
-+      IR_ProvidesDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -23600,7 +21703,7 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ProvidesDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ProvidesDescription &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -23615,7 +21718,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ProvidesDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ProvidesDescription &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -23632,19 +21735,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::UsesDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::UsesDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::UsesDef_ptr _tao_objref
-+    const IR_UsesDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23654,7 +21746,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::UsesDef_ptr &_tao_objref
-+    IR_UsesDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -23664,7 +21756,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::UsesDef::_unchecked_narrow (
-+      IR_UsesDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -23679,7 +21771,7 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::UsesDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_UsesDescription &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -23695,7 +21787,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::UsesDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_UsesDescription &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -23711,51 +21803,28 @@
-   
- }
- 
--
--#if !defined _TAO_CDR_OP_IR_ProvidesDescSeq_I_
--#define _TAO_CDR_OP_IR_ProvidesDescSeq_I_
--
- CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::ProvidesDescSeq &
-+    const IR_ProvidesDescSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::ProvidesDescSeq &
-+    IR_ProvidesDescSeq &
-   );
- 
--#endif /* _TAO_CDR_OP_IR_ProvidesDescSeq_I_ */
--
--
--#if !defined _TAO_CDR_OP_IR_UsesDescSeq_I_
--#define _TAO_CDR_OP_IR_UsesDescSeq_I_
--
- CORBA::Boolean TAO_IFR_Client_Export operator<< (
-     TAO_OutputCDR &,
--    const IR::UsesDescSeq &
-+    const IR_UsesDescSeq &
-   );
- CORBA::Boolean TAO_IFR_Client_Export operator>> (
-     TAO_InputCDR &,
--    IR::UsesDescSeq &
--  );
--
--#endif /* _TAO_CDR_OP_IR_UsesDescSeq_I_ */
--
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IR::EventDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::EventDef_ptr &
-+    IR_UsesDescSeq &
-   );
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &strm,
--    const IR::EventDef_ptr _tao_objref
-+    const IR_EventDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23765,7 +21834,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::EventDef_ptr &_tao_objref
-+    IR_EventDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -23775,7 +21844,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::EventDef::_unchecked_narrow (
-+      IR_EventDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -23790,7 +21859,7 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::EventDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_EventDescription &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -23805,7 +21874,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::EventDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_EventDescription &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -23822,19 +21891,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::EmitsDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::EmitsDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::EmitsDef_ptr _tao_objref
-+    const IR_EmitsDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23844,7 +21902,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::EmitsDef_ptr &_tao_objref
-+    IR_EmitsDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -23854,7 +21912,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::EmitsDef::_unchecked_narrow (
-+      IR_EmitsDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -23871,19 +21929,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::PublishesDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::PublishesDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::PublishesDef_ptr _tao_objref
-+    const IR_PublishesDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23893,7 +21940,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::PublishesDef_ptr &_tao_objref
-+    IR_PublishesDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -23903,7 +21950,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::PublishesDef::_unchecked_narrow (
-+      IR_PublishesDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -23920,19 +21967,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::ConsumesDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ConsumesDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ConsumesDef_ptr _tao_objref
-+    const IR_ConsumesDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23942,7 +21978,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::ConsumesDef_ptr &_tao_objref
-+    IR_ConsumesDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -23952,7 +21988,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::ConsumesDef::_unchecked_narrow (
-+      IR_ConsumesDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -23969,19 +22005,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::ComponentDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::ComponentDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::ComponentDef_ptr _tao_objref
-+    const IR_ComponentDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -23991,7 +22016,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::ComponentDef_ptr &_tao_objref
-+    IR_ComponentDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -24001,7 +22026,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::ComponentDef::_unchecked_narrow (
-+      IR_ComponentDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -24016,7 +22041,7 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ComponentDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ComponentDescription &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -24039,7 +22064,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ComponentDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ComponentDescription &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -24064,19 +22089,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::PrimaryKeyDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::PrimaryKeyDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::PrimaryKeyDef_ptr _tao_objref
-+    const IR_PrimaryKeyDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -24086,7 +22100,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::PrimaryKeyDef_ptr &_tao_objref
-+    IR_PrimaryKeyDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -24096,7 +22110,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::PrimaryKeyDef::_unchecked_narrow (
-+      IR_PrimaryKeyDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -24111,7 +22125,7 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::PrimaryKeyDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_PrimaryKeyDescription &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -24126,7 +22140,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::PrimaryKeyDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_PrimaryKeyDescription &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
-@@ -24143,19 +22157,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::FactoryDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::FactoryDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::FactoryDef_ptr _tao_objref
-+    const IR_FactoryDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -24165,7 +22168,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::FactoryDef_ptr &_tao_objref
-+    IR_FactoryDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -24175,7 +22178,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::FactoryDef::_unchecked_narrow (
-+      IR_FactoryDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -24192,19 +22195,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::FinderDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::FinderDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::FinderDef_ptr _tao_objref
-+    const IR_FinderDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -24214,7 +22206,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::FinderDef_ptr &_tao_objref
-+    IR_FinderDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -24224,7 +22216,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::FinderDef::_unchecked_narrow (
-+      IR_FinderDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -24241,19 +22233,8 @@
- 
- ACE_INLINE CORBA::Boolean
- operator<< (
--    TAO_OutputCDR &,
--    const IR::HomeDef_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IR::HomeDef_ptr &
--  );
--
--ACE_INLINE CORBA::Boolean
--operator<< (
-     TAO_OutputCDR &strm,
--    const IR::HomeDef_ptr _tao_objref
-+    const IR_HomeDef_ptr _tao_objref
-   )
- {
-   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-@@ -24263,7 +22244,7 @@
- ACE_INLINE CORBA::Boolean
- operator>> (
-     TAO_InputCDR &strm,
--    IR::HomeDef_ptr &_tao_objref
-+    IR_HomeDef_ptr &_tao_objref
-   )
- {
-   ACE_TRY_NEW_ENV
-@@ -24273,7 +22254,7 @@
-       return 0;
-     // narrow to the right type
-     _tao_objref =
--      IR::HomeDef::_unchecked_narrow (
-+      IR_HomeDef::_unchecked_narrow (
-           obj.in (),
-           ACE_TRY_ENV
-         );
-@@ -24288,7 +22269,7 @@
-   return 0;
- }
- 
--ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::HomeDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_HomeDescription &_tao_aggregate)
- {
-   if (
-     (strm << _tao_aggregate.name.in ()) &&
-@@ -24310,7 +22291,7 @@
-   
- }
- 
--ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::HomeDescription &_tao_aggregate)
-+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_HomeDescription &_tao_aggregate)
- {
-   if (
-     (strm >> _tao_aggregate.name.out ()) &&
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 096b7b76d2d..7229806c7ee 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -34,16 +34,36 @@
 static const CORBA::Long _oc_IOP_ProfileId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-  10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
+  30,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x50726f66), 
+  ACE_NTOHL (0x696c6549), 
+  ACE_NTOHL (0x643a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
+  10,
+  ACE_NTOHL (0x50726f66), 
+  ACE_NTOHL (0x696c6549), 
+  ACE_NTOHL (0x64000000),  // name = ProfileId
   CORBA::tk_ulong,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IOP_ProfileId (CORBA::tk_alias, sizeof (_oc_IOP_ProfileId), (char *) &_oc_IOP_ProfileId, 0, sizeof (IOP::ProfileId));
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_ProfileId (
+    CORBA::tk_alias,
+    sizeof (_oc_IOP_ProfileId),
+    (char *) &_oc_IOP_ProfileId,
+    0,
+    sizeof (IOP::ProfileId)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProfileId, &_tc_TAO_tc_IOP_ProfileId)
 TAO_NAMESPACE_END
+
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_INTERNET_IOP, 0U)
@@ -55,19 +75,48 @@ TAO_NAMESPACE_END
 static const CORBA::Long _oc_IOP_TaggedProfile[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-  14, ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x65000000),  // name = TaggedProfile
+  34,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x65645072), 
+  ACE_NTOHL (0x6f66696c), 
+  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
+  14,
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x65645072), 
+  ACE_NTOHL (0x6f66696c), 
+  ACE_NTOHL (0x65000000),  // name = TaggedProfile
   2, // member count
-  4, ACE_NTOHL (0x74616700),  // name = tag
+  4,
+  ACE_NTOHL (0x74616700),  // name = tag
   CORBA::tk_alias, // typecode kind for typedefs
   60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-    10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
+    30,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x50726f66), 
+    ACE_NTOHL (0x696c6549), 
+    ACE_NTOHL (0x643a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
+    10,
+    ACE_NTOHL (0x50726f66), 
+    ACE_NTOHL (0x696c6549), 
+    ACE_NTOHL (0x64000000),  // name = ProfileId
     CORBA::tk_ulong,
 
 
-  13, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c655f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = profile_data
+  13,
+  ACE_NTOHL (0x70726f66), 
+  ACE_NTOHL (0x696c655f), 
+  ACE_NTOHL (0x64617461), 
+  ACE_NTOHL (0x0),  // name = profile_data
   CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
@@ -76,11 +125,20 @@ static const CORBA::Long _oc_IOP_TaggedProfile[] =
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfile (CORBA::tk_struct, sizeof (_oc_IOP_TaggedProfile), (char *) &_oc_IOP_TaggedProfile, 0, sizeof (IOP::TaggedProfile));
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfile (
+    CORBA::tk_struct,
+    sizeof (_oc_IOP_TaggedProfile),
+    (char *) &_oc_IOP_TaggedProfile,
+    0,
+    sizeof (IOP::TaggedProfile)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedProfile, &_tc_TAO_tc_IOP_TaggedProfile)
 TAO_NAMESPACE_END
+
 void IOP::TaggedProfile::_tao_any_destructor (void *x)
 {
   TaggedProfile *tmp = ACE_static_cast (TaggedProfile*,x);
@@ -98,30 +156,30 @@ void IOP::TaggedProfile::_tao_any_destructor (void *x)
 IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
 IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 IOP::TaggedProfile::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 IOP::TaggedProfile::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
@@ -138,32 +196,73 @@ void IOP::TaggedProfile::_tao_seq_Octet::_tao_any_destructor (void *x)
 static const CORBA::Long _oc_IOP_IOR[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  24, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x494f523a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
-  4, ACE_NTOHL (0x494f5200),  // name = IOR
+  24,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x494f523a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
+  4,
+  ACE_NTOHL (0x494f5200),  // name = IOR
   2, // member count
-  8, ACE_NTOHL (0x74797065), ACE_NTOHL (0x5f696400),  // name = type_id
-  CORBA::tk_string,
+  8,
+  ACE_NTOHL (0x74797065), 
+  ACE_NTOHL (0x5f696400),  // name = type_id
+  CORBA::tk_string, 
   0U, // string length
-  9, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c6573), ACE_NTOHL (0x0),  // name = profiles
+  9,
+  ACE_NTOHL (0x70726f66), 
+  ACE_NTOHL (0x696c6573), 
+  ACE_NTOHL (0x0),  // name = profiles
   CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     184, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-      14, ACE_NTOHL (0x54616767), ACE_NTOHL (0x65645072), ACE_NTOHL (0x6f66696c), ACE_NTOHL (0x65000000),  // name = TaggedProfile
+      34,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x65645072), 
+      ACE_NTOHL (0x6f66696c), 
+      ACE_NTOHL (0x653a312e), 
+      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
+      14,
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x65645072), 
+      ACE_NTOHL (0x6f66696c), 
+      ACE_NTOHL (0x65000000),  // name = TaggedProfile
       2, // member count
-      4, ACE_NTOHL (0x74616700),  // name = tag
+      4,
+      ACE_NTOHL (0x74616700),  // name = tag
       CORBA::tk_alias, // typecode kind for typedefs
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-        10, ACE_NTOHL (0x50726f66), ACE_NTOHL (0x696c6549), ACE_NTOHL (0x64000000),  // name = ProfileId
+        30,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x50726f66), 
+        ACE_NTOHL (0x696c6549), 
+        ACE_NTOHL (0x643a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
+        10,
+        ACE_NTOHL (0x50726f66), 
+        ACE_NTOHL (0x696c6549), 
+        ACE_NTOHL (0x64000000),  // name = ProfileId
         CORBA::tk_ulong,
 
 
-      13, ACE_NTOHL (0x70726f66), ACE_NTOHL (0x696c655f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = profile_data
+      13,
+      ACE_NTOHL (0x70726f66), 
+      ACE_NTOHL (0x696c655f), 
+      ACE_NTOHL (0x64617461), 
+      ACE_NTOHL (0x0),  // name = profile_data
       CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
@@ -175,11 +274,20 @@ static const CORBA::Long _oc_IOP_IOR[] =
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IOP_IOR (CORBA::tk_struct, sizeof (_oc_IOP_IOR), (char *) &_oc_IOP_IOR, 0, sizeof (IOP::IOR));
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_IOR (
+    CORBA::tk_struct,
+    sizeof (_oc_IOP_IOR),
+    (char *) &_oc_IOP_IOR,
+    0,
+    sizeof (IOP::IOR)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IOR, &_tc_TAO_tc_IOP_IOR)
 TAO_NAMESPACE_END
+
 void IOP::IOR::_tao_any_destructor (void *x)
 {
   IOR *tmp = ACE_static_cast (IOR*,x);
@@ -188,7 +296,7 @@ void IOP::IOR::_tao_any_destructor (void *x)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_
 
@@ -197,43 +305,43 @@ void IOP::IOR::_tao_any_destructor (void *x)
   {
     IOP::TaggedProfile* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::allocbuf (length);
-
+    
     if (this->buffer_ != 0)
     {
       IOP::TaggedProfile *old = ACE_reinterpret_cast (IOP::TaggedProfile *,this->buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-
+      
       if (this->release_)
         _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (old);
-
+      
     }
     this->buffer_ = tmp;
   }
-
+  
   void
   IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-
+    
     IOP::TaggedProfile *tmp = ACE_reinterpret_cast (IOP::TaggedProfile *,this->buffer_);
-
+    
     _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::freebuf (tmp);
     this->buffer_ = 0;
-  }
-
+  } 
+  
   IOP::IOR::_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile::~_TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-
-
+  
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_)
 #define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CS_
@@ -245,30 +353,30 @@ void IOP::IOR::_tao_any_destructor (void *x)
 IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (void)
 {}
 IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedProfile>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (CORBA::ULong max, CORBA::ULong length, IOP::TaggedProfile *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedProfile>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 IOP::IOR::_tao_seq_TaggedProfile::_tao_seq_TaggedProfile (const _tao_seq_TaggedProfile &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_IOR__tao_seq_TaggedProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedProfile>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 IOP::IOR::_tao_seq_TaggedProfile::~_tao_seq_TaggedProfile (void) // dtor
@@ -285,32 +393,81 @@ void IOP::IOR::_tao_seq_TaggedProfile::_tao_any_destructor (void *x)
 static const CORBA::Long _oc_IOP_ComponentId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-  12, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400),  // name = ComponentId
+  32,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x7449643a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
+  12,
+  ACE_NTOHL (0x436f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x74496400),  // name = ComponentId
   CORBA::tk_ulong,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IOP_ComponentId (CORBA::tk_alias, sizeof (_oc_IOP_ComponentId), (char *) &_oc_IOP_ComponentId, 0, sizeof (IOP::ComponentId));
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_ComponentId (
+    CORBA::tk_alias,
+    sizeof (_oc_IOP_ComponentId),
+    (char *) &_oc_IOP_ComponentId,
+    0,
+    sizeof (IOP::ComponentId)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentId, &_tc_TAO_tc_IOP_ComponentId)
 TAO_NAMESPACE_END
+
 static const CORBA::Long _oc_IOP_TaggedComponent[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-  16, ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7400),  // name = TaggedComponent
+  36,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e743a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
+  16,
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7400),  // name = TaggedComponent
   2, // member count
-  4, ACE_NTOHL (0x74616700),  // name = tag
+  4,
+  ACE_NTOHL (0x74616700),  // name = tag
   CORBA::tk_alias, // typecode kind for typedefs
   60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-    12, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400),  // name = ComponentId
+    32,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x436f6d70), 
+    ACE_NTOHL (0x6f6e656e), 
+    ACE_NTOHL (0x7449643a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
+    12,
+    ACE_NTOHL (0x436f6d70), 
+    ACE_NTOHL (0x6f6e656e), 
+    ACE_NTOHL (0x74496400),  // name = ComponentId
     CORBA::tk_ulong,
 
 
-  15, ACE_NTOHL (0x636f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000),  // name = component_data
+  15,
+  ACE_NTOHL (0x636f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x745f6461), 
+  ACE_NTOHL (0x74610000),  // name = component_data
   CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
@@ -319,11 +476,20 @@ static const CORBA::Long _oc_IOP_TaggedComponent[] =
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponent (CORBA::tk_struct, sizeof (_oc_IOP_TaggedComponent), (char *) &_oc_IOP_TaggedComponent, 0, sizeof (IOP::TaggedComponent));
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponent (
+    CORBA::tk_struct,
+    sizeof (_oc_IOP_TaggedComponent),
+    (char *) &_oc_IOP_TaggedComponent,
+    0,
+    sizeof (IOP::TaggedComponent)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedComponent, &_tc_TAO_tc_IOP_TaggedComponent)
 TAO_NAMESPACE_END
+
 void IOP::TaggedComponent::_tao_any_destructor (void *x)
 {
   TaggedComponent *tmp = ACE_static_cast (TaggedComponent*,x);
@@ -341,30 +507,30 @@ void IOP::TaggedComponent::_tao_any_destructor (void *x)
 IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
 IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 IOP::TaggedComponent::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 IOP::TaggedComponent::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
@@ -380,7 +546,7 @@ void IOP::TaggedComponent::_tao_seq_Octet::_tao_any_destructor (void *x)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CS_
 
@@ -389,43 +555,43 @@ void IOP::TaggedComponent::_tao_seq_Octet::_tao_any_destructor (void *x)
   {
     IOP::TaggedComponent* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::allocbuf (length);
-
+    
     if (this->buffer_ != 0)
     {
       IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-
+      
       if (this->release_)
         _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (old);
-
+      
     }
     this->buffer_ = tmp;
   }
-
+  
   void
   IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-
+    
     IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-
+    
     _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::freebuf (tmp);
     this->buffer_ = 0;
-  }
-
+  } 
+  
   IOP::_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile::~_TAO_Unbounded_Sequence_IOP_MultipleComponentProfile (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-
-
+  
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CS_)
 #define _IOP_MULTIPLECOMPONENTPROFILE_CS_
@@ -437,30 +603,30 @@ void IOP::TaggedComponent::_tao_seq_Octet::_tao_any_destructor (void *x)
 IOP::MultipleComponentProfile::MultipleComponentProfile (void)
 {}
 IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 IOP::MultipleComponentProfile::MultipleComponentProfile (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 IOP::MultipleComponentProfile::MultipleComponentProfile (const MultipleComponentProfile &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_MultipleComponentProfile
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 IOP::MultipleComponentProfile::~MultipleComponentProfile (void) // dtor
@@ -477,27 +643,75 @@ void IOP::MultipleComponentProfile::_tao_any_destructor (void *x)
 static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  45, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x4d756c74), ACE_NTOHL (0x69706c65), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7450726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/MultipleComponentProfile:1.0
-  25, ACE_NTOHL (0x4d756c74), ACE_NTOHL (0x69706c65), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7450726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x0),  // name = MultipleComponentProfile
+  45,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x4d756c74), 
+  ACE_NTOHL (0x69706c65), 
+  ACE_NTOHL (0x436f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x7450726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/MultipleComponentProfile:1.0
+  25,
+  ACE_NTOHL (0x4d756c74), 
+  ACE_NTOHL (0x69706c65), 
+  ACE_NTOHL (0x436f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x7450726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x0),  // name = MultipleComponentProfile
   CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     184, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-      16, ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7400),  // name = TaggedComponent
+      36,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e743a), 
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
+      16,
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e7400),  // name = TaggedComponent
       2, // member count
-      4, ACE_NTOHL (0x74616700),  // name = tag
+      4,
+      ACE_NTOHL (0x74616700),  // name = tag
       CORBA::tk_alias, // typecode kind for typedefs
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-        12, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400),  // name = ComponentId
+        32,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
+        ACE_NTOHL (0x7449643a), 
+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
+        12,
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
+        ACE_NTOHL (0x74496400),  // name = ComponentId
         CORBA::tk_ulong,
 
 
-      15, ACE_NTOHL (0x636f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000),  // name = component_data
+      15,
+      ACE_NTOHL (0x636f6d70), 
+      ACE_NTOHL (0x6f6e656e), 
+      ACE_NTOHL (0x745f6461), 
+      ACE_NTOHL (0x74610000),  // name = component_data
       CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
@@ -509,14 +723,23 @@ static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IOP_MultipleComponentProfile (CORBA::tk_alias, sizeof (_oc_IOP_MultipleComponentProfile), (char *) &_oc_IOP_MultipleComponentProfile, 0, sizeof (IOP::MultipleComponentProfile));
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_MultipleComponentProfile (
+    CORBA::tk_alias,
+    sizeof (_oc_IOP_MultipleComponentProfile),
+    (char *) &_oc_IOP_MultipleComponentProfile,
+    0,
+    sizeof (IOP::MultipleComponentProfile)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_MultipleComponentProfile, &_tc_TAO_tc_IOP_MultipleComponentProfile)
 TAO_NAMESPACE_END
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTLIST_CS_
 
@@ -525,43 +748,43 @@ TAO_NAMESPACE_END
   {
     IOP::TaggedComponent* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_IOP_TaggedComponentList::allocbuf (length);
-
+    
     if (this->buffer_ != 0)
     {
       IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-
+      
       if (this->release_)
         _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (old);
-
+      
     }
     this->buffer_ = tmp;
   }
-
+  
   void
   IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-
+    
     IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-
+    
     _TAO_Unbounded_Sequence_IOP_TaggedComponentList::freebuf (tmp);
     this->buffer_ = 0;
-  }
-
+  } 
+  
   IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentList::~_TAO_Unbounded_Sequence_IOP_TaggedComponentList (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-
-
+  
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IOP_TAGGEDCOMPONENTLIST_CS_)
 #define _IOP_TAGGEDCOMPONENTLIST_CS_
@@ -573,30 +796,30 @@ TAO_NAMESPACE_END
 IOP::TaggedComponentList::TaggedComponentList (void)
 {}
 IOP::TaggedComponentList::TaggedComponentList (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_TaggedComponentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 IOP::TaggedComponentList::TaggedComponentList (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_TaggedComponentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 IOP::TaggedComponentList::TaggedComponentList (const TaggedComponentList &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_TaggedComponentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 IOP::TaggedComponentList::~TaggedComponentList (void) // dtor
@@ -613,27 +836,71 @@ void IOP::TaggedComponentList::_tao_any_destructor (void *x)
 static const CORBA::Long _oc_IOP_TaggedComponentList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e744c), ACE_NTOHL (0x6973743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponentList:1.0
-  20, ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e744c), ACE_NTOHL (0x69737400),  // name = TaggedComponentList
+  40,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e744c), 
+  ACE_NTOHL (0x6973743a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponentList:1.0
+  20,
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e744c), 
+  ACE_NTOHL (0x69737400),  // name = TaggedComponentList
   CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     184, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-      16, ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7400),  // name = TaggedComponent
+      36,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e743a), 
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
+      16,
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e7400),  // name = TaggedComponent
       2, // member count
-      4, ACE_NTOHL (0x74616700),  // name = tag
+      4,
+      ACE_NTOHL (0x74616700),  // name = tag
       CORBA::tk_alias, // typecode kind for typedefs
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-        12, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400),  // name = ComponentId
+        32,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
+        ACE_NTOHL (0x7449643a), 
+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
+        12,
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
+        ACE_NTOHL (0x74496400),  // name = ComponentId
         CORBA::tk_ulong,
 
 
-      15, ACE_NTOHL (0x636f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000),  // name = component_data
+      15,
+      ACE_NTOHL (0x636f6d70), 
+      ACE_NTOHL (0x6f6e656e), 
+      ACE_NTOHL (0x745f6461), 
+      ACE_NTOHL (0x74610000),  // name = component_data
       CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
@@ -645,14 +912,23 @@ static const CORBA::Long _oc_IOP_TaggedComponentList[] =
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentList (CORBA::tk_alias, sizeof (_oc_IOP_TaggedComponentList), (char *) &_oc_IOP_TaggedComponentList, 0, sizeof (IOP::TaggedComponentList));
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentList (
+    CORBA::tk_alias,
+    sizeof (_oc_IOP_TaggedComponentList),
+    (char *) &_oc_IOP_TaggedComponentList,
+    0,
+    sizeof (IOP::TaggedComponentList)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedComponentList, &_tc_TAO_tc_IOP_TaggedComponentList)
 TAO_NAMESPACE_END
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_TAGGEDCOMPONENTSEQ_CS_
 
@@ -661,43 +937,43 @@ TAO_NAMESPACE_END
   {
     IOP::TaggedComponent* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::allocbuf (length);
-
+    
     if (this->buffer_ != 0)
     {
       IOP::TaggedComponent *old = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-
+      
       if (this->release_)
         _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (old);
-
+      
     }
     this->buffer_ = tmp;
   }
-
+  
   void
   IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-
+    
     IOP::TaggedComponent *tmp = ACE_reinterpret_cast (IOP::TaggedComponent *,this->buffer_);
-
+    
     _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::freebuf (tmp);
     this->buffer_ = 0;
-  }
-
+  } 
+  
   IOP::_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq::~_TAO_Unbounded_Sequence_IOP_TaggedComponentSeq (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-
-
+  
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CS_)
 #define _IOP_TAGGEDCOMPONENTSEQ_CS_
@@ -709,30 +985,30 @@ TAO_NAMESPACE_END
 IOP::TaggedComponentSeq::TaggedComponentSeq (void)
 {}
 IOP::TaggedComponentSeq::TaggedComponentSeq (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 IOP::TaggedComponentSeq::TaggedComponentSeq (CORBA::ULong max, CORBA::ULong length, IOP::TaggedComponent *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 IOP::TaggedComponentSeq::TaggedComponentSeq (const TaggedComponentSeq &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_TaggedComponentSeq
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::TaggedComponent>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 IOP::TaggedComponentSeq::~TaggedComponentSeq (void) // dtor
@@ -749,27 +1025,71 @@ void IOP::TaggedComponentSeq::_tao_any_destructor (void *x)
 static const CORBA::Long _oc_IOP_TaggedComponentSeq[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/TaggedComponentSeq:1.0
-  19, ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7453), ACE_NTOHL (0x65710000),  // name = TaggedComponentSeq
+  39,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7453), 
+  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/TaggedComponentSeq:1.0
+  19,
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7453), 
+  ACE_NTOHL (0x65710000),  // name = TaggedComponentSeq
   CORBA::tk_sequence, // typecode kind
   200, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     184, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-      16, ACE_NTOHL (0x54616767), ACE_NTOHL (0x6564436f), ACE_NTOHL (0x6d706f6e), ACE_NTOHL (0x656e7400),  // name = TaggedComponent
+      36,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e743a), 
+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
+      16,
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e7400),  // name = TaggedComponent
       2, // member count
-      4, ACE_NTOHL (0x74616700),  // name = tag
+      4,
+      ACE_NTOHL (0x74616700),  // name = tag
       CORBA::tk_alias, // typecode kind for typedefs
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-        12, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74496400),  // name = ComponentId
+        32,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
+        ACE_NTOHL (0x7449643a), 
+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
+        12,
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
+        ACE_NTOHL (0x74496400),  // name = ComponentId
         CORBA::tk_ulong,
 
 
-      15, ACE_NTOHL (0x636f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x745f6461), ACE_NTOHL (0x74610000),  // name = component_data
+      15,
+      ACE_NTOHL (0x636f6d70), 
+      ACE_NTOHL (0x6f6e656e), 
+      ACE_NTOHL (0x745f6461), 
+      ACE_NTOHL (0x74610000),  // name = component_data
       CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
@@ -781,11 +1101,20 @@ static const CORBA::Long _oc_IOP_TaggedComponentSeq[] =
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentSeq (CORBA::tk_alias, sizeof (_oc_IOP_TaggedComponentSeq), (char *) &_oc_IOP_TaggedComponentSeq, 0, sizeof (IOP::TaggedComponentSeq));
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_IOP_TaggedComponentSeq),
+    (char *) &_oc_IOP_TaggedComponentSeq,
+    0,
+    sizeof (IOP::TaggedComponentSeq)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TaggedComponentSeq, &_tc_TAO_tc_IOP_TaggedComponentSeq)
 TAO_NAMESPACE_END
+
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_ORB_TYPE, 0U)
@@ -829,32 +1158,83 @@ TAO_NAMESPACE_END
 static const CORBA::Long _oc_IOP_ServiceId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-  10, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x64000000),  // name = ServiceId
+  30,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636549), 
+  ACE_NTOHL (0x643a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
+  10,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636549), 
+  ACE_NTOHL (0x64000000),  // name = ServiceId
   CORBA::tk_ulong,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceId (CORBA::tk_alias, sizeof (_oc_IOP_ServiceId), (char *) &_oc_IOP_ServiceId, 0, sizeof (IOP::ServiceId));
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceId (
+    CORBA::tk_alias,
+    sizeof (_oc_IOP_ServiceId),
+    (char *) &_oc_IOP_ServiceId,
+    0,
+    sizeof (IOP::ServiceId)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceId, &_tc_TAO_tc_IOP_ServiceId)
 TAO_NAMESPACE_END
+
 static const CORBA::Long _oc_IOP_ServiceContext[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
-  15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78740000),  // name = ServiceContext
+  35,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636543), 
+  ACE_NTOHL (0x6f6e7465), 
+  ACE_NTOHL (0x78743a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
+  15,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636543), 
+  ACE_NTOHL (0x6f6e7465), 
+  ACE_NTOHL (0x78740000),  // name = ServiceContext
   2, // member count
-  11, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x6578745f), ACE_NTOHL (0x69640000),  // name = context_id
+  11,
+  ACE_NTOHL (0x636f6e74), 
+  ACE_NTOHL (0x6578745f), 
+  ACE_NTOHL (0x69640000),  // name = context_id
   CORBA::tk_alias, // typecode kind for typedefs
   60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-    10, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x64000000),  // name = ServiceId
+    30,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x53657276), 
+    ACE_NTOHL (0x69636549), 
+    ACE_NTOHL (0x643a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
+    10,
+    ACE_NTOHL (0x53657276), 
+    ACE_NTOHL (0x69636549), 
+    ACE_NTOHL (0x64000000),  // name = ServiceId
     CORBA::tk_ulong,
 
 
-  13, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x6578745f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = context_data
+  13,
+  ACE_NTOHL (0x636f6e74), 
+  ACE_NTOHL (0x6578745f), 
+  ACE_NTOHL (0x64617461), 
+  ACE_NTOHL (0x0),  // name = context_data
   CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
@@ -863,11 +1243,20 @@ static const CORBA::Long _oc_IOP_ServiceContext[] =
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContext (CORBA::tk_struct, sizeof (_oc_IOP_ServiceContext), (char *) &_oc_IOP_ServiceContext, 0, sizeof (IOP::ServiceContext));
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContext (
+    CORBA::tk_struct,
+    sizeof (_oc_IOP_ServiceContext),
+    (char *) &_oc_IOP_ServiceContext,
+    0,
+    sizeof (IOP::ServiceContext)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceContext, &_tc_TAO_tc_IOP_ServiceContext)
 TAO_NAMESPACE_END
+
 void IOP::ServiceContext::_tao_any_destructor (void *x)
 {
   ServiceContext *tmp = ACE_static_cast (ServiceContext*,x);
@@ -885,30 +1274,30 @@ void IOP::ServiceContext::_tao_any_destructor (void *x)
 IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (void)
 {}
 IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 IOP::ServiceContext::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 IOP::ServiceContext::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
@@ -924,7 +1313,7 @@ void IOP::ServiceContext::_tao_seq_Octet::_tao_any_destructor (void *x)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CS_
 
@@ -933,43 +1322,43 @@ void IOP::ServiceContext::_tao_seq_Octet::_tao_any_destructor (void *x)
   {
     IOP::ServiceContext* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_IOP_ServiceContextList::allocbuf (length);
-
+    
     if (this->buffer_ != 0)
     {
       IOP::ServiceContext *old = ACE_reinterpret_cast (IOP::ServiceContext *,this->buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-
+      
       if (this->release_)
         _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (old);
-
+      
     }
     this->buffer_ = tmp;
   }
-
+  
   void
   IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-
+    
     IOP::ServiceContext *tmp = ACE_reinterpret_cast (IOP::ServiceContext *,this->buffer_);
-
+    
     _TAO_Unbounded_Sequence_IOP_ServiceContextList::freebuf (tmp);
     this->buffer_ = 0;
-  }
-
+  } 
+  
   IOP::_TAO_Unbounded_Sequence_IOP_ServiceContextList::~_TAO_Unbounded_Sequence_IOP_ServiceContextList (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-
-
+  
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IOP_SERVICECONTEXTLIST_CS_)
 #define _IOP_SERVICECONTEXTLIST_CS_
@@ -981,30 +1370,30 @@ void IOP::ServiceContext::_tao_seq_Octet::_tao_any_destructor (void *x)
 IOP::ServiceContextList::ServiceContextList (void)
 {}
 IOP::ServiceContextList::ServiceContextList (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_ServiceContextList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::ServiceContext>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 IOP::ServiceContextList::ServiceContextList (CORBA::ULong max, CORBA::ULong length, IOP::ServiceContext *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_ServiceContextList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::ServiceContext>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 IOP::ServiceContextList::ServiceContextList (const ServiceContextList &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_IOP_ServiceContextList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<IOP::ServiceContext>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 IOP::ServiceContextList::~ServiceContextList (void) // dtor
@@ -1021,27 +1410,73 @@ void IOP::ServiceContextList::_tao_any_destructor (void *x)
 static const CORBA::Long _oc_IOP_ServiceContextList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744c69), ACE_NTOHL (0x73743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContextList:1.0
-  19, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744c69), ACE_NTOHL (0x73740000),  // name = ServiceContextList
+  39,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636543), 
+  ACE_NTOHL (0x6f6e7465), 
+  ACE_NTOHL (0x78744c69), 
+  ACE_NTOHL (0x73743a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContextList:1.0
+  19,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636543), 
+  ACE_NTOHL (0x6f6e7465), 
+  ACE_NTOHL (0x78744c69), 
+  ACE_NTOHL (0x73740000),  // name = ServiceContextList
   CORBA::tk_sequence, // typecode kind
   208, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
     192, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
-      15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636543), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78740000),  // name = ServiceContext
+      35,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x69636543), 
+      ACE_NTOHL (0x6f6e7465), 
+      ACE_NTOHL (0x78743a31), 
+      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
+      15,
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x69636543), 
+      ACE_NTOHL (0x6f6e7465), 
+      ACE_NTOHL (0x78740000),  // name = ServiceContext
       2, // member count
-      11, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x6578745f), ACE_NTOHL (0x69640000),  // name = context_id
+      11,
+      ACE_NTOHL (0x636f6e74), 
+      ACE_NTOHL (0x6578745f), 
+      ACE_NTOHL (0x69640000),  // name = context_id
       CORBA::tk_alias, // typecode kind for typedefs
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
-        30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-        10, ACE_NTOHL (0x53657276), ACE_NTOHL (0x69636549), ACE_NTOHL (0x64000000),  // name = ServiceId
+        30,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x53657276), 
+        ACE_NTOHL (0x69636549), 
+        ACE_NTOHL (0x643a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
+        10,
+        ACE_NTOHL (0x53657276), 
+        ACE_NTOHL (0x69636549), 
+        ACE_NTOHL (0x64000000),  // name = ServiceId
         CORBA::tk_ulong,
 
 
-      13, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x6578745f), ACE_NTOHL (0x64617461), ACE_NTOHL (0x0),  // name = context_data
+      13,
+      ACE_NTOHL (0x636f6e74), 
+      ACE_NTOHL (0x6578745f), 
+      ACE_NTOHL (0x64617461), 
+      ACE_NTOHL (0x0),  // name = context_data
       CORBA::tk_sequence, // typecode kind
       12, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
@@ -1053,11 +1488,20 @@ static const CORBA::Long _oc_IOP_ServiceContextList[] =
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContextList (CORBA::tk_alias, sizeof (_oc_IOP_ServiceContextList), (char *) &_oc_IOP_ServiceContextList, 0, sizeof (IOP::ServiceContextList));
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContextList (
+    CORBA::tk_alias,
+    sizeof (_oc_IOP_ServiceContextList),
+    (char *) &_oc_IOP_ServiceContextList,
+    0,
+    sizeof (IOP::ServiceContextList)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServiceContextList, &_tc_TAO_tc_IOP_ServiceContextList)
 TAO_NAMESPACE_END
+
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, TransactionService, 0U)
@@ -1122,6 +1566,188 @@ TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, FT_REQUEST, 13U)
 TAO_NAMESPACE_END
+// *************************************************************
+// Operations for class IOP::Codec_var
+// *************************************************************
+
+IOP::Codec_var::Codec_var (void) // default constructor
+  : ptr_ (Codec::_nil ())
+{}
+
+::IOP::Codec_ptr
+IOP::Codec_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+IOP::Codec_var::Codec_var (const ::IOP::Codec_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (Codec::_duplicate (p.ptr ()))
+{}
+
+IOP::Codec_var::~Codec_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+IOP::Codec_var &
+IOP::Codec_var::operator= (Codec_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+IOP::Codec_var &
+IOP::Codec_var::operator= (const ::IOP::Codec_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::IOP::Codec::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+IOP::Codec_var::operator const ::IOP::Codec_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+IOP::Codec_var::operator ::IOP::Codec_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::IOP::Codec_ptr
+IOP::Codec_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::IOP::Codec_ptr
+IOP::Codec_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::IOP::Codec_ptr &
+IOP::Codec_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::IOP::Codec_ptr &
+IOP::Codec_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IOP::Codec::_nil ();
+  return this->ptr_;
+}
+
+::IOP::Codec_ptr
+IOP::Codec_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::IOP::Codec_ptr val = this->ptr_;
+  this->ptr_ = ::IOP::Codec::_nil ();
+  return val;
+}
+
+::IOP::Codec_ptr
+IOP::Codec_var::duplicate (Codec_ptr p)
+{
+  return ::IOP::Codec::_duplicate (p);
+}
+
+void
+IOP::Codec_var::release (Codec_ptr p)
+{
+  CORBA::release (p);
+}
+
+::IOP::Codec_ptr
+IOP::Codec_var::nil (void)
+{
+  return ::IOP::Codec::_nil ();
+}
+
+::IOP::Codec_ptr
+IOP::Codec_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::IOP::Codec::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+IOP::Codec_var::upcast (void *src)
+{
+  Codec **tmp =
+    ACE_static_cast (Codec **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class IOP::Codec_out
+// *************************************************************
+
+IOP::Codec_out::Codec_out (Codec_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::IOP::Codec::_nil ();
+}
+
+IOP::Codec_out::Codec_out (Codec_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IOP::Codec::_nil ();
+}
+
+IOP::Codec_out::Codec_out (const ::IOP::Codec_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (Codec_out &, p).ptr_)
+{}
+
+::IOP::Codec_out &
+IOP::Codec_out::operator= (const ::IOP::Codec_out &p)
+{
+  this->ptr_ = ACE_const_cast (Codec_out&, p).ptr_;
+  return *this;
+}
+
+IOP::Codec_out &
+IOP::Codec_out::operator= (const ::IOP::Codec_var &p)
+{
+  this->ptr_ = ::IOP::Codec::_duplicate (p.ptr ());
+  return *this;
+}
+
+IOP::Codec_out &
+IOP::Codec_out::operator= (Codec_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+IOP::Codec_out::operator ::IOP::Codec_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::IOP::Codec_ptr &
+IOP::Codec_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::IOP::Codec_ptr
+IOP::Codec_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 // default constructor
 IOP::Codec::Codec ()
@@ -1180,7 +1806,7 @@ void *IOP::Codec::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1398,16 +2024,38 @@ CORBA::Exception *IOP::Codec::TypeMismatch::_alloc (void)
 static const CORBA::Long _oc_IOP_EncodingFormat[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x456e636f), ACE_NTOHL (0x64696e67), ACE_NTOHL (0x466f726d), ACE_NTOHL (0x61743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
-  15, ACE_NTOHL (0x456e636f), ACE_NTOHL (0x64696e67), ACE_NTOHL (0x466f726d), ACE_NTOHL (0x61740000),  // name = EncodingFormat
+  35,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x466f726d), 
+  ACE_NTOHL (0x61743a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
+  15,
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x466f726d), 
+  ACE_NTOHL (0x61740000),  // name = EncodingFormat
   CORBA::tk_short,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IOP_EncodingFormat (CORBA::tk_alias, sizeof (_oc_IOP_EncodingFormat), (char *) &_oc_IOP_EncodingFormat, 0, sizeof (IOP::EncodingFormat));
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_EncodingFormat (
+    CORBA::tk_alias,
+    sizeof (_oc_IOP_EncodingFormat),
+    (char *) &_oc_IOP_EncodingFormat,
+    0,
+    sizeof (IOP::EncodingFormat)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EncodingFormat, &_tc_TAO_tc_IOP_EncodingFormat)
 TAO_NAMESPACE_END
+
 TAO_NAMESPACE_TYPE (const CORBA::Short)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (const CORBA::Short, ENCODING_CDR_ENCAPS, 0)
@@ -1415,36 +2063,261 @@ TAO_NAMESPACE_END
 static const CORBA::Long _oc_IOP_Encoding[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x456e636f), ACE_NTOHL (0x64696e67), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Encoding:1.0
-  9, ACE_NTOHL (0x456e636f), ACE_NTOHL (0x64696e67), ACE_NTOHL (0x0),  // name = Encoding
+  29,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Encoding:1.0
+  9,
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x0),  // name = Encoding
   3, // member count
-  7, ACE_NTOHL (0x666f726d), ACE_NTOHL (0x61740000),  // name = format
+  7,
+  ACE_NTOHL (0x666f726d), 
+  ACE_NTOHL (0x61740000),  // name = format
   CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x456e636f), ACE_NTOHL (0x64696e67), ACE_NTOHL (0x466f726d), ACE_NTOHL (0x61743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
-    15, ACE_NTOHL (0x456e636f), ACE_NTOHL (0x64696e67), ACE_NTOHL (0x466f726d), ACE_NTOHL (0x61740000),  // name = EncodingFormat
+    35,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x456e636f), 
+    ACE_NTOHL (0x64696e67), 
+    ACE_NTOHL (0x466f726d), 
+    ACE_NTOHL (0x61743a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
+    15,
+    ACE_NTOHL (0x456e636f), 
+    ACE_NTOHL (0x64696e67), 
+    ACE_NTOHL (0x466f726d), 
+    ACE_NTOHL (0x61740000),  // name = EncodingFormat
     CORBA::tk_short,
 
 
-  14, ACE_NTOHL (0x6d616a6f), ACE_NTOHL (0x725f7665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e000000),  // name = major_version
+  14,
+  ACE_NTOHL (0x6d616a6f), 
+  ACE_NTOHL (0x725f7665), 
+  ACE_NTOHL (0x7273696f), 
+  ACE_NTOHL (0x6e000000),  // name = major_version
   CORBA::tk_octet,
 
-  14, ACE_NTOHL (0x6d696e6f), ACE_NTOHL (0x725f7665), ACE_NTOHL (0x7273696f), ACE_NTOHL (0x6e000000),  // name = minor_version
+  14,
+  ACE_NTOHL (0x6d696e6f), 
+  ACE_NTOHL (0x725f7665), 
+  ACE_NTOHL (0x7273696f), 
+  ACE_NTOHL (0x6e000000),  // name = minor_version
   CORBA::tk_octet,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_IOP_Encoding (CORBA::tk_struct, sizeof (_oc_IOP_Encoding), (char *) &_oc_IOP_Encoding, 0, sizeof (IOP::Encoding));
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_Encoding (
+    CORBA::tk_struct,
+    sizeof (_oc_IOP_Encoding),
+    (char *) &_oc_IOP_Encoding,
+    0,
+    sizeof (IOP::Encoding)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Encoding, &_tc_TAO_tc_IOP_Encoding)
 TAO_NAMESPACE_END
+
 void IOP::Encoding::_tao_any_destructor (void *x)
 {
   Encoding *tmp = ACE_static_cast (Encoding*,x);
   delete tmp;
 }
 
+// *************************************************************
+// Operations for class IOP::CodecFactory_var
+// *************************************************************
+
+IOP::CodecFactory_var::CodecFactory_var (void) // default constructor
+  : ptr_ (CodecFactory::_nil ())
+{}
+
+::IOP::CodecFactory_ptr
+IOP::CodecFactory_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+IOP::CodecFactory_var::CodecFactory_var (const ::IOP::CodecFactory_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CodecFactory::_duplicate (p.ptr ()))
+{}
+
+IOP::CodecFactory_var::~CodecFactory_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+IOP::CodecFactory_var &
+IOP::CodecFactory_var::operator= (CodecFactory_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+IOP::CodecFactory_var &
+IOP::CodecFactory_var::operator= (const ::IOP::CodecFactory_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::IOP::CodecFactory::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+IOP::CodecFactory_var::operator const ::IOP::CodecFactory_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+IOP::CodecFactory_var::operator ::IOP::CodecFactory_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::IOP::CodecFactory_ptr
+IOP::CodecFactory_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::IOP::CodecFactory_ptr
+IOP::CodecFactory_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::IOP::CodecFactory_ptr &
+IOP::CodecFactory_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::IOP::CodecFactory_ptr &
+IOP::CodecFactory_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IOP::CodecFactory::_nil ();
+  return this->ptr_;
+}
+
+::IOP::CodecFactory_ptr
+IOP::CodecFactory_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::IOP::CodecFactory_ptr val = this->ptr_;
+  this->ptr_ = ::IOP::CodecFactory::_nil ();
+  return val;
+}
+
+::IOP::CodecFactory_ptr
+IOP::CodecFactory_var::duplicate (CodecFactory_ptr p)
+{
+  return ::IOP::CodecFactory::_duplicate (p);
+}
+
+void
+IOP::CodecFactory_var::release (CodecFactory_ptr p)
+{
+  CORBA::release (p);
+}
+
+::IOP::CodecFactory_ptr
+IOP::CodecFactory_var::nil (void)
+{
+  return ::IOP::CodecFactory::_nil ();
+}
+
+::IOP::CodecFactory_ptr
+IOP::CodecFactory_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::IOP::CodecFactory::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+IOP::CodecFactory_var::upcast (void *src)
+{
+  CodecFactory **tmp =
+    ACE_static_cast (CodecFactory **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class IOP::CodecFactory_out
+// *************************************************************
+
+IOP::CodecFactory_out::CodecFactory_out (CodecFactory_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::IOP::CodecFactory::_nil ();
+}
+
+IOP::CodecFactory_out::CodecFactory_out (CodecFactory_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IOP::CodecFactory::_nil ();
+}
+
+IOP::CodecFactory_out::CodecFactory_out (const ::IOP::CodecFactory_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CodecFactory_out &, p).ptr_)
+{}
+
+::IOP::CodecFactory_out &
+IOP::CodecFactory_out::operator= (const ::IOP::CodecFactory_out &p)
+{
+  this->ptr_ = ACE_const_cast (CodecFactory_out&, p).ptr_;
+  return *this;
+}
+
+IOP::CodecFactory_out &
+IOP::CodecFactory_out::operator= (const ::IOP::CodecFactory_var &p)
+{
+  this->ptr_ = ::IOP::CodecFactory::_duplicate (p.ptr ());
+  return *this;
+}
+
+IOP::CodecFactory_out &
+IOP::CodecFactory_out::operator= (CodecFactory_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+IOP::CodecFactory_out::operator ::IOP::CodecFactory_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::IOP::CodecFactory_ptr &
+IOP::CodecFactory_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::IOP::CodecFactory_ptr
+IOP::CodecFactory_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 // default constructor
 IOP::CodecFactory::CodecFactory ()
@@ -1503,7 +2376,7 @@ void *IOP::CodecFactory::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1618,15 +2491,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedProfile
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (IOP::_tc_TaggedProfile, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedProfile, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -1703,15 +2574,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::IOR *&_tao_el
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (IOP::_tc_IOR, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (IOP::_tc_IOR, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -1788,15 +2657,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (IOP::_tc_TaggedComponent, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponent, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -1881,15 +2748,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::MultipleCompo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (IOP::_tc_MultipleComponentProfile, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (IOP::_tc_MultipleComponentProfile, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -1974,15 +2839,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result=
-      type->equivalent (IOP::_tc_TaggedComponentList, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentList, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -2067,15 +2930,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::TaggedCompone
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (IOP::_tc_TaggedComponentSeq, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (IOP::_tc_TaggedComponentSeq, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -2152,15 +3013,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContex
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (IOP::_tc_ServiceContext, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContext, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -2245,15 +3104,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::ServiceContex
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (IOP::_tc_ServiceContextList, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (IOP::_tc_ServiceContextList, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -2337,15 +3194,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IOP::Encoding *&_t
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (IOP::_tc_Encoding, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (IOP::_tc_Encoding, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -2405,20 +3260,20 @@ CORBA::Boolean operator<< (
   if (strm << _tao_sequence.length ())
   {
     // encode all elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
         ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedProfile::_tao_seq_Octet *)&_tao_sequence);
       if (oseq->mb ())
         return strm.write_octet_array_mb (oseq->mb ());
       else
         return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -2435,14 +3290,14 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
         ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
       oseq->replace (_tao_seq_len, strm.start ());
       oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
@@ -2451,10 +3306,10 @@ CORBA::Boolean operator>> (
     }
     else
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -2495,7 +3350,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -2522,20 +3377,20 @@ CORBA::Boolean operator<< (
   if (strm << _tao_sequence.length ())
   {
     // encode all elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
         ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::TaggedComponent::_tao_seq_Octet *)&_tao_sequence);
       if (oseq->mb ())
         return strm.write_octet_array_mb (oseq->mb ());
       else
         return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -2552,14 +3407,14 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
         ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
       oseq->replace (_tao_seq_len, strm.start ());
       oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
@@ -2568,10 +3423,10 @@ CORBA::Boolean operator>> (
     }
     else
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -2608,7 +3463,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -2650,7 +3505,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -2692,7 +3547,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -2717,20 +3572,20 @@ CORBA::Boolean operator<< (
   if (strm << _tao_sequence.length ())
   {
     // encode all elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
         ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (IOP::ServiceContext::_tao_seq_Octet *)&_tao_sequence);
       if (oseq->mb ())
         return strm.write_octet_array_mb (oseq->mb ());
       else
         return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -2747,14 +3602,14 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
         ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
       oseq->replace (_tao_seq_len, strm.start ());
       oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
@@ -2763,10 +3618,10 @@ CORBA::Boolean operator>> (
     }
     else
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -2803,7 +3658,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -2815,3 +3670,4 @@ CORBA::Boolean operator>> (
   }
   return 0; // error
 }
+
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index b9a4cfbdbef..a0f98977d74 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -19,11 +19,10 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_IOPC_H_
-#define _TAO_IDL_IOPC_H_
+#ifndef _TAO_IDL_ORIG_IOPC_H_
+#define _TAO_IDL_ORIG_IOPC_H_
 
 #include "ace/pre.h"
-
 #include "TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -130,76 +129,6 @@ TAO_NAMESPACE  IOP
     
 #endif /* end #if !defined */
 
-
-#if !defined (_IOP_TAGGEDPROFILE__TAO_SEQ_OCTET___VAR_CH_)
-#define _IOP_TAGGEDPROFILE__TAO_SEQ_OCTET___VAR_CH_
-
-    // *************************************************************
-    // class IOP::TaggedProfile::_tao_seq_Octet_var
-    // *************************************************************
-
-    class TAO_Export _tao_seq_Octet_var
-    {
-    public:
-      _tao_seq_Octet_var (void); // default constructor
-      _tao_seq_Octet_var (_tao_seq_Octet *);
-      _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor
-      _tao_seq_Octet_var (const _tao_seq_Octet &); // fixed-size base types only
-      ~_tao_seq_Octet_var (void); // destructor
-      
-      _tao_seq_Octet_var &operator= (_tao_seq_Octet *);
-      _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &);
-      _tao_seq_Octet_var &operator= (const _tao_seq_Octet &); // fixed-size base types only
-      _tao_seq_Octet *operator-> (void);
-      const _tao_seq_Octet *operator-> (void) const;
-      
-      operator const _tao_seq_Octet &() const;
-      operator _tao_seq_Octet &();
-      operator _tao_seq_Octet &() const;
-      
-      CORBA::Octet & operator[] (CORBA::ULong index);
-      const CORBA::Octet & operator[] (CORBA::ULong index) const;
-      
-      // in, inout, out, _retn 
-      const _tao_seq_Octet &in (void) const;
-      _tao_seq_Octet &inout (void);
-      _tao_seq_Octet *&out (void);
-      _tao_seq_Octet *_retn (void);
-      _tao_seq_Octet *ptr (void) const;
-
-    private:
-      _tao_seq_Octet *ptr_;
-    };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_TAGGEDPROFILE__TAO_SEQ_OCTET___OUT_CH_)
-#define _IOP_TAGGEDPROFILE__TAO_SEQ_OCTET___OUT_CH_
-
-    class TAO_Export _tao_seq_Octet_out
-    {
-    public:
-      _tao_seq_Octet_out (_tao_seq_Octet *&);
-      _tao_seq_Octet_out (_tao_seq_Octet_var &);
-      _tao_seq_Octet_out (const _tao_seq_Octet_out &);
-      _tao_seq_Octet_out &operator= (const _tao_seq_Octet_out &);
-      _tao_seq_Octet_out &operator= (_tao_seq_Octet *);
-      operator _tao_seq_Octet *&();
-      _tao_seq_Octet *&ptr (void);
-      _tao_seq_Octet *operator-> (void);
-      CORBA::Octet & operator[] (CORBA::ULong index);
-      
-    private:
-      _tao_seq_Octet *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_Octet_var &);
-    };
-
-
-#endif /* end #if !defined */
-
 #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef _tao_seq_Octet _profile_data_seq;
   #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
@@ -350,75 +279,6 @@ TAO_NAMESPACE  IOP
     
 #endif /* end #if !defined */
 
-
-#if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE___VAR_CH_)
-#define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE___VAR_CH_
-
-    // *************************************************************
-    // class IOP::IOR::_tao_seq_TaggedProfile_var
-    // *************************************************************
-
-    class TAO_Export _tao_seq_TaggedProfile_var
-    {
-    public:
-      _tao_seq_TaggedProfile_var (void); // default constructor
-      _tao_seq_TaggedProfile_var (_tao_seq_TaggedProfile *);
-      _tao_seq_TaggedProfile_var (const _tao_seq_TaggedProfile_var &); // copy constructor
-      ~_tao_seq_TaggedProfile_var (void); // destructor
-      
-      _tao_seq_TaggedProfile_var &operator= (_tao_seq_TaggedProfile *);
-      _tao_seq_TaggedProfile_var &operator= (const _tao_seq_TaggedProfile_var &);
-      _tao_seq_TaggedProfile *operator-> (void);
-      const _tao_seq_TaggedProfile *operator-> (void) const;
-      
-      operator const _tao_seq_TaggedProfile &() const;
-      operator _tao_seq_TaggedProfile &();
-      operator _tao_seq_TaggedProfile &() const;
-      operator _tao_seq_TaggedProfile *&(); // variable-size base types only
-      
-      ACE_NESTED_CLASS (IOP, TaggedProfile) & operator[] (CORBA::ULong index);
-      const ACE_NESTED_CLASS (IOP, TaggedProfile) & operator[] (CORBA::ULong index) const;
-      
-      // in, inout, out, _retn 
-      const _tao_seq_TaggedProfile &in (void) const;
-      _tao_seq_TaggedProfile &inout (void);
-      _tao_seq_TaggedProfile *&out (void);
-      _tao_seq_TaggedProfile *_retn (void);
-      _tao_seq_TaggedProfile *ptr (void) const;
-
-    private:
-      _tao_seq_TaggedProfile *ptr_;
-    };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE___OUT_CH_)
-#define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE___OUT_CH_
-
-    class TAO_Export _tao_seq_TaggedProfile_out
-    {
-    public:
-      _tao_seq_TaggedProfile_out (_tao_seq_TaggedProfile *&);
-      _tao_seq_TaggedProfile_out (_tao_seq_TaggedProfile_var &);
-      _tao_seq_TaggedProfile_out (const _tao_seq_TaggedProfile_out &);
-      _tao_seq_TaggedProfile_out &operator= (const _tao_seq_TaggedProfile_out &);
-      _tao_seq_TaggedProfile_out &operator= (_tao_seq_TaggedProfile *);
-      operator _tao_seq_TaggedProfile *&();
-      _tao_seq_TaggedProfile *&ptr (void);
-      _tao_seq_TaggedProfile *operator-> (void);
-      ACE_NESTED_CLASS (IOP, TaggedProfile) & operator[] (CORBA::ULong index);
-      
-    private:
-      _tao_seq_TaggedProfile *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_TaggedProfile_var &);
-    };
-
-
-#endif /* end #if !defined */
-
 #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef _tao_seq_TaggedProfile _profiles_seq;
   #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
@@ -540,76 +400,6 @@ TAO_NAMESPACE  IOP
     
 #endif /* end #if !defined */
 
-
-#if !defined (_IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET___VAR_CH_)
-#define _IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET___VAR_CH_
-
-    // *************************************************************
-    // class IOP::TaggedComponent::_tao_seq_Octet_var
-    // *************************************************************
-
-    class TAO_Export _tao_seq_Octet_var
-    {
-    public:
-      _tao_seq_Octet_var (void); // default constructor
-      _tao_seq_Octet_var (_tao_seq_Octet *);
-      _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor
-      _tao_seq_Octet_var (const _tao_seq_Octet &); // fixed-size base types only
-      ~_tao_seq_Octet_var (void); // destructor
-      
-      _tao_seq_Octet_var &operator= (_tao_seq_Octet *);
-      _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &);
-      _tao_seq_Octet_var &operator= (const _tao_seq_Octet &); // fixed-size base types only
-      _tao_seq_Octet *operator-> (void);
-      const _tao_seq_Octet *operator-> (void) const;
-      
-      operator const _tao_seq_Octet &() const;
-      operator _tao_seq_Octet &();
-      operator _tao_seq_Octet &() const;
-      
-      CORBA::Octet & operator[] (CORBA::ULong index);
-      const CORBA::Octet & operator[] (CORBA::ULong index) const;
-      
-      // in, inout, out, _retn 
-      const _tao_seq_Octet &in (void) const;
-      _tao_seq_Octet &inout (void);
-      _tao_seq_Octet *&out (void);
-      _tao_seq_Octet *_retn (void);
-      _tao_seq_Octet *ptr (void) const;
-
-    private:
-      _tao_seq_Octet *ptr_;
-    };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET___OUT_CH_)
-#define _IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET___OUT_CH_
-
-    class TAO_Export _tao_seq_Octet_out
-    {
-    public:
-      _tao_seq_Octet_out (_tao_seq_Octet *&);
-      _tao_seq_Octet_out (_tao_seq_Octet_var &);
-      _tao_seq_Octet_out (const _tao_seq_Octet_out &);
-      _tao_seq_Octet_out &operator= (const _tao_seq_Octet_out &);
-      _tao_seq_Octet_out &operator= (_tao_seq_Octet *);
-      operator _tao_seq_Octet *&();
-      _tao_seq_Octet *&ptr (void);
-      _tao_seq_Octet *operator-> (void);
-      CORBA::Octet & operator[] (CORBA::ULong index);
-      
-    private:
-      _tao_seq_Octet *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_Octet_var &);
-    };
-
-
-#endif /* end #if !defined */
-
 #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef _tao_seq_Octet _component_data_seq;
   #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
@@ -1207,76 +997,6 @@ TAO_NAMESPACE  IOP
     
 #endif /* end #if !defined */
 
-
-#if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_OCTET___VAR_CH_)
-#define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET___VAR_CH_
-
-    // *************************************************************
-    // class IOP::ServiceContext::_tao_seq_Octet_var
-    // *************************************************************
-
-    class TAO_Export _tao_seq_Octet_var
-    {
-    public:
-      _tao_seq_Octet_var (void); // default constructor
-      _tao_seq_Octet_var (_tao_seq_Octet *);
-      _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor
-      _tao_seq_Octet_var (const _tao_seq_Octet &); // fixed-size base types only
-      ~_tao_seq_Octet_var (void); // destructor
-      
-      _tao_seq_Octet_var &operator= (_tao_seq_Octet *);
-      _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &);
-      _tao_seq_Octet_var &operator= (const _tao_seq_Octet &); // fixed-size base types only
-      _tao_seq_Octet *operator-> (void);
-      const _tao_seq_Octet *operator-> (void) const;
-      
-      operator const _tao_seq_Octet &() const;
-      operator _tao_seq_Octet &();
-      operator _tao_seq_Octet &() const;
-      
-      CORBA::Octet & operator[] (CORBA::ULong index);
-      const CORBA::Octet & operator[] (CORBA::ULong index) const;
-      
-      // in, inout, out, _retn 
-      const _tao_seq_Octet &in (void) const;
-      _tao_seq_Octet &inout (void);
-      _tao_seq_Octet *&out (void);
-      _tao_seq_Octet *_retn (void);
-      _tao_seq_Octet *ptr (void) const;
-
-    private:
-      _tao_seq_Octet *ptr_;
-    };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_OCTET___OUT_CH_)
-#define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET___OUT_CH_
-
-    class TAO_Export _tao_seq_Octet_out
-    {
-    public:
-      _tao_seq_Octet_out (_tao_seq_Octet *&);
-      _tao_seq_Octet_out (_tao_seq_Octet_var &);
-      _tao_seq_Octet_out (const _tao_seq_Octet_out &);
-      _tao_seq_Octet_out &operator= (const _tao_seq_Octet_out &);
-      _tao_seq_Octet_out &operator= (_tao_seq_Octet *);
-      operator _tao_seq_Octet *&();
-      _tao_seq_Octet *&ptr (void);
-      _tao_seq_Octet *operator-> (void);
-      CORBA::Octet & operator[] (CORBA::ULong index);
-      
-    private:
-      _tao_seq_Octet *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_Octet_var &);
-    };
-
-
-#endif /* end #if !defined */
-
 #if !defined (__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
     typedef _tao_seq_Octet _context_data_seq;
   #endif /* ! __GNUC__ || ACE_HAS_GNUG_PRE_2_8 */
@@ -1550,7 +1270,15 @@ TAO_NAMESPACE  IOP
     Codec_ptr &out (void);
     Codec_ptr _retn (void);
     Codec_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static Codec_ptr duplicate (Codec_ptr);
+    static void release (Codec_ptr);
+    static Codec_ptr nil (void);
+    static Codec_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     Codec_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1577,7 +1305,7 @@ TAO_NAMESPACE  IOP
     operator Codec_ptr &();
     Codec_ptr &ptr (void);
     Codec_ptr operator-> (void);
-    
+  
   private:
     Codec_ptr &ptr_;
   };
@@ -1885,7 +1613,15 @@ class TAO_Export Codec : public virtual CORBA_Object
     CodecFactory_ptr &out (void);
     CodecFactory_ptr _retn (void);
     CodecFactory_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static CodecFactory_ptr duplicate (CodecFactory_ptr);
+    static void release (CodecFactory_ptr);
+    static CodecFactory_ptr nil (void);
+    static CodecFactory_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     CodecFactory_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1912,7 +1648,7 @@ class TAO_Export Codec : public virtual CORBA_Object
     operator CodecFactory_ptr &();
     CodecFactory_ptr &ptr (void);
     CodecFactory_ptr operator-> (void);
-    
+  
   private:
     CodecFactory_ptr &ptr_;
   };
@@ -2020,8 +1756,6 @@ class TAO_Export CodecFactory : public virtual CORBA_Object
 }
 TAO_NAMESPACE_CLOSE // module IOP
 
-// Proxy Broker Factory function pointer declarations.
-
 TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedProfile &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedProfile*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedProfile *&); // deprecated
diff --git a/TAO/tao/IOPC.i b/TAO/tao/IOPC.i
index aba1dad1014..465ba351f1f 100644
--- a/TAO/tao/IOPC.i
+++ b/TAO/tao/IOPC.i
@@ -212,236 +212,6 @@ IOP::TaggedProfile_out::operator-> (void)
   return this->ptr_;
 }
 
-
-#if !defined (_IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CI_)
-#define _IOP_TAGGEDPROFILE__TAO_SEQ_OCTET_CI_
-
-// *************************************************************
-// Inline operations for class IOP::TaggedProfile::_tao_seq_Octet_var
-// *************************************************************
-
-ACE_INLINE
-IOP::TaggedProfile::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::TaggedProfile::_tao_seq_Octet_var::_tao_seq_Octet_var (_tao_seq_Octet *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::TaggedProfile::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::IOP::TaggedProfile::_tao_seq_Octet_var &p) // copy constructor
-{
-  if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IOP::TaggedProfile::_tao_seq_Octet (*p.ptr_));
-  else
-    this->ptr_ = 0;
-}
-
-// fixed-size base types only
-ACE_INLINE
-IOP::TaggedProfile::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::IOP::TaggedProfile::_tao_seq_Octet &p)
-{
-  ACE_NEW (this->ptr_, ::IOP::TaggedProfile::_tao_seq_Octet (p));
-}
-
-ACE_INLINE
-IOP::TaggedProfile::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedProfile::_tao_seq_Octet_var &
-IOP::TaggedProfile::_tao_seq_Octet_var::operator= (_tao_seq_Octet *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet_var &
-IOP::TaggedProfile::_tao_seq_Octet_var::operator= (const ::IOP::TaggedProfile::_tao_seq_Octet_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          _tao_seq_Octet *deep_copy =
-            new _tao_seq_Octet (*p.ptr_);
-          
-          if (deep_copy != 0)
-            {
-              _tao_seq_Octet *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// fixed-size types only
-ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet_var &
-IOP::TaggedProfile::_tao_seq_Octet_var::operator= (const ::IOP::TaggedProfile::_tao_seq_Octet &p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IOP::TaggedProfile::_tao_seq_Octet (p), *this);
-  }
-  return *this;
-}
-
-ACE_INLINE const ::IOP::TaggedProfile::_tao_seq_Octet *
-IOP::TaggedProfile::_tao_seq_Octet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet *
-IOP::TaggedProfile::_tao_seq_Octet_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IOP::TaggedProfile::_tao_seq_Octet_var::operator const ::IOP::TaggedProfile::_tao_seq_Octet &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-IOP::TaggedProfile::_tao_seq_Octet_var::operator ::IOP::TaggedProfile::_tao_seq_Octet &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-IOP::TaggedProfile::_tao_seq_Octet_var::operator ::IOP::TaggedProfile::_tao_seq_Octet &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-IOP::TaggedProfile::_tao_seq_Octet_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::Octet &
-IOP::TaggedProfile::_tao_seq_Octet_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE const ::IOP::TaggedProfile::_tao_seq_Octet &
-IOP::TaggedProfile::_tao_seq_Octet_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet &
-IOP::TaggedProfile::_tao_seq_Octet_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet *&
-IOP::TaggedProfile::_tao_seq_Octet_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet *
-IOP::TaggedProfile::_tao_seq_Octet_var::_retn (void)
-{
-  ::IOP::TaggedProfile::_tao_seq_Octet *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet *
-IOP::TaggedProfile::_tao_seq_Octet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::TaggedProfile::_tao_seq_Octet_out
-// *************************************************************
-
-ACE_INLINE
-IOP::TaggedProfile::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedProfile::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedProfile::_tao_seq_Octet_out::_tao_seq_Octet_out (const ::IOP::TaggedProfile::_tao_seq_Octet_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (_tao_seq_Octet_out&, p).ptr_)
-{}
-
-ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet_out &
-IOP::TaggedProfile::_tao_seq_Octet_out::operator= (const ::IOP::TaggedProfile::_tao_seq_Octet_out &p)
-{
-  this->ptr_ = ACE_const_cast (_tao_seq_Octet_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet_out &
-IOP::TaggedProfile::_tao_seq_Octet_out::operator= (_tao_seq_Octet *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IOP::TaggedProfile::_tao_seq_Octet_out::operator ::IOP::TaggedProfile::_tao_seq_Octet *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet *&
-IOP::TaggedProfile::_tao_seq_Octet_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::TaggedProfile::_tao_seq_Octet *
-IOP::TaggedProfile::_tao_seq_Octet_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-IOP::TaggedProfile::_tao_seq_Octet_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
 // *************************************************************
 // Inline operations for class IOP::IOR_var
 // *************************************************************
@@ -811,224 +581,6 @@ IOP::IOR_out::operator-> (void)
 
 
 #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CI_)
-#define _IOP_IOR__TAO_SEQ_TAGGEDPROFILE_CI_
-
-// *************************************************************
-// Inline operations for class IOP::IOR::_tao_seq_TaggedProfile_var
-// *************************************************************
-
-ACE_INLINE
-IOP::IOR::_tao_seq_TaggedProfile_var::_tao_seq_TaggedProfile_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::IOR::_tao_seq_TaggedProfile_var::_tao_seq_TaggedProfile_var (_tao_seq_TaggedProfile *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::IOR::_tao_seq_TaggedProfile_var::_tao_seq_TaggedProfile_var (const ::IOP::IOR::_tao_seq_TaggedProfile_var &p) // copy constructor
-{
-  if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IOP::IOR::_tao_seq_TaggedProfile (*p.ptr_));
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::IOR::_tao_seq_TaggedProfile_var::~_tao_seq_TaggedProfile_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::IOR::_tao_seq_TaggedProfile_var &
-IOP::IOR::_tao_seq_TaggedProfile_var::operator= (_tao_seq_TaggedProfile *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile_var &
-IOP::IOR::_tao_seq_TaggedProfile_var::operator= (const ::IOP::IOR::_tao_seq_TaggedProfile_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          _tao_seq_TaggedProfile *deep_copy =
-            new _tao_seq_TaggedProfile (*p.ptr_);
-          
-          if (deep_copy != 0)
-            {
-              _tao_seq_TaggedProfile *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-ACE_INLINE const ::IOP::IOR::_tao_seq_TaggedProfile *
-IOP::IOR::_tao_seq_TaggedProfile_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile *
-IOP::IOR::_tao_seq_TaggedProfile_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IOP::IOR::_tao_seq_TaggedProfile_var::operator const ::IOP::IOR::_tao_seq_TaggedProfile &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-IOP::IOR::_tao_seq_TaggedProfile_var::operator ::IOP::IOR::_tao_seq_TaggedProfile &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-IOP::IOR::_tao_seq_TaggedProfile_var::operator ::IOP::IOR::_tao_seq_TaggedProfile &() const // cast 
-{
-  return *this->ptr_;
-}
-
-// variable-size types only
-ACE_INLINE
-IOP::IOR::_tao_seq_TaggedProfile_var::operator ::IOP::IOR::_tao_seq_TaggedProfile *&() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedProfile &
-IOP::IOR::_tao_seq_TaggedProfile_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const IOP::TaggedProfile &
-IOP::IOR::_tao_seq_TaggedProfile_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const IOP::TaggedProfile &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE const ::IOP::IOR::_tao_seq_TaggedProfile &
-IOP::IOR::_tao_seq_TaggedProfile_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile &
-IOP::IOR::_tao_seq_TaggedProfile_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile *&
-IOP::IOR::_tao_seq_TaggedProfile_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile *
-IOP::IOR::_tao_seq_TaggedProfile_var::_retn (void)
-{
-  ::IOP::IOR::_tao_seq_TaggedProfile *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile *
-IOP::IOR::_tao_seq_TaggedProfile_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::IOR::_tao_seq_TaggedProfile_out
-// *************************************************************
-
-ACE_INLINE
-IOP::IOR::_tao_seq_TaggedProfile_out::_tao_seq_TaggedProfile_out (_tao_seq_TaggedProfile *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::IOR::_tao_seq_TaggedProfile_out::_tao_seq_TaggedProfile_out (_tao_seq_TaggedProfile_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::IOR::_tao_seq_TaggedProfile_out::_tao_seq_TaggedProfile_out (const ::IOP::IOR::_tao_seq_TaggedProfile_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (_tao_seq_TaggedProfile_out&, p).ptr_)
-{}
-
-ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile_out &
-IOP::IOR::_tao_seq_TaggedProfile_out::operator= (const ::IOP::IOR::_tao_seq_TaggedProfile_out &p)
-{
-  this->ptr_ = ACE_const_cast (_tao_seq_TaggedProfile_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile_out &
-IOP::IOR::_tao_seq_TaggedProfile_out::operator= (_tao_seq_TaggedProfile *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IOP::IOR::_tao_seq_TaggedProfile_out::operator ::IOP::IOR::_tao_seq_TaggedProfile *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile *&
-IOP::IOR::_tao_seq_TaggedProfile_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::IOR::_tao_seq_TaggedProfile *
-IOP::IOR::_tao_seq_TaggedProfile_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedProfile &
-IOP::IOR::_tao_seq_TaggedProfile_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
 // *************************************************************
 // Inline operations for class IOP::TaggedComponent_var
 // *************************************************************
@@ -1223,236 +775,6 @@ IOP::TaggedComponent_out::operator-> (void)
 }
 
 
-#if !defined (_IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CI_)
-#define _IOP_TAGGEDCOMPONENT__TAO_SEQ_OCTET_CI_
-
-// *************************************************************
-// Inline operations for class IOP::TaggedComponent::_tao_seq_Octet_var
-// *************************************************************
-
-ACE_INLINE
-IOP::TaggedComponent::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::TaggedComponent::_tao_seq_Octet_var::_tao_seq_Octet_var (_tao_seq_Octet *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::TaggedComponent::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::IOP::TaggedComponent::_tao_seq_Octet_var &p) // copy constructor
-{
-  if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IOP::TaggedComponent::_tao_seq_Octet (*p.ptr_));
-  else
-    this->ptr_ = 0;
-}
-
-// fixed-size base types only
-ACE_INLINE
-IOP::TaggedComponent::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::IOP::TaggedComponent::_tao_seq_Octet &p)
-{
-  ACE_NEW (this->ptr_, ::IOP::TaggedComponent::_tao_seq_Octet (p));
-}
-
-ACE_INLINE
-IOP::TaggedComponent::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::TaggedComponent::_tao_seq_Octet_var &
-IOP::TaggedComponent::_tao_seq_Octet_var::operator= (_tao_seq_Octet *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet_var &
-IOP::TaggedComponent::_tao_seq_Octet_var::operator= (const ::IOP::TaggedComponent::_tao_seq_Octet_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          _tao_seq_Octet *deep_copy =
-            new _tao_seq_Octet (*p.ptr_);
-          
-          if (deep_copy != 0)
-            {
-              _tao_seq_Octet *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// fixed-size types only
-ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet_var &
-IOP::TaggedComponent::_tao_seq_Octet_var::operator= (const ::IOP::TaggedComponent::_tao_seq_Octet &p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IOP::TaggedComponent::_tao_seq_Octet (p), *this);
-  }
-  return *this;
-}
-
-ACE_INLINE const ::IOP::TaggedComponent::_tao_seq_Octet *
-IOP::TaggedComponent::_tao_seq_Octet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet *
-IOP::TaggedComponent::_tao_seq_Octet_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IOP::TaggedComponent::_tao_seq_Octet_var::operator const ::IOP::TaggedComponent::_tao_seq_Octet &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-IOP::TaggedComponent::_tao_seq_Octet_var::operator ::IOP::TaggedComponent::_tao_seq_Octet &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-IOP::TaggedComponent::_tao_seq_Octet_var::operator ::IOP::TaggedComponent::_tao_seq_Octet &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-IOP::TaggedComponent::_tao_seq_Octet_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::Octet &
-IOP::TaggedComponent::_tao_seq_Octet_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE const ::IOP::TaggedComponent::_tao_seq_Octet &
-IOP::TaggedComponent::_tao_seq_Octet_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet &
-IOP::TaggedComponent::_tao_seq_Octet_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet *&
-IOP::TaggedComponent::_tao_seq_Octet_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet *
-IOP::TaggedComponent::_tao_seq_Octet_var::_retn (void)
-{
-  ::IOP::TaggedComponent::_tao_seq_Octet *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet *
-IOP::TaggedComponent::_tao_seq_Octet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::TaggedComponent::_tao_seq_Octet_out
-// *************************************************************
-
-ACE_INLINE
-IOP::TaggedComponent::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedComponent::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::TaggedComponent::_tao_seq_Octet_out::_tao_seq_Octet_out (const ::IOP::TaggedComponent::_tao_seq_Octet_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (_tao_seq_Octet_out&, p).ptr_)
-{}
-
-ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet_out &
-IOP::TaggedComponent::_tao_seq_Octet_out::operator= (const ::IOP::TaggedComponent::_tao_seq_Octet_out &p)
-{
-  this->ptr_ = ACE_const_cast (_tao_seq_Octet_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet_out &
-IOP::TaggedComponent::_tao_seq_Octet_out::operator= (_tao_seq_Octet *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IOP::TaggedComponent::_tao_seq_Octet_out::operator ::IOP::TaggedComponent::_tao_seq_Octet *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet *&
-IOP::TaggedComponent::_tao_seq_Octet_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::TaggedComponent::_tao_seq_Octet *
-IOP::TaggedComponent::_tao_seq_Octet_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-IOP::TaggedComponent::_tao_seq_Octet_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_MULTIPLECOMPONENTPROFILE_CI_)
@@ -2828,236 +2150,6 @@ IOP::ServiceContext_out::operator-> (void)
 }
 
 
-#if !defined (_IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CI_)
-#define _IOP_SERVICECONTEXT__TAO_SEQ_OCTET_CI_
-
-// *************************************************************
-// Inline operations for class IOP::ServiceContext::_tao_seq_Octet_var
-// *************************************************************
-
-ACE_INLINE
-IOP::ServiceContext::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-IOP::ServiceContext::_tao_seq_Octet_var::_tao_seq_Octet_var (_tao_seq_Octet *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-IOP::ServiceContext::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::IOP::ServiceContext::_tao_seq_Octet_var &p) // copy constructor
-{
-  if (p.ptr_)
-    ACE_NEW (this->ptr_, ::IOP::ServiceContext::_tao_seq_Octet (*p.ptr_));
-  else
-    this->ptr_ = 0;
-}
-
-// fixed-size base types only
-ACE_INLINE
-IOP::ServiceContext::_tao_seq_Octet_var::_tao_seq_Octet_var (const ::IOP::ServiceContext::_tao_seq_Octet &p)
-{
-  ACE_NEW (this->ptr_, ::IOP::ServiceContext::_tao_seq_Octet (p));
-}
-
-ACE_INLINE
-IOP::ServiceContext::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE IOP::ServiceContext::_tao_seq_Octet_var &
-IOP::ServiceContext::_tao_seq_Octet_var::operator= (_tao_seq_Octet *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet_var &
-IOP::ServiceContext::_tao_seq_Octet_var::operator= (const ::IOP::ServiceContext::_tao_seq_Octet_var &p)
-{
-  if (this != &p)
-    {
-      if (p.ptr_ == 0)
-        {
-          delete this->ptr_;
-          this->ptr_ = 0;
-        }
-      else
-        {
-          _tao_seq_Octet *deep_copy =
-            new _tao_seq_Octet (*p.ptr_);
-          
-          if (deep_copy != 0)
-            {
-              _tao_seq_Octet *tmp = deep_copy;
-              deep_copy = this->ptr_;
-              this->ptr_ = tmp;
-              delete deep_copy;
-            }
-        }
-    }
-  
-  return *this;
-}
-
-// fixed-size types only
-ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet_var &
-IOP::ServiceContext::_tao_seq_Octet_var::operator= (const ::IOP::ServiceContext::_tao_seq_Octet &p)
-{
-  if (this->ptr_ != &p)
-  {
-    delete this->ptr_;
-    ACE_NEW_RETURN (this->ptr_, ::IOP::ServiceContext::_tao_seq_Octet (p), *this);
-  }
-  return *this;
-}
-
-ACE_INLINE const ::IOP::ServiceContext::_tao_seq_Octet *
-IOP::ServiceContext::_tao_seq_Octet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet *
-IOP::ServiceContext::_tao_seq_Octet_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IOP::ServiceContext::_tao_seq_Octet_var::operator const ::IOP::ServiceContext::_tao_seq_Octet &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-IOP::ServiceContext::_tao_seq_Octet_var::operator ::IOP::ServiceContext::_tao_seq_Octet &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-IOP::ServiceContext::_tao_seq_Octet_var::operator ::IOP::ServiceContext::_tao_seq_Octet &() const // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-IOP::ServiceContext::_tao_seq_Octet_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA::Octet &
-IOP::ServiceContext::_tao_seq_Octet_var::operator[] (CORBA::ULong index) const
-{
-  return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
-}
-
-ACE_INLINE const ::IOP::ServiceContext::_tao_seq_Octet &
-IOP::ServiceContext::_tao_seq_Octet_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet &
-IOP::ServiceContext::_tao_seq_Octet_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet *&
-IOP::ServiceContext::_tao_seq_Octet_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet *
-IOP::ServiceContext::_tao_seq_Octet_var::_retn (void)
-{
-  ::IOP::ServiceContext::_tao_seq_Octet *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet *
-IOP::ServiceContext::_tao_seq_Octet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class IOP::ServiceContext::_tao_seq_Octet_out
-// *************************************************************
-
-ACE_INLINE
-IOP::ServiceContext::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::ServiceContext::_tao_seq_Octet_out::_tao_seq_Octet_out (_tao_seq_Octet_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-IOP::ServiceContext::_tao_seq_Octet_out::_tao_seq_Octet_out (const ::IOP::ServiceContext::_tao_seq_Octet_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (_tao_seq_Octet_out&, p).ptr_)
-{}
-
-ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet_out &
-IOP::ServiceContext::_tao_seq_Octet_out::operator= (const ::IOP::ServiceContext::_tao_seq_Octet_out &p)
-{
-  this->ptr_ = ACE_const_cast (_tao_seq_Octet_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet_out &
-IOP::ServiceContext::_tao_seq_Octet_out::operator= (_tao_seq_Octet *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IOP::ServiceContext::_tao_seq_Octet_out::operator ::IOP::ServiceContext::_tao_seq_Octet *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet *&
-IOP::ServiceContext::_tao_seq_Octet_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::ServiceContext::_tao_seq_Octet *
-IOP::ServiceContext::_tao_seq_Octet_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-IOP::ServiceContext::_tao_seq_Octet_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IOP_SERVICECONTEXTLIST_CI_)
@@ -3464,170 +2556,50 @@ IOP::ServiceContextList_out::operator[] (CORBA::ULong index)
 // *************************************************************
 
 
-#if !defined (_IOP_CODEC___VAR_CI_)
-#define _IOP_CODEC___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IOP::Codec_var
-// *************************************************************
-
-ACE_INLINE
-IOP::Codec_var::Codec_var (void) // default constructor
-  : ptr_ (Codec::_nil ())
-{}
-
-ACE_INLINE ::IOP::Codec_ptr
-IOP::Codec_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::Codec_var::Codec_var (const ::IOP::Codec_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (Codec::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IOP::Codec_var::~Codec_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IOP::Codec_var &
-IOP::Codec_var::operator= (Codec_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IOP::Codec_var &
-IOP::Codec_var::operator= (const ::IOP::Codec_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::IOP::Codec::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-IOP::Codec_var::operator const ::IOP::Codec_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IOP::Codec_var::operator ::IOP::Codec_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::Codec_ptr
-IOP::Codec_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::Codec_ptr
-IOP::Codec_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::Codec_ptr &
-IOP::Codec_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::Codec_ptr &
-IOP::Codec_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IOP::Codec::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::Codec_ptr
-IOP::Codec_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::IOP::Codec_ptr val = this->ptr_;
-  this->ptr_ = ::IOP::Codec::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_CODEC___OUT_CI_)
-#define _IOP_CODEC___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IOP::Codec_out
-// *************************************************************
-
-ACE_INLINE
-IOP::Codec_out::Codec_out (Codec_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::IOP::Codec::_nil ();
-}
-
-ACE_INLINE
-IOP::Codec_out::Codec_out (Codec_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IOP::Codec::_nil ();
-}
-
-ACE_INLINE
-IOP::Codec_out::Codec_out (const ::IOP::Codec_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Codec_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IOP::Codec_out &
-IOP::Codec_out::operator= (const ::IOP::Codec_out &p)
-{
-  this->ptr_ = ACE_const_cast (Codec_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_IOP_CODEC___CI_)
+#define _IOP_CODEC___CI_
 
-ACE_INLINE IOP::Codec_out &
-IOP::Codec_out::operator= (const ::IOP::Codec_var &p)
+ACE_INLINE IOP::Codec_ptr
+tao_IOP_Codec_duplicate (
+    IOP::Codec_ptr p
+  )
 {
-  this->ptr_ = ::IOP::Codec::_duplicate (p.ptr ());
-  return *this;
+  return IOP::Codec::_duplicate (p);
 }
 
-ACE_INLINE IOP::Codec_out &
-IOP::Codec_out::operator= (Codec_ptr p)
+ACE_INLINE void
+tao_IOP_Codec_release (
+    IOP::Codec_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-IOP::Codec_out::operator ::IOP::Codec_ptr &() // cast
+ACE_INLINE IOP::Codec_ptr
+tao_IOP_Codec_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return IOP::Codec::_nil ();
 }
 
-ACE_INLINE ::IOP::Codec_ptr &
-IOP::Codec_out::ptr (void) // ptr
+ACE_INLINE IOP::Codec_ptr
+tao_IOP_Codec_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return IOP::Codec::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::IOP::Codec_ptr
-IOP::Codec_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_IOP_Codec_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  IOP::Codec **tmp =
+    ACE_static_cast (IOP::Codec **, src);
+  return *tmp;
 }
 
 
@@ -3783,170 +2755,50 @@ IOP::Encoding_var::ptr (void) const
 // *************************************************************
 
 
-#if !defined (_IOP_CODECFACTORY___VAR_CI_)
-#define _IOP_CODECFACTORY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IOP::CodecFactory_var
-// *************************************************************
-
-ACE_INLINE
-IOP::CodecFactory_var::CodecFactory_var (void) // default constructor
-  : ptr_ (CodecFactory::_nil ())
-{}
-
-ACE_INLINE ::IOP::CodecFactory_ptr
-IOP::CodecFactory_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IOP::CodecFactory_var::CodecFactory_var (const ::IOP::CodecFactory_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CodecFactory::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IOP::CodecFactory_var::~CodecFactory_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IOP::CodecFactory_var &
-IOP::CodecFactory_var::operator= (CodecFactory_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IOP::CodecFactory_var &
-IOP::CodecFactory_var::operator= (const ::IOP::CodecFactory_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::IOP::CodecFactory::_duplicate (p.ptr ());
-  }
-  return *this;
-}
+#if !defined (_IOP_CODECFACTORY___CI_)
+#define _IOP_CODECFACTORY___CI_
 
-ACE_INLINE 
-IOP::CodecFactory_var::operator const ::IOP::CodecFactory_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IOP::CodecFactory_var::operator ::IOP::CodecFactory_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::CodecFactory_ptr
-IOP::CodecFactory_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::CodecFactory_ptr
-IOP::CodecFactory_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::CodecFactory_ptr &
-IOP::CodecFactory_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::CodecFactory_ptr &
-IOP::CodecFactory_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IOP::CodecFactory::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::IOP::CodecFactory_ptr
-IOP::CodecFactory_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::IOP::CodecFactory_ptr val = this->ptr_;
-  this->ptr_ = ::IOP::CodecFactory::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IOP_CODECFACTORY___OUT_CI_)
-#define _IOP_CODECFACTORY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IOP::CodecFactory_out
-// *************************************************************
-
-ACE_INLINE
-IOP::CodecFactory_out::CodecFactory_out (CodecFactory_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::IOP::CodecFactory::_nil ();
-}
-
-ACE_INLINE
-IOP::CodecFactory_out::CodecFactory_out (CodecFactory_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IOP::CodecFactory::_nil ();
-}
-
-ACE_INLINE
-IOP::CodecFactory_out::CodecFactory_out (const ::IOP::CodecFactory_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CodecFactory_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IOP::CodecFactory_out &
-IOP::CodecFactory_out::operator= (const ::IOP::CodecFactory_out &p)
-{
-  this->ptr_ = ACE_const_cast (CodecFactory_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IOP::CodecFactory_out &
-IOP::CodecFactory_out::operator= (const ::IOP::CodecFactory_var &p)
+ACE_INLINE IOP::CodecFactory_ptr
+tao_IOP_CodecFactory_duplicate (
+    IOP::CodecFactory_ptr p
+  )
 {
-  this->ptr_ = ::IOP::CodecFactory::_duplicate (p.ptr ());
-  return *this;
+  return IOP::CodecFactory::_duplicate (p);
 }
 
-ACE_INLINE IOP::CodecFactory_out &
-IOP::CodecFactory_out::operator= (CodecFactory_ptr p)
+ACE_INLINE void
+tao_IOP_CodecFactory_release (
+    IOP::CodecFactory_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-IOP::CodecFactory_out::operator ::IOP::CodecFactory_ptr &() // cast
+ACE_INLINE IOP::CodecFactory_ptr
+tao_IOP_CodecFactory_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return IOP::CodecFactory::_nil ();
 }
 
-ACE_INLINE ::IOP::CodecFactory_ptr &
-IOP::CodecFactory_out::ptr (void) // ptr
+ACE_INLINE IOP::CodecFactory_ptr
+tao_IOP_CodecFactory_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return IOP::CodecFactory::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::IOP::CodecFactory_ptr
-IOP::CodecFactory_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_IOP_CodecFactory_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  IOP::CodecFactory **tmp =
+    ACE_static_cast (IOP::CodecFactory **, src);
+  return *tmp;
 }
 
 
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index d8acb2ed33a..da823bdac13 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -1,28 +1,44 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IORManip_Loader.h"
 #include "tao/Typecode.h"
 #include "tao/Any.h"
 #include "tao/ORB.h"
 
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#endif /* __BORLANDC__ */
+
 #if !defined (__ACE_INLINE__)
 #include "IORC.i"
 #endif /* !defined INLINE */
 
-// default constructor
+// Default constructor.
 TAO_IOP::EmptyProfileList::EmptyProfileList (void)
   : CORBA_UserException ("IDL:TAO_IOP/EmptyProfileList:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 TAO_IOP::EmptyProfileList::~EmptyProfileList (void)
 {
 }
@@ -33,60 +49,66 @@ void TAO_IOP::EmptyProfileList::_tao_any_destructor (void *x)
   delete tmp;
 }
 
-// copy constructor
+// Copy constructor.
 TAO_IOP::EmptyProfileList::EmptyProfileList (const ::TAO_IOP::EmptyProfileList &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 TAO_IOP::EmptyProfileList&
 TAO_IOP::EmptyProfileList::operator= (const ::TAO_IOP::EmptyProfileList &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 TAO_IOP::EmptyProfileList *
 TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/EmptyProfileList:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (EmptyProfileList *, exc);
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/EmptyProfileList:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (EmptyProfileList *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void TAO_IOP::EmptyProfileList::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void TAO_IOP::EmptyProfileList::_tao_encode (
     TAO_OutputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   ) const
 {
   if (cdr << *this)
-    return;
+    {
+      return;
+    }
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void TAO_IOP::EmptyProfileList::_tao_decode (
     TAO_InputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (cdr >> *this)
-    return;
+    {
+      return;
+    }
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *TAO_IOP::EmptyProfileList::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -97,29 +119,52 @@ CORBA::Exception *TAO_IOP::EmptyProfileList::_alloc (void)
 static const CORBA::Long _oc_TAO_IOP_EmptyProfileList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x456d7074), ACE_NTOHL (0x7950726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/EmptyProfileList:1.0
-  17, ACE_NTOHL (0x456d7074), ACE_NTOHL (0x7950726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x0),  // name = EmptyProfileList
+  33,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x456d7074), 
+  ACE_NTOHL (0x7950726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/EmptyProfileList:1.0
+  17,
+  ACE_NTOHL (0x456d7074), 
+  ACE_NTOHL (0x7950726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x0),  // name = EmptyProfileList
   0, // member count
 };
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_EmptyProfileList (CORBA::tk_except, sizeof (_oc_TAO_IOP_EmptyProfileList), (char *) &_oc_TAO_IOP_EmptyProfileList, 0, sizeof (TAO_IOP::EmptyProfileList));
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_EmptyProfileList (
+    CORBA::tk_except,
+    sizeof (_oc_TAO_IOP_EmptyProfileList),
+    (char *) &_oc_TAO_IOP_EmptyProfileList,
+    0,
+    sizeof (TAO_IOP::EmptyProfileList)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO_IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EmptyProfileList, &_tc_TAO_tc_TAO_IOP_EmptyProfileList)
 TAO_NAMESPACE_END
 
-// TAO extension - the virtual _type method
+
+// TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_type (void) const
 {
   return ::TAO_IOP::_tc_EmptyProfileList;
 }
 
-// default constructor
+// Default constructor.
 TAO_IOP::NotFound::NotFound (void)
   : CORBA_UserException ("IDL:TAO_IOP/NotFound:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 TAO_IOP::NotFound::~NotFound (void)
 {
 }
@@ -130,60 +175,66 @@ void TAO_IOP::NotFound::_tao_any_destructor (void *x)
   delete tmp;
 }
 
-// copy constructor
+// Copy constructor.
 TAO_IOP::NotFound::NotFound (const ::TAO_IOP::NotFound &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 TAO_IOP::NotFound&
 TAO_IOP::NotFound::operator= (const ::TAO_IOP::NotFound &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 TAO_IOP::NotFound *
 TAO_IOP::NotFound::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/NotFound:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (NotFound *, exc);
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/NotFound:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (NotFound *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void TAO_IOP::NotFound::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void TAO_IOP::NotFound::_tao_encode (
     TAO_OutputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   ) const
 {
   if (cdr << *this)
-    return;
+    {
+      return;
+    }
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void TAO_IOP::NotFound::_tao_decode (
     TAO_InputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (cdr >> *this)
-    return;
+    {
+      return;
+    }
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *TAO_IOP::NotFound::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -194,29 +245,48 @@ CORBA::Exception *TAO_IOP::NotFound::_alloc (void)
 static const CORBA::Long _oc_TAO_IOP_NotFound[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  25, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x4e6f7446), ACE_NTOHL (0x6f756e64), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/NotFound:1.0
-  9, ACE_NTOHL (0x4e6f7446), ACE_NTOHL (0x6f756e64), ACE_NTOHL (0x0),  // name = NotFound
+  25,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x4e6f7446), 
+  ACE_NTOHL (0x6f756e64), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/NotFound:1.0
+  9,
+  ACE_NTOHL (0x4e6f7446), 
+  ACE_NTOHL (0x6f756e64), 
+  ACE_NTOHL (0x0),  // name = NotFound
   0, // member count
 };
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_NotFound (CORBA::tk_except, sizeof (_oc_TAO_IOP_NotFound), (char *) &_oc_TAO_IOP_NotFound, 0, sizeof (TAO_IOP::NotFound));
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_NotFound (
+    CORBA::tk_except,
+    sizeof (_oc_TAO_IOP_NotFound),
+    (char *) &_oc_TAO_IOP_NotFound,
+    0,
+    sizeof (TAO_IOP::NotFound)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO_IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NotFound, &_tc_TAO_tc_TAO_IOP_NotFound)
 TAO_NAMESPACE_END
 
-// TAO extension - the virtual _type method
+
+// TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr TAO_IOP::NotFound::_type (void) const
 {
   return ::TAO_IOP::_tc_NotFound;
 }
 
-// default constructor
+// Default constructor.
 TAO_IOP::Duplicate::Duplicate (void)
   : CORBA_UserException ("IDL:TAO_IOP/Duplicate:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 TAO_IOP::Duplicate::~Duplicate (void)
 {
 }
@@ -227,60 +297,66 @@ void TAO_IOP::Duplicate::_tao_any_destructor (void *x)
   delete tmp;
 }
 
-// copy constructor
+// Copy constructor.
 TAO_IOP::Duplicate::Duplicate (const ::TAO_IOP::Duplicate &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 TAO_IOP::Duplicate&
 TAO_IOP::Duplicate::operator= (const ::TAO_IOP::Duplicate &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 TAO_IOP::Duplicate *
 TAO_IOP::Duplicate::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Duplicate:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (Duplicate *, exc);
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Duplicate:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (Duplicate *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void TAO_IOP::Duplicate::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void TAO_IOP::Duplicate::_tao_encode (
     TAO_OutputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   ) const
 {
   if (cdr << *this)
-    return;
+    {
+      return;
+    }
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void TAO_IOP::Duplicate::_tao_decode (
     TAO_InputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (cdr >> *this)
-    return;
+    {
+      return;
+    }
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *TAO_IOP::Duplicate::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -291,29 +367,48 @@ CORBA::Exception *TAO_IOP::Duplicate::_alloc (void)
 static const CORBA::Long _oc_TAO_IOP_Duplicate[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  26, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x4475706c), ACE_NTOHL (0x69636174), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/Duplicate:1.0
-  10, ACE_NTOHL (0x4475706c), ACE_NTOHL (0x69636174), ACE_NTOHL (0x65000000),  // name = Duplicate
+  26,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x4475706c), 
+  ACE_NTOHL (0x69636174), 
+  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/Duplicate:1.0
+  10,
+  ACE_NTOHL (0x4475706c), 
+  ACE_NTOHL (0x69636174), 
+  ACE_NTOHL (0x65000000),  // name = Duplicate
   0, // member count
 };
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Duplicate (CORBA::tk_except, sizeof (_oc_TAO_IOP_Duplicate), (char *) &_oc_TAO_IOP_Duplicate, 0, sizeof (TAO_IOP::Duplicate));
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Duplicate (
+    CORBA::tk_except,
+    sizeof (_oc_TAO_IOP_Duplicate),
+    (char *) &_oc_TAO_IOP_Duplicate,
+    0,
+    sizeof (TAO_IOP::Duplicate)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO_IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Duplicate, &_tc_TAO_tc_TAO_IOP_Duplicate)
 TAO_NAMESPACE_END
 
-// TAO extension - the virtual _type method
+
+// TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr TAO_IOP::Duplicate::_type (void) const
 {
   return ::TAO_IOP::_tc_Duplicate;
 }
 
-// default constructor
+// Default constructor.
 TAO_IOP::Invalid_IOR::Invalid_IOR (void)
   : CORBA_UserException ("IDL:TAO_IOP/Invalid_IOR:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 TAO_IOP::Invalid_IOR::~Invalid_IOR (void)
 {
 }
@@ -324,60 +419,66 @@ void TAO_IOP::Invalid_IOR::_tao_any_destructor (void *x)
   delete tmp;
 }
 
-// copy constructor
+// Copy constructor.
 TAO_IOP::Invalid_IOR::Invalid_IOR (const ::TAO_IOP::Invalid_IOR &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 TAO_IOP::Invalid_IOR&
 TAO_IOP::Invalid_IOR::operator= (const ::TAO_IOP::Invalid_IOR &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 TAO_IOP::Invalid_IOR *
 TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Invalid_IOR:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (Invalid_IOR *, exc);
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Invalid_IOR:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (Invalid_IOR *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void TAO_IOP::Invalid_IOR::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void TAO_IOP::Invalid_IOR::_tao_encode (
     TAO_OutputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   ) const
 {
   if (cdr << *this)
-    return;
+    {
+      return;
+    }
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void TAO_IOP::Invalid_IOR::_tao_decode (
     TAO_InputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (cdr >> *this)
-    return;
+    {
+      return;
+    }
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *TAO_IOP::Invalid_IOR::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -388,29 +489,48 @@ CORBA::Exception *TAO_IOP::Invalid_IOR::_alloc (void)
 static const CORBA::Long _oc_TAO_IOP_Invalid_IOR[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c69645f), ACE_NTOHL (0x494f523a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_IOP/Invalid_IOR:1.0
-  12, ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c69645f), ACE_NTOHL (0x494f5200),  // name = Invalid_IOR
+  28,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c69645f), 
+  ACE_NTOHL (0x494f523a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_IOP/Invalid_IOR:1.0
+  12,
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c69645f), 
+  ACE_NTOHL (0x494f5200),  // name = Invalid_IOR
   0, // member count
 };
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Invalid_IOR (CORBA::tk_except, sizeof (_oc_TAO_IOP_Invalid_IOR), (char *) &_oc_TAO_IOP_Invalid_IOR, 0, sizeof (TAO_IOP::Invalid_IOR));
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Invalid_IOR (
+    CORBA::tk_except,
+    sizeof (_oc_TAO_IOP_Invalid_IOR),
+    (char *) &_oc_TAO_IOP_Invalid_IOR,
+    0,
+    sizeof (TAO_IOP::Invalid_IOR)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO_IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Invalid_IOR, &_tc_TAO_tc_TAO_IOP_Invalid_IOR)
 TAO_NAMESPACE_END
 
-// TAO extension - the virtual _type method
+
+// TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr TAO_IOP::Invalid_IOR::_type (void) const
 {
   return ::TAO_IOP::_tc_Invalid_IOR;
 }
 
-// default constructor
+// Default constructor.
 TAO_IOP::MultiProfileList::MultiProfileList (void)
   : CORBA_UserException ("IDL:TAO_IOP/MultiProfileList:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 TAO_IOP::MultiProfileList::~MultiProfileList (void)
 {
 }
@@ -421,60 +541,66 @@ void TAO_IOP::MultiProfileList::_tao_any_destructor (void *x)
   delete tmp;
 }
 
-// copy constructor
+// Copy constructor.
 TAO_IOP::MultiProfileList::MultiProfileList (const ::TAO_IOP::MultiProfileList &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 TAO_IOP::MultiProfileList&
 TAO_IOP::MultiProfileList::operator= (const ::TAO_IOP::MultiProfileList &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 TAO_IOP::MultiProfileList *
 TAO_IOP::MultiProfileList::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/MultiProfileList:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (MultiProfileList *, exc);
+  if (!ACE_OS::strcmp ("IDL:TAO_IOP/MultiProfileList:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (MultiProfileList *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void TAO_IOP::MultiProfileList::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void TAO_IOP::MultiProfileList::_tao_encode (
     TAO_OutputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   ) const
 {
   if (cdr << *this)
-    return;
+    {
+      return;
+    }
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void TAO_IOP::MultiProfileList::_tao_decode (
     TAO_InputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (cdr >> *this)
-    return;
+    {
+      return;
+    }
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *TAO_IOP::MultiProfileList::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -485,27 +611,233 @@ CORBA::Exception *TAO_IOP::MultiProfileList::_alloc (void)
 static const CORBA::Long _oc_TAO_IOP_MultiProfileList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x4d756c74), ACE_NTOHL (0x6950726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/MultiProfileList:1.0
-  17, ACE_NTOHL (0x4d756c74), ACE_NTOHL (0x6950726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x0),  // name = MultiProfileList
+  33,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x4d756c74), 
+  ACE_NTOHL (0x6950726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/MultiProfileList:1.0
+  17,
+  ACE_NTOHL (0x4d756c74), 
+  ACE_NTOHL (0x6950726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x0),  // name = MultiProfileList
   0, // member count
 };
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_MultiProfileList (CORBA::tk_except, sizeof (_oc_TAO_IOP_MultiProfileList), (char *) &_oc_TAO_IOP_MultiProfileList, 0, sizeof (TAO_IOP::MultiProfileList));
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_MultiProfileList (
+    CORBA::tk_except,
+    sizeof (_oc_TAO_IOP_MultiProfileList),
+    (char *) &_oc_TAO_IOP_MultiProfileList,
+    0,
+    sizeof (TAO_IOP::MultiProfileList)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO_IOP)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_MultiProfileList, &_tc_TAO_tc_TAO_IOP_MultiProfileList)
 TAO_NAMESPACE_END
 
-// TAO extension - the virtual _type method
+
+// TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr TAO_IOP::MultiProfileList::_type (void) const
 {
   return ::TAO_IOP::_tc_MultiProfileList;
 }
 
+// *************************************************************
+// Operations for class TAO_IOP::TAO_IOR_Property_var
+// *************************************************************
 
-// default constructor
-TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void)
+TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (void) // default constructor
+  : ptr_ (TAO_IOR_Property::_nil ())
+{}
+
+::TAO_IOP::TAO_IOR_Property_ptr
+TAO_IOP::TAO_IOR_Property_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (const ::TAO_IOP::TAO_IOR_Property_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (TAO_IOR_Property::_duplicate (p.ptr ()))
+{}
+
+TAO_IOP::TAO_IOR_Property_var::~TAO_IOR_Property_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+TAO_IOP::TAO_IOR_Property_var &
+TAO_IOP::TAO_IOR_Property_var::operator= (TAO_IOR_Property_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+TAO_IOP::TAO_IOR_Property_var &
+TAO_IOP::TAO_IOR_Property_var::operator= (const ::TAO_IOP::TAO_IOR_Property_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+TAO_IOP::TAO_IOR_Property_var::operator const ::TAO_IOP::TAO_IOR_Property_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+TAO_IOP::TAO_IOR_Property_var::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::TAO_IOP::TAO_IOR_Property_ptr
+TAO_IOP::TAO_IOR_Property_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::TAO_IOP::TAO_IOR_Property_ptr
+TAO_IOP::TAO_IOR_Property_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::TAO_IOP::TAO_IOR_Property_ptr &
+TAO_IOP::TAO_IOR_Property_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::TAO_IOP::TAO_IOR_Property_ptr &
+TAO_IOP::TAO_IOR_Property_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
+  return this->ptr_;
+}
+
+::TAO_IOP::TAO_IOR_Property_ptr
+TAO_IOP::TAO_IOR_Property_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::TAO_IOP::TAO_IOR_Property_ptr val = this->ptr_;
+  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
+  return val;
+}
+
+::TAO_IOP::TAO_IOR_Property_ptr
+TAO_IOP::TAO_IOR_Property_var::duplicate (TAO_IOR_Property_ptr p)
+{
+  return ::TAO_IOP::TAO_IOR_Property::_duplicate (p);
+}
+
+void
+TAO_IOP::TAO_IOR_Property_var::release (TAO_IOR_Property_ptr p)
+{
+  CORBA::release (p);
+}
+
+::TAO_IOP::TAO_IOR_Property_ptr
+TAO_IOP::TAO_IOR_Property_var::nil (void)
+{
+  return ::TAO_IOP::TAO_IOR_Property::_nil ();
+}
+
+::TAO_IOP::TAO_IOR_Property_ptr
+TAO_IOP::TAO_IOR_Property_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::TAO_IOP::TAO_IOR_Property::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+TAO_IOP::TAO_IOR_Property_var::upcast (void *src)
+{
+  TAO_IOR_Property **tmp =
+    ACE_static_cast (TAO_IOR_Property **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class TAO_IOP::TAO_IOR_Property_out
+// *************************************************************
+
+TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
+}
+
+TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
+}
+
+TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (const ::TAO_IOP::TAO_IOR_Property_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (TAO_IOR_Property_out &, p).ptr_)
 {}
 
+::TAO_IOP::TAO_IOR_Property_out &
+TAO_IOP::TAO_IOR_Property_out::operator= (const ::TAO_IOP::TAO_IOR_Property_out &p)
+{
+  this->ptr_ = ACE_const_cast (TAO_IOR_Property_out&, p).ptr_;
+  return *this;
+}
+
+TAO_IOP::TAO_IOR_Property_out &
+TAO_IOP::TAO_IOR_Property_out::operator= (const ::TAO_IOP::TAO_IOR_Property_var &p)
+{
+  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_duplicate (p.ptr ());
+  return *this;
+}
+
+TAO_IOP::TAO_IOR_Property_out &
+TAO_IOP::TAO_IOR_Property_out::operator= (TAO_IOR_Property_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+TAO_IOP::TAO_IOR_Property_out::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::TAO_IOP::TAO_IOR_Property_ptr &
+TAO_IOP::TAO_IOR_Property_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::TAO_IOP::TAO_IOR_Property_ptr
+TAO_IOP::TAO_IOR_Property_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+TAO_IOP::TAO_IOR_Property::TAO_IOR_Property ()
+{
+  }
+
 // destructor
 TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void)
 {}
@@ -558,7 +890,7 @@ void *TAO_IOP::TAO_IOR_Property::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -569,11 +901,194 @@ const char* TAO_IOP::TAO_IOR_Property::_interface_repository_id (void) const
   return "IDL:TAO_IOP/TAO_IOR_Property:1.0";
 }
 
+// *************************************************************
+// Operations for class TAO_IOP::TAO_IOR_Manipulation_var
+// *************************************************************
+
+TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (void) // default constructor
+  : ptr_ (TAO_IOR_Manipulation::_nil ())
+{}
 
-// default constructor
-TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
+::TAO_IOP::TAO_IOR_Manipulation_ptr
+TAO_IOP::TAO_IOR_Manipulation_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (const ::TAO_IOP::TAO_IOR_Manipulation_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (TAO_IOR_Manipulation::_duplicate (p.ptr ()))
 {}
 
+TAO_IOP::TAO_IOR_Manipulation_var::~TAO_IOR_Manipulation_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+TAO_IOP::TAO_IOR_Manipulation_var &
+TAO_IOP::TAO_IOR_Manipulation_var::operator= (TAO_IOR_Manipulation_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+TAO_IOP::TAO_IOR_Manipulation_var &
+TAO_IOP::TAO_IOR_Manipulation_var::operator= (const ::TAO_IOP::TAO_IOR_Manipulation_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+TAO_IOP::TAO_IOR_Manipulation_var::operator const ::TAO_IOP::TAO_IOR_Manipulation_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+TAO_IOP::TAO_IOR_Manipulation_var::operator ::TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::TAO_IOP::TAO_IOR_Manipulation_ptr
+TAO_IOP::TAO_IOR_Manipulation_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::TAO_IOP::TAO_IOR_Manipulation_ptr
+TAO_IOP::TAO_IOR_Manipulation_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::TAO_IOP::TAO_IOR_Manipulation_ptr &
+TAO_IOP::TAO_IOR_Manipulation_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::TAO_IOP::TAO_IOR_Manipulation_ptr &
+TAO_IOP::TAO_IOR_Manipulation_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
+  return this->ptr_;
+}
+
+::TAO_IOP::TAO_IOR_Manipulation_ptr
+TAO_IOP::TAO_IOR_Manipulation_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::TAO_IOP::TAO_IOR_Manipulation_ptr val = this->ptr_;
+  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
+  return val;
+}
+
+::TAO_IOP::TAO_IOR_Manipulation_ptr
+TAO_IOP::TAO_IOR_Manipulation_var::duplicate (TAO_IOR_Manipulation_ptr p)
+{
+  return ::TAO_IOP::TAO_IOR_Manipulation::_duplicate (p);
+}
+
+void
+TAO_IOP::TAO_IOR_Manipulation_var::release (TAO_IOR_Manipulation_ptr p)
+{
+  CORBA::release (p);
+}
+
+::TAO_IOP::TAO_IOR_Manipulation_ptr
+TAO_IOP::TAO_IOR_Manipulation_var::nil (void)
+{
+  return ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
+}
+
+::TAO_IOP::TAO_IOR_Manipulation_ptr
+TAO_IOP::TAO_IOR_Manipulation_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::TAO_IOP::TAO_IOR_Manipulation::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+TAO_IOP::TAO_IOR_Manipulation_var::upcast (void *src)
+{
+  TAO_IOR_Manipulation **tmp =
+    ACE_static_cast (TAO_IOR_Manipulation **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class TAO_IOP::TAO_IOR_Manipulation_out
+// *************************************************************
+
+TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
+}
+
+TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
+}
+
+TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (const ::TAO_IOP::TAO_IOR_Manipulation_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (TAO_IOR_Manipulation_out &, p).ptr_)
+{}
+
+::TAO_IOP::TAO_IOR_Manipulation_out &
+TAO_IOP::TAO_IOR_Manipulation_out::operator= (const ::TAO_IOP::TAO_IOR_Manipulation_out &p)
+{
+  this->ptr_ = ACE_const_cast (TAO_IOR_Manipulation_out&, p).ptr_;
+  return *this;
+}
+
+TAO_IOP::TAO_IOR_Manipulation_out &
+TAO_IOP::TAO_IOR_Manipulation_out::operator= (const ::TAO_IOP::TAO_IOR_Manipulation_var &p)
+{
+  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_duplicate (p.ptr ());
+  return *this;
+}
+
+TAO_IOP::TAO_IOR_Manipulation_out &
+TAO_IOP::TAO_IOR_Manipulation_out::operator= (TAO_IOR_Manipulation_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+TAO_IOP::TAO_IOR_Manipulation_out::operator ::TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::TAO_IOP::TAO_IOR_Manipulation_ptr &
+TAO_IOP::TAO_IOR_Manipulation_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::TAO_IOP::TAO_IOR_Manipulation_ptr
+TAO_IOP::TAO_IOR_Manipulation_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation ()
+{
+  }
+
 // destructor
 TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
 {}
@@ -616,9 +1131,30 @@ TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj)
   return obj;
 }
 
+void *TAO_IOP::TAO_IOR_Manipulation::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *retv = 0;
+  if (type == ACE_reinterpret_cast
+    (ptr_arith_t,
+      &ACE_NESTED_CLASS (::TAO_IOP, TAO_IOR_Manipulation)::_narrow))
+    retv = ACE_reinterpret_cast (void*, this);
+  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+    retv = ACE_reinterpret_cast (void *,
+      ACE_static_cast (CORBA::Object_ptr, this));
+    
+  if (retv)
+    this->_add_ref ();
+  return retv;
+}
+
+const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
+{
+  return "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0";
+}
 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+  
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_
 
@@ -628,55 +1164,65 @@ TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj)
   {
     CORBA::Object **tmp = 0;
     tmp = _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::allocbuf (length);
-
+    
     if (this->buffer_ != 0)
     {
       CORBA::Object **old = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = CORBA::Object::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-
+        {
+          if (!this->release_)
+            {
+              tmp[i] = CORBA::Object::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
       if (this->release_)
-        delete[] old;
-
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
-
+  
   void
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::Object::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = CORBA::Object::_nil ();
+      }
+    
     _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::freebuf (tmp);
     this->buffer_ = 0;
   }
-
+  
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::~_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void)
   {
     this->_deallocate_buffer ();
   }
-
+  
   void
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
   {
     CORBA::Object **tmp = ACE_reinterpret_cast (CORBA::Object**, this->buffer_);
-
+    
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA::Object::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = CORBA::Object::_nil ();
+      }
   }
-  void
+  
+  void 
   TAO_IOP::TAO_IOR_Manipulation::_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList::_downcast (
       void* target,
       CORBA_Object *src,
@@ -694,11 +1240,11 @@ TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj)
     CORBA::Object **tmp = ACE_static_cast (CORBA::Object**, src);
     return *tmp;
   }
-
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_
@@ -710,30 +1256,30 @@ TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj)
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (void)
 {}
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (CORBA::ULong max, CORBA::ULong length, CORBA::Object_ptr *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 TAO_IOP::TAO_IOR_Manipulation::IORList::IORList (const IORList &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 TAO_IOP::TAO_IOR_Manipulation::IORList::~IORList (void) // dtor
@@ -747,27 +1293,6 @@ void TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
-void *TAO_IOP::TAO_IOR_Manipulation::_tao_QueryInterface (ptr_arith_t type)
-{
-  void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::TAO_IOP, TAO_IOR_Manipulation)::_narrow))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
-  return retv;
-}
-
-const char* TAO_IOP::TAO_IOR_Manipulation::_interface_repository_id (void) const
-{
-  return "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0";
-}
-
 void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::EmptyProfileList &_tao_elem) // copying
 {
   TAO_OutputCDR stream;
@@ -807,15 +1332,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::EmptyProf
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    int retval =
-      type->equivalent (TAO_IOP::_tc_EmptyProfileList,
-                        ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_EmptyProfileList, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    if (!retval)
-      {
-        return 0;
-      }
-
+    
+    if (!result)
+      return 0; // not equivalent
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (TAO_IOP::EmptyProfileList *)_tao_any.value ();
@@ -899,14 +1422,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::NotFound
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    int retval =
-      type->equivalent (TAO_IOP::_tc_NotFound, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_NotFound, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    if (!retval)
-      {
-        return 0;
-      }
-
+    
+    if (!result)
+      return 0; // not equivalent
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (TAO_IOP::NotFound *)_tao_any.value ();
@@ -990,16 +1512,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::Duplicate
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
-    int retval =
-      type->equivalent (TAO_IOP::_tc_Duplicate, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Duplicate, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    // not equal
-    if (!retval)
-      {
-        return 0;
-      }
-
+    
+    if (!result)
+      return 0; // not equivalent
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (TAO_IOP::Duplicate *)_tao_any.value ();
@@ -1083,15 +1602,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::Invalid_I
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
-    int retval = type->equivalent (TAO_IOP::_tc_Invalid_IOR,
-                                   ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_Invalid_IOR, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-    if (!retval)
-      {
-        return 0;
-      }
-
+    
+    if (!result)
+      return 0; // not equivalent
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (TAO_IOP::Invalid_IOR *)_tao_any.value ();
@@ -1175,16 +1692,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::MultiProf
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
-    int retval =
-      type->equivalent (TAO_IOP::_tc_MultiProfileList, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-
-    if (!retval)
-      {
-        return 0;
-      }
+    
+    CORBA::Boolean result = type->equivalent (TAO_IOP::_tc_MultiProfileList, ACE_TRY_ENV);
     ACE_TRY_CHECK;
+    
+    if (!result)
+      return 0; // not equivalent
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (TAO_IOP::MultiProfileList *)_tao_any.value ();
@@ -1242,3 +1756,4 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::MultiProf
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
   #  pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Manipulation,TAO_IOP::TAO_IOR_Manipulation_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index b5529ecf9dd..c247834e9f7 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.h
@@ -1,14 +1,26 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_IORC_H_
-#define _TAO_IDL_IORC_H_
+#ifndef _TAO_IDL_ORIG_IORC_H_
+#define _TAO_IDL_ORIG_IORC_H_
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
@@ -47,6 +59,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
 TAO_NAMESPACE  TAO_IOP
 {
 
@@ -57,31 +73,40 @@ TAO_NAMESPACE  TAO_IOP
   {
   public:
 
-    EmptyProfileList (void); // default ctor
-    EmptyProfileList (const EmptyProfileList &); // copy ctor
+    EmptyProfileList (void);
+    // Default constructor.
+    
+    EmptyProfileList (const EmptyProfileList &);
+    // Copy constructor.
+    
     ~EmptyProfileList (void);
+    // Destructor.
+    
     static void _tao_any_destructor (void*);
+    
     EmptyProfileList &operator= (const EmptyProfileList &);
-
-
+    
     virtual void _raise (void);
 
     virtual void _tao_encode (
         TAO_OutputCDR &,
-        CORBA::Environment &) const;
+        CORBA::Environment &
+      ) const;
+    
     virtual void _tao_decode (
         TAO_InputCDR &,
-        CORBA::Environment &);
-
+        CORBA::Environment &
+      );
+    
     static EmptyProfileList *_downcast (CORBA::Exception *);
 
 
-    // = TAO extension
+    // = TAO extension.
     static CORBA::Exception *_alloc (void);
     virtual CORBA::TypeCode_ptr _type (void) const;
-  }; // exception TAO_IOP::EmptyProfileList
+  }; // Exception TAO_IOP::EmptyProfileList.
 
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EmptyProfileList;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EmptyProfileList;
 
 
 #endif /* end #if !defined */
@@ -94,31 +119,40 @@ TAO_NAMESPACE  TAO_IOP
   {
   public:
 
-    NotFound (void); // default ctor
-    NotFound (const NotFound &); // copy ctor
+    NotFound (void);
+    // Default constructor.
+    
+    NotFound (const NotFound &);
+    // Copy constructor.
+    
     ~NotFound (void);
+    // Destructor.
+    
     static void _tao_any_destructor (void*);
+    
     NotFound &operator= (const NotFound &);
-
-
+    
     virtual void _raise (void);
 
     virtual void _tao_encode (
         TAO_OutputCDR &,
-        CORBA::Environment &) const;
+        CORBA::Environment &
+      ) const;
+    
     virtual void _tao_decode (
         TAO_InputCDR &,
-        CORBA::Environment &);
-
+        CORBA::Environment &
+      );
+    
     static NotFound *_downcast (CORBA::Exception *);
 
 
-    // = TAO extension
+    // = TAO extension.
     static CORBA::Exception *_alloc (void);
     virtual CORBA::TypeCode_ptr _type (void) const;
-  }; // exception TAO_IOP::NotFound
+  }; // Exception TAO_IOP::NotFound.
 
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NotFound;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NotFound;
 
 
 #endif /* end #if !defined */
@@ -131,31 +165,40 @@ TAO_NAMESPACE  TAO_IOP
   {
   public:
 
-    Duplicate (void); // default ctor
-    Duplicate (const Duplicate &); // copy ctor
+    Duplicate (void);
+    // Default constructor.
+    
+    Duplicate (const Duplicate &);
+    // Copy constructor.
+    
     ~Duplicate (void);
+    // Destructor.
+    
     static void _tao_any_destructor (void*);
+    
     Duplicate &operator= (const Duplicate &);
-
-
+    
     virtual void _raise (void);
 
     virtual void _tao_encode (
         TAO_OutputCDR &,
-        CORBA::Environment &) const;
+        CORBA::Environment &
+      ) const;
+    
     virtual void _tao_decode (
         TAO_InputCDR &,
-        CORBA::Environment &);
-
+        CORBA::Environment &
+      );
+    
     static Duplicate *_downcast (CORBA::Exception *);
 
 
-    // = TAO extension
+    // = TAO extension.
     static CORBA::Exception *_alloc (void);
     virtual CORBA::TypeCode_ptr _type (void) const;
-  }; // exception TAO_IOP::Duplicate
+  }; // Exception TAO_IOP::Duplicate.
 
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Duplicate;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Duplicate;
 
 
 #endif /* end #if !defined */
@@ -168,31 +211,40 @@ TAO_NAMESPACE  TAO_IOP
   {
   public:
 
-    Invalid_IOR (void); // default ctor
-    Invalid_IOR (const Invalid_IOR &); // copy ctor
+    Invalid_IOR (void);
+    // Default constructor.
+    
+    Invalid_IOR (const Invalid_IOR &);
+    // Copy constructor.
+    
     ~Invalid_IOR (void);
+    // Destructor.
+    
     static void _tao_any_destructor (void*);
+    
     Invalid_IOR &operator= (const Invalid_IOR &);
-
-
+    
     virtual void _raise (void);
 
     virtual void _tao_encode (
         TAO_OutputCDR &,
-        CORBA::Environment &) const;
+        CORBA::Environment &
+      ) const;
+    
     virtual void _tao_decode (
         TAO_InputCDR &,
-        CORBA::Environment &);
-
+        CORBA::Environment &
+      );
+    
     static Invalid_IOR *_downcast (CORBA::Exception *);
 
 
-    // = TAO extension
+    // = TAO extension.
     static CORBA::Exception *_alloc (void);
     virtual CORBA::TypeCode_ptr _type (void) const;
-  }; // exception TAO_IOP::Invalid_IOR
+  }; // Exception TAO_IOP::Invalid_IOR.
 
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Invalid_IOR;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Invalid_IOR;
 
 
 #endif /* end #if !defined */
@@ -205,31 +257,40 @@ TAO_NAMESPACE  TAO_IOP
   {
   public:
 
-    MultiProfileList (void); // default ctor
-    MultiProfileList (const MultiProfileList &); // copy ctor
+    MultiProfileList (void);
+    // Default constructor.
+    
+    MultiProfileList (const MultiProfileList &);
+    // Copy constructor.
+    
     ~MultiProfileList (void);
+    // Destructor.
+    
     static void _tao_any_destructor (void*);
+    
     MultiProfileList &operator= (const MultiProfileList &);
-
-
+    
     virtual void _raise (void);
 
     virtual void _tao_encode (
         TAO_OutputCDR &,
-        CORBA::Environment &) const;
+        CORBA::Environment &
+      ) const;
+    
     virtual void _tao_decode (
         TAO_InputCDR &,
-        CORBA::Environment &);
-
+        CORBA::Environment &
+      );
+    
     static MultiProfileList *_downcast (CORBA::Exception *);
 
 
-    // = TAO extension
+    // = TAO extension.
     static CORBA::Exception *_alloc (void);
     virtual CORBA::TypeCode_ptr _type (void) const;
-  }; // exception TAO_IOP::MultiProfileList
+  }; // Exception TAO_IOP::MultiProfileList.
 
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_MultiProfileList;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_MultiProfileList;
 
 
 #endif /* end #if !defined */
@@ -240,7 +301,7 @@ TAO_NAMESPACE  TAO_IOP
 
   class TAO_IOR_Property;
   typedef TAO_IOR_Property *TAO_IOR_Property_ptr;
-
+  
 #endif /* end #if !defined */
 
 
@@ -251,23 +312,31 @@ TAO_NAMESPACE  TAO_IOP
   {
   public:
     TAO_IOR_Property_var (void); // default constructor
-    TAO_IOR_Property_var (TAO_IOR_Property_ptr p) : ptr_ (p) {}
+    TAO_IOR_Property_var (TAO_IOR_Property_ptr p) : ptr_ (p) {} 
     TAO_IOR_Property_var (const TAO_IOR_Property_var &); // copy constructor
     ~TAO_IOR_Property_var (void); // destructor
-
+    
     TAO_IOR_Property_var &operator= (TAO_IOR_Property_ptr);
     TAO_IOR_Property_var &operator= (const TAO_IOR_Property_var &);
     TAO_IOR_Property_ptr operator-> (void) const;
-
+    
     operator const TAO_IOR_Property_ptr &() const;
     operator TAO_IOR_Property_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     TAO_IOR_Property_ptr in (void) const;
     TAO_IOR_Property_ptr &inout (void);
     TAO_IOR_Property_ptr &out (void);
     TAO_IOR_Property_ptr _retn (void);
     TAO_IOR_Property_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static TAO_IOR_Property_ptr duplicate (TAO_IOR_Property_ptr);
+    static void release (TAO_IOR_Property_ptr);
+    static TAO_IOR_Property_ptr nil (void);
+    static TAO_IOR_Property_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     TAO_IOR_Property_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -294,7 +363,7 @@ TAO_NAMESPACE  TAO_IOP
     operator TAO_IOR_Property_ptr &();
     TAO_IOR_Property_ptr &ptr (void);
     TAO_IOR_Property_ptr operator-> (void);
-
+  
   private:
     TAO_IOR_Property_ptr &ptr_;
   };
@@ -318,12 +387,12 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
     static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj);
     static TAO_IOR_Property_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
     static TAO_IOR_Property_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
     static TAO_IOR_Property_ptr _nil (void)
@@ -333,7 +402,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
 
     virtual CORBA::Boolean set_property (
         CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -344,7 +413,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
     virtual CORBA::Boolean set_primary (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -355,7 +424,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
 
     virtual CORBA::Object_ptr get_primary (
         CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -365,7 +434,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
 
     virtual CORBA::Boolean is_primary_set (
         CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -373,11 +442,12 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    TAO_IOR_Property (void);
+    TAO_IOR_Property ();
+    
     virtual ~TAO_IOR_Property (void);
   private:
     TAO_IOR_Property (const TAO_IOR_Property &);
@@ -393,7 +463,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
 
   class TAO_IOR_Manipulation;
   typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
-
+  
 #endif /* end #if !defined */
 
 
@@ -404,23 +474,31 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
   {
   public:
     TAO_IOR_Manipulation_var (void); // default constructor
-    TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr p) : ptr_ (p) {}
+    TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr p) : ptr_ (p) {} 
     TAO_IOR_Manipulation_var (const TAO_IOR_Manipulation_var &); // copy constructor
     ~TAO_IOR_Manipulation_var (void); // destructor
-
+    
     TAO_IOR_Manipulation_var &operator= (TAO_IOR_Manipulation_ptr);
     TAO_IOR_Manipulation_var &operator= (const TAO_IOR_Manipulation_var &);
     TAO_IOR_Manipulation_ptr operator-> (void) const;
-
+    
     operator const TAO_IOR_Manipulation_ptr &() const;
     operator TAO_IOR_Manipulation_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     TAO_IOR_Manipulation_ptr in (void) const;
     TAO_IOR_Manipulation_ptr &inout (void);
     TAO_IOR_Manipulation_ptr &out (void);
     TAO_IOR_Manipulation_ptr _retn (void);
     TAO_IOR_Manipulation_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static TAO_IOR_Manipulation_ptr duplicate (TAO_IOR_Manipulation_ptr);
+    static void release (TAO_IOR_Manipulation_ptr);
+    static TAO_IOR_Manipulation_ptr nil (void);
+    static TAO_IOR_Manipulation_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     TAO_IOR_Manipulation_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -447,7 +525,7 @@ class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
     operator TAO_IOR_Manipulation_ptr &();
     TAO_IOR_Manipulation_ptr &ptr (void);
     TAO_IOR_Manipulation_ptr operator-> (void);
-
+  
   private:
     TAO_IOR_Manipulation_ptr &ptr_;
   };
@@ -471,12 +549,12 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
     static TAO_IOR_Manipulation_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
     static TAO_IOR_Manipulation_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
     static TAO_IOR_Manipulation_ptr _nil (void)
@@ -486,7 +564,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+      
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
 
@@ -494,7 +572,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
       {
       public:
         // = Initialization and termination methods.
-
+        
         _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
         _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum);
         _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum,
@@ -516,43 +594,43 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
         virtual void _downcast (
             void* target,
             CORBA_Object *src,
-            CORBA_Environment &ACE_TRY_ENV =
+            CORBA_Environment &ACE_TRY_ENV = 
               TAO_default_environment ()
           );
         virtual CORBA_Object* _upcast (void *src) const;
-
+        
       };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+    
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
 
     class IORList;
     class IORList_var;
-
+    
     // *************************************************************
     // IORList
     // *************************************************************
-
-    class TAO_IORManip_Export IORList : public
+    
+    class TAO_IORManip_Export IORList : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
       _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
       TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
     {
     public:
       IORList (void); // default ctor
       IORList (CORBA::ULong max); // uses max size
       IORList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Object_ptr *buffer,
-        CORBA::Boolean release=0
+        CORBA::ULong max, 
+        CORBA::ULong length, 
+        CORBA::Object_ptr *buffer, 
+        CORBA::Boolean release = 0
       );
       IORList (const IORList &); // copy ctor
       ~IORList (void);
@@ -563,7 +641,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
     };
-
+    
 #endif /* end #if !defined */
 
 
@@ -581,19 +659,20 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
       IORList_var (IORList *);
       IORList_var (const IORList_var &); // copy constructor
       ~IORList_var (void); // destructor
-
+      
       IORList_var &operator= (IORList *);
       IORList_var &operator= (const IORList_var &);
       IORList *operator-> (void);
       const IORList *operator-> (void) const;
-
+      
       operator const IORList &() const;
       operator IORList &();
       operator IORList &() const;
       operator IORList *&(); // variable-size base types only
-
+      
       TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-      // in, inout, out, _retn
+      
+      // in, inout, out, _retn 
       const IORList &in (void) const;
       IORList &inout (void);
       IORList *&out (void);
@@ -623,7 +702,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
       IORList *&ptr (void);
       IORList *operator-> (void);
       TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-
+      
     private:
       IORList *&ptr_;
       // assignment from T_var not allowed
@@ -635,7 +714,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
 
     virtual CORBA::Object_ptr merge_iors (
         const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -648,7 +727,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     virtual CORBA::Object_ptr add_profiles (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -661,7 +740,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     virtual CORBA::Object_ptr remove_profiles (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -674,7 +753,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     virtual CORBA::Boolean set_property (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -687,7 +766,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -701,7 +780,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     virtual CORBA::Object_ptr get_primary (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -712,7 +791,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     virtual CORBA::Boolean is_primary_set (
         TAO_IOP::TAO_IOR_Property_ptr prop,
         CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -722,7 +801,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
     virtual CORBA::ULong is_in_ior (
         CORBA::Object_ptr ior1,
         CORBA::Object_ptr ior2,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -732,7 +811,7 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
 
     virtual CORBA::ULong get_profile_count (
         CORBA::Object_ptr ior,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -741,11 +820,12 @@ class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    TAO_IOR_Manipulation (void);
+    TAO_IOR_Manipulation ();
+    
     virtual ~TAO_IOR_Manipulation (void);
   private:
     TAO_IOR_Manipulation (const TAO_IOR_Manipulation &);
@@ -809,5 +889,8 @@ TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiPro
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#include "ace/post.h"
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #endif /* ifndef */
diff --git a/TAO/tao/IORManipulation/IORC.i b/TAO/tao/IORManipulation/IORC.i
index e01dc172db3..a8d2ba4aab2 100644
--- a/TAO/tao/IORManipulation/IORC.i
+++ b/TAO/tao/IORManipulation/IORC.i
@@ -1,11 +1,23 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // *************************************************************
 // Inline operations for exception TAO_IOP::EmptyProfileList
@@ -28,170 +40,50 @@
 // *************************************************************
 
 
-#if !defined (_TAO_IOP_TAO_IOR_PROPERTY___VAR_CI_)
-#define _TAO_IOP_TAO_IOR_PROPERTY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class TAO_IOP::TAO_IOR_Property_var
-// *************************************************************
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (void) // default constructor
-  : ptr_ (TAO_IOR_Property::_nil ())
-{}
-
-ACE_INLINE ::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (const ::TAO_IOP::TAO_IOR_Property_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (TAO_IOR_Property::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Property_var::~TAO_IOR_Property_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Property_var &
-TAO_IOP::TAO_IOR_Property_var::operator= (TAO_IOR_Property_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Property_var &
-TAO_IOP::TAO_IOR_Property_var::operator= (const ::TAO_IOP::TAO_IOR_Property_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-TAO_IOP::TAO_IOR_Property_var::operator const ::TAO_IOP::TAO_IOR_Property_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-TAO_IOP::TAO_IOR_Property_var::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_IOP::TAO_IOR_Property_ptr &
-TAO_IOP::TAO_IOR_Property_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_IOP::TAO_IOR_Property_ptr &
-TAO_IOP::TAO_IOR_Property_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::TAO_IOP::TAO_IOR_Property_ptr val = this->ptr_;
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_PROPERTY___OUT_CI_)
-#define _TAO_IOP_TAO_IOR_PROPERTY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class TAO_IOP::TAO_IOR_Property_out
-// *************************************************************
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (const ::TAO_IOP::TAO_IOR_Property_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (TAO_IOR_Property_out &, p).ptr_)
-{}
-
-ACE_INLINE ::TAO_IOP::TAO_IOR_Property_out &
-TAO_IOP::TAO_IOR_Property_out::operator= (const ::TAO_IOP::TAO_IOR_Property_out &p)
-{
-  this->ptr_ = ACE_const_cast (TAO_IOR_Property_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_TAO_IOP_TAO_IOR_PROPERTY___CI_)
+#define _TAO_IOP_TAO_IOR_PROPERTY___CI_
 
-ACE_INLINE TAO_IOP::TAO_IOR_Property_out &
-TAO_IOP::TAO_IOR_Property_out::operator= (const ::TAO_IOP::TAO_IOR_Property_var &p)
+ACE_INLINE TAO_IOP::TAO_IOR_Property_ptr
+tao_TAO_IOP_TAO_IOR_Property_duplicate (
+    TAO_IOP::TAO_IOR_Property_ptr p
+  )
 {
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_duplicate (p.ptr ());
-  return *this;
+  return TAO_IOP::TAO_IOR_Property::_duplicate (p);
 }
 
-ACE_INLINE TAO_IOP::TAO_IOR_Property_out &
-TAO_IOP::TAO_IOR_Property_out::operator= (TAO_IOR_Property_ptr p)
+ACE_INLINE void
+tao_TAO_IOP_TAO_IOR_Property_release (
+    TAO_IOP::TAO_IOR_Property_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-TAO_IOP::TAO_IOR_Property_out::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // cast
+ACE_INLINE TAO_IOP::TAO_IOR_Property_ptr
+tao_TAO_IOP_TAO_IOR_Property_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return TAO_IOP::TAO_IOR_Property::_nil ();
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Property_ptr &
-TAO_IOP::TAO_IOR_Property_out::ptr (void) // ptr
+ACE_INLINE TAO_IOP::TAO_IOR_Property_ptr
+tao_TAO_IOP_TAO_IOR_Property_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return TAO_IOP::TAO_IOR_Property::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Property_ptr
-TAO_IOP::TAO_IOR_Property_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_TAO_IOP_TAO_IOR_Property_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  TAO_IOP::TAO_IOR_Property **tmp =
+    ACE_static_cast (TAO_IOP::TAO_IOR_Property **, src);
+  return *tmp;
 }
 
 
@@ -211,7 +103,9 @@ TAO_IOP::TAO_IOR_Property_out::operator-> (void)
     ACE_NEW_RETURN (buf, CORBA::Object*[nelems], 0);
     
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = CORBA::Object::_nil ();
+      {
+        buf[i] = CORBA::Object::_nil ();
+      }
     
     return buf;
   }
@@ -254,7 +148,9 @@ TAO_IOP::TAO_IOR_Property_out::operator-> (void)
       CORBA::Object ** const tmp2 = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = CORBA::Object::_duplicate (tmp2[i]);
+        {
+          tmp1[i] = CORBA::Object::_duplicate (tmp2[i]);
+        }
       
       this->buffer_ = tmp1;
     }
@@ -294,7 +190,9 @@ TAO_IOP::TAO_IOR_Property_out::operator-> (void)
     CORBA::Object ** const tmp2 = ACE_reinterpret_cast (CORBA::Object ** ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA::Object::_duplicate (tmp2[i]);
+      {
+        tmp1[i] = CORBA::Object::_duplicate (tmp2[i]);
+      }
     
     return *this;
   }
@@ -394,8 +292,8 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (IORList *p)
   return *this;
 }
 
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation::IORList_var &
-TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_var &p) // deep copy
+ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation::IORList_var &
+TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const ::TAO_IOP::TAO_IOR_Manipulation::IORList_var &p)
 {
   if (this != &p)
     {
@@ -406,12 +304,12 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator= (const ::TAO_IOP::TAO_IOR_
         }
       else
         {
-          TAO_IOP::TAO_IOR_Manipulation::IORList *deep_copy = 
-            new TAO_IOP::TAO_IOR_Manipulation::IORList (*p.ptr_);
+          IORList *deep_copy =
+            new IORList (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              TAO_IOP::TAO_IOR_Manipulation::IORList *tmp = deep_copy;
+              IORList *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -459,7 +357,7 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator ::TAO_IOP::TAO_IOR_Manipula
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var> 
+ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
 TAO_IOP::TAO_IOR_Manipulation::IORList_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -556,7 +454,7 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var> 
+ACE_INLINE TAO_Object_Manager<CORBA::Object,CORBA::Object_var>
 TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
@@ -566,170 +464,50 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___VAR_CI_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___VAR_CI_
-
-// *************************************************************
-// Inline operations for class TAO_IOP::TAO_IOR_Manipulation_var
-// *************************************************************
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (void) // default constructor
-  : ptr_ (TAO_IOR_Manipulation::_nil ())
-{}
-
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_var::TAO_IOR_Manipulation_var (const ::TAO_IOP::TAO_IOR_Manipulation_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (TAO_IOR_Manipulation::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_var::~TAO_IOR_Manipulation_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_var &
-TAO_IOP::TAO_IOR_Manipulation_var::operator= (TAO_IOR_Manipulation_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_var &
-TAO_IOP::TAO_IOR_Manipulation_var::operator= (const ::TAO_IOP::TAO_IOR_Manipulation_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-TAO_IOP::TAO_IOR_Manipulation_var::operator const ::TAO_IOP::TAO_IOR_Manipulation_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-TAO_IOP::TAO_IOR_Manipulation_var::operator ::TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast 
-{
-  return this->ptr_;
-}
+#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___CI_)
+#define _TAO_IOP_TAO_IOR_MANIPULATION___CI_
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::operator-> (void) const
+ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
+tao_TAO_IOP_TAO_IOR_Manipulation_duplicate (
+    TAO_IOP::TAO_IOR_Manipulation_ptr p
+  )
 {
-  return this->ptr_;
+  return TAO_IOP::TAO_IOR_Manipulation::_duplicate (p);
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::in (void) const
+ACE_INLINE void
+tao_TAO_IOP_TAO_IOR_Manipulation_release (
+    TAO_IOP::TAO_IOR_Manipulation_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_var::inout (void)
+ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
+tao_TAO_IOP_TAO_IOR_Manipulation_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return TAO_IOP::TAO_IOR_Manipulation::_nil ();
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_var::out (void)
+ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_ptr
+tao_TAO_IOP_TAO_IOR_Manipulation_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  return this->ptr_;
+  return TAO_IOP::TAO_IOR_Manipulation::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_TAO_IOP_TAO_IOR_Manipulation_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::TAO_IOP::TAO_IOR_Manipulation_ptr val = this->ptr_;
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___OUT_CI_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION___OUT_CI_
-
-// *************************************************************
-// Inline operations for class TAO_IOP::TAO_IOR_Manipulation_out
-// *************************************************************
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_nil ();
-}
-
-ACE_INLINE
-TAO_IOP::TAO_IOR_Manipulation_out::TAO_IOR_Manipulation_out (const ::TAO_IOP::TAO_IOR_Manipulation_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (TAO_IOR_Manipulation_out &, p).ptr_)
-{}
-
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation_out &
-TAO_IOP::TAO_IOR_Manipulation_out::operator= (const ::TAO_IOP::TAO_IOR_Manipulation_out &p)
-{
-  this->ptr_ = ACE_const_cast (TAO_IOR_Manipulation_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_out &
-TAO_IOP::TAO_IOR_Manipulation_out::operator= (const ::TAO_IOP::TAO_IOR_Manipulation_var &p)
-{
-  this->ptr_ = ::TAO_IOP::TAO_IOR_Manipulation::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE TAO_IOP::TAO_IOR_Manipulation_out &
-TAO_IOP::TAO_IOR_Manipulation_out::operator= (TAO_IOR_Manipulation_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-TAO_IOP::TAO_IOR_Manipulation_out::operator ::TAO_IOP::TAO_IOR_Manipulation_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation_ptr &
-TAO_IOP::TAO_IOR_Manipulation_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO_IOP::TAO_IOR_Manipulation_ptr
-TAO_IOP::TAO_IOR_Manipulation_out::operator-> (void)
-{
-  return this->ptr_;
+  TAO_IOP::TAO_IOR_Manipulation **tmp =
+    ACE_static_cast (TAO_IOP::TAO_IOR_Manipulation **, src);
+  return *tmp;
 }
 
 
diff --git a/TAO/tao/IORManipulation/diffs/IORC.cpp.diff b/TAO/tao/IORManipulation/diffs/IORC.cpp.diff
index 1aa3b1df64d..a07be5dce35 100644
--- a/TAO/tao/IORManipulation/diffs/IORC.cpp.diff
+++ b/TAO/tao/IORManipulation/diffs/IORC.cpp.diff
@@ -1,1163 +1,29 @@
-1c1
-< /* -*- C++ -*- $Id$ */
----
-> /* -*- C++ -*- $Id$ */
-11,13d10
-< #include "tao/Typecode.h"
-< #include "tao/Any.h"
-< #include  "tao/ORB.h"
-18a16
-> 
-20,23c18,19
-< TAO_IOP::EmptyProfileList::EmptyProfileList (void)
-<   : CORBA_UserException ("IDL:TAO_IOP/EmptyProfileList:1.0")
-< {
-< }
----
-> TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
-> {}
-25,28c21,23
-< // destructor - all members are of self managing types
-< TAO_IOP::EmptyProfileList::~EmptyProfileList (void)
-< {
-< }
----
-> // destructor
-> TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
-> {}
-30,69c25,26
-< void TAO_IOP::EmptyProfileList::_tao_any_destructor (void *x)
-< {
-<   EmptyProfileList *tmp = ACE_static_cast (EmptyProfileList*,x);
-<   delete tmp;
-< }
-< 
-< // copy constructor
-< TAO_IOP::EmptyProfileList::EmptyProfileList (const ::TAO_IOP::EmptyProfileList &_tao_excp)
-<   : CORBA_UserException (_tao_excp._id ())
-< {
-< }
-< 
-< // assignment operator
-< TAO_IOP::EmptyProfileList&
-< TAO_IOP::EmptyProfileList::operator= (const ::TAO_IOP::EmptyProfileList &_tao_excp)
-< {
-< 
-<   this->CORBA_UserException::operator= (_tao_excp);
-<   return *this;
-< }
-< 
-< // narrow
-< TAO_IOP::EmptyProfileList *
-< TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception *exc)
-< {
-<   if (!ACE_OS::strcmp ("IDL:TAO_IOP/EmptyProfileList:1.0", exc->_id ())) // same type
-<     return ACE_dynamic_cast (EmptyProfileList *, exc);
-<   else
-<     return 0;
-< }
-< 
-< 
-< void TAO_IOP::EmptyProfileList::_raise ()
-< {
-<   TAO_RAISE(*this);
-< }
-< 
-< 
-< void TAO_IOP::EmptyProfileList::_tao_encode (
-<     TAO_OutputCDR &cdr,
----
-> TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_narrow (
->     CORBA::Object_ptr obj,
-71c28
-<   ) const
----
->   )
-73,75c30
-<   if (cdr << *this)
-<     return;
-<   ACE_THROW (CORBA::MARSHAL ());
----
->   return TAO_IOR_Manipulation::_unchecked_narrow (obj, ACE_TRY_ENV);
-78,81c33,35
-< 
-< void TAO_IOP::EmptyProfileList::_tao_decode (
-<     TAO_InputCDR &cdr,
-<     CORBA::Environment &ACE_TRY_ENV
----
-> TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (
->     CORBA::Object_ptr obj,
->     CORBA::Environment &
-84,86c38,52
-<   if (cdr >> *this)
-<     return;
-<   ACE_THROW (CORBA::MARSHAL ());
----
->   if (CORBA::is_nil (obj))
->     return TAO_IOR_Manipulation::_nil ();
->   return
->       ACE_reinterpret_cast
->         (
->           TAO_IOR_Manipulation_ptr,
->             obj->_tao_QueryInterface
->               (
->                 ACE_reinterpret_cast
->                   (
->                     ptr_arith_t,
->                     &TAO_IOR_Manipulation::_narrow
->                   )
->               )
->         );
-89,90c55,56
-< // TAO extension - the _alloc method
-< CORBA::Exception *TAO_IOP::EmptyProfileList::_alloc (void)
----
-> TAO_IOP::TAO_IOR_Manipulation_ptr
-> TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj)
-92,94c58,60
-<   CORBA::Exception *retval = 0;
-<   ACE_NEW_RETURN (retval, ::TAO_IOP::EmptyProfileList, 0);
-<   return retval;
----
->   if (!CORBA::is_nil (obj))
->     obj->_add_ref ();
->   return obj;
-97,115d62
-< static const CORBA::Long _oc_TAO_IOP_EmptyProfileList[] =
-< {
-<   TAO_ENCAP_BYTE_ORDER, // byte order
-<   33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x456d7074), ACE_NTOHL (0x7950726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/EmptyProfileList:1.0
-<   17, ACE_NTOHL (0x456d7074), ACE_NTOHL (0x7950726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x0),  // name = EmptyProfileList
-<   0, // member count
-< };
-< static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_EmptyProfileList (CORBA::tk_except, sizeof (_oc_TAO_IOP_EmptyProfileList), (char *) &_oc_TAO_IOP_EmptyProfileList, 0, sizeof (TAO_IOP::EmptyProfileList));
-< TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-< TAO_NAMESPACE_BEGIN (TAO_IOP)
-< TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EmptyProfileList, &_tc_TAO_tc_TAO_IOP_EmptyProfileList)
-< TAO_NAMESPACE_END
-< 
-< // TAO extension - the virtual _type method
-< CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_type (void) const
-< {
-<   return ::TAO_IOP::_tc_EmptyProfileList;
-< }
-< 
-117,118c64
-< TAO_IOP::NotFound::NotFound (void)
-<   : CORBA_UserException ("IDL:TAO_IOP/NotFound:1.0")
----
-> TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::EmptyProfileList (void)
-123c69
-< TAO_IOP::NotFound::~NotFound (void)
----
-> TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::~EmptyProfileList (void)
-127,132d72
-< void TAO_IOP::NotFound::_tao_any_destructor (void *x)
-< {
-<   NotFound *tmp = ACE_static_cast (NotFound*,x);
-<   delete tmp;
-< }
-< 
-134c74
-< TAO_IOP::NotFound::NotFound (const ::TAO_IOP::NotFound &_tao_excp)
----
-> TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::EmptyProfileList (const ::TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &_tao_excp)
-140,141c80,81
-< TAO_IOP::NotFound&
-< TAO_IOP::NotFound::operator= (const ::TAO_IOP::NotFound &_tao_excp)
----
-> TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList&
-> TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::operator= (const ::TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList &_tao_excp)
-149,150c89,90
-< TAO_IOP::NotFound *
-< TAO_IOP::NotFound::_downcast (CORBA::Exception *exc)
----
-> TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList *
-> TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_downcast (CORBA::Exception *exc)
-152,153c92,93
-<   if (!ACE_OS::strcmp ("IDL:TAO_IOP/NotFound:1.0", exc->_id ())) // same type
-<     return ACE_dynamic_cast (NotFound *, exc);
----
->   if (!ACE_OS::strcmp ("IDL:TAO_IOP/TAO_IOR_Manipulation/EmptyProfileList:1.0", exc->_id ())) // same type
->     return ACE_dynamic_cast (EmptyProfileList *, exc);
-159c99
-< void TAO_IOP::NotFound::_raise ()
----
-> void TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_raise ()
-165,168c105,107
-< void TAO_IOP::NotFound::_tao_encode (
-<     TAO_OutputCDR &cdr,
-<     CORBA::Environment &ACE_TRY_ENV
-<   ) const
----
-> void TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_tao_encode (
->     TAO_OutputCDR &,
->     CORBA::Environment &ACE_TRY_ENV) const
-170,171d108
-<   if (cdr << *this)
-<     return;
-176,179c113,115
-< void TAO_IOP::NotFound::_tao_decode (
-<     TAO_InputCDR &cdr,
-<     CORBA::Environment &ACE_TRY_ENV
-<   )
----
-> void TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_tao_decode (
->     TAO_InputCDR &,
->     CORBA::Environment &ACE_TRY_ENV)
-181,182d116
-<   if (cdr >> *this)
-<     return;
-187c121
-< CORBA::Exception *TAO_IOP::NotFound::_alloc (void)
----
-> CORBA::Exception *TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList::_alloc (void)
-190c124
-<   ACE_NEW_RETURN (retval, ::TAO_IOP::NotFound, 0);
----
->   ACE_NEW_RETURN (retval, ::TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList, 0);
-194,212d127
-< static const CORBA::Long _oc_TAO_IOP_NotFound[] =
-< {
-<   TAO_ENCAP_BYTE_ORDER, // byte order
-<   25, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x4e6f7446), ACE_NTOHL (0x6f756e64), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/NotFound:1.0
-<   9, ACE_NTOHL (0x4e6f7446), ACE_NTOHL (0x6f756e64), ACE_NTOHL (0x0),  // name = NotFound
-<   0, // member count
-< };
-< static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_NotFound (CORBA::tk_except, sizeof (_oc_TAO_IOP_NotFound), (char *) &_oc_TAO_IOP_NotFound, 0, sizeof (TAO_IOP::NotFound));
-< TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-< TAO_NAMESPACE_BEGIN (TAO_IOP)
-< TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NotFound, &_tc_TAO_tc_TAO_IOP_NotFound)
-< TAO_NAMESPACE_END
-< 
-< // TAO extension - the virtual _type method
-< CORBA::TypeCode_ptr TAO_IOP::NotFound::_type (void) const
-< {
-<   return ::TAO_IOP::_tc_NotFound;
-< }
-< 
-214,215c129
-< TAO_IOP::Duplicate::Duplicate (void)
-<   : CORBA_UserException ("IDL:TAO_IOP/Duplicate:1.0")
----
-> TAO_IOP::TAO_IOR_Manipulation::NotFound::NotFound (void)
-220c134
-< TAO_IOP::Duplicate::~Duplicate (void)
----
-> TAO_IOP::TAO_IOR_Manipulation::NotFound::~NotFound (void)
-224,229d137
-< void TAO_IOP::Duplicate::_tao_any_destructor (void *x)
-< {
-<   Duplicate *tmp = ACE_static_cast (Duplicate*,x);
-<   delete tmp;
-< }
-< 
-231c139
-< TAO_IOP::Duplicate::Duplicate (const ::TAO_IOP::Duplicate &_tao_excp)
----
-> TAO_IOP::TAO_IOR_Manipulation::NotFound::NotFound (const ::TAO_IOP::TAO_IOR_Manipulation::NotFound &_tao_excp)
-237,238c145,146
-< TAO_IOP::Duplicate&
-< TAO_IOP::Duplicate::operator= (const ::TAO_IOP::Duplicate &_tao_excp)
----
-> TAO_IOP::TAO_IOR_Manipulation::NotFound&
-> TAO_IOP::TAO_IOR_Manipulation::NotFound::operator= (const ::TAO_IOP::TAO_IOR_Manipulation::NotFound &_tao_excp)
-246,247c154,155
-< TAO_IOP::Duplicate *
-< TAO_IOP::Duplicate::_downcast (CORBA::Exception *exc)
----
-> TAO_IOP::TAO_IOR_Manipulation::NotFound *
-> TAO_IOP::TAO_IOR_Manipulation::NotFound::_downcast (CORBA::Exception *exc)
-249,250c157,158
-<   if (!ACE_OS::strcmp ("IDL:TAO_IOP/Duplicate:1.0", exc->_id ())) // same type
-<     return ACE_dynamic_cast (Duplicate *, exc);
----
->   if (!ACE_OS::strcmp ("IDL:TAO_IOP/TAO_IOR_Manipulation/NotFound:1.0", exc->_id ())) // same type
->     return ACE_dynamic_cast (NotFound *, exc);
-256c164
-< void TAO_IOP::Duplicate::_raise ()
----
-> void TAO_IOP::TAO_IOR_Manipulation::NotFound::_raise ()
-262,265c170,172
-< void TAO_IOP::Duplicate::_tao_encode (
-<     TAO_OutputCDR &cdr,
-<     CORBA::Environment &ACE_TRY_ENV
-<   ) const
----
-> void TAO_IOP::TAO_IOR_Manipulation::NotFound::_tao_encode (
->     TAO_OutputCDR &,
->     CORBA::Environment &ACE_TRY_ENV) const
-267,268d173
-<   if (cdr << *this)
-<     return;
-273,276c178,180
-< void TAO_IOP::Duplicate::_tao_decode (
-<     TAO_InputCDR &cdr,
-<     CORBA::Environment &ACE_TRY_ENV
-<   )
----
-> void TAO_IOP::TAO_IOR_Manipulation::NotFound::_tao_decode (
->     TAO_InputCDR &,
->     CORBA::Environment &ACE_TRY_ENV)
-278,279d181
-<   if (cdr >> *this)
-<     return;
-284c186
-< CORBA::Exception *TAO_IOP::Duplicate::_alloc (void)
----
-> CORBA::Exception *TAO_IOP::TAO_IOR_Manipulation::NotFound::_alloc (void)
-287c189
-<   ACE_NEW_RETURN (retval, ::TAO_IOP::Duplicate, 0);
----
->   ACE_NEW_RETURN (retval, ::TAO_IOP::TAO_IOR_Manipulation::NotFound, 0);
-291,309d192
-< static const CORBA::Long _oc_TAO_IOP_Duplicate[] =
-< {
-<   TAO_ENCAP_BYTE_ORDER, // byte order
-<   26, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x4475706c), ACE_NTOHL (0x69636174), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/Duplicate:1.0
-<   10, ACE_NTOHL (0x4475706c), ACE_NTOHL (0x69636174), ACE_NTOHL (0x65000000),  // name = Duplicate
-<   0, // member count
-< };
-< static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Duplicate (CORBA::tk_except, sizeof (_oc_TAO_IOP_Duplicate), (char *) &_oc_TAO_IOP_Duplicate, 0, sizeof (TAO_IOP::Duplicate));
-< TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-< TAO_NAMESPACE_BEGIN (TAO_IOP)
-< TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Duplicate, &_tc_TAO_tc_TAO_IOP_Duplicate)
-< TAO_NAMESPACE_END
-< 
-< // TAO extension - the virtual _type method
-< CORBA::TypeCode_ptr TAO_IOP::Duplicate::_type (void) const
-< {
-<   return ::TAO_IOP::_tc_Duplicate;
-< }
-< 
-311,312c194
-< TAO_IOP::Invalid_IOR::Invalid_IOR (void)
-<   : CORBA_UserException ("IDL:TAO_IOP/Invalid_IOR:1.0")
----
-> TAO_IOP::TAO_IOR_Manipulation::Duplicate::Duplicate (void)
-317c199
-< TAO_IOP::Invalid_IOR::~Invalid_IOR (void)
----
-> TAO_IOP::TAO_IOR_Manipulation::Duplicate::~Duplicate (void)
-321,326d202
-< void TAO_IOP::Invalid_IOR::_tao_any_destructor (void *x)
-< {
-<   Invalid_IOR *tmp = ACE_static_cast (Invalid_IOR*,x);
-<   delete tmp;
-< }
-< 
-328c204
-< TAO_IOP::Invalid_IOR::Invalid_IOR (const ::TAO_IOP::Invalid_IOR &_tao_excp)
----
-> TAO_IOP::TAO_IOR_Manipulation::Duplicate::Duplicate (const ::TAO_IOP::TAO_IOR_Manipulation::Duplicate &_tao_excp)
-334,335c210,211
-< TAO_IOP::Invalid_IOR&
-< TAO_IOP::Invalid_IOR::operator= (const ::TAO_IOP::Invalid_IOR &_tao_excp)
----
-> TAO_IOP::TAO_IOR_Manipulation::Duplicate&
-> TAO_IOP::TAO_IOR_Manipulation::Duplicate::operator= (const ::TAO_IOP::TAO_IOR_Manipulation::Duplicate &_tao_excp)
-343,344c219,220
-< TAO_IOP::Invalid_IOR *
-< TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception *exc)
----
-> TAO_IOP::TAO_IOR_Manipulation::Duplicate *
-> TAO_IOP::TAO_IOR_Manipulation::Duplicate::_downcast (CORBA::Exception *exc)
-346,347c222,223
-<   if (!ACE_OS::strcmp ("IDL:TAO_IOP/Invalid_IOR:1.0", exc->_id ())) // same type
-<     return ACE_dynamic_cast (Invalid_IOR *, exc);
----
->   if (!ACE_OS::strcmp ("IDL:TAO_IOP/TAO_IOR_Manipulation/Duplicate:1.0", exc->_id ())) // same type
->     return ACE_dynamic_cast (Duplicate *, exc);
-353c229
-< void TAO_IOP::Invalid_IOR::_raise ()
----
-> void TAO_IOP::TAO_IOR_Manipulation::Duplicate::_raise ()
-359,362c235,237
-< void TAO_IOP::Invalid_IOR::_tao_encode (
-<     TAO_OutputCDR &cdr,
-<     CORBA::Environment &ACE_TRY_ENV
-<   ) const
----
-> void TAO_IOP::TAO_IOR_Manipulation::Duplicate::_tao_encode (
->     TAO_OutputCDR &,
->     CORBA::Environment &ACE_TRY_ENV) const
-364,365d238
-<   if (cdr << *this)
-<     return;
-370,373c243,245
-< void TAO_IOP::Invalid_IOR::_tao_decode (
-<     TAO_InputCDR &cdr,
-<     CORBA::Environment &ACE_TRY_ENV
-<   )
----
-> void TAO_IOP::TAO_IOR_Manipulation::Duplicate::_tao_decode (
->     TAO_InputCDR &,
->     CORBA::Environment &ACE_TRY_ENV)
-375,376d246
-<   if (cdr >> *this)
-<     return;
-381c251
-< CORBA::Exception *TAO_IOP::Invalid_IOR::_alloc (void)
----
-> CORBA::Exception *TAO_IOP::TAO_IOR_Manipulation::Duplicate::_alloc (void)
-384c254
-<   ACE_NEW_RETURN (retval, ::TAO_IOP::Invalid_IOR, 0);
----
->   ACE_NEW_RETURN (retval, ::TAO_IOP::TAO_IOR_Manipulation::Duplicate, 0);
-388,406d257
-< static const CORBA::Long _oc_TAO_IOP_Invalid_IOR[] =
-< {
-<   TAO_ENCAP_BYTE_ORDER, // byte order
-<   28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c69645f), ACE_NTOHL (0x494f523a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_IOP/Invalid_IOR:1.0
-<   12, ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c69645f), ACE_NTOHL (0x494f5200),  // name = Invalid_IOR
-<   0, // member count
-< };
-< static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Invalid_IOR (CORBA::tk_except, sizeof (_oc_TAO_IOP_Invalid_IOR), (char *) &_oc_TAO_IOP_Invalid_IOR, 0, sizeof (TAO_IOP::Invalid_IOR));
-< TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-< TAO_NAMESPACE_BEGIN (TAO_IOP)
-< TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Invalid_IOR, &_tc_TAO_tc_TAO_IOP_Invalid_IOR)
-< TAO_NAMESPACE_END
-< 
-< // TAO extension - the virtual _type method
-< CORBA::TypeCode_ptr TAO_IOP::Invalid_IOR::_type (void) const
-< {
-<   return ::TAO_IOP::_tc_Invalid_IOR;
-< }
-< 
-408,409c259
-< TAO_IOP::MultiProfileList::MultiProfileList (void)
-<   : CORBA_UserException ("IDL:TAO_IOP/MultiProfileList:1.0")
----
-> TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::Invalid_IOR (void)
-414c264
-< TAO_IOP::MultiProfileList::~MultiProfileList (void)
----
-> TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::~Invalid_IOR (void)
-418,423d267
-< void TAO_IOP::MultiProfileList::_tao_any_destructor (void *x)
-< {
-<   MultiProfileList *tmp = ACE_static_cast (MultiProfileList*,x);
-<   delete tmp;
-< }
-< 
-425c269
-< TAO_IOP::MultiProfileList::MultiProfileList (const ::TAO_IOP::MultiProfileList &_tao_excp)
----
-> TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::Invalid_IOR (const ::TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &_tao_excp)
-431,432c275,276
-< TAO_IOP::MultiProfileList&
-< TAO_IOP::MultiProfileList::operator= (const ::TAO_IOP::MultiProfileList &_tao_excp)
----
-> TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR&
-> TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::operator= (const ::TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR &_tao_excp)
-440,441c284,285
-< TAO_IOP::MultiProfileList *
-< TAO_IOP::MultiProfileList::_downcast (CORBA::Exception *exc)
----
-> TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR *
-> TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_downcast (CORBA::Exception *exc)
-443,444c287,288
-<   if (!ACE_OS::strcmp ("IDL:TAO_IOP/MultiProfileList:1.0", exc->_id ())) // same type
-<     return ACE_dynamic_cast (MultiProfileList *, exc);
----
->   if (!ACE_OS::strcmp ("IDL:TAO_IOP/TAO_IOR_Manipulation/Invalid_IOR:1.0", exc->_id ())) // same type
->     return ACE_dynamic_cast (Invalid_IOR *, exc);
-450c294
-< void TAO_IOP::MultiProfileList::_raise ()
----
-> void TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_raise ()
-456,459c300,302
-< void TAO_IOP::MultiProfileList::_tao_encode (
-<     TAO_OutputCDR &cdr,
-<     CORBA::Environment &ACE_TRY_ENV
-<   ) const
----
-> void TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_tao_encode (
->     TAO_OutputCDR &,
->     CORBA::Environment &ACE_TRY_ENV) const
-461,462d303
-<   if (cdr << *this)
-<     return;
-467,470c308,310
-< void TAO_IOP::MultiProfileList::_tao_decode (
-<     TAO_InputCDR &cdr,
-<     CORBA::Environment &ACE_TRY_ENV
-<   )
----
-> void TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_tao_decode (
->     TAO_InputCDR &,
->     CORBA::Environment &ACE_TRY_ENV)
-472,473d311
-<   if (cdr >> *this)
-<     return;
-478c316
-< CORBA::Exception *TAO_IOP::MultiProfileList::_alloc (void)
----
-> CORBA::Exception *TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR::_alloc (void)
-481c319
-<   ACE_NEW_RETURN (retval, ::TAO_IOP::MultiProfileList, 0);
----
->   ACE_NEW_RETURN (retval, ::TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR, 0);
-485,496d322
-< static const CORBA::Long _oc_TAO_IOP_MultiProfileList[] =
-< {
-<   TAO_ENCAP_BYTE_ORDER, // byte order
-<   33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f5f), ACE_NTOHL (0x494f502f), ACE_NTOHL (0x4d756c74), ACE_NTOHL (0x6950726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/MultiProfileList:1.0
-<   17, ACE_NTOHL (0x4d756c74), ACE_NTOHL (0x6950726f), ACE_NTOHL (0x66696c65), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x0),  // name = MultiProfileList
-<   0, // member count
-< };
-< static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_MultiProfileList (CORBA::tk_except, sizeof (_oc_TAO_IOP_MultiProfileList), (char *) &_oc_TAO_IOP_MultiProfileList, 0, sizeof (TAO_IOP::MultiProfileList));
-< TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-< TAO_NAMESPACE_BEGIN (TAO_IOP)
-< TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_MultiProfileList, &_tc_TAO_tc_TAO_IOP_MultiProfileList)
-< TAO_NAMESPACE_END
-498,621d323
-< // TAO extension - the virtual _type method
-< CORBA::TypeCode_ptr TAO_IOP::MultiProfileList::_type (void) const
-< {
-<   return ::TAO_IOP::_tc_MultiProfileList;
-< }
-< 
-< 
-< // default constructor
-< TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void)
-< {}
-< 
-< // destructor
-< TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void)
-< {}
-< 
-< TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_narrow (
-<     CORBA::Object_ptr obj,
-<     CORBA::Environment &ACE_TRY_ENV
-<   )
-< {
-<   return TAO_IOR_Property::_unchecked_narrow (obj, ACE_TRY_ENV);
-< }
-< 
-< TAO_IOP::TAO_IOR_Property_ptr TAO_IOP::TAO_IOR_Property::_unchecked_narrow (
-<     CORBA::Object_ptr obj,
-<     CORBA::Environment &
-<   )
-< {
-<   if (CORBA::is_nil (obj))
-<     return TAO_IOR_Property::_nil ();
-<   return
-<       ACE_reinterpret_cast
-<         (
-<           TAO_IOR_Property_ptr,
-<             obj->_tao_QueryInterface
-<               (
-<                 ACE_reinterpret_cast
-<                   (
-<                     ptr_arith_t,
-<                     &TAO_IOR_Property::_narrow
-<                   )
-<               )
-<         );
-< }
-< 
-< TAO_IOP::TAO_IOR_Property_ptr
-< TAO_IOP::TAO_IOR_Property::_duplicate (TAO_IOR_Property_ptr obj)
-< {
-<   if (!CORBA::is_nil (obj))
-<     obj->_add_ref ();
-<   return obj;
-< }
-< 
-< void *TAO_IOP::TAO_IOR_Property::_tao_QueryInterface (ptr_arith_t type)
-< {
-<   void *retv = 0;
-<   if (type == ACE_reinterpret_cast
-<     (ptr_arith_t,
-<       &ACE_NESTED_CLASS (::TAO_IOP, TAO_IOR_Property)::_narrow))
-<     retv = ACE_reinterpret_cast (void*, this);
-<   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-<     retv = ACE_reinterpret_cast (void *,
-<       ACE_static_cast (CORBA::Object_ptr, this));
-< 
-<   if (retv)
-<     this->_add_ref ();
-<   return retv;
-< }
-< 
-< const char* TAO_IOP::TAO_IOR_Property::_interface_repository_id (void) const
-< {
-<   return "IDL:TAO_IOP/TAO_IOR_Property:1.0";
-< }
-< 
-< 
-< 
-< 
-< // default constructor
-< TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
-< {}
-< 
-< // destructor
-< TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
-< {}
-< 
-< TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_narrow (
-<     CORBA::Object_ptr obj,
-<     CORBA::Environment &ACE_TRY_ENV
-<   )
-< {
-<   return TAO_IOR_Manipulation::_unchecked_narrow (obj, ACE_TRY_ENV);
-< }
-< 
-< TAO_IOP::TAO_IOR_Manipulation_ptr TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (
-<     CORBA::Object_ptr obj,
-<     CORBA::Environment &
-<   )
-< {
-<   if (CORBA::is_nil (obj))
-<     return TAO_IOR_Manipulation::_nil ();
-<   return
-<       ACE_reinterpret_cast
-<         (
-<           TAO_IOR_Manipulation_ptr,
-<             obj->_tao_QueryInterface
-<               (
-<                 ACE_reinterpret_cast
-<                   (
-<                     ptr_arith_t,
-<                     &TAO_IOR_Manipulation::_narrow
-<                   )
-<               )
-<         );
-< }
-< 
-< TAO_IOP::TAO_IOR_Manipulation_ptr
-< TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj)
-< {
-<   if (!CORBA::is_nil (obj))
-<     obj->_add_ref ();
-<   return obj;
-< }
-< 
-< 
-623c325
-< 
----
->   
-633c335
-< 
----
->     
-642c344
-< 
----
->         
-645c347
-< 
----
->       
-649c351
-< 
----
->   
-664c366
-< 
----
->   
-669c371
-< 
----
->   
-674c376
-< 
----
->     
-681c383
-<   void
----
->   void 
-698c400
-< 
----
->   
-702c404
-< #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
----
-> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-714c416
-<   :
----
->   : 
-719c421
-< #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
----
-> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-723c425
-<   :
----
->   : 
-728c430
-< #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
----
-> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-732c434
-<   :
----
->   : 
-737c439
-< #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
----
-> #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-761c463
-< 
----
->     
-772,1213d473
-< 
-< 
-< void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::EmptyProfileList &_tao_elem) // copying
-< {
-<   TAO_OutputCDR stream;
-<   stream << _tao_elem;
-<   _tao_any._tao_replace (
-<       TAO_IOP::_tc_EmptyProfileList,
-<       TAO_ENCAP_BYTE_ORDER,
-<       stream.begin ()
-<     );
-< }
-< 
-< void operator<<= (CORBA::Any &_tao_any, TAO_IOP::EmptyProfileList *_tao_elem) // non copying
-< {
-<   TAO_OutputCDR stream;
-<   stream << *_tao_elem;
-<   _tao_any._tao_replace (
-<       TAO_IOP::_tc_EmptyProfileList,
-<       TAO_ENCAP_BYTE_ORDER,
-<       stream.begin (),
-<       1,
-<       _tao_elem,
-<       TAO_IOP::EmptyProfileList::_tao_any_destructor
-<     );
-< }
-< 
-< CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::EmptyProfileList *&_tao_elem)
-< {
-<   return _tao_any >>= ACE_const_cast(
-<       const TAO_IOP::EmptyProfileList*&,
-<       _tao_elem
-<     );
-< }
-< 
-< CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::EmptyProfileList *&_tao_elem)
-< {
-<   _tao_elem = 0;
-<   ACE_TRY_NEW_ENV
-<   {
-<     CORBA::TypeCode_var type = _tao_any.type ();
-<     if (!type->equivalent (TAO_IOP::_tc_EmptyProfileList, ACE_TRY_ENV)) // not equal
-<       {
-<         return 0;
-<       }
-<     ACE_TRY_CHECK;
-<     if (_tao_any.any_owns_data ())
-<     {
-<       _tao_elem = (TAO_IOP::EmptyProfileList *)_tao_any.value ();
-<       return 1;
-<     }
-<     else
-<     {
-<       TAO_IOP::EmptyProfileList *tmp;
-<       ACE_NEW_RETURN (tmp, TAO_IOP::EmptyProfileList, 0);
-<       TAO_InputCDR stream (
-<           _tao_any._tao_get_cdr (),
-<           _tao_any._tao_byte_order ()
-<         );
-<       CORBA::String_var interface_repository_id;
-<       if (!(stream >> interface_repository_id.out ()))
-<         return 0;
-<       if (ACE_OS::strcmp (
-<           interface_repository_id.in (),
-<           "IDL:TAO_IOP/EmptyProfileList:1.0"))
-<         return 0;
-<       if (stream >> *tmp)
-<       {
-<         ((CORBA::Any *)&_tao_any)->_tao_replace (
-<             TAO_IOP::_tc_EmptyProfileList,
-<             1,
-<             tmp,
-<             TAO_IOP::EmptyProfileList::_tao_any_destructor
-<           );
-<         _tao_elem = tmp;
-<         return 1;
-<       }
-<       else
-<       {
-<         delete tmp;
-<       }
-<     }
-<   }
-<   ACE_CATCHANY
-<   {
-<   }
-<   ACE_ENDTRY;
-<   return 0;
-< }
-< 
-< void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::NotFound &_tao_elem) // copying
-< {
-<   TAO_OutputCDR stream;
-<   stream << _tao_elem;
-<   _tao_any._tao_replace (
-<       TAO_IOP::_tc_NotFound,
-<       TAO_ENCAP_BYTE_ORDER,
-<       stream.begin ()
-<     );
-< }
-< 
-< void operator<<= (CORBA::Any &_tao_any, TAO_IOP::NotFound *_tao_elem) // non copying
-< {
-<   TAO_OutputCDR stream;
-<   stream << *_tao_elem;
-<   _tao_any._tao_replace (
-<       TAO_IOP::_tc_NotFound,
-<       TAO_ENCAP_BYTE_ORDER,
-<       stream.begin (),
-<       1,
-<       _tao_elem,
-<       TAO_IOP::NotFound::_tao_any_destructor
-<     );
-< }
-< 
-< CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::NotFound *&_tao_elem)
-< {
-<   return _tao_any >>= ACE_const_cast(
-<       const TAO_IOP::NotFound*&,
-<       _tao_elem
-<     );
-< }
-< 
-< CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::NotFound *&_tao_elem)
-< {
-<   _tao_elem = 0;
-<   ACE_TRY_NEW_ENV
-<   {
-<     CORBA::TypeCode_var type = _tao_any.type ();
-<     if (!type->equivalent (TAO_IOP::_tc_NotFound, ACE_TRY_ENV)) // not equal
-<       {
-<         return 0;
-<       }
-<     ACE_TRY_CHECK;
-<     if (_tao_any.any_owns_data ())
-<     {
-<       _tao_elem = (TAO_IOP::NotFound *)_tao_any.value ();
-<       return 1;
-<     }
-<     else
-<     {
-<       TAO_IOP::NotFound *tmp;
-<       ACE_NEW_RETURN (tmp, TAO_IOP::NotFound, 0);
-<       TAO_InputCDR stream (
-<           _tao_any._tao_get_cdr (),
-<           _tao_any._tao_byte_order ()
-<         );
-<       CORBA::String_var interface_repository_id;
-<       if (!(stream >> interface_repository_id.out ()))
-<         return 0;
-<       if (ACE_OS::strcmp (
-<           interface_repository_id.in (),
-<           "IDL:TAO_IOP/NotFound:1.0"))
-<         return 0;
-<       if (stream >> *tmp)
-<       {
-<         ((CORBA::Any *)&_tao_any)->_tao_replace (
-<             TAO_IOP::_tc_NotFound,
-<             1,
-<             tmp,
-<             TAO_IOP::NotFound::_tao_any_destructor
-<           );
-<         _tao_elem = tmp;
-<         return 1;
-<       }
-<       else
-<       {
-<         delete tmp;
-<       }
-<     }
-<   }
-<   ACE_CATCHANY
-<   {
-<   }
-<   ACE_ENDTRY;
-<   return 0;
-< }
-< 
-< void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::Duplicate &_tao_elem) // copying
-< {
-<   TAO_OutputCDR stream;
-<   stream << _tao_elem;
-<   _tao_any._tao_replace (
-<       TAO_IOP::_tc_Duplicate,
-<       TAO_ENCAP_BYTE_ORDER,
-<       stream.begin ()
-<     );
-< }
-< 
-< void operator<<= (CORBA::Any &_tao_any, TAO_IOP::Duplicate *_tao_elem) // non copying
-< {
-<   TAO_OutputCDR stream;
-<   stream << *_tao_elem;
-<   _tao_any._tao_replace (
-<       TAO_IOP::_tc_Duplicate,
-<       TAO_ENCAP_BYTE_ORDER,
-<       stream.begin (),
-<       1,
-<       _tao_elem,
-<       TAO_IOP::Duplicate::_tao_any_destructor
-<     );
-< }
-< 
-< CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::Duplicate *&_tao_elem)
-< {
-<   return _tao_any >>= ACE_const_cast(
-<       const TAO_IOP::Duplicate*&,
-<       _tao_elem
-<     );
-< }
-< 
-< CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::Duplicate *&_tao_elem)
-< {
-<   _tao_elem = 0;
-<   ACE_TRY_NEW_ENV
-<   {
-<     CORBA::TypeCode_var type = _tao_any.type ();
-<     if (!type->equivalent (TAO_IOP::_tc_Duplicate, ACE_TRY_ENV)) // not equal
-<       {
-<         return 0;
-<       }
-<     ACE_TRY_CHECK;
-<     if (_tao_any.any_owns_data ())
-<     {
-<       _tao_elem = (TAO_IOP::Duplicate *)_tao_any.value ();
-<       return 1;
-<     }
-<     else
-<     {
-<       TAO_IOP::Duplicate *tmp;
-<       ACE_NEW_RETURN (tmp, TAO_IOP::Duplicate, 0);
-<       TAO_InputCDR stream (
-<           _tao_any._tao_get_cdr (),
-<           _tao_any._tao_byte_order ()
-<         );
-<       CORBA::String_var interface_repository_id;
-<       if (!(stream >> interface_repository_id.out ()))
-<         return 0;
-<       if (ACE_OS::strcmp (
-<           interface_repository_id.in (),
-<           "IDL:TAO_IOP/Duplicate:1.0"))
-<         return 0;
-<       if (stream >> *tmp)
-<       {
-<         ((CORBA::Any *)&_tao_any)->_tao_replace (
-<             TAO_IOP::_tc_Duplicate,
-<             1,
-<             tmp,
-<             TAO_IOP::Duplicate::_tao_any_destructor
-<           );
-<         _tao_elem = tmp;
-<         return 1;
-<       }
-<       else
-<       {
-<         delete tmp;
-<       }
-<     }
-<   }
-<   ACE_CATCHANY
-<   {
-<   }
-<   ACE_ENDTRY;
-<   return 0;
-< }
-< 
-< void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::Invalid_IOR &_tao_elem) // copying
-< {
-<   TAO_OutputCDR stream;
-<   stream << _tao_elem;
-<   _tao_any._tao_replace (
-<       TAO_IOP::_tc_Invalid_IOR,
-<       TAO_ENCAP_BYTE_ORDER,
-<       stream.begin ()
-<     );
-< }
-< 
-< void operator<<= (CORBA::Any &_tao_any, TAO_IOP::Invalid_IOR *_tao_elem) // non copying
-< {
-<   TAO_OutputCDR stream;
-<   stream << *_tao_elem;
-<   _tao_any._tao_replace (
-<       TAO_IOP::_tc_Invalid_IOR,
-<       TAO_ENCAP_BYTE_ORDER,
-<       stream.begin (),
-<       1,
-<       _tao_elem,
-<       TAO_IOP::Invalid_IOR::_tao_any_destructor
-<     );
-< }
-< 
-< CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::Invalid_IOR *&_tao_elem)
-< {
-<   return _tao_any >>= ACE_const_cast(
-<       const TAO_IOP::Invalid_IOR*&,
-<       _tao_elem
-<     );
-< }
-< 
-< CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::Invalid_IOR *&_tao_elem)
-< {
-<   _tao_elem = 0;
-<   ACE_TRY_NEW_ENV
-<   {
-<     CORBA::TypeCode_var type = _tao_any.type ();
-<     if (!type->equivalent (TAO_IOP::_tc_Invalid_IOR, ACE_TRY_ENV)) // not equal
-<       {
-<         return 0;
-<       }
-<     ACE_TRY_CHECK;
-<     if (_tao_any.any_owns_data ())
-<     {
-<       _tao_elem = (TAO_IOP::Invalid_IOR *)_tao_any.value ();
-<       return 1;
-<     }
-<     else
-<     {
-<       TAO_IOP::Invalid_IOR *tmp;
-<       ACE_NEW_RETURN (tmp, TAO_IOP::Invalid_IOR, 0);
-<       TAO_InputCDR stream (
-<           _tao_any._tao_get_cdr (),
-<           _tao_any._tao_byte_order ()
-<         );
-<       CORBA::String_var interface_repository_id;
-<       if (!(stream >> interface_repository_id.out ()))
-<         return 0;
-<       if (ACE_OS::strcmp (
-<           interface_repository_id.in (),
-<           "IDL:TAO_IOP/Invalid_IOR:1.0"))
-<         return 0;
-<       if (stream >> *tmp)
-<       {
-<         ((CORBA::Any *)&_tao_any)->_tao_replace (
-<             TAO_IOP::_tc_Invalid_IOR,
-<             1,
-<             tmp,
-<             TAO_IOP::Invalid_IOR::_tao_any_destructor
-<           );
-<         _tao_elem = tmp;
-<         return 1;
-<       }
-<       else
-<       {
-<         delete tmp;
-<       }
-<     }
-<   }
-<   ACE_CATCHANY
-<   {
-<   }
-<   ACE_ENDTRY;
-<   return 0;
-< }
-< 
-< void operator<<= (CORBA::Any &_tao_any, const TAO_IOP::MultiProfileList &_tao_elem) // copying
-< {
-<   TAO_OutputCDR stream;
-<   stream << _tao_elem;
-<   _tao_any._tao_replace (
-<       TAO_IOP::_tc_MultiProfileList,
-<       TAO_ENCAP_BYTE_ORDER,
-<       stream.begin ()
-<     );
-< }
-< 
-< void operator<<= (CORBA::Any &_tao_any, TAO_IOP::MultiProfileList *_tao_elem) // non copying
-< {
-<   TAO_OutputCDR stream;
-<   stream << *_tao_elem;
-<   _tao_any._tao_replace (
-<       TAO_IOP::_tc_MultiProfileList,
-<       TAO_ENCAP_BYTE_ORDER,
-<       stream.begin (),
-<       1,
-<       _tao_elem,
-<       TAO_IOP::MultiProfileList::_tao_any_destructor
-<     );
-< }
-< 
-< CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::MultiProfileList *&_tao_elem)
-< {
-<   return _tao_any >>= ACE_const_cast(
-<       const TAO_IOP::MultiProfileList*&,
-<       _tao_elem
-<     );
-< }
-< 
-< CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const TAO_IOP::MultiProfileList *&_tao_elem)
-< {
-<   _tao_elem = 0;
-<   ACE_TRY_NEW_ENV
-<   {
-<     CORBA::TypeCode_var type = _tao_any.type ();
-<     if (!type->equivalent (TAO_IOP::_tc_MultiProfileList, ACE_TRY_ENV)) // not equal
-<       {
-<         return 0;
-<       }
-<     ACE_TRY_CHECK;
-<     if (_tao_any.any_owns_data ())
-<     {
-<       _tao_elem = (TAO_IOP::MultiProfileList *)_tao_any.value ();
-<       return 1;
-<     }
-<     else
-<     {
-<       TAO_IOP::MultiProfileList *tmp;
-<       ACE_NEW_RETURN (tmp, TAO_IOP::MultiProfileList, 0);
-<       TAO_InputCDR stream (
-<           _tao_any._tao_get_cdr (),
-<           _tao_any._tao_byte_order ()
-<         );
-<       CORBA::String_var interface_repository_id;
-<       if (!(stream >> interface_repository_id.out ()))
-<         return 0;
-<       if (ACE_OS::strcmp (
-<           interface_repository_id.in (),
-<           "IDL:TAO_IOP/MultiProfileList:1.0"))
-<         return 0;
-<       if (stream >> *tmp)
-<       {
-<         ((CORBA::Any *)&_tao_any)->_tao_replace (
-<             TAO_IOP::_tc_MultiProfileList,
-<             1,
-<             tmp,
-<             TAO_IOP::MultiProfileList::_tao_any_destructor
-<           );
-<         _tao_elem = tmp;
-<         return 1;
-<       }
-<       else
-<       {
-<         delete tmp;
-<       }
-<     }
-<   }
-<   ACE_CATCHANY
-<   {
-<   }
-<   ACE_ENDTRY;
-<   return 0;
-< }
-< 
-1216,1222d475
-<     template class TAO_Object_Manager<TAO_IOP::TAO_IOR_Property,TAO_IOP::TAO_IOR_Property_var>;
-<   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-<   #  pragma instantiate TAO_Object_Manager<TAO_IOP::TAO_IOR_Property,TAO_IOP::TAO_IOR_Property_var>
-< #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-< 
-< #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-<     defined (ACE_HAS_GNU_REPO)
-1226a480
-> 
+--- orig/IORC.cpp	Wed Apr 18 22:57:41 2001
++++ IORC.cpp	Wed Apr 18 22:51:07 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,14 +19,10 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#include "IORC.h"
+-
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+-#include "tao/ClientRequestInfo.h"
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
++#include "IORManip_Loader.h"
++#include "tao/Typecode.h"
++#include "tao/Any.h"
++#include "tao/ORB.h"
+ 
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus
diff --git a/TAO/tao/IORManipulation/diffs/IORC.h.diff b/TAO/tao/IORManipulation/diffs/IORC.h.diff
index 3f4845df567..3e9c82fafc9 100644
--- a/TAO/tao/IORManipulation/diffs/IORC.h.diff
+++ b/TAO/tao/IORManipulation/diffs/IORC.h.diff
@@ -1,1044 +1,35 @@
-1c1
-< /* -*- C++ -*- $Id$ */
----
-> /* -*- C++ -*- $Id$ */
-13d12
-< #include "ace/pre.h"
-14a14,17
-> #include "tao/Object.h"
-> #include "tao/Exception.h"
-> #include "tao/Environment.h"
-> #include "tao/Sequence.h"
-15a19,21
-> #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-> #include "ace/streams.h"
-> #endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
-21,26d26
-< #include "ior_manip_export.h"
-< #include "tao/Exception.h"
-< #include "tao/Object.h"
-< #include "tao/Environment.h"
-< #include "tao/Sequence.h"
-< #include "tao/CDR.h"
-31c31
-< #define TAO_EXPORT_MACRO TAO_IORManip_Export
----
-> #define TAO_EXPORT_MACRO TAO_Export
-37c37
-< #  define TAO_EXPORT_NESTED_MACRO TAO_IORManip_Export
----
-> #  define TAO_EXPORT_NESTED_MACRO TAO_Export
-50,51c50,51
-< #if !defined (_TAO_IOP_EMPTYPROFILELIST_CH_)
-< #define _TAO_IOP_EMPTYPROFILELIST_CH_
----
-> #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___PTR_CH_)
-> #define _TAO_IOP_TAO_IOR_MANIPULATION___PTR_CH_
-53,55c53,54
-<   class TAO_IORManip_Export EmptyProfileList : public CORBA::UserException
-<   {
-<   public:
----
->   class TAO_IOR_Manipulation;
->   typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
-57,83d55
-<     EmptyProfileList (void); // default ctor
-<     EmptyProfileList (const EmptyProfileList &); // copy ctor
-<     ~EmptyProfileList (void);
-<     static void _tao_any_destructor (void*);
-<     EmptyProfileList &operator= (const EmptyProfileList &);
-< 
-< 
-<     virtual void _raise (void);
-< 
-<     virtual void _tao_encode (
-<         TAO_OutputCDR &,
-<         CORBA::Environment &) const;
-<     virtual void _tao_decode (
-<         TAO_InputCDR &,
-<         CORBA::Environment &);
-< 
-<     static EmptyProfileList *_downcast (CORBA::Exception *);
-< 
-< 
-<     // = TAO extension
-<     static CORBA::Exception *_alloc (void);
-<     virtual CORBA::TypeCode_ptr _type (void) const;
-<   }; // exception TAO_IOP::EmptyProfileList
-< 
-<     TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EmptyProfileList;
-< 
-< 
-87,88c59,60
-< #if !defined (_TAO_IOP_NOTFOUND_CH_)
-< #define _TAO_IOP_NOTFOUND_CH_
----
-> #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_)
-> #define _TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_
-90c62
-<   class TAO_IORManip_Export NotFound : public CORBA::UserException
----
->   class TAO_Export TAO_IOR_Manipulation_var : public TAO_Base_var
-92a65,68
->     TAO_IOR_Manipulation_var (void); // default constructor
->     TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr p) : ptr_ (p) {}
->     TAO_IOR_Manipulation_var (const TAO_IOR_Manipulation_var &); // copy constructor
->     ~TAO_IOR_Manipulation_var (void); // destructor
-94,98c70,72
-<     NotFound (void); // default ctor
-<     NotFound (const NotFound &); // copy ctor
-<     ~NotFound (void);
-<     static void _tao_any_destructor (void*);
-<     NotFound &operator= (const NotFound &);
----
->     TAO_IOR_Manipulation_var &operator= (TAO_IOR_Manipulation_ptr);
->     TAO_IOR_Manipulation_var &operator= (const TAO_IOR_Manipulation_var &);
->     TAO_IOR_Manipulation_ptr operator-> (void) const;
-99a74,81
->     operator const TAO_IOR_Manipulation_ptr &() const;
->     operator TAO_IOR_Manipulation_ptr &();
->     // in, inout, out, _retn
->     TAO_IOR_Manipulation_ptr in (void) const;
->     TAO_IOR_Manipulation_ptr &inout (void);
->     TAO_IOR_Manipulation_ptr &out (void);
->     TAO_IOR_Manipulation_ptr _retn (void);
->     TAO_IOR_Manipulation_ptr ptr (void) const;
-101c83,88
-<     virtual void _raise (void);
----
->   private:
->     TAO_IOR_Manipulation_ptr ptr_;
->     // Unimplemented - prevents widening assignment.
->     TAO_IOR_Manipulation_var (const TAO_Base_var &rhs);
->     TAO_IOR_Manipulation_var &operator= (const TAO_Base_var &rhs);
->   };
-103,108d89
-<     virtual void _tao_encode (
-<         TAO_OutputCDR &,
-<         CORBA::Environment &) const;
-<     virtual void _tao_decode (
-<         TAO_InputCDR &,
-<         CORBA::Environment &);
-110,120d90
-<     static NotFound *_downcast (CORBA::Exception *);
-< 
-< 
-<     // = TAO extension
-<     static CORBA::Exception *_alloc (void);
-<     virtual CORBA::TypeCode_ptr _type (void) const;
-<   }; // exception TAO_IOP::NotFound
-< 
-<     TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NotFound;
-< 
-< 
-124,125c94,95
-< #if !defined (_TAO_IOP_DUPLICATE_CH_)
-< #define _TAO_IOP_DUPLICATE_CH_
----
-> #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___OUT_CH_)
-> #define _TAO_IOP_TAO_IOR_MANIPULATION___OUT_CH_
-127c97
-<   class TAO_IORManip_Export Duplicate : public CORBA::UserException
----
->   class TAO_Export TAO_IOR_Manipulation_out
-129a100,108
->     TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_ptr &);
->     TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_var &);
->     TAO_IOR_Manipulation_out (const TAO_IOR_Manipulation_out &);
->     TAO_IOR_Manipulation_out &operator= (const TAO_IOR_Manipulation_out &);
->     TAO_IOR_Manipulation_out &operator= (const TAO_IOR_Manipulation_var &);
->     TAO_IOR_Manipulation_out &operator= (TAO_IOR_Manipulation_ptr);
->     operator TAO_IOR_Manipulation_ptr &();
->     TAO_IOR_Manipulation_ptr &ptr (void);
->     TAO_IOR_Manipulation_ptr operator-> (void);
-131,135c110,112
-<     Duplicate (void); // default ctor
-<     Duplicate (const Duplicate &); // copy ctor
-<     ~Duplicate (void);
-<     static void _tao_any_destructor (void*);
-<     Duplicate &operator= (const Duplicate &);
----
->   private:
->     TAO_IOR_Manipulation_ptr &ptr_;
->   };
-138,157d114
-<     virtual void _raise (void);
-< 
-<     virtual void _tao_encode (
-<         TAO_OutputCDR &,
-<         CORBA::Environment &) const;
-<     virtual void _tao_decode (
-<         TAO_InputCDR &,
-<         CORBA::Environment &);
-< 
-<     static Duplicate *_downcast (CORBA::Exception *);
-< 
-< 
-<     // = TAO extension
-<     static CORBA::Exception *_alloc (void);
-<     virtual CORBA::TypeCode_ptr _type (void) const;
-<   }; // exception TAO_IOP::Duplicate
-< 
-<     TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Duplicate;
-< 
-< 
-161,162c118,119
-< #if !defined (_TAO_IOP_INVALID_IOR_CH_)
-< #define _TAO_IOP_INVALID_IOR_CH_
----
-> #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_CH_)
-> #define _TAO_IOP_TAO_IOR_MANIPULATION_CH_
-164c121
-<   class TAO_IORManip_Export Invalid_IOR : public CORBA::UserException
----
-> class TAO_Export TAO_IOR_Manipulation : public virtual CORBA_Object
-166a124,127
->   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
->     typedef TAO_IOR_Manipulation_ptr _ptr_type;
->     typedef TAO_IOR_Manipulation_var _var_type;
->   #endif /* ! __GNUC__ || g++ >= 2.8 */
-168,172c129,144
-<     Invalid_IOR (void); // default ctor
-<     Invalid_IOR (const Invalid_IOR &); // copy ctor
-<     ~Invalid_IOR (void);
-<     static void _tao_any_destructor (void*);
-<     Invalid_IOR &operator= (const Invalid_IOR &);
----
->     // the static operations
->     static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
->     static TAO_IOR_Manipulation_ptr _narrow (
->         CORBA::Object_ptr obj,
->         CORBA::Environment &ACE_TRY_ENV =
->           TAO_default_environment ()
->       );
->     static TAO_IOR_Manipulation_ptr _unchecked_narrow (
->         CORBA::Object_ptr obj,
->         CORBA::Environment &ACE_TRY_ENV =
->           TAO_default_environment ()
->       );
->     static TAO_IOR_Manipulation_ptr _nil (void)
->       {
->         return (TAO_IOR_Manipulation_ptr)0;
->       }
-175c147,148
-<     virtual void _raise (void);
----
-> #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_EMPTYPROFILELIST_CH_)
-> #define _TAO_IOP_TAO_IOR_MANIPULATION_EMPTYPROFILELIST_CH_
-177,182c150,152
-<     virtual void _tao_encode (
-<         TAO_OutputCDR &,
-<         CORBA::Environment &) const;
-<     virtual void _tao_decode (
-<         TAO_InputCDR &,
-<         CORBA::Environment &);
----
->     class TAO_Export EmptyProfileList : public CORBA::UserException
->     {
->     public:
-184d153
-<     static Invalid_IOR *_downcast (CORBA::Exception *);
-185a155,158
->     EmptyProfileList (void); // default ctor
->     EmptyProfileList (const EmptyProfileList &); // copy ctor
->     ~EmptyProfileList (void);
->     EmptyProfileList &operator= (const EmptyProfileList &);
-187,190d159
-<     // = TAO extension
-<     static CORBA::Exception *_alloc (void);
-<     virtual CORBA::TypeCode_ptr _type (void) const;
-<   }; // exception TAO_IOP::Invalid_IOR
-192,211d160
-<     TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Invalid_IOR;
-< 
-< 
-< #endif /* end #if !defined */
-< 
-< 
-< #if !defined (_TAO_IOP_MULTIPROFILELIST_CH_)
-< #define _TAO_IOP_MULTIPROFILELIST_CH_
-< 
-<   class TAO_IORManip_Export MultiProfileList : public CORBA::UserException
-<   {
-<   public:
-< 
-<     MultiProfileList (void); // default ctor
-<     MultiProfileList (const MultiProfileList &); // copy ctor
-<     ~MultiProfileList (void);
-<     static void _tao_any_destructor (void*);
-<     MultiProfileList &operator= (const MultiProfileList &);
-< 
-< 
-221c170
-<     static MultiProfileList *_downcast (CORBA::Exception *);
----
->     static EmptyProfileList *_downcast (CORBA::Exception *);
-226,227d174
-<     virtual CORBA::TypeCode_ptr _type (void) const;
-<   }; // exception TAO_IOP::MultiProfileList
-229c176
-<     TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_MultiProfileList;
----
->   }; // exception TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-235,236c182,183
-< #if !defined (_TAO_IOP_TAO_IOR_PROPERTY___PTR_CH_)
-< #define _TAO_IOP_TAO_IOR_PROPERTY___PTR_CH_
----
-> #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_NOTFOUND_CH_)
-> #define _TAO_IOP_TAO_IOR_MANIPULATION_NOTFOUND_CH_
-238,247c185
-<   class TAO_IOR_Property;
-<   typedef TAO_IOR_Property *TAO_IOR_Property_ptr;
-< 
-< #endif /* end #if !defined */
-< 
-< 
-< #if !defined (_TAO_IOP_TAO_IOR_PROPERTY___VAR_CH_)
-< #define _TAO_IOP_TAO_IOR_PROPERTY___VAR_CH_
-< 
-<   class TAO_IORManip_Export TAO_IOR_Property_var : public TAO_Base_var
----
->   class TAO_Export NotFound : public CORBA::UserException
-250,253d187
-<     TAO_IOR_Property_var (void); // default constructor
-<     TAO_IOR_Property_var (TAO_IOR_Property_ptr p) : ptr_ (p) {}
-<     TAO_IOR_Property_var (const TAO_IOR_Property_var &); // copy constructor
-<     ~TAO_IOR_Property_var (void); // destructor
-255,257d188
-<     TAO_IOR_Property_var &operator= (TAO_IOR_Property_ptr);
-<     TAO_IOR_Property_var &operator= (const TAO_IOR_Property_var &);
-<     TAO_IOR_Property_ptr operator-> (void) const;
-259,266c190,193
-<     operator const TAO_IOR_Property_ptr &() const;
-<     operator TAO_IOR_Property_ptr &();
-<     // in, inout, out, _retn
-<     TAO_IOR_Property_ptr in (void) const;
-<     TAO_IOR_Property_ptr &inout (void);
-<     TAO_IOR_Property_ptr &out (void);
-<     TAO_IOR_Property_ptr _retn (void);
-<     TAO_IOR_Property_ptr ptr (void) const;
----
->   NotFound (void); // default ctor
->   NotFound (const NotFound &); // copy ctor
->   ~NotFound (void);
->   NotFound &operator= (const NotFound &);
-268,273d194
-<   private:
-<     TAO_IOR_Property_ptr ptr_;
-<     // Unimplemented - prevents widening assignment.
-<     TAO_IOR_Property_var (const TAO_Base_var &rhs);
-<     TAO_IOR_Property_var &operator= (const TAO_Base_var &rhs);
-<   };
-274a196
->   virtual void _raise (void);
-276c198,203
-< #endif /* end #if !defined */
----
->   virtual void _tao_encode (
->       TAO_OutputCDR &,
->       CORBA::Environment &) const;
->   virtual void _tao_decode (
->       TAO_InputCDR &,
->       CORBA::Environment &);
-277a205
->   static NotFound *_downcast (CORBA::Exception *);
-279,280d206
-< #if !defined (_TAO_IOP_TAO_IOR_PROPERTY___OUT_CH_)
-< #define _TAO_IOP_TAO_IOR_PROPERTY___OUT_CH_
-282,293c208,209
-<   class TAO_IORManip_Export TAO_IOR_Property_out
-<   {
-<   public:
-<     TAO_IOR_Property_out (TAO_IOR_Property_ptr &);
-<     TAO_IOR_Property_out (TAO_IOR_Property_var &);
-<     TAO_IOR_Property_out (const TAO_IOR_Property_out &);
-<     TAO_IOR_Property_out &operator= (const TAO_IOR_Property_out &);
-<     TAO_IOR_Property_out &operator= (const TAO_IOR_Property_var &);
-<     TAO_IOR_Property_out &operator= (TAO_IOR_Property_ptr);
-<     operator TAO_IOR_Property_ptr &();
-<     TAO_IOR_Property_ptr &ptr (void);
-<     TAO_IOR_Property_ptr operator-> (void);
----
->   // = TAO extension
->   static CORBA::Exception *_alloc (void);
-295,297c211
-<   private:
-<     TAO_IOR_Property_ptr &ptr_;
-<   };
----
-> }; // exception TAO_IOP::TAO_IOR_Manipulation::NotFound
-303,304c217,218
-< #if !defined (_TAO_IOP_TAO_IOR_PROPERTY_CH_)
-< #define _TAO_IOP_TAO_IOR_PROPERTY_CH_
----
-> #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_DUPLICATE_CH_)
-> #define _TAO_IOP_TAO_IOR_MANIPULATION_DUPLICATE_CH_
-306,312c220,222
-< class TAO_IORManip_Export TAO_IOR_Property : public virtual CORBA_Object
-<   {
-<   public:
-<   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-<     typedef TAO_IOR_Property_ptr _ptr_type;
-<     typedef TAO_IOR_Property_var _var_type;
-<   #endif /* ! __GNUC__ || g++ >= 2.8 */
----
-> class TAO_Export Duplicate : public CORBA::UserException
-> {
-> public:
-314,329d223
-<     // the static operations
-<     static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj);
-<     static TAO_IOR_Property_ptr _narrow (
-<         CORBA::Object_ptr obj,
-<         CORBA::Environment &ACE_TRY_ENV =
-<           TAO_default_environment ()
-<       );
-<     static TAO_IOR_Property_ptr _unchecked_narrow (
-<         CORBA::Object_ptr obj,
-<         CORBA::Environment &ACE_TRY_ENV =
-<           TAO_default_environment ()
-<       );
-<     static TAO_IOR_Property_ptr _nil (void)
-<       {
-<         return (TAO_IOR_Property_ptr)0;
-<       }
-331,339c225,228
-<     virtual CORBA::Boolean set_property (
-<         CORBA::Object_ptr ior,
-<         CORBA::Environment &ACE_TRY_ENV =
-<           TAO_default_environment ()
-<       )
-<       ACE_THROW_SPEC ((
-<         CORBA::SystemException,
-<         TAO_IOP::Invalid_IOR
-<       )) = 0;
----
-> Duplicate (void); // default ctor
-> Duplicate (const Duplicate &); // copy ctor
-> ~Duplicate (void);
-> Duplicate &operator= (const Duplicate &);
-341,350d229
-<     virtual CORBA::Boolean set_primary (
-<         CORBA::Object_ptr ior1,
-<         CORBA::Object_ptr ior2,
-<         CORBA::Environment &ACE_TRY_ENV =
-<           TAO_default_environment ()
-<       )
-<       ACE_THROW_SPEC ((
-<         CORBA::SystemException,
-<         TAO_IOP::Duplicate
-<       )) = 0;
-352,360c231
-<     virtual CORBA::Object_ptr get_primary (
-<         CORBA::Object_ptr ior,
-<         CORBA::Environment &ACE_TRY_ENV =
-<           TAO_default_environment ()
-<       )
-<       ACE_THROW_SPEC ((
-<         CORBA::SystemException,
-<         TAO_IOP::NotFound
-<       )) = 0;
----
-> virtual void _raise (void);
-362,369c233,238
-<     virtual CORBA::Boolean is_primary_set (
-<         CORBA::Object_ptr ior,
-<         CORBA::Environment &ACE_TRY_ENV =
-<           TAO_default_environment ()
-<       )
-<       ACE_THROW_SPEC ((
-<         CORBA::SystemException
-<       )) = 0;
----
-> virtual void _tao_encode (
->     TAO_OutputCDR &,
->     CORBA::Environment &) const;
-> virtual void _tao_decode (
->     TAO_InputCDR &,
->     CORBA::Environment &);
-371c240
-<     virtual void *_tao_QueryInterface (ptr_arith_t type);
----
-> static Duplicate *_downcast (CORBA::Exception *);
-373d241
-<     virtual const char* _interface_repository_id (void) const;
-375,381c243,244
-<   protected:
-<     TAO_IOR_Property (void);
-<     virtual ~TAO_IOR_Property (void);
-<   private:
-<     TAO_IOR_Property (const TAO_IOR_Property &);
-<     void operator= (const TAO_IOR_Property &);
-< };
----
-> // = TAO extension
-> static CORBA::Exception *_alloc (void);
-382a246
-> }; // exception TAO_IOP::TAO_IOR_Manipulation::Duplicate
-384d247
-< #endif /* end #if !defined */
-386,392d248
-< 
-< #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___PTR_CH_)
-< #define _TAO_IOP_TAO_IOR_MANIPULATION___PTR_CH_
-< 
-< class TAO_IOR_Manipulation;
-< typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
-< 
-396,397c252,253
-< #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_)
-< #define _TAO_IOP_TAO_IOR_MANIPULATION___VAR_CH_
----
-> #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_INVALID_IOR_CH_)
-> #define _TAO_IOP_TAO_IOR_MANIPULATION_INVALID_IOR_CH_
-399c255
-< class TAO_IORManip_Export TAO_IOR_Manipulation_var : public TAO_Base_var
----
-> class TAO_Export Invalid_IOR : public CORBA::UserException
-402,405d257
-<   TAO_IOR_Manipulation_var (void); // default constructor
-<   TAO_IOR_Manipulation_var (TAO_IOR_Manipulation_ptr p) : ptr_ (p) {}
-<   TAO_IOR_Manipulation_var (const TAO_IOR_Manipulation_var &); // copy constructor
-<   ~TAO_IOR_Manipulation_var (void); // destructor
-407,409d258
-<   TAO_IOR_Manipulation_var &operator= (TAO_IOR_Manipulation_ptr);
-<   TAO_IOR_Manipulation_var &operator= (const TAO_IOR_Manipulation_var &);
-<   TAO_IOR_Manipulation_ptr operator-> (void) const;
-411,418c260,263
-<   operator const TAO_IOR_Manipulation_ptr &() const;
-<   operator TAO_IOR_Manipulation_ptr &();
-<   // in, inout, out, _retn
-<   TAO_IOR_Manipulation_ptr in (void) const;
-<   TAO_IOR_Manipulation_ptr &inout (void);
-<   TAO_IOR_Manipulation_ptr &out (void);
-<   TAO_IOR_Manipulation_ptr _retn (void);
-<   TAO_IOR_Manipulation_ptr ptr (void) const;
----
-> Invalid_IOR (void); // default ctor
-> Invalid_IOR (const Invalid_IOR &); // copy ctor
-> ~Invalid_IOR (void);
-> Invalid_IOR &operator= (const Invalid_IOR &);
-420,425d264
-< private:
-<   TAO_IOR_Manipulation_ptr ptr_;
-<   // Unimplemented - prevents widening assignment.
-<   TAO_IOR_Manipulation_var (const TAO_Base_var &rhs);
-<   TAO_IOR_Manipulation_var &operator= (const TAO_Base_var &rhs);
-< };
-426a266
-> virtual void _raise (void);
-428c268,273
-< #endif /* end #if !defined */
----
-> virtual void _tao_encode (
->     TAO_OutputCDR &,
->     CORBA::Environment &) const;
-> virtual void _tao_decode (
->     TAO_InputCDR &,
->     CORBA::Environment &);
-429a275
-> static Invalid_IOR *_downcast (CORBA::Exception *);
-431,432d276
-< #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION___OUT_CH_)
-< #define _TAO_IOP_TAO_IOR_MANIPULATION___OUT_CH_
-434,445c278,279
-< class TAO_IORManip_Export TAO_IOR_Manipulation_out
-< {
-< public:
-<   TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_ptr &);
-<   TAO_IOR_Manipulation_out (TAO_IOR_Manipulation_var &);
-<   TAO_IOR_Manipulation_out (const TAO_IOR_Manipulation_out &);
-<   TAO_IOR_Manipulation_out &operator= (const TAO_IOR_Manipulation_out &);
-<   TAO_IOR_Manipulation_out &operator= (const TAO_IOR_Manipulation_var &);
-<   TAO_IOR_Manipulation_out &operator= (TAO_IOR_Manipulation_ptr);
-<   operator TAO_IOR_Manipulation_ptr &();
-<   TAO_IOR_Manipulation_ptr &ptr (void);
-<   TAO_IOR_Manipulation_ptr operator-> (void);
----
-> // = TAO extension
-> static CORBA::Exception *_alloc (void);
-447,449c281
-< private:
-<   TAO_IOR_Manipulation_ptr &ptr_;
-< };
----
-> }; // exception TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-455,483d286
-< #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_CH_)
-< #define _TAO_IOP_TAO_IOR_MANIPULATION_CH_
-< 
-< class TAO_IORManip_Export TAO_IOR_Manipulation : public virtual CORBA_Object
-< {
-< public:
-< #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-<   typedef TAO_IOR_Manipulation_ptr _ptr_type;
-<   typedef TAO_IOR_Manipulation_var _var_type;
-< #endif /* ! __GNUC__ || g++ >= 2.8 */
-< 
-<   // the static operations
-<   static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
-<   static TAO_IOR_Manipulation_ptr _narrow (
-<       CORBA::Object_ptr obj,
-<       CORBA::Environment &ACE_TRY_ENV =
-<         TAO_default_environment ()
-<     );
-<   static TAO_IOR_Manipulation_ptr _unchecked_narrow (
-<       CORBA::Object_ptr obj,
-<       CORBA::Environment &ACE_TRY_ENV =
-<         TAO_default_environment ()
-<     );
-<   static TAO_IOR_Manipulation_ptr _nil (void)
-<     {
-<       return (TAO_IOR_Manipulation_ptr)0;
-<     }
-< 
-< 
-489,492c292,295
-<     class _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList : public TAO_Unbounded_Base_Sequence
-<     {
-<     public:
-<       // = Initialization and termination methods.
----
->   class _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList : public TAO_Unbounded_Base_Sequence
->   {
->   public:
->     // = Initialization and termination methods.
-494,518c297,321
-<       _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
-<       _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum);
-<       _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum,
-<         CORBA::ULong length,
-<         CORBA::Object* *value,
-<         CORBA::Boolean release = 0);
-<       _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList(const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs);
-<       virtual ~_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
-<       _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &operator= (const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs);
-<       TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index) const;
-<       static CORBA::Object **allocbuf (CORBA::ULong nelems);
-<       static void freebuf (CORBA::Object **buffer);
-<       // The Base_Sequence functions, please see tao/Sequence.h
-<       virtual void _allocate_buffer (CORBA::ULong length);
-<       virtual void _deallocate_buffer (void);
-<       CORBA::Object* *get_buffer (CORBA::Boolean orphan = 0);
-<       const CORBA::Object* *get_buffer (void) const;
-<       virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
-<       virtual void _downcast (
-<           void* target,
-<           CORBA_Object *src,
-<           CORBA_Environment &ACE_TRY_ENV =
-<             TAO_default_environment ()
-<         );
-<       virtual CORBA_Object* _upcast (void *src) const;
----
->     _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
->     _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum);
->     _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (CORBA::ULong maximum,
->       CORBA::ULong length,
->       CORBA::Object* *value,
->       CORBA::Boolean release = 0);
->     _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList(const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs);
->     virtual ~_TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList (void);
->     _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &operator= (const _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList &rhs);
->     TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index) const;
->     static CORBA::Object **allocbuf (CORBA::ULong nelems);
->     static void freebuf (CORBA::Object **buffer);
->     // The Base_Sequence functions, please see tao/Sequence.h
->     virtual void _allocate_buffer (CORBA::ULong length);
->     virtual void _deallocate_buffer (void);
->     CORBA::Object* *get_buffer (CORBA::Boolean orphan = 0);
->     const CORBA::Object* *get_buffer (void) const;
->     virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
->     virtual void _downcast (
->         void* target,
->         CORBA_Object *src,
->         CORBA_Environment &ACE_TRY_ENV =
->           TAO_default_environment ()
->       );
->     virtual CORBA_Object* _upcast (void *src) const;
-520c323
-<     };
----
->   };
-530,531c333,334
-<   class IORList;
-<   class IORList_var;
----
-> class IORList;
-> class IORList_var;
-533,535c336,338
-<   // *************************************************************
-<   // IORList
-<   // *************************************************************
----
-> // *************************************************************
-> // IORList
-> // *************************************************************
-537c340
-<   class TAO_IORManip_Export IORList : public
----
-> class TAO_Export IORList : public
-539c342
-<     _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
----
->   _TAO_Unbounded_Object_Sequence_TAO_IOP_TAO_IOR_Manipulation_IORList
-541c344
-<     TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
----
->   TAO_Unbounded_Object_Sequence<CORBA::Object,CORBA::Object_var>
-543,555c346,358
-<   {
-<   public:
-<     IORList (void); // default ctor
-<     IORList (CORBA::ULong max); // uses max size
-<     IORList (
-<       CORBA::ULong max,
-<       CORBA::ULong length,
-<       CORBA::Object_ptr *buffer,
-<       CORBA::Boolean release=0
-<     );
-<     IORList (const IORList &); // copy ctor
-<     ~IORList (void);
-<     static void _tao_any_destructor (void*);
----
-> {
-> public:
->   IORList (void); // default ctor
->   IORList (CORBA::ULong max); // uses max size
->   IORList (
->     CORBA::ULong max,
->     CORBA::ULong length,
->     CORBA::Object_ptr *buffer,
->     CORBA::Boolean release=0
->   );
->   IORList (const IORList &); // copy ctor
->   ~IORList (void);
->   static void _tao_any_destructor (void*);
-558c361
-<     typedef IORList_var _var_type;
----
->   typedef IORList_var _var_type;
-561c364
-<   };
----
-> };
-569,571c372,374
-<   // *************************************************************
-<   // class TAO_IOP::TAO_IOR_Manipulation::IORList_var
-<   // *************************************************************
----
-> // *************************************************************
-> // class TAO_IOP::TAO_IOR_Manipulation::IORList_var
-> // *************************************************************
-573,579c376,382
-<   class TAO_IORManip_Export IORList_var
-<   {
-<   public:
-<     IORList_var (void); // default constructor
-<     IORList_var (IORList *);
-<     IORList_var (const IORList_var &); // copy constructor
-<     ~IORList_var (void); // destructor
----
-> class TAO_Export IORList_var
-> {
-> public:
->   IORList_var (void); // default constructor
->   IORList_var (IORList *);
->   IORList_var (const IORList_var &); // copy constructor
->   ~IORList_var (void); // destructor
-581,584c384,387
-<     IORList_var &operator= (IORList *);
-<     IORList_var &operator= (const IORList_var &);
-<     IORList *operator-> (void);
-<     const IORList *operator-> (void) const;
----
->   IORList_var &operator= (IORList *);
->   IORList_var &operator= (const IORList_var &);
->   IORList *operator-> (void);
->   const IORList *operator-> (void) const;
-586,589c389,392
-<     operator const IORList &() const;
-<     operator IORList &();
-<     operator IORList &() const;
-<     operator IORList *&(); // variable-size base types only
----
->   operator const IORList &() const;
->   operator IORList &();
->   operator IORList &() const;
->   operator IORList *&(); // variable-size base types only
-591,597c394,400
-<     TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-<     // in, inout, out, _retn
-<     const IORList &in (void) const;
-<     IORList &inout (void);
-<     IORList *&out (void);
-<     IORList *_retn (void);
-<     IORList *ptr (void) const;
----
->   TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
->   // in, inout, out, _retn
->   const IORList &in (void) const;
->   IORList &inout (void);
->   IORList *&out (void);
->   IORList *_retn (void);
->   IORList *ptr (void) const;
-599,601c402,404
-<   private:
-<     IORList *ptr_;
-<   };
----
-> private:
->   IORList *ptr_;
-> };
-610,621c413,424
-<   class TAO_IORManip_Export IORList_out
-<   {
-<   public:
-<     IORList_out (IORList *&);
-<     IORList_out (IORList_var &);
-<     IORList_out (const IORList_out &);
-<     IORList_out &operator= (const IORList_out &);
-<     IORList_out &operator= (IORList *);
-<     operator IORList *&();
-<     IORList *&ptr (void);
-<     IORList *operator-> (void);
-<     TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
----
-> class TAO_Export IORList_out
-> {
-> public:
->   IORList_out (IORList *&);
->   IORList_out (IORList_var &);
->   IORList_out (const IORList_out &);
->   IORList_out &operator= (const IORList_out &);
->   IORList_out &operator= (IORList *);
->   operator IORList *&();
->   IORList *&ptr (void);
->   IORList *operator-> (void);
->   TAO_Object_Manager<CORBA::Object,CORBA::Object_var> operator[] (CORBA::ULong index);
-623,627c426,430
-<   private:
-<     IORList *&ptr_;
-<     // assignment from T_var not allowed
-<     void operator= (const IORList_var &);
-<   };
----
-> private:
->   IORList *&ptr_;
->   // assignment from T_var not allowed
->   void operator= (const IORList_var &);
-> };
-632,642c435,445
-<   virtual CORBA::Object_ptr merge_iors (
-<       const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
-<       CORBA::Environment &ACE_TRY_ENV =
-<         TAO_default_environment ()
-<     )
-<     ACE_THROW_SPEC ((
-<       CORBA::SystemException,
-<       TAO_IOP::EmptyProfileList,
-<       TAO_IOP::Duplicate,
-<       TAO_IOP::Invalid_IOR
-<     )) = 0;
----
-> virtual CORBA::Object_ptr merge_iors (
->     const TAO_IOP::TAO_IOR_Manipulation::IORList & iors,
->     CORBA::Environment &ACE_TRY_ENV =
->       TAO_default_environment ()
->   )
->   ACE_THROW_SPEC ((
->     CORBA::SystemException,
->     TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
->     TAO_IOP::TAO_IOR_Manipulation::Duplicate,
->     TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
->   )) = 0;
-644,655c447,458
-<   virtual CORBA::Object_ptr add_profiles (
-<       CORBA::Object_ptr ior1,
-<       CORBA::Object_ptr ior2,
-<       CORBA::Environment &ACE_TRY_ENV =
-<         TAO_default_environment ()
-<     )
-<     ACE_THROW_SPEC ((
-<       CORBA::SystemException,
-<       TAO_IOP::EmptyProfileList,
-<       TAO_IOP::Duplicate,
-<       TAO_IOP::Invalid_IOR
-<     )) = 0;
----
-> virtual CORBA::Object_ptr add_profiles (
->     CORBA::Object_ptr ior1,
->     CORBA::Object_ptr ior2,
->     CORBA::Environment &ACE_TRY_ENV =
->       TAO_default_environment ()
->   )
->   ACE_THROW_SPEC ((
->     CORBA::SystemException,
->     TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
->     TAO_IOP::TAO_IOR_Manipulation::Duplicate,
->     TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
->   )) = 0;
-657,668c460,471
-<   virtual CORBA::Object_ptr remove_profiles (
-<       CORBA::Object_ptr ior1,
-<       CORBA::Object_ptr ior2,
-<       CORBA::Environment &ACE_TRY_ENV =
-<         TAO_default_environment ()
-<     )
-<     ACE_THROW_SPEC ((
-<       CORBA::SystemException,
-<       TAO_IOP::Invalid_IOR,
-<       TAO_IOP::EmptyProfileList,
-<       TAO_IOP::NotFound
-<     )) = 0;
----
-> virtual CORBA::Object_ptr remove_profiles (
->     CORBA::Object_ptr ior1,
->     CORBA::Object_ptr ior2,
->     CORBA::Environment &ACE_TRY_ENV =
->       TAO_default_environment ()
->   )
->   ACE_THROW_SPEC ((
->     CORBA::SystemException,
->     TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR,
->     TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList,
->     TAO_IOP::TAO_IOR_Manipulation::NotFound
->   )) = 0;
-670,680c473,482
-<   virtual CORBA::Boolean set_property (
-<       TAO_IOP::TAO_IOR_Property_ptr prop,
-<       CORBA::Object_ptr ior,
-<       CORBA::Environment &ACE_TRY_ENV =
-<         TAO_default_environment ()
-<     )
-<     ACE_THROW_SPEC ((
-<       CORBA::SystemException,
-<       TAO_IOP::Invalid_IOR,
-<       TAO_IOP::Duplicate
-<     )) = 0;
----
-> virtual CORBA::ULong is_in_ior (
->     CORBA::Object_ptr ior1,
->     CORBA::Object_ptr ior2,
->     CORBA::Environment &ACE_TRY_ENV =
->       TAO_default_environment ()
->   )
->   ACE_THROW_SPEC ((
->     CORBA::SystemException,
->     TAO_IOP::TAO_IOR_Manipulation::NotFound
->   )) = 0;
-682,695c484,492
-<   virtual CORBA::Boolean set_primary (
-<       TAO_IOP::TAO_IOR_Property_ptr prop,
-<       CORBA::Object_ptr ior1,
-<       CORBA::Object_ptr ior2,
-<       CORBA::Environment &ACE_TRY_ENV =
-<         TAO_default_environment ()
-<     )
-<     ACE_THROW_SPEC ((
-<       CORBA::SystemException,
-<       TAO_IOP::Invalid_IOR,
-<       TAO_IOP::Duplicate,
-<       TAO_IOP::MultiProfileList,
-<       TAO_IOP::NotFound
-<     )) = 0;
----
-> virtual CORBA::ULong get_profile_count (
->     CORBA::Object_ptr ior,
->     CORBA::Environment &ACE_TRY_ENV =
->       TAO_default_environment ()
->   )
->   ACE_THROW_SPEC ((
->     CORBA::SystemException,
->     TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
->   )) = 0;
-697,706c494
-<   virtual CORBA::Object_ptr get_primary (
-<       TAO_IOP::TAO_IOR_Property_ptr prop,
-<       CORBA::Object_ptr ior,
-<       CORBA::Environment &ACE_TRY_ENV =
-<         TAO_default_environment ()
-<     )
-<     ACE_THROW_SPEC ((
-<       CORBA::SystemException,
-<       TAO_IOP::NotFound
-<     )) = 0;
----
-> virtual void *_tao_QueryInterface (ptr_arith_t type);
-708,716c496
-<   virtual CORBA::Boolean is_primary_set (
-<       TAO_IOP::TAO_IOR_Property_ptr prop,
-<       CORBA::Object_ptr ior,
-<       CORBA::Environment &ACE_TRY_ENV =
-<         TAO_default_environment ()
-<     )
-<     ACE_THROW_SPEC ((
-<       CORBA::SystemException
-<     )) = 0;
----
-> virtual const char* _interface_repository_id (void) const;
-718,742d497
-<   virtual CORBA::ULong is_in_ior (
-<       CORBA::Object_ptr ior1,
-<       CORBA::Object_ptr ior2,
-<       CORBA::Environment &ACE_TRY_ENV =
-<         TAO_default_environment ()
-<     )
-<     ACE_THROW_SPEC ((
-<       CORBA::SystemException,
-<       TAO_IOP::NotFound
-<     )) = 0;
-< 
-<   virtual CORBA::ULong get_profile_count (
-<       CORBA::Object_ptr ior,
-<       CORBA::Environment &ACE_TRY_ENV =
-<         TAO_default_environment ()
-<     )
-<     ACE_THROW_SPEC ((
-<       CORBA::SystemException,
-<       TAO_IOP::EmptyProfileList
-<     )) = 0;
-< 
-<   virtual void *_tao_QueryInterface (ptr_arith_t type);
-< 
-<   virtual const char* _interface_repository_id (void) const;
-< 
-758,777d512
-< TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::EmptyProfileList &); // copying version
-< TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::EmptyProfileList*); // noncopying version
-< TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::EmptyProfileList *&); // deprecated
-< TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::EmptyProfileList *&);
-< TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::NotFound &); // copying version
-< TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::NotFound*); // noncopying version
-< TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::NotFound *&); // deprecated
-< TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::NotFound *&);
-< TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::Duplicate &); // copying version
-< TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::Duplicate*); // noncopying version
-< TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::Duplicate *&); // deprecated
-< TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::Duplicate *&);
-< TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::Invalid_IOR &); // copying version
-< TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::Invalid_IOR*); // noncopying version
-< TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::Invalid_IOR *&); // deprecated
-< TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::Invalid_IOR *&);
-< TAO_IORManip_Export void operator<<= (CORBA::Any &, const TAO_IOP::MultiProfileList &); // copying version
-< TAO_IORManip_Export void operator<<= (CORBA::Any &, TAO_IOP::MultiProfileList*); // noncopying version
-< TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_IOP::MultiProfileList *&); // deprecated
-< TAO_IORManip_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO_IOP::MultiProfileList *&);
-781,782d515
-< TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::EmptyProfileList &);
-< TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::EmptyProfileList &);
-784,796d516
-< TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::NotFound &);
-< TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::NotFound &);
-< 
-< TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::Duplicate &);
-< TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::Duplicate &);
-< 
-< TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::Invalid_IOR &);
-< TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::Invalid_IOR &);
-< 
-< TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::MultiProfileList &);
-< TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiProfileList &);
-< 
-< 
-808d527
-< #include "ace/post.h"
+--- orig/IORC.h	Wed Apr 18 22:57:41 2001
++++ IORC.h	Wed Apr 18 22:44:16 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:
+@@ -22,12 +22,23 @@
+ #ifndef _TAO_IDL_ORIG_IORC_H_
+ #define _TAO_IDL_ORIG_IORC_H_
+ 
+-#include "tao/corba.h"
++#include "ace/pre.h"
++#include "tao/corbafwd.h"
++
++#ifndef TAO_IORMANIP_SAFE_INCLUDE
++#error "You should not include IORC.h directly, use IORManip_Loader.h"
++#endif /* !TAO_IORMANIP_SAFE_INCLUDE */
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
++#include "ior_manip_export.h"
++#include "tao/Exception.h"
++#include "tao/Object.h"
++#include "tao/Environment.h"
++#include "tao/Sequence.h"
++#include "tao/CDR.h"
+ 
+ #if defined (TAO_EXPORT_MACRO)
+ #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/IORManipulation/diffs/IORC.i.diff b/TAO/tao/IORManipulation/diffs/IORC.i.diff
index 8b1904849dc..4dff0d0fd84 100644
--- a/TAO/tao/IORManipulation/diffs/IORC.i.diff
+++ b/TAO/tao/IORManipulation/diffs/IORC.i.diff
@@ -1,271 +1,10 @@
-1c1
-< /* -*- C++ -*- $Id$ */
----
-> /* -*- C++ -*- $Id$ */
-11c11
-< // Inline operations for exception TAO_IOP::EmptyProfileList
----
-> // Inline operations for exception TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList
-15c15
-< // Inline operations for exception TAO_IOP::NotFound
----
-> // Inline operations for exception TAO_IOP::TAO_IOR_Manipulation::NotFound
-19c19
-< // Inline operations for exception TAO_IOP::Duplicate
----
-> // Inline operations for exception TAO_IOP::TAO_IOR_Manipulation::Duplicate
-23c23
-< // Inline operations for exception TAO_IOP::Invalid_IOR
----
-> // Inline operations for exception TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR
-26,28d25
-< // *************************************************************
-< // Inline operations for exception TAO_IOP::MultiProfileList
-< // *************************************************************
-30,200d26
-< 
-< #if !defined (_TAO_IOP_TAO_IOR_PROPERTY___VAR_CI_)
-< #define _TAO_IOP_TAO_IOR_PROPERTY___VAR_CI_
-< 
-< // *************************************************************
-< // Inline operations for class TAO_IOP::TAO_IOR_Property_var
-< // *************************************************************
-< 
-< ACE_INLINE
-< TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (void) // default constructor
-<   : ptr_ (TAO_IOR_Property::_nil ())
-< {}
-< 
-< ACE_INLINE ::TAO_IOP::TAO_IOR_Property_ptr
-< TAO_IOP::TAO_IOR_Property_var::ptr (void) const
-< {
-<   return this->ptr_;
-< }
-< 
-< ACE_INLINE
-< TAO_IOP::TAO_IOR_Property_var::TAO_IOR_Property_var (const ::TAO_IOP::TAO_IOR_Property_var &p) // copy constructor
-<   : TAO_Base_var (),
-<     ptr_ (TAO_IOR_Property::_duplicate (p.ptr ()))
-< {}
-< 
-< ACE_INLINE
-< TAO_IOP::TAO_IOR_Property_var::~TAO_IOR_Property_var (void) // destructor
-< {
-<   CORBA::release (this->ptr_);
-< }
-< 
-< ACE_INLINE TAO_IOP::TAO_IOR_Property_var &
-< TAO_IOP::TAO_IOR_Property_var::operator= (TAO_IOR_Property_ptr p)
-< {
-<   CORBA::release (this->ptr_);
-<   this->ptr_ = p;
-<   return *this;
-< }
-< 
-< ACE_INLINE TAO_IOP::TAO_IOR_Property_var &
-< TAO_IOP::TAO_IOR_Property_var::operator= (const ::TAO_IOP::TAO_IOR_Property_var &p)
-< {
-<   if (this != &p)
-<   {
-<     CORBA::release (this->ptr_);
-<     this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_duplicate (p.ptr ());
-<   }
-<   return *this;
-< }
-< 
-< ACE_INLINE 
-< TAO_IOP::TAO_IOR_Property_var::operator const ::TAO_IOP::TAO_IOR_Property_ptr &() const // cast
-< {
-<   return this->ptr_;
-< }
-< 
-< ACE_INLINE 
-< TAO_IOP::TAO_IOR_Property_var::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // cast 
-< {
-<   return this->ptr_;
-< }
-< 
-< ACE_INLINE ::TAO_IOP::TAO_IOR_Property_ptr
-< TAO_IOP::TAO_IOR_Property_var::operator-> (void) const
-< {
-<   return this->ptr_;
-< }
-< 
-< ACE_INLINE ::TAO_IOP::TAO_IOR_Property_ptr
-< TAO_IOP::TAO_IOR_Property_var::in (void) const
-< {
-<   return this->ptr_;
-< }
-< 
-< ACE_INLINE ::TAO_IOP::TAO_IOR_Property_ptr &
-< TAO_IOP::TAO_IOR_Property_var::inout (void)
-< {
-<   return this->ptr_;
-< }
-< 
-< ACE_INLINE ::TAO_IOP::TAO_IOR_Property_ptr &
-< TAO_IOP::TAO_IOR_Property_var::out (void)
-< {
-<   CORBA::release (this->ptr_);
-<   this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
-<   return this->ptr_;
-< }
-< 
-< ACE_INLINE ::TAO_IOP::TAO_IOR_Property_ptr
-< TAO_IOP::TAO_IOR_Property_var::_retn (void)
-< {
-<   // yield ownership of managed obj reference
-<   ::TAO_IOP::TAO_IOR_Property_ptr val = this->ptr_;
-<   this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
-<   return val;
-< }
-< 
-< 
-< #endif /* end #if !defined */
-< 
-< 
-< #if !defined (_TAO_IOP_TAO_IOR_PROPERTY___OUT_CI_)
-< #define _TAO_IOP_TAO_IOR_PROPERTY___OUT_CI_
-< 
-< // *************************************************************
-< // Inline operations for class TAO_IOP::TAO_IOR_Property_out
-< // *************************************************************
-< 
-< ACE_INLINE
-< TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_ptr &p)
-<   : ptr_ (p)
-< {
-<   this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
-< }
-< 
-< ACE_INLINE
-< TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (TAO_IOR_Property_var &p) // constructor from _var
-<   : ptr_ (p.out ())
-< {
-<   CORBA::release (this->ptr_);
-<   this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_nil ();
-< }
-< 
-< ACE_INLINE
-< TAO_IOP::TAO_IOR_Property_out::TAO_IOR_Property_out (const ::TAO_IOP::TAO_IOR_Property_out &p) // copy constructor
-<   : ptr_ (ACE_const_cast (TAO_IOR_Property_out &, p).ptr_)
-< {}
-< 
-< ACE_INLINE ::TAO_IOP::TAO_IOR_Property_out &
-< TAO_IOP::TAO_IOR_Property_out::operator= (const ::TAO_IOP::TAO_IOR_Property_out &p)
-< {
-<   this->ptr_ = ACE_const_cast (TAO_IOR_Property_out&, p).ptr_;
-<   return *this;
-< }
-< 
-< ACE_INLINE TAO_IOP::TAO_IOR_Property_out &
-< TAO_IOP::TAO_IOR_Property_out::operator= (const ::TAO_IOP::TAO_IOR_Property_var &p)
-< {
-<   this->ptr_ = ::TAO_IOP::TAO_IOR_Property::_duplicate (p.ptr ());
-<   return *this;
-< }
-< 
-< ACE_INLINE TAO_IOP::TAO_IOR_Property_out &
-< TAO_IOP::TAO_IOR_Property_out::operator= (TAO_IOR_Property_ptr p)
-< {
-<   this->ptr_ = p;
-<   return *this;
-< }
-< 
-< ACE_INLINE 
-< TAO_IOP::TAO_IOR_Property_out::operator ::TAO_IOP::TAO_IOR_Property_ptr &() // cast
-< {
-<   return this->ptr_;
-< }
-< 
-< ACE_INLINE ::TAO_IOP::TAO_IOR_Property_ptr &
-< TAO_IOP::TAO_IOR_Property_out::ptr (void) // ptr
-< {
-<   return this->ptr_;
-< }
-< 
-< ACE_INLINE ::TAO_IOP::TAO_IOR_Property_ptr
-< TAO_IOP::TAO_IOR_Property_out::operator-> (void)
-< {
-<   return this->ptr_;
-< }
-< 
-< 
-< #endif /* end #if !defined */
-< 
-< 
-322c148
-<         this->release_ = 1;
----
-> 	this->release_ = 1;
-720,789d545
-< 
-< ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::EmptyProfileList &_tao_aggregate)
-< {
-<   // first marshal the repository ID
-<   if (strm << _tao_aggregate._id ())
-<     return 1;
-<   else
-<     return 0;
-< }
-< 
-< ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::EmptyProfileList&)
-< {
-<   return 1;
-< }
-< 
-< ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::NotFound &_tao_aggregate)
-< {
-<   // first marshal the repository ID
-<   if (strm << _tao_aggregate._id ())
-<     return 1;
-<   else
-<     return 0;
-< }
-< 
-< ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::NotFound&)
-< {
-<   return 1;
-< }
-< 
-< ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::Duplicate &_tao_aggregate)
-< {
-<   // first marshal the repository ID
-<   if (strm << _tao_aggregate._id ())
-<     return 1;
-<   else
-<     return 0;
-< }
-< 
-< ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::Duplicate&)
-< {
-<   return 1;
-< }
-< 
-< ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::Invalid_IOR &_tao_aggregate)
-< {
-<   // first marshal the repository ID
-<   if (strm << _tao_aggregate._id ())
-<     return 1;
-<   else
-<     return 0;
-< }
-< 
-< ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::Invalid_IOR&)
-< {
-<   return 1;
-< }
-< 
-< ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::MultiProfileList &_tao_aggregate)
-< {
-<   // first marshal the repository ID
-<   if (strm << _tao_aggregate._id ())
-<     return 1;
-<   else
-<     return 0;
-< }
-< 
-< ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::MultiProfileList&)
-< {
-<   return 1;
-< }
+--- orig/IORC.i	Wed Apr 18 22:57:41 2001
++++ IORC.i	Wed Apr 18 22:48:05 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/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp
index b5e4d056e5e..b025b1cce86 100644
--- a/TAO/tao/IORTable/IORTableC.cpp
+++ b/TAO/tao/IORTable/IORTableC.cpp
@@ -1,25 +1,41 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IORTableC.h"
 
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#endif /* __BORLANDC__ */
+
 #if !defined (__ACE_INLINE__)
 #include "IORTableC.i"
 #endif /* !defined INLINE */
 
-// default constructor
+// Default constructor.
 IORTable::AlreadyBound::AlreadyBound (void)
   : CORBA_UserException ("IDL:IORTable/AlreadyBound:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 IORTable::AlreadyBound::~AlreadyBound (void)
 {
 }
@@ -30,56 +46,56 @@ void IORTable::AlreadyBound::_tao_any_destructor (void *x)
   delete tmp;
 }
 
-// copy constructor
+// Copy constructor.
 IORTable::AlreadyBound::AlreadyBound (const ::IORTable::AlreadyBound &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 IORTable::AlreadyBound&
 IORTable::AlreadyBound::operator= (const ::IORTable::AlreadyBound &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 IORTable::AlreadyBound *
 IORTable::AlreadyBound::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:IORTable/AlreadyBound:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (AlreadyBound *, exc);
+  if (!ACE_OS::strcmp ("IDL:IORTable/AlreadyBound:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (AlreadyBound *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void IORTable::AlreadyBound::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void IORTable::AlreadyBound::_tao_encode (
-    TAO_OutputCDR &,
+    TAO_OutputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void IORTable::AlreadyBound::_tao_decode (
-    TAO_InputCDR &,
+    TAO_InputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *IORTable::AlreadyBound::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -87,13 +103,13 @@ CORBA::Exception *IORTable::AlreadyBound::_alloc (void)
   return retval;
 }
 
-// default constructor
+// Default constructor.
 IORTable::NotFound::NotFound (void)
   : CORBA_UserException ("IDL:IORTable/NotFound:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 IORTable::NotFound::~NotFound (void)
 {
 }
@@ -104,56 +120,56 @@ void IORTable::NotFound::_tao_any_destructor (void *x)
   delete tmp;
 }
 
-// copy constructor
+// Copy constructor.
 IORTable::NotFound::NotFound (const ::IORTable::NotFound &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 IORTable::NotFound&
 IORTable::NotFound::operator= (const ::IORTable::NotFound &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 IORTable::NotFound *
 IORTable::NotFound::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:IORTable/NotFound:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (NotFound *, exc);
+  if (!ACE_OS::strcmp ("IDL:IORTable/NotFound:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (NotFound *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void IORTable::NotFound::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void IORTable::NotFound::_tao_encode (
-    TAO_OutputCDR &,
+    TAO_OutputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void IORTable::NotFound::_tao_decode (
-    TAO_InputCDR &,
+    TAO_InputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *IORTable::NotFound::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -161,11 +177,194 @@ CORBA::Exception *IORTable::NotFound::_alloc (void)
   return retval;
 }
 
+// *************************************************************
+// Operations for class IORTable::Table_var
+// *************************************************************
 
-// default constructor
-IORTable::Table::Table (void)
+IORTable::Table_var::Table_var (void) // default constructor
+  : ptr_ (Table::_nil ())
+{}
+
+::IORTable::Table_ptr
+IORTable::Table_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+IORTable::Table_var::Table_var (const ::IORTable::Table_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (Table::_duplicate (p.ptr ()))
+{}
+
+IORTable::Table_var::~Table_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+IORTable::Table_var &
+IORTable::Table_var::operator= (Table_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+IORTable::Table_var &
+IORTable::Table_var::operator= (const ::IORTable::Table_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::IORTable::Table::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+IORTable::Table_var::operator const ::IORTable::Table_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+IORTable::Table_var::operator ::IORTable::Table_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::IORTable::Table_ptr
+IORTable::Table_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::IORTable::Table_ptr
+IORTable::Table_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::IORTable::Table_ptr &
+IORTable::Table_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::IORTable::Table_ptr &
+IORTable::Table_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IORTable::Table::_nil ();
+  return this->ptr_;
+}
+
+::IORTable::Table_ptr
+IORTable::Table_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::IORTable::Table_ptr val = this->ptr_;
+  this->ptr_ = ::IORTable::Table::_nil ();
+  return val;
+}
+
+::IORTable::Table_ptr
+IORTable::Table_var::duplicate (Table_ptr p)
+{
+  return ::IORTable::Table::_duplicate (p);
+}
+
+void
+IORTable::Table_var::release (Table_ptr p)
+{
+  CORBA::release (p);
+}
+
+::IORTable::Table_ptr
+IORTable::Table_var::nil (void)
+{
+  return ::IORTable::Table::_nil ();
+}
+
+::IORTable::Table_ptr
+IORTable::Table_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::IORTable::Table::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+IORTable::Table_var::upcast (void *src)
+{
+  Table **tmp =
+    ACE_static_cast (Table **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class IORTable::Table_out
+// *************************************************************
+
+IORTable::Table_out::Table_out (Table_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::IORTable::Table::_nil ();
+}
+
+IORTable::Table_out::Table_out (Table_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IORTable::Table::_nil ();
+}
+
+IORTable::Table_out::Table_out (const ::IORTable::Table_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (Table_out &, p).ptr_)
 {}
 
+::IORTable::Table_out &
+IORTable::Table_out::operator= (const ::IORTable::Table_out &p)
+{
+  this->ptr_ = ACE_const_cast (Table_out&, p).ptr_;
+  return *this;
+}
+
+IORTable::Table_out &
+IORTable::Table_out::operator= (const ::IORTable::Table_var &p)
+{
+  this->ptr_ = ::IORTable::Table::_duplicate (p.ptr ());
+  return *this;
+}
+
+IORTable::Table_out &
+IORTable::Table_out::operator= (Table_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+IORTable::Table_out::operator ::IORTable::Table_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::IORTable::Table_ptr &
+IORTable::Table_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::IORTable::Table_ptr
+IORTable::Table_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+IORTable::Table::Table ()
+{
+  }
+
 // destructor
 IORTable::Table::~Table (void)
 {}
@@ -229,11 +428,194 @@ const char* IORTable::Table::_interface_repository_id (void) const
   return "IDL:IORTable/Table:1.0";
 }
 
+// *************************************************************
+// Operations for class IORTable::Locator_var
+// *************************************************************
 
-// default constructor
-IORTable::Locator::Locator (void)
+IORTable::Locator_var::Locator_var (void) // default constructor
+  : ptr_ (Locator::_nil ())
+{}
+
+::IORTable::Locator_ptr
+IORTable::Locator_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+IORTable::Locator_var::Locator_var (const ::IORTable::Locator_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (Locator::_duplicate (p.ptr ()))
 {}
 
+IORTable::Locator_var::~Locator_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+IORTable::Locator_var &
+IORTable::Locator_var::operator= (Locator_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+IORTable::Locator_var &
+IORTable::Locator_var::operator= (const ::IORTable::Locator_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::IORTable::Locator::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+IORTable::Locator_var::operator const ::IORTable::Locator_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+IORTable::Locator_var::operator ::IORTable::Locator_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::IORTable::Locator_ptr
+IORTable::Locator_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::IORTable::Locator_ptr
+IORTable::Locator_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::IORTable::Locator_ptr &
+IORTable::Locator_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::IORTable::Locator_ptr &
+IORTable::Locator_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IORTable::Locator::_nil ();
+  return this->ptr_;
+}
+
+::IORTable::Locator_ptr
+IORTable::Locator_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::IORTable::Locator_ptr val = this->ptr_;
+  this->ptr_ = ::IORTable::Locator::_nil ();
+  return val;
+}
+
+::IORTable::Locator_ptr
+IORTable::Locator_var::duplicate (Locator_ptr p)
+{
+  return ::IORTable::Locator::_duplicate (p);
+}
+
+void
+IORTable::Locator_var::release (Locator_ptr p)
+{
+  CORBA::release (p);
+}
+
+::IORTable::Locator_ptr
+IORTable::Locator_var::nil (void)
+{
+  return ::IORTable::Locator::_nil ();
+}
+
+::IORTable::Locator_ptr
+IORTable::Locator_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::IORTable::Locator::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+IORTable::Locator_var::upcast (void *src)
+{
+  Locator **tmp =
+    ACE_static_cast (Locator **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class IORTable::Locator_out
+// *************************************************************
+
+IORTable::Locator_out::Locator_out (Locator_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::IORTable::Locator::_nil ();
+}
+
+IORTable::Locator_out::Locator_out (Locator_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::IORTable::Locator::_nil ();
+}
+
+IORTable::Locator_out::Locator_out (const ::IORTable::Locator_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (Locator_out &, p).ptr_)
+{}
+
+::IORTable::Locator_out &
+IORTable::Locator_out::operator= (const ::IORTable::Locator_out &p)
+{
+  this->ptr_ = ACE_const_cast (Locator_out&, p).ptr_;
+  return *this;
+}
+
+IORTable::Locator_out &
+IORTable::Locator_out::operator= (const ::IORTable::Locator_var &p)
+{
+  this->ptr_ = ::IORTable::Locator::_duplicate (p.ptr ());
+  return *this;
+}
+
+IORTable::Locator_out &
+IORTable::Locator_out::operator= (Locator_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+IORTable::Locator_out::operator ::IORTable::Locator_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::IORTable::Locator_ptr &
+IORTable::Locator_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::IORTable::Locator_ptr
+IORTable::Locator_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+IORTable::Locator::Locator ()
+{
+  }
+
 // destructor
 IORTable::Locator::~Locator (void)
 {}
diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h
index 9f4e1965292..5f8846e7722 100644
--- a/TAO/tao/IORTable/IORTableC.h
+++ b/TAO/tao/IORTable/IORTableC.h
@@ -1,11 +1,23 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #ifndef _TAO_IDL_ORIG_IORTABLEC_H_
 #define _TAO_IDL_ORIG_IORTABLEC_H_
@@ -38,14 +50,18 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
 TAO_NAMESPACE  IORTable
 {
   class Locator;
-
+  
 #if !defined (_IORTABLE_LOCATOR___PTR_CH_)
 #define _IORTABLE_LOCATOR___PTR_CH_
 
-typedef Locator *Locator_ptr;
+  typedef Locator *Locator_ptr;
 
 #endif /* end #if !defined */
 
@@ -57,23 +73,31 @@ typedef Locator *Locator_ptr;
   {
   public:
     Locator_var (void); // default constructor
-    Locator_var (Locator_ptr p) : ptr_ (p) {}
+    Locator_var (Locator_ptr p) : ptr_ (p) {} 
     Locator_var (const Locator_var &); // copy constructor
     ~Locator_var (void); // destructor
-
+    
     Locator_var &operator= (Locator_ptr);
     Locator_var &operator= (const Locator_var &);
     Locator_ptr operator-> (void) const;
-
+    
     operator const Locator_ptr &() const;
     operator Locator_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     Locator_ptr in (void) const;
     Locator_ptr &inout (void);
     Locator_ptr &out (void);
     Locator_ptr _retn (void);
     Locator_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static Locator_ptr duplicate (Locator_ptr);
+    static void release (Locator_ptr);
+    static Locator_ptr nil (void);
+    static Locator_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     Locator_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -100,7 +124,7 @@ typedef Locator *Locator_ptr;
     operator Locator_ptr &();
     Locator_ptr &ptr (void);
     Locator_ptr operator-> (void);
-
+  
   private:
     Locator_ptr &ptr_;
   };
@@ -116,28 +140,37 @@ typedef Locator *Locator_ptr;
   {
   public:
 
-    AlreadyBound (void); // default ctor
-    AlreadyBound (const AlreadyBound &); // copy ctor
+    AlreadyBound (void);
+    // Default constructor.
+    
+    AlreadyBound (const AlreadyBound &);
+    // Copy constructor.
+    
     ~AlreadyBound (void);
+    // Destructor.
+    
     static void _tao_any_destructor (void*);
+    
     AlreadyBound &operator= (const AlreadyBound &);
-
-
+    
     virtual void _raise (void);
 
     virtual void _tao_encode (
         TAO_OutputCDR &,
-        CORBA::Environment &) const;
+        CORBA::Environment &
+      ) const;
+    
     virtual void _tao_decode (
         TAO_InputCDR &,
-        CORBA::Environment &);
-
+        CORBA::Environment &
+      );
+    
     static AlreadyBound *_downcast (CORBA::Exception *);
 
 
-    // = TAO extension
+    // = TAO extension.
     static CORBA::Exception *_alloc (void);
-  }; // exception IORTable::AlreadyBound
+  }; // Exception IORTable::AlreadyBound.
 
 
 #endif /* end #if !defined */
@@ -150,28 +183,37 @@ typedef Locator *Locator_ptr;
   {
   public:
 
-    NotFound (void); // default ctor
-    NotFound (const NotFound &); // copy ctor
+    NotFound (void);
+    // Default constructor.
+    
+    NotFound (const NotFound &);
+    // Copy constructor.
+    
     ~NotFound (void);
+    // Destructor.
+    
     static void _tao_any_destructor (void*);
+    
     NotFound &operator= (const NotFound &);
-
-
+    
     virtual void _raise (void);
 
     virtual void _tao_encode (
         TAO_OutputCDR &,
-        CORBA::Environment &) const;
+        CORBA::Environment &
+      ) const;
+    
     virtual void _tao_decode (
         TAO_InputCDR &,
-        CORBA::Environment &);
-
+        CORBA::Environment &
+      );
+    
     static NotFound *_downcast (CORBA::Exception *);
 
 
-    // = TAO extension
+    // = TAO extension.
     static CORBA::Exception *_alloc (void);
-  }; // exception IORTable::NotFound
+  }; // Exception IORTable::NotFound.
 
 
 #endif /* end #if !defined */
@@ -182,7 +224,7 @@ typedef Locator *Locator_ptr;
 
   class Table;
   typedef Table *Table_ptr;
-
+  
 #endif /* end #if !defined */
 
 
@@ -193,23 +235,31 @@ typedef Locator *Locator_ptr;
   {
   public:
     Table_var (void); // default constructor
-    Table_var (Table_ptr p) : ptr_ (p) {}
+    Table_var (Table_ptr p) : ptr_ (p) {} 
     Table_var (const Table_var &); // copy constructor
     ~Table_var (void); // destructor
-
+    
     Table_var &operator= (Table_ptr);
     Table_var &operator= (const Table_var &);
     Table_ptr operator-> (void) const;
-
+    
     operator const Table_ptr &() const;
     operator Table_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     Table_ptr in (void) const;
     Table_ptr &inout (void);
     Table_ptr &out (void);
     Table_ptr _retn (void);
     Table_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static Table_ptr duplicate (Table_ptr);
+    static void release (Table_ptr);
+    static Table_ptr nil (void);
+    static Table_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     Table_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -236,7 +286,7 @@ typedef Locator *Locator_ptr;
     operator Table_ptr &();
     Table_ptr &ptr (void);
     Table_ptr operator-> (void);
-
+  
   private:
     Table_ptr &ptr_;
   };
@@ -260,12 +310,12 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object
     static Table_ptr _duplicate (Table_ptr obj);
     static Table_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
     static Table_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
     static Table_ptr _nil (void)
@@ -276,7 +326,7 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object
     virtual void bind (
         const char * object_key,
         const char * IOR,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -287,7 +337,7 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object
     virtual void rebind (
         const char * object_key,
         const char * IOR,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -296,7 +346,7 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object
 
     virtual void unbind (
         const char * object_key,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -306,7 +356,7 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object
 
     virtual void set_locator (
         IORTable::Locator_ptr the_locator,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -314,11 +364,12 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    Table (void);
+    Table ();
+    
     virtual ~Table (void);
   private:
     Table (const Table &);
@@ -329,74 +380,6 @@ class TAO_IORTable_Export Table : public virtual CORBA_Object
 #endif /* end #if !defined */
 
 
-#if !defined (_IORTABLE_LOCATOR___PTR_CH_)
-#define _IORTABLE_LOCATOR___PTR_CH_
-
-  class Locator;
-  typedef Locator *Locator_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IORTABLE_LOCATOR___VAR_CH_)
-#define _IORTABLE_LOCATOR___VAR_CH_
-
-  class TAO_IORTable_Export Locator_var : public TAO_Base_var
-  {
-  public:
-    Locator_var (void); // default constructor
-    Locator_var (Locator_ptr p) : ptr_ (p) {}
-    Locator_var (const Locator_var &); // copy constructor
-    ~Locator_var (void); // destructor
-
-    Locator_var &operator= (Locator_ptr);
-    Locator_var &operator= (const Locator_var &);
-    Locator_ptr operator-> (void) const;
-
-    operator const Locator_ptr &() const;
-    operator Locator_ptr &();
-    // in, inout, out, _retn
-    Locator_ptr in (void) const;
-    Locator_ptr &inout (void);
-    Locator_ptr &out (void);
-    Locator_ptr _retn (void);
-    Locator_ptr ptr (void) const;
-
-  private:
-    Locator_ptr ptr_;
-    // Unimplemented - prevents widening assignment.
-    Locator_var (const TAO_Base_var &rhs);
-    Locator_var &operator= (const TAO_Base_var &rhs);
-  };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IORTABLE_LOCATOR___OUT_CH_)
-#define _IORTABLE_LOCATOR___OUT_CH_
-
-  class TAO_IORTable_Export Locator_out
-  {
-  public:
-    Locator_out (Locator_ptr &);
-    Locator_out (Locator_var &);
-    Locator_out (const Locator_out &);
-    Locator_out &operator= (const Locator_out &);
-    Locator_out &operator= (const Locator_var &);
-    Locator_out &operator= (Locator_ptr);
-    operator Locator_ptr &();
-    Locator_ptr &ptr (void);
-    Locator_ptr operator-> (void);
-
-  private:
-    Locator_ptr &ptr_;
-  };
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_IORTABLE_LOCATOR_CH_)
 #define _IORTABLE_LOCATOR_CH_
 
@@ -412,12 +395,12 @@ class TAO_IORTable_Export Locator : public virtual CORBA_Object
     static Locator_ptr _duplicate (Locator_ptr obj);
     static Locator_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
     static Locator_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
     static Locator_ptr _nil (void)
@@ -427,7 +410,7 @@ class TAO_IORTable_Export Locator : public virtual CORBA_Object
 
     virtual char * locate (
         const char * object_key,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -436,11 +419,12 @@ class TAO_IORTable_Export Locator : public virtual CORBA_Object
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    Locator (void);
+    Locator ();
+    
     virtual ~Locator (void);
   private:
     Locator (const Locator &);
@@ -462,5 +446,9 @@ TAO_NAMESPACE_CLOSE // module IORTable
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/IORTable/IORTableC.i b/TAO/tao/IORTable/IORTableC.i
index a964a344a76..cc5fe59fc25 100644
--- a/TAO/tao/IORTable/IORTableC.i
+++ b/TAO/tao/IORTable/IORTableC.i
@@ -1,181 +1,23 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-#if !defined (_IORTABLE_LOCATOR___VAR_CI_)
-#define _IORTABLE_LOCATOR___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IORTable::Locator_var
-// *************************************************************
-
-ACE_INLINE
-IORTable::Locator_var::Locator_var (void) // default constructor
-  : ptr_ (IORTable::Locator::_nil ())
-{}
-
-ACE_INLINE IORTable::Locator_ptr 
-IORTable::Locator_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-IORTable::Locator_var::Locator_var (const IORTable::Locator_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (Locator::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IORTable::Locator_var::~Locator_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IORTable::Locator_var &
-IORTable::Locator_var::operator= (IORTable::Locator_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE IORTable::Locator_var &
-IORTable::Locator_var::operator= (const IORTable::Locator_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = IORTable::Locator::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-IORTable::Locator_var::operator const IORTable::Locator_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IORTable::Locator_var::operator IORTable::Locator_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IORTable::Locator_ptr 
-IORTable::Locator_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IORTable::Locator_ptr
-IORTable::Locator_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IORTable::Locator_ptr &
-IORTable::Locator_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IORTable::Locator_ptr &
-IORTable::Locator_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IORTable::Locator::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE IORTable::Locator_ptr 
-IORTable::Locator_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  IORTable::Locator_ptr val = this->ptr_;
-  this->ptr_ = IORTable::Locator::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IORTABLE_LOCATOR___OUT_CI_)
-#define _IORTABLE_LOCATOR___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IORTable::Locator_out
-// *************************************************************
-
-ACE_INLINE
-IORTable::Locator_out::Locator_out (IORTable::Locator_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = IORTable::Locator::_nil ();
-}
-
-ACE_INLINE
-IORTable::Locator_out::Locator_out (IORTable::Locator_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = IORTable::Locator::_nil ();
-}
-
-ACE_INLINE
-IORTable::Locator_out::Locator_out (const IORTable::Locator_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IORTable::Locator_out&,p).ptr_)
-{}
-
-ACE_INLINE IORTable::Locator_out &
-IORTable::Locator_out::operator= (const IORTable::Locator_out &p)
-{
-  this->ptr_ = ACE_const_cast (IORTable::Locator_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IORTable::Locator_out &
-IORTable::Locator_out::operator= (const IORTable::Locator_var &p)
-{
-  this->ptr_ = IORTable::Locator::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE IORTable::Locator_out &
-IORTable::Locator_out::operator= (IORTable::Locator_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-IORTable::Locator_out::operator IORTable::Locator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IORTable::Locator_ptr &
-IORTable::Locator_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE IORTable::Locator_ptr 
-IORTable::Locator_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // *************************************************************
 // Inline operations for exception IORTable::AlreadyBound
@@ -186,171 +28,102 @@ IORTable::Locator_out::operator-> (void)
 // *************************************************************
 
 
-#if !defined (_IORTABLE_TABLE___VAR_CI_)
-#define _IORTABLE_TABLE___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IORTable::Table_var
-// *************************************************************
-
-ACE_INLINE
-IORTable::Table_var::Table_var (void) // default constructor
-  : ptr_ (Table::_nil ())
-{}
+#if !defined (_IORTABLE_TABLE___CI_)
+#define _IORTABLE_TABLE___CI_
 
-ACE_INLINE ::IORTable::Table_ptr
-IORTable::Table_var::ptr (void) const
+ACE_INLINE IORTable::Table_ptr
+tao_IORTable_Table_duplicate (
+    IORTable::Table_ptr p
+  )
 {
-  return this->ptr_;
+  return IORTable::Table::_duplicate (p);
 }
 
-ACE_INLINE
-IORTable::Table_var::Table_var (const ::IORTable::Table_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (Table::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IORTable::Table_var::~Table_var (void) // destructor
+ACE_INLINE void
+tao_IORTable_Table_release (
+    IORTable::Table_ptr p
+  )
 {
-  CORBA::release (this->ptr_);
+  CORBA::release (p);
 }
 
-ACE_INLINE IORTable::Table_var &
-IORTable::Table_var::operator= (Table_ptr p)
+ACE_INLINE IORTable::Table_ptr
+tao_IORTable_Table_nil (
+    void
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
+  return IORTable::Table::_nil ();
 }
 
-ACE_INLINE IORTable::Table_var &
-IORTable::Table_var::operator= (const ::IORTable::Table_var &p)
+ACE_INLINE IORTable::Table_ptr
+tao_IORTable_Table_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::IORTable::Table::_duplicate (p.ptr ());
-  }
-  return *this;
+  return IORTable::Table::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE 
-IORTable::Table_var::operator const ::IORTable::Table_ptr &() const // cast
+ACE_INLINE CORBA::Object *
+tao_IORTable_Table_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
-}
-
-ACE_INLINE 
-IORTable::Table_var::operator ::IORTable::Table_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IORTable::Table_ptr
-IORTable::Table_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IORTable::Table_ptr
-IORTable::Table_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IORTable::Table_ptr &
-IORTable::Table_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::IORTable::Table_ptr &
-IORTable::Table_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IORTable::Table::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::IORTable::Table_ptr
-IORTable::Table_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::IORTable::Table_ptr val = this->ptr_;
-  this->ptr_ = ::IORTable::Table::_nil ();
-  return val;
+  IORTable::Table **tmp =
+    ACE_static_cast (IORTable::Table **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_IORTABLE_TABLE___OUT_CI_)
-#define _IORTABLE_TABLE___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IORTable::Table_out
-// *************************************************************
+#if !defined (_IORTABLE_LOCATOR___CI_)
+#define _IORTABLE_LOCATOR___CI_
 
-ACE_INLINE
-IORTable::Table_out::Table_out (Table_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::IORTable::Table::_nil ();
-}
-
-ACE_INLINE
-IORTable::Table_out::Table_out (Table_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::IORTable::Table::_nil ();
-}
-
-ACE_INLINE
-IORTable::Table_out::Table_out (const ::IORTable::Table_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Table_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IORTable::Table_out &
-IORTable::Table_out::operator= (const ::IORTable::Table_out &p)
-{
-  this->ptr_ = ACE_const_cast (Table_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE IORTable::Table_out &
-IORTable::Table_out::operator= (const ::IORTable::Table_var &p)
+ACE_INLINE IORTable::Locator_ptr
+tao_IORTable_Locator_duplicate (
+    IORTable::Locator_ptr p
+  )
 {
-  this->ptr_ = ::IORTable::Table::_duplicate (p.ptr ());
-  return *this;
+  return IORTable::Locator::_duplicate (p);
 }
 
-ACE_INLINE IORTable::Table_out &
-IORTable::Table_out::operator= (Table_ptr p)
+ACE_INLINE void
+tao_IORTable_Locator_release (
+    IORTable::Locator_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-IORTable::Table_out::operator ::IORTable::Table_ptr &() // cast
+ACE_INLINE IORTable::Locator_ptr
+tao_IORTable_Locator_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return IORTable::Locator::_nil ();
 }
 
-ACE_INLINE ::IORTable::Table_ptr &
-IORTable::Table_out::ptr (void) // ptr
+ACE_INLINE IORTable::Locator_ptr
+tao_IORTable_Locator_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return IORTable::Locator::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::IORTable::Table_ptr
-IORTable::Table_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_IORTable_Locator_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  IORTable::Locator **tmp =
+    ACE_static_cast (IORTable::Locator **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
+
diff --git a/TAO/tao/IORTable/diffs/IORTableC.cpp.diff b/TAO/tao/IORTable/diffs/IORTableC.cpp.diff
index ca30df4b6f6..98cca7e813a 100644
--- a/TAO/tao/IORTable/diffs/IORTableC.cpp.diff
+++ b/TAO/tao/IORTable/diffs/IORTableC.cpp.diff
@@ -1,54 +1,72 @@
---- orig/IORTableC.cpp	Sun Sep 10 16:20:41 2000
-+++ IORTableC.cpp	Sun Sep 10 16:22:48 2000
-@@ -63,23 +63,19 @@
+--- orig/IORTableC.cpp	Wed Apr 18 22:30:43 2001
++++ IORTableC.cpp	Wed Apr 18 22:29: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:
+@@ -21,13 +21,6 @@
  
- void IORTable::AlreadyBound::_tao_encode (
--    TAO_OutputCDR &cdr,
-+    TAO_OutputCDR &,
+ #include "IORTableC.h"
+ 
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+-#include "tao/ClientRequestInfo.h"
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+-
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus
+ #endif /* __BORLANDC__ */
+@@ -91,11 +84,6 @@
      CORBA::Environment &ACE_TRY_ENV
    ) const
  {
 -  if (cdr << *this)
--    return;
+-    {
+-      return;
+-    }
+-  
    ACE_THROW (CORBA::MARSHAL ());
  }
  
- 
- void IORTable::AlreadyBound::_tao_decode (
--    TAO_InputCDR &cdr,
-+    TAO_InputCDR &,
+@@ -104,11 +92,6 @@
      CORBA::Environment &ACE_TRY_ENV
    )
  {
 -  if (cdr >> *this)
--    return;
+-    {
+-      return;
+-    }
+-  
    ACE_THROW (CORBA::MARSHAL ());
  }
  
-@@ -141,23 +137,19 @@
- 
- 
- void IORTable::NotFound::_tao_encode (
--    TAO_OutputCDR &cdr,
-+    TAO_OutputCDR &,
+@@ -175,11 +158,6 @@
      CORBA::Environment &ACE_TRY_ENV
    ) const
  {
 -  if (cdr << *this)
--    return;
+-    {
+-      return;
+-    }
+-  
    ACE_THROW (CORBA::MARSHAL ());
  }
  
- 
- void IORTable::NotFound::_tao_decode (
--    TAO_InputCDR &cdr,
-+    TAO_InputCDR &,
+@@ -188,11 +166,6 @@
      CORBA::Environment &ACE_TRY_ENV
    )
  {
 -  if (cdr >> *this)
--    return;
+-    {
+-      return;
+-    }
+-  
    ACE_THROW (CORBA::MARSHAL ());
  }
  
diff --git a/TAO/tao/IORTable/diffs/IORTableC.h.diff b/TAO/tao/IORTable/diffs/IORTableC.h.diff
index c6a41ad862b..8e21f65b34d 100644
--- a/TAO/tao/IORTable/diffs/IORTableC.h.diff
+++ b/TAO/tao/IORTable/diffs/IORTableC.h.diff
@@ -1,255 +1,14 @@
---- orig/IORTableC.h	Sun Sep 10 16:20:41 2000
-+++ IORTableC.h	Sun Sep 10 16:22:06 2000
-@@ -41,7 +41,7 @@
- TAO_NAMESPACE  IORTable
- {
-   class Locator;
--  
-+
- #if !defined (_IORTABLE_LOCATOR___PTR_CH_)
- #define _IORTABLE_LOCATOR___PTR_CH_
- 
-@@ -57,17 +57,17 @@
-   {
-   public:
-     Locator_var (void); // default constructor
--    Locator_var (Locator_ptr p) : ptr_ (p) {} 
-+    Locator_var (Locator_ptr p) : ptr_ (p) {}
-     Locator_var (const Locator_var &); // copy constructor
-     ~Locator_var (void); // destructor
--    
-+
-     Locator_var &operator= (Locator_ptr);
-     Locator_var &operator= (const Locator_var &);
-     Locator_ptr operator-> (void) const;
--    
-+
-     operator const Locator_ptr &() const;
-     operator Locator_ptr &();
--    // in, inout, out, _retn 
-+    // in, inout, out, _retn
-     Locator_ptr in (void) const;
-     Locator_ptr &inout (void);
-     Locator_ptr &out (void);
-@@ -100,7 +100,7 @@
-     operator Locator_ptr &();
-     Locator_ptr &ptr (void);
-     Locator_ptr operator-> (void);
--    
-+
-   private:
-     Locator_ptr &ptr_;
-   };
-@@ -115,7 +115,7 @@
-   class TAO_IORTable_Export AlreadyBound : public CORBA::UserException
-   {
-   public:
--    
-+
-     AlreadyBound (void); // default ctor
-     AlreadyBound (const AlreadyBound &); // copy ctor
-     ~AlreadyBound (void);
-@@ -139,7 +139,7 @@
-     static CORBA::Exception *_alloc (void);
-   }; // exception IORTable::AlreadyBound
- 
--  
-+
- #endif /* end #if !defined */
- 
- 
-@@ -149,7 +149,7 @@
-   class TAO_IORTable_Export NotFound : public CORBA::UserException
-   {
-   public:
--    
-+
-     NotFound (void); // default ctor
-     NotFound (const NotFound &); // copy ctor
-     ~NotFound (void);
-@@ -173,7 +173,7 @@
-     static CORBA::Exception *_alloc (void);
-   }; // exception IORTable::NotFound
- 
--  
-+
- #endif /* end #if !defined */
- 
- 
-@@ -182,7 +182,7 @@
- 
-   class Table;
-   typedef Table *Table_ptr;
--  
-+
- #endif /* end #if !defined */
- 
- 
-@@ -193,17 +193,17 @@
-   {
-   public:
-     Table_var (void); // default constructor
--    Table_var (Table_ptr p) : ptr_ (p) {} 
-+    Table_var (Table_ptr p) : ptr_ (p) {}
-     Table_var (const Table_var &); // copy constructor
-     ~Table_var (void); // destructor
--    
-+
-     Table_var &operator= (Table_ptr);
-     Table_var &operator= (const Table_var &);
-     Table_ptr operator-> (void) const;
--    
-+
-     operator const Table_ptr &() const;
-     operator Table_ptr &();
--    // in, inout, out, _retn 
-+    // in, inout, out, _retn
-     Table_ptr in (void) const;
-     Table_ptr &inout (void);
-     Table_ptr &out (void);
-@@ -236,7 +236,7 @@
-     operator Table_ptr &();
-     Table_ptr &ptr (void);
-     Table_ptr operator-> (void);
--    
-+
-   private:
-     Table_ptr &ptr_;
-   };
-@@ -260,12 +260,12 @@
-     static Table_ptr _duplicate (Table_ptr obj);
-     static Table_ptr _narrow (
-         CORBA::Object_ptr obj,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
-     static Table_ptr _unchecked_narrow (
-         CORBA::Object_ptr obj,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
-     static Table_ptr _nil (void)
-@@ -276,7 +276,7 @@
-     virtual void bind (
-         const char * object_key,
-         const char * IOR,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((
-@@ -287,7 +287,7 @@
-     virtual void rebind (
-         const char * object_key,
-         const char * IOR,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((
-@@ -296,7 +296,7 @@
- 
-     virtual void unbind (
-         const char * object_key,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((
-@@ -306,7 +306,7 @@
- 
-     virtual void set_locator (
-         IORTable::Locator_ptr the_locator,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((
-@@ -314,7 +314,7 @@
-       )) = 0;
- 
-     virtual void *_tao_QueryInterface (ptr_arith_t type);
--    
-+
-     virtual const char* _interface_repository_id (void) const;
- 
-   protected:
-@@ -334,7 +334,7 @@
- 
-   class Locator;
-   typedef Locator *Locator_ptr;
--  
-+
- #endif /* end #if !defined */
- 
- 
-@@ -345,17 +345,17 @@
-   {
-   public:
-     Locator_var (void); // default constructor
--    Locator_var (Locator_ptr p) : ptr_ (p) {} 
-+    Locator_var (Locator_ptr p) : ptr_ (p) {}
-     Locator_var (const Locator_var &); // copy constructor
-     ~Locator_var (void); // destructor
--    
-+
-     Locator_var &operator= (Locator_ptr);
-     Locator_var &operator= (const Locator_var &);
-     Locator_ptr operator-> (void) const;
--    
-+
-     operator const Locator_ptr &() const;
-     operator Locator_ptr &();
--    // in, inout, out, _retn 
-+    // in, inout, out, _retn
-     Locator_ptr in (void) const;
-     Locator_ptr &inout (void);
-     Locator_ptr &out (void);
-@@ -388,7 +388,7 @@
-     operator Locator_ptr &();
-     Locator_ptr &ptr (void);
-     Locator_ptr operator-> (void);
--    
-+
-   private:
-     Locator_ptr &ptr_;
-   };
-@@ -412,12 +412,12 @@
-     static Locator_ptr _duplicate (Locator_ptr obj);
-     static Locator_ptr _narrow (
-         CORBA::Object_ptr obj,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
-     static Locator_ptr _unchecked_narrow (
-         CORBA::Object_ptr obj,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
-     static Locator_ptr _nil (void)
-@@ -427,7 +427,7 @@
- 
-     virtual char * locate (
-         const char * object_key,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((
-@@ -436,7 +436,7 @@
-       )) = 0;
- 
-     virtual void *_tao_QueryInterface (ptr_arith_t type);
--    
-+
-     virtual const char* _interface_repository_id (void) const;
- 
-   protected:
-@@ -453,19 +453,6 @@
+--- orig/IORTableC.h	Wed Apr 18 22:30:43 2001
++++ IORTableC.h	Wed Apr 18 22:22: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:
+@@ -437,19 +437,6 @@
  
  }
  TAO_NAMESPACE_CLOSE // module IORTable
diff --git a/TAO/tao/IORTable/diffs/IORTableC.i.diff b/TAO/tao/IORTable/diffs/IORTableC.i.diff
index 288ba1509ef..8558f4c988b 100644
--- a/TAO/tao/IORTable/diffs/IORTableC.i.diff
+++ b/TAO/tao/IORTable/diffs/IORTableC.i.diff
@@ -1,20 +1,18 @@
---- orig/IORTableC.i	Sun Sep 10 16:20:41 2000
-+++ IORTableC.i	Sun Sep 10 16:22:20 2000
-@@ -354,42 +354,3 @@
+--- orig/IORTableC.i	Wed Apr 18 22:30:43 2001
++++ IORTableC.i	Wed Apr 18 22:23:53 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:
+@@ -126,32 +126,4 @@
  
  
  #endif /* end #if !defined */
 -
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
--    const IORTable::Locator_ptr
--  );
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &,
--    IORTable::Locator_ptr &
--  );
 -ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IORTable::AlreadyBound &_tao_aggregate)
 -{
 -  // first marshal the repository ID
@@ -42,4 +40,4 @@
 -{
 -  return 1;
 -}
--
+ 
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp
index 93ec555fb58..ae08722c404 100644
--- a/TAO/tao/MessagingC.cpp
+++ b/TAO/tao/MessagingC.cpp
@@ -331,6 +331,188 @@ TAO_NAMESPACE_BEGIN (Messaging)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, REBIND_POLICY_TYPE, 23U)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class Messaging::RebindPolicy_var
+// *************************************************************
+
+Messaging::RebindPolicy_var::RebindPolicy_var (void) // default constructor
+  : ptr_ (RebindPolicy::_nil ())
+{}
+
+::Messaging::RebindPolicy_ptr
+Messaging::RebindPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+Messaging::RebindPolicy_var::RebindPolicy_var (const ::Messaging::RebindPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (RebindPolicy::_duplicate (p.ptr ()))
+{}
+
+Messaging::RebindPolicy_var::~RebindPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+Messaging::RebindPolicy_var &
+Messaging::RebindPolicy_var::operator= (RebindPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::RebindPolicy_var &
+Messaging::RebindPolicy_var::operator= (const ::Messaging::RebindPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::Messaging::RebindPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+Messaging::RebindPolicy_var::operator const ::Messaging::RebindPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+Messaging::RebindPolicy_var::operator ::Messaging::RebindPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::Messaging::RebindPolicy_ptr
+Messaging::RebindPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::RebindPolicy_ptr
+Messaging::RebindPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::RebindPolicy_ptr &
+Messaging::RebindPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::Messaging::RebindPolicy_ptr &
+Messaging::RebindPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::RebindPolicy::_nil ();
+  return this->ptr_;
+}
+
+::Messaging::RebindPolicy_ptr
+Messaging::RebindPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::Messaging::RebindPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::Messaging::RebindPolicy::_nil ();
+  return val;
+}
+
+::Messaging::RebindPolicy_ptr
+Messaging::RebindPolicy_var::duplicate (RebindPolicy_ptr p)
+{
+  return ::Messaging::RebindPolicy::_duplicate (p);
+}
+
+void
+Messaging::RebindPolicy_var::release (RebindPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::Messaging::RebindPolicy_ptr
+Messaging::RebindPolicy_var::nil (void)
+{
+  return ::Messaging::RebindPolicy::_nil ();
+}
+
+::Messaging::RebindPolicy_ptr
+Messaging::RebindPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::Messaging::RebindPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+Messaging::RebindPolicy_var::upcast (void *src)
+{
+  RebindPolicy **tmp =
+    ACE_static_cast (RebindPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class Messaging::RebindPolicy_out
+// *************************************************************
+
+Messaging::RebindPolicy_out::RebindPolicy_out (RebindPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::Messaging::RebindPolicy::_nil ();
+}
+
+Messaging::RebindPolicy_out::RebindPolicy_out (RebindPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::RebindPolicy::_nil ();
+}
+
+Messaging::RebindPolicy_out::RebindPolicy_out (const ::Messaging::RebindPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (RebindPolicy_out &, p).ptr_)
+{}
+
+::Messaging::RebindPolicy_out &
+Messaging::RebindPolicy_out::operator= (const ::Messaging::RebindPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (RebindPolicy_out&, p).ptr_;
+  return *this;
+}
+
+Messaging::RebindPolicy_out &
+Messaging::RebindPolicy_out::operator= (const ::Messaging::RebindPolicy_var &p)
+{
+  this->ptr_ = ::Messaging::RebindPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+Messaging::RebindPolicy_out &
+Messaging::RebindPolicy_out::operator= (RebindPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::RebindPolicy_out::operator ::Messaging::RebindPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::Messaging::RebindPolicy_ptr &
+Messaging::RebindPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::Messaging::RebindPolicy_ptr
+Messaging::RebindPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 Messaging::RebindPolicy::RebindPolicy ()
 {
@@ -411,8 +593,6 @@ const char* Messaging::RebindPolicy::_interface_repository_id (void) const
   return "IDL:omg.org/Messaging/RebindPolicy:1.0";
 }
 
-#endif /* TAO_HAS_REBIND_POLICY == 1 */
-
 #if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
 
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
@@ -420,6 +600,189 @@ TAO_NAMESPACE_BEGIN (Messaging)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, SYNC_SCOPE_POLICY_TYPE, 24U)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class Messaging::SyncScopePolicy_var
+// *************************************************************
+
+Messaging::SyncScopePolicy_var::SyncScopePolicy_var (void) // default constructor
+  : ptr_ (SyncScopePolicy::_nil ())
+{}
+
+::Messaging::SyncScopePolicy_ptr
+Messaging::SyncScopePolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+#endif /* TAO_HAS_REBIND_POLICY == 1 */
+
+Messaging::SyncScopePolicy_var::SyncScopePolicy_var (const ::Messaging::SyncScopePolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (SyncScopePolicy::_duplicate (p.ptr ()))
+{}
+
+Messaging::SyncScopePolicy_var::~SyncScopePolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+Messaging::SyncScopePolicy_var &
+Messaging::SyncScopePolicy_var::operator= (SyncScopePolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::SyncScopePolicy_var &
+Messaging::SyncScopePolicy_var::operator= (const ::Messaging::SyncScopePolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::Messaging::SyncScopePolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+Messaging::SyncScopePolicy_var::operator const ::Messaging::SyncScopePolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+Messaging::SyncScopePolicy_var::operator ::Messaging::SyncScopePolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::Messaging::SyncScopePolicy_ptr
+Messaging::SyncScopePolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::SyncScopePolicy_ptr
+Messaging::SyncScopePolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::SyncScopePolicy_ptr &
+Messaging::SyncScopePolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::Messaging::SyncScopePolicy_ptr &
+Messaging::SyncScopePolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::SyncScopePolicy::_nil ();
+  return this->ptr_;
+}
+
+::Messaging::SyncScopePolicy_ptr
+Messaging::SyncScopePolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::Messaging::SyncScopePolicy_ptr val = this->ptr_;
+  this->ptr_ = ::Messaging::SyncScopePolicy::_nil ();
+  return val;
+}
+
+::Messaging::SyncScopePolicy_ptr
+Messaging::SyncScopePolicy_var::duplicate (SyncScopePolicy_ptr p)
+{
+  return ::Messaging::SyncScopePolicy::_duplicate (p);
+}
+
+void
+Messaging::SyncScopePolicy_var::release (SyncScopePolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::Messaging::SyncScopePolicy_ptr
+Messaging::SyncScopePolicy_var::nil (void)
+{
+  return ::Messaging::SyncScopePolicy::_nil ();
+}
+
+::Messaging::SyncScopePolicy_ptr
+Messaging::SyncScopePolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::Messaging::SyncScopePolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+Messaging::SyncScopePolicy_var::upcast (void *src)
+{
+  SyncScopePolicy **tmp =
+    ACE_static_cast (SyncScopePolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class Messaging::SyncScopePolicy_out
+// *************************************************************
+
+Messaging::SyncScopePolicy_out::SyncScopePolicy_out (SyncScopePolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::Messaging::SyncScopePolicy::_nil ();
+}
+
+Messaging::SyncScopePolicy_out::SyncScopePolicy_out (SyncScopePolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::SyncScopePolicy::_nil ();
+}
+
+Messaging::SyncScopePolicy_out::SyncScopePolicy_out (const ::Messaging::SyncScopePolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (SyncScopePolicy_out &, p).ptr_)
+{}
+
+::Messaging::SyncScopePolicy_out &
+Messaging::SyncScopePolicy_out::operator= (const ::Messaging::SyncScopePolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (SyncScopePolicy_out&, p).ptr_;
+  return *this;
+}
+
+Messaging::SyncScopePolicy_out &
+Messaging::SyncScopePolicy_out::operator= (const ::Messaging::SyncScopePolicy_var &p)
+{
+  this->ptr_ = ::Messaging::SyncScopePolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+Messaging::SyncScopePolicy_out &
+Messaging::SyncScopePolicy_out::operator= (SyncScopePolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::SyncScopePolicy_out::operator ::Messaging::SyncScopePolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::Messaging::SyncScopePolicy_ptr &
+Messaging::SyncScopePolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::Messaging::SyncScopePolicy_ptr
+Messaging::SyncScopePolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 // default constructor
 Messaging::SyncScopePolicy::SyncScopePolicy ()
 {
@@ -594,6 +957,188 @@ void Messaging::PriorityRange::_tao_any_destructor (void *x)
 }
 
 
+// *************************************************************
+// Operations for class Messaging::RequestPriorityPolicy_var
+// *************************************************************
+
+Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (void) // default constructor
+  : ptr_ (RequestPriorityPolicy::_nil ())
+{}
+
+::Messaging::RequestPriorityPolicy_ptr
+Messaging::RequestPriorityPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (const ::Messaging::RequestPriorityPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (RequestPriorityPolicy::_duplicate (p.ptr ()))
+{}
+
+Messaging::RequestPriorityPolicy_var::~RequestPriorityPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+Messaging::RequestPriorityPolicy_var &
+Messaging::RequestPriorityPolicy_var::operator= (RequestPriorityPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::RequestPriorityPolicy_var &
+Messaging::RequestPriorityPolicy_var::operator= (const ::Messaging::RequestPriorityPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::Messaging::RequestPriorityPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+Messaging::RequestPriorityPolicy_var::operator const ::Messaging::RequestPriorityPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+Messaging::RequestPriorityPolicy_var::operator ::Messaging::RequestPriorityPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestPriorityPolicy_ptr
+Messaging::RequestPriorityPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestPriorityPolicy_ptr
+Messaging::RequestPriorityPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestPriorityPolicy_ptr &
+Messaging::RequestPriorityPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestPriorityPolicy_ptr &
+Messaging::RequestPriorityPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil ();
+  return this->ptr_;
+}
+
+::Messaging::RequestPriorityPolicy_ptr
+Messaging::RequestPriorityPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::Messaging::RequestPriorityPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil ();
+  return val;
+}
+
+::Messaging::RequestPriorityPolicy_ptr
+Messaging::RequestPriorityPolicy_var::duplicate (RequestPriorityPolicy_ptr p)
+{
+  return ::Messaging::RequestPriorityPolicy::_duplicate (p);
+}
+
+void
+Messaging::RequestPriorityPolicy_var::release (RequestPriorityPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::Messaging::RequestPriorityPolicy_ptr
+Messaging::RequestPriorityPolicy_var::nil (void)
+{
+  return ::Messaging::RequestPriorityPolicy::_nil ();
+}
+
+::Messaging::RequestPriorityPolicy_ptr
+Messaging::RequestPriorityPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::Messaging::RequestPriorityPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+Messaging::RequestPriorityPolicy_var::upcast (void *src)
+{
+  RequestPriorityPolicy **tmp =
+    ACE_static_cast (RequestPriorityPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class Messaging::RequestPriorityPolicy_out
+// *************************************************************
+
+Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (RequestPriorityPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil ();
+}
+
+Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (RequestPriorityPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil ();
+}
+
+Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (const ::Messaging::RequestPriorityPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (RequestPriorityPolicy_out &, p).ptr_)
+{}
+
+::Messaging::RequestPriorityPolicy_out &
+Messaging::RequestPriorityPolicy_out::operator= (const ::Messaging::RequestPriorityPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (RequestPriorityPolicy_out&, p).ptr_;
+  return *this;
+}
+
+Messaging::RequestPriorityPolicy_out &
+Messaging::RequestPriorityPolicy_out::operator= (const ::Messaging::RequestPriorityPolicy_var &p)
+{
+  this->ptr_ = ::Messaging::RequestPriorityPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+Messaging::RequestPriorityPolicy_out &
+Messaging::RequestPriorityPolicy_out::operator= (RequestPriorityPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::RequestPriorityPolicy_out::operator ::Messaging::RequestPriorityPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestPriorityPolicy_ptr &
+Messaging::RequestPriorityPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestPriorityPolicy_ptr
+Messaging::RequestPriorityPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 Messaging::RequestPriorityPolicy::RequestPriorityPolicy ()
 {
@@ -674,15 +1219,193 @@ const char* Messaging::RequestPriorityPolicy::_interface_repository_id (void) co
   return "IDL:omg.org/Messaging/RequestPriorityPolicy:1.0";
 }
 
-#endif /* TAO_HAS_PRIORITY_POLICIES == 1 */
-
-#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1)
-
 TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (Messaging)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_PRIORITY_POLICY_TYPE, 26U)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class Messaging::ReplyPriorityPolicy_var
+// *************************************************************
+
+Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (void) // default constructor
+  : ptr_ (ReplyPriorityPolicy::_nil ())
+{}
+
+::Messaging::ReplyPriorityPolicy_ptr
+Messaging::ReplyPriorityPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (const ::Messaging::ReplyPriorityPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ReplyPriorityPolicy::_duplicate (p.ptr ()))
+{}
+
+Messaging::ReplyPriorityPolicy_var::~ReplyPriorityPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+Messaging::ReplyPriorityPolicy_var &
+Messaging::ReplyPriorityPolicy_var::operator= (ReplyPriorityPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::ReplyPriorityPolicy_var &
+Messaging::ReplyPriorityPolicy_var::operator= (const ::Messaging::ReplyPriorityPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+Messaging::ReplyPriorityPolicy_var::operator const ::Messaging::ReplyPriorityPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+Messaging::ReplyPriorityPolicy_var::operator ::Messaging::ReplyPriorityPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyPriorityPolicy_ptr
+Messaging::ReplyPriorityPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyPriorityPolicy_ptr
+Messaging::ReplyPriorityPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyPriorityPolicy_ptr &
+Messaging::ReplyPriorityPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyPriorityPolicy_ptr &
+Messaging::ReplyPriorityPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil ();
+  return this->ptr_;
+}
+
+::Messaging::ReplyPriorityPolicy_ptr
+Messaging::ReplyPriorityPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::Messaging::ReplyPriorityPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil ();
+  return val;
+}
+
+::Messaging::ReplyPriorityPolicy_ptr
+Messaging::ReplyPriorityPolicy_var::duplicate (ReplyPriorityPolicy_ptr p)
+{
+  return ::Messaging::ReplyPriorityPolicy::_duplicate (p);
+}
+
+void
+Messaging::ReplyPriorityPolicy_var::release (ReplyPriorityPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::Messaging::ReplyPriorityPolicy_ptr
+Messaging::ReplyPriorityPolicy_var::nil (void)
+{
+  return ::Messaging::ReplyPriorityPolicy::_nil ();
+}
+
+::Messaging::ReplyPriorityPolicy_ptr
+Messaging::ReplyPriorityPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::Messaging::ReplyPriorityPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+Messaging::ReplyPriorityPolicy_var::upcast (void *src)
+{
+  ReplyPriorityPolicy **tmp =
+    ACE_static_cast (ReplyPriorityPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class Messaging::ReplyPriorityPolicy_out
+// *************************************************************
+
+Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (ReplyPriorityPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil ();
+}
+
+Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (ReplyPriorityPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil ();
+}
+
+Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (const ::Messaging::ReplyPriorityPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ReplyPriorityPolicy_out &, p).ptr_)
+{}
+
+::Messaging::ReplyPriorityPolicy_out &
+Messaging::ReplyPriorityPolicy_out::operator= (const ::Messaging::ReplyPriorityPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (ReplyPriorityPolicy_out&, p).ptr_;
+  return *this;
+}
+
+Messaging::ReplyPriorityPolicy_out &
+Messaging::ReplyPriorityPolicy_out::operator= (const ::Messaging::ReplyPriorityPolicy_var &p)
+{
+  this->ptr_ = ::Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+Messaging::ReplyPriorityPolicy_out &
+Messaging::ReplyPriorityPolicy_out::operator= (ReplyPriorityPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::ReplyPriorityPolicy_out::operator ::Messaging::ReplyPriorityPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyPriorityPolicy_ptr &
+Messaging::ReplyPriorityPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyPriorityPolicy_ptr
+Messaging::ReplyPriorityPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy ()
 {
@@ -772,6 +1495,188 @@ TAO_NAMESPACE_BEGIN (Messaging)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_START_TIME_POLICY_TYPE, 27U)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class Messaging::RequestStartTimePolicy_var
+// *************************************************************
+
+Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (void) // default constructor
+  : ptr_ (RequestStartTimePolicy::_nil ())
+{}
+
+::Messaging::RequestStartTimePolicy_ptr
+Messaging::RequestStartTimePolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (const ::Messaging::RequestStartTimePolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (RequestStartTimePolicy::_duplicate (p.ptr ()))
+{}
+
+Messaging::RequestStartTimePolicy_var::~RequestStartTimePolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+Messaging::RequestStartTimePolicy_var &
+Messaging::RequestStartTimePolicy_var::operator= (RequestStartTimePolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::RequestStartTimePolicy_var &
+Messaging::RequestStartTimePolicy_var::operator= (const ::Messaging::RequestStartTimePolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::Messaging::RequestStartTimePolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+Messaging::RequestStartTimePolicy_var::operator const ::Messaging::RequestStartTimePolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+Messaging::RequestStartTimePolicy_var::operator ::Messaging::RequestStartTimePolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestStartTimePolicy_ptr
+Messaging::RequestStartTimePolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestStartTimePolicy_ptr
+Messaging::RequestStartTimePolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestStartTimePolicy_ptr &
+Messaging::RequestStartTimePolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestStartTimePolicy_ptr &
+Messaging::RequestStartTimePolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil ();
+  return this->ptr_;
+}
+
+::Messaging::RequestStartTimePolicy_ptr
+Messaging::RequestStartTimePolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::Messaging::RequestStartTimePolicy_ptr val = this->ptr_;
+  this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil ();
+  return val;
+}
+
+::Messaging::RequestStartTimePolicy_ptr
+Messaging::RequestStartTimePolicy_var::duplicate (RequestStartTimePolicy_ptr p)
+{
+  return ::Messaging::RequestStartTimePolicy::_duplicate (p);
+}
+
+void
+Messaging::RequestStartTimePolicy_var::release (RequestStartTimePolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::Messaging::RequestStartTimePolicy_ptr
+Messaging::RequestStartTimePolicy_var::nil (void)
+{
+  return ::Messaging::RequestStartTimePolicy::_nil ();
+}
+
+::Messaging::RequestStartTimePolicy_ptr
+Messaging::RequestStartTimePolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::Messaging::RequestStartTimePolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+Messaging::RequestStartTimePolicy_var::upcast (void *src)
+{
+  RequestStartTimePolicy **tmp =
+    ACE_static_cast (RequestStartTimePolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class Messaging::RequestStartTimePolicy_out
+// *************************************************************
+
+Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (RequestStartTimePolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil ();
+}
+
+Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (RequestStartTimePolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil ();
+}
+
+Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (const ::Messaging::RequestStartTimePolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (RequestStartTimePolicy_out &, p).ptr_)
+{}
+
+::Messaging::RequestStartTimePolicy_out &
+Messaging::RequestStartTimePolicy_out::operator= (const ::Messaging::RequestStartTimePolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (RequestStartTimePolicy_out&, p).ptr_;
+  return *this;
+}
+
+Messaging::RequestStartTimePolicy_out &
+Messaging::RequestStartTimePolicy_out::operator= (const ::Messaging::RequestStartTimePolicy_var &p)
+{
+  this->ptr_ = ::Messaging::RequestStartTimePolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+Messaging::RequestStartTimePolicy_out &
+Messaging::RequestStartTimePolicy_out::operator= (RequestStartTimePolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::RequestStartTimePolicy_out::operator ::Messaging::RequestStartTimePolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestStartTimePolicy_ptr &
+Messaging::RequestStartTimePolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestStartTimePolicy_ptr
+Messaging::RequestStartTimePolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 Messaging::RequestStartTimePolicy::RequestStartTimePolicy ()
 {
@@ -861,6 +1766,188 @@ TAO_NAMESPACE_BEGIN (Messaging)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_END_TIME_POLICY_TYPE, 28U)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class Messaging::RequestEndTimePolicy_var
+// *************************************************************
+
+Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (void) // default constructor
+  : ptr_ (RequestEndTimePolicy::_nil ())
+{}
+
+::Messaging::RequestEndTimePolicy_ptr
+Messaging::RequestEndTimePolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (const ::Messaging::RequestEndTimePolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (RequestEndTimePolicy::_duplicate (p.ptr ()))
+{}
+
+Messaging::RequestEndTimePolicy_var::~RequestEndTimePolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+Messaging::RequestEndTimePolicy_var &
+Messaging::RequestEndTimePolicy_var::operator= (RequestEndTimePolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::RequestEndTimePolicy_var &
+Messaging::RequestEndTimePolicy_var::operator= (const ::Messaging::RequestEndTimePolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::Messaging::RequestEndTimePolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+Messaging::RequestEndTimePolicy_var::operator const ::Messaging::RequestEndTimePolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+Messaging::RequestEndTimePolicy_var::operator ::Messaging::RequestEndTimePolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestEndTimePolicy_ptr
+Messaging::RequestEndTimePolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestEndTimePolicy_ptr
+Messaging::RequestEndTimePolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestEndTimePolicy_ptr &
+Messaging::RequestEndTimePolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestEndTimePolicy_ptr &
+Messaging::RequestEndTimePolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil ();
+  return this->ptr_;
+}
+
+::Messaging::RequestEndTimePolicy_ptr
+Messaging::RequestEndTimePolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::Messaging::RequestEndTimePolicy_ptr val = this->ptr_;
+  this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil ();
+  return val;
+}
+
+::Messaging::RequestEndTimePolicy_ptr
+Messaging::RequestEndTimePolicy_var::duplicate (RequestEndTimePolicy_ptr p)
+{
+  return ::Messaging::RequestEndTimePolicy::_duplicate (p);
+}
+
+void
+Messaging::RequestEndTimePolicy_var::release (RequestEndTimePolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::Messaging::RequestEndTimePolicy_ptr
+Messaging::RequestEndTimePolicy_var::nil (void)
+{
+  return ::Messaging::RequestEndTimePolicy::_nil ();
+}
+
+::Messaging::RequestEndTimePolicy_ptr
+Messaging::RequestEndTimePolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::Messaging::RequestEndTimePolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+Messaging::RequestEndTimePolicy_var::upcast (void *src)
+{
+  RequestEndTimePolicy **tmp =
+    ACE_static_cast (RequestEndTimePolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class Messaging::RequestEndTimePolicy_out
+// *************************************************************
+
+Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (RequestEndTimePolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil ();
+}
+
+Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (RequestEndTimePolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil ();
+}
+
+Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (const ::Messaging::RequestEndTimePolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (RequestEndTimePolicy_out &, p).ptr_)
+{}
+
+::Messaging::RequestEndTimePolicy_out &
+Messaging::RequestEndTimePolicy_out::operator= (const ::Messaging::RequestEndTimePolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (RequestEndTimePolicy_out&, p).ptr_;
+  return *this;
+}
+
+Messaging::RequestEndTimePolicy_out &
+Messaging::RequestEndTimePolicy_out::operator= (const ::Messaging::RequestEndTimePolicy_var &p)
+{
+  this->ptr_ = ::Messaging::RequestEndTimePolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+Messaging::RequestEndTimePolicy_out &
+Messaging::RequestEndTimePolicy_out::operator= (RequestEndTimePolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::RequestEndTimePolicy_out::operator ::Messaging::RequestEndTimePolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestEndTimePolicy_ptr &
+Messaging::RequestEndTimePolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::Messaging::RequestEndTimePolicy_ptr
+Messaging::RequestEndTimePolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 Messaging::RequestEndTimePolicy::RequestEndTimePolicy ()
 {
@@ -950,6 +2037,188 @@ TAO_NAMESPACE_BEGIN (Messaging)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_START_TIME_POLICY_TYPE, 29U)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class Messaging::ReplyStartTimePolicy_var
+// *************************************************************
+
+Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (void) // default constructor
+  : ptr_ (ReplyStartTimePolicy::_nil ())
+{}
+
+::Messaging::ReplyStartTimePolicy_ptr
+Messaging::ReplyStartTimePolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (const ::Messaging::ReplyStartTimePolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ReplyStartTimePolicy::_duplicate (p.ptr ()))
+{}
+
+Messaging::ReplyStartTimePolicy_var::~ReplyStartTimePolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+Messaging::ReplyStartTimePolicy_var &
+Messaging::ReplyStartTimePolicy_var::operator= (ReplyStartTimePolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::ReplyStartTimePolicy_var &
+Messaging::ReplyStartTimePolicy_var::operator= (const ::Messaging::ReplyStartTimePolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+Messaging::ReplyStartTimePolicy_var::operator const ::Messaging::ReplyStartTimePolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+Messaging::ReplyStartTimePolicy_var::operator ::Messaging::ReplyStartTimePolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyStartTimePolicy_ptr
+Messaging::ReplyStartTimePolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyStartTimePolicy_ptr
+Messaging::ReplyStartTimePolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyStartTimePolicy_ptr &
+Messaging::ReplyStartTimePolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyStartTimePolicy_ptr &
+Messaging::ReplyStartTimePolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil ();
+  return this->ptr_;
+}
+
+::Messaging::ReplyStartTimePolicy_ptr
+Messaging::ReplyStartTimePolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::Messaging::ReplyStartTimePolicy_ptr val = this->ptr_;
+  this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil ();
+  return val;
+}
+
+::Messaging::ReplyStartTimePolicy_ptr
+Messaging::ReplyStartTimePolicy_var::duplicate (ReplyStartTimePolicy_ptr p)
+{
+  return ::Messaging::ReplyStartTimePolicy::_duplicate (p);
+}
+
+void
+Messaging::ReplyStartTimePolicy_var::release (ReplyStartTimePolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::Messaging::ReplyStartTimePolicy_ptr
+Messaging::ReplyStartTimePolicy_var::nil (void)
+{
+  return ::Messaging::ReplyStartTimePolicy::_nil ();
+}
+
+::Messaging::ReplyStartTimePolicy_ptr
+Messaging::ReplyStartTimePolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::Messaging::ReplyStartTimePolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+Messaging::ReplyStartTimePolicy_var::upcast (void *src)
+{
+  ReplyStartTimePolicy **tmp =
+    ACE_static_cast (ReplyStartTimePolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class Messaging::ReplyStartTimePolicy_out
+// *************************************************************
+
+Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (ReplyStartTimePolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil ();
+}
+
+Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (ReplyStartTimePolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil ();
+}
+
+Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (const ::Messaging::ReplyStartTimePolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ReplyStartTimePolicy_out &, p).ptr_)
+{}
+
+::Messaging::ReplyStartTimePolicy_out &
+Messaging::ReplyStartTimePolicy_out::operator= (const ::Messaging::ReplyStartTimePolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (ReplyStartTimePolicy_out&, p).ptr_;
+  return *this;
+}
+
+Messaging::ReplyStartTimePolicy_out &
+Messaging::ReplyStartTimePolicy_out::operator= (const ::Messaging::ReplyStartTimePolicy_var &p)
+{
+  this->ptr_ = ::Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+Messaging::ReplyStartTimePolicy_out &
+Messaging::ReplyStartTimePolicy_out::operator= (ReplyStartTimePolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::ReplyStartTimePolicy_out::operator ::Messaging::ReplyStartTimePolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyStartTimePolicy_ptr &
+Messaging::ReplyStartTimePolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyStartTimePolicy_ptr
+Messaging::ReplyStartTimePolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy ()
 {
@@ -1039,6 +2308,188 @@ TAO_NAMESPACE_BEGIN (Messaging)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_END_TIME_POLICY_TYPE, 30U)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class Messaging::ReplyEndTimePolicy_var
+// *************************************************************
+
+Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (void) // default constructor
+  : ptr_ (ReplyEndTimePolicy::_nil ())
+{}
+
+::Messaging::ReplyEndTimePolicy_ptr
+Messaging::ReplyEndTimePolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (const ::Messaging::ReplyEndTimePolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ReplyEndTimePolicy::_duplicate (p.ptr ()))
+{}
+
+Messaging::ReplyEndTimePolicy_var::~ReplyEndTimePolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+Messaging::ReplyEndTimePolicy_var &
+Messaging::ReplyEndTimePolicy_var::operator= (ReplyEndTimePolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::ReplyEndTimePolicy_var &
+Messaging::ReplyEndTimePolicy_var::operator= (const ::Messaging::ReplyEndTimePolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+Messaging::ReplyEndTimePolicy_var::operator const ::Messaging::ReplyEndTimePolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+Messaging::ReplyEndTimePolicy_var::operator ::Messaging::ReplyEndTimePolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyEndTimePolicy_ptr
+Messaging::ReplyEndTimePolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyEndTimePolicy_ptr
+Messaging::ReplyEndTimePolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyEndTimePolicy_ptr &
+Messaging::ReplyEndTimePolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyEndTimePolicy_ptr &
+Messaging::ReplyEndTimePolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil ();
+  return this->ptr_;
+}
+
+::Messaging::ReplyEndTimePolicy_ptr
+Messaging::ReplyEndTimePolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::Messaging::ReplyEndTimePolicy_ptr val = this->ptr_;
+  this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil ();
+  return val;
+}
+
+::Messaging::ReplyEndTimePolicy_ptr
+Messaging::ReplyEndTimePolicy_var::duplicate (ReplyEndTimePolicy_ptr p)
+{
+  return ::Messaging::ReplyEndTimePolicy::_duplicate (p);
+}
+
+void
+Messaging::ReplyEndTimePolicy_var::release (ReplyEndTimePolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::Messaging::ReplyEndTimePolicy_ptr
+Messaging::ReplyEndTimePolicy_var::nil (void)
+{
+  return ::Messaging::ReplyEndTimePolicy::_nil ();
+}
+
+::Messaging::ReplyEndTimePolicy_ptr
+Messaging::ReplyEndTimePolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::Messaging::ReplyEndTimePolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+Messaging::ReplyEndTimePolicy_var::upcast (void *src)
+{
+  ReplyEndTimePolicy **tmp =
+    ACE_static_cast (ReplyEndTimePolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class Messaging::ReplyEndTimePolicy_out
+// *************************************************************
+
+Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (ReplyEndTimePolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil ();
+}
+
+Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (ReplyEndTimePolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil ();
+}
+
+Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (const ::Messaging::ReplyEndTimePolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ReplyEndTimePolicy_out &, p).ptr_)
+{}
+
+::Messaging::ReplyEndTimePolicy_out &
+Messaging::ReplyEndTimePolicy_out::operator= (const ::Messaging::ReplyEndTimePolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (ReplyEndTimePolicy_out&, p).ptr_;
+  return *this;
+}
+
+Messaging::ReplyEndTimePolicy_out &
+Messaging::ReplyEndTimePolicy_out::operator= (const ::Messaging::ReplyEndTimePolicy_var &p)
+{
+  this->ptr_ = ::Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+Messaging::ReplyEndTimePolicy_out &
+Messaging::ReplyEndTimePolicy_out::operator= (ReplyEndTimePolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::ReplyEndTimePolicy_out::operator ::Messaging::ReplyEndTimePolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyEndTimePolicy_ptr &
+Messaging::ReplyEndTimePolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyEndTimePolicy_ptr
+Messaging::ReplyEndTimePolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy ()
 {
@@ -1128,6 +2579,188 @@ TAO_NAMESPACE_BEGIN (Messaging)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, RELATIVE_REQ_TIMEOUT_POLICY_TYPE, 31U)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class Messaging::RelativeRequestTimeoutPolicy_var
+// *************************************************************
+
+Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (void) // default constructor
+  : ptr_ (RelativeRequestTimeoutPolicy::_nil ())
+{}
+
+::Messaging::RelativeRequestTimeoutPolicy_ptr
+Messaging::RelativeRequestTimeoutPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (const ::Messaging::RelativeRequestTimeoutPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (RelativeRequestTimeoutPolicy::_duplicate (p.ptr ()))
+{}
+
+Messaging::RelativeRequestTimeoutPolicy_var::~RelativeRequestTimeoutPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+Messaging::RelativeRequestTimeoutPolicy_var &
+Messaging::RelativeRequestTimeoutPolicy_var::operator= (RelativeRequestTimeoutPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::RelativeRequestTimeoutPolicy_var &
+Messaging::RelativeRequestTimeoutPolicy_var::operator= (const ::Messaging::RelativeRequestTimeoutPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+Messaging::RelativeRequestTimeoutPolicy_var::operator const ::Messaging::RelativeRequestTimeoutPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+Messaging::RelativeRequestTimeoutPolicy_var::operator ::Messaging::RelativeRequestTimeoutPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::Messaging::RelativeRequestTimeoutPolicy_ptr
+Messaging::RelativeRequestTimeoutPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::RelativeRequestTimeoutPolicy_ptr
+Messaging::RelativeRequestTimeoutPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::RelativeRequestTimeoutPolicy_ptr &
+Messaging::RelativeRequestTimeoutPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::Messaging::RelativeRequestTimeoutPolicy_ptr &
+Messaging::RelativeRequestTimeoutPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil ();
+  return this->ptr_;
+}
+
+::Messaging::RelativeRequestTimeoutPolicy_ptr
+Messaging::RelativeRequestTimeoutPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::Messaging::RelativeRequestTimeoutPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil ();
+  return val;
+}
+
+::Messaging::RelativeRequestTimeoutPolicy_ptr
+Messaging::RelativeRequestTimeoutPolicy_var::duplicate (RelativeRequestTimeoutPolicy_ptr p)
+{
+  return ::Messaging::RelativeRequestTimeoutPolicy::_duplicate (p);
+}
+
+void
+Messaging::RelativeRequestTimeoutPolicy_var::release (RelativeRequestTimeoutPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::Messaging::RelativeRequestTimeoutPolicy_ptr
+Messaging::RelativeRequestTimeoutPolicy_var::nil (void)
+{
+  return ::Messaging::RelativeRequestTimeoutPolicy::_nil ();
+}
+
+::Messaging::RelativeRequestTimeoutPolicy_ptr
+Messaging::RelativeRequestTimeoutPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::Messaging::RelativeRequestTimeoutPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+Messaging::RelativeRequestTimeoutPolicy_var::upcast (void *src)
+{
+  RelativeRequestTimeoutPolicy **tmp =
+    ACE_static_cast (RelativeRequestTimeoutPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class Messaging::RelativeRequestTimeoutPolicy_out
+// *************************************************************
+
+Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil ();
+}
+
+Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil ();
+}
+
+Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (const ::Messaging::RelativeRequestTimeoutPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (RelativeRequestTimeoutPolicy_out &, p).ptr_)
+{}
+
+::Messaging::RelativeRequestTimeoutPolicy_out &
+Messaging::RelativeRequestTimeoutPolicy_out::operator= (const ::Messaging::RelativeRequestTimeoutPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (RelativeRequestTimeoutPolicy_out&, p).ptr_;
+  return *this;
+}
+
+Messaging::RelativeRequestTimeoutPolicy_out &
+Messaging::RelativeRequestTimeoutPolicy_out::operator= (const ::Messaging::RelativeRequestTimeoutPolicy_var &p)
+{
+  this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+Messaging::RelativeRequestTimeoutPolicy_out &
+Messaging::RelativeRequestTimeoutPolicy_out::operator= (RelativeRequestTimeoutPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::RelativeRequestTimeoutPolicy_out::operator ::Messaging::RelativeRequestTimeoutPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::Messaging::RelativeRequestTimeoutPolicy_ptr &
+Messaging::RelativeRequestTimeoutPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::Messaging::RelativeRequestTimeoutPolicy_ptr
+Messaging::RelativeRequestTimeoutPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy ()
 {
@@ -1217,6 +2850,188 @@ TAO_NAMESPACE_BEGIN (Messaging)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, RELATIVE_RT_TIMEOUT_POLICY_TYPE, 32U)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class Messaging::RelativeRoundtripTimeoutPolicy_var
+// *************************************************************
+
+Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (void) // default constructor
+  : ptr_ (RelativeRoundtripTimeoutPolicy::_nil ())
+{}
+
+::Messaging::RelativeRoundtripTimeoutPolicy_ptr
+Messaging::RelativeRoundtripTimeoutPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (const ::Messaging::RelativeRoundtripTimeoutPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ()))
+{}
+
+Messaging::RelativeRoundtripTimeoutPolicy_var::~RelativeRoundtripTimeoutPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+Messaging::RelativeRoundtripTimeoutPolicy_var &
+Messaging::RelativeRoundtripTimeoutPolicy_var::operator= (RelativeRoundtripTimeoutPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::RelativeRoundtripTimeoutPolicy_var &
+Messaging::RelativeRoundtripTimeoutPolicy_var::operator= (const ::Messaging::RelativeRoundtripTimeoutPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+Messaging::RelativeRoundtripTimeoutPolicy_var::operator const ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+Messaging::RelativeRoundtripTimeoutPolicy_var::operator ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::Messaging::RelativeRoundtripTimeoutPolicy_ptr
+Messaging::RelativeRoundtripTimeoutPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::RelativeRoundtripTimeoutPolicy_ptr
+Messaging::RelativeRoundtripTimeoutPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::RelativeRoundtripTimeoutPolicy_ptr &
+Messaging::RelativeRoundtripTimeoutPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::Messaging::RelativeRoundtripTimeoutPolicy_ptr &
+Messaging::RelativeRoundtripTimeoutPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
+  return this->ptr_;
+}
+
+::Messaging::RelativeRoundtripTimeoutPolicy_ptr
+Messaging::RelativeRoundtripTimeoutPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::Messaging::RelativeRoundtripTimeoutPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
+  return val;
+}
+
+::Messaging::RelativeRoundtripTimeoutPolicy_ptr
+Messaging::RelativeRoundtripTimeoutPolicy_var::duplicate (RelativeRoundtripTimeoutPolicy_ptr p)
+{
+  return ::Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p);
+}
+
+void
+Messaging::RelativeRoundtripTimeoutPolicy_var::release (RelativeRoundtripTimeoutPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::Messaging::RelativeRoundtripTimeoutPolicy_ptr
+Messaging::RelativeRoundtripTimeoutPolicy_var::nil (void)
+{
+  return ::Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
+}
+
+::Messaging::RelativeRoundtripTimeoutPolicy_ptr
+Messaging::RelativeRoundtripTimeoutPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::Messaging::RelativeRoundtripTimeoutPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+Messaging::RelativeRoundtripTimeoutPolicy_var::upcast (void *src)
+{
+  RelativeRoundtripTimeoutPolicy **tmp =
+    ACE_static_cast (RelativeRoundtripTimeoutPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class Messaging::RelativeRoundtripTimeoutPolicy_out
+// *************************************************************
+
+Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
+}
+
+Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
+}
+
+Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (const ::Messaging::RelativeRoundtripTimeoutPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (RelativeRoundtripTimeoutPolicy_out &, p).ptr_)
+{}
+
+::Messaging::RelativeRoundtripTimeoutPolicy_out &
+Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (const ::Messaging::RelativeRoundtripTimeoutPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (RelativeRoundtripTimeoutPolicy_out&, p).ptr_;
+  return *this;
+}
+
+Messaging::RelativeRoundtripTimeoutPolicy_out &
+Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (const ::Messaging::RelativeRoundtripTimeoutPolicy_var &p)
+{
+  this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+Messaging::RelativeRoundtripTimeoutPolicy_out &
+Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (RelativeRoundtripTimeoutPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::RelativeRoundtripTimeoutPolicy_out::operator ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::Messaging::RelativeRoundtripTimeoutPolicy_ptr &
+Messaging::RelativeRoundtripTimeoutPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::Messaging::RelativeRoundtripTimeoutPolicy_ptr
+Messaging::RelativeRoundtripTimeoutPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy ()
 {
@@ -1395,6 +3210,188 @@ void Messaging::RoutingTypeRange::_tao_any_destructor (void *x)
 }
 
 
+// *************************************************************
+// Operations for class Messaging::RoutingPolicy_var
+// *************************************************************
+
+Messaging::RoutingPolicy_var::RoutingPolicy_var (void) // default constructor
+  : ptr_ (RoutingPolicy::_nil ())
+{}
+
+::Messaging::RoutingPolicy_ptr
+Messaging::RoutingPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+Messaging::RoutingPolicy_var::RoutingPolicy_var (const ::Messaging::RoutingPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (RoutingPolicy::_duplicate (p.ptr ()))
+{}
+
+Messaging::RoutingPolicy_var::~RoutingPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+Messaging::RoutingPolicy_var &
+Messaging::RoutingPolicy_var::operator= (RoutingPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::RoutingPolicy_var &
+Messaging::RoutingPolicy_var::operator= (const ::Messaging::RoutingPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::Messaging::RoutingPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+Messaging::RoutingPolicy_var::operator const ::Messaging::RoutingPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+Messaging::RoutingPolicy_var::operator ::Messaging::RoutingPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::Messaging::RoutingPolicy_ptr
+Messaging::RoutingPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::RoutingPolicy_ptr
+Messaging::RoutingPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::RoutingPolicy_ptr &
+Messaging::RoutingPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::Messaging::RoutingPolicy_ptr &
+Messaging::RoutingPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::RoutingPolicy::_nil ();
+  return this->ptr_;
+}
+
+::Messaging::RoutingPolicy_ptr
+Messaging::RoutingPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::Messaging::RoutingPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::Messaging::RoutingPolicy::_nil ();
+  return val;
+}
+
+::Messaging::RoutingPolicy_ptr
+Messaging::RoutingPolicy_var::duplicate (RoutingPolicy_ptr p)
+{
+  return ::Messaging::RoutingPolicy::_duplicate (p);
+}
+
+void
+Messaging::RoutingPolicy_var::release (RoutingPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::Messaging::RoutingPolicy_ptr
+Messaging::RoutingPolicy_var::nil (void)
+{
+  return ::Messaging::RoutingPolicy::_nil ();
+}
+
+::Messaging::RoutingPolicy_ptr
+Messaging::RoutingPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::Messaging::RoutingPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+Messaging::RoutingPolicy_var::upcast (void *src)
+{
+  RoutingPolicy **tmp =
+    ACE_static_cast (RoutingPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class Messaging::RoutingPolicy_out
+// *************************************************************
+
+Messaging::RoutingPolicy_out::RoutingPolicy_out (RoutingPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::Messaging::RoutingPolicy::_nil ();
+}
+
+Messaging::RoutingPolicy_out::RoutingPolicy_out (RoutingPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::RoutingPolicy::_nil ();
+}
+
+Messaging::RoutingPolicy_out::RoutingPolicy_out (const ::Messaging::RoutingPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (RoutingPolicy_out &, p).ptr_)
+{}
+
+::Messaging::RoutingPolicy_out &
+Messaging::RoutingPolicy_out::operator= (const ::Messaging::RoutingPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (RoutingPolicy_out&, p).ptr_;
+  return *this;
+}
+
+Messaging::RoutingPolicy_out &
+Messaging::RoutingPolicy_out::operator= (const ::Messaging::RoutingPolicy_var &p)
+{
+  this->ptr_ = ::Messaging::RoutingPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+Messaging::RoutingPolicy_out &
+Messaging::RoutingPolicy_out::operator= (RoutingPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::RoutingPolicy_out::operator ::Messaging::RoutingPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::Messaging::RoutingPolicy_ptr &
+Messaging::RoutingPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::Messaging::RoutingPolicy_ptr
+Messaging::RoutingPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 Messaging::RoutingPolicy::RoutingPolicy ()
 {
@@ -1484,6 +3481,188 @@ TAO_NAMESPACE_BEGIN (Messaging)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, MAX_HOPS_POLICY_TYPE, 34U)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class Messaging::MaxHopsPolicy_var
+// *************************************************************
+
+Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (void) // default constructor
+  : ptr_ (MaxHopsPolicy::_nil ())
+{}
+
+::Messaging::MaxHopsPolicy_ptr
+Messaging::MaxHopsPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (const ::Messaging::MaxHopsPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (MaxHopsPolicy::_duplicate (p.ptr ()))
+{}
+
+Messaging::MaxHopsPolicy_var::~MaxHopsPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+Messaging::MaxHopsPolicy_var &
+Messaging::MaxHopsPolicy_var::operator= (MaxHopsPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::MaxHopsPolicy_var &
+Messaging::MaxHopsPolicy_var::operator= (const ::Messaging::MaxHopsPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::Messaging::MaxHopsPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+Messaging::MaxHopsPolicy_var::operator const ::Messaging::MaxHopsPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+Messaging::MaxHopsPolicy_var::operator ::Messaging::MaxHopsPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::Messaging::MaxHopsPolicy_ptr
+Messaging::MaxHopsPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::MaxHopsPolicy_ptr
+Messaging::MaxHopsPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::MaxHopsPolicy_ptr &
+Messaging::MaxHopsPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::Messaging::MaxHopsPolicy_ptr &
+Messaging::MaxHopsPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::MaxHopsPolicy::_nil ();
+  return this->ptr_;
+}
+
+::Messaging::MaxHopsPolicy_ptr
+Messaging::MaxHopsPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::Messaging::MaxHopsPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::Messaging::MaxHopsPolicy::_nil ();
+  return val;
+}
+
+::Messaging::MaxHopsPolicy_ptr
+Messaging::MaxHopsPolicy_var::duplicate (MaxHopsPolicy_ptr p)
+{
+  return ::Messaging::MaxHopsPolicy::_duplicate (p);
+}
+
+void
+Messaging::MaxHopsPolicy_var::release (MaxHopsPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::Messaging::MaxHopsPolicy_ptr
+Messaging::MaxHopsPolicy_var::nil (void)
+{
+  return ::Messaging::MaxHopsPolicy::_nil ();
+}
+
+::Messaging::MaxHopsPolicy_ptr
+Messaging::MaxHopsPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::Messaging::MaxHopsPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+Messaging::MaxHopsPolicy_var::upcast (void *src)
+{
+  MaxHopsPolicy **tmp =
+    ACE_static_cast (MaxHopsPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class Messaging::MaxHopsPolicy_out
+// *************************************************************
+
+Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (MaxHopsPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::Messaging::MaxHopsPolicy::_nil ();
+}
+
+Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (MaxHopsPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::MaxHopsPolicy::_nil ();
+}
+
+Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (const ::Messaging::MaxHopsPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (MaxHopsPolicy_out &, p).ptr_)
+{}
+
+::Messaging::MaxHopsPolicy_out &
+Messaging::MaxHopsPolicy_out::operator= (const ::Messaging::MaxHopsPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (MaxHopsPolicy_out&, p).ptr_;
+  return *this;
+}
+
+Messaging::MaxHopsPolicy_out &
+Messaging::MaxHopsPolicy_out::operator= (const ::Messaging::MaxHopsPolicy_var &p)
+{
+  this->ptr_ = ::Messaging::MaxHopsPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+Messaging::MaxHopsPolicy_out &
+Messaging::MaxHopsPolicy_out::operator= (MaxHopsPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::MaxHopsPolicy_out::operator ::Messaging::MaxHopsPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::Messaging::MaxHopsPolicy_ptr &
+Messaging::MaxHopsPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::Messaging::MaxHopsPolicy_ptr
+Messaging::MaxHopsPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 Messaging::MaxHopsPolicy::MaxHopsPolicy ()
 {
@@ -1573,6 +3752,188 @@ TAO_NAMESPACE_BEGIN (Messaging)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, QUEUE_ORDER_POLICY_TYPE, 35U)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class Messaging::QueueOrderPolicy_var
+// *************************************************************
+
+Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (void) // default constructor
+  : ptr_ (QueueOrderPolicy::_nil ())
+{}
+
+::Messaging::QueueOrderPolicy_ptr
+Messaging::QueueOrderPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (const ::Messaging::QueueOrderPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (QueueOrderPolicy::_duplicate (p.ptr ()))
+{}
+
+Messaging::QueueOrderPolicy_var::~QueueOrderPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+Messaging::QueueOrderPolicy_var &
+Messaging::QueueOrderPolicy_var::operator= (QueueOrderPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::QueueOrderPolicy_var &
+Messaging::QueueOrderPolicy_var::operator= (const ::Messaging::QueueOrderPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::Messaging::QueueOrderPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+Messaging::QueueOrderPolicy_var::operator const ::Messaging::QueueOrderPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+Messaging::QueueOrderPolicy_var::operator ::Messaging::QueueOrderPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::Messaging::QueueOrderPolicy_ptr
+Messaging::QueueOrderPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::QueueOrderPolicy_ptr
+Messaging::QueueOrderPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::QueueOrderPolicy_ptr &
+Messaging::QueueOrderPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::Messaging::QueueOrderPolicy_ptr &
+Messaging::QueueOrderPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::QueueOrderPolicy::_nil ();
+  return this->ptr_;
+}
+
+::Messaging::QueueOrderPolicy_ptr
+Messaging::QueueOrderPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::Messaging::QueueOrderPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::Messaging::QueueOrderPolicy::_nil ();
+  return val;
+}
+
+::Messaging::QueueOrderPolicy_ptr
+Messaging::QueueOrderPolicy_var::duplicate (QueueOrderPolicy_ptr p)
+{
+  return ::Messaging::QueueOrderPolicy::_duplicate (p);
+}
+
+void
+Messaging::QueueOrderPolicy_var::release (QueueOrderPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::Messaging::QueueOrderPolicy_ptr
+Messaging::QueueOrderPolicy_var::nil (void)
+{
+  return ::Messaging::QueueOrderPolicy::_nil ();
+}
+
+::Messaging::QueueOrderPolicy_ptr
+Messaging::QueueOrderPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::Messaging::QueueOrderPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+Messaging::QueueOrderPolicy_var::upcast (void *src)
+{
+  QueueOrderPolicy **tmp =
+    ACE_static_cast (QueueOrderPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class Messaging::QueueOrderPolicy_out
+// *************************************************************
+
+Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (QueueOrderPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::Messaging::QueueOrderPolicy::_nil ();
+}
+
+Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (QueueOrderPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::QueueOrderPolicy::_nil ();
+}
+
+Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (const ::Messaging::QueueOrderPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (QueueOrderPolicy_out &, p).ptr_)
+{}
+
+::Messaging::QueueOrderPolicy_out &
+Messaging::QueueOrderPolicy_out::operator= (const ::Messaging::QueueOrderPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (QueueOrderPolicy_out&, p).ptr_;
+  return *this;
+}
+
+Messaging::QueueOrderPolicy_out &
+Messaging::QueueOrderPolicy_out::operator= (const ::Messaging::QueueOrderPolicy_var &p)
+{
+  this->ptr_ = ::Messaging::QueueOrderPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+Messaging::QueueOrderPolicy_out &
+Messaging::QueueOrderPolicy_out::operator= (QueueOrderPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::QueueOrderPolicy_out::operator ::Messaging::QueueOrderPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::Messaging::QueueOrderPolicy_ptr &
+Messaging::QueueOrderPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::Messaging::QueueOrderPolicy_ptr
+Messaging::QueueOrderPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 Messaging::QueueOrderPolicy::QueueOrderPolicy ()
 {
@@ -2050,6 +4411,188 @@ Messaging::ExceptionHolder_init::tao_repository_id (void)
 #endif /* end #if !defined */
 
 
+// *************************************************************
+// Operations for class Messaging::ReplyHandler_var
+// *************************************************************
+
+Messaging::ReplyHandler_var::ReplyHandler_var (void) // default constructor
+  : ptr_ (ReplyHandler::_nil ())
+{}
+
+::Messaging::ReplyHandler_ptr
+Messaging::ReplyHandler_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+Messaging::ReplyHandler_var::ReplyHandler_var (const ::Messaging::ReplyHandler_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ReplyHandler::_duplicate (p.ptr ()))
+{}
+
+Messaging::ReplyHandler_var::~ReplyHandler_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+Messaging::ReplyHandler_var &
+Messaging::ReplyHandler_var::operator= (ReplyHandler_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::ReplyHandler_var &
+Messaging::ReplyHandler_var::operator= (const ::Messaging::ReplyHandler_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::Messaging::ReplyHandler::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+Messaging::ReplyHandler_var::operator const ::Messaging::ReplyHandler_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+Messaging::ReplyHandler_var::operator ::Messaging::ReplyHandler_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyHandler_ptr
+Messaging::ReplyHandler_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyHandler_ptr
+Messaging::ReplyHandler_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyHandler_ptr &
+Messaging::ReplyHandler_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyHandler_ptr &
+Messaging::ReplyHandler_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::ReplyHandler::_nil ();
+  return this->ptr_;
+}
+
+::Messaging::ReplyHandler_ptr
+Messaging::ReplyHandler_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::Messaging::ReplyHandler_ptr val = this->ptr_;
+  this->ptr_ = ::Messaging::ReplyHandler::_nil ();
+  return val;
+}
+
+::Messaging::ReplyHandler_ptr
+Messaging::ReplyHandler_var::duplicate (ReplyHandler_ptr p)
+{
+  return ::Messaging::ReplyHandler::_duplicate (p);
+}
+
+void
+Messaging::ReplyHandler_var::release (ReplyHandler_ptr p)
+{
+  CORBA::release (p);
+}
+
+::Messaging::ReplyHandler_ptr
+Messaging::ReplyHandler_var::nil (void)
+{
+  return ::Messaging::ReplyHandler::_nil ();
+}
+
+::Messaging::ReplyHandler_ptr
+Messaging::ReplyHandler_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::Messaging::ReplyHandler::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+Messaging::ReplyHandler_var::upcast (void *src)
+{
+  ReplyHandler **tmp =
+    ACE_static_cast (ReplyHandler **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class Messaging::ReplyHandler_out
+// *************************************************************
+
+Messaging::ReplyHandler_out::ReplyHandler_out (ReplyHandler_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::Messaging::ReplyHandler::_nil ();
+}
+
+Messaging::ReplyHandler_out::ReplyHandler_out (ReplyHandler_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::Messaging::ReplyHandler::_nil ();
+}
+
+Messaging::ReplyHandler_out::ReplyHandler_out (const ::Messaging::ReplyHandler_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ReplyHandler_out &, p).ptr_)
+{}
+
+::Messaging::ReplyHandler_out &
+Messaging::ReplyHandler_out::operator= (const ::Messaging::ReplyHandler_out &p)
+{
+  this->ptr_ = ACE_const_cast (ReplyHandler_out&, p).ptr_;
+  return *this;
+}
+
+Messaging::ReplyHandler_out &
+Messaging::ReplyHandler_out::operator= (const ::Messaging::ReplyHandler_var &p)
+{
+  this->ptr_ = ::Messaging::ReplyHandler::_duplicate (p.ptr ());
+  return *this;
+}
+
+Messaging::ReplyHandler_out &
+Messaging::ReplyHandler_out::operator= (ReplyHandler_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+Messaging::ReplyHandler_out::operator ::Messaging::ReplyHandler_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyHandler_ptr &
+Messaging::ReplyHandler_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::Messaging::ReplyHandler_ptr
+Messaging::ReplyHandler_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 #if (TAO_HAS_INTERCEPTORS == 1)
 #endif /* TAO_HAS_INTERCEPTORS */
 
@@ -3006,4 +5549,40 @@ CORBA::Boolean operator>> (
   return 0; // error
 }
 
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const Messaging::ReplyHandler_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    Messaging::ReplyHandler_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      Messaging::ReplyHandler::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
index ae5cdd94a1d..0b67e1e717b 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -171,6 +171,14 @@ TAO_NAMESPACE  Messaging
     RebindPolicy_ptr _retn (void);
     RebindPolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static RebindPolicy_ptr duplicate (RebindPolicy_ptr);
+    static void release (RebindPolicy_ptr);
+    static RebindPolicy_ptr nil (void);
+    static RebindPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     RebindPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -298,6 +306,14 @@ class TAO_Export RebindPolicy: public virtual CORBA::Policy
     SyncScopePolicy_ptr _retn (void);
     SyncScopePolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static SyncScopePolicy_ptr duplicate (SyncScopePolicy_ptr);
+    static void release (SyncScopePolicy_ptr);
+    static SyncScopePolicy_ptr nil (void);
+    static SyncScopePolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     SyncScopePolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -475,6 +491,14 @@ class TAO_Export SyncScopePolicy: public virtual CORBA::Policy
     RequestPriorityPolicy_ptr _retn (void);
     RequestPriorityPolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static RequestPriorityPolicy_ptr duplicate (RequestPriorityPolicy_ptr);
+    static void release (RequestPriorityPolicy_ptr);
+    static RequestPriorityPolicy_ptr nil (void);
+    static RequestPriorityPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     RequestPriorityPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -598,6 +622,14 @@ class TAO_Export RequestPriorityPolicy: public virtual CORBA::Policy
     ReplyPriorityPolicy_ptr _retn (void);
     ReplyPriorityPolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ReplyPriorityPolicy_ptr duplicate (ReplyPriorityPolicy_ptr);
+    static void release (ReplyPriorityPolicy_ptr);
+    static ReplyPriorityPolicy_ptr nil (void);
+    static ReplyPriorityPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ReplyPriorityPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -725,6 +757,14 @@ class TAO_Export ReplyPriorityPolicy: public virtual CORBA::Policy
     RequestStartTimePolicy_ptr _retn (void);
     RequestStartTimePolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static RequestStartTimePolicy_ptr duplicate (RequestStartTimePolicy_ptr);
+    static void release (RequestStartTimePolicy_ptr);
+    static RequestStartTimePolicy_ptr nil (void);
+    static RequestStartTimePolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     RequestStartTimePolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -852,6 +892,14 @@ class TAO_Export RequestStartTimePolicy: public virtual CORBA::Policy
     RequestEndTimePolicy_ptr _retn (void);
     RequestEndTimePolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static RequestEndTimePolicy_ptr duplicate (RequestEndTimePolicy_ptr);
+    static void release (RequestEndTimePolicy_ptr);
+    static RequestEndTimePolicy_ptr nil (void);
+    static RequestEndTimePolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     RequestEndTimePolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -979,6 +1027,14 @@ class TAO_Export RequestEndTimePolicy: public virtual CORBA::Policy
     ReplyStartTimePolicy_ptr _retn (void);
     ReplyStartTimePolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ReplyStartTimePolicy_ptr duplicate (ReplyStartTimePolicy_ptr);
+    static void release (ReplyStartTimePolicy_ptr);
+    static ReplyStartTimePolicy_ptr nil (void);
+    static ReplyStartTimePolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ReplyStartTimePolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1106,6 +1162,14 @@ class TAO_Export ReplyStartTimePolicy: public virtual CORBA::Policy
     ReplyEndTimePolicy_ptr _retn (void);
     ReplyEndTimePolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ReplyEndTimePolicy_ptr duplicate (ReplyEndTimePolicy_ptr);
+    static void release (ReplyEndTimePolicy_ptr);
+    static ReplyEndTimePolicy_ptr nil (void);
+    static ReplyEndTimePolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ReplyEndTimePolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1233,6 +1297,14 @@ class TAO_Export ReplyEndTimePolicy: public virtual CORBA::Policy
     RelativeRequestTimeoutPolicy_ptr _retn (void);
     RelativeRequestTimeoutPolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static RelativeRequestTimeoutPolicy_ptr duplicate (RelativeRequestTimeoutPolicy_ptr);
+    static void release (RelativeRequestTimeoutPolicy_ptr);
+    static RelativeRequestTimeoutPolicy_ptr nil (void);
+    static RelativeRequestTimeoutPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     RelativeRequestTimeoutPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1360,6 +1432,14 @@ class TAO_Export RelativeRequestTimeoutPolicy: public virtual CORBA::Policy
     RelativeRoundtripTimeoutPolicy_ptr _retn (void);
     RelativeRoundtripTimeoutPolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static RelativeRoundtripTimeoutPolicy_ptr duplicate (RelativeRoundtripTimeoutPolicy_ptr);
+    static void release (RelativeRoundtripTimeoutPolicy_ptr);
+    static RelativeRoundtripTimeoutPolicy_ptr nil (void);
+    static RelativeRoundtripTimeoutPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     RelativeRoundtripTimeoutPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1537,6 +1617,14 @@ class TAO_Export RelativeRoundtripTimeoutPolicy: public virtual CORBA::Policy
     RoutingPolicy_ptr _retn (void);
     RoutingPolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static RoutingPolicy_ptr duplicate (RoutingPolicy_ptr);
+    static void release (RoutingPolicy_ptr);
+    static RoutingPolicy_ptr nil (void);
+    static RoutingPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     RoutingPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1664,6 +1752,14 @@ class TAO_Export RoutingPolicy: public virtual CORBA::Policy
     MaxHopsPolicy_ptr _retn (void);
     MaxHopsPolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static MaxHopsPolicy_ptr duplicate (MaxHopsPolicy_ptr);
+    static void release (MaxHopsPolicy_ptr);
+    static MaxHopsPolicy_ptr nil (void);
+    static MaxHopsPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     MaxHopsPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1791,6 +1887,14 @@ class TAO_Export MaxHopsPolicy: public virtual CORBA::Policy
     QueueOrderPolicy_ptr _retn (void);
     QueueOrderPolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static QueueOrderPolicy_ptr duplicate (QueueOrderPolicy_ptr);
+    static void release (QueueOrderPolicy_ptr);
+    static QueueOrderPolicy_ptr nil (void);
+    static QueueOrderPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     QueueOrderPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2369,6 +2473,14 @@ class TAO_Export QueueOrderPolicy: public virtual CORBA::Policy
     ReplyHandler_ptr _retn (void);
     ReplyHandler_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ReplyHandler_ptr duplicate (ReplyHandler_ptr);
+    static void release (ReplyHandler_ptr);
+    static ReplyHandler_ptr nil (void);
+    static ReplyHandler_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ReplyHandler_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2595,7 +2707,9 @@ TAO_NAMESPACE_CLOSE // module Messaging
 
 #if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 
-extern TAO_Export Messaging::_TAO_ReplyHandler_Proxy_Broker * (*Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer) (
+extern TAO_Export
+Messaging::_TAO_ReplyHandler_Proxy_Broker *
+(*Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i
index 2435f5d14fd..0d55151d8cf 100644
--- a/TAO/tao/MessagingC.i
+++ b/TAO/tao/MessagingC.i
@@ -20,346 +20,106 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-#if !defined (_MESSAGING_REBINDPOLICY___VAR_CI_)
-#define _MESSAGING_REBINDPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::RebindPolicy_var
-// *************************************************************
-
 #if (TAO_HAS_REBIND_POLICY == 1)
 
-ACE_INLINE
-Messaging::RebindPolicy_var::RebindPolicy_var (void) // default constructor
-  : ptr_ (RebindPolicy::_nil ())
-{}
-
-ACE_INLINE ::Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_var::RebindPolicy_var (const ::Messaging::RebindPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (RebindPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RebindPolicy_var::~RebindPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RebindPolicy_var &
-Messaging::RebindPolicy_var::operator= (RebindPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RebindPolicy_var &
-Messaging::RebindPolicy_var::operator= (const ::Messaging::RebindPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::RebindPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_var::operator const ::Messaging::RebindPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_var::operator ::Messaging::RebindPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
+#if !defined (_MESSAGING_REBINDPOLICY___CI_)
+#define _MESSAGING_REBINDPOLICY___CI_
 
-ACE_INLINE ::Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RebindPolicy_ptr &
-Messaging::RebindPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RebindPolicy_ptr &
-Messaging::RebindPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RebindPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::RebindPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::RebindPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_MESSAGING_REBINDPOLICY___OUT_CI_)
-#define _MESSAGING_REBINDPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::RebindPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RebindPolicy_out::RebindPolicy_out (RebindPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::RebindPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_out::RebindPolicy_out (RebindPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RebindPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_out::RebindPolicy_out (const ::Messaging::RebindPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (RebindPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::Messaging::RebindPolicy_out &
-Messaging::RebindPolicy_out::operator= (const ::Messaging::RebindPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (RebindPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RebindPolicy_out &
-Messaging::RebindPolicy_out::operator= (const ::Messaging::RebindPolicy_var &p)
+ACE_INLINE Messaging::RebindPolicy_ptr
+tao_Messaging_RebindPolicy_duplicate (
+    Messaging::RebindPolicy_ptr p
+  )
 {
-  this->ptr_ = ::Messaging::RebindPolicy::_duplicate (p.ptr ());
-  return *this;
+  return Messaging::RebindPolicy::_duplicate (p);
 }
 
-ACE_INLINE Messaging::RebindPolicy_out &
-Messaging::RebindPolicy_out::operator= (RebindPolicy_ptr p)
+ACE_INLINE void
+tao_Messaging_RebindPolicy_release (
+    Messaging::RebindPolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-Messaging::RebindPolicy_out::operator ::Messaging::RebindPolicy_ptr &() // cast
+ACE_INLINE Messaging::RebindPolicy_ptr
+tao_Messaging_RebindPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return Messaging::RebindPolicy::_nil ();
 }
 
-ACE_INLINE ::Messaging::RebindPolicy_ptr &
-Messaging::RebindPolicy_out::ptr (void) // ptr
+ACE_INLINE Messaging::RebindPolicy_ptr
+tao_Messaging_RebindPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return Messaging::RebindPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_Messaging_RebindPolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  Messaging::RebindPolicy **tmp =
+    ACE_static_cast (Messaging::RebindPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_MESSAGING_SYNCSCOPEPOLICY___VAR_CI_)
-#define _MESSAGING_SYNCSCOPEPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::SyncScopePolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::SyncScopePolicy_var::SyncScopePolicy_var (void) // default constructor
-  : ptr_ (SyncScopePolicy::_nil ())
-{}
-
-ACE_INLINE ::Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
 #endif /* TAO_HAS_REBIND_POLICY == 1 */
 
 #if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
 
-ACE_INLINE
-Messaging::SyncScopePolicy_var::SyncScopePolicy_var (const ::Messaging::SyncScopePolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (SyncScopePolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_var::~SyncScopePolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_var &
-Messaging::SyncScopePolicy_var::operator= (SyncScopePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_var &
-Messaging::SyncScopePolicy_var::operator= (const ::Messaging::SyncScopePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::SyncScopePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_var::operator const ::Messaging::SyncScopePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_var::operator ::Messaging::SyncScopePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::SyncScopePolicy_ptr &
-Messaging::SyncScopePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::SyncScopePolicy_ptr &
-Messaging::SyncScopePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::SyncScopePolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::SyncScopePolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::SyncScopePolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_MESSAGING_SYNCSCOPEPOLICY___OUT_CI_)
-#define _MESSAGING_SYNCSCOPEPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::SyncScopePolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::SyncScopePolicy_out::SyncScopePolicy_out (SyncScopePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::SyncScopePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_out::SyncScopePolicy_out (SyncScopePolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::SyncScopePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_out::SyncScopePolicy_out (const ::Messaging::SyncScopePolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (SyncScopePolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::Messaging::SyncScopePolicy_out &
-Messaging::SyncScopePolicy_out::operator= (const ::Messaging::SyncScopePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (SyncScopePolicy_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_MESSAGING_SYNCSCOPEPOLICY___CI_)
+#define _MESSAGING_SYNCSCOPEPOLICY___CI_
 
-ACE_INLINE Messaging::SyncScopePolicy_out &
-Messaging::SyncScopePolicy_out::operator= (const ::Messaging::SyncScopePolicy_var &p)
+ACE_INLINE Messaging::SyncScopePolicy_ptr
+tao_Messaging_SyncScopePolicy_duplicate (
+    Messaging::SyncScopePolicy_ptr p
+  )
 {
-  this->ptr_ = ::Messaging::SyncScopePolicy::_duplicate (p.ptr ());
-  return *this;
+  return Messaging::SyncScopePolicy::_duplicate (p);
 }
 
-ACE_INLINE Messaging::SyncScopePolicy_out &
-Messaging::SyncScopePolicy_out::operator= (SyncScopePolicy_ptr p)
+ACE_INLINE void
+tao_Messaging_SyncScopePolicy_release (
+    Messaging::SyncScopePolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-Messaging::SyncScopePolicy_out::operator ::Messaging::SyncScopePolicy_ptr &() // cast
+ACE_INLINE Messaging::SyncScopePolicy_ptr
+tao_Messaging_SyncScopePolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return Messaging::SyncScopePolicy::_nil ();
 }
 
-ACE_INLINE ::Messaging::SyncScopePolicy_ptr &
-Messaging::SyncScopePolicy_out::ptr (void) // ptr
+ACE_INLINE Messaging::SyncScopePolicy_ptr
+tao_Messaging_SyncScopePolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return Messaging::SyncScopePolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_Messaging_SyncScopePolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  Messaging::SyncScopePolicy **tmp =
+    ACE_static_cast (Messaging::SyncScopePolicy **, src);
+  return *tmp;
 }
 
 
@@ -515,1397 +275,437 @@ Messaging::PriorityRange_var::ptr (void) const
 }
 
 
-#if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___VAR_CI_)
-#define _MESSAGING_REQUESTPRIORITYPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::RequestPriorityPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (void) // default constructor
-  : ptr_ (RequestPriorityPolicy::_nil ())
-{}
-
-ACE_INLINE ::Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (const ::Messaging::RequestPriorityPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (RequestPriorityPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::~RequestPriorityPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_var &
-Messaging::RequestPriorityPolicy_var::operator= (RequestPriorityPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_var &
-Messaging::RequestPriorityPolicy_var::operator= (const ::Messaging::RequestPriorityPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::RequestPriorityPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::operator const ::Messaging::RequestPriorityPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::operator ::Messaging::RequestPriorityPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestPriorityPolicy_ptr &
-Messaging::RequestPriorityPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestPriorityPolicy_ptr &
-Messaging::RequestPriorityPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::RequestPriorityPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___OUT_CI_)
-#define _MESSAGING_REQUESTPRIORITYPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::RequestPriorityPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (RequestPriorityPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (RequestPriorityPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RequestPriorityPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (const ::Messaging::RequestPriorityPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (RequestPriorityPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::Messaging::RequestPriorityPolicy_out &
-Messaging::RequestPriorityPolicy_out::operator= (const ::Messaging::RequestPriorityPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (RequestPriorityPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_out &
-Messaging::RequestPriorityPolicy_out::operator= (const ::Messaging::RequestPriorityPolicy_var &p)
-{
-  this->ptr_ = ::Messaging::RequestPriorityPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_out &
-Messaging::RequestPriorityPolicy_out::operator= (RequestPriorityPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_out::operator ::Messaging::RequestPriorityPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestPriorityPolicy_ptr &
-Messaging::RequestPriorityPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
+#if !defined (_MESSAGING_REQUESTPRIORITYPOLICY___CI_)
+#define _MESSAGING_REQUESTPRIORITYPOLICY___CI_
 
-#endif /* end #if !defined */
-
-
-#if !defined (_MESSAGING_REPLYPRIORITYPOLICY___VAR_CI_)
-#define _MESSAGING_REPLYPRIORITYPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyPriorityPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (void) // default constructor
-  : ptr_ (ReplyPriorityPolicy::_nil ())
-{}
-
-ACE_INLINE ::Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (const ::Messaging::ReplyPriorityPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ReplyPriorityPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::~ReplyPriorityPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_var &
-Messaging::ReplyPriorityPolicy_var::operator= (ReplyPriorityPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_var &
-Messaging::ReplyPriorityPolicy_var::operator= (const ::Messaging::ReplyPriorityPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::operator const ::Messaging::ReplyPriorityPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::operator ::Messaging::ReplyPriorityPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::operator-> (void) const
+ACE_INLINE Messaging::RequestPriorityPolicy_ptr
+tao_Messaging_RequestPriorityPolicy_duplicate (
+    Messaging::RequestPriorityPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  return Messaging::RequestPriorityPolicy::_duplicate (p);
 }
 
-ACE_INLINE ::Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::in (void) const
+ACE_INLINE void
+tao_Messaging_RequestPriorityPolicy_release (
+    Messaging::RequestPriorityPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::Messaging::ReplyPriorityPolicy_ptr &
-Messaging::ReplyPriorityPolicy_var::inout (void)
+ACE_INLINE Messaging::RequestPriorityPolicy_ptr
+tao_Messaging_RequestPriorityPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return Messaging::RequestPriorityPolicy::_nil ();
 }
 
-ACE_INLINE ::Messaging::ReplyPriorityPolicy_ptr &
-Messaging::ReplyPriorityPolicy_var::out (void)
+ACE_INLINE Messaging::RequestPriorityPolicy_ptr
+tao_Messaging_RequestPriorityPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil ();
-  return this->ptr_;
+  return Messaging::RequestPriorityPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_Messaging_RequestPriorityPolicy_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::Messaging::ReplyPriorityPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil ();
-  return val;
+  Messaging::RequestPriorityPolicy **tmp =
+    ACE_static_cast (Messaging::RequestPriorityPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_MESSAGING_REPLYPRIORITYPOLICY___OUT_CI_)
-#define _MESSAGING_REPLYPRIORITYPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyPriorityPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (ReplyPriorityPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (ReplyPriorityPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::ReplyPriorityPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (const ::Messaging::ReplyPriorityPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ReplyPriorityPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::Messaging::ReplyPriorityPolicy_out &
-Messaging::ReplyPriorityPolicy_out::operator= (const ::Messaging::ReplyPriorityPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ReplyPriorityPolicy_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_MESSAGING_REPLYPRIORITYPOLICY___CI_)
+#define _MESSAGING_REPLYPRIORITYPOLICY___CI_
 
-ACE_INLINE Messaging::ReplyPriorityPolicy_out &
-Messaging::ReplyPriorityPolicy_out::operator= (const ::Messaging::ReplyPriorityPolicy_var &p)
+ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
+tao_Messaging_ReplyPriorityPolicy_duplicate (
+    Messaging::ReplyPriorityPolicy_ptr p
+  )
 {
-  this->ptr_ = ::Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ());
-  return *this;
+  return Messaging::ReplyPriorityPolicy::_duplicate (p);
 }
 
-ACE_INLINE Messaging::ReplyPriorityPolicy_out &
-Messaging::ReplyPriorityPolicy_out::operator= (ReplyPriorityPolicy_ptr p)
+ACE_INLINE void
+tao_Messaging_ReplyPriorityPolicy_release (
+    Messaging::ReplyPriorityPolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_out::operator ::Messaging::ReplyPriorityPolicy_ptr &() // cast
+ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
+tao_Messaging_ReplyPriorityPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return Messaging::ReplyPriorityPolicy::_nil ();
 }
 
-ACE_INLINE ::Messaging::ReplyPriorityPolicy_ptr &
-Messaging::ReplyPriorityPolicy_out::ptr (void) // ptr
+ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
+tao_Messaging_ReplyPriorityPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return Messaging::ReplyPriorityPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_Messaging_ReplyPriorityPolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  Messaging::ReplyPriorityPolicy **tmp =
+    ACE_static_cast (Messaging::ReplyPriorityPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___VAR_CI_)
-#define _MESSAGING_REQUESTSTARTTIMEPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::RequestStartTimePolicy_var
-// *************************************************************
-
 #endif /* TAO_HAS_PRIORITY_POLICIES == 1 */
 
 #if (TAO_HAS_REQUEST_START_TIME_POLICY == 1)
 
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (void) // default constructor
-  : ptr_ (RequestStartTimePolicy::_nil ())
-{}
-
-ACE_INLINE ::Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (const ::Messaging::RequestStartTimePolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (RequestStartTimePolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::~RequestStartTimePolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_var &
-Messaging::RequestStartTimePolicy_var::operator= (RequestStartTimePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_var &
-Messaging::RequestStartTimePolicy_var::operator= (const ::Messaging::RequestStartTimePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::RequestStartTimePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::operator const ::Messaging::RequestStartTimePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::operator ::Messaging::RequestStartTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestStartTimePolicy_ptr &
-Messaging::RequestStartTimePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestStartTimePolicy_ptr &
-Messaging::RequestStartTimePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::RequestStartTimePolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___OUT_CI_)
-#define _MESSAGING_REQUESTSTARTTIMEPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::RequestStartTimePolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (RequestStartTimePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (RequestStartTimePolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RequestStartTimePolicy::_nil ();
-}
+#if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___CI_)
+#define _MESSAGING_REQUESTSTARTTIMEPOLICY___CI_
 
-ACE_INLINE
-Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (const ::Messaging::RequestStartTimePolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (RequestStartTimePolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::Messaging::RequestStartTimePolicy_out &
-Messaging::RequestStartTimePolicy_out::operator= (const ::Messaging::RequestStartTimePolicy_out &p)
+ACE_INLINE Messaging::RequestStartTimePolicy_ptr
+tao_Messaging_RequestStartTimePolicy_duplicate (
+    Messaging::RequestStartTimePolicy_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (RequestStartTimePolicy_out&, p).ptr_;
-  return *this;
+  return Messaging::RequestStartTimePolicy::_duplicate (p);
 }
 
-ACE_INLINE Messaging::RequestStartTimePolicy_out &
-Messaging::RequestStartTimePolicy_out::operator= (const ::Messaging::RequestStartTimePolicy_var &p)
+ACE_INLINE void
+tao_Messaging_RequestStartTimePolicy_release (
+    Messaging::RequestStartTimePolicy_ptr p
+  )
 {
-  this->ptr_ = ::Messaging::RequestStartTimePolicy::_duplicate (p.ptr ());
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE Messaging::RequestStartTimePolicy_out &
-Messaging::RequestStartTimePolicy_out::operator= (RequestStartTimePolicy_ptr p)
+ACE_INLINE Messaging::RequestStartTimePolicy_ptr
+tao_Messaging_RequestStartTimePolicy_nil (
+    void
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  return Messaging::RequestStartTimePolicy::_nil ();
 }
 
-ACE_INLINE
-Messaging::RequestStartTimePolicy_out::operator ::Messaging::RequestStartTimePolicy_ptr &() // cast
+ACE_INLINE Messaging::RequestStartTimePolicy_ptr
+tao_Messaging_RequestStartTimePolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return Messaging::RequestStartTimePolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::Messaging::RequestStartTimePolicy_ptr &
-Messaging::RequestStartTimePolicy_out::ptr (void) // ptr
+ACE_INLINE CORBA::Object *
+tao_Messaging_RequestStartTimePolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_out::operator-> (void)
-{
-  return this->ptr_;
+  Messaging::RequestStartTimePolicy **tmp =
+    ACE_static_cast (Messaging::RequestStartTimePolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___VAR_CI_)
-#define _MESSAGING_REQUESTENDTIMEPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::RequestEndTimePolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (void) // default constructor
-  : ptr_ (RequestEndTimePolicy::_nil ())
-{}
-
-ACE_INLINE ::Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (const ::Messaging::RequestEndTimePolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (RequestEndTimePolicy::_duplicate (p.ptr ()))
-{}
-
 #endif /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */
 
 #if (TAO_HAS_REQUEST_END_TIME_POLICY == 1)
 
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::~RequestEndTimePolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
+#if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___CI_)
+#define _MESSAGING_REQUESTENDTIMEPOLICY___CI_
 
-ACE_INLINE Messaging::RequestEndTimePolicy_var &
-Messaging::RequestEndTimePolicy_var::operator= (RequestEndTimePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_var &
-Messaging::RequestEndTimePolicy_var::operator= (const ::Messaging::RequestEndTimePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::RequestEndTimePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::operator const ::Messaging::RequestEndTimePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::operator ::Messaging::RequestEndTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestEndTimePolicy_ptr &
-Messaging::RequestEndTimePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestEndTimePolicy_ptr &
-Messaging::RequestEndTimePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::RequestEndTimePolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___OUT_CI_)
-#define _MESSAGING_REQUESTENDTIMEPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::RequestEndTimePolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (RequestEndTimePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (RequestEndTimePolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RequestEndTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (const ::Messaging::RequestEndTimePolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (RequestEndTimePolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::Messaging::RequestEndTimePolicy_out &
-Messaging::RequestEndTimePolicy_out::operator= (const ::Messaging::RequestEndTimePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (RequestEndTimePolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_out &
-Messaging::RequestEndTimePolicy_out::operator= (const ::Messaging::RequestEndTimePolicy_var &p)
+ACE_INLINE Messaging::RequestEndTimePolicy_ptr
+tao_Messaging_RequestEndTimePolicy_duplicate (
+    Messaging::RequestEndTimePolicy_ptr p
+  )
 {
-  this->ptr_ = ::Messaging::RequestEndTimePolicy::_duplicate (p.ptr ());
-  return *this;
+  return Messaging::RequestEndTimePolicy::_duplicate (p);
 }
 
-ACE_INLINE Messaging::RequestEndTimePolicy_out &
-Messaging::RequestEndTimePolicy_out::operator= (RequestEndTimePolicy_ptr p)
+ACE_INLINE void
+tao_Messaging_RequestEndTimePolicy_release (
+    Messaging::RequestEndTimePolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-Messaging::RequestEndTimePolicy_out::operator ::Messaging::RequestEndTimePolicy_ptr &() // cast
+ACE_INLINE Messaging::RequestEndTimePolicy_ptr
+tao_Messaging_RequestEndTimePolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return Messaging::RequestEndTimePolicy::_nil ();
 }
 
-ACE_INLINE ::Messaging::RequestEndTimePolicy_ptr &
-Messaging::RequestEndTimePolicy_out::ptr (void) // ptr
+ACE_INLINE Messaging::RequestEndTimePolicy_ptr
+tao_Messaging_RequestEndTimePolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return Messaging::RequestEndTimePolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_Messaging_RequestEndTimePolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  Messaging::RequestEndTimePolicy **tmp =
+    ACE_static_cast (Messaging::RequestEndTimePolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___VAR_CI_)
-#define _MESSAGING_REPLYSTARTTIMEPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyStartTimePolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (void) // default constructor
-  : ptr_ (ReplyStartTimePolicy::_nil ())
-{}
-
-ACE_INLINE ::Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (const ::Messaging::ReplyStartTimePolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ReplyStartTimePolicy::_duplicate (p.ptr ()))
-{}
-
 #endif /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */
 
 #if (TAO_HAS_REPLY_START_TIME_POLICY == 1)
 
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::~ReplyStartTimePolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
+#if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___CI_)
+#define _MESSAGING_REPLYSTARTTIMEPOLICY___CI_
 
-ACE_INLINE Messaging::ReplyStartTimePolicy_var &
-Messaging::ReplyStartTimePolicy_var::operator= (ReplyStartTimePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_var &
-Messaging::ReplyStartTimePolicy_var::operator= (const ::Messaging::ReplyStartTimePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::operator const ::Messaging::ReplyStartTimePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::operator ::Messaging::ReplyStartTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::ReplyStartTimePolicy_ptr &
-Messaging::ReplyStartTimePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::ReplyStartTimePolicy_ptr &
-Messaging::ReplyStartTimePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::ReplyStartTimePolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___OUT_CI_)
-#define _MESSAGING_REPLYSTARTTIMEPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyStartTimePolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (ReplyStartTimePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (ReplyStartTimePolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::ReplyStartTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (const ::Messaging::ReplyStartTimePolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ReplyStartTimePolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::Messaging::ReplyStartTimePolicy_out &
-Messaging::ReplyStartTimePolicy_out::operator= (const ::Messaging::ReplyStartTimePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ReplyStartTimePolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_out &
-Messaging::ReplyStartTimePolicy_out::operator= (const ::Messaging::ReplyStartTimePolicy_var &p)
+ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
+tao_Messaging_ReplyStartTimePolicy_duplicate (
+    Messaging::ReplyStartTimePolicy_ptr p
+  )
 {
-  this->ptr_ = ::Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ());
-  return *this;
+  return Messaging::ReplyStartTimePolicy::_duplicate (p);
 }
 
-ACE_INLINE Messaging::ReplyStartTimePolicy_out &
-Messaging::ReplyStartTimePolicy_out::operator= (ReplyStartTimePolicy_ptr p)
+ACE_INLINE void
+tao_Messaging_ReplyStartTimePolicy_release (
+    Messaging::ReplyStartTimePolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_out::operator ::Messaging::ReplyStartTimePolicy_ptr &() // cast
+ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
+tao_Messaging_ReplyStartTimePolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return Messaging::ReplyStartTimePolicy::_nil ();
 }
 
-ACE_INLINE ::Messaging::ReplyStartTimePolicy_ptr &
-Messaging::ReplyStartTimePolicy_out::ptr (void) // ptr
+ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
+tao_Messaging_ReplyStartTimePolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return Messaging::ReplyStartTimePolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_Messaging_ReplyStartTimePolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  Messaging::ReplyStartTimePolicy **tmp =
+    ACE_static_cast (Messaging::ReplyStartTimePolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_MESSAGING_REPLYENDTIMEPOLICY___VAR_CI_)
-#define _MESSAGING_REPLYENDTIMEPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyEndTimePolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (void) // default constructor
-  : ptr_ (ReplyEndTimePolicy::_nil ())
-{}
-
-ACE_INLINE ::Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (const ::Messaging::ReplyEndTimePolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ReplyEndTimePolicy::_duplicate (p.ptr ()))
-{}
-
 #endif /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */
 
 #if (TAO_HAS_REPLY_END_TIME_POLICY == 1)
 
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::~ReplyEndTimePolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_var &
-Messaging::ReplyEndTimePolicy_var::operator= (ReplyEndTimePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_var &
-Messaging::ReplyEndTimePolicy_var::operator= (const ::Messaging::ReplyEndTimePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::operator const ::Messaging::ReplyEndTimePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::operator ::Messaging::ReplyEndTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::ReplyEndTimePolicy_ptr &
-Messaging::ReplyEndTimePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::ReplyEndTimePolicy_ptr &
-Messaging::ReplyEndTimePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::ReplyEndTimePolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_MESSAGING_REPLYENDTIMEPOLICY___OUT_CI_)
-#define _MESSAGING_REPLYENDTIMEPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyEndTimePolicy_out
-// *************************************************************
+#if !defined (_MESSAGING_REPLYENDTIMEPOLICY___CI_)
+#define _MESSAGING_REPLYENDTIMEPOLICY___CI_
 
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (ReplyEndTimePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (ReplyEndTimePolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::ReplyEndTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (const ::Messaging::ReplyEndTimePolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ReplyEndTimePolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::Messaging::ReplyEndTimePolicy_out &
-Messaging::ReplyEndTimePolicy_out::operator= (const ::Messaging::ReplyEndTimePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ReplyEndTimePolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_out &
-Messaging::ReplyEndTimePolicy_out::operator= (const ::Messaging::ReplyEndTimePolicy_var &p)
+ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
+tao_Messaging_ReplyEndTimePolicy_duplicate (
+    Messaging::ReplyEndTimePolicy_ptr p
+  )
 {
-  this->ptr_ = ::Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ());
-  return *this;
+  return Messaging::ReplyEndTimePolicy::_duplicate (p);
 }
 
-ACE_INLINE Messaging::ReplyEndTimePolicy_out &
-Messaging::ReplyEndTimePolicy_out::operator= (ReplyEndTimePolicy_ptr p)
+ACE_INLINE void
+tao_Messaging_ReplyEndTimePolicy_release (
+    Messaging::ReplyEndTimePolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_out::operator ::Messaging::ReplyEndTimePolicy_ptr &() // cast
+ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
+tao_Messaging_ReplyEndTimePolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return Messaging::ReplyEndTimePolicy::_nil ();
 }
 
-ACE_INLINE ::Messaging::ReplyEndTimePolicy_ptr &
-Messaging::ReplyEndTimePolicy_out::ptr (void) // ptr
+ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
+tao_Messaging_ReplyEndTimePolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return Messaging::ReplyEndTimePolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_Messaging_ReplyEndTimePolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  Messaging::ReplyEndTimePolicy **tmp =
+    ACE_static_cast (Messaging::ReplyEndTimePolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___VAR_CI_)
-#define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::RelativeRequestTimeoutPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (void) // default constructor
-  : ptr_ (RelativeRequestTimeoutPolicy::_nil ())
-{}
-
-ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (const ::Messaging::RelativeRequestTimeoutPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (RelativeRequestTimeoutPolicy::_duplicate (p.ptr ()))
-{}
-
 #endif /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */
 
 #if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1)
 
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::~RelativeRequestTimeoutPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_var &
-Messaging::RelativeRequestTimeoutPolicy_var::operator= (RelativeRequestTimeoutPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_var &
-Messaging::RelativeRequestTimeoutPolicy_var::operator= (const ::Messaging::RelativeRequestTimeoutPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::operator const ::Messaging::RelativeRequestTimeoutPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::operator ::Messaging::RelativeRequestTimeoutPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
+#if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___CI_)
+#define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___CI_
 
-ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_ptr &
-Messaging::RelativeRequestTimeoutPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_ptr &
-Messaging::RelativeRequestTimeoutPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::RelativeRequestTimeoutPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___OUT_CI_)
-#define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::RelativeRequestTimeoutPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (const ::Messaging::RelativeRequestTimeoutPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (RelativeRequestTimeoutPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_out &
-Messaging::RelativeRequestTimeoutPolicy_out::operator= (const ::Messaging::RelativeRequestTimeoutPolicy_out &p)
+ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
+tao_Messaging_RelativeRequestTimeoutPolicy_duplicate (
+    Messaging::RelativeRequestTimeoutPolicy_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (RelativeRequestTimeoutPolicy_out&, p).ptr_;
-  return *this;
+  return Messaging::RelativeRequestTimeoutPolicy::_duplicate (p);
 }
 
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_out &
-Messaging::RelativeRequestTimeoutPolicy_out::operator= (const ::Messaging::RelativeRequestTimeoutPolicy_var &p)
+ACE_INLINE void
+tao_Messaging_RelativeRequestTimeoutPolicy_release (
+    Messaging::RelativeRequestTimeoutPolicy_ptr p
+  )
 {
-  this->ptr_ = ::Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ());
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_out &
-Messaging::RelativeRequestTimeoutPolicy_out::operator= (RelativeRequestTimeoutPolicy_ptr p)
+ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
+tao_Messaging_RelativeRequestTimeoutPolicy_nil (
+    void
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  return Messaging::RelativeRequestTimeoutPolicy::_nil ();
 }
 
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_out::operator ::Messaging::RelativeRequestTimeoutPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_ptr &
-Messaging::RelativeRequestTimeoutPolicy_out::ptr (void) // ptr
+ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
+tao_Messaging_RelativeRequestTimeoutPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return Messaging::RelativeRequestTimeoutPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_Messaging_RelativeRequestTimeoutPolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  Messaging::RelativeRequestTimeoutPolicy **tmp =
+    ACE_static_cast (Messaging::RelativeRequestTimeoutPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___VAR_CI_)
-#define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::RelativeRoundtripTimeoutPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (void) // default constructor
-  : ptr_ (RelativeRoundtripTimeoutPolicy::_nil ())
-{}
-
-ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (const ::Messaging::RelativeRoundtripTimeoutPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ()))
-{}
-
 #endif /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */
 
 #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
 
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::~RelativeRoundtripTimeoutPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_var &
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator= (RelativeRoundtripTimeoutPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_var &
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator= (const ::Messaging::RelativeRoundtripTimeoutPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator const ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
+#if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___CI_)
+#define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___CI_
 
-ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator-> (void) const
+ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
+tao_Messaging_RelativeRoundtripTimeoutPolicy_duplicate (
+    Messaging::RelativeRoundtripTimeoutPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  return Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p);
 }
 
-ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::in (void) const
+ACE_INLINE void
+tao_Messaging_RelativeRoundtripTimeoutPolicy_release (
+    Messaging::RelativeRoundtripTimeoutPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &
-Messaging::RelativeRoundtripTimeoutPolicy_var::inout (void)
+ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
+tao_Messaging_RelativeRoundtripTimeoutPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
 }
 
-ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &
-Messaging::RelativeRoundtripTimeoutPolicy_var::out (void)
+ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
+tao_Messaging_RelativeRoundtripTimeoutPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  return this->ptr_;
+  return Messaging::RelativeRoundtripTimeoutPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_Messaging_RelativeRoundtripTimeoutPolicy_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::Messaging::RelativeRoundtripTimeoutPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  return val;
+  Messaging::RelativeRoundtripTimeoutPolicy **tmp =
+    ACE_static_cast (Messaging::RelativeRoundtripTimeoutPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
+#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
-#if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___OUT_CI_)
-#define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::RelativeRoundtripTimeoutPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (const ::Messaging::RelativeRoundtripTimeoutPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (RelativeRoundtripTimeoutPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_out &
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (const ::Messaging::RelativeRoundtripTimeoutPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (RelativeRoundtripTimeoutPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_out &
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (const ::Messaging::RelativeRoundtripTimeoutPolicy_var &p)
-{
-  this->ptr_ = ::Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_out &
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (RelativeRoundtripTimeoutPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_ptr &
-Messaging::RelativeRoundtripTimeoutPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
+#if (TAO_HAS_ROUTING_POLICY == 1)
 
 // *************************************************************
 // Inline operations for class Messaging::RoutingTypeRange_var
 // *************************************************************
 
-#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
-
-#if (TAO_HAS_ROUTING_POLICY == 1)
-
 ACE_INLINE
 Messaging::RoutingTypeRange_var::RoutingTypeRange_var (void) // default constructor
   : ptr_ (0)
@@ -2048,518 +848,158 @@ Messaging::RoutingTypeRange_var::ptr (void) const
 }
 
 
-#if !defined (_MESSAGING_ROUTINGPOLICY___VAR_CI_)
-#define _MESSAGING_ROUTINGPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::RoutingPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RoutingPolicy_var::RoutingPolicy_var (void) // default constructor
-  : ptr_ (RoutingPolicy::_nil ())
-{}
-
-ACE_INLINE ::Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy_var::RoutingPolicy_var (const ::Messaging::RoutingPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (RoutingPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RoutingPolicy_var::~RoutingPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RoutingPolicy_var &
-Messaging::RoutingPolicy_var::operator= (RoutingPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_var &
-Messaging::RoutingPolicy_var::operator= (const ::Messaging::RoutingPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::RoutingPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy_var::operator const ::Messaging::RoutingPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
+#if !defined (_MESSAGING_ROUTINGPOLICY___CI_)
+#define _MESSAGING_ROUTINGPOLICY___CI_
 
-ACE_INLINE
-Messaging::RoutingPolicy_var::operator ::Messaging::RoutingPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RoutingPolicy_ptr &
-Messaging::RoutingPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RoutingPolicy_ptr &
-Messaging::RoutingPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RoutingPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::RoutingPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::RoutingPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_MESSAGING_ROUTINGPOLICY___OUT_CI_)
-#define _MESSAGING_ROUTINGPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::RoutingPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RoutingPolicy_out::RoutingPolicy_out (RoutingPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::RoutingPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy_out::RoutingPolicy_out (RoutingPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::RoutingPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy_out::RoutingPolicy_out (const ::Messaging::RoutingPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (RoutingPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::Messaging::RoutingPolicy_out &
-Messaging::RoutingPolicy_out::operator= (const ::Messaging::RoutingPolicy_out &p)
+ACE_INLINE Messaging::RoutingPolicy_ptr
+tao_Messaging_RoutingPolicy_duplicate (
+    Messaging::RoutingPolicy_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (RoutingPolicy_out&, p).ptr_;
-  return *this;
+  return Messaging::RoutingPolicy::_duplicate (p);
 }
 
-ACE_INLINE Messaging::RoutingPolicy_out &
-Messaging::RoutingPolicy_out::operator= (const ::Messaging::RoutingPolicy_var &p)
-{
-  this->ptr_ = ::Messaging::RoutingPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_out &
-Messaging::RoutingPolicy_out::operator= (RoutingPolicy_ptr p)
+ACE_INLINE void
+tao_Messaging_RoutingPolicy_release (
+    Messaging::RoutingPolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-Messaging::RoutingPolicy_out::operator ::Messaging::RoutingPolicy_ptr &() // cast
+ACE_INLINE Messaging::RoutingPolicy_ptr
+tao_Messaging_RoutingPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return Messaging::RoutingPolicy::_nil ();
 }
 
-ACE_INLINE ::Messaging::RoutingPolicy_ptr &
-Messaging::RoutingPolicy_out::ptr (void) // ptr
+ACE_INLINE Messaging::RoutingPolicy_ptr
+tao_Messaging_RoutingPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return Messaging::RoutingPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_Messaging_RoutingPolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  Messaging::RoutingPolicy **tmp =
+    ACE_static_cast (Messaging::RoutingPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_MESSAGING_MAXHOPSPOLICY___VAR_CI_)
-#define _MESSAGING_MAXHOPSPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::MaxHopsPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (void) // default constructor
-  : ptr_ (MaxHopsPolicy::_nil ())
-{}
-
-ACE_INLINE ::Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (const ::Messaging::MaxHopsPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (MaxHopsPolicy::_duplicate (p.ptr ()))
-{}
-
 #endif /* TAO_HAS_ROUTING_POLICY == 1 */
 
 #if (TAO_HAS_MAX_HOPS_POLICY == 1)
 
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::~MaxHopsPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_var &
-Messaging::MaxHopsPolicy_var::operator= (MaxHopsPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_var &
-Messaging::MaxHopsPolicy_var::operator= (const ::Messaging::MaxHopsPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::MaxHopsPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::operator const ::Messaging::MaxHopsPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::operator ::Messaging::MaxHopsPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::MaxHopsPolicy_ptr &
-Messaging::MaxHopsPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::MaxHopsPolicy_ptr &
-Messaging::MaxHopsPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::MaxHopsPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::Messaging::MaxHopsPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::MaxHopsPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_MESSAGING_MAXHOPSPOLICY___OUT_CI_)
-#define _MESSAGING_MAXHOPSPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::MaxHopsPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (MaxHopsPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::MaxHopsPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (MaxHopsPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::MaxHopsPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (const ::Messaging::MaxHopsPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (MaxHopsPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::Messaging::MaxHopsPolicy_out &
-Messaging::MaxHopsPolicy_out::operator= (const ::Messaging::MaxHopsPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (MaxHopsPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_out &
-Messaging::MaxHopsPolicy_out::operator= (const ::Messaging::MaxHopsPolicy_var &p)
-{
-  this->ptr_ = ::Messaging::MaxHopsPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_out &
-Messaging::MaxHopsPolicy_out::operator= (MaxHopsPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_out::operator ::Messaging::MaxHopsPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::MaxHopsPolicy_ptr &
-Messaging::MaxHopsPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_MESSAGING_QUEUEORDERPOLICY___VAR_CI_)
-#define _MESSAGING_QUEUEORDERPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::QueueOrderPolicy_var
-// *************************************************************
+#if !defined (_MESSAGING_MAXHOPSPOLICY___CI_)
+#define _MESSAGING_MAXHOPSPOLICY___CI_
 
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (void) // default constructor
-  : ptr_ (QueueOrderPolicy::_nil ())
-{}
-
-ACE_INLINE ::Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (const ::Messaging::QueueOrderPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (QueueOrderPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::~QueueOrderPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_var &
-Messaging::QueueOrderPolicy_var::operator= (QueueOrderPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_var &
-Messaging::QueueOrderPolicy_var::operator= (const ::Messaging::QueueOrderPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::QueueOrderPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::operator const ::Messaging::QueueOrderPolicy_ptr &() const // cast
+ACE_INLINE Messaging::MaxHopsPolicy_ptr
+tao_Messaging_MaxHopsPolicy_duplicate (
+    Messaging::MaxHopsPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  return Messaging::MaxHopsPolicy::_duplicate (p);
 }
 
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::operator ::Messaging::QueueOrderPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::operator-> (void) const
+ACE_INLINE void
+tao_Messaging_MaxHopsPolicy_release (
+    Messaging::MaxHopsPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::in (void) const
+ACE_INLINE Messaging::MaxHopsPolicy_ptr
+tao_Messaging_MaxHopsPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return Messaging::MaxHopsPolicy::_nil ();
 }
 
-ACE_INLINE ::Messaging::QueueOrderPolicy_ptr &
-Messaging::QueueOrderPolicy_var::inout (void)
+ACE_INLINE Messaging::MaxHopsPolicy_ptr
+tao_Messaging_MaxHopsPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return Messaging::MaxHopsPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::Messaging::QueueOrderPolicy_ptr &
-Messaging::QueueOrderPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::QueueOrderPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_Messaging_MaxHopsPolicy_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::Messaging::QueueOrderPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::QueueOrderPolicy::_nil ();
-  return val;
+  Messaging::MaxHopsPolicy **tmp =
+    ACE_static_cast (Messaging::MaxHopsPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_MESSAGING_QUEUEORDERPOLICY___OUT_CI_)
-#define _MESSAGING_QUEUEORDERPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::QueueOrderPolicy_out
-// *************************************************************
-
 #endif /* TAO_HAS_MAX_HOPS_POLICY == 1 */
 
 #if (TAO_HAS_QUEUE_ORDER_POLICY == 1)
 
-ACE_INLINE
-Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (QueueOrderPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::Messaging::QueueOrderPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (QueueOrderPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::QueueOrderPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (const ::Messaging::QueueOrderPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (QueueOrderPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::Messaging::QueueOrderPolicy_out &
-Messaging::QueueOrderPolicy_out::operator= (const ::Messaging::QueueOrderPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (QueueOrderPolicy_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_MESSAGING_QUEUEORDERPOLICY___CI_)
+#define _MESSAGING_QUEUEORDERPOLICY___CI_
 
-ACE_INLINE Messaging::QueueOrderPolicy_out &
-Messaging::QueueOrderPolicy_out::operator= (const ::Messaging::QueueOrderPolicy_var &p)
+ACE_INLINE Messaging::QueueOrderPolicy_ptr
+tao_Messaging_QueueOrderPolicy_duplicate (
+    Messaging::QueueOrderPolicy_ptr p
+  )
 {
-  this->ptr_ = ::Messaging::QueueOrderPolicy::_duplicate (p.ptr ());
-  return *this;
+  return Messaging::QueueOrderPolicy::_duplicate (p);
 }
 
-ACE_INLINE Messaging::QueueOrderPolicy_out &
-Messaging::QueueOrderPolicy_out::operator= (QueueOrderPolicy_ptr p)
+ACE_INLINE void
+tao_Messaging_QueueOrderPolicy_release (
+    Messaging::QueueOrderPolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-Messaging::QueueOrderPolicy_out::operator ::Messaging::QueueOrderPolicy_ptr &() // cast
+ACE_INLINE Messaging::QueueOrderPolicy_ptr
+tao_Messaging_QueueOrderPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return Messaging::QueueOrderPolicy::_nil ();
 }
 
-ACE_INLINE ::Messaging::QueueOrderPolicy_ptr &
-Messaging::QueueOrderPolicy_out::ptr (void) // ptr
+ACE_INLINE Messaging::QueueOrderPolicy_ptr
+tao_Messaging_QueueOrderPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return Messaging::QueueOrderPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_Messaging_QueueOrderPolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  Messaging::QueueOrderPolicy **tmp =
+    ACE_static_cast (Messaging::QueueOrderPolicy **, src);
+  return *tmp;
 }
 
 
@@ -3287,9 +1727,6 @@ Messaging::ExceptionHolder_var::_retn (void)
 #if !defined (_MESSAGING_EXCEPTIONHOLDER___OUT_CI_)
 #define _MESSAGING_EXCEPTIONHOLDER___OUT_CI_
 
-#if !defined (_MESSAGING_EXCEPTIONHOLDER___VAR_CI_)
-#define _MESSAGING_EXCEPTIONHOLDER___VAR_CI_
-
 // *************************************************************
 // Inline operations for class Messaging::ExceptionHolder_out
 // *************************************************************
@@ -3362,192 +1799,62 @@ Messaging::ExceptionHolder_out::operator-> (void)
 #if !defined (_MESSAGING_REPLYHANDLER___CI_)
 #define _MESSAGING_REPLYHANDLER___CI_
 
-ACE_INLINE
-Messaging::ReplyHandler::ReplyHandler (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE Messaging::ReplyHandler_ptr
+tao_Messaging_ReplyHandler_duplicate (
+    Messaging::ReplyHandler_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  this->Messaging_ReplyHandler_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_MESSAGING_REPLYHANDLER___VAR_CI_)
-#define _MESSAGING_REPLYHANDLER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyHandler_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyHandler_var::ReplyHandler_var (void) // default constructor
-  : ptr_ (ReplyHandler::_nil ())
-{}
-
-ACE_INLINE ::Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyHandler_var::ReplyHandler_var (const ::Messaging::ReplyHandler_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ReplyHandler::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::ReplyHandler_var::~ReplyHandler_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
+  return Messaging::ReplyHandler::_duplicate (p);
 }
 
-ACE_INLINE Messaging::ReplyHandler_var &
-Messaging::ReplyHandler_var::operator= (ReplyHandler_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyHandler_var &
-Messaging::ReplyHandler_var::operator= (const ::Messaging::ReplyHandler_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::Messaging::ReplyHandler::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyHandler_var::operator const ::Messaging::ReplyHandler_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyHandler_var::operator ::Messaging::ReplyHandler_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::ReplyHandler_ptr &
-Messaging::ReplyHandler_var::inout (void)
+ACE_INLINE void
+tao_Messaging_ReplyHandler_release (
+    Messaging::ReplyHandler_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::Messaging::ReplyHandler_ptr &
-Messaging::ReplyHandler_var::out (void)
+ACE_INLINE Messaging::ReplyHandler_ptr
+tao_Messaging_ReplyHandler_nil (
+    void
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::ReplyHandler::_nil ();
-  return this->ptr_;
+  return Messaging::ReplyHandler::_nil ();
 }
 
-ACE_INLINE ::Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::_retn (void)
+ACE_INLINE Messaging::ReplyHandler_ptr
+tao_Messaging_ReplyHandler_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  // yield ownership of managed obj reference
-  ::Messaging::ReplyHandler_ptr val = this->ptr_;
-  this->ptr_ = ::Messaging::ReplyHandler::_nil ();
-  return val;
+  return Messaging::ReplyHandler::_narrow (p, ACE_TRY_ENV);
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_MESSAGING_REPLYHANDLER___OUT_CI_)
-#define _MESSAGING_REPLYHANDLER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyHandler_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyHandler_out::ReplyHandler_out (ReplyHandler_ptr &p)
-  : ptr_ (p)
+ACE_INLINE CORBA::Object *
+tao_Messaging_ReplyHandler_upcast (
+    void *src
+  )
 {
-  this->ptr_ = ::Messaging::ReplyHandler::_nil ();
+  Messaging::ReplyHandler **tmp =
+    ACE_static_cast (Messaging::ReplyHandler **, src);
+  return *tmp;
 }
 
 ACE_INLINE
-Messaging::ReplyHandler_out::ReplyHandler_out (ReplyHandler_var &p) // constructor from _var
-  : ptr_ (p.out ())
+Messaging::ReplyHandler::ReplyHandler (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::Messaging::ReplyHandler::_nil ();
+  this->Messaging_ReplyHandler_setup_collocation (_tao_collocated);
 }
 
-
-
 #endif /* end #if !defined */
 
-ACE_INLINE
-Messaging::ReplyHandler_out::ReplyHandler_out (const ::Messaging::ReplyHandler_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ReplyHandler_out &, p).ptr_)
-{}
-
-ACE_INLINE ::Messaging::ReplyHandler_out &
-Messaging::ReplyHandler_out::operator= (const ::Messaging::ReplyHandler_out &p)
-{
-  this->ptr_ = ACE_const_cast (ReplyHandler_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyHandler_out &
-Messaging::ReplyHandler_out::operator= (const ::Messaging::ReplyHandler_var &p)
-{
-  this->ptr_ = ::Messaging::ReplyHandler::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyHandler_out &
-Messaging::ReplyHandler_out::operator= (ReplyHandler_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyHandler_out::operator ::Messaging::ReplyHandler_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::ReplyHandler_ptr &
-Messaging::ReplyHandler_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
 
 #endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
 
@@ -3697,53 +2004,15 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm)
 
 }
 
-ACE_INLINE CORBA::Boolean
+CORBA::Boolean TAO_Export 
 operator<< (
     TAO_OutputCDR &,
     const Messaging::ReplyHandler_ptr
   );
-ACE_INLINE CORBA::Boolean
+CORBA::Boolean TAO_Export 
 operator>> (
     TAO_InputCDR &,
     Messaging::ReplyHandler_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::ReplyHandler_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    Messaging::ReplyHandler_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      Messaging::ReplyHandler::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
 #endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index 4cb7107a512..a3ab7ce91e5 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -304,6 +304,12 @@ public:
   CORBA::Object_ptr _retn (void);
   CORBA::Object_ptr ptr (void) const;
 
+  static CORBA::Object_ptr duplicate (CORBA::Object_ptr);
+  static void release (CORBA::Object_ptr);
+  static CORBA::Object_ptr nil (void);
+  static CORBA::Object_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
 private:
   CORBA::Object_ptr ptr_;
 };
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
index 21bf2291b44..7ef030c1964 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -196,6 +196,41 @@ CORBA_Object_var::_retn (void)
   return val;
 }
 
+ACE_INLINE CORBA_Object_ptr
+CORBA_Object_var::duplicate (CORBA_Object_ptr p)
+{
+  return CORBA_Object::_duplicate (p);
+}
+
+ACE_INLINE void
+CORBA_Object_var::release (CORBA_Object_ptr p)
+{
+  CORBA::release (p);
+}
+
+ACE_INLINE CORBA_Object_ptr
+CORBA_Object_var::nil (void)
+{
+  return CORBA_Object::_nil ();
+}
+
+ACE_INLINE CORBA_Object_ptr
+CORBA_Object_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &
+  )
+{
+  return CORBA_Object::_duplicate (p);
+}
+
+ACE_INLINE CORBA::Object *
+CORBA_Object_var::upcast (void *src)
+{
+  CORBA_Object **tmp =
+    ACE_static_cast (CORBA_Object **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Inline operations for class CORBA_Object_out
 // *************************************************************
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index d85c981c322..2fe8a940a56 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -463,6 +463,187 @@ CORBA::TypeCode_ptr CORBA_InvalidPolicies::_type (void) const
   return ::_tc_CORBA_InvalidPolicies;
 }
 
+// *************************************************************
+// Operations for class CORBA_Policy_var
+// *************************************************************
+
+CORBA_Policy_var::CORBA_Policy_var (void) // default constructor
+  : ptr_ (CORBA_Policy::_nil ())
+{}
+
+::CORBA_Policy_ptr
+CORBA_Policy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_Policy_var::CORBA_Policy_var (const ::CORBA_Policy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_Policy::_duplicate (p.ptr ()))
+{}
+
+CORBA_Policy_var::~CORBA_Policy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_Policy_var &
+CORBA_Policy_var::operator= (CORBA_Policy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_Policy_var &
+CORBA_Policy_var::operator= (const ::CORBA_Policy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_Policy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_Policy_var::operator const ::CORBA_Policy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_Policy_var::operator ::CORBA_Policy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_Policy_ptr
+CORBA_Policy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_Policy_ptr
+CORBA_Policy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_Policy_ptr &
+CORBA_Policy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_Policy_ptr &
+CORBA_Policy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_Policy::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_Policy_ptr
+CORBA_Policy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_Policy_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_Policy::_nil ();
+  return val;
+}
+
+::CORBA_Policy_ptr
+CORBA_Policy_var::duplicate (CORBA_Policy_ptr p)
+{
+  return ::CORBA_Policy::_duplicate (p);
+}
+
+void
+CORBA_Policy_var::release (CORBA_Policy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_Policy_ptr
+CORBA_Policy_var::nil (void)
+{
+  return ::CORBA_Policy::_nil ();
+}
+
+::CORBA_Policy_ptr
+CORBA_Policy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_Policy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_Policy_var::upcast (void *src)
+{
+  CORBA_Policy **tmp =
+    ACE_static_cast (CORBA_Policy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Operations for class CORBA_Policy_out
+// *************************************************************
+
+CORBA_Policy_out::CORBA_Policy_out (CORBA_Policy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_Policy::_nil ();
+}
+
+CORBA_Policy_out::CORBA_Policy_out (CORBA_Policy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_Policy::_nil ();
+}
+
+CORBA_Policy_out::CORBA_Policy_out (const ::CORBA_Policy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_Policy_out &, p).ptr_)
+{}
+
+::CORBA_Policy_out &
+CORBA_Policy_out::operator= (const ::CORBA_Policy_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_Policy_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_Policy_out &
+CORBA_Policy_out::operator= (const ::CORBA_Policy_var &p)
+{
+  this->ptr_ = ::CORBA_Policy::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_Policy_out &
+CORBA_Policy_out::operator= (CORBA_Policy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_Policy_out::operator ::CORBA_Policy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_Policy_ptr &
+CORBA_Policy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_Policy_ptr
+CORBA_Policy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 class TAO_ClientRequestInfo_CORBA_Policy_policy_type_get : public TAO_ClientRequestInfo
@@ -1500,14 +1681,21 @@ CORBA::TypeCode_ptr _tc_CORBA_Policy =
     {
       CORBA_Policy **old = ACE_reinterpret_cast (CORBA_Policy**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = CORBA_Policy::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-        
-      if (this->release_)
-        delete[] old;
+        {
+          if (!this->release_)
+            {
+              tmp[i] = CORBA_Policy::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
       
+      if (this->release_)
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
@@ -1518,11 +1706,13 @@ CORBA::TypeCode_ptr _tc_CORBA_Policy =
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     CORBA_Policy **tmp = ACE_reinterpret_cast (CORBA_Policy**, this->buffer_);
+
     for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
       CORBA::release (tmp[i]);
       tmp[i] = CORBA_Policy::_nil ();
     }
+
     _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::freebuf (tmp);
     this->buffer_ = 0;
   }
@@ -1538,11 +1728,12 @@ CORBA::TypeCode_ptr _tc_CORBA_Policy =
     CORBA_Policy **tmp = ACE_reinterpret_cast (CORBA_Policy**, this->buffer_);
     
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = CORBA_Policy::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = CORBA_Policy::_nil ();
+      }
   }
+
   void 
   _TAO_Unbounded_Object_Sequence_CORBA_PolicyList::_downcast (
       void* target,
@@ -1822,6 +2013,187 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyTypeSeq (
 CORBA::TypeCode_ptr _tc_CORBA_PolicyTypeSeq =
   &_tc_TAO_tc_CORBA_PolicyTypeSeq;
 
+// *************************************************************
+// Operations for class CORBA_PolicyManager_var
+// *************************************************************
+
+CORBA_PolicyManager_var::CORBA_PolicyManager_var (void) // default constructor
+  : ptr_ (CORBA_PolicyManager::_nil ())
+{}
+
+::CORBA_PolicyManager_ptr
+CORBA_PolicyManager_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_PolicyManager_var::CORBA_PolicyManager_var (const ::CORBA_PolicyManager_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_PolicyManager::_duplicate (p.ptr ()))
+{}
+
+CORBA_PolicyManager_var::~CORBA_PolicyManager_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_PolicyManager_var &
+CORBA_PolicyManager_var::operator= (CORBA_PolicyManager_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_PolicyManager_var &
+CORBA_PolicyManager_var::operator= (const ::CORBA_PolicyManager_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_PolicyManager::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_PolicyManager_var::operator const ::CORBA_PolicyManager_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_PolicyManager_var::operator ::CORBA_PolicyManager_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_PolicyManager_ptr
+CORBA_PolicyManager_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_PolicyManager_ptr
+CORBA_PolicyManager_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_PolicyManager_ptr &
+CORBA_PolicyManager_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_PolicyManager_ptr &
+CORBA_PolicyManager_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_PolicyManager::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_PolicyManager_ptr
+CORBA_PolicyManager_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_PolicyManager_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_PolicyManager::_nil ();
+  return val;
+}
+
+::CORBA_PolicyManager_ptr
+CORBA_PolicyManager_var::duplicate (CORBA_PolicyManager_ptr p)
+{
+  return ::CORBA_PolicyManager::_duplicate (p);
+}
+
+void
+CORBA_PolicyManager_var::release (CORBA_PolicyManager_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_PolicyManager_ptr
+CORBA_PolicyManager_var::nil (void)
+{
+  return ::CORBA_PolicyManager::_nil ();
+}
+
+::CORBA_PolicyManager_ptr
+CORBA_PolicyManager_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_PolicyManager::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_PolicyManager_var::upcast (void *src)
+{
+  CORBA_PolicyManager **tmp =
+    ACE_static_cast (CORBA_PolicyManager **, src);
+  return *tmp;
+}
+// *************************************************************
+// Operations for class CORBA_PolicyManager_out
+// *************************************************************
+
+CORBA_PolicyManager_out::CORBA_PolicyManager_out (CORBA_PolicyManager_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_PolicyManager::_nil ();
+}
+
+CORBA_PolicyManager_out::CORBA_PolicyManager_out (CORBA_PolicyManager_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_PolicyManager::_nil ();
+}
+
+CORBA_PolicyManager_out::CORBA_PolicyManager_out (const ::CORBA_PolicyManager_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_PolicyManager_out &, p).ptr_)
+{}
+
+::CORBA_PolicyManager_out &
+CORBA_PolicyManager_out::operator= (const ::CORBA_PolicyManager_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_PolicyManager_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_PolicyManager_out &
+CORBA_PolicyManager_out::operator= (const ::CORBA_PolicyManager_var &p)
+{
+  this->ptr_ = ::CORBA_PolicyManager::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_PolicyManager_out &
+CORBA_PolicyManager_out::operator= (CORBA_PolicyManager_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_PolicyManager_out::operator ::CORBA_PolicyManager_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_PolicyManager_ptr &
+CORBA_PolicyManager_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_PolicyManager_ptr
+CORBA_PolicyManager_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
 
 // default constructor
 CORBA_PolicyManager::CORBA_PolicyManager ()
@@ -1892,6 +2264,188 @@ const char* CORBA_PolicyManager::_interface_repository_id (void) const
 }
 
 
+// *************************************************************
+// Operations for class CORBA_PolicyCurrent_var
+// *************************************************************
+
+CORBA_PolicyCurrent_var::CORBA_PolicyCurrent_var (void) // default constructor
+  : ptr_ (CORBA_PolicyCurrent::_nil ())
+{}
+
+::CORBA_PolicyCurrent_ptr
+CORBA_PolicyCurrent_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_PolicyCurrent_var::CORBA_PolicyCurrent_var (const ::CORBA_PolicyCurrent_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_PolicyCurrent::_duplicate (p.ptr ()))
+{}
+
+CORBA_PolicyCurrent_var::~CORBA_PolicyCurrent_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_PolicyCurrent_var &
+CORBA_PolicyCurrent_var::operator= (CORBA_PolicyCurrent_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_PolicyCurrent_var &
+CORBA_PolicyCurrent_var::operator= (const ::CORBA_PolicyCurrent_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_PolicyCurrent::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_PolicyCurrent_var::operator const ::CORBA_PolicyCurrent_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_PolicyCurrent_var::operator ::CORBA_PolicyCurrent_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_PolicyCurrent_ptr
+CORBA_PolicyCurrent_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_PolicyCurrent_ptr
+CORBA_PolicyCurrent_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_PolicyCurrent_ptr &
+CORBA_PolicyCurrent_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_PolicyCurrent_ptr &
+CORBA_PolicyCurrent_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_PolicyCurrent::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_PolicyCurrent_ptr
+CORBA_PolicyCurrent_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_PolicyCurrent_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_PolicyCurrent::_nil ();
+  return val;
+}
+
+::CORBA_PolicyCurrent_ptr
+CORBA_PolicyCurrent_var::duplicate (CORBA_PolicyCurrent_ptr p)
+{
+  return ::CORBA_PolicyCurrent::_duplicate (p);
+}
+
+void
+CORBA_PolicyCurrent_var::release (CORBA_PolicyCurrent_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_PolicyCurrent_ptr
+CORBA_PolicyCurrent_var::nil (void)
+{
+  return ::CORBA_PolicyCurrent::_nil ();
+}
+
+::CORBA_PolicyCurrent_ptr
+CORBA_PolicyCurrent_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_PolicyCurrent::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_PolicyCurrent_var::upcast (void *src)
+{
+  CORBA_PolicyCurrent **tmp =
+    ACE_static_cast (CORBA_PolicyCurrent **, src);
+  return *tmp;
+}
+// *************************************************************
+// Operations for class CORBA_PolicyCurrent_out
+// *************************************************************
+
+CORBA_PolicyCurrent_out::CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_PolicyCurrent::_nil ();
+}
+
+CORBA_PolicyCurrent_out::CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_PolicyCurrent::_nil ();
+}
+
+CORBA_PolicyCurrent_out::CORBA_PolicyCurrent_out (const ::CORBA_PolicyCurrent_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_PolicyCurrent_out &, p).ptr_)
+{}
+
+::CORBA_PolicyCurrent_out &
+CORBA_PolicyCurrent_out::operator= (const ::CORBA_PolicyCurrent_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_PolicyCurrent_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_PolicyCurrent_out &
+CORBA_PolicyCurrent_out::operator= (const ::CORBA_PolicyCurrent_var &p)
+{
+  this->ptr_ = ::CORBA_PolicyCurrent::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_PolicyCurrent_out &
+CORBA_PolicyCurrent_out::operator= (CORBA_PolicyCurrent_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_PolicyCurrent_out::operator ::CORBA_PolicyCurrent_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_PolicyCurrent_ptr &
+CORBA_PolicyCurrent_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_PolicyCurrent_ptr
+CORBA_PolicyCurrent_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 CORBA_PolicyCurrent::CORBA_PolicyCurrent ()
 {
@@ -2501,6 +3055,42 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
+    const CORBA_Policy_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    CORBA_Policy_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      CORBA_Policy::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
     const CORBA_PolicyList &_tao_sequence
   )
 {
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index c287f174cc6..f3e07b3349b 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -278,6 +278,14 @@ public:
   CORBA_Policy_ptr _retn (void);
   CORBA_Policy_ptr ptr (void) const;
 
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_Policy_ptr duplicate (CORBA_Policy_ptr);
+  static void release (CORBA_Policy_ptr);
+  static CORBA_Policy_ptr nil (void);
+  static CORBA_Policy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
 private:
   CORBA_Policy_ptr ptr_;
   // Unimplemented - prevents widening assignment.
@@ -910,6 +918,14 @@ public:
   CORBA_PolicyManager_ptr _retn (void);
   CORBA_PolicyManager_ptr ptr (void) const;
 
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_PolicyManager_ptr duplicate (CORBA_PolicyManager_ptr);
+  static void release (CORBA_PolicyManager_ptr);
+  static CORBA_PolicyManager_ptr nil (void);
+  static CORBA_PolicyManager_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
 private:
   CORBA_PolicyManager_ptr ptr_;
   // Unimplemented - prevents widening assignment.
@@ -1043,6 +1059,14 @@ public:
   CORBA_PolicyCurrent_ptr _retn (void);
   CORBA_PolicyCurrent_ptr ptr (void) const;
 
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_PolicyCurrent_ptr duplicate (CORBA_PolicyCurrent_ptr);
+  static void release (CORBA_PolicyCurrent_ptr);
+  static CORBA_PolicyCurrent_ptr nil (void);
+  static CORBA_PolicyCurrent_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
 private:
   CORBA_PolicyCurrent_ptr ptr_;
   // Unimplemented - prevents widening assignment.
@@ -1124,7 +1148,9 @@ private:
 
 // Proxy Broker Factory function pointer declarations.
 
-extern TAO_Export _TAO_CORBA_Policy_Proxy_Broker * (*_TAO_CORBA_Policy_Proxy_Broker_Factory_function_pointer) (
+extern TAO_Export
+_TAO_CORBA_Policy_Proxy_Broker *
+(*_TAO_CORBA_Policy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i
index 1d4f91dcbf9..bbd5df5f2bd 100644
--- a/TAO/tao/PolicyC.i
+++ b/TAO/tao/PolicyC.i
@@ -207,184 +207,58 @@
 #if !defined (_CORBA_POLICY___CI_)
 #define _CORBA_POLICY___CI_
 
-ACE_INLINE
-CORBA_Policy::CORBA_Policy (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE CORBA_Policy_ptr
+tao_CORBA_Policy_duplicate (
+    CORBA_Policy_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->CORBA_Policy_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_POLICY___VAR_CI_)
-#define _CORBA_POLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_Policy_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_Policy_var::CORBA_Policy_var (void) // default constructor
-  : ptr_ (CORBA_Policy::_nil ())
-{}
-
-ACE_INLINE ::CORBA_Policy_ptr
-CORBA_Policy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Policy_var::CORBA_Policy_var (const ::CORBA_Policy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_Policy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_Policy_var::~CORBA_Policy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_Policy_var &
-CORBA_Policy_var::operator= (CORBA_Policy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_Policy_var &
-CORBA_Policy_var::operator= (const ::CORBA_Policy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_Policy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_Policy_var::operator const ::CORBA_Policy_ptr &() const // cast
 {
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_Policy_var::operator ::CORBA_Policy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Policy_ptr
-CORBA_Policy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Policy_ptr
-CORBA_Policy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Policy_ptr &
-CORBA_Policy_var::inout (void)
-{
-  return this->ptr_;
+  return CORBA_Policy::_duplicate (p);
 }
 
-ACE_INLINE ::CORBA_Policy_ptr &
-CORBA_Policy_var::out (void)
+ACE_INLINE void
+tao_CORBA_Policy_release (
+    CORBA_Policy_ptr p
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_Policy::_nil ();
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_Policy_ptr
-CORBA_Policy_var::_retn (void)
+ACE_INLINE CORBA_Policy_ptr
+tao_CORBA_Policy_nil (
+    void
+  )
 {
-  // yield ownership of managed obj reference
-  ::CORBA_Policy_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_Policy::_nil ();
-  return val;
+  return CORBA_Policy::_nil ();
 }
 
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_POLICY___OUT_CI_)
-#define _CORBA_POLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_Policy_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_Policy_out::CORBA_Policy_out (CORBA_Policy_ptr &p)
-  : ptr_ (p)
+ACE_INLINE CORBA_Policy_ptr
+tao_CORBA_Policy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  this->ptr_ = ::CORBA_Policy::_nil ();
+  return CORBA_Policy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE
-CORBA_Policy_out::CORBA_Policy_out (CORBA_Policy_var &p) // constructor from _var
-  : ptr_ (p.out ())
+ACE_INLINE CORBA::Object *
+tao_CORBA_Policy_upcast (
+    void *src
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_Policy::_nil ();
+  CORBA_Policy **tmp =
+    ACE_static_cast (CORBA_Policy **, src);
+  return *tmp;
 }
 
 ACE_INLINE
-CORBA_Policy_out::CORBA_Policy_out (const ::CORBA_Policy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_Policy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_Policy_out &
-CORBA_Policy_out::operator= (const ::CORBA_Policy_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_Policy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Policy_out &
-CORBA_Policy_out::operator= (const ::CORBA_Policy_var &p)
-{
-  this->ptr_ = ::CORBA_Policy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_Policy_out &
-CORBA_Policy_out::operator= (CORBA_Policy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_Policy_out::operator ::CORBA_Policy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Policy_ptr &
-CORBA_Policy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Policy_ptr
-CORBA_Policy_out::operator-> (void)
+CORBA_Policy::CORBA_Policy (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->CORBA_Policy_setup_collocation (_tao_collocated);
 }
 
 
@@ -404,7 +278,9 @@ CORBA_Policy_out::operator-> (void)
     ACE_NEW_RETURN (buf, CORBA_Policy*[nelems], 0);
     
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = CORBA_Policy::_nil ();
+      {
+        buf[i] = CORBA_Policy::_nil ();
+      }
     
     return buf;
   }
@@ -447,7 +323,9 @@ CORBA_Policy_out::operator-> (void)
       CORBA_Policy ** const tmp2 = ACE_reinterpret_cast (CORBA_Policy ** ACE_CAST_CONST, rhs.buffer_);
       
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = CORBA_Policy::_duplicate (tmp2[i]);
+        {
+          tmp1[i] = CORBA_Policy::_duplicate (tmp2[i]);
+        }
       
       this->buffer_ = tmp1;
     }
@@ -487,7 +365,9 @@ CORBA_Policy_out::operator-> (void)
     CORBA_Policy ** const tmp2 = ACE_reinterpret_cast (CORBA_Policy ** ACE_CAST_CONST, rhs.buffer_);
     
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = CORBA_Policy::_duplicate (tmp2[i]);
+      {
+        tmp1[i] = CORBA_Policy::_duplicate (tmp2[i]);
+      }
     
     return *this;
   }
@@ -1165,340 +1045,100 @@ CORBA_PolicyTypeSeq_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_POLICYMANAGER___VAR_CI_)
-#define _CORBA_POLICYMANAGER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyManager_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyManager_var::CORBA_PolicyManager_var (void) // default constructor
-  : ptr_ (CORBA_PolicyManager::_nil ())
-{}
-
-ACE_INLINE ::CORBA_PolicyManager_ptr
-CORBA_PolicyManager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyManager_var::CORBA_PolicyManager_var (const ::CORBA_PolicyManager_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_PolicyManager::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_PolicyManager_var::~CORBA_PolicyManager_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_PolicyManager_var &
-CORBA_PolicyManager_var::operator= (CORBA_PolicyManager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyManager_var &
-CORBA_PolicyManager_var::operator= (const ::CORBA_PolicyManager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_PolicyManager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_PolicyManager_var::operator const ::CORBA_PolicyManager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_PolicyManager_var::operator ::CORBA_PolicyManager_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_PolicyManager_ptr
-CORBA_PolicyManager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_PolicyManager_ptr
-CORBA_PolicyManager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_PolicyManager_ptr &
-CORBA_PolicyManager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_PolicyManager_ptr &
-CORBA_PolicyManager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_PolicyManager::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_PolicyManager_ptr
-CORBA_PolicyManager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA_PolicyManager_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_PolicyManager::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_POLICYMANAGER___OUT_CI_)
-#define _CORBA_POLICYMANAGER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyManager_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyManager_out::CORBA_PolicyManager_out (CORBA_PolicyManager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_PolicyManager::_nil ();
-}
-
-ACE_INLINE
-CORBA_PolicyManager_out::CORBA_PolicyManager_out (CORBA_PolicyManager_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_PolicyManager::_nil ();
-}
-
-ACE_INLINE
-CORBA_PolicyManager_out::CORBA_PolicyManager_out (const ::CORBA_PolicyManager_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_PolicyManager_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_PolicyManager_out &
-CORBA_PolicyManager_out::operator= (const ::CORBA_PolicyManager_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_PolicyManager_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyManager_out &
-CORBA_PolicyManager_out::operator= (const ::CORBA_PolicyManager_var &p)
-{
-  this->ptr_ = ::CORBA_PolicyManager::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyManager_out &
-CORBA_PolicyManager_out::operator= (CORBA_PolicyManager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_PolicyManager_out::operator ::CORBA_PolicyManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_PolicyManager_ptr &
-CORBA_PolicyManager_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_PolicyManager_ptr
-CORBA_PolicyManager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_POLICYCURRENT___VAR_CI_)
-#define _CORBA_POLICYCURRENT___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyCurrent_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyCurrent_var::CORBA_PolicyCurrent_var (void) // default constructor
-  : ptr_ (CORBA_PolicyCurrent::_nil ())
-{}
-
-ACE_INLINE ::CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyCurrent_var::CORBA_PolicyCurrent_var (const ::CORBA_PolicyCurrent_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_PolicyCurrent::_duplicate (p.ptr ()))
-{}
+#if !defined (_CORBA_POLICYMANAGER___CI_)
+#define _CORBA_POLICYMANAGER___CI_
 
-ACE_INLINE
-CORBA_PolicyCurrent_var::~CORBA_PolicyCurrent_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_PolicyCurrent_var &
-CORBA_PolicyCurrent_var::operator= (CORBA_PolicyCurrent_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_var &
-CORBA_PolicyCurrent_var::operator= (const ::CORBA_PolicyCurrent_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_PolicyCurrent::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_PolicyCurrent_var::operator const ::CORBA_PolicyCurrent_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_PolicyCurrent_var::operator ::CORBA_PolicyCurrent_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent_var::operator-> (void) const
+ACE_INLINE CORBA_PolicyManager_ptr
+tao_CORBA_PolicyManager_duplicate (
+    CORBA_PolicyManager_ptr p
+  )
 {
-  return this->ptr_;
+  return CORBA_PolicyManager::_duplicate (p);
 }
 
-ACE_INLINE ::CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent_var::in (void) const
+ACE_INLINE void
+tao_CORBA_PolicyManager_release (
+    CORBA_PolicyManager_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_PolicyCurrent_ptr &
-CORBA_PolicyCurrent_var::inout (void)
+ACE_INLINE CORBA_PolicyManager_ptr
+tao_CORBA_PolicyManager_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_PolicyManager::_nil ();
 }
 
-ACE_INLINE ::CORBA_PolicyCurrent_ptr &
-CORBA_PolicyCurrent_var::out (void)
+ACE_INLINE CORBA_PolicyManager_ptr
+tao_CORBA_PolicyManager_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_PolicyCurrent::_nil ();
-  return this->ptr_;
+  return CORBA_PolicyManager::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_PolicyManager_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::CORBA_PolicyCurrent_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_PolicyCurrent::_nil ();
-  return val;
+  CORBA_PolicyManager **tmp =
+    ACE_static_cast (CORBA_PolicyManager **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_POLICYCURRENT___OUT_CI_)
-#define _CORBA_POLICYCURRENT___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyCurrent_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyCurrent_out::CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_PolicyCurrent::_nil ();
-}
+#if !defined (_CORBA_POLICYCURRENT___CI_)
+#define _CORBA_POLICYCURRENT___CI_
 
-ACE_INLINE
-CORBA_PolicyCurrent_out::CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_PolicyCurrent::_nil ();
-}
-
-ACE_INLINE
-CORBA_PolicyCurrent_out::CORBA_PolicyCurrent_out (const ::CORBA_PolicyCurrent_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_PolicyCurrent_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_PolicyCurrent_out &
-CORBA_PolicyCurrent_out::operator= (const ::CORBA_PolicyCurrent_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_PolicyCurrent_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_out &
-CORBA_PolicyCurrent_out::operator= (const ::CORBA_PolicyCurrent_var &p)
+ACE_INLINE CORBA_PolicyCurrent_ptr
+tao_CORBA_PolicyCurrent_duplicate (
+    CORBA_PolicyCurrent_ptr p
+  )
 {
-  this->ptr_ = ::CORBA_PolicyCurrent::_duplicate (p.ptr ());
-  return *this;
+  return CORBA_PolicyCurrent::_duplicate (p);
 }
 
-ACE_INLINE CORBA_PolicyCurrent_out &
-CORBA_PolicyCurrent_out::operator= (CORBA_PolicyCurrent_ptr p)
+ACE_INLINE void
+tao_CORBA_PolicyCurrent_release (
+    CORBA_PolicyCurrent_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-CORBA_PolicyCurrent_out::operator ::CORBA_PolicyCurrent_ptr &() // cast
+ACE_INLINE CORBA_PolicyCurrent_ptr
+tao_CORBA_PolicyCurrent_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_PolicyCurrent::_nil ();
 }
 
-ACE_INLINE ::CORBA_PolicyCurrent_ptr &
-CORBA_PolicyCurrent_out::ptr (void) // ptr
+ACE_INLINE CORBA_PolicyCurrent_ptr
+tao_CORBA_PolicyCurrent_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_PolicyCurrent::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_PolicyCurrent_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  CORBA_PolicyCurrent **tmp =
+    ACE_static_cast (CORBA_PolicyCurrent **, src);
+  return *tmp;
 }
 
 
@@ -1594,55 +1234,16 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,CORBA_InvalidPolicies &
     return 0;
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+CORBA::Boolean TAO_Export operator<< (
     TAO_OutputCDR &,
     const CORBA_Policy_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+CORBA::Boolean TAO_Export operator>> (
     TAO_InputCDR &,
     CORBA_Policy_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_Policy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA_Policy_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      CORBA_Policy::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
 
 #if !defined _TAO_CDR_OP_CORBA_PolicyList_I_
 #define _TAO_CDR_OP_CORBA_PolicyList_I_
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index f1a644b7493..6bc3248d22e 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -1,11 +1,23 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*- $Id$ */
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PollableC.h"
 
@@ -21,6 +33,197 @@
 
 ACE_RCSID(tao, PollableC, "$Id$")
 
+// *************************************************************
+// Operations for class CORBA_Pollable_var
+// *************************************************************
+
+CORBA_Pollable_var::CORBA_Pollable_var (void) // default constructor
+  : ptr_ (CORBA_Pollable::_nil ())
+{}
+
+::CORBA_Pollable_ptr
+CORBA_Pollable_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_Pollable_var::CORBA_Pollable_var (const ::CORBA_Pollable_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_Pollable::_duplicate (p.ptr ()))
+{}
+
+CORBA_Pollable_var::~CORBA_Pollable_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_Pollable_var &
+CORBA_Pollable_var::operator= (CORBA_Pollable_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_Pollable_var &
+CORBA_Pollable_var::operator= (const ::CORBA_Pollable_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_Pollable::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_Pollable_var::operator const ::CORBA_Pollable_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_Pollable_var::operator ::CORBA_Pollable_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_Pollable_ptr
+CORBA_Pollable_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_Pollable_ptr
+CORBA_Pollable_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_Pollable_ptr &
+CORBA_Pollable_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_Pollable_ptr &
+CORBA_Pollable_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_Pollable::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_Pollable_ptr
+CORBA_Pollable_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_Pollable_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_Pollable::_nil ();
+  return val;
+}
+
+::CORBA_Pollable_ptr
+CORBA_Pollable_var::duplicate (CORBA_Pollable_ptr p)
+{
+  return ::CORBA_Pollable::_duplicate (p);
+}
+
+void
+CORBA_Pollable_var::release (CORBA_Pollable_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_Pollable_ptr
+CORBA_Pollable_var::nil (void)
+{
+  return ::CORBA_Pollable::_nil ();
+}
+
+::CORBA_Pollable_ptr
+CORBA_Pollable_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_Pollable::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_Pollable_var::upcast (void *src)
+{
+  CORBA_Pollable **tmp =
+    ACE_static_cast (CORBA_Pollable **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class CORBA_Pollable_out
+// *************************************************************
+
+CORBA_Pollable_out::CORBA_Pollable_out (CORBA_Pollable_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_Pollable::_nil ();
+}
+
+CORBA_Pollable_out::CORBA_Pollable_out (CORBA_Pollable_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_Pollable::_nil ();
+}
+
+CORBA_Pollable_out::CORBA_Pollable_out (const ::CORBA_Pollable_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_Pollable_out &, p).ptr_)
+{}
+
+::CORBA_Pollable_out &
+CORBA_Pollable_out::operator= (const ::CORBA_Pollable_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_Pollable_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_Pollable_out &
+CORBA_Pollable_out::operator= (const ::CORBA_Pollable_var &p)
+{
+  this->ptr_ = ::CORBA_Pollable::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_Pollable_out &
+CORBA_Pollable_out::operator= (CORBA_Pollable_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_Pollable_out::operator ::CORBA_Pollable_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_Pollable_ptr &
+CORBA_Pollable_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_Pollable_ptr
+CORBA_Pollable_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+CORBA_Pollable::CORBA_Pollable ()
+{
+  }
+
+// destructor
+CORBA_Pollable::~CORBA_Pollable (void)
+{}
+
 CORBA_Pollable_ptr CORBA_Pollable::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
@@ -80,6 +283,197 @@ const char* CORBA_Pollable::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/Pollable:1.0";
 }
 
+// *************************************************************
+// Operations for class CORBA_DIIPollable_var
+// *************************************************************
+
+CORBA_DIIPollable_var::CORBA_DIIPollable_var (void) // default constructor
+  : ptr_ (CORBA_DIIPollable::_nil ())
+{}
+
+::CORBA_DIIPollable_ptr
+CORBA_DIIPollable_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_DIIPollable_var::CORBA_DIIPollable_var (const ::CORBA_DIIPollable_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_DIIPollable::_duplicate (p.ptr ()))
+{}
+
+CORBA_DIIPollable_var::~CORBA_DIIPollable_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_DIIPollable_var &
+CORBA_DIIPollable_var::operator= (CORBA_DIIPollable_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_DIIPollable_var &
+CORBA_DIIPollable_var::operator= (const ::CORBA_DIIPollable_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_DIIPollable::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_DIIPollable_var::operator const ::CORBA_DIIPollable_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_DIIPollable_var::operator ::CORBA_DIIPollable_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_DIIPollable_ptr
+CORBA_DIIPollable_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_DIIPollable_ptr
+CORBA_DIIPollable_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_DIIPollable_ptr &
+CORBA_DIIPollable_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_DIIPollable_ptr &
+CORBA_DIIPollable_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_DIIPollable::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_DIIPollable_ptr
+CORBA_DIIPollable_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_DIIPollable_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_DIIPollable::_nil ();
+  return val;
+}
+
+::CORBA_DIIPollable_ptr
+CORBA_DIIPollable_var::duplicate (CORBA_DIIPollable_ptr p)
+{
+  return ::CORBA_DIIPollable::_duplicate (p);
+}
+
+void
+CORBA_DIIPollable_var::release (CORBA_DIIPollable_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_DIIPollable_ptr
+CORBA_DIIPollable_var::nil (void)
+{
+  return ::CORBA_DIIPollable::_nil ();
+}
+
+::CORBA_DIIPollable_ptr
+CORBA_DIIPollable_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_DIIPollable::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_DIIPollable_var::upcast (void *src)
+{
+  CORBA_DIIPollable **tmp =
+    ACE_static_cast (CORBA_DIIPollable **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class CORBA_DIIPollable_out
+// *************************************************************
+
+CORBA_DIIPollable_out::CORBA_DIIPollable_out (CORBA_DIIPollable_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_DIIPollable::_nil ();
+}
+
+CORBA_DIIPollable_out::CORBA_DIIPollable_out (CORBA_DIIPollable_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_DIIPollable::_nil ();
+}
+
+CORBA_DIIPollable_out::CORBA_DIIPollable_out (const ::CORBA_DIIPollable_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_DIIPollable_out &, p).ptr_)
+{}
+
+::CORBA_DIIPollable_out &
+CORBA_DIIPollable_out::operator= (const ::CORBA_DIIPollable_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_DIIPollable_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_DIIPollable_out &
+CORBA_DIIPollable_out::operator= (const ::CORBA_DIIPollable_var &p)
+{
+  this->ptr_ = ::CORBA_DIIPollable::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_DIIPollable_out &
+CORBA_DIIPollable_out::operator= (CORBA_DIIPollable_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_DIIPollable_out::operator ::CORBA_DIIPollable_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_DIIPollable_ptr &
+CORBA_DIIPollable_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_DIIPollable_ptr
+CORBA_DIIPollable_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+CORBA_DIIPollable::CORBA_DIIPollable ()
+{
+  }
+
+// destructor
+CORBA_DIIPollable::~CORBA_DIIPollable (void)
+{}
+
 CORBA_DIIPollable_ptr CORBA_DIIPollable::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
@@ -151,6 +545,197 @@ const char* CORBA_DIIPollable::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/DIIPollable:1.0";
 }
 
+// *************************************************************
+// Operations for class CORBA_PollableSet_var
+// *************************************************************
+
+CORBA_PollableSet_var::CORBA_PollableSet_var (void) // default constructor
+  : ptr_ (CORBA_PollableSet::_nil ())
+{}
+
+::CORBA_PollableSet_ptr
+CORBA_PollableSet_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_PollableSet_var::CORBA_PollableSet_var (const ::CORBA_PollableSet_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_PollableSet::_duplicate (p.ptr ()))
+{}
+
+CORBA_PollableSet_var::~CORBA_PollableSet_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_PollableSet_var &
+CORBA_PollableSet_var::operator= (CORBA_PollableSet_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_PollableSet_var &
+CORBA_PollableSet_var::operator= (const ::CORBA_PollableSet_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_PollableSet::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_PollableSet_var::operator const ::CORBA_PollableSet_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_PollableSet_var::operator ::CORBA_PollableSet_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_PollableSet_ptr
+CORBA_PollableSet_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_PollableSet_ptr
+CORBA_PollableSet_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_PollableSet_ptr &
+CORBA_PollableSet_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_PollableSet_ptr &
+CORBA_PollableSet_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_PollableSet::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_PollableSet_ptr
+CORBA_PollableSet_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_PollableSet_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_PollableSet::_nil ();
+  return val;
+}
+
+::CORBA_PollableSet_ptr
+CORBA_PollableSet_var::duplicate (CORBA_PollableSet_ptr p)
+{
+  return ::CORBA_PollableSet::_duplicate (p);
+}
+
+void
+CORBA_PollableSet_var::release (CORBA_PollableSet_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_PollableSet_ptr
+CORBA_PollableSet_var::nil (void)
+{
+  return ::CORBA_PollableSet::_nil ();
+}
+
+::CORBA_PollableSet_ptr
+CORBA_PollableSet_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_PollableSet::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_PollableSet_var::upcast (void *src)
+{
+  CORBA_PollableSet **tmp =
+    ACE_static_cast (CORBA_PollableSet **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class CORBA_PollableSet_out
+// *************************************************************
+
+CORBA_PollableSet_out::CORBA_PollableSet_out (CORBA_PollableSet_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_PollableSet::_nil ();
+}
+
+CORBA_PollableSet_out::CORBA_PollableSet_out (CORBA_PollableSet_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_PollableSet::_nil ();
+}
+
+CORBA_PollableSet_out::CORBA_PollableSet_out (const ::CORBA_PollableSet_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_PollableSet_out &, p).ptr_)
+{}
+
+::CORBA_PollableSet_out &
+CORBA_PollableSet_out::operator= (const ::CORBA_PollableSet_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_PollableSet_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_PollableSet_out &
+CORBA_PollableSet_out::operator= (const ::CORBA_PollableSet_var &p)
+{
+  this->ptr_ = ::CORBA_PollableSet::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_PollableSet_out &
+CORBA_PollableSet_out::operator= (CORBA_PollableSet_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_PollableSet_out::operator ::CORBA_PollableSet_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_PollableSet_ptr &
+CORBA_PollableSet_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_PollableSet_ptr
+CORBA_PollableSet_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+CORBA_PollableSet::CORBA_PollableSet ()
+{
+  }
+
+// destructor
+CORBA_PollableSet::~CORBA_PollableSet (void)
+{}
+
 CORBA_PollableSet_ptr CORBA_PollableSet::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
@@ -189,59 +774,83 @@ CORBA_PollableSet::_duplicate (CORBA_PollableSet_ptr obj)
   return obj;
 }
 
-// default constructor
+void *CORBA_PollableSet::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *retv = 0;
+  if (type == ACE_reinterpret_cast
+    (ptr_arith_t,
+      &CORBA_PollableSet::_narrow))
+    retv = ACE_reinterpret_cast (void*, this);
+  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+    retv = ACE_reinterpret_cast (void *,
+      ACE_static_cast (CORBA::Object_ptr, this));
+    
+  if (retv)
+    this->_add_ref ();
+  return retv;
+}
+
+const char* CORBA_PollableSet::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/CORBA_PollableSet:1.0";
+}
+
+// Default constructor.
 CORBA_PollableSet::NoPossiblePollable::NoPossiblePollable (void)
+  : CORBA_UserException ("IDL:omg.org/CORBA_PollableSet/NoPossiblePollable:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 CORBA_PollableSet::NoPossiblePollable::~NoPossiblePollable (void)
 {
 }
 
-// copy constructor
+// Copy constructor.
 CORBA_PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA_PollableSet::NoPossiblePollable &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
-  }
+}
 
-// assignment operator
+// Assignment operator.
 CORBA_PollableSet::NoPossiblePollable&
 CORBA_PollableSet::NoPossiblePollable::operator= (const ::CORBA_PollableSet::NoPossiblePollable &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 CORBA_PollableSet::NoPossiblePollable *
 CORBA_PollableSet::NoPossiblePollable::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (NoPossiblePollable *, exc);
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA_PollableSet/NoPossiblePollable:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (NoPossiblePollable *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void CORBA_PollableSet::NoPossiblePollable::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void CORBA_PollableSet::NoPossiblePollable::_tao_encode (
     TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV) const
+    CORBA::Environment &ACE_TRY_ENV
+  ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void CORBA_PollableSet::NoPossiblePollable::_tao_decode (
     TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
@@ -254,48 +863,50 @@ CORBA::Exception *CORBA_PollableSet::NoPossiblePollable::_alloc (void)
   return retval;
 }
 
-// default constructor
+// Default constructor.
 CORBA_PollableSet::UnknownPollable::UnknownPollable (void)
+  : CORBA_UserException ("IDL:omg.org/CORBA_PollableSet/UnknownPollable:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 CORBA_PollableSet::UnknownPollable::~UnknownPollable (void)
 {
 }
 
-// copy constructor
+// Copy constructor.
 CORBA_PollableSet::UnknownPollable::UnknownPollable (const ::CORBA_PollableSet::UnknownPollable &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
-  }
+}
 
-// assignment operator
+// Assignment operator.
 CORBA_PollableSet::UnknownPollable&
 CORBA_PollableSet::UnknownPollable::operator= (const ::CORBA_PollableSet::UnknownPollable &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 CORBA_PollableSet::UnknownPollable *
 CORBA_PollableSet::UnknownPollable::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (UnknownPollable *, exc);
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA_PollableSet/UnknownPollable:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (UnknownPollable *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void CORBA_PollableSet::UnknownPollable::_raise ()
 {
   TAO_RAISE(*this);
 }
 
-
 void CORBA_PollableSet::UnknownPollable::_tao_encode (
     TAO_OutputCDR &,
     CORBA::Environment &ACE_TRY_ENV) const
@@ -306,12 +917,13 @@ void CORBA_PollableSet::UnknownPollable::_tao_encode (
 
 void CORBA_PollableSet::UnknownPollable::_tao_decode (
     TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *CORBA_PollableSet::UnknownPollable::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -319,25 +931,25 @@ CORBA::Exception *CORBA_PollableSet::UnknownPollable::_alloc (void)
   return retval;
 }
 
-void *CORBA_PollableSet::_tao_QueryInterface (ptr_arith_t type)
-{
-  void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &CORBA_PollableSet::_narrow))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
-  return retv;
-}
-
-const char* CORBA_PollableSet::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PollableSet:1.0";
-}
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+    template class TAO_Object_Manager<CORBA_Pollable,CORBA_Pollable_var>;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  #  pragma instantiate TAO_Object_Manager<CORBA_Pollable,CORBA_Pollable_var>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+    template class TAO_Object_Manager<CORBA_DIIPollable,CORBA_DIIPollable_var>;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  #  pragma instantiate TAO_Object_Manager<CORBA_DIIPollable,CORBA_DIIPollable_var>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+    defined (ACE_HAS_GNU_REPO)
+    template class TAO_Object_Manager<CORBA_PollableSet,CORBA_PollableSet_var>;
+  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+  #  pragma instantiate TAO_Object_Manager<CORBA_PollableSet,CORBA_PollableSet_var>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 #endif /* TAO_HAS_AMI_POLLER == 1 */
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index d3b3d25b796..5d594835bcb 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -1,11 +1,23 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*- 
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #ifndef _TAO_IDL_TMP_POLLABLEC_H_
 #define _TAO_IDL_TMP_POLLABLEC_H_
@@ -43,6 +55,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
 class CORBA_PollableSet;
 
 #if !defined (_CORBA_POLLABLESET___PTR_CH_)
@@ -77,6 +93,14 @@ public:
   CORBA_PollableSet_ptr _retn (void);
   CORBA_PollableSet_ptr ptr (void) const;
 
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_PollableSet_ptr duplicate (CORBA_PollableSet_ptr);
+  static void release (CORBA_PollableSet_ptr);
+  static CORBA_PollableSet_ptr nil (void);
+  static CORBA_PollableSet_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
 private:
   CORBA_PollableSet_ptr ptr_;
   // Unimplemented - prevents widening assignment.
@@ -145,6 +169,14 @@ public:
   CORBA_Pollable_ptr _retn (void);
   CORBA_Pollable_ptr ptr (void) const;
 
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_Pollable_ptr duplicate (CORBA_Pollable_ptr);
+  static void release (CORBA_Pollable_ptr);
+  static CORBA_Pollable_ptr nil (void);
+  static CORBA_Pollable_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
 private:
   CORBA_Pollable_ptr ptr_;
   // Unimplemented - prevents widening assignment.
@@ -231,6 +263,7 @@ public:
 
 protected:
   CORBA_Pollable (void);
+
   virtual ~CORBA_Pollable (void);
 private:
   CORBA_Pollable (const CORBA_Pollable &);
@@ -274,6 +307,14 @@ public:
   CORBA_DIIPollable_ptr _retn (void);
   CORBA_DIIPollable_ptr ptr (void) const;
 
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_DIIPollable_ptr duplicate (CORBA_DIIPollable_ptr);
+  static void release (CORBA_DIIPollable_ptr);
+  static CORBA_DIIPollable_ptr nil (void);
+  static CORBA_DIIPollable_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
+
 private:
   CORBA_DIIPollable_ptr ptr_;
   // Unimplemented - prevents widening assignment.
@@ -343,6 +384,7 @@ public:
 
 protected:
   CORBA_DIIPollable (void);
+
   virtual ~CORBA_DIIPollable (void);
 private:
   CORBA_DIIPollable (const CORBA_DIIPollable &);
@@ -362,65 +404,6 @@ typedef CORBA_PollableSet *CORBA_PollableSet_ptr;
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_POLLABLESET___VAR_CH_)
-#define _CORBA_POLLABLESET___VAR_CH_
-
-class TAO_Export CORBA_PollableSet_var : public TAO_Base_var
-{
-public:
-  CORBA_PollableSet_var (void); // default constructor
-  CORBA_PollableSet_var (CORBA_PollableSet_ptr);
-  CORBA_PollableSet_var (const CORBA_PollableSet_var &); // copy constructor
-  ~CORBA_PollableSet_var (void); // destructor
-
-  CORBA_PollableSet_var &operator= (CORBA_PollableSet_ptr);
-  CORBA_PollableSet_var &operator= (const CORBA_PollableSet_var &);
-  CORBA_PollableSet_ptr operator-> (void) const;
-
-  operator const CORBA_PollableSet_ptr &() const;
-  operator CORBA_PollableSet_ptr &();
-  // in, inout, out, _retn
-  CORBA_PollableSet_ptr in (void) const;
-  CORBA_PollableSet_ptr &inout (void);
-  CORBA_PollableSet_ptr &out (void);
-  CORBA_PollableSet_ptr _retn (void);
-  CORBA_PollableSet_ptr ptr (void) const;
-
-private:
-  CORBA_PollableSet_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  CORBA_PollableSet_var (const TAO_Base_var &rhs);
-  CORBA_PollableSet_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_POLLABLESET___OUT_CH_)
-#define _CORBA_POLLABLESET___OUT_CH_
-
-class TAO_Export CORBA_PollableSet_out
-{
-public:
-  CORBA_PollableSet_out (CORBA_PollableSet_ptr &);
-  CORBA_PollableSet_out (CORBA_PollableSet_var &);
-  CORBA_PollableSet_out (const CORBA_PollableSet_out &);
-  CORBA_PollableSet_out &operator= (const CORBA_PollableSet_out &);
-  CORBA_PollableSet_out &operator= (const CORBA_PollableSet_var &);
-  CORBA_PollableSet_out &operator= (CORBA_PollableSet_ptr);
-  operator CORBA_PollableSet_ptr &();
-  CORBA_PollableSet_ptr &ptr (void);
-  CORBA_PollableSet_ptr operator-> (void);
-
-private:
-  CORBA_PollableSet_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_CORBA_POLLABLESET_CH_)
 #define _CORBA_POLLABLESET_CH_
 
@@ -457,29 +440,35 @@ public:
   {
   public:
 
-
-  NoPossiblePollable (void); // default ctor
-  NoPossiblePollable (const NoPossiblePollable &); // copy ctor
-  ~NoPossiblePollable (void);
-  NoPossiblePollable &operator= (const NoPossiblePollable &);
-
-
-  virtual void _raise (void);
-
-  virtual void _tao_encode (
-      TAO_OutputCDR &,
-      CORBA::Environment &) const;
-  virtual void _tao_decode (
-      TAO_InputCDR &,
-      CORBA::Environment &);
-
-  static NoPossiblePollable *_downcast (CORBA::Exception *);
-
-
-  // = TAO extension
-  static CORBA::Exception *_alloc (void);
-
-}; // exception CORBA_PollableSet::NoPossiblePollable
+    NoPossiblePollable (void);
+    // Default constructor.
+    
+    NoPossiblePollable (const NoPossiblePollable &);
+    // Copy constructor.
+    
+    ~NoPossiblePollable (void);
+    // Destructor.
+    
+    NoPossiblePollable &operator= (const NoPossiblePollable &);
+    
+    virtual void _raise (void);
+
+    virtual void _tao_encode (
+        TAO_OutputCDR &,
+        CORBA::Environment &
+      ) const;
+    
+    virtual void _tao_decode (
+        TAO_InputCDR &,
+        CORBA::Environment &
+      );
+    
+    static NoPossiblePollable *_downcast (CORBA::Exception *);
+
+
+    // = TAO extension.
+    static CORBA::Exception *_alloc (void);
+  }; // Exception CORBA_PollableSet::NoPossiblePollable.
 
 
 #endif /* end #if !defined */
@@ -488,33 +477,39 @@ public:
 #if !defined (_CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_)
 #define _CORBA_POLLABLESET_UNKNOWNPOLLABLE_CH_
 
-class TAO_Export UnknownPollable : public CORBA::UserException
-{
-public:
-
-
-UnknownPollable (void); // default ctor
-UnknownPollable (const UnknownPollable &); // copy ctor
-~UnknownPollable (void);
-UnknownPollable &operator= (const UnknownPollable &);
-
-
-virtual void _raise (void);
-
-virtual void _tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &) const;
-virtual void _tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &);
-
-static UnknownPollable *_downcast (CORBA::Exception *);
-
-
-// = TAO extension
-static CORBA::Exception *_alloc (void);
+  class TAO_Export UnknownPollable : public CORBA::UserException
+  {
+  public:
 
-}; // exception CORBA_PollableSet::UnknownPollable
+    UnknownPollable (void);
+    // Default constructor.
+    
+    UnknownPollable (const UnknownPollable &);
+    // Copy constructor.
+    
+    ~UnknownPollable (void);
+    // Destructor.
+    
+    UnknownPollable &operator= (const UnknownPollable &);
+    
+    virtual void _raise (void);
+
+    virtual void _tao_encode (
+        TAO_OutputCDR &,
+        CORBA::Environment &
+      ) const;
+    
+    virtual void _tao_decode (
+        TAO_InputCDR &,
+        CORBA::Environment &
+      );
+    
+    static UnknownPollable *_downcast (CORBA::Exception *);
+
+
+    // = TAO extension.
+    static CORBA::Exception *_alloc (void);
+  }; // Exception CORBA_PollableSet::UnknownPollable.
 
 
 #endif /* end #if !defined */
@@ -570,6 +565,7 @@ virtual const char* _interface_repository_id (void) const;
 
 protected:
   CORBA_PollableSet (void);
+
   virtual ~CORBA_PollableSet (void);
 private:
   CORBA_PollableSet (const CORBA_PollableSet &);
@@ -594,6 +590,10 @@ private:
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #endif /* TAO_HAS_AMI_POLLER == 1 */
 
 #include "ace/post.h"
diff --git a/TAO/tao/PollableC.i b/TAO/tao/PollableC.i
index 9525b7375d8..15ab3737c09 100644
--- a/TAO/tao/PollableC.i
+++ b/TAO/tao/PollableC.i
@@ -1,576 +1,178 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*- $Id$ */
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-ACE_INLINE
-CORBA_Pollable::CORBA_Pollable (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_Pollable::~CORBA_Pollable (void) // destructor
-{}
-
-
-#if !defined (_CORBA_POLLABLE___VAR_CI_)
-#define _CORBA_POLLABLE___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_Pollable_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_Pollable_var::CORBA_Pollable_var (void) // default constructor
-  : ptr_ (CORBA_Pollable::_nil ())
-{}
-
-ACE_INLINE
-CORBA_Pollable_var::CORBA_Pollable_var (CORBA_Pollable_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE ::CORBA_Pollable_ptr
-CORBA_Pollable_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Pollable_var::CORBA_Pollable_var (const ::CORBA_Pollable_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_Pollable::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_Pollable_var::~CORBA_Pollable_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_Pollable_var &
-CORBA_Pollable_var::operator= (CORBA_Pollable_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_Pollable_var &
-CORBA_Pollable_var::operator= (const ::CORBA_Pollable_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_Pollable::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Pollable_var::operator const ::CORBA_Pollable_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Pollable_var::operator ::CORBA_Pollable_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Pollable_ptr
-CORBA_Pollable_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Pollable_ptr
-CORBA_Pollable_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Pollable_ptr &
-CORBA_Pollable_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Pollable_ptr &
-CORBA_Pollable_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_Pollable::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Pollable_ptr
-CORBA_Pollable_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA_Pollable_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_Pollable::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_POLLABLE___OUT_CI_)
-#define _CORBA_POLLABLE___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_Pollable_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_Pollable_out::CORBA_Pollable_out (CORBA_Pollable_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_Pollable::_nil ();
-}
-
-ACE_INLINE
-CORBA_Pollable_out::CORBA_Pollable_out (CORBA_Pollable_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_Pollable::_nil ();
-}
-
-ACE_INLINE
-CORBA_Pollable_out::CORBA_Pollable_out (const ::CORBA_Pollable_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_Pollable_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_Pollable_out &
-CORBA_Pollable_out::operator= (const ::CORBA_Pollable_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_Pollable_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Pollable_out &
-CORBA_Pollable_out::operator= (const ::CORBA_Pollable_var &p)
-{
-  this->ptr_ = ::CORBA_Pollable::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_Pollable_out &
-CORBA_Pollable_out::operator= (CORBA_Pollable_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Pollable_out::operator ::CORBA_Pollable_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Pollable_ptr &
-CORBA_Pollable_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_Pollable_ptr
-CORBA_Pollable_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-CORBA_DIIPollable::CORBA_DIIPollable (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_DIIPollable::~CORBA_DIIPollable (void) // destructor
-{}
-
-
-#if !defined (_CORBA_DIIPOLLABLE___VAR_CI_)
-#define _CORBA_DIIPOLLABLE___VAR_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_DIIPollable_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_DIIPollable_var::CORBA_DIIPollable_var (void) // default constructor
-  : ptr_ (CORBA_DIIPollable::_nil ())
-{}
-
-ACE_INLINE
-CORBA_DIIPollable_var::CORBA_DIIPollable_var (CORBA_DIIPollable_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE ::CORBA_DIIPollable_ptr
-CORBA_DIIPollable_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DIIPollable_var::CORBA_DIIPollable_var (const ::CORBA_DIIPollable_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_DIIPollable::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_DIIPollable_var::~CORBA_DIIPollable_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-ACE_INLINE CORBA_DIIPollable_var &
-CORBA_DIIPollable_var::operator= (CORBA_DIIPollable_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
 
-ACE_INLINE CORBA_DIIPollable_var &
-CORBA_DIIPollable_var::operator= (const ::CORBA_DIIPollable_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_DIIPollable::_duplicate (p.ptr ());
-  }
-  return *this;
-}
+#if !defined (_CORBA_POLLABLE___CI_)
+#define _CORBA_POLLABLE___CI_
 
-ACE_INLINE
-CORBA_DIIPollable_var::operator const ::CORBA_DIIPollable_ptr &() const // cast
+ACE_INLINE CORBA_Pollable_ptr
+tao_CORBA_Pollable_duplicate (
+    CORBA_Pollable_ptr p
+  )
 {
-  return this->ptr_;
+  return CORBA_Pollable::_duplicate (p);
 }
 
-ACE_INLINE
-CORBA_DIIPollable_var::operator ::CORBA_DIIPollable_ptr &() // cast
+ACE_INLINE void
+tao_CORBA_Pollable_release (
+    CORBA_Pollable_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::CORBA_DIIPollable_ptr
-CORBA_DIIPollable_var::operator-> (void) const
+ACE_INLINE CORBA_Pollable_ptr
+tao_CORBA_Pollable_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_Pollable::_nil ();
 }
 
-ACE_INLINE ::CORBA_DIIPollable_ptr
-CORBA_DIIPollable_var::in (void) const
+ACE_INLINE CORBA_Pollable_ptr
+tao_CORBA_Pollable_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_Pollable::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_DIIPollable_ptr &
-CORBA_DIIPollable_var::inout (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_Pollable_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_DIIPollable_ptr &
-CORBA_DIIPollable_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_DIIPollable::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_DIIPollable_ptr
-CORBA_DIIPollable_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA_DIIPollable_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_DIIPollable::_nil ();
-  return val;
+  CORBA_Pollable **tmp =
+    ACE_static_cast (CORBA_Pollable **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_CORBA_DIIPOLLABLE___OUT_CI_)
-#define _CORBA_DIIPOLLABLE___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_DIIPollable_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_DIIPollable_out::CORBA_DIIPollable_out (CORBA_DIIPollable_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_DIIPollable::_nil ();
-}
-
-ACE_INLINE
-CORBA_DIIPollable_out::CORBA_DIIPollable_out (CORBA_DIIPollable_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_DIIPollable::_nil ();
-}
-
-ACE_INLINE
-CORBA_DIIPollable_out::CORBA_DIIPollable_out (const ::CORBA_DIIPollable_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_DIIPollable_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_DIIPollable_out &
-CORBA_DIIPollable_out::operator= (const ::CORBA_DIIPollable_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_DIIPollable_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_CORBA_DIIPOLLABLE___CI_)
+#define _CORBA_DIIPOLLABLE___CI_
 
-ACE_INLINE CORBA_DIIPollable_out &
-CORBA_DIIPollable_out::operator= (const ::CORBA_DIIPollable_var &p)
+ACE_INLINE CORBA_DIIPollable_ptr
+tao_CORBA_DIIPollable_duplicate (
+    CORBA_DIIPollable_ptr p
+  )
 {
-  this->ptr_ = ::CORBA_DIIPollable::_duplicate (p.ptr ());
-  return *this;
+  return CORBA_DIIPollable::_duplicate (p);
 }
 
-ACE_INLINE CORBA_DIIPollable_out &
-CORBA_DIIPollable_out::operator= (CORBA_DIIPollable_ptr p)
+ACE_INLINE void
+tao_CORBA_DIIPollable_release (
+    CORBA_DIIPollable_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-CORBA_DIIPollable_out::operator ::CORBA_DIIPollable_ptr &() // cast
+ACE_INLINE CORBA_DIIPollable_ptr
+tao_CORBA_DIIPollable_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_DIIPollable::_nil ();
 }
 
-ACE_INLINE ::CORBA_DIIPollable_ptr &
-CORBA_DIIPollable_out::ptr (void) // ptr
+ACE_INLINE CORBA_DIIPollable_ptr
+tao_CORBA_DIIPollable_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_DIIPollable::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_DIIPollable_ptr
-CORBA_DIIPollable_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_DIIPollable_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  CORBA_DIIPollable **tmp =
+    ACE_static_cast (CORBA_DIIPollable **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
-ACE_INLINE
-CORBA_PollableSet::CORBA_PollableSet (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_PollableSet::~CORBA_PollableSet (void) // destructor
-{}
-
-
-#if !defined (_CORBA_POLLABLESET___VAR_CI_)
-#define _CORBA_POLLABLESET___VAR_CI_
-
 // *************************************************************
-// Inline operations for class CORBA_PollableSet_var
+// Inline operations for exception CORBA_PollableSet::NoPossiblePollable
 // *************************************************************
 
-ACE_INLINE
-CORBA_PollableSet_var::CORBA_PollableSet_var (void) // default constructor
-  : ptr_ (CORBA_PollableSet::_nil ())
-{}
-
-ACE_INLINE
-CORBA_PollableSet_var::CORBA_PollableSet_var (CORBA_PollableSet_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE ::CORBA_PollableSet_ptr
-CORBA_PollableSet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PollableSet_var::CORBA_PollableSet_var (const ::CORBA_PollableSet_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_PollableSet::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_PollableSet_var::~CORBA_PollableSet_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_PollableSet_var &
-CORBA_PollableSet_var::operator= (CORBA_PollableSet_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_PollableSet_var &
-CORBA_PollableSet_var::operator= (const ::CORBA_PollableSet_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_PollableSet::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_PollableSet_var::operator const ::CORBA_PollableSet_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PollableSet_var::operator ::CORBA_PollableSet_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_PollableSet_ptr
-CORBA_PollableSet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_PollableSet_ptr
-CORBA_PollableSet_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_PollableSet_ptr &
-CORBA_PollableSet_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_PollableSet_ptr &
-CORBA_PollableSet_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_PollableSet::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_PollableSet_ptr
-CORBA_PollableSet_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA_PollableSet_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_PollableSet::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_POLLABLESET___OUT_CI_)
-#define _CORBA_POLLABLESET___OUT_CI_
-
 // *************************************************************
-// Inline operations for class CORBA_PollableSet_out
+// Inline operations for exception CORBA_PollableSet::UnknownPollable
 // *************************************************************
 
-ACE_INLINE
-CORBA_PollableSet_out::CORBA_PollableSet_out (CORBA_PollableSet_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_PollableSet::_nil ();
-}
+#if !defined (_CORBA_POLLABLESET___CI_)
+#define _CORBA_POLLABLESET___CI_
 
-ACE_INLINE
-CORBA_PollableSet_out::CORBA_PollableSet_out (CORBA_PollableSet_var &p) // constructor from _var
-  : ptr_ (p.out ())
+ACE_INLINE CORBA_PollableSet_ptr
+tao_CORBA_PollableSet_duplicate (
+    CORBA_PollableSet_ptr p
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_PollableSet::_nil ();
+  return CORBA_PollableSet::_duplicate (p);
 }
 
-ACE_INLINE
-CORBA_PollableSet_out::CORBA_PollableSet_out (const ::CORBA_PollableSet_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_PollableSet_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_PollableSet_out &
-CORBA_PollableSet_out::operator= (const ::CORBA_PollableSet_out &p)
+ACE_INLINE void
+tao_CORBA_PollableSet_release (
+    CORBA_PollableSet_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (CORBA_PollableSet_out&, p).ptr_;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE CORBA_PollableSet_out &
-CORBA_PollableSet_out::operator= (const ::CORBA_PollableSet_var &p)
+ACE_INLINE CORBA_PollableSet_ptr
+tao_CORBA_PollableSet_nil (
+    void
+  )
 {
-  this->ptr_ = ::CORBA_PollableSet::_duplicate (p.ptr ());
-  return *this;
+  return CORBA_PollableSet::_nil ();
 }
 
-ACE_INLINE CORBA_PollableSet_out &
-CORBA_PollableSet_out::operator= (CORBA_PollableSet_ptr p)
+ACE_INLINE CORBA_PollableSet_ptr
+tao_CORBA_PollableSet_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  return CORBA_PollableSet::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE
-CORBA_PollableSet_out::operator ::CORBA_PollableSet_ptr &() // cast
+ACE_INLINE CORBA::Object *
+tao_CORBA_PollableSet_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_PollableSet_ptr &
-CORBA_PollableSet_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_PollableSet_ptr
-CORBA_PollableSet_out::operator-> (void)
-{
-  return this->ptr_;
+  CORBA_PollableSet **tmp =
+    ACE_static_cast (CORBA_PollableSet **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
-// *************************************************************
-// Inline operations for exception CORBA_PollableSet::NoPossiblePollable
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception CORBA_PollableSet::UnknownPollable
-// *************************************************************
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA_PollableSet_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA_PollableSet_ptr &
-  );
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 13538cdf8a3..a16cd6a5497 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -31,6 +31,188 @@
 
 #include "CORBA_String.h"
 
+// *************************************************************
+// Operations for class PortableInterceptor::Interceptor_var
+// *************************************************************
+
+PortableInterceptor::Interceptor_var::Interceptor_var (void) // default constructor
+  : ptr_ (Interceptor::_nil ())
+{}
+
+::PortableInterceptor::Interceptor_ptr
+PortableInterceptor::Interceptor_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::Interceptor_var::Interceptor_var (const ::PortableInterceptor::Interceptor_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (Interceptor::_duplicate (p.ptr ()))
+{}
+
+PortableInterceptor::Interceptor_var::~Interceptor_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableInterceptor::Interceptor_var &
+PortableInterceptor::Interceptor_var::operator= (Interceptor_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::Interceptor_var &
+PortableInterceptor::Interceptor_var::operator= (const ::PortableInterceptor::Interceptor_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableInterceptor::Interceptor::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableInterceptor::Interceptor_var::operator const ::PortableInterceptor::Interceptor_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::Interceptor_ptr
+PortableInterceptor::Interceptor_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::Interceptor_ptr
+PortableInterceptor::Interceptor_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::Interceptor_ptr &
+PortableInterceptor::Interceptor_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::Interceptor_ptr &
+PortableInterceptor::Interceptor_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::Interceptor::_nil ();
+  return this->ptr_;
+}
+
+::PortableInterceptor::Interceptor_ptr
+PortableInterceptor::Interceptor_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableInterceptor::Interceptor_ptr val = this->ptr_;
+  this->ptr_ = ::PortableInterceptor::Interceptor::_nil ();
+  return val;
+}
+
+::PortableInterceptor::Interceptor_ptr
+PortableInterceptor::Interceptor_var::duplicate (PortableInterceptor::Interceptor_ptr p)
+{
+  return ::PortableInterceptor::Interceptor::_duplicate (p);
+}
+
+void
+PortableInterceptor::Interceptor_var::release (PortableInterceptor::Interceptor_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableInterceptor::Interceptor_ptr
+PortableInterceptor::Interceptor_var::nil (void)
+{
+  return ::PortableInterceptor::Interceptor::_nil ();
+}
+
+::PortableInterceptor::Interceptor_ptr
+PortableInterceptor::Interceptor_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableInterceptor::Interceptor::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableInterceptor::Interceptor_var::upcast (void *src)
+{
+  PortableInterceptor::Interceptor **tmp =
+    ACE_static_cast (PortableInterceptor::Interceptor **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class PortableInterceptor::Interceptor_out
+// *************************************************************
+
+PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableInterceptor::Interceptor::_nil ();
+}
+
+PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::Interceptor::_nil ();
+}
+
+PortableInterceptor::Interceptor_out::Interceptor_out (const ::PortableInterceptor::Interceptor_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (Interceptor_out &, p).ptr_)
+{}
+
+::PortableInterceptor::Interceptor_out &
+PortableInterceptor::Interceptor_out::operator= (const ::PortableInterceptor::Interceptor_out &p)
+{
+  this->ptr_ = ACE_const_cast (Interceptor_out&, p).ptr_;
+  return *this;
+}
+
+PortableInterceptor::Interceptor_out &
+PortableInterceptor::Interceptor_out::operator= (const ::PortableInterceptor::Interceptor_var &p)
+{
+  this->ptr_ = ::PortableInterceptor::Interceptor::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableInterceptor::Interceptor_out &
+PortableInterceptor::Interceptor_out::operator= (Interceptor_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::Interceptor_out::operator ::PortableInterceptor::Interceptor_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::Interceptor_ptr &
+PortableInterceptor::Interceptor_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::Interceptor_ptr
+PortableInterceptor::Interceptor_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 PortableInterceptor::Interceptor::Interceptor ()
 {
@@ -200,21 +382,59 @@ PortableInterceptor::ForwardRequest::ForwardRequest (
 static const CORBA::Long _oc_PortableInterceptor_ForwardRequest[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72636570), ACE_NTOHL (0x746f722f), ACE_NTOHL (0x466f7277), ACE_NTOHL (0x61726452), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableInterceptor/ForwardRequest:1.0
-  15, ACE_NTOHL (0x466f7277), ACE_NTOHL (0x61726452), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73740000),  // name = ForwardRequest
+  43,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x466f7277), 
+  ACE_NTOHL (0x61726452), 
+  ACE_NTOHL (0x65717565), 
+  ACE_NTOHL (0x73743a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableInterceptor/ForwardRequest:1.0
+  15,
+  ACE_NTOHL (0x466f7277), 
+  ACE_NTOHL (0x61726452), 
+  ACE_NTOHL (0x65717565), 
+  ACE_NTOHL (0x73740000),  // name = ForwardRequest
   2, // member count
-  8, ACE_NTOHL (0x666f7277), ACE_NTOHL (0x61726400),  // name = forward
+  8,
+  ACE_NTOHL (0x666f7277), 
+  ACE_NTOHL (0x61726400),  // name = forward
   CORBA::tk_objref,
   52, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
-    7, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63740000),  // name = Object
-
-  10, ACE_NTOHL (0x7065726d), ACE_NTOHL (0x616e656e), ACE_NTOHL (0x74000000),  // name = permanent
+    29,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f62), 
+    ACE_NTOHL (0x6a656374), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
+    7,
+    ACE_NTOHL (0x4f626a65), 
+    ACE_NTOHL (0x63740000),  // name = Object
+
+  10,
+  ACE_NTOHL (0x7065726d), 
+  ACE_NTOHL (0x616e656e), 
+  ACE_NTOHL (0x74000000),  // name = permanent
   CORBA::tk_boolean,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ForwardRequest (CORBA::tk_except, sizeof (_oc_PortableInterceptor_ForwardRequest), (char *) &_oc_PortableInterceptor_ForwardRequest, 0, sizeof (PortableInterceptor::ForwardRequest));
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ForwardRequest (
+    CORBA::tk_except,
+    sizeof (_oc_PortableInterceptor_ForwardRequest),
+    (char *) &_oc_PortableInterceptor_ForwardRequest,
+    0,
+    sizeof (PortableInterceptor::ForwardRequest)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ForwardRequest, &_tc_TAO_tc_PortableInterceptor_ForwardRequest)
@@ -229,16 +449,38 @@ CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_type (void) const
 static const CORBA::Long _oc_PortableInterceptor_ReplyStatus[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72636570), ACE_NTOHL (0x746f722f), ACE_NTOHL (0x5265706c), ACE_NTOHL (0x79537461), ACE_NTOHL (0x7475733a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableInterceptor/ReplyStatus:1.0
-  12, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x79537461), ACE_NTOHL (0x74757300),  // name = ReplyStatus
+  40,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x5265706c), 
+  ACE_NTOHL (0x79537461), 
+  ACE_NTOHL (0x7475733a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableInterceptor/ReplyStatus:1.0
+  12,
+  ACE_NTOHL (0x5265706c), 
+  ACE_NTOHL (0x79537461), 
+  ACE_NTOHL (0x74757300),  // name = ReplyStatus
   CORBA::tk_short,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ReplyStatus (CORBA::tk_alias, sizeof (_oc_PortableInterceptor_ReplyStatus), (char *) &_oc_PortableInterceptor_ReplyStatus, 0, sizeof (PortableInterceptor::ReplyStatus));
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_ReplyStatus (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableInterceptor_ReplyStatus),
+    (char *) &_oc_PortableInterceptor_ReplyStatus,
+    0,
+    sizeof (PortableInterceptor::ReplyStatus)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyStatus, &_tc_TAO_tc_PortableInterceptor_ReplyStatus)
 TAO_NAMESPACE_END
+
 TAO_NAMESPACE_TYPE (const CORBA::Short)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
 TAO_NAMESPACE_DEFINE (const CORBA::Short, SUCCESSFUL, 0)
@@ -266,16 +508,36 @@ TAO_NAMESPACE_END
 static const CORBA::Long _oc_PortableInterceptor_SlotId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72636570), ACE_NTOHL (0x746f722f), ACE_NTOHL (0x536c6f74), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableInterceptor/SlotId:1.0
-  7, ACE_NTOHL (0x536c6f74), ACE_NTOHL (0x49640000),  // name = SlotId
+  35,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x536c6f74), 
+  ACE_NTOHL (0x49643a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableInterceptor/SlotId:1.0
+  7,
+  ACE_NTOHL (0x536c6f74), 
+  ACE_NTOHL (0x49640000),  // name = SlotId
   CORBA::tk_ulong,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_SlotId (CORBA::tk_alias, sizeof (_oc_PortableInterceptor_SlotId), (char *) &_oc_PortableInterceptor_SlotId, 0, sizeof (PortableInterceptor::SlotId));
+
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_SlotId (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableInterceptor_SlotId),
+    (char *) &_oc_PortableInterceptor_SlotId,
+    0,
+    sizeof (PortableInterceptor::SlotId)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SlotId, &_tc_TAO_tc_PortableInterceptor_SlotId)
 TAO_NAMESPACE_END
+
 // Default constructor.
 PortableInterceptor::InvalidSlot::InvalidSlot (void)
   : CORBA_UserException ("IDL:PortableInterceptor/InvalidSlot:1.0")
@@ -363,11 +625,31 @@ CORBA::Exception *PortableInterceptor::InvalidSlot::_alloc (void)
 static const CORBA::Long _oc_PortableInterceptor_InvalidSlot[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72636570), ACE_NTOHL (0x746f722f), ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c696453), ACE_NTOHL (0x6c6f743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableInterceptor/InvalidSlot:1.0
-  12, ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c696453), ACE_NTOHL (0x6c6f7400),  // name = InvalidSlot
+  40,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x496e7465), 
+  ACE_NTOHL (0x72636570), 
+  ACE_NTOHL (0x746f722f), 
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696453), 
+  ACE_NTOHL (0x6c6f743a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableInterceptor/InvalidSlot:1.0
+  12,
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696453), 
+  ACE_NTOHL (0x6c6f7400),  // name = InvalidSlot
   0, // member count
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_InvalidSlot (CORBA::tk_except, sizeof (_oc_PortableInterceptor_InvalidSlot), (char *) &_oc_PortableInterceptor_InvalidSlot, 0, sizeof (PortableInterceptor::InvalidSlot));
+static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_InvalidSlot (
+    CORBA::tk_except,
+    sizeof (_oc_PortableInterceptor_InvalidSlot),
+    (char *) &_oc_PortableInterceptor_InvalidSlot,
+    0,
+    sizeof (PortableInterceptor::InvalidSlot)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableInterceptor)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InvalidSlot, &_tc_TAO_tc_PortableInterceptor_InvalidSlot)
@@ -380,6 +662,188 @@ CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_type (void) const
 }
 
 
+// *************************************************************
+// Operations for class PortableInterceptor::Current_var
+// *************************************************************
+
+PortableInterceptor::Current_var::Current_var (void) // default constructor
+  : ptr_ (Current::_nil ())
+{}
+
+::PortableInterceptor::Current_ptr
+PortableInterceptor::Current_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::Current_var::Current_var (const ::PortableInterceptor::Current_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (Current::_duplicate (p.ptr ()))
+{}
+
+PortableInterceptor::Current_var::~Current_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableInterceptor::Current_var &
+PortableInterceptor::Current_var::operator= (Current_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::Current_var &
+PortableInterceptor::Current_var::operator= (const ::PortableInterceptor::Current_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableInterceptor::Current::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableInterceptor::Current_var::operator const ::PortableInterceptor::Current_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::Current_ptr
+PortableInterceptor::Current_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::Current_ptr
+PortableInterceptor::Current_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::Current_ptr &
+PortableInterceptor::Current_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::Current_ptr &
+PortableInterceptor::Current_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::Current::_nil ();
+  return this->ptr_;
+}
+
+::PortableInterceptor::Current_ptr
+PortableInterceptor::Current_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableInterceptor::Current_ptr val = this->ptr_;
+  this->ptr_ = ::PortableInterceptor::Current::_nil ();
+  return val;
+}
+
+::PortableInterceptor::Current_ptr
+PortableInterceptor::Current_var::duplicate (PortableInterceptor::Current_ptr p)
+{
+  return ::PortableInterceptor::Current::_duplicate (p);
+}
+
+void
+PortableInterceptor::Current_var::release (PortableInterceptor::Current_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableInterceptor::Current_ptr
+PortableInterceptor::Current_var::nil (void)
+{
+  return ::PortableInterceptor::Current::_nil ();
+}
+
+::PortableInterceptor::Current_ptr
+PortableInterceptor::Current_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableInterceptor::Current::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableInterceptor::Current_var::upcast (void *src)
+{
+  PortableInterceptor::Current **tmp =
+    ACE_static_cast (PortableInterceptor::Current **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class PortableInterceptor::Current_out
+// *************************************************************
+
+PortableInterceptor::Current_out::Current_out (Current_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableInterceptor::Current::_nil ();
+}
+
+PortableInterceptor::Current_out::Current_out (Current_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::Current::_nil ();
+}
+
+PortableInterceptor::Current_out::Current_out (const ::PortableInterceptor::Current_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
+{}
+
+::PortableInterceptor::Current_out &
+PortableInterceptor::Current_out::operator= (const ::PortableInterceptor::Current_out &p)
+{
+  this->ptr_ = ACE_const_cast (Current_out&, p).ptr_;
+  return *this;
+}
+
+PortableInterceptor::Current_out &
+PortableInterceptor::Current_out::operator= (const ::PortableInterceptor::Current_var &p)
+{
+  this->ptr_ = ::PortableInterceptor::Current::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableInterceptor::Current_out &
+PortableInterceptor::Current_out::operator= (Current_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::Current_out::operator ::PortableInterceptor::Current_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::Current_ptr &
+PortableInterceptor::Current_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::Current_ptr
+PortableInterceptor::Current_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 PortableInterceptor::Current::Current ()
 {
@@ -461,6 +925,188 @@ const char* PortableInterceptor::Current::_interface_repository_id (void) const
 }
 
 
+// *************************************************************
+// Operations for class PortableInterceptor::RequestInfo_var
+// *************************************************************
+
+PortableInterceptor::RequestInfo_var::RequestInfo_var (void) // default constructor
+  : ptr_ (RequestInfo::_nil ())
+{}
+
+::PortableInterceptor::RequestInfo_ptr
+PortableInterceptor::RequestInfo_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::RequestInfo_var::RequestInfo_var (const ::PortableInterceptor::RequestInfo_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (RequestInfo::_duplicate (p.ptr ()))
+{}
+
+PortableInterceptor::RequestInfo_var::~RequestInfo_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableInterceptor::RequestInfo_var &
+PortableInterceptor::RequestInfo_var::operator= (RequestInfo_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::RequestInfo_var &
+PortableInterceptor::RequestInfo_var::operator= (const ::PortableInterceptor::RequestInfo_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableInterceptor::RequestInfo::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableInterceptor::RequestInfo_var::operator const ::PortableInterceptor::RequestInfo_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::RequestInfo_ptr
+PortableInterceptor::RequestInfo_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::RequestInfo_ptr
+PortableInterceptor::RequestInfo_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::RequestInfo_ptr &
+PortableInterceptor::RequestInfo_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::RequestInfo_ptr &
+PortableInterceptor::RequestInfo_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::RequestInfo::_nil ();
+  return this->ptr_;
+}
+
+::PortableInterceptor::RequestInfo_ptr
+PortableInterceptor::RequestInfo_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableInterceptor::RequestInfo_ptr val = this->ptr_;
+  this->ptr_ = ::PortableInterceptor::RequestInfo::_nil ();
+  return val;
+}
+
+::PortableInterceptor::RequestInfo_ptr
+PortableInterceptor::RequestInfo_var::duplicate (PortableInterceptor::RequestInfo_ptr p)
+{
+  return ::PortableInterceptor::RequestInfo::_duplicate (p);
+}
+
+void
+PortableInterceptor::RequestInfo_var::release (PortableInterceptor::RequestInfo_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableInterceptor::RequestInfo_ptr
+PortableInterceptor::RequestInfo_var::nil (void)
+{
+  return ::PortableInterceptor::RequestInfo::_nil ();
+}
+
+::PortableInterceptor::RequestInfo_ptr
+PortableInterceptor::RequestInfo_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableInterceptor::RequestInfo::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableInterceptor::RequestInfo_var::upcast (void *src)
+{
+  PortableInterceptor::RequestInfo **tmp =
+    ACE_static_cast (PortableInterceptor::RequestInfo **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class PortableInterceptor::RequestInfo_out
+// *************************************************************
+
+PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableInterceptor::RequestInfo::_nil ();
+}
+
+PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::RequestInfo::_nil ();
+}
+
+PortableInterceptor::RequestInfo_out::RequestInfo_out (const ::PortableInterceptor::RequestInfo_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (RequestInfo_out &, p).ptr_)
+{}
+
+::PortableInterceptor::RequestInfo_out &
+PortableInterceptor::RequestInfo_out::operator= (const ::PortableInterceptor::RequestInfo_out &p)
+{
+  this->ptr_ = ACE_const_cast (RequestInfo_out&, p).ptr_;
+  return *this;
+}
+
+PortableInterceptor::RequestInfo_out &
+PortableInterceptor::RequestInfo_out::operator= (const ::PortableInterceptor::RequestInfo_var &p)
+{
+  this->ptr_ = ::PortableInterceptor::RequestInfo::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableInterceptor::RequestInfo_out &
+PortableInterceptor::RequestInfo_out::operator= (RequestInfo_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::RequestInfo_out::operator ::PortableInterceptor::RequestInfo_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::RequestInfo_ptr &
+PortableInterceptor::RequestInfo_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::RequestInfo_ptr
+PortableInterceptor::RequestInfo_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 PortableInterceptor::RequestInfo::RequestInfo ()
 {
@@ -530,6 +1176,188 @@ const char* PortableInterceptor::RequestInfo::_interface_repository_id (void) co
 }
 
 
+// *************************************************************
+// Operations for class PortableInterceptor::ClientRequestInfo_var
+// *************************************************************
+
+PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (void) // default constructor
+  : ptr_ (ClientRequestInfo::_nil ())
+{}
+
+::PortableInterceptor::ClientRequestInfo_ptr
+PortableInterceptor::ClientRequestInfo_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (const ::PortableInterceptor::ClientRequestInfo_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ClientRequestInfo::_duplicate (p.ptr ()))
+{}
+
+PortableInterceptor::ClientRequestInfo_var::~ClientRequestInfo_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableInterceptor::ClientRequestInfo_var &
+PortableInterceptor::ClientRequestInfo_var::operator= (ClientRequestInfo_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::ClientRequestInfo_var &
+PortableInterceptor::ClientRequestInfo_var::operator= (const ::PortableInterceptor::ClientRequestInfo_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableInterceptor::ClientRequestInfo_var::operator const ::PortableInterceptor::ClientRequestInfo_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ClientRequestInfo_ptr
+PortableInterceptor::ClientRequestInfo_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ClientRequestInfo_ptr
+PortableInterceptor::ClientRequestInfo_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ClientRequestInfo_ptr &
+PortableInterceptor::ClientRequestInfo_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ClientRequestInfo_ptr &
+PortableInterceptor::ClientRequestInfo_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil ();
+  return this->ptr_;
+}
+
+::PortableInterceptor::ClientRequestInfo_ptr
+PortableInterceptor::ClientRequestInfo_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableInterceptor::ClientRequestInfo_ptr val = this->ptr_;
+  this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil ();
+  return val;
+}
+
+::PortableInterceptor::ClientRequestInfo_ptr
+PortableInterceptor::ClientRequestInfo_var::duplicate (PortableInterceptor::ClientRequestInfo_ptr p)
+{
+  return ::PortableInterceptor::ClientRequestInfo::_duplicate (p);
+}
+
+void
+PortableInterceptor::ClientRequestInfo_var::release (PortableInterceptor::ClientRequestInfo_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableInterceptor::ClientRequestInfo_ptr
+PortableInterceptor::ClientRequestInfo_var::nil (void)
+{
+  return ::PortableInterceptor::ClientRequestInfo::_nil ();
+}
+
+::PortableInterceptor::ClientRequestInfo_ptr
+PortableInterceptor::ClientRequestInfo_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableInterceptor::ClientRequestInfo::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableInterceptor::ClientRequestInfo_var::upcast (void *src)
+{
+  PortableInterceptor::ClientRequestInfo **tmp =
+    ACE_static_cast (PortableInterceptor::ClientRequestInfo **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class PortableInterceptor::ClientRequestInfo_out
+// *************************************************************
+
+PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequestInfo_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil ();
+}
+
+PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequestInfo_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil ();
+}
+
+PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (const ::PortableInterceptor::ClientRequestInfo_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ClientRequestInfo_out &, p).ptr_)
+{}
+
+::PortableInterceptor::ClientRequestInfo_out &
+PortableInterceptor::ClientRequestInfo_out::operator= (const ::PortableInterceptor::ClientRequestInfo_out &p)
+{
+  this->ptr_ = ACE_const_cast (ClientRequestInfo_out&, p).ptr_;
+  return *this;
+}
+
+PortableInterceptor::ClientRequestInfo_out &
+PortableInterceptor::ClientRequestInfo_out::operator= (const ::PortableInterceptor::ClientRequestInfo_var &p)
+{
+  this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableInterceptor::ClientRequestInfo_out &
+PortableInterceptor::ClientRequestInfo_out::operator= (ClientRequestInfo_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::ClientRequestInfo_out::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ClientRequestInfo_ptr &
+PortableInterceptor::ClientRequestInfo_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ClientRequestInfo_ptr
+PortableInterceptor::ClientRequestInfo_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 PortableInterceptor::ClientRequestInfo::ClientRequestInfo ()
 {
@@ -611,6 +1439,188 @@ const char* PortableInterceptor::ClientRequestInfo::_interface_repository_id (vo
 }
 
 
+// *************************************************************
+// Operations for class PortableInterceptor::ServerRequestInfo_var
+// *************************************************************
+
+PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (void) // default constructor
+  : ptr_ (ServerRequestInfo::_nil ())
+{}
+
+::PortableInterceptor::ServerRequestInfo_ptr
+PortableInterceptor::ServerRequestInfo_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (const ::PortableInterceptor::ServerRequestInfo_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ServerRequestInfo::_duplicate (p.ptr ()))
+{}
+
+PortableInterceptor::ServerRequestInfo_var::~ServerRequestInfo_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableInterceptor::ServerRequestInfo_var &
+PortableInterceptor::ServerRequestInfo_var::operator= (ServerRequestInfo_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::ServerRequestInfo_var &
+PortableInterceptor::ServerRequestInfo_var::operator= (const ::PortableInterceptor::ServerRequestInfo_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableInterceptor::ServerRequestInfo_var::operator const ::PortableInterceptor::ServerRequestInfo_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ServerRequestInfo_ptr
+PortableInterceptor::ServerRequestInfo_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ServerRequestInfo_ptr
+PortableInterceptor::ServerRequestInfo_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ServerRequestInfo_ptr &
+PortableInterceptor::ServerRequestInfo_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ServerRequestInfo_ptr &
+PortableInterceptor::ServerRequestInfo_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil ();
+  return this->ptr_;
+}
+
+::PortableInterceptor::ServerRequestInfo_ptr
+PortableInterceptor::ServerRequestInfo_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableInterceptor::ServerRequestInfo_ptr val = this->ptr_;
+  this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil ();
+  return val;
+}
+
+::PortableInterceptor::ServerRequestInfo_ptr
+PortableInterceptor::ServerRequestInfo_var::duplicate (PortableInterceptor::ServerRequestInfo_ptr p)
+{
+  return ::PortableInterceptor::ServerRequestInfo::_duplicate (p);
+}
+
+void
+PortableInterceptor::ServerRequestInfo_var::release (PortableInterceptor::ServerRequestInfo_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableInterceptor::ServerRequestInfo_ptr
+PortableInterceptor::ServerRequestInfo_var::nil (void)
+{
+  return ::PortableInterceptor::ServerRequestInfo::_nil ();
+}
+
+::PortableInterceptor::ServerRequestInfo_ptr
+PortableInterceptor::ServerRequestInfo_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableInterceptor::ServerRequestInfo::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableInterceptor::ServerRequestInfo_var::upcast (void *src)
+{
+  PortableInterceptor::ServerRequestInfo **tmp =
+    ACE_static_cast (PortableInterceptor::ServerRequestInfo **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class PortableInterceptor::ServerRequestInfo_out
+// *************************************************************
+
+PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequestInfo_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil ();
+}
+
+PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequestInfo_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil ();
+}
+
+PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (const ::PortableInterceptor::ServerRequestInfo_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ServerRequestInfo_out &, p).ptr_)
+{}
+
+::PortableInterceptor::ServerRequestInfo_out &
+PortableInterceptor::ServerRequestInfo_out::operator= (const ::PortableInterceptor::ServerRequestInfo_out &p)
+{
+  this->ptr_ = ACE_const_cast (ServerRequestInfo_out&, p).ptr_;
+  return *this;
+}
+
+PortableInterceptor::ServerRequestInfo_out &
+PortableInterceptor::ServerRequestInfo_out::operator= (const ::PortableInterceptor::ServerRequestInfo_var &p)
+{
+  this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableInterceptor::ServerRequestInfo_out &
+PortableInterceptor::ServerRequestInfo_out::operator= (ServerRequestInfo_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::ServerRequestInfo_out::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ServerRequestInfo_ptr &
+PortableInterceptor::ServerRequestInfo_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ServerRequestInfo_ptr
+PortableInterceptor::ServerRequestInfo_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 PortableInterceptor::ServerRequestInfo::ServerRequestInfo ()
 {
@@ -692,6 +1702,188 @@ const char* PortableInterceptor::ServerRequestInfo::_interface_repository_id (vo
 }
 
 
+// *************************************************************
+// Operations for class PortableInterceptor::ClientRequestInterceptor_var
+// *************************************************************
+
+PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (void) // default constructor
+  : ptr_ (ClientRequestInterceptor::_nil ())
+{}
+
+::PortableInterceptor::ClientRequestInterceptor_ptr
+PortableInterceptor::ClientRequestInterceptor_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (const ::PortableInterceptor::ClientRequestInterceptor_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ClientRequestInterceptor::_duplicate (p.ptr ()))
+{}
+
+PortableInterceptor::ClientRequestInterceptor_var::~ClientRequestInterceptor_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableInterceptor::ClientRequestInterceptor_var &
+PortableInterceptor::ClientRequestInterceptor_var::operator= (ClientRequestInterceptor_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::ClientRequestInterceptor_var &
+PortableInterceptor::ClientRequestInterceptor_var::operator= (const ::PortableInterceptor::ClientRequestInterceptor_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableInterceptor::ClientRequestInterceptor_var::operator const ::PortableInterceptor::ClientRequestInterceptor_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ClientRequestInterceptor_ptr
+PortableInterceptor::ClientRequestInterceptor_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ClientRequestInterceptor_ptr
+PortableInterceptor::ClientRequestInterceptor_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ClientRequestInterceptor_ptr &
+PortableInterceptor::ClientRequestInterceptor_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ClientRequestInterceptor_ptr &
+PortableInterceptor::ClientRequestInterceptor_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil ();
+  return this->ptr_;
+}
+
+::PortableInterceptor::ClientRequestInterceptor_ptr
+PortableInterceptor::ClientRequestInterceptor_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableInterceptor::ClientRequestInterceptor_ptr val = this->ptr_;
+  this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil ();
+  return val;
+}
+
+::PortableInterceptor::ClientRequestInterceptor_ptr
+PortableInterceptor::ClientRequestInterceptor_var::duplicate (PortableInterceptor::ClientRequestInterceptor_ptr p)
+{
+  return ::PortableInterceptor::ClientRequestInterceptor::_duplicate (p);
+}
+
+void
+PortableInterceptor::ClientRequestInterceptor_var::release (PortableInterceptor::ClientRequestInterceptor_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableInterceptor::ClientRequestInterceptor_ptr
+PortableInterceptor::ClientRequestInterceptor_var::nil (void)
+{
+  return ::PortableInterceptor::ClientRequestInterceptor::_nil ();
+}
+
+::PortableInterceptor::ClientRequestInterceptor_ptr
+PortableInterceptor::ClientRequestInterceptor_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableInterceptor::ClientRequestInterceptor::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableInterceptor::ClientRequestInterceptor_var::upcast (void *src)
+{
+  PortableInterceptor::ClientRequestInterceptor **tmp =
+    ACE_static_cast (PortableInterceptor::ClientRequestInterceptor **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class PortableInterceptor::ClientRequestInterceptor_out
+// *************************************************************
+
+PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (ClientRequestInterceptor_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil ();
+}
+
+PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (ClientRequestInterceptor_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil ();
+}
+
+PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (const ::PortableInterceptor::ClientRequestInterceptor_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ClientRequestInterceptor_out &, p).ptr_)
+{}
+
+::PortableInterceptor::ClientRequestInterceptor_out &
+PortableInterceptor::ClientRequestInterceptor_out::operator= (const ::PortableInterceptor::ClientRequestInterceptor_out &p)
+{
+  this->ptr_ = ACE_const_cast (ClientRequestInterceptor_out&, p).ptr_;
+  return *this;
+}
+
+PortableInterceptor::ClientRequestInterceptor_out &
+PortableInterceptor::ClientRequestInterceptor_out::operator= (const ::PortableInterceptor::ClientRequestInterceptor_var &p)
+{
+  this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableInterceptor::ClientRequestInterceptor_out &
+PortableInterceptor::ClientRequestInterceptor_out::operator= (ClientRequestInterceptor_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::ClientRequestInterceptor_out::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ClientRequestInterceptor_ptr &
+PortableInterceptor::ClientRequestInterceptor_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ClientRequestInterceptor_ptr
+PortableInterceptor::ClientRequestInterceptor_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 PortableInterceptor::ClientRequestInterceptor::ClientRequestInterceptor ()
 {
@@ -773,6 +1965,188 @@ const char* PortableInterceptor::ClientRequestInterceptor::_interface_repository
 }
 
 
+// *************************************************************
+// Operations for class PortableInterceptor::ServerRequestInterceptor_var
+// *************************************************************
+
+PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (void) // default constructor
+  : ptr_ (ServerRequestInterceptor::_nil ())
+{}
+
+::PortableInterceptor::ServerRequestInterceptor_ptr
+PortableInterceptor::ServerRequestInterceptor_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (const ::PortableInterceptor::ServerRequestInterceptor_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ServerRequestInterceptor::_duplicate (p.ptr ()))
+{}
+
+PortableInterceptor::ServerRequestInterceptor_var::~ServerRequestInterceptor_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableInterceptor::ServerRequestInterceptor_var &
+PortableInterceptor::ServerRequestInterceptor_var::operator= (ServerRequestInterceptor_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::ServerRequestInterceptor_var &
+PortableInterceptor::ServerRequestInterceptor_var::operator= (const ::PortableInterceptor::ServerRequestInterceptor_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableInterceptor::ServerRequestInterceptor_var::operator const ::PortableInterceptor::ServerRequestInterceptor_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ServerRequestInterceptor_ptr
+PortableInterceptor::ServerRequestInterceptor_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ServerRequestInterceptor_ptr
+PortableInterceptor::ServerRequestInterceptor_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ServerRequestInterceptor_ptr &
+PortableInterceptor::ServerRequestInterceptor_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ServerRequestInterceptor_ptr &
+PortableInterceptor::ServerRequestInterceptor_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil ();
+  return this->ptr_;
+}
+
+::PortableInterceptor::ServerRequestInterceptor_ptr
+PortableInterceptor::ServerRequestInterceptor_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableInterceptor::ServerRequestInterceptor_ptr val = this->ptr_;
+  this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil ();
+  return val;
+}
+
+::PortableInterceptor::ServerRequestInterceptor_ptr
+PortableInterceptor::ServerRequestInterceptor_var::duplicate (PortableInterceptor::ServerRequestInterceptor_ptr p)
+{
+  return ::PortableInterceptor::ServerRequestInterceptor::_duplicate (p);
+}
+
+void
+PortableInterceptor::ServerRequestInterceptor_var::release (PortableInterceptor::ServerRequestInterceptor_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableInterceptor::ServerRequestInterceptor_ptr
+PortableInterceptor::ServerRequestInterceptor_var::nil (void)
+{
+  return ::PortableInterceptor::ServerRequestInterceptor::_nil ();
+}
+
+::PortableInterceptor::ServerRequestInterceptor_ptr
+PortableInterceptor::ServerRequestInterceptor_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableInterceptor::ServerRequestInterceptor::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableInterceptor::ServerRequestInterceptor_var::upcast (void *src)
+{
+  PortableInterceptor::ServerRequestInterceptor **tmp =
+    ACE_static_cast (PortableInterceptor::ServerRequestInterceptor **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class PortableInterceptor::ServerRequestInterceptor_out
+// *************************************************************
+
+PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (ServerRequestInterceptor_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil ();
+}
+
+PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (ServerRequestInterceptor_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil ();
+}
+
+PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (const ::PortableInterceptor::ServerRequestInterceptor_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ServerRequestInterceptor_out &, p).ptr_)
+{}
+
+::PortableInterceptor::ServerRequestInterceptor_out &
+PortableInterceptor::ServerRequestInterceptor_out::operator= (const ::PortableInterceptor::ServerRequestInterceptor_out &p)
+{
+  this->ptr_ = ACE_const_cast (ServerRequestInterceptor_out&, p).ptr_;
+  return *this;
+}
+
+PortableInterceptor::ServerRequestInterceptor_out &
+PortableInterceptor::ServerRequestInterceptor_out::operator= (const ::PortableInterceptor::ServerRequestInterceptor_var &p)
+{
+  this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableInterceptor::ServerRequestInterceptor_out &
+PortableInterceptor::ServerRequestInterceptor_out::operator= (ServerRequestInterceptor_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::ServerRequestInterceptor_out::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ServerRequestInterceptor_ptr &
+PortableInterceptor::ServerRequestInterceptor_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ServerRequestInterceptor_ptr
+PortableInterceptor::ServerRequestInterceptor_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor ()
 {
@@ -854,6 +2228,188 @@ const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository
 }
 
 
+// *************************************************************
+// Operations for class PortableInterceptor::IORInfo_var
+// *************************************************************
+
+PortableInterceptor::IORInfo_var::IORInfo_var (void) // default constructor
+  : ptr_ (IORInfo::_nil ())
+{}
+
+::PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::IORInfo_var::IORInfo_var (const ::PortableInterceptor::IORInfo_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (IORInfo::_duplicate (p.ptr ()))
+{}
+
+PortableInterceptor::IORInfo_var::~IORInfo_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableInterceptor::IORInfo_var &
+PortableInterceptor::IORInfo_var::operator= (IORInfo_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::IORInfo_var &
+PortableInterceptor::IORInfo_var::operator= (const ::PortableInterceptor::IORInfo_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableInterceptor::IORInfo::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableInterceptor::IORInfo_var::operator const ::PortableInterceptor::IORInfo_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::IORInfo_ptr &
+PortableInterceptor::IORInfo_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::IORInfo_ptr &
+PortableInterceptor::IORInfo_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::IORInfo::_nil ();
+  return this->ptr_;
+}
+
+::PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableInterceptor::IORInfo_ptr val = this->ptr_;
+  this->ptr_ = ::PortableInterceptor::IORInfo::_nil ();
+  return val;
+}
+
+::PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo_var::duplicate (PortableInterceptor::IORInfo_ptr p)
+{
+  return ::PortableInterceptor::IORInfo::_duplicate (p);
+}
+
+void
+PortableInterceptor::IORInfo_var::release (PortableInterceptor::IORInfo_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo_var::nil (void)
+{
+  return ::PortableInterceptor::IORInfo::_nil ();
+}
+
+::PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableInterceptor::IORInfo::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableInterceptor::IORInfo_var::upcast (void *src)
+{
+  PortableInterceptor::IORInfo **tmp =
+    ACE_static_cast (PortableInterceptor::IORInfo **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class PortableInterceptor::IORInfo_out
+// *************************************************************
+
+PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableInterceptor::IORInfo::_nil ();
+}
+
+PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::IORInfo::_nil ();
+}
+
+PortableInterceptor::IORInfo_out::IORInfo_out (const ::PortableInterceptor::IORInfo_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (IORInfo_out &, p).ptr_)
+{}
+
+::PortableInterceptor::IORInfo_out &
+PortableInterceptor::IORInfo_out::operator= (const ::PortableInterceptor::IORInfo_out &p)
+{
+  this->ptr_ = ACE_const_cast (IORInfo_out&, p).ptr_;
+  return *this;
+}
+
+PortableInterceptor::IORInfo_out &
+PortableInterceptor::IORInfo_out::operator= (const ::PortableInterceptor::IORInfo_var &p)
+{
+  this->ptr_ = ::PortableInterceptor::IORInfo::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableInterceptor::IORInfo_out &
+PortableInterceptor::IORInfo_out::operator= (IORInfo_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::IORInfo_out::operator ::PortableInterceptor::IORInfo_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::IORInfo_ptr &
+PortableInterceptor::IORInfo_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::IORInfo_ptr
+PortableInterceptor::IORInfo_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 PortableInterceptor::IORInfo::IORInfo ()
 {
@@ -923,6 +2479,188 @@ const char* PortableInterceptor::IORInfo::_interface_repository_id (void) const
 }
 
 
+// *************************************************************
+// Operations for class PortableInterceptor::IORInterceptor_var
+// *************************************************************
+
+PortableInterceptor::IORInterceptor_var::IORInterceptor_var (void) // default constructor
+  : ptr_ (IORInterceptor::_nil ())
+{}
+
+::PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::IORInterceptor_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::IORInterceptor_var::IORInterceptor_var (const ::PortableInterceptor::IORInterceptor_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (IORInterceptor::_duplicate (p.ptr ()))
+{}
+
+PortableInterceptor::IORInterceptor_var::~IORInterceptor_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableInterceptor::IORInterceptor_var &
+PortableInterceptor::IORInterceptor_var::operator= (IORInterceptor_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::IORInterceptor_var &
+PortableInterceptor::IORInterceptor_var::operator= (const ::PortableInterceptor::IORInterceptor_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableInterceptor::IORInterceptor::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableInterceptor::IORInterceptor_var::operator const ::PortableInterceptor::IORInterceptor_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::IORInterceptor_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::IORInterceptor_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::IORInterceptor_ptr &
+PortableInterceptor::IORInterceptor_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::IORInterceptor_ptr &
+PortableInterceptor::IORInterceptor_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil ();
+  return this->ptr_;
+}
+
+::PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::IORInterceptor_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableInterceptor::IORInterceptor_ptr val = this->ptr_;
+  this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil ();
+  return val;
+}
+
+::PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::IORInterceptor_var::duplicate (PortableInterceptor::IORInterceptor_ptr p)
+{
+  return ::PortableInterceptor::IORInterceptor::_duplicate (p);
+}
+
+void
+PortableInterceptor::IORInterceptor_var::release (PortableInterceptor::IORInterceptor_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::IORInterceptor_var::nil (void)
+{
+  return ::PortableInterceptor::IORInterceptor::_nil ();
+}
+
+::PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::IORInterceptor_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableInterceptor::IORInterceptor::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableInterceptor::IORInterceptor_var::upcast (void *src)
+{
+  PortableInterceptor::IORInterceptor **tmp =
+    ACE_static_cast (PortableInterceptor::IORInterceptor **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class PortableInterceptor::IORInterceptor_out
+// *************************************************************
+
+PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil ();
+}
+
+PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil ();
+}
+
+PortableInterceptor::IORInterceptor_out::IORInterceptor_out (const ::PortableInterceptor::IORInterceptor_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (IORInterceptor_out &, p).ptr_)
+{}
+
+::PortableInterceptor::IORInterceptor_out &
+PortableInterceptor::IORInterceptor_out::operator= (const ::PortableInterceptor::IORInterceptor_out &p)
+{
+  this->ptr_ = ACE_const_cast (IORInterceptor_out&, p).ptr_;
+  return *this;
+}
+
+PortableInterceptor::IORInterceptor_out &
+PortableInterceptor::IORInterceptor_out::operator= (const ::PortableInterceptor::IORInterceptor_var &p)
+{
+  this->ptr_ = ::PortableInterceptor::IORInterceptor::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableInterceptor::IORInterceptor_out &
+PortableInterceptor::IORInterceptor_out::operator= (IORInterceptor_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::IORInterceptor_out::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::IORInterceptor_ptr &
+PortableInterceptor::IORInterceptor_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::IORInterceptor_ptr
+PortableInterceptor::IORInterceptor_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 PortableInterceptor::IORInterceptor::IORInterceptor ()
 {
@@ -1004,6 +2742,188 @@ const char* PortableInterceptor::IORInterceptor::_interface_repository_id (void)
 }
 
 
+// *************************************************************
+// Operations for class PortableInterceptor::PolicyFactory_var
+// *************************************************************
+
+PortableInterceptor::PolicyFactory_var::PolicyFactory_var (void) // default constructor
+  : ptr_ (PolicyFactory::_nil ())
+{}
+
+::PortableInterceptor::PolicyFactory_ptr
+PortableInterceptor::PolicyFactory_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::PolicyFactory_var::PolicyFactory_var (const ::PortableInterceptor::PolicyFactory_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (PolicyFactory::_duplicate (p.ptr ()))
+{}
+
+PortableInterceptor::PolicyFactory_var::~PolicyFactory_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableInterceptor::PolicyFactory_var &
+PortableInterceptor::PolicyFactory_var::operator= (PolicyFactory_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::PolicyFactory_var &
+PortableInterceptor::PolicyFactory_var::operator= (const ::PortableInterceptor::PolicyFactory_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableInterceptor::PolicyFactory::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableInterceptor::PolicyFactory_var::operator const ::PortableInterceptor::PolicyFactory_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::PolicyFactory_ptr
+PortableInterceptor::PolicyFactory_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::PolicyFactory_ptr
+PortableInterceptor::PolicyFactory_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::PolicyFactory_ptr &
+PortableInterceptor::PolicyFactory_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::PolicyFactory_ptr &
+PortableInterceptor::PolicyFactory_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil ();
+  return this->ptr_;
+}
+
+::PortableInterceptor::PolicyFactory_ptr
+PortableInterceptor::PolicyFactory_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableInterceptor::PolicyFactory_ptr val = this->ptr_;
+  this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil ();
+  return val;
+}
+
+::PortableInterceptor::PolicyFactory_ptr
+PortableInterceptor::PolicyFactory_var::duplicate (PortableInterceptor::PolicyFactory_ptr p)
+{
+  return ::PortableInterceptor::PolicyFactory::_duplicate (p);
+}
+
+void
+PortableInterceptor::PolicyFactory_var::release (PortableInterceptor::PolicyFactory_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableInterceptor::PolicyFactory_ptr
+PortableInterceptor::PolicyFactory_var::nil (void)
+{
+  return ::PortableInterceptor::PolicyFactory::_nil ();
+}
+
+::PortableInterceptor::PolicyFactory_ptr
+PortableInterceptor::PolicyFactory_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableInterceptor::PolicyFactory::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableInterceptor::PolicyFactory_var::upcast (void *src)
+{
+  PortableInterceptor::PolicyFactory **tmp =
+    ACE_static_cast (PortableInterceptor::PolicyFactory **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class PortableInterceptor::PolicyFactory_out
+// *************************************************************
+
+PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil ();
+}
+
+PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil ();
+}
+
+PortableInterceptor::PolicyFactory_out::PolicyFactory_out (const ::PortableInterceptor::PolicyFactory_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (PolicyFactory_out &, p).ptr_)
+{}
+
+::PortableInterceptor::PolicyFactory_out &
+PortableInterceptor::PolicyFactory_out::operator= (const ::PortableInterceptor::PolicyFactory_out &p)
+{
+  this->ptr_ = ACE_const_cast (PolicyFactory_out&, p).ptr_;
+  return *this;
+}
+
+PortableInterceptor::PolicyFactory_out &
+PortableInterceptor::PolicyFactory_out::operator= (const ::PortableInterceptor::PolicyFactory_var &p)
+{
+  this->ptr_ = ::PortableInterceptor::PolicyFactory::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableInterceptor::PolicyFactory_out &
+PortableInterceptor::PolicyFactory_out::operator= (PolicyFactory_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::PolicyFactory_out::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::PolicyFactory_ptr &
+PortableInterceptor::PolicyFactory_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::PolicyFactory_ptr
+PortableInterceptor::PolicyFactory_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 PortableInterceptor::PolicyFactory::PolicyFactory ()
 {
@@ -1073,6 +2993,188 @@ const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void)
 }
 
 
+// *************************************************************
+// Operations for class PortableInterceptor::ORBInitInfo_var
+// *************************************************************
+
+PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (void) // default constructor
+  : ptr_ (ORBInitInfo::_nil ())
+{}
+
+::PortableInterceptor::ORBInitInfo_ptr
+PortableInterceptor::ORBInitInfo_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (const ::PortableInterceptor::ORBInitInfo_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ORBInitInfo::_duplicate (p.ptr ()))
+{}
+
+PortableInterceptor::ORBInitInfo_var::~ORBInitInfo_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableInterceptor::ORBInitInfo_var &
+PortableInterceptor::ORBInitInfo_var::operator= (ORBInitInfo_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::ORBInitInfo_var &
+PortableInterceptor::ORBInitInfo_var::operator= (const ::PortableInterceptor::ORBInitInfo_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableInterceptor::ORBInitInfo::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableInterceptor::ORBInitInfo_var::operator const ::PortableInterceptor::ORBInitInfo_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ORBInitInfo_ptr
+PortableInterceptor::ORBInitInfo_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ORBInitInfo_ptr
+PortableInterceptor::ORBInitInfo_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ORBInitInfo_ptr &
+PortableInterceptor::ORBInitInfo_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ORBInitInfo_ptr &
+PortableInterceptor::ORBInitInfo_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil ();
+  return this->ptr_;
+}
+
+::PortableInterceptor::ORBInitInfo_ptr
+PortableInterceptor::ORBInitInfo_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableInterceptor::ORBInitInfo_ptr val = this->ptr_;
+  this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil ();
+  return val;
+}
+
+::PortableInterceptor::ORBInitInfo_ptr
+PortableInterceptor::ORBInitInfo_var::duplicate (PortableInterceptor::ORBInitInfo_ptr p)
+{
+  return ::PortableInterceptor::ORBInitInfo::_duplicate (p);
+}
+
+void
+PortableInterceptor::ORBInitInfo_var::release (PortableInterceptor::ORBInitInfo_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableInterceptor::ORBInitInfo_ptr
+PortableInterceptor::ORBInitInfo_var::nil (void)
+{
+  return ::PortableInterceptor::ORBInitInfo::_nil ();
+}
+
+::PortableInterceptor::ORBInitInfo_ptr
+PortableInterceptor::ORBInitInfo_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableInterceptor::ORBInitInfo::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableInterceptor::ORBInitInfo_var::upcast (void *src)
+{
+  PortableInterceptor::ORBInitInfo **tmp =
+    ACE_static_cast (PortableInterceptor::ORBInitInfo **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class PortableInterceptor::ORBInitInfo_out
+// *************************************************************
+
+PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil ();
+}
+
+PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil ();
+}
+
+PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (const ::PortableInterceptor::ORBInitInfo_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ORBInitInfo_out &, p).ptr_)
+{}
+
+::PortableInterceptor::ORBInitInfo_out &
+PortableInterceptor::ORBInitInfo_out::operator= (const ::PortableInterceptor::ORBInitInfo_out &p)
+{
+  this->ptr_ = ACE_const_cast (ORBInitInfo_out&, p).ptr_;
+  return *this;
+}
+
+PortableInterceptor::ORBInitInfo_out &
+PortableInterceptor::ORBInitInfo_out::operator= (const ::PortableInterceptor::ORBInitInfo_var &p)
+{
+  this->ptr_ = ::PortableInterceptor::ORBInitInfo::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableInterceptor::ORBInitInfo_out &
+PortableInterceptor::ORBInitInfo_out::operator= (ORBInitInfo_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::ORBInitInfo_out::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ORBInitInfo_ptr &
+PortableInterceptor::ORBInitInfo_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ORBInitInfo_ptr
+PortableInterceptor::ORBInitInfo_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 PortableInterceptor::ORBInitInfo::ORBInitInfo ()
 {
@@ -1288,6 +3390,188 @@ CORBA::Exception *PortableInterceptor::ORBInitInfo::InvalidName::_alloc (void)
 }
 
 
+// *************************************************************
+// Operations for class PortableInterceptor::ORBInitializer_var
+// *************************************************************
+
+PortableInterceptor::ORBInitializer_var::ORBInitializer_var (void) // default constructor
+  : ptr_ (ORBInitializer::_nil ())
+{}
+
+::PortableInterceptor::ORBInitializer_ptr
+PortableInterceptor::ORBInitializer_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::ORBInitializer_var::ORBInitializer_var (const ::PortableInterceptor::ORBInitializer_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ORBInitializer::_duplicate (p.ptr ()))
+{}
+
+PortableInterceptor::ORBInitializer_var::~ORBInitializer_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableInterceptor::ORBInitializer_var &
+PortableInterceptor::ORBInitializer_var::operator= (ORBInitializer_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::ORBInitializer_var &
+PortableInterceptor::ORBInitializer_var::operator= (const ::PortableInterceptor::ORBInitializer_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableInterceptor::ORBInitializer::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableInterceptor::ORBInitializer_var::operator const ::PortableInterceptor::ORBInitializer_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ORBInitializer_ptr
+PortableInterceptor::ORBInitializer_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ORBInitializer_ptr
+PortableInterceptor::ORBInitializer_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ORBInitializer_ptr &
+PortableInterceptor::ORBInitializer_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ORBInitializer_ptr &
+PortableInterceptor::ORBInitializer_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil ();
+  return this->ptr_;
+}
+
+::PortableInterceptor::ORBInitializer_ptr
+PortableInterceptor::ORBInitializer_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableInterceptor::ORBInitializer_ptr val = this->ptr_;
+  this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil ();
+  return val;
+}
+
+::PortableInterceptor::ORBInitializer_ptr
+PortableInterceptor::ORBInitializer_var::duplicate (PortableInterceptor::ORBInitializer_ptr p)
+{
+  return ::PortableInterceptor::ORBInitializer::_duplicate (p);
+}
+
+void
+PortableInterceptor::ORBInitializer_var::release (PortableInterceptor::ORBInitializer_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableInterceptor::ORBInitializer_ptr
+PortableInterceptor::ORBInitializer_var::nil (void)
+{
+  return ::PortableInterceptor::ORBInitializer::_nil ();
+}
+
+::PortableInterceptor::ORBInitializer_ptr
+PortableInterceptor::ORBInitializer_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableInterceptor::ORBInitializer::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableInterceptor::ORBInitializer_var::upcast (void *src)
+{
+  PortableInterceptor::ORBInitializer **tmp =
+    ACE_static_cast (PortableInterceptor::ORBInitializer **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class PortableInterceptor::ORBInitializer_out
+// *************************************************************
+
+PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil ();
+}
+
+PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil ();
+}
+
+PortableInterceptor::ORBInitializer_out::ORBInitializer_out (const ::PortableInterceptor::ORBInitializer_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ORBInitializer_out &, p).ptr_)
+{}
+
+::PortableInterceptor::ORBInitializer_out &
+PortableInterceptor::ORBInitializer_out::operator= (const ::PortableInterceptor::ORBInitializer_out &p)
+{
+  this->ptr_ = ACE_const_cast (ORBInitializer_out&, p).ptr_;
+  return *this;
+}
+
+PortableInterceptor::ORBInitializer_out &
+PortableInterceptor::ORBInitializer_out::operator= (const ::PortableInterceptor::ORBInitializer_var &p)
+{
+  this->ptr_ = ::PortableInterceptor::ORBInitializer::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableInterceptor::ORBInitializer_out &
+PortableInterceptor::ORBInitializer_out::operator= (ORBInitializer_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableInterceptor::ORBInitializer_out::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ORBInitializer_ptr &
+PortableInterceptor::ORBInitializer_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableInterceptor::ORBInitializer_ptr
+PortableInterceptor::ORBInitializer_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 PortableInterceptor::ORBInitializer::ORBInitializer ()
 {
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index d5d92d38e32..a8f2dd5dc12 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -94,6 +94,14 @@ TAO_NAMESPACE  PortableInterceptor
     Interceptor_ptr _retn (void);
     Interceptor_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static Interceptor_ptr duplicate (Interceptor_ptr);
+    static void release (Interceptor_ptr);
+    static Interceptor_ptr nil (void);
+    static Interceptor_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     Interceptor_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -339,6 +347,14 @@ class TAO_Export Interceptor : public virtual CORBA_Object
     Current_ptr _retn (void);
     Current_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static Current_ptr duplicate (Current_ptr);
+    static void release (Current_ptr);
+    static Current_ptr nil (void);
+    static Current_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     Current_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -473,6 +489,14 @@ class TAO_Export Current: public virtual CORBA::Current
     RequestInfo_ptr _retn (void);
     RequestInfo_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static RequestInfo_ptr duplicate (RequestInfo_ptr);
+    static void release (RequestInfo_ptr);
+    static RequestInfo_ptr nil (void);
+    static RequestInfo_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     RequestInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -706,6 +730,14 @@ class TAO_Export RequestInfo : public virtual CORBA_Object
     ClientRequestInfo_ptr _retn (void);
     ClientRequestInfo_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ClientRequestInfo_ptr duplicate (ClientRequestInfo_ptr);
+    static void release (ClientRequestInfo_ptr);
+    static ClientRequestInfo_ptr nil (void);
+    static ClientRequestInfo_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ClientRequestInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -896,6 +928,14 @@ class TAO_Export ClientRequestInfo: public virtual RequestInfo
     ServerRequestInfo_ptr _retn (void);
     ServerRequestInfo_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ServerRequestInfo_ptr duplicate (ServerRequestInfo_ptr);
+    static void release (ServerRequestInfo_ptr);
+    static ServerRequestInfo_ptr nil (void);
+    static ServerRequestInfo_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ServerRequestInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1080,6 +1120,14 @@ class TAO_Export ServerRequestInfo: public virtual RequestInfo
     ClientRequestInterceptor_ptr _retn (void);
     ClientRequestInterceptor_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ClientRequestInterceptor_ptr duplicate (ClientRequestInterceptor_ptr);
+    static void release (ClientRequestInterceptor_ptr);
+    static ClientRequestInterceptor_ptr nil (void);
+    static ClientRequestInterceptor_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ClientRequestInterceptor_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1236,6 +1284,14 @@ class TAO_Export ClientRequestInterceptor: public virtual Interceptor
     ServerRequestInterceptor_ptr _retn (void);
     ServerRequestInterceptor_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ServerRequestInterceptor_ptr duplicate (ServerRequestInterceptor_ptr);
+    static void release (ServerRequestInterceptor_ptr);
+    static ServerRequestInterceptor_ptr nil (void);
+    static ServerRequestInterceptor_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ServerRequestInterceptor_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1393,6 +1449,14 @@ class TAO_Export ServerRequestInterceptor: public virtual Interceptor
     IORInfo_ptr _retn (void);
     IORInfo_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static IORInfo_ptr duplicate (IORInfo_ptr);
+    static void release (IORInfo_ptr);
+    static IORInfo_ptr nil (void);
+    static IORInfo_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     IORInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1534,6 +1598,14 @@ class TAO_Export IORInfo : public virtual CORBA_Object
     IORInterceptor_ptr _retn (void);
     IORInterceptor_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static IORInterceptor_ptr duplicate (IORInterceptor_ptr);
+    static void release (IORInterceptor_ptr);
+    static IORInterceptor_ptr nil (void);
+    static IORInterceptor_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     IORInterceptor_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1655,6 +1727,14 @@ class TAO_Export IORInterceptor: public virtual Interceptor
     PolicyFactory_ptr _retn (void);
     PolicyFactory_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static PolicyFactory_ptr duplicate (PolicyFactory_ptr);
+    static void release (PolicyFactory_ptr);
+    static PolicyFactory_ptr nil (void);
+    static PolicyFactory_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     PolicyFactory_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1778,6 +1858,14 @@ class TAO_Export PolicyFactory : public virtual CORBA_Object
     ORBInitInfo_ptr _retn (void);
     ORBInitInfo_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ORBInitInfo_ptr duplicate (ORBInitInfo_ptr);
+    static void release (ORBInitInfo_ptr);
+    static ORBInitInfo_ptr nil (void);
+    static ORBInitInfo_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ORBInitInfo_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2073,6 +2161,14 @@ class TAO_Export ORBInitInfo : public virtual CORBA_Object
     ORBInitializer_ptr _retn (void);
     ORBInitializer_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ORBInitializer_ptr duplicate (ORBInitializer_ptr);
+    static void release (ORBInitializer_ptr);
+    static ORBInitializer_ptr nil (void);
+    static ORBInitializer_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ORBInitializer_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2177,8 +2273,6 @@ TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer (
 }
 TAO_NAMESPACE_CLOSE // module PortableInterceptor
 
-// Proxy Broker Factory function pointer declarations.
-
 TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::ForwardRequest &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::ForwardRequest*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::ForwardRequest *&); // deprecated
diff --git a/TAO/tao/PortableInterceptorC.i b/TAO/tao/PortableInterceptorC.i
index f296c6dc807..ad51917c359 100644
--- a/TAO/tao/PortableInterceptorC.i
+++ b/TAO/tao/PortableInterceptorC.i
@@ -20,170 +20,50 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___VAR_CI_)
-#define _PORTABLEINTERCEPTOR_INTERCEPTOR___VAR_CI_
+#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___CI_)
+#define _PORTABLEINTERCEPTOR_INTERCEPTOR___CI_
 
-// *************************************************************
-// Inline operations for class PortableInterceptor::Interceptor_var
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::Interceptor_var::Interceptor_var (void) // default constructor
-  : ptr_ (Interceptor::_nil ())
-{}
-
-ACE_INLINE ::PortableInterceptor::Interceptor_ptr
-PortableInterceptor::Interceptor_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableInterceptor::Interceptor_var::Interceptor_var (const ::PortableInterceptor::Interceptor_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (Interceptor::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableInterceptor::Interceptor_var::~Interceptor_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableInterceptor::Interceptor_var &
-PortableInterceptor::Interceptor_var::operator= (Interceptor_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::Interceptor_var &
-PortableInterceptor::Interceptor_var::operator= (const ::PortableInterceptor::Interceptor_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::Interceptor::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::Interceptor_var::operator const ::PortableInterceptor::Interceptor_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableInterceptor::Interceptor_var::operator ::PortableInterceptor::Interceptor_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::Interceptor_ptr
-PortableInterceptor::Interceptor_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::Interceptor_ptr
-PortableInterceptor::Interceptor_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::Interceptor_ptr &
-PortableInterceptor::Interceptor_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::Interceptor_ptr &
-PortableInterceptor::Interceptor_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::Interceptor::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::Interceptor_ptr
-PortableInterceptor::Interceptor_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::Interceptor_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::Interceptor::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR___OUT_CI_)
-#define _PORTABLEINTERCEPTOR_INTERCEPTOR___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::Interceptor_out
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::Interceptor::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::Interceptor_out::Interceptor_out (Interceptor_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::Interceptor::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::Interceptor_out::Interceptor_out (const ::PortableInterceptor::Interceptor_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Interceptor_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableInterceptor::Interceptor_out &
-PortableInterceptor::Interceptor_out::operator= (const ::PortableInterceptor::Interceptor_out &p)
-{
-  this->ptr_ = ACE_const_cast (Interceptor_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::Interceptor_out &
-PortableInterceptor::Interceptor_out::operator= (const ::PortableInterceptor::Interceptor_var &p)
+ACE_INLINE PortableInterceptor::Interceptor_ptr
+tao_PortableInterceptor_Interceptor_duplicate (
+    PortableInterceptor::Interceptor_ptr p
+  )
 {
-  this->ptr_ = ::PortableInterceptor::Interceptor::_duplicate (p.ptr ());
-  return *this;
+  return PortableInterceptor::Interceptor::_duplicate (p);
 }
 
-ACE_INLINE PortableInterceptor::Interceptor_out &
-PortableInterceptor::Interceptor_out::operator= (Interceptor_ptr p)
+ACE_INLINE void
+tao_PortableInterceptor_Interceptor_release (
+    PortableInterceptor::Interceptor_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-PortableInterceptor::Interceptor_out::operator ::PortableInterceptor::Interceptor_ptr &() // cast
+ACE_INLINE PortableInterceptor::Interceptor_ptr
+tao_PortableInterceptor_Interceptor_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::Interceptor::_nil ();
 }
 
-ACE_INLINE ::PortableInterceptor::Interceptor_ptr &
-PortableInterceptor::Interceptor_out::ptr (void) // ptr
+ACE_INLINE PortableInterceptor::Interceptor_ptr
+tao_PortableInterceptor_Interceptor_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::Interceptor::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableInterceptor::Interceptor_ptr
-PortableInterceptor::Interceptor_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_PortableInterceptor_Interceptor_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  PortableInterceptor::Interceptor **tmp =
+    ACE_static_cast (PortableInterceptor::Interceptor **, src);
+  return *tmp;
 }
 
 
@@ -198,1530 +78,450 @@ PortableInterceptor::Interceptor_out::operator-> (void)
 // *************************************************************
 
 
-#if !defined (_PORTABLEINTERCEPTOR_CURRENT___VAR_CI_)
-#define _PORTABLEINTERCEPTOR_CURRENT___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::Current_var
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::Current_var::Current_var (void) // default constructor
-  : ptr_ (Current::_nil ())
-{}
-
-ACE_INLINE ::PortableInterceptor::Current_ptr
-PortableInterceptor::Current_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableInterceptor::Current_var::Current_var (const ::PortableInterceptor::Current_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (Current::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableInterceptor::Current_var::~Current_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableInterceptor::Current_var &
-PortableInterceptor::Current_var::operator= (Current_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::Current_var &
-PortableInterceptor::Current_var::operator= (const ::PortableInterceptor::Current_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::Current::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::Current_var::operator const ::PortableInterceptor::Current_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableInterceptor::Current_var::operator ::PortableInterceptor::Current_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::Current_ptr
-PortableInterceptor::Current_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::Current_ptr
-PortableInterceptor::Current_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::Current_ptr &
-PortableInterceptor::Current_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::Current_ptr &
-PortableInterceptor::Current_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::Current::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::Current_ptr
-PortableInterceptor::Current_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::Current_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::Current::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLEINTERCEPTOR_CURRENT___OUT_CI_)
-#define _PORTABLEINTERCEPTOR_CURRENT___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::Current_out
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::Current_out::Current_out (Current_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::Current::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::Current_out::Current_out (Current_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::Current::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::Current_out::Current_out (const ::PortableInterceptor::Current_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableInterceptor::Current_out &
-PortableInterceptor::Current_out::operator= (const ::PortableInterceptor::Current_out &p)
-{
-  this->ptr_ = ACE_const_cast (Current_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::Current_out &
-PortableInterceptor::Current_out::operator= (const ::PortableInterceptor::Current_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::Current::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::Current_out &
-PortableInterceptor::Current_out::operator= (Current_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::Current_out::operator ::PortableInterceptor::Current_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::Current_ptr &
-PortableInterceptor::Current_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::Current_ptr
-PortableInterceptor::Current_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___VAR_CI_)
-#define _PORTABLEINTERCEPTOR_REQUESTINFO___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::RequestInfo_var
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::RequestInfo_var::RequestInfo_var (void) // default constructor
-  : ptr_ (RequestInfo::_nil ())
-{}
-
-ACE_INLINE ::PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableInterceptor::RequestInfo_var::RequestInfo_var (const ::PortableInterceptor::RequestInfo_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (RequestInfo::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableInterceptor::RequestInfo_var::~RequestInfo_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableInterceptor::RequestInfo_var &
-PortableInterceptor::RequestInfo_var::operator= (RequestInfo_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::RequestInfo_var &
-PortableInterceptor::RequestInfo_var::operator= (const ::PortableInterceptor::RequestInfo_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::RequestInfo::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::RequestInfo_var::operator const ::PortableInterceptor::RequestInfo_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableInterceptor::RequestInfo_var::operator ::PortableInterceptor::RequestInfo_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::RequestInfo_ptr &
-PortableInterceptor::RequestInfo_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::RequestInfo_ptr &
-PortableInterceptor::RequestInfo_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::RequestInfo::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::RequestInfo_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::RequestInfo::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___OUT_CI_)
-#define _PORTABLEINTERCEPTOR_REQUESTINFO___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::RequestInfo_out
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::RequestInfo::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::RequestInfo_out::RequestInfo_out (RequestInfo_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::RequestInfo::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::RequestInfo_out::RequestInfo_out (const ::PortableInterceptor::RequestInfo_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (RequestInfo_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableInterceptor::RequestInfo_out &
-PortableInterceptor::RequestInfo_out::operator= (const ::PortableInterceptor::RequestInfo_out &p)
-{
-  this->ptr_ = ACE_const_cast (RequestInfo_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::RequestInfo_out &
-PortableInterceptor::RequestInfo_out::operator= (const ::PortableInterceptor::RequestInfo_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::RequestInfo::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::RequestInfo_out &
-PortableInterceptor::RequestInfo_out::operator= (RequestInfo_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::RequestInfo_out::operator ::PortableInterceptor::RequestInfo_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::RequestInfo_ptr &
-PortableInterceptor::RequestInfo_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::RequestInfo_ptr
-PortableInterceptor::RequestInfo_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___VAR_CI_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::ClientRequestInfo_var
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (void) // default constructor
-  : ptr_ (ClientRequestInfo::_nil ())
-{}
-
-ACE_INLINE ::PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableInterceptor::ClientRequestInfo_var::ClientRequestInfo_var (const ::PortableInterceptor::ClientRequestInfo_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ClientRequestInfo::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableInterceptor::ClientRequestInfo_var::~ClientRequestInfo_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableInterceptor::ClientRequestInfo_var &
-PortableInterceptor::ClientRequestInfo_var::operator= (ClientRequestInfo_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::ClientRequestInfo_var &
-PortableInterceptor::ClientRequestInfo_var::operator= (const ::PortableInterceptor::ClientRequestInfo_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::ClientRequestInfo_var::operator const ::PortableInterceptor::ClientRequestInfo_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableInterceptor::ClientRequestInfo_var::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ClientRequestInfo_ptr &
-PortableInterceptor::ClientRequestInfo_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ClientRequestInfo_ptr &
-PortableInterceptor::ClientRequestInfo_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::ClientRequestInfo_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___OUT_CI_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::ClientRequestInfo_out
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequestInfo_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (ClientRequestInfo_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::ClientRequestInfo_out::ClientRequestInfo_out (const ::PortableInterceptor::ClientRequestInfo_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ClientRequestInfo_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableInterceptor::ClientRequestInfo_out &
-PortableInterceptor::ClientRequestInfo_out::operator= (const ::PortableInterceptor::ClientRequestInfo_out &p)
-{
-  this->ptr_ = ACE_const_cast (ClientRequestInfo_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::ClientRequestInfo_out &
-PortableInterceptor::ClientRequestInfo_out::operator= (const ::PortableInterceptor::ClientRequestInfo_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::ClientRequestInfo::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::ClientRequestInfo_out &
-PortableInterceptor::ClientRequestInfo_out::operator= (ClientRequestInfo_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::ClientRequestInfo_out::operator ::PortableInterceptor::ClientRequestInfo_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ClientRequestInfo_ptr &
-PortableInterceptor::ClientRequestInfo_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ClientRequestInfo_ptr
-PortableInterceptor::ClientRequestInfo_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___VAR_CI_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::ServerRequestInfo_var
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (void) // default constructor
-  : ptr_ (ServerRequestInfo::_nil ())
-{}
-
-ACE_INLINE ::PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableInterceptor::ServerRequestInfo_var::ServerRequestInfo_var (const ::PortableInterceptor::ServerRequestInfo_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ServerRequestInfo::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableInterceptor::ServerRequestInfo_var::~ServerRequestInfo_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableInterceptor::ServerRequestInfo_var &
-PortableInterceptor::ServerRequestInfo_var::operator= (ServerRequestInfo_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::ServerRequestInfo_var &
-PortableInterceptor::ServerRequestInfo_var::operator= (const ::PortableInterceptor::ServerRequestInfo_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::ServerRequestInfo_var::operator const ::PortableInterceptor::ServerRequestInfo_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableInterceptor::ServerRequestInfo_var::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ServerRequestInfo_ptr &
-PortableInterceptor::ServerRequestInfo_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ServerRequestInfo_ptr &
-PortableInterceptor::ServerRequestInfo_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::ServerRequestInfo_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___OUT_CI_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::ServerRequestInfo_out
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequestInfo_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (ServerRequestInfo_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::ServerRequestInfo_out::ServerRequestInfo_out (const ::PortableInterceptor::ServerRequestInfo_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServerRequestInfo_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableInterceptor::ServerRequestInfo_out &
-PortableInterceptor::ServerRequestInfo_out::operator= (const ::PortableInterceptor::ServerRequestInfo_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServerRequestInfo_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::ServerRequestInfo_out &
-PortableInterceptor::ServerRequestInfo_out::operator= (const ::PortableInterceptor::ServerRequestInfo_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::ServerRequestInfo::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::ServerRequestInfo_out &
-PortableInterceptor::ServerRequestInfo_out::operator= (ServerRequestInfo_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::ServerRequestInfo_out::operator ::PortableInterceptor::ServerRequestInfo_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ServerRequestInfo_ptr &
-PortableInterceptor::ServerRequestInfo_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ServerRequestInfo_ptr
-PortableInterceptor::ServerRequestInfo_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___VAR_CI_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::ClientRequestInterceptor_var
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (void) // default constructor
-  : ptr_ (ClientRequestInterceptor::_nil ())
-{}
-
-ACE_INLINE ::PortableInterceptor::ClientRequestInterceptor_ptr
-PortableInterceptor::ClientRequestInterceptor_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableInterceptor::ClientRequestInterceptor_var::ClientRequestInterceptor_var (const ::PortableInterceptor::ClientRequestInterceptor_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ClientRequestInterceptor::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableInterceptor::ClientRequestInterceptor_var::~ClientRequestInterceptor_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableInterceptor::ClientRequestInterceptor_var &
-PortableInterceptor::ClientRequestInterceptor_var::operator= (ClientRequestInterceptor_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::ClientRequestInterceptor_var &
-PortableInterceptor::ClientRequestInterceptor_var::operator= (const ::PortableInterceptor::ClientRequestInterceptor_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::ClientRequestInterceptor_var::operator const ::PortableInterceptor::ClientRequestInterceptor_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableInterceptor::ClientRequestInterceptor_var::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ClientRequestInterceptor_ptr
-PortableInterceptor::ClientRequestInterceptor_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ClientRequestInterceptor_ptr
-PortableInterceptor::ClientRequestInterceptor_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ClientRequestInterceptor_ptr &
-PortableInterceptor::ClientRequestInterceptor_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ClientRequestInterceptor_ptr &
-PortableInterceptor::ClientRequestInterceptor_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ClientRequestInterceptor_ptr
-PortableInterceptor::ClientRequestInterceptor_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::ClientRequestInterceptor_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___OUT_CI_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::ClientRequestInterceptor_out
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (ClientRequestInterceptor_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil ();
-}
+#if !defined (_PORTABLEINTERCEPTOR_CURRENT___CI_)
+#define _PORTABLEINTERCEPTOR_CURRENT___CI_
 
-ACE_INLINE
-PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (ClientRequestInterceptor_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::ClientRequestInterceptor_out::ClientRequestInterceptor_out (const ::PortableInterceptor::ClientRequestInterceptor_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ClientRequestInterceptor_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableInterceptor::ClientRequestInterceptor_out &
-PortableInterceptor::ClientRequestInterceptor_out::operator= (const ::PortableInterceptor::ClientRequestInterceptor_out &p)
-{
-  this->ptr_ = ACE_const_cast (ClientRequestInterceptor_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::ClientRequestInterceptor_out &
-PortableInterceptor::ClientRequestInterceptor_out::operator= (const ::PortableInterceptor::ClientRequestInterceptor_var &p)
+ACE_INLINE PortableInterceptor::Current_ptr
+tao_PortableInterceptor_Current_duplicate (
+    PortableInterceptor::Current_ptr p
+  )
 {
-  this->ptr_ = ::PortableInterceptor::ClientRequestInterceptor::_duplicate (p.ptr ());
-  return *this;
+  return PortableInterceptor::Current::_duplicate (p);
 }
 
-ACE_INLINE PortableInterceptor::ClientRequestInterceptor_out &
-PortableInterceptor::ClientRequestInterceptor_out::operator= (ClientRequestInterceptor_ptr p)
+ACE_INLINE void
+tao_PortableInterceptor_Current_release (
+    PortableInterceptor::Current_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-PortableInterceptor::ClientRequestInterceptor_out::operator ::PortableInterceptor::ClientRequestInterceptor_ptr &() // cast
+ACE_INLINE PortableInterceptor::Current_ptr
+tao_PortableInterceptor_Current_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::Current::_nil ();
 }
 
-ACE_INLINE ::PortableInterceptor::ClientRequestInterceptor_ptr &
-PortableInterceptor::ClientRequestInterceptor_out::ptr (void) // ptr
+ACE_INLINE PortableInterceptor::Current_ptr
+tao_PortableInterceptor_Current_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::Current::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableInterceptor::ClientRequestInterceptor_ptr
-PortableInterceptor::ClientRequestInterceptor_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_PortableInterceptor_Current_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  PortableInterceptor::Current **tmp =
+    ACE_static_cast (PortableInterceptor::Current **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___VAR_CI_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___VAR_CI_
+#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO___CI_)
+#define _PORTABLEINTERCEPTOR_REQUESTINFO___CI_
 
-// *************************************************************
-// Inline operations for class PortableInterceptor::ServerRequestInterceptor_var
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (void) // default constructor
-  : ptr_ (ServerRequestInterceptor::_nil ())
-{}
-
-ACE_INLINE ::PortableInterceptor::ServerRequestInterceptor_ptr
-PortableInterceptor::ServerRequestInterceptor_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableInterceptor::ServerRequestInterceptor_var::ServerRequestInterceptor_var (const ::PortableInterceptor::ServerRequestInterceptor_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ServerRequestInterceptor::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableInterceptor::ServerRequestInterceptor_var::~ServerRequestInterceptor_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableInterceptor::ServerRequestInterceptor_var &
-PortableInterceptor::ServerRequestInterceptor_var::operator= (ServerRequestInterceptor_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::ServerRequestInterceptor_var &
-PortableInterceptor::ServerRequestInterceptor_var::operator= (const ::PortableInterceptor::ServerRequestInterceptor_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::ServerRequestInterceptor_var::operator const ::PortableInterceptor::ServerRequestInterceptor_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableInterceptor::ServerRequestInterceptor_var::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ServerRequestInterceptor_ptr
-PortableInterceptor::ServerRequestInterceptor_var::operator-> (void) const
+ACE_INLINE PortableInterceptor::RequestInfo_ptr
+tao_PortableInterceptor_RequestInfo_duplicate (
+    PortableInterceptor::RequestInfo_ptr p
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::RequestInfo::_duplicate (p);
 }
 
-ACE_INLINE ::PortableInterceptor::ServerRequestInterceptor_ptr
-PortableInterceptor::ServerRequestInterceptor_var::in (void) const
+ACE_INLINE void
+tao_PortableInterceptor_RequestInfo_release (
+    PortableInterceptor::RequestInfo_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::PortableInterceptor::ServerRequestInterceptor_ptr &
-PortableInterceptor::ServerRequestInterceptor_var::inout (void)
+ACE_INLINE PortableInterceptor::RequestInfo_ptr
+tao_PortableInterceptor_RequestInfo_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::RequestInfo::_nil ();
 }
 
-ACE_INLINE ::PortableInterceptor::ServerRequestInterceptor_ptr &
-PortableInterceptor::ServerRequestInterceptor_var::out (void)
+ACE_INLINE PortableInterceptor::RequestInfo_ptr
+tao_PortableInterceptor_RequestInfo_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil ();
-  return this->ptr_;
+  return PortableInterceptor::RequestInfo::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableInterceptor::ServerRequestInterceptor_ptr
-PortableInterceptor::ServerRequestInterceptor_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_PortableInterceptor_RequestInfo_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::ServerRequestInterceptor_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil ();
-  return val;
+  PortableInterceptor::RequestInfo **tmp =
+    ACE_static_cast (PortableInterceptor::RequestInfo **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___OUT_CI_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___OUT_CI_
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO___CI_
 
-// *************************************************************
-// Inline operations for class PortableInterceptor::ServerRequestInterceptor_out
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (ServerRequestInterceptor_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (ServerRequestInterceptor_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::ServerRequestInterceptor_out::ServerRequestInterceptor_out (const ::PortableInterceptor::ServerRequestInterceptor_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServerRequestInterceptor_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableInterceptor::ServerRequestInterceptor_out &
-PortableInterceptor::ServerRequestInterceptor_out::operator= (const ::PortableInterceptor::ServerRequestInterceptor_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServerRequestInterceptor_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::ServerRequestInterceptor_out &
-PortableInterceptor::ServerRequestInterceptor_out::operator= (const ::PortableInterceptor::ServerRequestInterceptor_var &p)
+ACE_INLINE PortableInterceptor::ClientRequestInfo_ptr
+tao_PortableInterceptor_ClientRequestInfo_duplicate (
+    PortableInterceptor::ClientRequestInfo_ptr p
+  )
 {
-  this->ptr_ = ::PortableInterceptor::ServerRequestInterceptor::_duplicate (p.ptr ());
-  return *this;
+  return PortableInterceptor::ClientRequestInfo::_duplicate (p);
 }
 
-ACE_INLINE PortableInterceptor::ServerRequestInterceptor_out &
-PortableInterceptor::ServerRequestInterceptor_out::operator= (ServerRequestInterceptor_ptr p)
+ACE_INLINE void
+tao_PortableInterceptor_ClientRequestInfo_release (
+    PortableInterceptor::ClientRequestInfo_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-PortableInterceptor::ServerRequestInterceptor_out::operator ::PortableInterceptor::ServerRequestInterceptor_ptr &() // cast
+ACE_INLINE PortableInterceptor::ClientRequestInfo_ptr
+tao_PortableInterceptor_ClientRequestInfo_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::ClientRequestInfo::_nil ();
 }
 
-ACE_INLINE ::PortableInterceptor::ServerRequestInterceptor_ptr &
-PortableInterceptor::ServerRequestInterceptor_out::ptr (void) // ptr
+ACE_INLINE PortableInterceptor::ClientRequestInfo_ptr
+tao_PortableInterceptor_ClientRequestInfo_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::ClientRequestInfo::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableInterceptor::ServerRequestInterceptor_ptr
-PortableInterceptor::ServerRequestInterceptor_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_PortableInterceptor_ClientRequestInfo_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  PortableInterceptor::ClientRequestInfo **tmp =
+    ACE_static_cast (PortableInterceptor::ClientRequestInfo **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINFO___VAR_CI_)
-#define _PORTABLEINTERCEPTOR_IORINFO___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::IORInfo_var
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::IORInfo_var::IORInfo_var (void) // default constructor
-  : ptr_ (IORInfo::_nil ())
-{}
-
-ACE_INLINE ::PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableInterceptor::IORInfo_var::IORInfo_var (const ::PortableInterceptor::IORInfo_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (IORInfo::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableInterceptor::IORInfo_var::~IORInfo_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO___CI_
 
-ACE_INLINE PortableInterceptor::IORInfo_var &
-PortableInterceptor::IORInfo_var::operator= (IORInfo_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::IORInfo_var &
-PortableInterceptor::IORInfo_var::operator= (const ::PortableInterceptor::IORInfo_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::IORInfo::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::IORInfo_var::operator const ::PortableInterceptor::IORInfo_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableInterceptor::IORInfo_var::operator ::PortableInterceptor::IORInfo_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo_var::operator-> (void) const
+ACE_INLINE PortableInterceptor::ServerRequestInfo_ptr
+tao_PortableInterceptor_ServerRequestInfo_duplicate (
+    PortableInterceptor::ServerRequestInfo_ptr p
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::ServerRequestInfo::_duplicate (p);
 }
 
-ACE_INLINE ::PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo_var::in (void) const
+ACE_INLINE void
+tao_PortableInterceptor_ServerRequestInfo_release (
+    PortableInterceptor::ServerRequestInfo_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::PortableInterceptor::IORInfo_ptr &
-PortableInterceptor::IORInfo_var::inout (void)
+ACE_INLINE PortableInterceptor::ServerRequestInfo_ptr
+tao_PortableInterceptor_ServerRequestInfo_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::ServerRequestInfo::_nil ();
 }
 
-ACE_INLINE ::PortableInterceptor::IORInfo_ptr &
-PortableInterceptor::IORInfo_var::out (void)
+ACE_INLINE PortableInterceptor::ServerRequestInfo_ptr
+tao_PortableInterceptor_ServerRequestInfo_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::IORInfo::_nil ();
-  return this->ptr_;
+  return PortableInterceptor::ServerRequestInfo::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_PortableInterceptor_ServerRequestInfo_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::IORInfo_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::IORInfo::_nil ();
-  return val;
+  PortableInterceptor::ServerRequestInfo **tmp =
+    ACE_static_cast (PortableInterceptor::ServerRequestInfo **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINFO___OUT_CI_)
-#define _PORTABLEINTERCEPTOR_IORINFO___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::IORInfo_out
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::IORInfo::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::IORInfo_out::IORInfo_out (IORInfo_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::IORInfo::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::IORInfo_out::IORInfo_out (const ::PortableInterceptor::IORInfo_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IORInfo_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableInterceptor::IORInfo_out &
-PortableInterceptor::IORInfo_out::operator= (const ::PortableInterceptor::IORInfo_out &p)
-{
-  this->ptr_ = ACE_const_cast (IORInfo_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR___CI_
 
-ACE_INLINE PortableInterceptor::IORInfo_out &
-PortableInterceptor::IORInfo_out::operator= (const ::PortableInterceptor::IORInfo_var &p)
+ACE_INLINE PortableInterceptor::ClientRequestInterceptor_ptr
+tao_PortableInterceptor_ClientRequestInterceptor_duplicate (
+    PortableInterceptor::ClientRequestInterceptor_ptr p
+  )
 {
-  this->ptr_ = ::PortableInterceptor::IORInfo::_duplicate (p.ptr ());
-  return *this;
+  return PortableInterceptor::ClientRequestInterceptor::_duplicate (p);
 }
 
-ACE_INLINE PortableInterceptor::IORInfo_out &
-PortableInterceptor::IORInfo_out::operator= (IORInfo_ptr p)
+ACE_INLINE void
+tao_PortableInterceptor_ClientRequestInterceptor_release (
+    PortableInterceptor::ClientRequestInterceptor_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-PortableInterceptor::IORInfo_out::operator ::PortableInterceptor::IORInfo_ptr &() // cast
+ACE_INLINE PortableInterceptor::ClientRequestInterceptor_ptr
+tao_PortableInterceptor_ClientRequestInterceptor_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::ClientRequestInterceptor::_nil ();
 }
 
-ACE_INLINE ::PortableInterceptor::IORInfo_ptr &
-PortableInterceptor::IORInfo_out::ptr (void) // ptr
+ACE_INLINE PortableInterceptor::ClientRequestInterceptor_ptr
+tao_PortableInterceptor_ClientRequestInterceptor_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::ClientRequestInterceptor::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableInterceptor::IORInfo_ptr
-PortableInterceptor::IORInfo_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_PortableInterceptor_ClientRequestInterceptor_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  PortableInterceptor::ClientRequestInterceptor **tmp =
+    ACE_static_cast (PortableInterceptor::ClientRequestInterceptor **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___VAR_CI_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::IORInterceptor_var
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::IORInterceptor_var::IORInterceptor_var (void) // default constructor
-  : ptr_ (IORInterceptor::_nil ())
-{}
-
-ACE_INLINE ::PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableInterceptor::IORInterceptor_var::IORInterceptor_var (const ::PortableInterceptor::IORInterceptor_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (IORInterceptor::_duplicate (p.ptr ()))
-{}
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR___CI_
 
-ACE_INLINE
-PortableInterceptor::IORInterceptor_var::~IORInterceptor_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableInterceptor::IORInterceptor_var &
-PortableInterceptor::IORInterceptor_var::operator= (IORInterceptor_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::IORInterceptor_var &
-PortableInterceptor::IORInterceptor_var::operator= (const ::PortableInterceptor::IORInterceptor_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::IORInterceptor::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::IORInterceptor_var::operator const ::PortableInterceptor::IORInterceptor_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableInterceptor::IORInterceptor_var::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor_var::operator-> (void) const
+ACE_INLINE PortableInterceptor::ServerRequestInterceptor_ptr
+tao_PortableInterceptor_ServerRequestInterceptor_duplicate (
+    PortableInterceptor::ServerRequestInterceptor_ptr p
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::ServerRequestInterceptor::_duplicate (p);
 }
 
-ACE_INLINE ::PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor_var::in (void) const
+ACE_INLINE void
+tao_PortableInterceptor_ServerRequestInterceptor_release (
+    PortableInterceptor::ServerRequestInterceptor_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::PortableInterceptor::IORInterceptor_ptr &
-PortableInterceptor::IORInterceptor_var::inout (void)
+ACE_INLINE PortableInterceptor::ServerRequestInterceptor_ptr
+tao_PortableInterceptor_ServerRequestInterceptor_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::ServerRequestInterceptor::_nil ();
 }
 
-ACE_INLINE ::PortableInterceptor::IORInterceptor_ptr &
-PortableInterceptor::IORInterceptor_var::out (void)
+ACE_INLINE PortableInterceptor::ServerRequestInterceptor_ptr
+tao_PortableInterceptor_ServerRequestInterceptor_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil ();
-  return this->ptr_;
+  return PortableInterceptor::ServerRequestInterceptor::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_PortableInterceptor_ServerRequestInterceptor_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::IORInterceptor_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil ();
-  return val;
+  PortableInterceptor::ServerRequestInterceptor **tmp =
+    ACE_static_cast (PortableInterceptor::ServerRequestInterceptor **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___OUT_CI_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::IORInterceptor_out
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::IORInterceptor_out::IORInterceptor_out (IORInterceptor_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::IORInterceptor::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::IORInterceptor_out::IORInterceptor_out (const ::PortableInterceptor::IORInterceptor_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IORInterceptor_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableInterceptor::IORInterceptor_out &
-PortableInterceptor::IORInterceptor_out::operator= (const ::PortableInterceptor::IORInterceptor_out &p)
-{
-  this->ptr_ = ACE_const_cast (IORInterceptor_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_PORTABLEINTERCEPTOR_IORINFO___CI_)
+#define _PORTABLEINTERCEPTOR_IORINFO___CI_
 
-ACE_INLINE PortableInterceptor::IORInterceptor_out &
-PortableInterceptor::IORInterceptor_out::operator= (const ::PortableInterceptor::IORInterceptor_var &p)
+ACE_INLINE PortableInterceptor::IORInfo_ptr
+tao_PortableInterceptor_IORInfo_duplicate (
+    PortableInterceptor::IORInfo_ptr p
+  )
 {
-  this->ptr_ = ::PortableInterceptor::IORInterceptor::_duplicate (p.ptr ());
-  return *this;
+  return PortableInterceptor::IORInfo::_duplicate (p);
 }
 
-ACE_INLINE PortableInterceptor::IORInterceptor_out &
-PortableInterceptor::IORInterceptor_out::operator= (IORInterceptor_ptr p)
+ACE_INLINE void
+tao_PortableInterceptor_IORInfo_release (
+    PortableInterceptor::IORInfo_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-PortableInterceptor::IORInterceptor_out::operator ::PortableInterceptor::IORInterceptor_ptr &() // cast
+ACE_INLINE PortableInterceptor::IORInfo_ptr
+tao_PortableInterceptor_IORInfo_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::IORInfo::_nil ();
 }
 
-ACE_INLINE ::PortableInterceptor::IORInterceptor_ptr &
-PortableInterceptor::IORInterceptor_out::ptr (void) // ptr
+ACE_INLINE PortableInterceptor::IORInfo_ptr
+tao_PortableInterceptor_IORInfo_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::IORInfo::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableInterceptor::IORInterceptor_ptr
-PortableInterceptor::IORInterceptor_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_PortableInterceptor_IORInfo_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  PortableInterceptor::IORInfo **tmp =
+    ACE_static_cast (PortableInterceptor::IORInfo **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___VAR_CI_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::PolicyFactory_var
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::PolicyFactory_var::PolicyFactory_var (void) // default constructor
-  : ptr_ (PolicyFactory::_nil ())
-{}
-
-ACE_INLINE ::PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableInterceptor::PolicyFactory_var::PolicyFactory_var (const ::PortableInterceptor::PolicyFactory_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (PolicyFactory::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableInterceptor::PolicyFactory_var::~PolicyFactory_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableInterceptor::PolicyFactory_var &
-PortableInterceptor::PolicyFactory_var::operator= (PolicyFactory_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::PolicyFactory_var &
-PortableInterceptor::PolicyFactory_var::operator= (const ::PortableInterceptor::PolicyFactory_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::PolicyFactory::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::PolicyFactory_var::operator const ::PortableInterceptor::PolicyFactory_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableInterceptor::PolicyFactory_var::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast 
-{
-  return this->ptr_;
-}
+#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_)
+#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR___CI_
 
-ACE_INLINE ::PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory_var::operator-> (void) const
+ACE_INLINE PortableInterceptor::IORInterceptor_ptr
+tao_PortableInterceptor_IORInterceptor_duplicate (
+    PortableInterceptor::IORInterceptor_ptr p
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::IORInterceptor::_duplicate (p);
 }
 
-ACE_INLINE ::PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory_var::in (void) const
+ACE_INLINE void
+tao_PortableInterceptor_IORInterceptor_release (
+    PortableInterceptor::IORInterceptor_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::PortableInterceptor::PolicyFactory_ptr &
-PortableInterceptor::PolicyFactory_var::inout (void)
+ACE_INLINE PortableInterceptor::IORInterceptor_ptr
+tao_PortableInterceptor_IORInterceptor_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::IORInterceptor::_nil ();
 }
 
-ACE_INLINE ::PortableInterceptor::PolicyFactory_ptr &
-PortableInterceptor::PolicyFactory_var::out (void)
+ACE_INLINE PortableInterceptor::IORInterceptor_ptr
+tao_PortableInterceptor_IORInterceptor_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil ();
-  return this->ptr_;
+  return PortableInterceptor::IORInterceptor::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_PortableInterceptor_IORInterceptor_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::PolicyFactory_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil ();
-  return val;
+  PortableInterceptor::IORInterceptor **tmp =
+    ACE_static_cast (PortableInterceptor::IORInterceptor **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___OUT_CI_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::PolicyFactory_out
-// *************************************************************
+#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY___CI_)
+#define _PORTABLEINTERCEPTOR_POLICYFACTORY___CI_
 
-ACE_INLINE
-PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::PolicyFactory_out::PolicyFactory_out (PolicyFactory_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::PolicyFactory::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::PolicyFactory_out::PolicyFactory_out (const ::PortableInterceptor::PolicyFactory_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (PolicyFactory_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableInterceptor::PolicyFactory_out &
-PortableInterceptor::PolicyFactory_out::operator= (const ::PortableInterceptor::PolicyFactory_out &p)
-{
-  this->ptr_ = ACE_const_cast (PolicyFactory_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::PolicyFactory_out &
-PortableInterceptor::PolicyFactory_out::operator= (const ::PortableInterceptor::PolicyFactory_var &p)
+ACE_INLINE PortableInterceptor::PolicyFactory_ptr
+tao_PortableInterceptor_PolicyFactory_duplicate (
+    PortableInterceptor::PolicyFactory_ptr p
+  )
 {
-  this->ptr_ = ::PortableInterceptor::PolicyFactory::_duplicate (p.ptr ());
-  return *this;
+  return PortableInterceptor::PolicyFactory::_duplicate (p);
 }
 
-ACE_INLINE PortableInterceptor::PolicyFactory_out &
-PortableInterceptor::PolicyFactory_out::operator= (PolicyFactory_ptr p)
+ACE_INLINE void
+tao_PortableInterceptor_PolicyFactory_release (
+    PortableInterceptor::PolicyFactory_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-PortableInterceptor::PolicyFactory_out::operator ::PortableInterceptor::PolicyFactory_ptr &() // cast
+ACE_INLINE PortableInterceptor::PolicyFactory_ptr
+tao_PortableInterceptor_PolicyFactory_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::PolicyFactory::_nil ();
 }
 
-ACE_INLINE ::PortableInterceptor::PolicyFactory_ptr &
-PortableInterceptor::PolicyFactory_out::ptr (void) // ptr
+ACE_INLINE PortableInterceptor::PolicyFactory_ptr
+tao_PortableInterceptor_PolicyFactory_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::PolicyFactory::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableInterceptor::PolicyFactory_ptr
-PortableInterceptor::PolicyFactory_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_PortableInterceptor_PolicyFactory_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  PortableInterceptor::PolicyFactory **tmp =
+    ACE_static_cast (PortableInterceptor::PolicyFactory **, src);
+  return *tmp;
 }
 
 
@@ -1736,340 +536,100 @@ PortableInterceptor::PolicyFactory_out::operator-> (void)
 // *************************************************************
 
 
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___VAR_CI_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::ORBInitInfo_var
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (void) // default constructor
-  : ptr_ (ORBInitInfo::_nil ())
-{}
-
-ACE_INLINE ::PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableInterceptor::ORBInitInfo_var::ORBInitInfo_var (const ::PortableInterceptor::ORBInitInfo_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ORBInitInfo::_duplicate (p.ptr ()))
-{}
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___CI_)
+#define _PORTABLEINTERCEPTOR_ORBINITINFO___CI_
 
-ACE_INLINE
-PortableInterceptor::ORBInitInfo_var::~ORBInitInfo_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableInterceptor::ORBInitInfo_var &
-PortableInterceptor::ORBInitInfo_var::operator= (ORBInitInfo_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::ORBInitInfo_var &
-PortableInterceptor::ORBInitInfo_var::operator= (const ::PortableInterceptor::ORBInitInfo_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::ORBInitInfo::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::ORBInitInfo_var::operator const ::PortableInterceptor::ORBInitInfo_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableInterceptor::ORBInitInfo_var::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ORBInitInfo_ptr &
-PortableInterceptor::ORBInitInfo_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ORBInitInfo_ptr &
-PortableInterceptor::ORBInitInfo_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::ORBInitInfo_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO___OUT_CI_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::ORBInitInfo_out
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (ORBInitInfo_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ORBInitInfo::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::ORBInitInfo_out::ORBInitInfo_out (const ::PortableInterceptor::ORBInitInfo_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ORBInitInfo_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableInterceptor::ORBInitInfo_out &
-PortableInterceptor::ORBInitInfo_out::operator= (const ::PortableInterceptor::ORBInitInfo_out &p)
-{
-  this->ptr_ = ACE_const_cast (ORBInitInfo_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::ORBInitInfo_out &
-PortableInterceptor::ORBInitInfo_out::operator= (const ::PortableInterceptor::ORBInitInfo_var &p)
-{
-  this->ptr_ = ::PortableInterceptor::ORBInitInfo::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::ORBInitInfo_out &
-PortableInterceptor::ORBInitInfo_out::operator= (ORBInitInfo_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::ORBInitInfo_out::operator ::PortableInterceptor::ORBInitInfo_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ORBInitInfo_ptr &
-PortableInterceptor::ORBInitInfo_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ORBInitInfo_ptr
-PortableInterceptor::ORBInitInfo_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___VAR_CI_)
-#define _PORTABLEINTERCEPTOR_ORBINITIALIZER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::ORBInitializer_var
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::ORBInitializer_var::ORBInitializer_var (void) // default constructor
-  : ptr_ (ORBInitializer::_nil ())
-{}
-
-ACE_INLINE ::PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableInterceptor::ORBInitializer_var::ORBInitializer_var (const ::PortableInterceptor::ORBInitializer_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ORBInitializer::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableInterceptor::ORBInitializer_var::~ORBInitializer_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableInterceptor::ORBInitializer_var &
-PortableInterceptor::ORBInitializer_var::operator= (ORBInitializer_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::ORBInitializer_var &
-PortableInterceptor::ORBInitializer_var::operator= (const ::PortableInterceptor::ORBInitializer_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableInterceptor::ORBInitializer::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-PortableInterceptor::ORBInitializer_var::operator const ::PortableInterceptor::ORBInitializer_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-PortableInterceptor::ORBInitializer_var::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer_var::operator-> (void) const
+ACE_INLINE PortableInterceptor::ORBInitInfo_ptr
+tao_PortableInterceptor_ORBInitInfo_duplicate (
+    PortableInterceptor::ORBInitInfo_ptr p
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::ORBInitInfo::_duplicate (p);
 }
 
-ACE_INLINE ::PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer_var::in (void) const
+ACE_INLINE void
+tao_PortableInterceptor_ORBInitInfo_release (
+    PortableInterceptor::ORBInitInfo_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::PortableInterceptor::ORBInitializer_ptr &
-PortableInterceptor::ORBInitializer_var::inout (void)
+ACE_INLINE PortableInterceptor::ORBInitInfo_ptr
+tao_PortableInterceptor_ORBInitInfo_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::ORBInitInfo::_nil ();
 }
 
-ACE_INLINE ::PortableInterceptor::ORBInitializer_ptr &
-PortableInterceptor::ORBInitializer_var::out (void)
+ACE_INLINE PortableInterceptor::ORBInitInfo_ptr
+tao_PortableInterceptor_ORBInitInfo_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil ();
-  return this->ptr_;
+  return PortableInterceptor::ORBInitInfo::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_PortableInterceptor_ORBInitInfo_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::PortableInterceptor::ORBInitializer_ptr val = this->ptr_;
-  this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil ();
-  return val;
+  PortableInterceptor::ORBInitInfo **tmp =
+    ACE_static_cast (PortableInterceptor::ORBInitInfo **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___OUT_CI_)
-#define _PORTABLEINTERCEPTOR_ORBINITIALIZER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableInterceptor::ORBInitializer_out
-// *************************************************************
-
-ACE_INLINE
-PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil ();
-}
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_)
+#define _PORTABLEINTERCEPTOR_ORBINITIALIZER___CI_
 
-ACE_INLINE
-PortableInterceptor::ORBInitializer_out::ORBInitializer_out (ORBInitializer_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableInterceptor::ORBInitializer::_nil ();
-}
-
-ACE_INLINE
-PortableInterceptor::ORBInitializer_out::ORBInitializer_out (const ::PortableInterceptor::ORBInitializer_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ORBInitializer_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableInterceptor::ORBInitializer_out &
-PortableInterceptor::ORBInitializer_out::operator= (const ::PortableInterceptor::ORBInitializer_out &p)
-{
-  this->ptr_ = ACE_const_cast (ORBInitializer_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableInterceptor::ORBInitializer_out &
-PortableInterceptor::ORBInitializer_out::operator= (const ::PortableInterceptor::ORBInitializer_var &p)
+ACE_INLINE PortableInterceptor::ORBInitializer_ptr
+tao_PortableInterceptor_ORBInitializer_duplicate (
+    PortableInterceptor::ORBInitializer_ptr p
+  )
 {
-  this->ptr_ = ::PortableInterceptor::ORBInitializer::_duplicate (p.ptr ());
-  return *this;
+  return PortableInterceptor::ORBInitializer::_duplicate (p);
 }
 
-ACE_INLINE PortableInterceptor::ORBInitializer_out &
-PortableInterceptor::ORBInitializer_out::operator= (ORBInitializer_ptr p)
+ACE_INLINE void
+tao_PortableInterceptor_ORBInitializer_release (
+    PortableInterceptor::ORBInitializer_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-PortableInterceptor::ORBInitializer_out::operator ::PortableInterceptor::ORBInitializer_ptr &() // cast
+ACE_INLINE PortableInterceptor::ORBInitializer_ptr
+tao_PortableInterceptor_ORBInitializer_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::ORBInitializer::_nil ();
 }
 
-ACE_INLINE ::PortableInterceptor::ORBInitializer_ptr &
-PortableInterceptor::ORBInitializer_out::ptr (void) // ptr
+ACE_INLINE PortableInterceptor::ORBInitializer_ptr
+tao_PortableInterceptor_ORBInitializer_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return PortableInterceptor::ORBInitializer::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableInterceptor::ORBInitializer_ptr
-PortableInterceptor::ORBInitializer_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_PortableInterceptor_ORBInitializer_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  PortableInterceptor::ORBInitializer **tmp =
+    ACE_static_cast (PortableInterceptor::ORBInitializer **, src);
+  return *tmp;
 }
 
 
diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp
index 6e44a09ab28..6bd3f0fc192 100644
--- a/TAO/tao/PortableServer/ImplRepoC.cpp
+++ b/TAO/tao/PortableServer/ImplRepoC.cpp
@@ -24,7 +24,6 @@
 #include "tao/Stub.h"
 #include "tao/Invocation.h"
 #include "tao/PortableInterceptor.h"
-
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
@@ -37,9 +36,355 @@
 #include "ImplRepoC.i"
 #endif /* !defined INLINE */
 
+// *************************************************************
+// Operations for class ImplementationRepository::ServerObject_var
+// *************************************************************
+
+ImplementationRepository::ServerObject_var::ServerObject_var (void) // default constructor
+  : ptr_ (ServerObject::_nil ())
+{}
+
+::ImplementationRepository::ServerObject_ptr
+ImplementationRepository::ServerObject_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+ImplementationRepository::ServerObject_var::ServerObject_var (const ::ImplementationRepository::ServerObject_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ServerObject::_duplicate (p.ptr ()))
+{}
+
+ImplementationRepository::ServerObject_var::~ServerObject_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+ImplementationRepository::ServerObject_var &
+ImplementationRepository::ServerObject_var::operator= (ServerObject_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+ImplementationRepository::ServerObject_var &
+ImplementationRepository::ServerObject_var::operator= (const ::ImplementationRepository::ServerObject_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::ImplementationRepository::ServerObject::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+ImplementationRepository::ServerObject_var::operator const ::ImplementationRepository::ServerObject_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::ImplementationRepository::ServerObject_ptr
+ImplementationRepository::ServerObject_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::ImplementationRepository::ServerObject_ptr
+ImplementationRepository::ServerObject_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::ImplementationRepository::ServerObject_ptr &
+ImplementationRepository::ServerObject_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::ImplementationRepository::ServerObject_ptr &
+ImplementationRepository::ServerObject_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::ImplementationRepository::ServerObject::_nil ();
+  return this->ptr_;
+}
+
+::ImplementationRepository::ServerObject_ptr
+ImplementationRepository::ServerObject_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::ImplementationRepository::ServerObject_ptr val = this->ptr_;
+  this->ptr_ = ::ImplementationRepository::ServerObject::_nil ();
+  return val;
+}
+
+::ImplementationRepository::ServerObject_ptr
+ImplementationRepository::ServerObject_var::duplicate (ServerObject_ptr p)
+{
+  return ::ImplementationRepository::ServerObject::_duplicate (p);
+}
+
+void
+ImplementationRepository::ServerObject_var::release (ServerObject_ptr p)
+{
+  CORBA::release (p);
+}
+
+::ImplementationRepository::ServerObject_ptr
+ImplementationRepository::ServerObject_var::nil (void)
+{
+  return ::ImplementationRepository::ServerObject::_nil ();
+}
+
+::ImplementationRepository::ServerObject_ptr
+ImplementationRepository::ServerObject_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::ImplementationRepository::ServerObject::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+ImplementationRepository::ServerObject_var::upcast (void *src)
+{
+  ServerObject **tmp =
+    ACE_static_cast (ServerObject **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class ImplementationRepository::ServerObject_out
+// *************************************************************
+
+ImplementationRepository::ServerObject_out::ServerObject_out (ServerObject_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::ImplementationRepository::ServerObject::_nil ();
+}
+
+ImplementationRepository::ServerObject_out::ServerObject_out (ServerObject_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::ImplementationRepository::ServerObject::_nil ();
+}
+
+ImplementationRepository::ServerObject_out::ServerObject_out (const ::ImplementationRepository::ServerObject_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ServerObject_out &, p).ptr_)
+{}
+
+::ImplementationRepository::ServerObject_out &
+ImplementationRepository::ServerObject_out::operator= (const ::ImplementationRepository::ServerObject_out &p)
+{
+  this->ptr_ = ACE_const_cast (ServerObject_out&, p).ptr_;
+  return *this;
+}
+
+ImplementationRepository::ServerObject_out &
+ImplementationRepository::ServerObject_out::operator= (const ::ImplementationRepository::ServerObject_var &p)
+{
+  this->ptr_ = ::ImplementationRepository::ServerObject::_duplicate (p.ptr ());
+  return *this;
+}
+
+ImplementationRepository::ServerObject_out &
+ImplementationRepository::ServerObject_out::operator= (ServerObject_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ImplementationRepository::ServerObject_out::operator ::ImplementationRepository::ServerObject_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::ImplementationRepository::ServerObject_ptr &
+ImplementationRepository::ServerObject_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::ImplementationRepository::ServerObject_ptr
+ImplementationRepository::ServerObject_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping : public TAO_ClientRequestInfo
+{
+public:
+  TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      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));
+
+private:
+  TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &);
+  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &);
+
+  
+};
+
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (
+    TAO_GIOP_Invocation *_tao_invocation,
+    CORBA::Object_ptr _tao_target,
+    CORBA::Environment &    
+  )
+  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return parameter_list;
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+
+CORBA::Any * 
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ClientRequestInfo
+{
+public:
+  TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      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));
+
+private:
+  TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &);
+  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &);
+
+  
+};
+
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (
+    TAO_GIOP_Invocation *_tao_invocation,
+    CORBA::Object_ptr _tao_target,
+    CORBA::Environment &    
+  )
+  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return parameter_list;
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+
+CORBA::Any * 
+TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+#endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation.
+//                Base & Remote Proxy  Implementation. 
 //
 
 ImplementationRepository::_TAO_ServerObject_Proxy_Impl::_TAO_ServerObject_Proxy_Impl (void)
@@ -58,15 +403,15 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
     CORBA::SystemException
   ))
 {
+  
 
-
-
-
+  
+  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "ping",
@@ -79,31 +424,31 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors ()
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       int _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-      ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ri (
+      TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ri (
         &_tao_call,
         _collocated_tao_target_,
         ACE_TRY_ENV
       );
       ACE_CHECK;
-
+      
       ACE_TRY
         {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+        
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
           TAO_INTERCEPTOR (ri.response_expected (1));
-
+          
           TAO_INTERCEPTOR (
             _tao_vfr.send_request (
               &ri,
@@ -111,7 +456,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
             )
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
@@ -120,16 +465,16 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
               );
-
+              
             }
-
-
+          
+          
           TAO_INTERCEPTOR (
             ri.reply_status (_invoke_status);
             if (_invoke_status == TAO_INVOKE_OK)
@@ -146,10 +491,10 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
                   ACE_TRY_ENV
                 );
               }
-
+            
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
         }
       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -157,8 +502,8 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
           _invoke_status =
             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
-          ri.forward_reference (exc);
+          
+          ri.forward_reference (exc); 
           _tao_vfr.receive_other (
             &ri,
             ACE_TRY_ENV
@@ -177,7 +522,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
         }
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
 
       if (_invoke_status == TAO_INVOKE_RESTART)
@@ -185,10 +530,10 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
           _tao_call.restart_flag (1);
           continue;
         }
-
+      
       break;
     }
-
+  
 }
 
 void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
@@ -199,15 +544,15 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
     CORBA::SystemException
   ))
 {
+  
 
-
-
-
+  
+  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "shutdown",
@@ -220,31 +565,31 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors ()
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       int _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-      ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ri (
+      TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ri (
         &_tao_call,
         _collocated_tao_target_,
         ACE_TRY_ENV
       );
       ACE_CHECK;
-
+      
       ACE_TRY
         {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+        
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
           TAO_INTERCEPTOR (ri.response_expected (1));
-
+          
           TAO_INTERCEPTOR (
             _tao_vfr.send_request (
               &ri,
@@ -252,7 +597,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
             )
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
@@ -261,16 +606,16 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
               );
-
+              
             }
-
-
+          
+          
           TAO_INTERCEPTOR (
             ri.reply_status (_invoke_status);
             if (_invoke_status == TAO_INVOKE_OK)
@@ -287,10 +632,10 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
                   ACE_TRY_ENV
                 );
               }
-
+            
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
         }
       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -298,8 +643,8 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
           _invoke_status =
             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
-          ri.forward_reference (exc);
+          
+          ri.forward_reference (exc); 
           _tao_vfr.receive_other (
             &ri,
             ACE_TRY_ENV
@@ -318,7 +663,7 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
         }
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
 
       if (_invoke_status == TAO_INVOKE_RESTART)
@@ -326,15 +671,15 @@ void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
           _tao_call.restart_flag (1);
           continue;
         }
-
+      
       break;
     }
-
+  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -455,14 +800,14 @@ ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObjec
             stub,
             1,
             obj->_servant ()),
-
+            
           ServerObject::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::ImplementationRepository::ServerObject (stub, 0, obj->_servant ()), ServerObject::_nil ());
         return default_proxy;
       }
-    else
+    else 
       return
         ACE_reinterpret_cast
           (
@@ -506,7 +851,7 @@ void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptr_arith_t t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -524,10 +869,10 @@ void ImplementationRepository::ServerObject::ping (
     CORBA::SystemException
   ))
 {
-  _TAO_ServerObject_Proxy_Impl &proxy =
+  _TAO_ServerObject_Proxy_Impl &proxy = 
     this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-
+  
   proxy.ping (
       this,
       ACE_TRY_ENV
@@ -541,131 +886,36 @@ void ImplementationRepository::ServerObject::shutdown (
     CORBA::SystemException
   ))
 {
-  _TAO_ServerObject_Proxy_Impl &proxy =
+  _TAO_ServerObject_Proxy_Impl &proxy = 
     this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-
+  
   proxy.shutdown (
       this,
       ACE_TRY_ENV
     );
 }
 
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return exception_list;
-}
-
-
-CORBA::Any *
-ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return result_any;
-}
-
-ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return exception_list;
-}
-
-
-CORBA::Any *
-ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
 static const CORBA::Long _oc_ImplementationRepository_ServerObject[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x7665724f),
-  ACE_NTOHL (0x626a6563),
-  ACE_NTOHL (0x743a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x7665724f), 
+  ACE_NTOHL (0x626a6563), 
+  ACE_NTOHL (0x743a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:ImplementationRepository/ServerObject:1.0
   13,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65724f62),
-  ACE_NTOHL (0x6a656374),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65724f62), 
+  ACE_NTOHL (0x6a656374), 
   ACE_NTOHL (0x0),  // name = ServerObject
 };
 
@@ -686,36 +936,36 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentVariable[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   53,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f456e76),
-  ACE_NTOHL (0x69726f6e),
-  ACE_NTOHL (0x6d656e74),
-  ACE_NTOHL (0x56617269),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f456e76), 
+  ACE_NTOHL (0x69726f6e), 
+  ACE_NTOHL (0x6d656e74), 
+  ACE_NTOHL (0x56617269), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
   20,
-  ACE_NTOHL (0x456e7669),
-  ACE_NTOHL (0x726f6e6d),
-  ACE_NTOHL (0x656e7456),
-  ACE_NTOHL (0x61726961),
+  ACE_NTOHL (0x456e7669), 
+  ACE_NTOHL (0x726f6e6d), 
+  ACE_NTOHL (0x656e7456), 
+  ACE_NTOHL (0x61726961), 
   ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
   2, // member count
   5,
-  ACE_NTOHL (0x6e616d65),
+  ACE_NTOHL (0x6e616d65), 
   ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_string,
+  CORBA::tk_string, 
   0U, // string length
   6,
-  ACE_NTOHL (0x76616c75),
+  ACE_NTOHL (0x76616c75), 
   ACE_NTOHL (0x65000000),  // name = value
-  CORBA::tk_string,
+  CORBA::tk_string, 
   0U, // string length
 };
 
@@ -742,21 +992,21 @@ static const CORBA::Long _oc_ImplementationRepository_Address[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f416464),
-  ACE_NTOHL (0x72657373),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f416464), 
+  ACE_NTOHL (0x72657373), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
   8,
-  ACE_NTOHL (0x41646472),
+  ACE_NTOHL (0x41646472), 
   ACE_NTOHL (0x65737300),  // name = Address
-  CORBA::tk_string,
+  CORBA::tk_string, 
   0U, // string length
 };
 
@@ -775,7 +1025,7 @@ TAO_NAMESPACE_END
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
 
@@ -784,43 +1034,43 @@ TAO_NAMESPACE_END
   {
     ImplementationRepository::EnvironmentVariable* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (length);
-
+    
     if (this->buffer_ != 0)
     {
       ImplementationRepository::EnvironmentVariable *old = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-
+      
       if (this->release_)
         _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (old);
-
+      
     }
     this->buffer_ = tmp;
   }
-
+  
   void
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-
+    
     ImplementationRepository::EnvironmentVariable *tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_);
-
+    
     _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp);
     this->buffer_ = 0;
-  }
-
+  } 
+  
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-
-
+  
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
@@ -832,30 +1082,30 @@ TAO_NAMESPACE_END
 ImplementationRepository::EnvironmentList::EnvironmentList (void)
 {}
 ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::EnvironmentVariable *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 ImplementationRepository::EnvironmentList::EnvironmentList (const EnvironmentList &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 ImplementationRepository::EnvironmentList::~EnvironmentList (void) // dtor
@@ -873,23 +1123,23 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f456e76),
-  ACE_NTOHL (0x69726f6e),
-  ACE_NTOHL (0x6d656e74),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f456e76), 
+  ACE_NTOHL (0x69726f6e), 
+  ACE_NTOHL (0x6d656e74), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
   16,
-  ACE_NTOHL (0x456e7669),
-  ACE_NTOHL (0x726f6e6d),
-  ACE_NTOHL (0x656e744c),
+  ACE_NTOHL (0x456e7669), 
+  ACE_NTOHL (0x726f6e6d), 
+  ACE_NTOHL (0x656e744c), 
   ACE_NTOHL (0x69737400),  // name = EnvironmentList
   CORBA::tk_sequence, // typecode kind
   148, // encapsulation length
@@ -898,36 +1148,36 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] =
     132, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       53,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x496d706c),
-      ACE_NTOHL (0x656d656e),
-      ACE_NTOHL (0x74617469),
-      ACE_NTOHL (0x6f6e5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x2f456e76),
-      ACE_NTOHL (0x69726f6e),
-      ACE_NTOHL (0x6d656e74),
-      ACE_NTOHL (0x56617269),
-      ACE_NTOHL (0x61626c65),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x496d706c), 
+      ACE_NTOHL (0x656d656e), 
+      ACE_NTOHL (0x74617469), 
+      ACE_NTOHL (0x6f6e5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x2f456e76), 
+      ACE_NTOHL (0x69726f6e), 
+      ACE_NTOHL (0x6d656e74), 
+      ACE_NTOHL (0x56617269), 
+      ACE_NTOHL (0x61626c65), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
       20,
-      ACE_NTOHL (0x456e7669),
-      ACE_NTOHL (0x726f6e6d),
-      ACE_NTOHL (0x656e7456),
-      ACE_NTOHL (0x61726961),
+      ACE_NTOHL (0x456e7669), 
+      ACE_NTOHL (0x726f6e6d), 
+      ACE_NTOHL (0x656e7456), 
+      ACE_NTOHL (0x61726961), 
       ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
       2, // member count
       5,
-      ACE_NTOHL (0x6e616d65),
+      ACE_NTOHL (0x6e616d65), 
       ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_string,
+      CORBA::tk_string, 
       0U, // string length
       6,
-      ACE_NTOHL (0x76616c75),
+      ACE_NTOHL (0x76616c75), 
       ACE_NTOHL (0x65000000),  // name = value
-      CORBA::tk_string,
+      CORBA::tk_string, 
       0U, // string length
 
     0U,
@@ -951,37 +1201,37 @@ static const CORBA::Long _oc_ImplementationRepository_ActivationMode[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f416374),
-  ACE_NTOHL (0x69766174),
-  ACE_NTOHL (0x696f6e4d),
-  ACE_NTOHL (0x6f64653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f416374), 
+  ACE_NTOHL (0x69766174), 
+  ACE_NTOHL (0x696f6e4d), 
+  ACE_NTOHL (0x6f64653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
   15,
-  ACE_NTOHL (0x41637469),
-  ACE_NTOHL (0x76617469),
-  ACE_NTOHL (0x6f6e4d6f),
+  ACE_NTOHL (0x41637469), 
+  ACE_NTOHL (0x76617469), 
+  ACE_NTOHL (0x6f6e4d6f), 
   ACE_NTOHL (0x64650000),  // name = ActivationMode
   4, // member count
   7,
-  ACE_NTOHL (0x4e4f524d),
+  ACE_NTOHL (0x4e4f524d), 
   ACE_NTOHL (0x414c0000),  // name = NORMAL
   7,
-  ACE_NTOHL (0x4d414e55),
+  ACE_NTOHL (0x4d414e55), 
   ACE_NTOHL (0x414c0000),  // name = MANUAL
   11,
-  ACE_NTOHL (0x5045525f),
-  ACE_NTOHL (0x434c4945),
+  ACE_NTOHL (0x5045525f), 
+  ACE_NTOHL (0x434c4945), 
   ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
   11,
-  ACE_NTOHL (0x4155544f),
-  ACE_NTOHL (0x5f535441),
+  ACE_NTOHL (0x4155544f), 
+  ACE_NTOHL (0x5f535441), 
   ACE_NTOHL (0x52540000),  // name = AUTO_START
 };
 
@@ -1002,56 +1252,56 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f537461),
-  ACE_NTOHL (0x72747570),
-  ACE_NTOHL (0x4f707469),
-  ACE_NTOHL (0x6f6e733a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f537461), 
+  ACE_NTOHL (0x72747570), 
+  ACE_NTOHL (0x4f707469), 
+  ACE_NTOHL (0x6f6e733a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
   15,
-  ACE_NTOHL (0x53746172),
-  ACE_NTOHL (0x7475704f),
-  ACE_NTOHL (0x7074696f),
+  ACE_NTOHL (0x53746172), 
+  ACE_NTOHL (0x7475704f), 
+  ACE_NTOHL (0x7074696f), 
   ACE_NTOHL (0x6e730000),  // name = StartupOptions
   4, // member count
   13,
-  ACE_NTOHL (0x636f6d6d),
-  ACE_NTOHL (0x616e645f),
-  ACE_NTOHL (0x6c696e65),
+  ACE_NTOHL (0x636f6d6d), 
+  ACE_NTOHL (0x616e645f), 
+  ACE_NTOHL (0x6c696e65), 
   ACE_NTOHL (0x0),  // name = command_line
-  CORBA::tk_string,
+  CORBA::tk_string, 
   0U, // string length
   12,
-  ACE_NTOHL (0x656e7669),
-  ACE_NTOHL (0x726f6e6d),
+  ACE_NTOHL (0x656e7669), 
+  ACE_NTOHL (0x726f6e6d), 
   ACE_NTOHL (0x656e7400),  // name = environment
   CORBA::tk_alias, // typecode kind for typedefs
   236, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     49,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x496d706c),
-    ACE_NTOHL (0x656d656e),
-    ACE_NTOHL (0x74617469),
-    ACE_NTOHL (0x6f6e5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x2f456e76),
-    ACE_NTOHL (0x69726f6e),
-    ACE_NTOHL (0x6d656e74),
-    ACE_NTOHL (0x4c697374),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x496d706c), 
+    ACE_NTOHL (0x656d656e), 
+    ACE_NTOHL (0x74617469), 
+    ACE_NTOHL (0x6f6e5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x2f456e76), 
+    ACE_NTOHL (0x69726f6e), 
+    ACE_NTOHL (0x6d656e74), 
+    ACE_NTOHL (0x4c697374), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
     16,
-    ACE_NTOHL (0x456e7669),
-    ACE_NTOHL (0x726f6e6d),
-    ACE_NTOHL (0x656e744c),
+    ACE_NTOHL (0x456e7669), 
+    ACE_NTOHL (0x726f6e6d), 
+    ACE_NTOHL (0x656e744c), 
     ACE_NTOHL (0x69737400),  // name = EnvironmentList
     CORBA::tk_sequence, // typecode kind
     148, // encapsulation length
@@ -1060,88 +1310,88 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] =
       132, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         53,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x496d706c),
-        ACE_NTOHL (0x656d656e),
-        ACE_NTOHL (0x74617469),
-        ACE_NTOHL (0x6f6e5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x2f456e76),
-        ACE_NTOHL (0x69726f6e),
-        ACE_NTOHL (0x6d656e74),
-        ACE_NTOHL (0x56617269),
-        ACE_NTOHL (0x61626c65),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x496d706c), 
+        ACE_NTOHL (0x656d656e), 
+        ACE_NTOHL (0x74617469), 
+        ACE_NTOHL (0x6f6e5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x2f456e76), 
+        ACE_NTOHL (0x69726f6e), 
+        ACE_NTOHL (0x6d656e74), 
+        ACE_NTOHL (0x56617269), 
+        ACE_NTOHL (0x61626c65), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
         20,
-        ACE_NTOHL (0x456e7669),
-        ACE_NTOHL (0x726f6e6d),
-        ACE_NTOHL (0x656e7456),
-        ACE_NTOHL (0x61726961),
+        ACE_NTOHL (0x456e7669), 
+        ACE_NTOHL (0x726f6e6d), 
+        ACE_NTOHL (0x656e7456), 
+        ACE_NTOHL (0x61726961), 
         ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
         2, // member count
         5,
-        ACE_NTOHL (0x6e616d65),
+        ACE_NTOHL (0x6e616d65), 
         ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_string,
+        CORBA::tk_string, 
         0U, // string length
         6,
-        ACE_NTOHL (0x76616c75),
+        ACE_NTOHL (0x76616c75), 
         ACE_NTOHL (0x65000000),  // name = value
-        CORBA::tk_string,
+        CORBA::tk_string, 
         0U, // string length
 
       0U,
 
 
   18,
-  ACE_NTOHL (0x776f726b),
-  ACE_NTOHL (0x696e675f),
-  ACE_NTOHL (0x64697265),
-  ACE_NTOHL (0x63746f72),
+  ACE_NTOHL (0x776f726b), 
+  ACE_NTOHL (0x696e675f), 
+  ACE_NTOHL (0x64697265), 
+  ACE_NTOHL (0x63746f72), 
   ACE_NTOHL (0x79000000),  // name = working_directory
-  CORBA::tk_string,
+  CORBA::tk_string, 
   0U, // string length
   11,
-  ACE_NTOHL (0x61637469),
-  ACE_NTOHL (0x76617469),
+  ACE_NTOHL (0x61637469), 
+  ACE_NTOHL (0x76617469), 
   ACE_NTOHL (0x6f6e0000),  // name = activation
   CORBA::tk_enum, // typecode kind
   136, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     48,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x496d706c),
-    ACE_NTOHL (0x656d656e),
-    ACE_NTOHL (0x74617469),
-    ACE_NTOHL (0x6f6e5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x2f416374),
-    ACE_NTOHL (0x69766174),
-    ACE_NTOHL (0x696f6e4d),
-    ACE_NTOHL (0x6f64653a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x496d706c), 
+    ACE_NTOHL (0x656d656e), 
+    ACE_NTOHL (0x74617469), 
+    ACE_NTOHL (0x6f6e5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x2f416374), 
+    ACE_NTOHL (0x69766174), 
+    ACE_NTOHL (0x696f6e4d), 
+    ACE_NTOHL (0x6f64653a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
     15,
-    ACE_NTOHL (0x41637469),
-    ACE_NTOHL (0x76617469),
-    ACE_NTOHL (0x6f6e4d6f),
+    ACE_NTOHL (0x41637469), 
+    ACE_NTOHL (0x76617469), 
+    ACE_NTOHL (0x6f6e4d6f), 
     ACE_NTOHL (0x64650000),  // name = ActivationMode
     4, // member count
     7,
-    ACE_NTOHL (0x4e4f524d),
+    ACE_NTOHL (0x4e4f524d), 
     ACE_NTOHL (0x414c0000),  // name = NORMAL
     7,
-    ACE_NTOHL (0x4d414e55),
+    ACE_NTOHL (0x4d414e55), 
     ACE_NTOHL (0x414c0000),  // name = MANUAL
     11,
-    ACE_NTOHL (0x5045525f),
-    ACE_NTOHL (0x434c4945),
+    ACE_NTOHL (0x5045525f), 
+    ACE_NTOHL (0x434c4945), 
     ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
     11,
-    ACE_NTOHL (0x4155544f),
-    ACE_NTOHL (0x5f535441),
+    ACE_NTOHL (0x4155544f), 
+    ACE_NTOHL (0x5f535441), 
     ACE_NTOHL (0x52540000),  // name = AUTO_START
 
 };
@@ -1169,95 +1419,95 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x76657249),
-  ACE_NTOHL (0x6e666f72),
-  ACE_NTOHL (0x6d617469),
-  ACE_NTOHL (0x6f6e3a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x76657249), 
+  ACE_NTOHL (0x6e666f72), 
+  ACE_NTOHL (0x6d617469), 
+  ACE_NTOHL (0x6f6e3a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformation:1.0
   18,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x6572496e),
-  ACE_NTOHL (0x666f726d),
-  ACE_NTOHL (0x6174696f),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6572496e), 
+  ACE_NTOHL (0x666f726d), 
+  ACE_NTOHL (0x6174696f), 
   ACE_NTOHL (0x6e000000),  // name = ServerInformation
   4, // member count
   15,
-  ACE_NTOHL (0x6c6f6769),
-  ACE_NTOHL (0x63616c5f),
-  ACE_NTOHL (0x73657276),
+  ACE_NTOHL (0x6c6f6769), 
+  ACE_NTOHL (0x63616c5f), 
+  ACE_NTOHL (0x73657276), 
   ACE_NTOHL (0x65720000),  // name = logical_server
-  CORBA::tk_string,
+  CORBA::tk_string, 
   0U, // string length
   7,
-  ACE_NTOHL (0x73657276),
+  ACE_NTOHL (0x73657276), 
   ACE_NTOHL (0x65720000),  // name = server
-  CORBA::tk_string,
+  CORBA::tk_string, 
   0U, // string length
   8,
-  ACE_NTOHL (0x73746172),
+  ACE_NTOHL (0x73746172), 
   ACE_NTOHL (0x74757000),  // name = startup
   CORBA::tk_struct, // typecode kind
   560, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     48,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x496d706c),
-    ACE_NTOHL (0x656d656e),
-    ACE_NTOHL (0x74617469),
-    ACE_NTOHL (0x6f6e5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x2f537461),
-    ACE_NTOHL (0x72747570),
-    ACE_NTOHL (0x4f707469),
-    ACE_NTOHL (0x6f6e733a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x496d706c), 
+    ACE_NTOHL (0x656d656e), 
+    ACE_NTOHL (0x74617469), 
+    ACE_NTOHL (0x6f6e5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x2f537461), 
+    ACE_NTOHL (0x72747570), 
+    ACE_NTOHL (0x4f707469), 
+    ACE_NTOHL (0x6f6e733a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
     15,
-    ACE_NTOHL (0x53746172),
-    ACE_NTOHL (0x7475704f),
-    ACE_NTOHL (0x7074696f),
+    ACE_NTOHL (0x53746172), 
+    ACE_NTOHL (0x7475704f), 
+    ACE_NTOHL (0x7074696f), 
     ACE_NTOHL (0x6e730000),  // name = StartupOptions
     4, // member count
     13,
-    ACE_NTOHL (0x636f6d6d),
-    ACE_NTOHL (0x616e645f),
-    ACE_NTOHL (0x6c696e65),
+    ACE_NTOHL (0x636f6d6d), 
+    ACE_NTOHL (0x616e645f), 
+    ACE_NTOHL (0x6c696e65), 
     ACE_NTOHL (0x0),  // name = command_line
-    CORBA::tk_string,
+    CORBA::tk_string, 
     0U, // string length
     12,
-    ACE_NTOHL (0x656e7669),
-    ACE_NTOHL (0x726f6e6d),
+    ACE_NTOHL (0x656e7669), 
+    ACE_NTOHL (0x726f6e6d), 
     ACE_NTOHL (0x656e7400),  // name = environment
     CORBA::tk_alias, // typecode kind for typedefs
     236, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       49,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x496d706c),
-      ACE_NTOHL (0x656d656e),
-      ACE_NTOHL (0x74617469),
-      ACE_NTOHL (0x6f6e5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x2f456e76),
-      ACE_NTOHL (0x69726f6e),
-      ACE_NTOHL (0x6d656e74),
-      ACE_NTOHL (0x4c697374),
-      ACE_NTOHL (0x3a312e30),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x496d706c), 
+      ACE_NTOHL (0x656d656e), 
+      ACE_NTOHL (0x74617469), 
+      ACE_NTOHL (0x6f6e5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x2f456e76), 
+      ACE_NTOHL (0x69726f6e), 
+      ACE_NTOHL (0x6d656e74), 
+      ACE_NTOHL (0x4c697374), 
+      ACE_NTOHL (0x3a312e30), 
       ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
       16,
-      ACE_NTOHL (0x456e7669),
-      ACE_NTOHL (0x726f6e6d),
-      ACE_NTOHL (0x656e744c),
+      ACE_NTOHL (0x456e7669), 
+      ACE_NTOHL (0x726f6e6d), 
+      ACE_NTOHL (0x656e744c), 
       ACE_NTOHL (0x69737400),  // name = EnvironmentList
       CORBA::tk_sequence, // typecode kind
       148, // encapsulation length
@@ -1266,114 +1516,114 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
         132, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           53,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x496d706c),
-          ACE_NTOHL (0x656d656e),
-          ACE_NTOHL (0x74617469),
-          ACE_NTOHL (0x6f6e5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x2f456e76),
-          ACE_NTOHL (0x69726f6e),
-          ACE_NTOHL (0x6d656e74),
-          ACE_NTOHL (0x56617269),
-          ACE_NTOHL (0x61626c65),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x496d706c), 
+          ACE_NTOHL (0x656d656e), 
+          ACE_NTOHL (0x74617469), 
+          ACE_NTOHL (0x6f6e5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x2f456e76), 
+          ACE_NTOHL (0x69726f6e), 
+          ACE_NTOHL (0x6d656e74), 
+          ACE_NTOHL (0x56617269), 
+          ACE_NTOHL (0x61626c65), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
           20,
-          ACE_NTOHL (0x456e7669),
-          ACE_NTOHL (0x726f6e6d),
-          ACE_NTOHL (0x656e7456),
-          ACE_NTOHL (0x61726961),
+          ACE_NTOHL (0x456e7669), 
+          ACE_NTOHL (0x726f6e6d), 
+          ACE_NTOHL (0x656e7456), 
+          ACE_NTOHL (0x61726961), 
           ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
           2, // member count
           5,
-          ACE_NTOHL (0x6e616d65),
+          ACE_NTOHL (0x6e616d65), 
           ACE_NTOHL (0x0),  // name = name
-          CORBA::tk_string,
+          CORBA::tk_string, 
           0U, // string length
           6,
-          ACE_NTOHL (0x76616c75),
+          ACE_NTOHL (0x76616c75), 
           ACE_NTOHL (0x65000000),  // name = value
-          CORBA::tk_string,
+          CORBA::tk_string, 
           0U, // string length
 
         0U,
 
 
     18,
-    ACE_NTOHL (0x776f726b),
-    ACE_NTOHL (0x696e675f),
-    ACE_NTOHL (0x64697265),
-    ACE_NTOHL (0x63746f72),
+    ACE_NTOHL (0x776f726b), 
+    ACE_NTOHL (0x696e675f), 
+    ACE_NTOHL (0x64697265), 
+    ACE_NTOHL (0x63746f72), 
     ACE_NTOHL (0x79000000),  // name = working_directory
-    CORBA::tk_string,
+    CORBA::tk_string, 
     0U, // string length
     11,
-    ACE_NTOHL (0x61637469),
-    ACE_NTOHL (0x76617469),
+    ACE_NTOHL (0x61637469), 
+    ACE_NTOHL (0x76617469), 
     ACE_NTOHL (0x6f6e0000),  // name = activation
     CORBA::tk_enum, // typecode kind
     136, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       48,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x496d706c),
-      ACE_NTOHL (0x656d656e),
-      ACE_NTOHL (0x74617469),
-      ACE_NTOHL (0x6f6e5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x2f416374),
-      ACE_NTOHL (0x69766174),
-      ACE_NTOHL (0x696f6e4d),
-      ACE_NTOHL (0x6f64653a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x496d706c), 
+      ACE_NTOHL (0x656d656e), 
+      ACE_NTOHL (0x74617469), 
+      ACE_NTOHL (0x6f6e5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x2f416374), 
+      ACE_NTOHL (0x69766174), 
+      ACE_NTOHL (0x696f6e4d), 
+      ACE_NTOHL (0x6f64653a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
       15,
-      ACE_NTOHL (0x41637469),
-      ACE_NTOHL (0x76617469),
-      ACE_NTOHL (0x6f6e4d6f),
+      ACE_NTOHL (0x41637469), 
+      ACE_NTOHL (0x76617469), 
+      ACE_NTOHL (0x6f6e4d6f), 
       ACE_NTOHL (0x64650000),  // name = ActivationMode
       4, // member count
       7,
-      ACE_NTOHL (0x4e4f524d),
+      ACE_NTOHL (0x4e4f524d), 
       ACE_NTOHL (0x414c0000),  // name = NORMAL
       7,
-      ACE_NTOHL (0x4d414e55),
+      ACE_NTOHL (0x4d414e55), 
       ACE_NTOHL (0x414c0000),  // name = MANUAL
       11,
-      ACE_NTOHL (0x5045525f),
-      ACE_NTOHL (0x434c4945),
+      ACE_NTOHL (0x5045525f), 
+      ACE_NTOHL (0x434c4945), 
       ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
       11,
-      ACE_NTOHL (0x4155544f),
-      ACE_NTOHL (0x5f535441),
+      ACE_NTOHL (0x4155544f), 
+      ACE_NTOHL (0x5f535441), 
       ACE_NTOHL (0x52540000),  // name = AUTO_START
 
 
   9,
-  ACE_NTOHL (0x6c6f6361),
-  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x6c6f6361), 
+  ACE_NTOHL (0x74696f6e), 
   ACE_NTOHL (0x0),  // name = location
   CORBA::tk_alias, // typecode kind for typedefs
   72, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     41,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x496d706c),
-    ACE_NTOHL (0x656d656e),
-    ACE_NTOHL (0x74617469),
-    ACE_NTOHL (0x6f6e5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x2f416464),
-    ACE_NTOHL (0x72657373),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x496d706c), 
+    ACE_NTOHL (0x656d656e), 
+    ACE_NTOHL (0x74617469), 
+    ACE_NTOHL (0x6f6e5265), 
+    ACE_NTOHL (0x706f7369), 
+    ACE_NTOHL (0x746f7279), 
+    ACE_NTOHL (0x2f416464), 
+    ACE_NTOHL (0x72657373), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
     8,
-    ACE_NTOHL (0x41646472),
+    ACE_NTOHL (0x41646472), 
     ACE_NTOHL (0x65737300),  // name = Address
-    CORBA::tk_string,
+    CORBA::tk_string, 
     0U, // string length
 
 };
@@ -1399,7 +1649,7 @@ void ImplementationRepository::ServerInformation::_tao_any_destructor (void *x)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
 
@@ -1408,43 +1658,43 @@ void ImplementationRepository::ServerInformation::_tao_any_destructor (void *x)
   {
     ImplementationRepository::ServerInformation* tmp = 0;
     tmp = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (length);
-
+    
     if (this->buffer_ != 0)
     {
       ImplementationRepository::ServerInformation *old = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-
+      
       if (this->release_)
         _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (old);
-
+      
     }
     this->buffer_ = tmp;
   }
-
+  
   void
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-
+    
     ImplementationRepository::ServerInformation *tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_);
-
+    
     _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
     this->buffer_ = 0;
-  }
-
+  } 
+  
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-
-
+  
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
@@ -1456,30 +1706,30 @@ void ImplementationRepository::ServerInformation::_tao_any_destructor (void *x)
 ImplementationRepository::ServerInformationList::ServerInformationList (void)
 {}
 ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::ServerInformation *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 ImplementationRepository::ServerInformationList::ServerInformationList (const ServerInformationList &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 ImplementationRepository::ServerInformationList::~ServerInformationList (void) // dtor
@@ -1497,26 +1747,26 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x76657249),
-  ACE_NTOHL (0x6e666f72),
-  ACE_NTOHL (0x6d617469),
-  ACE_NTOHL (0x6f6e4c69),
-  ACE_NTOHL (0x73743a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x76657249), 
+  ACE_NTOHL (0x6e666f72), 
+  ACE_NTOHL (0x6d617469), 
+  ACE_NTOHL (0x6f6e4c69), 
+  ACE_NTOHL (0x73743a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformationList:1.0
   22,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x6572496e),
-  ACE_NTOHL (0x666f726d),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e4c6973),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6572496e), 
+  ACE_NTOHL (0x666f726d), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e4c6973), 
   ACE_NTOHL (0x74000000),  // name = ServerInformationList
   CORBA::tk_sequence, // typecode kind
   828, // encapsulation length
@@ -1525,95 +1775,95 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
     812, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       51,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x496d706c),
-      ACE_NTOHL (0x656d656e),
-      ACE_NTOHL (0x74617469),
-      ACE_NTOHL (0x6f6e5265),
-      ACE_NTOHL (0x706f7369),
-      ACE_NTOHL (0x746f7279),
-      ACE_NTOHL (0x2f536572),
-      ACE_NTOHL (0x76657249),
-      ACE_NTOHL (0x6e666f72),
-      ACE_NTOHL (0x6d617469),
-      ACE_NTOHL (0x6f6e3a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x496d706c), 
+      ACE_NTOHL (0x656d656e), 
+      ACE_NTOHL (0x74617469), 
+      ACE_NTOHL (0x6f6e5265), 
+      ACE_NTOHL (0x706f7369), 
+      ACE_NTOHL (0x746f7279), 
+      ACE_NTOHL (0x2f536572), 
+      ACE_NTOHL (0x76657249), 
+      ACE_NTOHL (0x6e666f72), 
+      ACE_NTOHL (0x6d617469), 
+      ACE_NTOHL (0x6f6e3a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformation:1.0
       18,
-      ACE_NTOHL (0x53657276),
-      ACE_NTOHL (0x6572496e),
-      ACE_NTOHL (0x666f726d),
-      ACE_NTOHL (0x6174696f),
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x6572496e), 
+      ACE_NTOHL (0x666f726d), 
+      ACE_NTOHL (0x6174696f), 
       ACE_NTOHL (0x6e000000),  // name = ServerInformation
       4, // member count
       15,
-      ACE_NTOHL (0x6c6f6769),
-      ACE_NTOHL (0x63616c5f),
-      ACE_NTOHL (0x73657276),
+      ACE_NTOHL (0x6c6f6769), 
+      ACE_NTOHL (0x63616c5f), 
+      ACE_NTOHL (0x73657276), 
       ACE_NTOHL (0x65720000),  // name = logical_server
-      CORBA::tk_string,
+      CORBA::tk_string, 
       0U, // string length
       7,
-      ACE_NTOHL (0x73657276),
+      ACE_NTOHL (0x73657276), 
       ACE_NTOHL (0x65720000),  // name = server
-      CORBA::tk_string,
+      CORBA::tk_string, 
       0U, // string length
       8,
-      ACE_NTOHL (0x73746172),
+      ACE_NTOHL (0x73746172), 
       ACE_NTOHL (0x74757000),  // name = startup
       CORBA::tk_struct, // typecode kind
       560, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         48,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x496d706c),
-        ACE_NTOHL (0x656d656e),
-        ACE_NTOHL (0x74617469),
-        ACE_NTOHL (0x6f6e5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x2f537461),
-        ACE_NTOHL (0x72747570),
-        ACE_NTOHL (0x4f707469),
-        ACE_NTOHL (0x6f6e733a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x496d706c), 
+        ACE_NTOHL (0x656d656e), 
+        ACE_NTOHL (0x74617469), 
+        ACE_NTOHL (0x6f6e5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x2f537461), 
+        ACE_NTOHL (0x72747570), 
+        ACE_NTOHL (0x4f707469), 
+        ACE_NTOHL (0x6f6e733a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
         15,
-        ACE_NTOHL (0x53746172),
-        ACE_NTOHL (0x7475704f),
-        ACE_NTOHL (0x7074696f),
+        ACE_NTOHL (0x53746172), 
+        ACE_NTOHL (0x7475704f), 
+        ACE_NTOHL (0x7074696f), 
         ACE_NTOHL (0x6e730000),  // name = StartupOptions
         4, // member count
         13,
-        ACE_NTOHL (0x636f6d6d),
-        ACE_NTOHL (0x616e645f),
-        ACE_NTOHL (0x6c696e65),
+        ACE_NTOHL (0x636f6d6d), 
+        ACE_NTOHL (0x616e645f), 
+        ACE_NTOHL (0x6c696e65), 
         ACE_NTOHL (0x0),  // name = command_line
-        CORBA::tk_string,
+        CORBA::tk_string, 
         0U, // string length
         12,
-        ACE_NTOHL (0x656e7669),
-        ACE_NTOHL (0x726f6e6d),
+        ACE_NTOHL (0x656e7669), 
+        ACE_NTOHL (0x726f6e6d), 
         ACE_NTOHL (0x656e7400),  // name = environment
         CORBA::tk_alias, // typecode kind for typedefs
         236, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           49,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x496d706c),
-          ACE_NTOHL (0x656d656e),
-          ACE_NTOHL (0x74617469),
-          ACE_NTOHL (0x6f6e5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x2f456e76),
-          ACE_NTOHL (0x69726f6e),
-          ACE_NTOHL (0x6d656e74),
-          ACE_NTOHL (0x4c697374),
-          ACE_NTOHL (0x3a312e30),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x496d706c), 
+          ACE_NTOHL (0x656d656e), 
+          ACE_NTOHL (0x74617469), 
+          ACE_NTOHL (0x6f6e5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x2f456e76), 
+          ACE_NTOHL (0x69726f6e), 
+          ACE_NTOHL (0x6d656e74), 
+          ACE_NTOHL (0x4c697374), 
+          ACE_NTOHL (0x3a312e30), 
           ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
           16,
-          ACE_NTOHL (0x456e7669),
-          ACE_NTOHL (0x726f6e6d),
-          ACE_NTOHL (0x656e744c),
+          ACE_NTOHL (0x456e7669), 
+          ACE_NTOHL (0x726f6e6d), 
+          ACE_NTOHL (0x656e744c), 
           ACE_NTOHL (0x69737400),  // name = EnvironmentList
           CORBA::tk_sequence, // typecode kind
           148, // encapsulation length
@@ -1622,114 +1872,114 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
             132, // encapsulation length
               TAO_ENCAP_BYTE_ORDER, // byte order
               53,
-              ACE_NTOHL (0x49444c3a),
-              ACE_NTOHL (0x496d706c),
-              ACE_NTOHL (0x656d656e),
-              ACE_NTOHL (0x74617469),
-              ACE_NTOHL (0x6f6e5265),
-              ACE_NTOHL (0x706f7369),
-              ACE_NTOHL (0x746f7279),
-              ACE_NTOHL (0x2f456e76),
-              ACE_NTOHL (0x69726f6e),
-              ACE_NTOHL (0x6d656e74),
-              ACE_NTOHL (0x56617269),
-              ACE_NTOHL (0x61626c65),
-              ACE_NTOHL (0x3a312e30),
+              ACE_NTOHL (0x49444c3a), 
+              ACE_NTOHL (0x496d706c), 
+              ACE_NTOHL (0x656d656e), 
+              ACE_NTOHL (0x74617469), 
+              ACE_NTOHL (0x6f6e5265), 
+              ACE_NTOHL (0x706f7369), 
+              ACE_NTOHL (0x746f7279), 
+              ACE_NTOHL (0x2f456e76), 
+              ACE_NTOHL (0x69726f6e), 
+              ACE_NTOHL (0x6d656e74), 
+              ACE_NTOHL (0x56617269), 
+              ACE_NTOHL (0x61626c65), 
+              ACE_NTOHL (0x3a312e30), 
               ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
               20,
-              ACE_NTOHL (0x456e7669),
-              ACE_NTOHL (0x726f6e6d),
-              ACE_NTOHL (0x656e7456),
-              ACE_NTOHL (0x61726961),
+              ACE_NTOHL (0x456e7669), 
+              ACE_NTOHL (0x726f6e6d), 
+              ACE_NTOHL (0x656e7456), 
+              ACE_NTOHL (0x61726961), 
               ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
               2, // member count
               5,
-              ACE_NTOHL (0x6e616d65),
+              ACE_NTOHL (0x6e616d65), 
               ACE_NTOHL (0x0),  // name = name
-              CORBA::tk_string,
+              CORBA::tk_string, 
               0U, // string length
               6,
-              ACE_NTOHL (0x76616c75),
+              ACE_NTOHL (0x76616c75), 
               ACE_NTOHL (0x65000000),  // name = value
-              CORBA::tk_string,
+              CORBA::tk_string, 
               0U, // string length
 
             0U,
 
 
         18,
-        ACE_NTOHL (0x776f726b),
-        ACE_NTOHL (0x696e675f),
-        ACE_NTOHL (0x64697265),
-        ACE_NTOHL (0x63746f72),
+        ACE_NTOHL (0x776f726b), 
+        ACE_NTOHL (0x696e675f), 
+        ACE_NTOHL (0x64697265), 
+        ACE_NTOHL (0x63746f72), 
         ACE_NTOHL (0x79000000),  // name = working_directory
-        CORBA::tk_string,
+        CORBA::tk_string, 
         0U, // string length
         11,
-        ACE_NTOHL (0x61637469),
-        ACE_NTOHL (0x76617469),
+        ACE_NTOHL (0x61637469), 
+        ACE_NTOHL (0x76617469), 
         ACE_NTOHL (0x6f6e0000),  // name = activation
         CORBA::tk_enum, // typecode kind
         136, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           48,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x496d706c),
-          ACE_NTOHL (0x656d656e),
-          ACE_NTOHL (0x74617469),
-          ACE_NTOHL (0x6f6e5265),
-          ACE_NTOHL (0x706f7369),
-          ACE_NTOHL (0x746f7279),
-          ACE_NTOHL (0x2f416374),
-          ACE_NTOHL (0x69766174),
-          ACE_NTOHL (0x696f6e4d),
-          ACE_NTOHL (0x6f64653a),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x496d706c), 
+          ACE_NTOHL (0x656d656e), 
+          ACE_NTOHL (0x74617469), 
+          ACE_NTOHL (0x6f6e5265), 
+          ACE_NTOHL (0x706f7369), 
+          ACE_NTOHL (0x746f7279), 
+          ACE_NTOHL (0x2f416374), 
+          ACE_NTOHL (0x69766174), 
+          ACE_NTOHL (0x696f6e4d), 
+          ACE_NTOHL (0x6f64653a), 
           ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
           15,
-          ACE_NTOHL (0x41637469),
-          ACE_NTOHL (0x76617469),
-          ACE_NTOHL (0x6f6e4d6f),
+          ACE_NTOHL (0x41637469), 
+          ACE_NTOHL (0x76617469), 
+          ACE_NTOHL (0x6f6e4d6f), 
           ACE_NTOHL (0x64650000),  // name = ActivationMode
           4, // member count
           7,
-          ACE_NTOHL (0x4e4f524d),
+          ACE_NTOHL (0x4e4f524d), 
           ACE_NTOHL (0x414c0000),  // name = NORMAL
           7,
-          ACE_NTOHL (0x4d414e55),
+          ACE_NTOHL (0x4d414e55), 
           ACE_NTOHL (0x414c0000),  // name = MANUAL
           11,
-          ACE_NTOHL (0x5045525f),
-          ACE_NTOHL (0x434c4945),
+          ACE_NTOHL (0x5045525f), 
+          ACE_NTOHL (0x434c4945), 
           ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
           11,
-          ACE_NTOHL (0x4155544f),
-          ACE_NTOHL (0x5f535441),
+          ACE_NTOHL (0x4155544f), 
+          ACE_NTOHL (0x5f535441), 
           ACE_NTOHL (0x52540000),  // name = AUTO_START
 
 
       9,
-      ACE_NTOHL (0x6c6f6361),
-      ACE_NTOHL (0x74696f6e),
+      ACE_NTOHL (0x6c6f6361), 
+      ACE_NTOHL (0x74696f6e), 
       ACE_NTOHL (0x0),  // name = location
       CORBA::tk_alias, // typecode kind for typedefs
       72, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         41,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x496d706c),
-        ACE_NTOHL (0x656d656e),
-        ACE_NTOHL (0x74617469),
-        ACE_NTOHL (0x6f6e5265),
-        ACE_NTOHL (0x706f7369),
-        ACE_NTOHL (0x746f7279),
-        ACE_NTOHL (0x2f416464),
-        ACE_NTOHL (0x72657373),
-        ACE_NTOHL (0x3a312e30),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x496d706c), 
+        ACE_NTOHL (0x656d656e), 
+        ACE_NTOHL (0x74617469), 
+        ACE_NTOHL (0x6f6e5265), 
+        ACE_NTOHL (0x706f7369), 
+        ACE_NTOHL (0x746f7279), 
+        ACE_NTOHL (0x2f416464), 
+        ACE_NTOHL (0x72657373), 
+        ACE_NTOHL (0x3a312e30), 
         ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
         8,
-        ACE_NTOHL (0x41646472),
+        ACE_NTOHL (0x41646472), 
         ACE_NTOHL (0x65737300),  // name = Address
-        CORBA::tk_string,
+        CORBA::tk_string, 
         0U, // string length
 
 
@@ -1750,9 +2000,1183 @@ TAO_NAMESPACE_BEGIN (ImplementationRepository)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServerInformationList, &_tc_TAO_tc_ImplementationRepository_ServerInformationList)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class ImplementationRepository::Administration_var
+// *************************************************************
+
+ImplementationRepository::Administration_var::Administration_var (void) // default constructor
+  : ptr_ (Administration::_nil ())
+{}
+
+::ImplementationRepository::Administration_ptr
+ImplementationRepository::Administration_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+ImplementationRepository::Administration_var::Administration_var (const ::ImplementationRepository::Administration_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (Administration::_duplicate (p.ptr ()))
+{}
+
+ImplementationRepository::Administration_var::~Administration_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+ImplementationRepository::Administration_var &
+ImplementationRepository::Administration_var::operator= (Administration_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+ImplementationRepository::Administration_var &
+ImplementationRepository::Administration_var::operator= (const ::ImplementationRepository::Administration_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::ImplementationRepository::Administration::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+ImplementationRepository::Administration_var::operator const ::ImplementationRepository::Administration_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::ImplementationRepository::Administration_ptr
+ImplementationRepository::Administration_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::ImplementationRepository::Administration_ptr
+ImplementationRepository::Administration_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::ImplementationRepository::Administration_ptr &
+ImplementationRepository::Administration_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::ImplementationRepository::Administration_ptr &
+ImplementationRepository::Administration_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::ImplementationRepository::Administration::_nil ();
+  return this->ptr_;
+}
+
+::ImplementationRepository::Administration_ptr
+ImplementationRepository::Administration_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::ImplementationRepository::Administration_ptr val = this->ptr_;
+  this->ptr_ = ::ImplementationRepository::Administration::_nil ();
+  return val;
+}
+
+::ImplementationRepository::Administration_ptr
+ImplementationRepository::Administration_var::duplicate (Administration_ptr p)
+{
+  return ::ImplementationRepository::Administration::_duplicate (p);
+}
+
+void
+ImplementationRepository::Administration_var::release (Administration_ptr p)
+{
+  CORBA::release (p);
+}
+
+::ImplementationRepository::Administration_ptr
+ImplementationRepository::Administration_var::nil (void)
+{
+  return ::ImplementationRepository::Administration::_nil ();
+}
+
+::ImplementationRepository::Administration_ptr
+ImplementationRepository::Administration_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::ImplementationRepository::Administration::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+ImplementationRepository::Administration_var::upcast (void *src)
+{
+  Administration **tmp =
+    ACE_static_cast (Administration **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class ImplementationRepository::Administration_out
+// *************************************************************
+
+ImplementationRepository::Administration_out::Administration_out (Administration_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::ImplementationRepository::Administration::_nil ();
+}
+
+ImplementationRepository::Administration_out::Administration_out (Administration_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::ImplementationRepository::Administration::_nil ();
+}
+
+ImplementationRepository::Administration_out::Administration_out (const ::ImplementationRepository::Administration_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (Administration_out &, p).ptr_)
+{}
+
+::ImplementationRepository::Administration_out &
+ImplementationRepository::Administration_out::operator= (const ::ImplementationRepository::Administration_out &p)
+{
+  this->ptr_ = ACE_const_cast (Administration_out&, p).ptr_;
+  return *this;
+}
+
+ImplementationRepository::Administration_out &
+ImplementationRepository::Administration_out::operator= (const ::ImplementationRepository::Administration_var &p)
+{
+  this->ptr_ = ::ImplementationRepository::Administration::_duplicate (p.ptr ());
+  return *this;
+}
+
+ImplementationRepository::Administration_out &
+ImplementationRepository::Administration_out::operator= (Administration_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ImplementationRepository::Administration_out::operator ::ImplementationRepository::Administration_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::ImplementationRepository::Administration_ptr &
+ImplementationRepository::Administration_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::ImplementationRepository::Administration_ptr
+ImplementationRepository::Administration_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+#if (TAO_HAS_INTERCEPTORS == 1)
+class TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server : public TAO_ClientRequestInfo
+{
+public:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * server,
+      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));
+
+private:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &);
+  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &);
+
+  const char * server_;
+  
+};
+
+TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (
+    TAO_GIOP_Invocation *_tao_invocation,
+    CORBA::Object_ptr _tao_target,
+    const char * server,
+    CORBA::Environment &    
+  )
+  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+    server_ (server)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+    
+  CORBA::ULong length_server = parameter_list->length ();
+  parameter_list->length (length_server + 1);
+  (*parameter_list)[length_server].argument <<= server_;
+  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = 
+  {
+    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc},
+    {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc}
+  };
+  
+  exception_list->length (2);
+  for (CORBA::ULong i = 0; i < 2; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_activate_server_exceptiondata[i].tc;
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
+
+  return safe_exception_list._retn ();
+}
+
+
+CORBA::Any * 
+TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+class TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ClientRequestInfo
+{
+public:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * server,
+      const ImplementationRepository::StartupOptions & options,
+      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));
+
+private:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server &);
+  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server &);
+
+  const char * server_;
+  const ImplementationRepository::StartupOptions & options_;
+  
+};
+
+TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server (
+    TAO_GIOP_Invocation *_tao_invocation,
+    CORBA::Object_ptr _tao_target,
+    const char * server,
+    const ImplementationRepository::StartupOptions & options,
+    CORBA::Environment &    
+  )
+  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+    server_ (server),
+    options_ (options)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+    
+  CORBA::ULong length_server = parameter_list->length ();
+  parameter_list->length (length_server + 1);
+  (*parameter_list)[length_server].argument <<= server_;
+  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_options = parameter_list->length ();
+  parameter_list->length (length_options + 1);
+  (*parameter_list)[length_options].argument <<=  this->options_;
+  
+  (*parameter_list)[length_options].mode = Dynamic::PARAM_IN;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = 
+  {
+    {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc}
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_register_server_exceptiondata[i].tc;
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
+
+  return safe_exception_list._retn ();
+}
+
+
+CORBA::Any * 
+TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+class TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ClientRequestInfo
+{
+public:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * server,
+      const ImplementationRepository::StartupOptions & options,
+      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));
+
+private:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server &);
+  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server &);
+
+  const char * server_;
+  const ImplementationRepository::StartupOptions & options_;
+  
+};
+
+TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server (
+    TAO_GIOP_Invocation *_tao_invocation,
+    CORBA::Object_ptr _tao_target,
+    const char * server,
+    const ImplementationRepository::StartupOptions & options,
+    CORBA::Environment &    
+  )
+  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+    server_ (server),
+    options_ (options)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+    
+  CORBA::ULong length_server = parameter_list->length ();
+  parameter_list->length (length_server + 1);
+  (*parameter_list)[length_server].argument <<= server_;
+  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_options = parameter_list->length ();
+  parameter_list->length (length_options + 1);
+  (*parameter_list)[length_options].argument <<=  this->options_;
+  
+  (*parameter_list)[length_options].mode = Dynamic::PARAM_IN;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+
+CORBA::Any * 
+TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+class TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ClientRequestInfo
+{
+public:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * server,
+      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));
+
+private:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &);
+  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &);
+
+  const char * server_;
+  
+};
+
+TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (
+    TAO_GIOP_Invocation *_tao_invocation,
+    CORBA::Object_ptr _tao_target,
+    const char * server,
+    CORBA::Environment &    
+  )
+  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+    server_ (server)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+    
+  CORBA::ULong length_server = parameter_list->length ();
+  parameter_list->length (length_server + 1);
+  (*parameter_list)[length_server].argument <<= server_;
+  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = 
+  {
+    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_remove_server_exceptiondata[i].tc;
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
+
+  return safe_exception_list._retn ();
+}
+
+
+CORBA::Any * 
+TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+class TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ClientRequestInfo
+{
+public:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * server,
+      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));
+
+private:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &);
+  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &);
+
+  const char * server_;
+  
+};
+
+TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (
+    TAO_GIOP_Invocation *_tao_invocation,
+    CORBA::Object_ptr _tao_target,
+    const char * server,
+    CORBA::Environment &    
+  )
+  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+    server_ (server)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+    
+  CORBA::ULong length_server = parameter_list->length ();
+  parameter_list->length (length_server + 1);
+  (*parameter_list)[length_server].argument <<= server_;
+  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = 
+  {
+    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[i].tc;
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
+
+  return safe_exception_list._retn ();
+}
+
+
+CORBA::Any * 
+TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+class TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ClientRequestInfo
+{
+public:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      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));
+
+  void result (char * result);
+
+private:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running &);
+  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running &);
+
+  const char * server_;
+  const char * addr_;
+  ImplementationRepository::ServerObject_ptr server_object_;
+  char * _result;
+};
+
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running (
+    TAO_GIOP_Invocation *_tao_invocation,
+    CORBA::Object_ptr _tao_target,
+    const char * server,
+    const char * addr,
+    ImplementationRepository::ServerObject_ptr server_object,
+    CORBA::Environment &    
+  )
+  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+    server_ (server),
+    addr_ (addr),
+    server_object_ (server_object)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+    
+  CORBA::ULong length_server = parameter_list->length ();
+  parameter_list->length (length_server + 1);
+  (*parameter_list)[length_server].argument <<= server_;
+  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_addr = parameter_list->length ();
+  parameter_list->length (length_addr + 1);
+  (*parameter_list)[length_addr].argument <<= addr_;
+  (*parameter_list)[length_addr].mode = Dynamic::PARAM_IN;
+    
+  CORBA::ULong length_server_object = parameter_list->length ();
+  parameter_list->length (length_server_object + 1);
+  (*parameter_list)[length_server_object].argument <<=  this->server_object_;
+  
+  (*parameter_list)[length_server_object].mode = Dynamic::PARAM_IN;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = 
+  {
+    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[i].tc;
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
+
+  return safe_exception_list._retn ();
+}
+
+
+CORBA::Any * 
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  return safe_result_any._retn ();
+}
+
+void 
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result)
+{
+  // update the result 
+  this->_result = result;
+}
+
+class TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down : public TAO_ClientRequestInfo
+{
+public:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * server,
+      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));
+
+private:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
+  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
+
+  const char * server_;
+  
+};
+
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
+    TAO_GIOP_Invocation *_tao_invocation,
+    CORBA::Object_ptr _tao_target,
+    const char * server,
+    CORBA::Environment &    
+  )
+  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+    server_ (server)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+    
+  CORBA::ULong length_server = parameter_list->length ();
+  parameter_list->length (length_server + 1);
+  (*parameter_list)[length_server].argument <<= server_;
+  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = 
+  {
+    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[i].tc;
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
+
+  return safe_exception_list._retn ();
+}
+
+
+CORBA::Any * 
+TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+class TAO_ClientRequestInfo_ImplementationRepository_Administration_find : public TAO_ClientRequestInfo
+{
+public:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_find (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const char * server,
+      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));
+
+private:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_find (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &);
+  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &);
+
+  const char * server_;
+  
+};
+
+TAO_ClientRequestInfo_ImplementationRepository_Administration_find::TAO_ClientRequestInfo_ImplementationRepository_Administration_find (
+    TAO_GIOP_Invocation *_tao_invocation,
+    CORBA::Object_ptr _tao_target,
+    const char * server,
+    CORBA::Environment &    
+  )
+  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+    server_ (server)
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+    
+  CORBA::ULong length_server = parameter_list->length ();
+  parameter_list->length (length_server + 1);
+  (*parameter_list)[length_server].argument <<= server_;
+  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata[] = 
+  {
+    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_find_exceptiondata[i].tc;
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
+
+  return safe_exception_list._retn ();
+}
+
+
+CORBA::Any * 
+TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+class TAO_ClientRequestInfo_ImplementationRepository_Administration_list : public TAO_ClientRequestInfo
+{
+public:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_list (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const CORBA::ULong & how_many      
+,
+      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));
+
+private:
+  TAO_ClientRequestInfo_ImplementationRepository_Administration_list (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &);
+  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &);
+
+  const CORBA::ULong & how_many_;
+    
+
+};
+
+TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRequestInfo_ImplementationRepository_Administration_list (
+    TAO_GIOP_Invocation *_tao_invocation,
+    CORBA::Object_ptr _tao_target,
+    const CORBA::ULong & how_many    
+,
+    CORBA::Environment &    
+  )
+  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
+    how_many_ (how_many)
+
+{}
+
+Dynamic::ParameterList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+    
+  CORBA::ULong length_how_many = parameter_list->length ();
+  parameter_list->length (length_how_many + 1);
+  (*parameter_list)[length_how_many].argument <<= how_many_;
+  (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN;
+    
+
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ClientRequestInfo_ImplementationRepository_Administration_list::exceptions (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+
+CORBA::Any * 
+TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (CORBA::Environment &ACE_TRY_ENV)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+#endif /* TAO_HAS_INTERCEPTORS */
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation.
+//                Base & Remote Proxy  Implementation. 
 //
 
 ImplementationRepository::_TAO_Administration_Proxy_Impl::_TAO_Administration_Proxy_Impl (void)
@@ -1774,21 +3198,21 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
     ImplementationRepository::Administration::CannotActivate
   ))
 {
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = 
   {
     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc},
     {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "activate_server",
@@ -1801,32 +3225,32 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors ()
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       int _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-      ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server ri (
+      TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server ri (
         &_tao_call,
         _collocated_tao_target_,
         server,
         ACE_TRY_ENV
       );
       ACE_CHECK;
-
+      
       ACE_TRY
         {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+        
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
           TAO_INTERCEPTOR (ri.response_expected (1));
-
+          
           TAO_INTERCEPTOR (
             _tao_vfr.send_request (
               &ri,
@@ -1834,13 +3258,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
             )
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-
+          
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << server)
@@ -1848,20 +3272,20 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-
+            
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
               );
-
+              
             }
-
-
+          
+          
           TAO_INTERCEPTOR (
             ri.reply_status (_invoke_status);
             if (_invoke_status == TAO_INVOKE_OK)
@@ -1878,10 +3302,10 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
                   ACE_TRY_ENV
                 );
               }
-
+            
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
         }
       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -1889,8 +3313,8 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
           _invoke_status =
             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
-          ri.forward_reference (exc);
+          
+          ri.forward_reference (exc); 
           _tao_vfr.receive_other (
             &ri,
             ACE_TRY_ENV
@@ -1909,7 +3333,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
         }
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
 
       if (_invoke_status == TAO_INVOKE_RESTART)
@@ -1917,10 +3341,10 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
           _tao_call.restart_flag (1);
           continue;
         }
-
+      
       break;
     }
-
+  
 }
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_server (
@@ -1934,20 +3358,20 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
     ImplementationRepository::Administration::AlreadyRegistered
   ))
 {
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = 
   {
     {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "register_server",
@@ -1960,15 +3384,15 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors ()
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       int _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-      ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server ri (
+      TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server ri (
         &_tao_call,
         _collocated_tao_target_,
         server,
@@ -1976,17 +3400,17 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
         ACE_TRY_ENV
       );
       ACE_CHECK;
-
+      
       ACE_TRY
         {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+        
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
           TAO_INTERCEPTOR (ri.response_expected (1));
-
+          
           TAO_INTERCEPTOR (
             _tao_vfr.send_request (
               &ri,
@@ -1994,13 +3418,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
             )
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-
+          
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << server) &&
@@ -2009,20 +3433,20 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-
+            
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
               );
-
+              
             }
-
-
+          
+          
           TAO_INTERCEPTOR (
             ri.reply_status (_invoke_status);
             if (_invoke_status == TAO_INVOKE_OK)
@@ -2039,10 +3463,10 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
                   ACE_TRY_ENV
                 );
               }
-
+            
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
         }
       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -2050,8 +3474,8 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
           _invoke_status =
             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
-          ri.forward_reference (exc);
+          
+          ri.forward_reference (exc); 
           _tao_vfr.receive_other (
             &ri,
             ACE_TRY_ENV
@@ -2070,7 +3494,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
         }
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
 
       if (_invoke_status == TAO_INVOKE_RESTART)
@@ -2078,10 +3502,10 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
           _tao_call.restart_flag (1);
           continue;
         }
-
+      
       break;
     }
-
+  
 }
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister_server (
@@ -2094,15 +3518,15 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
     CORBA::SystemException
   ))
 {
+  
 
-
-
-
+  
+  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "reregister_server",
@@ -2115,15 +3539,15 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors ()
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       int _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-      ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server ri (
+      TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server ri (
         &_tao_call,
         _collocated_tao_target_,
         server,
@@ -2131,17 +3555,17 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
         ACE_TRY_ENV
       );
       ACE_CHECK;
-
+      
       ACE_TRY
         {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+        
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
           TAO_INTERCEPTOR (ri.response_expected (1));
-
+          
           TAO_INTERCEPTOR (
             _tao_vfr.send_request (
               &ri,
@@ -2149,13 +3573,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
             )
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-
+          
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << server) &&
@@ -2164,20 +3588,20 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-
+            
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
               );
-
+              
             }
-
-
+          
+          
           TAO_INTERCEPTOR (
             ri.reply_status (_invoke_status);
             if (_invoke_status == TAO_INVOKE_OK)
@@ -2194,10 +3618,10 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
                   ACE_TRY_ENV
                 );
               }
-
+            
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
         }
       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -2205,8 +3629,8 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
           _invoke_status =
             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
-          ri.forward_reference (exc);
+          
+          ri.forward_reference (exc); 
           _tao_vfr.receive_other (
             &ri,
             ACE_TRY_ENV
@@ -2225,7 +3649,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
         }
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
 
       if (_invoke_status == TAO_INVOKE_RESTART)
@@ -2233,10 +3657,10 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
           _tao_call.restart_flag (1);
           continue;
         }
-
+      
       break;
     }
-
+  
 }
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_server (
@@ -2249,20 +3673,20 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
     ImplementationRepository::Administration::NotFound
   ))
 {
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = 
   {
     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "remove_server",
@@ -2275,32 +3699,32 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors ()
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       int _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-      ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server ri (
+      TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server ri (
         &_tao_call,
         _collocated_tao_target_,
         server,
         ACE_TRY_ENV
       );
       ACE_CHECK;
-
+      
       ACE_TRY
         {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+        
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
           TAO_INTERCEPTOR (ri.response_expected (1));
-
+          
           TAO_INTERCEPTOR (
             _tao_vfr.send_request (
               &ri,
@@ -2308,13 +3732,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
             )
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-
+          
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << server)
@@ -2322,20 +3746,20 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-
+            
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
               );
-
+              
             }
-
-
+          
+          
           TAO_INTERCEPTOR (
             ri.reply_status (_invoke_status);
             if (_invoke_status == TAO_INVOKE_OK)
@@ -2352,10 +3776,10 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
                   ACE_TRY_ENV
                 );
               }
-
+            
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
         }
       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -2363,8 +3787,8 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
           _invoke_status =
             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
-          ri.forward_reference (exc);
+          
+          ri.forward_reference (exc); 
           _tao_vfr.receive_other (
             &ri,
             ACE_TRY_ENV
@@ -2383,7 +3807,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
         }
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
 
       if (_invoke_status == TAO_INVOKE_RESTART)
@@ -2391,10 +3815,10 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
           _tao_call.restart_flag (1);
           continue;
         }
-
+      
       break;
     }
-
+  
 }
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_server (
@@ -2407,20 +3831,20 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
     ImplementationRepository::Administration::NotFound
   ))
 {
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = 
   {
     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "shutdown_server",
@@ -2433,32 +3857,32 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors ()
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       int _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-      ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server ri (
+      TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server ri (
         &_tao_call,
         _collocated_tao_target_,
         server,
         ACE_TRY_ENV
       );
       ACE_CHECK;
-
+      
       ACE_TRY
         {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+        
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
           TAO_INTERCEPTOR (ri.response_expected (1));
-
+          
           TAO_INTERCEPTOR (
             _tao_vfr.send_request (
               &ri,
@@ -2466,13 +3890,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
             )
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-
+          
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << server)
@@ -2480,20 +3904,20 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-
+            
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
               );
-
+              
             }
-
-
+          
+          
           TAO_INTERCEPTOR (
             ri.reply_status (_invoke_status);
             if (_invoke_status == TAO_INVOKE_OK)
@@ -2510,10 +3934,10 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
                   ACE_TRY_ENV
                 );
               }
-
+            
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
         }
       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -2521,8 +3945,8 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
           _invoke_status =
             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
-          ri.forward_reference (exc);
+          
+          ri.forward_reference (exc); 
           _tao_vfr.receive_other (
             &ri,
             ACE_TRY_ENV
@@ -2541,7 +3965,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
         }
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
 
       if (_invoke_status == TAO_INVOKE_RESTART)
@@ -2549,10 +3973,10 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
           _tao_call.restart_flag (1);
           continue;
         }
-
+      
       break;
     }
-
+  
 }
 
 char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_running (
@@ -2567,20 +3991,20 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
     ImplementationRepository::Administration::NotFound
   ))
 {
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = 
   {
     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
   };
 
   CORBA::String_var _tao_safe_retval;
-
-
+  
+  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "server_is_running",
@@ -2593,15 +4017,15 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors ()
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       int _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-      ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running ri (
+      TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running ri (
         &_tao_call,
         _collocated_tao_target_,
         server,
@@ -2610,17 +4034,17 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN (0);
-
+      
       ACE_TRY
         {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+        
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-
+          
           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
           TAO_INTERCEPTOR (ri.response_expected (1));
-
+          
           TAO_INTERCEPTOR (
             _tao_vfr.send_request (
               &ri,
@@ -2628,13 +4052,13 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
             )
           );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-
+          
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-
+          
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << server) &&
@@ -2645,20 +4069,20 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
               CORBA::MARSHAL (),
               0
             );
-
+            
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-
+          
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-
+              
             }
-
+          
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> _tao_safe_retval.inout ())
@@ -2668,15 +4092,15 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 0
               );
-
+              
             }
-
+          
           TAO_INTERCEPTOR (
               char * _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
-
+          
           TAO_INTERCEPTOR (
             ri.reply_status (_invoke_status);
             if (_invoke_status == TAO_INVOKE_OK)
@@ -2693,10 +4117,10 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
                   ACE_TRY_ENV
                 );
               }
-
+            
           );
           TAO_INTERCEPTOR_CHECK_RETURN (0);
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
         }
       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -2704,8 +4128,8 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
           _invoke_status =
             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
-          ri.forward_reference (exc);
+          
+          ri.forward_reference (exc); 
           _tao_vfr.receive_other (
             &ri,
             ACE_TRY_ENV
@@ -2724,7 +4148,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
         }
       ACE_ENDTRY;
       ACE_CHECK_RETURN (0);
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
 
       if (_invoke_status == TAO_INVOKE_RESTART)
@@ -2732,7 +4156,7 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
           _tao_call.restart_flag (1);
           continue;
         }
-
+      
       break;
     }
   return _tao_safe_retval._retn ();
@@ -2748,20 +4172,20 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
     ImplementationRepository::Administration::NotFound
   ))
 {
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = 
   {
     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "server_is_shutting_down",
@@ -2774,32 +4198,32 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors ()
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       int _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-      ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ri (
+      TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ri (
         &_tao_call,
         _collocated_tao_target_,
         server,
         ACE_TRY_ENV
       );
       ACE_CHECK;
-
+      
       ACE_TRY
         {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+        
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
           TAO_INTERCEPTOR (ri.response_expected (1));
-
+          
           TAO_INTERCEPTOR (
             _tao_vfr.send_request (
               &ri,
@@ -2807,13 +4231,13 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
             )
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-
+          
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
                             (_tao_out << server)
@@ -2821,20 +4245,20 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-
+            
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
               );
-
+              
             }
-
-
+          
+          
           TAO_INTERCEPTOR (
             ri.reply_status (_invoke_status);
             if (_invoke_status == TAO_INVOKE_OK)
@@ -2851,10 +4275,10 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
                   ACE_TRY_ENV
                 );
               }
-
+            
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
         }
       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -2862,8 +4286,8 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
           _invoke_status =
             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
-          ri.forward_reference (exc);
+          
+          ri.forward_reference (exc); 
           _tao_vfr.receive_other (
             &ri,
             ACE_TRY_ENV
@@ -2882,7 +4306,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
         }
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
 
       if (_invoke_status == TAO_INVOKE_RESTART)
@@ -2890,10 +4314,10 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
           _tao_call.restart_flag (1);
           continue;
         }
-
+      
       break;
     }
-
+  
 }
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
@@ -2907,20 +4331,20 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
     ImplementationRepository::Administration::NotFound
   ))
 {
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] =
+  
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] = 
   {
     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
   };
 
 
-
-
+  
+  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   ACE_NEW (info.ptr (), ImplementationRepository::ServerInformation);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
@@ -2934,32 +4358,32 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors ()
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       int _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-      ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_find ri (
+      TAO_ClientRequestInfo_ImplementationRepository_Administration_find ri (
         &_tao_call,
         _collocated_tao_target_,
         server,
         ACE_TRY_ENV
       );
       ACE_CHECK;
-
+      
       ACE_TRY
         {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+        
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
           TAO_INTERCEPTOR (ri.response_expected (1));
-
+          
           TAO_INTERCEPTOR (
             _tao_vfr.send_request (
               &ri,
@@ -2967,33 +4391,33 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
             )
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-
+          
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
-                            (_tao_out << server)
+                            (_tao_out << server)              
             ))
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-
+            
           _invoke_status =
             _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
               );
-
+              
             }
-
+          
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                                           (_tao_in >> *info.ptr ())
@@ -3002,9 +4426,9 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
               TAO_INTERCEPTOR_THROW (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
               );
-
+              
             }
-
+          
           TAO_INTERCEPTOR (
             ri.reply_status (_invoke_status);
             if (_invoke_status == TAO_INVOKE_OK)
@@ -3021,10 +4445,10 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
                   ACE_TRY_ENV
                 );
               }
-
+            
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
         }
       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -3032,8 +4456,8 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
           _invoke_status =
             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
-          ri.forward_reference (exc);
+          
+          ri.forward_reference (exc); 
           _tao_vfr.receive_other (
             &ri,
             ACE_TRY_ENV
@@ -3052,7 +4476,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
         }
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
 
       if (_invoke_status == TAO_INVOKE_RESTART)
@@ -3060,10 +4484,10 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
           _tao_call.restart_flag (1);
           continue;
         }
-
+      
       break;
     }
-
+  
 }
 
 void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
@@ -3077,15 +4501,15 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
     CORBA::SystemException
   ))
 {
+  
 
-
-
-
+  
+  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   ACE_NEW (server_list.ptr (), ImplementationRepository::ServerInformationList);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
@@ -3099,33 +4523,33 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors ()
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       int _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-      ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_list ri (
+      TAO_ClientRequestInfo_ImplementationRepository_Administration_list ri (
         &_tao_call,
         _collocated_tao_target_,
-        how_many
+        how_many        
 ,
         ACE_TRY_ENV
       );
       ACE_CHECK;
-
+      
       ACE_TRY
         {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+        
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
           TAO_INTERCEPTOR (ri.response_expected (1));
-
+          
           TAO_INTERCEPTOR (
             _tao_vfr.send_request (
               &ri,
@@ -3133,33 +4557,33 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
             )
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK;
-
+          
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
-                            (_tao_out << how_many)
+                            (_tao_out << how_many)                            
             ))
             TAO_INTERCEPTOR_THROW (
               CORBA::MARSHAL ()
             );
-
+            
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
               );
-
+              
             }
-
+          
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                                           (_tao_in >> *server_list.ptr ()) &&
@@ -3169,9 +4593,9 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
               TAO_INTERCEPTOR_THROW (
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
               );
-
+              
             }
-
+          
           TAO_INTERCEPTOR (
             ri.reply_status (_invoke_status);
             if (_invoke_status == TAO_INVOKE_OK)
@@ -3188,10 +4612,10 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
                   ACE_TRY_ENV
                 );
               }
-
+            
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
         }
       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -3199,8 +4623,8 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
           _invoke_status =
             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
-          ri.forward_reference (exc);
+          
+          ri.forward_reference (exc); 
           _tao_vfr.receive_other (
             &ri,
             ACE_TRY_ENV
@@ -3219,7 +4643,7 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
         }
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
 
       if (_invoke_status == TAO_INVOKE_RESTART)
@@ -3227,15 +4651,15 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
           _tao_call.restart_flag (1);
           continue;
         }
-
+      
       break;
     }
-
+  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3356,14 +4780,14 @@ ImplementationRepository::Administration_ptr ImplementationRepository::Administr
             stub,
             1,
             obj->_servant ()),
-
+            
           Administration::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::ImplementationRepository::Administration (stub, 0, obj->_servant ()), Administration::_nil ());
         return default_proxy;
       }
-    else
+    else 
       return
         ACE_reinterpret_cast
           (
@@ -3407,7 +4831,7 @@ void *ImplementationRepository::Administration::_tao_QueryInterface (ptr_arith_t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -3477,7 +4901,7 @@ void ImplementationRepository::Administration::AlreadyRegistered::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -3490,7 +4914,7 @@ void ImplementationRepository::Administration::AlreadyRegistered::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -3506,28 +4930,28 @@ static const CORBA::Long _oc_ImplementationRepository_Administration_AlreadyRegi
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   66,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f41646d),
-  ACE_NTOHL (0x696e6973),
-  ACE_NTOHL (0x74726174),
-  ACE_NTOHL (0x696f6e2f),
-  ACE_NTOHL (0x416c7265),
-  ACE_NTOHL (0x61647952),
-  ACE_NTOHL (0x65676973),
-  ACE_NTOHL (0x74657265),
-  ACE_NTOHL (0x643a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f41646d), 
+  ACE_NTOHL (0x696e6973), 
+  ACE_NTOHL (0x74726174), 
+  ACE_NTOHL (0x696f6e2f), 
+  ACE_NTOHL (0x416c7265), 
+  ACE_NTOHL (0x61647952), 
+  ACE_NTOHL (0x65676973), 
+  ACE_NTOHL (0x74657265), 
+  ACE_NTOHL (0x643a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0
   18,
-  ACE_NTOHL (0x416c7265),
-  ACE_NTOHL (0x61647952),
-  ACE_NTOHL (0x65676973),
-  ACE_NTOHL (0x74657265),
+  ACE_NTOHL (0x416c7265), 
+  ACE_NTOHL (0x61647952), 
+  ACE_NTOHL (0x65676973), 
+  ACE_NTOHL (0x74657265), 
   ACE_NTOHL (0x64000000),  // name = AlreadyRegistered
   0, // member count
 };
@@ -3611,7 +5035,7 @@ void ImplementationRepository::Administration::CannotActivate::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -3624,7 +5048,7 @@ void ImplementationRepository::Administration::CannotActivate::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -3648,32 +5072,32 @@ static const CORBA::Long _oc_ImplementationRepository_Administration_CannotActiv
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   63,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f41646d),
-  ACE_NTOHL (0x696e6973),
-  ACE_NTOHL (0x74726174),
-  ACE_NTOHL (0x696f6e2f),
-  ACE_NTOHL (0x43616e6e),
-  ACE_NTOHL (0x6f744163),
-  ACE_NTOHL (0x74697661),
-  ACE_NTOHL (0x74653a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f41646d), 
+  ACE_NTOHL (0x696e6973), 
+  ACE_NTOHL (0x74726174), 
+  ACE_NTOHL (0x696f6e2f), 
+  ACE_NTOHL (0x43616e6e), 
+  ACE_NTOHL (0x6f744163), 
+  ACE_NTOHL (0x74697661), 
+  ACE_NTOHL (0x74653a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/Administration/CannotActivate:1.0
   15,
-  ACE_NTOHL (0x43616e6e),
-  ACE_NTOHL (0x6f744163),
-  ACE_NTOHL (0x74697661),
+  ACE_NTOHL (0x43616e6e), 
+  ACE_NTOHL (0x6f744163), 
+  ACE_NTOHL (0x74697661), 
   ACE_NTOHL (0x74650000),  // name = CannotActivate
   1, // member count
   7,
-  ACE_NTOHL (0x72656173),
+  ACE_NTOHL (0x72656173), 
   ACE_NTOHL (0x6f6e0000),  // name = reason
-  CORBA::tk_string,
+  CORBA::tk_string, 
   0U, // string length
 };
 
@@ -3754,7 +5178,7 @@ void ImplementationRepository::Administration::NotFound::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -3767,7 +5191,7 @@ void ImplementationRepository::Administration::NotFound::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -3783,24 +5207,24 @@ static const CORBA::Long _oc_ImplementationRepository_Administration_NotFound[]
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   57,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f41646d),
-  ACE_NTOHL (0x696e6973),
-  ACE_NTOHL (0x74726174),
-  ACE_NTOHL (0x696f6e2f),
-  ACE_NTOHL (0x4e6f7446),
-  ACE_NTOHL (0x6f756e64),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f41646d), 
+  ACE_NTOHL (0x696e6973), 
+  ACE_NTOHL (0x74726174), 
+  ACE_NTOHL (0x696f6e2f), 
+  ACE_NTOHL (0x4e6f7446), 
+  ACE_NTOHL (0x6f756e64), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Administration/NotFound:1.0
   9,
-  ACE_NTOHL (0x4e6f7446),
-  ACE_NTOHL (0x6f756e64),
+  ACE_NTOHL (0x4e6f7446), 
+  ACE_NTOHL (0x6f756e64), 
   ACE_NTOHL (0x0),  // name = NotFound
   0, // member count
 };
@@ -3833,10 +5257,10 @@ void ImplementationRepository::Administration::activate_server (
     ImplementationRepository::Administration::CannotActivate
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-
+  
   proxy.activate_server (
       this,
       server,
@@ -3854,10 +5278,10 @@ void ImplementationRepository::Administration::register_server (
     ImplementationRepository::Administration::AlreadyRegistered
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-
+  
   proxy.register_server (
       this,
       server,
@@ -3875,10 +5299,10 @@ void ImplementationRepository::Administration::reregister_server (
     CORBA::SystemException
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-
+  
   proxy.reregister_server (
       this,
       server,
@@ -3896,10 +5320,10 @@ void ImplementationRepository::Administration::remove_server (
     ImplementationRepository::Administration::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-
+  
   proxy.remove_server (
       this,
       server,
@@ -3916,10 +5340,10 @@ void ImplementationRepository::Administration::shutdown_server (
     ImplementationRepository::Administration::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-
+  
   proxy.shutdown_server (
       this,
       server,
@@ -3938,10 +5362,10 @@ char * ImplementationRepository::Administration::server_is_running (
     ImplementationRepository::Administration::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.server_is_running (
       this,
       server,
@@ -3960,10 +5384,10 @@ void ImplementationRepository::Administration::server_is_shutting_down (
     ImplementationRepository::Administration::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-
+  
   proxy.server_is_shutting_down (
       this,
       server,
@@ -3981,10 +5405,10 @@ void ImplementationRepository::Administration::find (
     ImplementationRepository::Administration::NotFound
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-
+  
   proxy.find (
       this,
       server,
@@ -4003,10 +5427,10 @@ void ImplementationRepository::Administration::list (
     CORBA::SystemException
   ))
 {
-  _TAO_Administration_Proxy_Impl &proxy =
+  _TAO_Administration_Proxy_Impl &proxy = 
     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-
+  
   proxy.list (
       this,
       how_many,
@@ -4016,642 +5440,399 @@ void ImplementationRepository::Administration::list (
     );
 }
 
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    CORBA::Environment &
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    server_ (server)
-{}
-
-Dynamic::ParameterList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+static const CORBA::Long _oc_ImplementationRepository_Administration[] =
 {
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f41646d), 
+  ACE_NTOHL (0x696e6973), 
+  ACE_NTOHL (0x74726174), 
+  ACE_NTOHL (0x696f6e3a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/Administration:1.0
+  15,
+  ACE_NTOHL (0x41646d69), 
+  ACE_NTOHL (0x6e697374), 
+  ACE_NTOHL (0x72617469), 
+  ACE_NTOHL (0x6f6e0000),  // name = Administration
+};
 
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] =
-  {
-    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc},
-    {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc}
-  };
+static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration (
+    CORBA::tk_objref,
+    sizeof (_oc_ImplementationRepository_Administration),
+    (char *) &_oc_ImplementationRepository_Administration,
+    0,
+    sizeof (ImplementationRepository::Administration)
+  );
 
-  exception_list->length (2);
-  for (CORBA::ULong i = 0; i < 2; ++i)
-    {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_activate_server_exceptiondata[i].tc;
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (ImplementationRepository)
+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Administration, &_tc_TAO_tc_ImplementationRepository_Administration)
+TAO_NAMESPACE_END
 
-  return safe_exception_list._retn ();
-}
+// *************************************************************
+// Operations for class ImplementationRepository::ServerInformationIterator_var
+// *************************************************************
 
+ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (void) // default constructor
+  : ptr_ (ServerInformationIterator::_nil ())
+{}
 
-CORBA::Any *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+::ImplementationRepository::ServerInformationIterator_ptr
+ImplementationRepository::ServerInformationIterator_var::ptr (void) const
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return result_any;
+  return this->ptr_;
 }
 
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    server_ (server),
-    options_ (options)
+ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (const ::ImplementationRepository::ServerInformationIterator_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ServerInformationIterator::_duplicate (p.ptr ()))
 {}
 
-Dynamic::ParameterList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+ImplementationRepository::ServerInformationIterator_var::~ServerInformationIterator_var (void) // destructor
 {
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-
-  CORBA::ULong length_options = parameter_list->length ();
-  parameter_list->length (length_options + 1);
-  (*parameter_list)[length_options].argument <<=  this->options_;
-
-  (*parameter_list)[length_options].mode = Dynamic::PARAM_IN;
-
-  return safe_parameter_list._retn ();
+  CORBA::release (this->ptr_);
 }
 
-Dynamic::ExceptionList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+ImplementationRepository::ServerInformationIterator_var &
+ImplementationRepository::ServerInformationIterator_var::operator= (ServerInformationIterator_ptr p)
 {
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
 
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata[] =
+ImplementationRepository::ServerInformationIterator_var &
+ImplementationRepository::ServerInformationIterator_var::operator= (const ::ImplementationRepository::ServerInformationIterator_var &p)
+{
+  if (this != &p)
   {
-    {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc}
-  };
-
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
-    {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_register_server_exceptiondata[i].tc;
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_duplicate (p.ptr ());
+  }
+  return *this;
 }
 
-
-CORBA::Any *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+ImplementationRepository::ServerInformationIterator_var::operator const ::ImplementationRepository::ServerInformationIterator_ptr &() const // cast
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return result_any;
+  return this->ptr_;
 }
 
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    CORBA::Environment &
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    server_ (server),
-    options_ (options)
-{}
-
-Dynamic::ParameterList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+ImplementationRepository::ServerInformationIterator_var::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast 
 {
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-
-  CORBA::ULong length_options = parameter_list->length ();
-  parameter_list->length (length_options + 1);
-  (*parameter_list)[length_options].argument <<=  this->options_;
-
-  (*parameter_list)[length_options].mode = Dynamic::PARAM_IN;
-
-  return safe_parameter_list._retn ();
+  return this->ptr_;
 }
 
-Dynamic::ExceptionList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+::ImplementationRepository::ServerInformationIterator_ptr
+ImplementationRepository::ServerInformationIterator_var::operator-> (void) const
 {
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return exception_list;
+  return this->ptr_;
 }
 
-
-CORBA::Any *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+::ImplementationRepository::ServerInformationIterator_ptr
+ImplementationRepository::ServerInformationIterator_var::in (void) const
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return result_any;
+  return this->ptr_;
 }
 
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    CORBA::Environment &
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    server_ (server)
-{}
-
-Dynamic::ParameterList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+::ImplementationRepository::ServerInformationIterator_ptr &
+ImplementationRepository::ServerInformationIterator_var::inout (void)
 {
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-
-  return safe_parameter_list._retn ();
+  return this->ptr_;
 }
 
-Dynamic::ExceptionList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+::ImplementationRepository::ServerInformationIterator_ptr &
+ImplementationRepository::ServerInformationIterator_var::out (void)
 {
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] =
-  {
-    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-  };
-
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
-    {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_remove_server_exceptiondata[i].tc;
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_nil ();
+  return this->ptr_;
 }
 
-
-CORBA::Any *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+::ImplementationRepository::ServerInformationIterator_ptr
+ImplementationRepository::ServerInformationIterator_var::_retn (void)
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return result_any;
+  // yield ownership of managed obj reference
+  ::ImplementationRepository::ServerInformationIterator_ptr val = this->ptr_;
+  this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_nil ();
+  return val;
 }
 
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    CORBA::Environment &
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    server_ (server)
-{}
-
-Dynamic::ParameterList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+::ImplementationRepository::ServerInformationIterator_ptr
+ImplementationRepository::ServerInformationIterator_var::duplicate (ServerInformationIterator_ptr p)
 {
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-
-  return safe_parameter_list._retn ();
+  return ::ImplementationRepository::ServerInformationIterator::_duplicate (p);
 }
 
-Dynamic::ExceptionList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+void
+ImplementationRepository::ServerInformationIterator_var::release (ServerInformationIterator_ptr p)
 {
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] =
-  {
-    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-  };
-
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
-    {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[i].tc;
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
+  CORBA::release (p);
 }
 
-
-CORBA::Any *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+::ImplementationRepository::ServerInformationIterator_ptr
+ImplementationRepository::ServerInformationIterator_var::nil (void)
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return result_any;
+  return ::ImplementationRepository::ServerInformationIterator::_nil ();
 }
 
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    const char * addr,
-    ImplementationRepository::ServerObject_ptr server_object,
-    CORBA::Environment &
+::ImplementationRepository::ServerInformationIterator_ptr
+ImplementationRepository::ServerInformationIterator_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
   )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    server_ (server),
-    addr_ (addr),
-    server_object_ (server_object)
-{}
-
-Dynamic::ParameterList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-
-  CORBA::ULong length_addr = parameter_list->length ();
-  parameter_list->length (length_addr + 1);
-  (*parameter_list)[length_addr].argument <<= addr_;
-  (*parameter_list)[length_addr].mode = Dynamic::PARAM_IN;
-
-  CORBA::ULong length_server_object = parameter_list->length ();
-  parameter_list->length (length_server_object + 1);
-  (*parameter_list)[length_server_object].argument <<=  this->server_object_;
-
-  (*parameter_list)[length_server_object].mode = Dynamic::PARAM_IN;
-
-  return safe_parameter_list._retn ();
+  return ::ImplementationRepository::ServerInformationIterator::_narrow (p, ACE_TRY_ENV);
 }
 
-Dynamic::ExceptionList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+CORBA::Object *
+ImplementationRepository::ServerInformationIterator_var::upcast (void *src)
 {
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] =
-  {
-    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-  };
-
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
-    {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[i].tc;
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
+  ServerInformationIterator **tmp =
+    ACE_static_cast (ServerInformationIterator **, src);
+  return *tmp;
 }
+// *************************************************************
+// Inline operations for class ImplementationRepository::ServerInformationIterator_out
+// *************************************************************
 
-
-CORBA::Any *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (ServerInformationIterator_ptr &p)
+  : ptr_ (p)
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Any_var safe_result_any = result_any;
-
-  (*result_any) <<= this->_result;
-  return safe_result_any._retn ();
+  this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_nil ();
 }
 
-void
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result)
+ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (ServerInformationIterator_var &p) // constructor from _var
+  : ptr_ (p.out ())
 {
-  // update the result
-  this->_result = result;
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_nil ();
 }
 
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    CORBA::Environment &
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    server_ (server)
+ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (const ::ImplementationRepository::ServerInformationIterator_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ServerInformationIterator_out &, p).ptr_)
 {}
 
-Dynamic::ParameterList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+::ImplementationRepository::ServerInformationIterator_out &
+ImplementationRepository::ServerInformationIterator_out::operator= (const ::ImplementationRepository::ServerInformationIterator_out &p)
 {
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-
-  return safe_parameter_list._retn ();
+  this->ptr_ = ACE_const_cast (ServerInformationIterator_out&, p).ptr_;
+  return *this;
 }
 
-Dynamic::ExceptionList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+ImplementationRepository::ServerInformationIterator_out &
+ImplementationRepository::ServerInformationIterator_out::operator= (const ::ImplementationRepository::ServerInformationIterator_var &p)
 {
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  this->ptr_ = ::ImplementationRepository::ServerInformationIterator::_duplicate (p.ptr ());
+  return *this;
+}
 
-  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+ImplementationRepository::ServerInformationIterator_out &
+ImplementationRepository::ServerInformationIterator_out::operator= (ServerInformationIterator_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
 
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] =
-  {
-    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-  };
+ImplementationRepository::ServerInformationIterator_out::operator ::ImplementationRepository::ServerInformationIterator_ptr &() // cast
+{
+  return this->ptr_;
+}
 
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
-    {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[i].tc;
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
+::ImplementationRepository::ServerInformationIterator_ptr &
+ImplementationRepository::ServerInformationIterator_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
 
-  return safe_exception_list._retn ();
+::ImplementationRepository::ServerInformationIterator_ptr
+ImplementationRepository::ServerInformationIterator_out::operator-> (void)
+{
+  return this->ptr_;
 }
 
 
-CORBA::Any *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+#if (TAO_HAS_INTERCEPTORS == 1)
+class TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n : public TAO_ClientRequestInfo
+{
+public:
+  TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      const CORBA::ULong & how_many,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
 
-  return result_any;
-}
+  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));
+
+  void result (CORBA::Boolean result);
+
+private:
+  TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
+  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
+
+  const CORBA::ULong & how_many_;
+  CORBA::Boolean _result;
+};
 
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_find::TAO_ClientRequestInfo_ImplementationRepository_Administration_find (
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const char * server,
-    CORBA::Environment &
+    const CORBA::ULong & how_many,
+    CORBA::Environment &    
   )
   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    server_ (server)
+    how_many_ (how_many)
 {}
 
 Dynamic::ParameterList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_server = parameter_list->length ();
-  parameter_list->length (length_server + 1);
-  (*parameter_list)[length_server].argument <<= server_;
-  (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
-
+    
+  CORBA::ULong length_how_many = parameter_list->length ();
+  parameter_list->length (length_how_many + 1);
+  (*parameter_list)[length_how_many].argument <<= how_many_;
+  (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN;
+  
   return safe_parameter_list._retn ();
 }
 
 Dynamic::ExceptionList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
-  Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata[] =
-  {
-    {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-  };
-
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
-    {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_find_exceptiondata[i].tc;
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode,CORBA::TypeCode_var> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
+  
+  return exception_list;
 }
 
 
-CORBA::Any *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any * 
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
+  CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
+  return safe_result_any._retn ();
+}
 
-  return result_any;
+void 
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result)
+{
+  // update the result 
+  this->_result = result;
 }
 
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRequestInfo_ImplementationRepository_Administration_list (
+class TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy : public TAO_ClientRequestInfo
+{
+public:
+  TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
+      TAO_GIOP_Invocation *_tao_invocation,
+      CORBA::Object_ptr _tao_target,
+      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));
+
+private:
+  TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
+  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
+
+  
+};
+
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
     TAO_GIOP_Invocation *_tao_invocation,
     CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & how_many
-,
-    CORBA::Environment &
+    CORBA::Environment &    
   )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    how_many_ (how_many)
-
+  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
 {}
 
 Dynamic::ParameterList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_how_many = parameter_list->length ();
-  parameter_list->length (length_how_many + 1);
-  (*parameter_list)[length_how_many].argument <<= how_many_;
-  (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN;
-
-
-  return safe_parameter_list._retn ();
+  
+  return parameter_list;
 }
 
 Dynamic::ExceptionList *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_list::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
 
-CORBA::Any *
-ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Any * 
+TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
@@ -4659,50 +5840,14 @@ ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRe
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
-static const CORBA::Long _oc_ImplementationRepository_Administration[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f41646d),
-  ACE_NTOHL (0x696e6973),
-  ACE_NTOHL (0x74726174),
-  ACE_NTOHL (0x696f6e3a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/Administration:1.0
-  15,
-  ACE_NTOHL (0x41646d69),
-  ACE_NTOHL (0x6e697374),
-  ACE_NTOHL (0x72617469),
-  ACE_NTOHL (0x6f6e0000),  // name = Administration
-};
-
-static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration (
-    CORBA::tk_objref,
-    sizeof (_oc_ImplementationRepository_Administration),
-    (char *) &_oc_ImplementationRepository_Administration,
-    0,
-    sizeof (ImplementationRepository::Administration)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Administration, &_tc_TAO_tc_ImplementationRepository_Administration)
-TAO_NAMESPACE_END
-
 
 ///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation.
+//                Base & Remote Proxy  Implementation. 
 //
 
 ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl::_TAO_ServerInformationIterator_Proxy_Impl (void)
@@ -4723,15 +5868,15 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
     CORBA::SystemException
   ))
 {
-
+  
   CORBA::Boolean _tao_retval = 0;
-
-
+  
+  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-
+  
   ACE_NEW_RETURN (server_list.ptr (), ImplementationRepository::ServerInformationList, 0);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
@@ -4745,32 +5890,32 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors ()
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       int _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-      ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ri (
+      TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ri (
         &_tao_call,
         _collocated_tao_target_,
         how_many,
         ACE_TRY_ENV
       );
       ACE_CHECK_RETURN  (_tao_retval);
-
+      
       ACE_TRY
         {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+        
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-
+          
           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
           TAO_INTERCEPTOR (ri.response_expected (1));
-
+          
           TAO_INTERCEPTOR (
             _tao_vfr.send_request (
               &ri,
@@ -4778,35 +5923,35 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
             )
           );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-
+          
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
             );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-
+          
           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
           if (!(
-                            (_tao_out << how_many)
+                            (_tao_out << how_many)              
             ))
             TAO_INTERCEPTOR_THROW_RETURN (
               CORBA::MARSHAL (),
               _tao_retval
             );
-
+            
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-
+          
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW_RETURN (
                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-
+              
             }
-
+          
           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
           if (!(
                             (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) &&
@@ -4817,14 +5962,14 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
                 _tao_retval
               );
-
+              
             }
-
+          
           TAO_INTERCEPTOR (
               CORBA::Boolean  _tao_retval_info = _tao_retval;
                ri.result (_tao_retval_info);
             );
-
+          
           TAO_INTERCEPTOR (
             ri.reply_status (_invoke_status);
             if (_invoke_status == TAO_INVOKE_OK)
@@ -4841,10 +5986,10 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
                   ACE_TRY_ENV
                 );
               }
-
+            
           );
           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
         }
       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -4852,8 +5997,8 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
           _invoke_status =
             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
-          ri.forward_reference (exc);
+          
+          ri.forward_reference (exc); 
           _tao_vfr.receive_other (
             &ri,
             ACE_TRY_ENV
@@ -4872,7 +6017,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
         }
       ACE_ENDTRY;
       ACE_CHECK_RETURN  (_tao_retval);
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
 
       if (_invoke_status == TAO_INVOKE_RESTART)
@@ -4880,7 +6025,7 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
           _tao_call.restart_flag (1);
           continue;
         }
-
+      
       break;
     }
   return _tao_retval;
@@ -4894,15 +6039,15 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
     CORBA::SystemException
   ))
 {
+  
 
-
-
-
+  
+  
   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-
+  
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "destroy",
@@ -4915,31 +6060,31 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
       istub->orb_core ()->client_request_interceptors ()
     );
-
+  
 #endif  /* TAO_HAS_INTERCEPTORS */
-
+  
   for (;;)
     {
       int _invoke_status = TAO_INVOKE_EXCEPTION;
-
+      
 #if TAO_HAS_INTERCEPTORS == 1
-      ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri (
+      TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri (
         &_tao_call,
         _collocated_tao_target_,
         ACE_TRY_ENV
       );
       ACE_CHECK;
-
+      
       ACE_TRY
         {
 #endif /* TAO_HAS_INTERCEPTORS */
-
+        
           _tao_call.start (ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
           TAO_INTERCEPTOR (ri.response_expected (1));
-
+          
           TAO_INTERCEPTOR (
             _tao_vfr.send_request (
               &ri,
@@ -4947,7 +6092,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
             )
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
           _tao_call.prepare_header (
               ACE_static_cast (CORBA::Octet, _tao_response_flag),
               ACE_TRY_ENV
@@ -4956,16 +6101,16 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
           _invoke_status =
             _tao_call.invoke (0, 0, ACE_TRY_ENV);
           TAO_INTERCEPTOR_CHECK;
-
+          
           if (_invoke_status == TAO_INVOKE_EXCEPTION)
             {
               TAO_INTERCEPTOR_THROW (
                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
               );
-
+              
             }
-
-
+          
+          
           TAO_INTERCEPTOR (
             ri.reply_status (_invoke_status);
             if (_invoke_status == TAO_INVOKE_OK)
@@ -4982,10 +6127,10 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
                   ACE_TRY_ENV
                 );
               }
-
+            
           );
           TAO_INTERCEPTOR_CHECK;
-
+          
 #if TAO_HAS_INTERCEPTORS == 1
         }
       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -4993,8 +6138,8 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
           _invoke_status =
             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
-          ri.forward_reference (exc);
+          
+          ri.forward_reference (exc); 
           _tao_vfr.receive_other (
             &ri,
             ACE_TRY_ENV
@@ -5013,7 +6158,7 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
         }
       ACE_ENDTRY;
       ACE_CHECK;
-
+      
 #endif /* TAO_HAS_INTERCEPTORS */
 
       if (_invoke_status == TAO_INVOKE_RESTART)
@@ -5021,15 +6166,15 @@ void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl:
           _tao_call.restart_flag (1);
           continue;
         }
-
+      
       break;
     }
-
+  
 }
 
 
 //
-//            End  Base & Remote  Proxy Implemeentation.
+//            End  Base & Remote  Proxy Implemeentation. 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -5150,14 +6295,14 @@ ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository
             stub,
             1,
             obj->_servant ()),
-
+            
           ServerInformationIterator::_nil ());
         }
       if (CORBA::is_nil (default_proxy))
         ACE_NEW_RETURN (default_proxy, ::ImplementationRepository::ServerInformationIterator (stub, 0, obj->_servant ()), ServerInformationIterator::_nil ());
         return default_proxy;
       }
-    else
+    else 
       return
         ACE_reinterpret_cast
           (
@@ -5201,7 +6346,7 @@ void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface (
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -5221,10 +6366,10 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
     CORBA::SystemException
   ))
 {
-  _TAO_ServerInformationIterator_Proxy_Impl &proxy =
+  _TAO_ServerInformationIterator_Proxy_Impl &proxy = 
     this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
-
+  
   return proxy.next_n (
       this,
       how_many,
@@ -5240,156 +6385,42 @@ void ImplementationRepository::ServerInformationIterator::destroy (
     CORBA::SystemException
   ))
 {
-  _TAO_ServerInformationIterator_Proxy_Impl &proxy =
+  _TAO_ServerInformationIterator_Proxy_Impl &proxy = 
     this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
   ACE_CHECK;
-
+  
   proxy.destroy (
       this,
       ACE_TRY_ENV
     );
 }
 
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & how_many,
-    CORBA::Environment &
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-    how_many_ (how_many)
-{}
-
-Dynamic::ParameterList *
-ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-  CORBA::ULong length_how_many = parameter_list->length ();
-  parameter_list->length (length_how_many + 1);
-  (*parameter_list)[length_how_many].argument <<= how_many_;
-  (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN;
-
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return exception_list;
-}
-
-
-CORBA::Any *
-ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Any_var safe_result_any = result_any;
-
-  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
-}
-
-void
-ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result)
-{
-  // update the result
-  this->_result = result;
-}
-
-ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    CORBA::Environment &
-  )
-  : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return parameter_list;
-}
-
-Dynamic::ExceptionList *
-ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return exception_list;
-}
-
-
-CORBA::Any *
-ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return result_any;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS */
 static const CORBA::Long _oc_ImplementationRepository_ServerInformationIterator[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   59,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x656d656e),
-  ACE_NTOHL (0x74617469),
-  ACE_NTOHL (0x6f6e5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f536572),
-  ACE_NTOHL (0x76657249),
-  ACE_NTOHL (0x6e666f72),
-  ACE_NTOHL (0x6d617469),
-  ACE_NTOHL (0x6f6e4974),
-  ACE_NTOHL (0x65726174),
-  ACE_NTOHL (0x6f723a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x656d656e), 
+  ACE_NTOHL (0x74617469), 
+  ACE_NTOHL (0x6f6e5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f536572), 
+  ACE_NTOHL (0x76657249), 
+  ACE_NTOHL (0x6e666f72), 
+  ACE_NTOHL (0x6d617469), 
+  ACE_NTOHL (0x6f6e4974), 
+  ACE_NTOHL (0x65726174), 
+  ACE_NTOHL (0x6f723a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformationIterator:1.0
   26,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x6572496e),
-  ACE_NTOHL (0x666f726d),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e497465),
-  ACE_NTOHL (0x7261746f),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x6572496e), 
+  ACE_NTOHL (0x666f726d), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e497465), 
+  ACE_NTOHL (0x7261746f), 
   ACE_NTOHL (0x72000000),  // name = ServerInformationIterator
 };
 
@@ -5412,7 +6443,7 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerObject_p
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        ImplementationRepository::_tc_ServerObject,
+        ImplementationRepository::_tc_ServerObject, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -5428,13 +6459,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
   {
     _tao_elem = ImplementationRepository::ServerObject::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-
+    
     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerObject, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
       return 0; // not equivalent
-
+    
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -5503,13 +6534,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
+    
     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentVariable, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
       return 0; // not equivalent
-
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -5594,13 +6625,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
+    
     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentList, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
       return 0; // not equivalent
-
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -5657,13 +6688,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
+    
     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ActivationMode, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
       return 0; // not equivalent
-
+    
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -5717,13 +6748,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
+    
     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_StartupOptions, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
       return 0; // not equivalent
-
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -5800,13 +6831,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
+    
     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformation, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
       return 0; // not equivalent
-
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -5891,13 +6922,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
+    
     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationList, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
       return 0; // not equivalent
-
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -5944,7 +6975,7 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::Administration
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        ImplementationRepository::_tc_Administration,
+        ImplementationRepository::_tc_Administration, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -5960,13 +6991,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
   {
     _tao_elem = ImplementationRepository::Administration::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-
+    
     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_Administration, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
       return 0; // not equivalent
-
+    
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -6038,13 +7069,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
+    
     CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
       return 0; // not equivalent
-
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (ImplementationRepository::Administration::AlreadyRegistered *)_tao_any.value ();
@@ -6128,13 +7159,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
+    
     CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
       return 0; // not equivalent
-
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (ImplementationRepository::Administration::CannotActivate *)_tao_any.value ();
@@ -6218,13 +7249,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const ImplementationRepo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-
+    
     CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_NotFound, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
       return 0; // not equivalent
-
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (ImplementationRepository::Administration::NotFound *)_tao_any.value ();
@@ -6275,7 +7306,7 @@ void operator<<= (CORBA::Any &_tao_any, ImplementationRepository::ServerInformat
   if (stream << _tao_elem)
   {
     _tao_any._tao_replace (
-        ImplementationRepository::_tc_ServerInformationIterator,
+        ImplementationRepository::_tc_ServerInformationIterator, 
         TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
@@ -6291,13 +7322,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
   {
     _tao_elem = ImplementationRepository::ServerInformationIterator::_nil ();
     CORBA::TypeCode_var type = _tao_any.type ();
-
+    
     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationIterator, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
       return 0; // not equivalent
-
+    
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -6332,6 +7363,42 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
+    const ImplementationRepository::ServerObject_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    ImplementationRepository::ServerObject_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      ImplementationRepository::ServerObject::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
     const ImplementationRepository::EnvironmentList &_tao_sequence
   )
 {
@@ -6359,7 +7426,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -6401,7 +7468,7 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
     CORBA::Boolean _tao_marshal_flag = 1;
@@ -6413,3 +7480,76 @@ CORBA::Boolean operator>> (
   }
   return 0; // error
 }
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const ImplementationRepository::Administration_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    ImplementationRepository::Administration_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      ImplementationRepository::Administration::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const ImplementationRepository::ServerInformationIterator_ptr _tao_objref
+  )
+{
+  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  return (strm << _tao_corba_obj);
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    ImplementationRepository::ServerInformationIterator_ptr &_tao_objref
+  )
+{
+  ACE_TRY_NEW_ENV
+  {
+    CORBA::Object_var obj;
+    if ((strm >> obj.inout ()) == 0)
+      return 0;
+    // narrow to the right type
+    _tao_objref =
+      ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
+          obj.in (),
+          ACE_TRY_ENV
+        );
+    ACE_TRY_CHECK;
+    return 1;
+  }
+  ACE_CATCHANY
+  {
+    // do nothing
+  }
+  ACE_ENDTRY;
+  return 0;
+}
+
diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h
index ebdd11f639f..8c3c2514cef 100644
--- a/TAO/tao/PortableServer/ImplRepoC.h
+++ b/TAO/tao/PortableServer/ImplRepoC.h
@@ -24,6 +24,11 @@
 
 #include "ace/pre.h"
 #include "tao/corbafwd.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "tao/CDR.h"
 #include "tao/Any.h"
 #include "tao/Object.h"
@@ -31,11 +36,6 @@
 #include "tao/Remote_Object_Proxy_Impl.h"
 #include "tao/Managed_Types.h"
 #include "tao/Sequence.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "portableserver_export.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -69,7 +69,7 @@ TAO_NAMESPACE  ImplementationRepository
 
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
-
+  
 #endif /* end #if !defined */
 
 
@@ -80,23 +80,31 @@ TAO_NAMESPACE  ImplementationRepository
   {
   public:
     ServerObject_var (void); // default constructor
-    ServerObject_var (ServerObject_ptr p) : ptr_ (p) {}
+    ServerObject_var (ServerObject_ptr p) : ptr_ (p) {} 
     ServerObject_var (const ServerObject_var &); // copy constructor
     ~ServerObject_var (void); // destructor
-
+    
     ServerObject_var &operator= (ServerObject_ptr);
     ServerObject_var &operator= (const ServerObject_var &);
     ServerObject_ptr operator-> (void) const;
-
+    
     operator const ServerObject_ptr &() const;
     operator ServerObject_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     ServerObject_ptr in (void) const;
     ServerObject_ptr &inout (void);
     ServerObject_ptr &out (void);
     ServerObject_ptr _retn (void);
     ServerObject_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ServerObject_ptr duplicate (ServerObject_ptr);
+    static void release (ServerObject_ptr);
+    static ServerObject_ptr nil (void);
+    static ServerObject_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ServerObject_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -123,7 +131,7 @@ TAO_NAMESPACE  ImplementationRepository
     operator ServerObject_ptr &();
     ServerObject_ptr &ptr (void);
     ServerObject_ptr operator-> (void);
-
+  
   private:
     ServerObject_ptr &ptr_;
   };
@@ -140,7 +148,7 @@ TAO_NAMESPACE  ImplementationRepository
   class _TAO_ServerObject_Remote_Proxy_Impl;
   class _TAO_ServerObject_Proxy_Broker;
   class _TAO_ServerObject_Remote_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export ServerObject : public virtual CORBA_Object
   {
   public:
@@ -153,12 +161,12 @@ TAO_NAMESPACE  ImplementationRepository
     static ServerObject_ptr _duplicate (ServerObject_ptr obj);
     static ServerObject_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
     static ServerObject_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
     static ServerObject_ptr _nil (void)
@@ -169,7 +177,7 @@ TAO_NAMESPACE  ImplementationRepository
     static void _tao_any_destructor (void*);
 
     virtual void ping (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -177,7 +185,7 @@ TAO_NAMESPACE  ImplementationRepository
       ));
 
     virtual void shutdown (
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -185,182 +193,94 @@ TAO_NAMESPACE  ImplementationRepository
       ));
 
     virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &ACE_TRY_ENV =
+        const CORBA::Char *type_id, 
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
 
   private:
     _TAO_ServerObject_Proxy_Broker *the_TAO_ServerObject_Proxy_Broker_;
-
+    
   protected:
     ServerObject (int collocated = 0);
-
+    
     protected:
       // This methods travese the inheritance tree and set the
       // parents piece of the given class in the right mode
       virtual void ImplementationRepository_ServerObject_setup_collocation (int collocated);
-
+      
       ServerObject (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0
         );
-
+      
       friend class _TAO_ServerObject_Remote_Proxy_Impl;
       friend class _TAO_ServerObject_ThruPOA_Proxy_Impl;
       friend class _TAO_ServerObject_Direct_Proxy_Impl;
-
+    
     virtual ~ServerObject (void);
   private:
     ServerObject (const ServerObject &);
     void operator= (const ServerObject &);
-
-#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_ClientRequestInfo_ImplementationRepository_ServerObject_ping : public TAO_ClientRequestInfo
-    {
-    public:
-      friend class ImplementationRepository::ServerObject;
-
-      friend class _TAO_ServerObject_Remote_Proxy_Impl;
-      friend class _TAO_ServerObject_ThruPOA_Proxy_Impl;
-      friend class _TAO_ServerObject_Direct_Proxy_Impl;
-
-    TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (
-        TAO_GIOP_Invocation *_tao_invocation,
-        CORBA::Object_ptr _tao_target,
-        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));
-
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &);
-
   };
 
-  class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class ImplementationRepository::ServerObject;
-
-    friend class _TAO_ServerObject_Remote_Proxy_Impl;
-    friend class _TAO_ServerObject_ThruPOA_Proxy_Impl;
-    friend class _TAO_ServerObject_Direct_Proxy_Impl;
-
-  TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      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));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &);
-
-};
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-};
-
-
+  
 // The Proxy Implementations are used by each interface to
 // perform a call. Each different implementation encapsulate
 // an invocation logics.
 
 
-///////////////////////////////////////////////////////////////////////
-//                    Base  Impl. Declaration
-//
-
-class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
-{
-public:
-  virtual ~_TAO_ServerObject_Proxy_Impl (void) { }
-
-    virtual void ping (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+  ///////////////////////////////////////////////////////////////////////
+  //                    Base  Impl. Declaration
+  //
+  
+  class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
+  {
+  public:
+    virtual ~_TAO_ServerObject_Proxy_Impl (void) { }
+    
+        virtual void ping (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
 
-  virtual void shutdown (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+    virtual void shutdown (
+        CORBA_Object *_collocated_tao_target_,
+        CORBA::Environment &ACE_TRY_ENV
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
 
 protected:
-  _TAO_ServerObject_Proxy_Impl (void);
-
-};
-//
-//                Base  Proxy Impl. Declaration
-///////////////////////////////////////////////////////////////////////
-
-
+    _TAO_ServerObject_Proxy_Impl (void);
+  
+  };
+  //
+  //                Base  Proxy Impl. Declaration
+  ///////////////////////////////////////////////////////////////////////
+  
+  
 ///////////////////////////////////////////////////////////////////////
 //                    Remote  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Impl :
+class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Impl : 
   public virtual _TAO_ServerObject_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl
 {
 public:
   _TAO_ServerObject_Remote_Proxy_Impl (void);
-
+  
   virtual ~_TAO_ServerObject_Remote_Proxy_Impl (void) { }
-
+  
     virtual void ping (
       CORBA_Object *_collocated_tao_target_,
       CORBA::Environment &ACE_TRY_ENV
@@ -385,14 +305,14 @@ public:
 
 
 // The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new
+// the right proxy for performing a call. In the new 
 // collocation scheme, the proxy to be used can vary on
-// a call by call basis.
+// a call by call basis. 
 
 
 
 ///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration
+//                 Base Proxy Broker Declaration 
 //
 
 class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Broker
@@ -406,25 +326,25 @@ public:
 
 protected:
   _TAO_ServerObject_Proxy_Broker (void);
-
+  
 };
 
 //
-//              End Base Proxy Broker Declaration
+//              End Base Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration
+//                 Remote Proxy Broker Declaration 
 //
 
 class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Broker : public virtual _TAO_ServerObject_Proxy_Broker
 {
-public:
+public: 
   _TAO_ServerObject_Remote_Proxy_Broker (void);
-
+  
   virtual ~_TAO_ServerObject_Remote_Proxy_Broker (void);
-
+  
   virtual _TAO_ServerObject_Proxy_Impl &select_proxy (
     ServerObject *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
@@ -442,7 +362,7 @@ public:
 
 
 //
-//              End Remote Proxy Broker Declaration
+//              End Remote Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -473,18 +393,18 @@ public:
   EnvironmentVariable_var (EnvironmentVariable *);
   EnvironmentVariable_var (const EnvironmentVariable_var &); // copy constructor
   ~EnvironmentVariable_var (void); // destructor
-
+  
   EnvironmentVariable_var &operator= (EnvironmentVariable *);
   EnvironmentVariable_var &operator= (const EnvironmentVariable_var &);
   EnvironmentVariable *operator-> (void);
   const EnvironmentVariable *operator-> (void) const;
-
+  
   operator const EnvironmentVariable &() const;
   operator EnvironmentVariable &();
   operator EnvironmentVariable &() const;
   operator EnvironmentVariable *&(); // variable-size types only
-
-  // in, inout, out, _retn
+  
+  // in, inout, out, _retn 
   const EnvironmentVariable &in (void) const;
   EnvironmentVariable &inout (void);
   EnvironmentVariable *&out (void);
@@ -506,7 +426,7 @@ public:
   operator EnvironmentVariable *&();
   EnvironmentVariable *&ptr (void);
   EnvironmentVariable *operator-> (void);
-
+  
 private:
   EnvironmentVariable *&ptr_;
   // assignment from T_var not allowed
@@ -522,7 +442,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address;
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
 
@@ -530,9 +450,9 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address;
   {
   public:
     // = Initialization and termination methods.
-
+    
     _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void); // Default constructor.
-    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum,
       CORBA::ULong length,
       EnvironmentVariable *data,
@@ -549,7 +469,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address;
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+    
     EnvironmentVariable *get_buffer (CORBA::Boolean orphan = 0);
     const EnvironmentVariable *get_buffer (void) const;
     void replace (CORBA::ULong max,
@@ -561,7 +481,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address;
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
@@ -573,20 +493,20 @@ class EnvironmentList_var;
 // EnvironmentList
 // *************************************************************
 
-class TAO_PortableServer_Export EnvironmentList : public
+class TAO_PortableServer_Export EnvironmentList : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<EnvironmentVariable>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 {
 public:
   EnvironmentList (void); // default ctor
   EnvironmentList (CORBA::ULong max); // uses max size
   EnvironmentList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    EnvironmentVariable *buffer,
+    CORBA::ULong max, 
+    CORBA::ULong length, 
+    EnvironmentVariable *buffer, 
     CORBA::Boolean release = 0
   );
   EnvironmentList (const EnvironmentList &); // copy ctor
@@ -616,21 +536,21 @@ public:
   EnvironmentList_var (EnvironmentList *);
   EnvironmentList_var (const EnvironmentList_var &); // copy constructor
   ~EnvironmentList_var (void); // destructor
-
+  
   EnvironmentList_var &operator= (EnvironmentList *);
   EnvironmentList_var &operator= (const EnvironmentList_var &);
   EnvironmentList *operator-> (void);
   const EnvironmentList *operator-> (void) const;
-
+  
   operator const EnvironmentList &() const;
   operator EnvironmentList &();
   operator EnvironmentList &() const;
   operator EnvironmentList *&(); // variable-size base types only
-
+  
   EnvironmentVariable & operator[] (CORBA::ULong index);
   const EnvironmentVariable & operator[] (CORBA::ULong index) const;
-
-  // in, inout, out, _retn
+  
+  // in, inout, out, _retn 
   const EnvironmentList &in (void) const;
   EnvironmentList &inout (void);
   EnvironmentList *&out (void);
@@ -660,7 +580,7 @@ public:
   EnvironmentList *&ptr (void);
   EnvironmentList *operator-> (void);
   EnvironmentVariable & operator[] (CORBA::ULong index);
-
+  
 private:
   EnvironmentList *&ptr_;
   // assignment from T_var not allowed
@@ -677,7 +597,7 @@ enum ActivationMode
     NORMAL,
     MANUAL,
     PER_CLIENT,
-    AUTO_START
+    AUTO_START  
 };
 typedef ActivationMode &ActivationMode_out;
 TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ActivationMode;
@@ -707,18 +627,18 @@ public:
   StartupOptions_var (StartupOptions *);
   StartupOptions_var (const StartupOptions_var &); // copy constructor
   ~StartupOptions_var (void); // destructor
-
+  
   StartupOptions_var &operator= (StartupOptions *);
   StartupOptions_var &operator= (const StartupOptions_var &);
   StartupOptions *operator-> (void);
   const StartupOptions *operator-> (void) const;
-
+  
   operator const StartupOptions &() const;
   operator StartupOptions &();
   operator StartupOptions &() const;
   operator StartupOptions *&(); // variable-size types only
-
-  // in, inout, out, _retn
+  
+  // in, inout, out, _retn 
   const StartupOptions &in (void) const;
   StartupOptions &inout (void);
   StartupOptions *&out (void);
@@ -740,7 +660,7 @@ public:
   operator StartupOptions *&();
   StartupOptions *&ptr (void);
   StartupOptions *operator-> (void);
-
+  
 private:
   StartupOptions *&ptr_;
   // assignment from T_var not allowed
@@ -774,18 +694,18 @@ public:
   ServerInformation_var (ServerInformation *);
   ServerInformation_var (const ServerInformation_var &); // copy constructor
   ~ServerInformation_var (void); // destructor
-
+  
   ServerInformation_var &operator= (ServerInformation *);
   ServerInformation_var &operator= (const ServerInformation_var &);
   ServerInformation *operator-> (void);
   const ServerInformation *operator-> (void) const;
-
+  
   operator const ServerInformation &() const;
   operator ServerInformation &();
   operator ServerInformation &() const;
   operator ServerInformation *&(); // variable-size types only
-
-  // in, inout, out, _retn
+  
+  // in, inout, out, _retn 
   const ServerInformation &in (void) const;
   ServerInformation &inout (void);
   ServerInformation *&out (void);
@@ -807,7 +727,7 @@ public:
   operator ServerInformation *&();
   ServerInformation *&ptr (void);
   ServerInformation *operator-> (void);
-
+  
 private:
   ServerInformation *&ptr_;
   // assignment from T_var not allowed
@@ -818,7 +738,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation;
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
 
@@ -826,9 +746,9 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation;
   {
   public:
     // = Initialization and termination methods.
-
+    
     _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void); // Default constructor.
-    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum);
+    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum); 
     _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum,
       CORBA::ULong length,
       ServerInformation *data,
@@ -845,7 +765,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation;
     virtual void _allocate_buffer (CORBA::ULong length);
     virtual void _deallocate_buffer (void);
     // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+    
     ServerInformation *get_buffer (CORBA::Boolean orphan = 0);
     const ServerInformation *get_buffer (void) const;
     void replace (CORBA::ULong max,
@@ -857,7 +777,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation;
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
@@ -869,20 +789,20 @@ class ServerInformationList_var;
 // ServerInformationList
 // *************************************************************
 
-class TAO_PortableServer_Export ServerInformationList : public
+class TAO_PortableServer_Export ServerInformationList : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ServerInformation>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 {
 public:
   ServerInformationList (void); // default ctor
   ServerInformationList (CORBA::ULong max); // uses max size
   ServerInformationList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    ServerInformation *buffer,
+    CORBA::ULong max, 
+    CORBA::ULong length, 
+    ServerInformation *buffer, 
     CORBA::Boolean release = 0
   );
   ServerInformationList (const ServerInformationList &); // copy ctor
@@ -912,21 +832,21 @@ public:
   ServerInformationList_var (ServerInformationList *);
   ServerInformationList_var (const ServerInformationList_var &); // copy constructor
   ~ServerInformationList_var (void); // destructor
-
+  
   ServerInformationList_var &operator= (ServerInformationList *);
   ServerInformationList_var &operator= (const ServerInformationList_var &);
   ServerInformationList *operator-> (void);
   const ServerInformationList *operator-> (void) const;
-
+  
   operator const ServerInformationList &() const;
   operator ServerInformationList &();
   operator ServerInformationList &() const;
   operator ServerInformationList *&(); // variable-size base types only
-
+  
   ServerInformation & operator[] (CORBA::ULong index);
   const ServerInformation & operator[] (CORBA::ULong index) const;
-
-  // in, inout, out, _retn
+  
+  // in, inout, out, _retn 
   const ServerInformationList &in (void) const;
   ServerInformationList &inout (void);
   ServerInformationList *&out (void);
@@ -956,7 +876,7 @@ public:
   ServerInformationList *&ptr (void);
   ServerInformationList *operator-> (void);
   ServerInformation & operator[] (CORBA::ULong index);
-
+  
 private:
   ServerInformationList *&ptr_;
   // assignment from T_var not allowed
@@ -985,22 +905,30 @@ class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_
 {
 public:
   ServerInformationIterator_var (void); // default constructor
-  ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {}
+  ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} 
   ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor
   ~ServerInformationIterator_var (void); // destructor
-
+  
   ServerInformationIterator_var &operator= (ServerInformationIterator_ptr);
   ServerInformationIterator_var &operator= (const ServerInformationIterator_var &);
   ServerInformationIterator_ptr operator-> (void) const;
-
+  
   operator const ServerInformationIterator_ptr &() const;
   operator ServerInformationIterator_ptr &();
-  // in, inout, out, _retn
+  // in, inout, out, _retn 
   ServerInformationIterator_ptr in (void) const;
   ServerInformationIterator_ptr &inout (void);
   ServerInformationIterator_ptr &out (void);
   ServerInformationIterator_ptr _retn (void);
   ServerInformationIterator_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static ServerInformationIterator_ptr duplicate (ServerInformationIterator_ptr);
+  static void release (ServerInformationIterator_ptr);
+  static ServerInformationIterator_ptr nil (void);
+  static ServerInformationIterator_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   ServerInformationIterator_ptr ptr_;
@@ -1053,22 +981,30 @@ class TAO_PortableServer_Export Administration_var : public TAO_Base_var
 {
 public:
   Administration_var (void); // default constructor
-  Administration_var (Administration_ptr p) : ptr_ (p) {}
+  Administration_var (Administration_ptr p) : ptr_ (p) {} 
   Administration_var (const Administration_var &); // copy constructor
   ~Administration_var (void); // destructor
-
+  
   Administration_var &operator= (Administration_ptr);
   Administration_var &operator= (const Administration_var &);
   Administration_ptr operator-> (void) const;
-
+  
   operator const Administration_ptr &() const;
   operator Administration_ptr &();
-  // in, inout, out, _retn
+  // in, inout, out, _retn 
   Administration_ptr in (void) const;
   Administration_ptr &inout (void);
   Administration_ptr &out (void);
   Administration_ptr _retn (void);
   Administration_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static Administration_ptr duplicate (Administration_ptr);
+  static void release (Administration_ptr);
+  static Administration_ptr nil (void);
+  static Administration_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   Administration_ptr ptr_;
@@ -1126,12 +1062,12 @@ public:
   static Administration_ptr _duplicate (Administration_ptr obj);
   static Administration_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
   static Administration_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
   static Administration_ptr _nil (void)
@@ -1151,29 +1087,29 @@ public:
 
     AlreadyRegistered (void);
     // Default constructor.
-
+    
     AlreadyRegistered (const AlreadyRegistered &);
     // Copy constructor.
-
+    
     ~AlreadyRegistered (void);
     // Destructor.
-
+    
     static void _tao_any_destructor (void*);
-
+    
     AlreadyRegistered &operator= (const AlreadyRegistered &);
-
+    
     virtual void _raise (void);
 
     virtual void _tao_encode (
         TAO_OutputCDR &,
         CORBA::Environment &
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &,
         CORBA::Environment &
       );
-
+    
     static AlreadyRegistered *_downcast (CORBA::Exception *);
 
 
@@ -1198,35 +1134,35 @@ public:
 
     CannotActivate (void);
     // Default constructor.
-
+    
     CannotActivate (const CannotActivate &);
     // Copy constructor.
-
+    
     ~CannotActivate (void);
     // Destructor.
-
+    
     static void _tao_any_destructor (void*);
-
+    
     CannotActivate &operator= (const CannotActivate &);
-
+    
     virtual void _raise (void);
 
     virtual void _tao_encode (
         TAO_OutputCDR &,
         CORBA::Environment &
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &,
         CORBA::Environment &
       );
-
+    
     static CannotActivate *_downcast (CORBA::Exception *);
 
     CannotActivate (
         const char * _tao_reason
       );
-
+    
     // = TAO extension.
     static CORBA::Exception *_alloc (void);
     virtual CORBA::TypeCode_ptr _type (void) const;
@@ -1247,29 +1183,29 @@ public:
 
     NotFound (void);
     // Default constructor.
-
+    
     NotFound (const NotFound &);
     // Copy constructor.
-
+    
     ~NotFound (void);
     // Destructor.
-
+    
     static void _tao_any_destructor (void*);
-
+    
     NotFound &operator= (const NotFound &);
-
+    
     virtual void _raise (void);
 
     virtual void _tao_encode (
         TAO_OutputCDR &,
         CORBA::Environment &
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &,
         CORBA::Environment &
       );
-
+    
     static NotFound *_downcast (CORBA::Exception *);
 
 
@@ -1285,7 +1221,7 @@ public:
 
   virtual void activate_server (
       const char * server,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1297,7 +1233,7 @@ public:
   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 ((
@@ -1308,7 +1244,7 @@ public:
   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 ((
@@ -1317,7 +1253,7 @@ public:
 
   virtual void remove_server (
       const char * server,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1327,7 +1263,7 @@ public:
 
   virtual void shutdown_server (
       const char * server,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -1339,7 +1275,7 @@ public:
       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 ((
@@ -1349,7 +1285,7 @@ public:
 
   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 ((
@@ -1360,7 +1296,7 @@ public:
   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 ((
@@ -1372,7 +1308,7 @@ public:
       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 ((
@@ -1380,437 +1316,39 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      const CORBA::Char *type_id, 
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+  
   virtual const char* _interface_repository_id (void) const;
 
 private:
   _TAO_Administration_Proxy_Broker *the_TAO_Administration_Proxy_Broker_;
-
+  
 protected:
   Administration (int collocated = 0);
-
+  
   protected:
     // This methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode
     virtual void ImplementationRepository_Administration_setup_collocation (int collocated);
-
+    
     Administration (
-      TAO_Stub *objref,
+      TAO_Stub *objref, 
       CORBA::Boolean _tao_collocated = 0,
       TAO_Abstract_ServantBase *servant = 0
       );
-
+    
     friend class _TAO_Administration_Remote_Proxy_Impl;
     friend class _TAO_Administration_ThruPOA_Proxy_Impl;
     friend class _TAO_Administration_Direct_Proxy_Impl;
-
+  
   virtual ~Administration (void);
 private:
   Administration (const Administration &);
   void operator= (const Administration &);
-
-#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_ClientRequestInfo_ImplementationRepository_Administration_activate_server : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class ImplementationRepository::Administration;
-
-    friend class _TAO_Administration_Remote_Proxy_Impl;
-    friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-    friend class _TAO_Administration_Direct_Proxy_Impl;
-
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      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));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &);
-  const char * server_;
-
-};
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ClientRequestInfo
-{
-public:
-  friend class ImplementationRepository::Administration;
-
-  friend class _TAO_Administration_Remote_Proxy_Impl;
-  friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-  friend class _TAO_Administration_Direct_Proxy_Impl;
-
-TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    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));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server &);
-  const char * server_;
-  const ImplementationRepository::StartupOptions & options_;
-
-};
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ClientRequestInfo
-{
-public:
-  friend class ImplementationRepository::Administration;
-
-  friend class _TAO_Administration_Remote_Proxy_Impl;
-  friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-  friend class _TAO_Administration_Direct_Proxy_Impl;
-
-TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    const ImplementationRepository::StartupOptions & options,
-    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));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server &);
-  const char * server_;
-  const ImplementationRepository::StartupOptions & options_;
-
-};
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ClientRequestInfo
-{
-public:
-  friend class ImplementationRepository::Administration;
-
-  friend class _TAO_Administration_Remote_Proxy_Impl;
-  friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-  friend class _TAO_Administration_Direct_Proxy_Impl;
-
-TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    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));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &);
-  const char * server_;
-
-};
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ClientRequestInfo
-{
-public:
-  friend class ImplementationRepository::Administration;
-
-  friend class _TAO_Administration_Remote_Proxy_Impl;
-  friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-  friend class _TAO_Administration_Direct_Proxy_Impl;
-
-TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    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));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &);
-  const char * server_;
-
-};
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ClientRequestInfo
-{
-public:
-  friend class ImplementationRepository::Administration;
-
-  friend class _TAO_Administration_Remote_Proxy_Impl;
-  friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-  friend class _TAO_Administration_Direct_Proxy_Impl;
-
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    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));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running &);
-  const char * server_;
-  const char * addr_;
-  ImplementationRepository::ServerObject_ptr server_object_;
-  void result (char * result);
-  // update the result
-  char * _result;
-};
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down : public TAO_ClientRequestInfo
-{
-public:
-  friend class ImplementationRepository::Administration;
-
-  friend class _TAO_Administration_Remote_Proxy_Impl;
-  friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-  friend class _TAO_Administration_Direct_Proxy_Impl;
-
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    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));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
-  const char * server_;
-
-};
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_find : public TAO_ClientRequestInfo
-{
-public:
-  friend class ImplementationRepository::Administration;
-
-  friend class _TAO_Administration_Remote_Proxy_Impl;
-  friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-  friend class _TAO_Administration_Direct_Proxy_Impl;
-
-TAO_ClientRequestInfo_ImplementationRepository_Administration_find (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const char * server,
-    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));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_find (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &);
-  const char * server_;
-
-};
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_list : public TAO_ClientRequestInfo
-{
-public:
-  friend class ImplementationRepository::Administration;
-
-  friend class _TAO_Administration_Remote_Proxy_Impl;
-  friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-  friend class _TAO_Administration_Direct_Proxy_Impl;
-
-TAO_ClientRequestInfo_ImplementationRepository_Administration_list (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    const CORBA::ULong & how_many
-,
-    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));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_list (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &);
-  const CORBA::ULong & how_many_;
-
-
-};
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -1827,7 +1365,7 @@ class TAO_PortableServer_Export _TAO_Administration_Proxy_Impl : public virtual
 {
 public:
   virtual ~_TAO_Administration_Proxy_Impl (void) { }
-
+  
     virtual void activate_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -1937,15 +1475,15 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl :
+class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl : 
   public virtual _TAO_Administration_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl
 {
 public:
   _TAO_Administration_Remote_Proxy_Impl (void);
-
+  
   virtual ~_TAO_Administration_Remote_Proxy_Impl (void) { }
-
+  
     virtual void activate_server (
       CORBA_Object *_collocated_tao_target_,
       const char * server,
@@ -2050,14 +1588,14 @@ public:
 
 
 // The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new
+// the right proxy for performing a call. In the new 
 // collocation scheme, the proxy to be used can vary on
-// a call by call basis.
+// a call by call basis. 
 
 
 
 ///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration
+//                 Base Proxy Broker Declaration 
 //
 
 class TAO_PortableServer_Export _TAO_Administration_Proxy_Broker
@@ -2071,25 +1609,25 @@ public:
 
 protected:
   _TAO_Administration_Proxy_Broker (void);
-
+  
 };
 
 //
-//              End Base Proxy Broker Declaration
+//              End Base Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration
+//                 Remote Proxy Broker Declaration 
 //
 
 class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Broker : public virtual _TAO_Administration_Proxy_Broker
 {
-public:
+public: 
   _TAO_Administration_Remote_Proxy_Broker (void);
-
+  
   virtual ~_TAO_Administration_Remote_Proxy_Broker (void);
-
+  
   virtual _TAO_Administration_Proxy_Impl &select_proxy (
     Administration *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
@@ -2107,7 +1645,7 @@ public:
 
 
 //
-//              End Remote Proxy Broker Declaration
+//              End Remote Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -2116,74 +1654,6 @@ public:
 TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Administration;
 
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___PTR_CH_
-
-class ServerInformationIterator;
-typedef ServerInformationIterator *ServerInformationIterator_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CH_
-
-class TAO_PortableServer_Export ServerInformationIterator_var : public TAO_Base_var
-{
-public:
-  ServerInformationIterator_var (void); // default constructor
-  ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {}
-  ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor
-  ~ServerInformationIterator_var (void); // destructor
-
-  ServerInformationIterator_var &operator= (ServerInformationIterator_ptr);
-  ServerInformationIterator_var &operator= (const ServerInformationIterator_var &);
-  ServerInformationIterator_ptr operator-> (void) const;
-
-  operator const ServerInformationIterator_ptr &() const;
-  operator ServerInformationIterator_ptr &();
-  // in, inout, out, _retn
-  ServerInformationIterator_ptr in (void) const;
-  ServerInformationIterator_ptr &inout (void);
-  ServerInformationIterator_ptr &out (void);
-  ServerInformationIterator_ptr _retn (void);
-  ServerInformationIterator_ptr ptr (void) const;
-
-private:
-  ServerInformationIterator_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  ServerInformationIterator_var (const TAO_Base_var &rhs);
-  ServerInformationIterator_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CH_
-
-class TAO_PortableServer_Export ServerInformationIterator_out
-{
-public:
-  ServerInformationIterator_out (ServerInformationIterator_ptr &);
-  ServerInformationIterator_out (ServerInformationIterator_var &);
-  ServerInformationIterator_out (const ServerInformationIterator_out &);
-  ServerInformationIterator_out &operator= (const ServerInformationIterator_out &);
-  ServerInformationIterator_out &operator= (const ServerInformationIterator_var &);
-  ServerInformationIterator_out &operator= (ServerInformationIterator_ptr);
-  operator ServerInformationIterator_ptr &();
-  ServerInformationIterator_ptr &ptr (void);
-  ServerInformationIterator_ptr operator-> (void);
-
-private:
-  ServerInformationIterator_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
 
@@ -2205,12 +1675,12 @@ public:
   static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
   static ServerInformationIterator_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
   static ServerInformationIterator_ptr _unchecked_narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
   static ServerInformationIterator_ptr _nil (void)
@@ -2223,7 +1693,7 @@ public:
   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 ((
@@ -2231,7 +1701,7 @@ public:
     ));
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     )
     ACE_THROW_SPEC ((
@@ -2239,131 +1709,39 @@ public:
     ));
 
   virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      const CORBA::Char *type_id, 
+      CORBA::Environment &ACE_TRY_ENV = 
         TAO_default_environment ()
     );
   virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+  
   virtual const char* _interface_repository_id (void) const;
 
 private:
   _TAO_ServerInformationIterator_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_;
-
+  
 protected:
   ServerInformationIterator (int collocated = 0);
-
+  
   protected:
     // This methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode
     virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated);
-
+    
     ServerInformationIterator (
-      TAO_Stub *objref,
+      TAO_Stub *objref, 
       CORBA::Boolean _tao_collocated = 0,
       TAO_Abstract_ServantBase *servant = 0
       );
-
+    
     friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
     friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
     friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
-
+  
   virtual ~ServerInformationIterator (void);
 private:
   ServerInformationIterator (const ServerInformationIterator &);
   void operator= (const ServerInformationIterator &);
-
-#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_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n : public TAO_ClientRequestInfo
-  {
-  public:
-    friend class ImplementationRepository::ServerInformationIterator;
-
-    friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
-    friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
-    friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
-
-  TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const CORBA::ULong & how_many,
-      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));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
-  const CORBA::ULong & how_many_;
-  void result (CORBA::Boolean result);
-  // update the result
-  CORBA::Boolean _result;
-};
-
-class TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy : public TAO_ClientRequestInfo
-{
-public:
-  friend class ImplementationRepository::ServerInformationIterator;
-
-  friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
-  friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
-  friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
-
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
-    TAO_GIOP_Invocation *_tao_invocation,
-    CORBA::Object_ptr _tao_target,
-    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));
-
-private:
-  TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
-  void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
-
-};
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
 };
 
 
@@ -2380,7 +1758,7 @@ class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Impl : publ
 {
 public:
   virtual ~_TAO_ServerInformationIterator_Proxy_Impl (void) { }
-
+  
     virtual CORBA::Boolean next_n (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong how_many,
@@ -2412,15 +1790,15 @@ protected:
 //                    Remote  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Impl :
+class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Impl : 
   public virtual _TAO_ServerInformationIterator_Proxy_Impl,
   public virtual TAO_Remote_Object_Proxy_Impl
 {
 public:
   _TAO_ServerInformationIterator_Remote_Proxy_Impl (void);
-
+  
   virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Impl (void) { }
-
+  
     virtual CORBA::Boolean next_n (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong how_many,
@@ -2447,14 +1825,14 @@ public:
 
 
 // The Proxy Brokers are used by each interface to get
-// the right proxy for performing a call. In the new
+// the right proxy for performing a call. In the new 
 // collocation scheme, the proxy to be used can vary on
-// a call by call basis.
+// a call by call basis. 
 
 
 
 ///////////////////////////////////////////////////////////////////////
-//                 Base Proxy Broker Declaration
+//                 Base Proxy Broker Declaration 
 //
 
 class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Broker
@@ -2468,25 +1846,25 @@ public:
 
 protected:
   _TAO_ServerInformationIterator_Proxy_Broker (void);
-
+  
 };
 
 //
-//              End Base Proxy Broker Declaration
+//              End Base Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
 ///////////////////////////////////////////////////////////////////////
-//                 Remote Proxy Broker Declaration
+//                 Remote Proxy Broker Declaration 
 //
 
 class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Broker : public virtual _TAO_ServerInformationIterator_Proxy_Broker
 {
-public:
+public: 
   _TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
-
+  
   virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
-
+  
   virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
     ServerInformationIterator *object,
     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
@@ -2504,7 +1882,7 @@ public:
 
 
 //
-//              End Remote Proxy Broker Declaration
+//              End Remote Proxy Broker Declaration 
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -2518,15 +1896,21 @@ TAO_NAMESPACE_CLOSE // module ImplementationRepository
 
 // Proxy Broker Factory function pointer declarations.
 
-extern TAO_PortableServer_Export ImplementationRepository::_TAO_ServerObject_Proxy_Broker * (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
+extern TAO_PortableServer_Export
+ImplementationRepository::_TAO_ServerObject_Proxy_Broker *
+(*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_PortableServer_Export ImplementationRepository::_TAO_Administration_Proxy_Broker * (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
+extern TAO_PortableServer_Export
+ImplementationRepository::_TAO_Administration_Proxy_Broker *
+(*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_PortableServer_Export ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker * (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
+extern TAO_PortableServer_Export
+ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker *
+(*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
@@ -2595,7 +1979,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); //
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); // 
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i
index 50b7f7a028c..5c61c8c9abd 100644
--- a/TAO/tao/PortableServer/ImplRepoC.i
+++ b/TAO/tao/PortableServer/ImplRepoC.i
@@ -23,184 +23,58 @@
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_
 
-ACE_INLINE
-ImplementationRepository::ServerObject::ServerObject (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE ImplementationRepository::ServerObject_ptr
+tao_ImplementationRepository_ServerObject_duplicate (
+    ImplementationRepository::ServerObject_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->ImplementationRepository_ServerObject_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CI_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___VAR_CI_
-
-// *************************************************************
-// Inline operations for class ImplementationRepository::ServerObject_var
-// *************************************************************
-
-ACE_INLINE
-ImplementationRepository::ServerObject_var::ServerObject_var (void) // default constructor
-  : ptr_ (ServerObject::_nil ())
-{}
-
-ACE_INLINE ::ImplementationRepository::ServerObject_ptr
-ImplementationRepository::ServerObject_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerObject_var::ServerObject_var (const ::ImplementationRepository::ServerObject_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ServerObject::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-ImplementationRepository::ServerObject_var::~ServerObject_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE ImplementationRepository::ServerObject_var &
-ImplementationRepository::ServerObject_var::operator= (ServerObject_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE ImplementationRepository::ServerObject_var &
-ImplementationRepository::ServerObject_var::operator= (const ::ImplementationRepository::ServerObject_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::ImplementationRepository::ServerObject::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerObject_var::operator const ::ImplementationRepository::ServerObject_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::ServerObject_ptr
-ImplementationRepository::ServerObject_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::ServerObject_ptr
-ImplementationRepository::ServerObject_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::ServerObject_ptr &
-ImplementationRepository::ServerObject_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::ServerObject_ptr &
-ImplementationRepository::ServerObject_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::ImplementationRepository::ServerObject::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::ServerObject_ptr
-ImplementationRepository::ServerObject_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::ImplementationRepository::ServerObject_ptr val = this->ptr_;
-  this->ptr_ = ::ImplementationRepository::ServerObject::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___OUT_CI_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___OUT_CI_
-
-// *************************************************************
-// Inline operations for class ImplementationRepository::ServerObject_out
-// *************************************************************
-
-ACE_INLINE
-ImplementationRepository::ServerObject_out::ServerObject_out (ServerObject_ptr &p)
-  : ptr_ (p)
 {
-  this->ptr_ = ::ImplementationRepository::ServerObject::_nil ();
+  return ImplementationRepository::ServerObject::_duplicate (p);
 }
 
-ACE_INLINE
-ImplementationRepository::ServerObject_out::ServerObject_out (ServerObject_var &p) // constructor from _var
-  : ptr_ (p.out ())
+ACE_INLINE void
+tao_ImplementationRepository_ServerObject_release (
+    ImplementationRepository::ServerObject_ptr p
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::ImplementationRepository::ServerObject::_nil ();
+  CORBA::release (p);
 }
 
-ACE_INLINE
-ImplementationRepository::ServerObject_out::ServerObject_out (const ::ImplementationRepository::ServerObject_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServerObject_out &, p).ptr_)
-{}
-
-ACE_INLINE ::ImplementationRepository::ServerObject_out &
-ImplementationRepository::ServerObject_out::operator= (const ::ImplementationRepository::ServerObject_out &p)
+ACE_INLINE ImplementationRepository::ServerObject_ptr
+tao_ImplementationRepository_ServerObject_nil (
+    void
+  )
 {
-  this->ptr_ = ACE_const_cast (ServerObject_out&, p).ptr_;
-  return *this;
+  return ImplementationRepository::ServerObject::_nil ();
 }
 
-ACE_INLINE ImplementationRepository::ServerObject_out &
-ImplementationRepository::ServerObject_out::operator= (const ::ImplementationRepository::ServerObject_var &p)
+ACE_INLINE ImplementationRepository::ServerObject_ptr
+tao_ImplementationRepository_ServerObject_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  this->ptr_ = ::ImplementationRepository::ServerObject::_duplicate (p.ptr ());
-  return *this;
+  return ImplementationRepository::ServerObject::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ImplementationRepository::ServerObject_out &
-ImplementationRepository::ServerObject_out::operator= (ServerObject_ptr p)
+ACE_INLINE CORBA::Object *
+tao_ImplementationRepository_ServerObject_upcast (
+    void *src
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  ImplementationRepository::ServerObject **tmp =
+    ACE_static_cast (ImplementationRepository::ServerObject **, src);
+  return *tmp;
 }
 
 ACE_INLINE
-ImplementationRepository::ServerObject_out::operator ::ImplementationRepository::ServerObject_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::ServerObject_ptr &
-ImplementationRepository::ServerObject_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::ServerObject_ptr
-ImplementationRepository::ServerObject_out::operator-> (void)
+ImplementationRepository::ServerObject::ServerObject (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->ImplementationRepository_ServerObject_setup_collocation (_tao_collocated);
 }
 
 
@@ -257,7 +131,7 @@ ImplementationRepository::EnvironmentVariable_var::operator= (const ::Implementa
         {
           EnvironmentVariable *deep_copy =
             new EnvironmentVariable (*p.ptr_);
-
+          
           if (deep_copy != 0)
             {
               EnvironmentVariable *tmp = deep_copy;
@@ -267,7 +141,7 @@ ImplementationRepository::EnvironmentVariable_var::operator= (const ::Implementa
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -290,20 +164,20 @@ ImplementationRepository::EnvironmentVariable_var::operator const ::Implementati
 }
 
 ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast
+ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast
+ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast
+ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast 
 {
   return this->ptr_;
 }
@@ -320,7 +194,7 @@ ImplementationRepository::EnvironmentVariable_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size
+// mapping for variable size 
 ACE_INLINE ::ImplementationRepository::EnvironmentVariable *&
 ImplementationRepository::EnvironmentVariable_var::out (void)
 {
@@ -381,7 +255,7 @@ ImplementationRepository::EnvironmentVariable_out::operator= (EnvironmentVariabl
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 ImplementationRepository::EnvironmentVariable_out::operator ::ImplementationRepository::EnvironmentVariable *&() // cast
 {
   return this->ptr_;
@@ -401,7 +275,7 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_
 
@@ -414,24 +288,24 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
     ACE_NEW_RETURN (retval, ImplementationRepository::EnvironmentVariable[size], 0);
     return retval;
   }
-
+  
   ACE_INLINE void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (ImplementationRepository::EnvironmentVariable *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-
+  
   ACE_INLINE
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void) // Default constructor.
   {
   }
-
+  
   ACE_INLINE
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (maximum))
   {
   }
-
+  
   ACE_INLINE
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -440,7 +314,7 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-
+  
   ACE_INLINE
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs)
   // Copy constructor.
@@ -450,10 +324,10 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
     {
       ImplementationRepository::EnvironmentVariable *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (this->maximum_);
       ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-
+      
       this->buffer_ = tmp1;
     }
     else
@@ -461,14 +335,14 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-
+  
   ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator= (const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-
+    
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -481,18 +355,18 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (rhs.maximum_);
-
+    
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+    
     ImplementationRepository::EnvironmentVariable *tmp1 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_);
     ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_);
-
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-
+    
     return *this;
   }
-
+  
   // = Accessors.
   ACE_INLINE ImplementationRepository::EnvironmentVariable &
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i)
@@ -502,7 +376,7 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
     ImplementationRepository::EnvironmentVariable* tmp = ACE_reinterpret_cast(ImplementationRepository::EnvironmentVariable*,this->buffer_);
     return tmp[i];
   }
-
+  
   ACE_INLINE const ImplementationRepository::EnvironmentVariable &
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i) const
   // operator []
@@ -511,9 +385,9 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
     ImplementationRepository::EnvironmentVariable * const tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-
+  
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+  
   ACE_INLINE ImplementationRepository::EnvironmentVariable *
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (CORBA::Boolean orphan)
   {
@@ -547,13 +421,13 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
     }
     return result;
   }
-
+  
   ACE_INLINE const ImplementationRepository::EnvironmentVariable *
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, this->buffer_);
   }
-
+  
   ACE_INLINE void
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -570,11 +444,11 @@ ImplementationRepository::EnvironmentVariable_out::operator-> (void)
     this->buffer_ = data;
     this->release_ = release;
   }
-
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_
@@ -630,7 +504,7 @@ ImplementationRepository::EnvironmentList_var::operator= (const ::Implementation
         {
           EnvironmentList *deep_copy =
             new EnvironmentList (*p.ptr_);
-
+          
           if (deep_copy != 0)
             {
               EnvironmentList *tmp = deep_copy;
@@ -640,7 +514,7 @@ ImplementationRepository::EnvironmentList_var::operator= (const ::Implementation
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -656,27 +530,27 @@ ImplementationRepository::EnvironmentList_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE
+ACE_INLINE 
 ImplementationRepository::EnvironmentList_var::operator const ::ImplementationRepository::EnvironmentList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast
+ACE_INLINE 
+ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast
+ACE_INLINE 
+ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast
+ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast 
 {
   return this->ptr_;
 }
@@ -705,7 +579,7 @@ ImplementationRepository::EnvironmentList_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size
+// mapping for variable size 
 ACE_INLINE ::ImplementationRepository::EnvironmentList *&
 ImplementationRepository::EnvironmentList_var::out (void)
 {
@@ -766,7 +640,7 @@ ImplementationRepository::EnvironmentList_out::operator= (EnvironmentList *p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 ImplementationRepository::EnvironmentList_out::operator ::ImplementationRepository::EnvironmentList *&() // cast
 {
   return this->ptr_;
@@ -844,7 +718,7 @@ ImplementationRepository::StartupOptions_var::operator= (const ::ImplementationR
         {
           StartupOptions *deep_copy =
             new StartupOptions (*p.ptr_);
-
+          
           if (deep_copy != 0)
             {
               StartupOptions *tmp = deep_copy;
@@ -854,7 +728,7 @@ ImplementationRepository::StartupOptions_var::operator= (const ::ImplementationR
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -877,20 +751,20 @@ ImplementationRepository::StartupOptions_var::operator const ::ImplementationRep
 }
 
 ACE_INLINE
-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast
+ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast
+ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast
+ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast 
 {
   return this->ptr_;
 }
@@ -907,7 +781,7 @@ ImplementationRepository::StartupOptions_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size
+// mapping for variable size 
 ACE_INLINE ::ImplementationRepository::StartupOptions *&
 ImplementationRepository::StartupOptions_var::out (void)
 {
@@ -968,7 +842,7 @@ ImplementationRepository::StartupOptions_out::operator= (StartupOptions *p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 ImplementationRepository::StartupOptions_out::operator ::ImplementationRepository::StartupOptions *&() // cast
 {
   return this->ptr_;
@@ -1037,7 +911,7 @@ ImplementationRepository::ServerInformation_var::operator= (const ::Implementati
         {
           ServerInformation *deep_copy =
             new ServerInformation (*p.ptr_);
-
+          
           if (deep_copy != 0)
             {
               ServerInformation *tmp = deep_copy;
@@ -1047,7 +921,7 @@ ImplementationRepository::ServerInformation_var::operator= (const ::Implementati
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -1070,20 +944,20 @@ ImplementationRepository::ServerInformation_var::operator const ::Implementation
 }
 
 ACE_INLINE
-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast
+ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE
-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast
+ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast
+ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast 
 {
   return this->ptr_;
 }
@@ -1100,7 +974,7 @@ ImplementationRepository::ServerInformation_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size
+// mapping for variable size 
 ACE_INLINE ::ImplementationRepository::ServerInformation *&
 ImplementationRepository::ServerInformation_var::out (void)
 {
@@ -1161,7 +1035,7 @@ ImplementationRepository::ServerInformation_out::operator= (ServerInformation *p
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 ImplementationRepository::ServerInformation_out::operator ::ImplementationRepository::ServerInformation *&() // cast
 {
   return this->ptr_;
@@ -1181,7 +1055,7 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_
 
@@ -1194,24 +1068,24 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
     ACE_NEW_RETURN (retval, ImplementationRepository::ServerInformation[size], 0);
     return retval;
   }
-
+  
   ACE_INLINE void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (ImplementationRepository::ServerInformation *buffer)
   // Free the sequence.
   {
     delete [] buffer;
   }
-
+  
   ACE_INLINE
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Default constructor.
   {
   }
-
+  
   ACE_INLINE
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (maximum))
   {
   }
-
+  
   ACE_INLINE
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -1220,7 +1094,7 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
-
+  
   ACE_INLINE
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs)
   // Copy constructor.
@@ -1230,10 +1104,10 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
     {
       ImplementationRepository::ServerInformation *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (this->maximum_);
       ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp1[i] = tmp2[i];
-
+      
       this->buffer_ = tmp1;
     }
     else
@@ -1241,14 +1115,14 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-
+  
   ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator= (const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
       return *this;
-
+    
     if (this->release_)
     {
       if (this->maximum_ < rhs.maximum_)
@@ -1261,18 +1135,18 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (rhs.maximum_);
-
+    
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+    
     ImplementationRepository::ServerInformation *tmp1 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
     ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_);
-
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
-
+    
     return *this;
   }
-
+  
   // = Accessors.
   ACE_INLINE ImplementationRepository::ServerInformation &
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i)
@@ -1282,7 +1156,7 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
     ImplementationRepository::ServerInformation* tmp = ACE_reinterpret_cast(ImplementationRepository::ServerInformation*,this->buffer_);
     return tmp[i];
   }
-
+  
   ACE_INLINE const ImplementationRepository::ServerInformation &
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i) const
   // operator []
@@ -1291,9 +1165,9 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
     ImplementationRepository::ServerInformation * const tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
-
+  
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+  
   ACE_INLINE ImplementationRepository::ServerInformation *
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (CORBA::Boolean orphan)
   {
@@ -1327,13 +1201,13 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
     }
     return result;
   }
-
+  
   ACE_INLINE const ImplementationRepository::ServerInformation *
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const ImplementationRepository::ServerInformation * ACE_CAST_CONST, this->buffer_);
   }
-
+  
   ACE_INLINE void
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::replace (CORBA::ULong max,
   CORBA::ULong length,
@@ -1350,11 +1224,11 @@ ImplementationRepository::ServerInformation_out::operator-> (void)
     this->buffer_ = data;
     this->release_ = release;
   }
-
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_
@@ -1410,7 +1284,7 @@ ImplementationRepository::ServerInformationList_var::operator= (const ::Implemen
         {
           ServerInformationList *deep_copy =
             new ServerInformationList (*p.ptr_);
-
+          
           if (deep_copy != 0)
             {
               ServerInformationList *tmp = deep_copy;
@@ -1420,7 +1294,7 @@ ImplementationRepository::ServerInformationList_var::operator= (const ::Implemen
             }
         }
     }
-
+  
   return *this;
 }
 
@@ -1436,27 +1310,27 @@ ImplementationRepository::ServerInformationList_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE
+ACE_INLINE 
 ImplementationRepository::ServerInformationList_var::operator const ::ImplementationRepository::ServerInformationList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast
+ACE_INLINE 
+ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast
+ACE_INLINE 
+ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast
+ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast 
 {
   return this->ptr_;
 }
@@ -1485,7 +1359,7 @@ ImplementationRepository::ServerInformationList_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size
+// mapping for variable size 
 ACE_INLINE ::ImplementationRepository::ServerInformationList *&
 ImplementationRepository::ServerInformationList_var::out (void)
 {
@@ -1546,7 +1420,7 @@ ImplementationRepository::ServerInformationList_out::operator= (ServerInformatio
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 ImplementationRepository::ServerInformationList_out::operator ::ImplementationRepository::ServerInformationList *&() // cast
 {
   return this->ptr_;
@@ -1573,194 +1447,6 @@ ImplementationRepository::ServerInformationList_out::operator[] (CORBA::ULong in
 
 #endif /* end #if !defined */
 
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_
-
-ACE_INLINE
-ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
-  )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->ImplementationRepository_ServerInformationIterator_setup_collocation (_tao_collocated);
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CI_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___VAR_CI_
-
-// *************************************************************
-// Inline operations for class ImplementationRepository::ServerInformationIterator_var
-// *************************************************************
-
-ACE_INLINE
-ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (void) // default constructor
-  : ptr_ (ImplementationRepository::ServerInformationIterator::_nil ())
-{}
-
-ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr
-ImplementationRepository::ServerInformationIterator_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationIterator_var::ServerInformationIterator_var (const ImplementationRepository::ServerInformationIterator_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ServerInformationIterator::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationIterator_var::~ServerInformationIterator_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE ImplementationRepository::ServerInformationIterator_var &
-ImplementationRepository::ServerInformationIterator_var::operator= (ImplementationRepository::ServerInformationIterator_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE ImplementationRepository::ServerInformationIterator_var &
-ImplementationRepository::ServerInformationIterator_var::operator= (const ImplementationRepository::ServerInformationIterator_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ImplementationRepository::ServerInformationIterator::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationIterator_var::operator const ImplementationRepository::ServerInformationIterator_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationIterator_var::operator ImplementationRepository::ServerInformationIterator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr
-ImplementationRepository::ServerInformationIterator_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr
-ImplementationRepository::ServerInformationIterator_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr &
-ImplementationRepository::ServerInformationIterator_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr &
-ImplementationRepository::ServerInformationIterator_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ImplementationRepository::ServerInformationIterator::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr
-ImplementationRepository::ServerInformationIterator_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ImplementationRepository::ServerInformationIterator_ptr val = this->ptr_;
-  this->ptr_ = ImplementationRepository::ServerInformationIterator::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CI_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___OUT_CI_
-
-// *************************************************************
-// Inline operations for class ImplementationRepository::ServerInformationIterator_out
-// *************************************************************
-
-ACE_INLINE
-ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (ImplementationRepository::ServerInformationIterator_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ImplementationRepository::ServerInformationIterator::_nil ();
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (ImplementationRepository::ServerInformationIterator_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ImplementationRepository::ServerInformationIterator::_nil ();
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationIterator_out::ServerInformationIterator_out (const ImplementationRepository::ServerInformationIterator_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ImplementationRepository::ServerInformationIterator_out&,p).ptr_)
-{}
-
-ACE_INLINE ImplementationRepository::ServerInformationIterator_out &
-ImplementationRepository::ServerInformationIterator_out::operator= (const ImplementationRepository::ServerInformationIterator_out &p)
-{
-  this->ptr_ = ACE_const_cast (ImplementationRepository::ServerInformationIterator_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE ImplementationRepository::ServerInformationIterator_out &
-ImplementationRepository::ServerInformationIterator_out::operator= (const ImplementationRepository::ServerInformationIterator_var &p)
-{
-  this->ptr_ = ImplementationRepository::ServerInformationIterator::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE ImplementationRepository::ServerInformationIterator_out &
-ImplementationRepository::ServerInformationIterator_out::operator= (ImplementationRepository::ServerInformationIterator_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationIterator_out::operator ImplementationRepository::ServerInformationIterator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr &
-ImplementationRepository::ServerInformationIterator_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr
-ImplementationRepository::ServerInformationIterator_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
 // *************************************************************
 // Inline operations for exception ImplementationRepository::Administration::AlreadyRegistered
 // *************************************************************
@@ -1777,238 +1463,134 @@ ImplementationRepository::ServerInformationIterator_out::operator-> (void)
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_
 
-ACE_INLINE
-ImplementationRepository::Administration::Administration (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant
+ACE_INLINE ImplementationRepository::Administration_ptr
+tao_ImplementationRepository_Administration_duplicate (
+    ImplementationRepository::Administration_ptr p
   )
-  : CORBA_Object (objref, _tao_collocated, servant)
-{
-  this->ImplementationRepository_Administration_setup_collocation (_tao_collocated);
-}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CI_)
-#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___VAR_CI_
-
-// *************************************************************
-// Inline operations for class ImplementationRepository::Administration_var
-// *************************************************************
-
-ACE_INLINE
-ImplementationRepository::Administration_var::Administration_var (void) // default constructor
-  : ptr_ (Administration::_nil ())
-{}
-
-ACE_INLINE ::ImplementationRepository::Administration_ptr
-ImplementationRepository::Administration_var::ptr (void) const
 {
-  return this->ptr_;
+  return ImplementationRepository::Administration::_duplicate (p);
 }
 
-ACE_INLINE
-ImplementationRepository::Administration_var::Administration_var (const ::ImplementationRepository::Administration_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (Administration::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-ImplementationRepository::Administration_var::~Administration_var (void) // destructor
+ACE_INLINE void
+tao_ImplementationRepository_Administration_release (
+    ImplementationRepository::Administration_ptr p
+  )
 {
-  CORBA::release (this->ptr_);
+  CORBA::release (p);
 }
 
-ACE_INLINE ImplementationRepository::Administration_var &
-ImplementationRepository::Administration_var::operator= (Administration_ptr p)
+ACE_INLINE ImplementationRepository::Administration_ptr
+tao_ImplementationRepository_Administration_nil (
+    void
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
+  return ImplementationRepository::Administration::_nil ();
 }
 
-ACE_INLINE ImplementationRepository::Administration_var &
-ImplementationRepository::Administration_var::operator= (const ::ImplementationRepository::Administration_var &p)
+ACE_INLINE ImplementationRepository::Administration_ptr
+tao_ImplementationRepository_Administration_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::ImplementationRepository::Administration::_duplicate (p.ptr ());
-  }
-  return *this;
+  return ImplementationRepository::Administration::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE
-ImplementationRepository::Administration_var::operator const ::ImplementationRepository::Administration_ptr &() const // cast
+ACE_INLINE CORBA::Object *
+tao_ImplementationRepository_Administration_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  ImplementationRepository::Administration **tmp =
+    ACE_static_cast (ImplementationRepository::Administration **, src);
+  return *tmp;
 }
 
 ACE_INLINE
-ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::Administration_ptr
-ImplementationRepository::Administration_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::Administration_ptr
-ImplementationRepository::Administration_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::Administration_ptr &
-ImplementationRepository::Administration_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::Administration_ptr &
-ImplementationRepository::Administration_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::ImplementationRepository::Administration::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::Administration_ptr
-ImplementationRepository::Administration_var::_retn (void)
+ImplementationRepository::Administration::Administration (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  // yield ownership of managed obj reference
-  ::ImplementationRepository::Administration_ptr val = this->ptr_;
-  this->ptr_ = ::ImplementationRepository::Administration::_nil ();
-  return val;
+  this->ImplementationRepository_Administration_setup_collocation (_tao_collocated);
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CI_)
-#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___OUT_CI_
-
-// *************************************************************
-// Inline operations for class ImplementationRepository::Administration_out
-// *************************************************************
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_
 
-ACE_INLINE
-ImplementationRepository::Administration_out::Administration_out (Administration_ptr &p)
-  : ptr_ (p)
+ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr
+tao_ImplementationRepository_ServerInformationIterator_duplicate (
+    ImplementationRepository::ServerInformationIterator_ptr p
+  )
 {
-  this->ptr_ = ::ImplementationRepository::Administration::_nil ();
+  return ImplementationRepository::ServerInformationIterator::_duplicate (p);
 }
 
-ACE_INLINE
-ImplementationRepository::Administration_out::Administration_out (Administration_var &p) // constructor from _var
-  : ptr_ (p.out ())
+ACE_INLINE void
+tao_ImplementationRepository_ServerInformationIterator_release (
+    ImplementationRepository::ServerInformationIterator_ptr p
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::ImplementationRepository::Administration::_nil ();
+  CORBA::release (p);
 }
 
-ACE_INLINE
-ImplementationRepository::Administration_out::Administration_out (const ::ImplementationRepository::Administration_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Administration_out &, p).ptr_)
-{}
-
-ACE_INLINE ::ImplementationRepository::Administration_out &
-ImplementationRepository::Administration_out::operator= (const ::ImplementationRepository::Administration_out &p)
+ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr
+tao_ImplementationRepository_ServerInformationIterator_nil (
+    void
+  )
 {
-  this->ptr_ = ACE_const_cast (Administration_out&, p).ptr_;
-  return *this;
+  return ImplementationRepository::ServerInformationIterator::_nil ();
 }
 
-ACE_INLINE ImplementationRepository::Administration_out &
-ImplementationRepository::Administration_out::operator= (const ::ImplementationRepository::Administration_var &p)
+ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr
+tao_ImplementationRepository_ServerInformationIterator_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  this->ptr_ = ::ImplementationRepository::Administration::_duplicate (p.ptr ());
-  return *this;
+  return ImplementationRepository::ServerInformationIterator::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ImplementationRepository::Administration_out &
-ImplementationRepository::Administration_out::operator= (Administration_ptr p)
+ACE_INLINE CORBA::Object *
+tao_ImplementationRepository_ServerInformationIterator_upcast (
+    void *src
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  ImplementationRepository::ServerInformationIterator **tmp =
+    ACE_static_cast (ImplementationRepository::ServerInformationIterator **, src);
+  return *tmp;
 }
 
 ACE_INLINE
-ImplementationRepository::Administration_out::operator ::ImplementationRepository::Administration_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::Administration_ptr &
-ImplementationRepository::Administration_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::ImplementationRepository::Administration_ptr
-ImplementationRepository::Administration_out::operator-> (void)
+ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
+    TAO_Stub *objref,
+    CORBA::Boolean _tao_collocated,
+    TAO_Abstract_ServantBase *servant
+  )
+  : CORBA_Object (objref, _tao_collocated, servant)
 {
-  return this->ptr_;
+  this->ImplementationRepository_ServerInformationIterator_setup_collocation (_tao_collocated);
 }
 
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+CORBA::Boolean TAO_PortableServer_Export operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::ServerObject_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+CORBA::Boolean TAO_PortableServer_Export operator>> (
     TAO_InputCDR &,
     ImplementationRepository::ServerObject_ptr &
   );
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const ImplementationRepository::ServerObject_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    ImplementationRepository::ServerObject_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      ImplementationRepository::ServerObject::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::EnvironmentVariable &_tao_aggregate)
 {
   if (
@@ -2018,7 +1600,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationR
     return 1;
   else
     return 0;
-
+  
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::EnvironmentVariable &_tao_aggregate)
@@ -2030,7 +1612,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito
     return 1;
   else
     return 0;
-
+  
 }
 
 
@@ -2058,12 +1640,12 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (ImplementationRepository::ActivationMode, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
@@ -2078,7 +1660,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationR
     return 1;
   else
     return 0;
-
+  
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::StartupOptions &_tao_aggregate)
@@ -2092,7 +1674,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito
     return 1;
   else
     return 0;
-
+  
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::ServerInformation &_tao_aggregate)
@@ -2106,7 +1688,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationR
     return 1;
   else
     return 0;
-
+  
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::ServerInformation &_tao_aggregate)
@@ -2120,7 +1702,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationReposito
     return 1;
   else
     return 0;
-
+  
 }
 
 
@@ -2138,23 +1720,22 @@ CORBA::Boolean TAO_PortableServer_Export operator>> (
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_ */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
+CORBA::Boolean TAO_PortableServer_Export operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::ServerInformationIterator_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+CORBA::Boolean TAO_PortableServer_Export operator>> (
     TAO_InputCDR &,
     ImplementationRepository::ServerInformationIterator_ptr &
   );
-ACE_INLINE CORBA::Boolean
-operator<< (
+
+CORBA::Boolean TAO_PortableServer_Export operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::Administration_ptr
   );
-ACE_INLINE CORBA::Boolean
-operator>> (
+
+CORBA::Boolean TAO_PortableServer_Export operator>> (
     TAO_InputCDR &,
     ImplementationRepository::Administration_ptr &
   );
@@ -2215,89 +1796,3 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,ImplementationRepository::A
   return 1;
 }
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const ImplementationRepository::Administration_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    ImplementationRepository::Administration_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      ImplementationRepository::Administration::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const ImplementationRepository::ServerInformationIterator_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    ImplementationRepository::ServerInformationIterator_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const ImplementationRepository::ServerInformationIterator_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    ImplementationRepository::ServerInformationIterator_ptr &_tao_objref
-  )
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    if ((strm >> obj.inout ()) == 0)
-      return 0;
-    // narrow to the right type
-    _tao_objref =
-      ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 9288535d86b..05af00d7e5c 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -1,23 +1,39 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PortableServerC.h"
 #include "POA.h"
 #include "tao/ORB.h"
 
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#endif /* __BORLANDC__ */
+
 #if !defined (__ACE_INLINE__)
 #include "PortableServerC.i"
 #endif /* !defined INLINE */
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CS_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CS_
 
@@ -27,55 +43,65 @@
   {
     PortableServer::POA **tmp = 0;
     tmp = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (length);
-
+    
     if (this->buffer_ != 0)
     {
       PortableServer::POA **old = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
       for (CORBA::ULong i = 0; i < this->length_; ++i)
-        if (!this->release_)
-          tmp[i] = PortableServer::POA::_duplicate (old[i]);
-        else
-          tmp[i] = old[i];
-
+        {
+          if (!this->release_)
+            {
+              tmp[i] = PortableServer::POA::_duplicate (old[i]);
+            }
+          else
+            {
+              tmp[i] = old[i];
+            }
+        }
+      
       if (this->release_)
-        delete[] old;
-
+        {
+          delete[] old;
+        }
     }
     this->buffer_ = tmp;
   }
-
+  
   void
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
     PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
+    
     for (CORBA::ULong i = 0; i < this->length_; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = PortableServer::POA::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = PortableServer::POA::_nil ();
+      }
+    
     _TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (tmp);
     this->buffer_ = 0;
   }
-
+  
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::~_TAO_Unbounded_Object_Sequence_PortableServer_POAList (void)
   {
     this->_deallocate_buffer ();
   }
-
+  
   void
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
   {
     PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA**, this->buffer_);
-
+    
     for (CORBA::ULong i = nl; i < ol; ++i)
-    {
-      CORBA::release (tmp[i]);
-      tmp[i] = PortableServer::POA::_nil ();
-    }
+      {
+        CORBA::release (tmp[i]);
+        tmp[i] = PortableServer::POA::_nil ();
+      }
   }
-  void
+  
+  void 
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_downcast (
       void* target,
       CORBA_Object *src,
@@ -93,11 +119,11 @@
     PortableServer::POA **tmp = ACE_static_cast (PortableServer::POA**, src);
     return *tmp;
   }
-
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_PORTABLESERVER_POALIST_CS_)
 #define _PORTABLESERVER_POALIST_CS_
@@ -109,30 +135,30 @@
 PortableServer::POAList::POAList (void)
 {}
 PortableServer::POAList::POAList (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_PortableServer_POAList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 PortableServer::POAList::POAList (CORBA::ULong max, CORBA::ULong length, PortableServer::POA_ptr *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_PortableServer_POAList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 PortableServer::POAList::POAList (const POAList &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Object_Sequence_PortableServer_POAList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Object_Sequence<PortableServer::POA,PortableServer::POA_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 PortableServer::POAList::~POAList (void) // dtor
@@ -157,30 +183,30 @@ void PortableServer::POAList::_tao_any_destructor (void *x)
 PortableServer::ObjectId::ObjectId (void)
 {}
 PortableServer::ObjectId::ObjectId (CORBA::ULong max) // uses max size
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max)
 {}
 PortableServer::ObjectId::ObjectId (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (max, length, buffer, release)
 {}
 PortableServer::ObjectId::ObjectId (const ObjectId &seq) // copy ctor
-  :
+  : 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
  (seq)
 {}
 PortableServer::ObjectId::~ObjectId (void) // dtor
@@ -197,8 +223,19 @@ void PortableServer::ObjectId::_tao_any_destructor (void *x)
 static const CORBA::Long _oc_PortableServer_ObjectId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4f), ACE_NTOHL (0x626a6563), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/ObjectId:1.0
-  9, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0x0),  // name = ObjectId
+  32,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f4f), 
+  ACE_NTOHL (0x626a6563), 
+  ACE_NTOHL (0x7449643a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/ObjectId:1.0
+  9,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x0),  // name = ObjectId
   CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
@@ -207,7 +244,15 @@ static const CORBA::Long _oc_PortableServer_ObjectId[] =
     0U,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ObjectId (CORBA::tk_alias, sizeof (_oc_PortableServer_ObjectId), (char *) &_oc_PortableServer_ObjectId, 0, sizeof (PortableServer::ObjectId));
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ObjectId (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableServer_ObjectId),
+    (char *) &_oc_PortableServer_ObjectId,
+    0,
+    sizeof (PortableServer::ObjectId)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ObjectId, &_tc_TAO_tc_PortableServer_ObjectId)
@@ -215,13 +260,13 @@ TAO_NAMESPACE_END
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-// default constructor
+// Default constructor.
 PortableServer::ForwardRequest::ForwardRequest (void)
   : CORBA_UserException ("IDL:PortableServer/ForwardRequest:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 PortableServer::ForwardRequest::~ForwardRequest (void)
 {
 }
@@ -232,62 +277,68 @@ void PortableServer::ForwardRequest::_tao_any_destructor (void *x)
   delete tmp;
 }
 
-// copy constructor
+// Copy constructor.
 PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardRequest &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
-    this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
+  this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
 }
 
-// assignment operator
+// Assignment operator.
 PortableServer::ForwardRequest&
 PortableServer::ForwardRequest::operator= (const ::PortableServer::ForwardRequest &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
   return *this;
 }
 
-// narrow
+// Narrow.
 PortableServer::ForwardRequest *
 PortableServer::ForwardRequest::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableServer/ForwardRequest:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (ForwardRequest *, exc);
+  if (!ACE_OS::strcmp ("IDL:PortableServer/ForwardRequest:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (ForwardRequest *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void PortableServer::ForwardRequest::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void PortableServer::ForwardRequest::_tao_encode (
     TAO_OutputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   ) const
 {
   if (cdr << *this)
-    return;
+    {
+      return;
+    }
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void PortableServer::ForwardRequest::_tao_decode (
     TAO_InputCDR &cdr,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
   if (cdr >> *this)
-    return;
+    {
+      return;
+    }
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *PortableServer::ForwardRequest::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -296,34 +347,72 @@ CORBA::Exception *PortableServer::ForwardRequest::_alloc (void)
 }
 
 PortableServer::ForwardRequest::ForwardRequest (
-  const CORBA::Object_ptr  _tao_forward_reference
-)
-  : CORBA_UserException  ("IDL:PortableServer/ForwardRequest:1.0")
+    const CORBA::Object_ptr  _tao_forward_reference
+  )
+  : CORBA_UserException ("IDL:PortableServer/ForwardRequest:1.0")
 {
-    this->forward_reference = CORBA::Object::_duplicate (_tao_forward_reference);
+  this->forward_reference = CORBA::Object::_duplicate (_tao_forward_reference);
 }
 
 static const CORBA::Long _oc_PortableServer_ForwardRequest[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f46), ACE_NTOHL (0x6f727761), ACE_NTOHL (0x72645265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:PortableServer/ForwardRequest:1.0
-  15, ACE_NTOHL (0x466f7277), ACE_NTOHL (0x61726452), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73740000),  // name = ForwardRequest
+  38,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f46), 
+  ACE_NTOHL (0x6f727761), 
+  ACE_NTOHL (0x72645265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x743a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:PortableServer/ForwardRequest:1.0
+  15,
+  ACE_NTOHL (0x466f7277), 
+  ACE_NTOHL (0x61726452), 
+  ACE_NTOHL (0x65717565), 
+  ACE_NTOHL (0x73740000),  // name = ForwardRequest
   1, // member count
-  18, ACE_NTOHL (0x666f7277), ACE_NTOHL (0x6172645f), ACE_NTOHL (0x72656665), ACE_NTOHL (0x72656e63), ACE_NTOHL (0x65000000),  // name = forward_reference
+  18,
+  ACE_NTOHL (0x666f7277), 
+  ACE_NTOHL (0x6172645f), 
+  ACE_NTOHL (0x72656665), 
+  ACE_NTOHL (0x72656e63), 
+  ACE_NTOHL (0x65000000),  // name = forward_reference
   CORBA::tk_objref,
   52, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
-    7, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63740000),  // name = Object
+    29,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f62), 
+    ACE_NTOHL (0x6a656374), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
+    7,
+    ACE_NTOHL (0x4f626a65), 
+    ACE_NTOHL (0x63740000),  // name = Object
 
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ForwardRequest (CORBA::tk_except, sizeof (_oc_PortableServer_ForwardRequest), (char *) &_oc_PortableServer_ForwardRequest, 0, sizeof (PortableServer::ForwardRequest));
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ForwardRequest (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_ForwardRequest),
+    (char *) &_oc_PortableServer_ForwardRequest,
+    0,
+    sizeof (PortableServer::ForwardRequest)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ForwardRequest, &_tc_TAO_tc_PortableServer_ForwardRequest)
 TAO_NAMESPACE_END
 
-// TAO extension - the virtual _type method
+
+// TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const
 {
   return ::PortableServer::_tc_ForwardRequest;
@@ -365,22 +454,239 @@ TAO_NAMESPACE_END
 static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f54), ACE_NTOHL (0x68726561), ACE_NTOHL (0x64506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:PortableServer/ThreadPolicyValue:1.0
-  18, ACE_NTOHL (0x54687265), ACE_NTOHL (0x6164506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000),  // name = ThreadPolicyValue
+  41,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f54), 
+  ACE_NTOHL (0x68726561), 
+  ACE_NTOHL (0x64506f6c), 
+  ACE_NTOHL (0x69637956), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:PortableServer/ThreadPolicyValue:1.0
+  18,
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x65000000),  // name = ThreadPolicyValue
   2, // member count
-  15, ACE_NTOHL (0x4f52425f), ACE_NTOHL (0x4354524c), ACE_NTOHL (0x5f4d4f44), ACE_NTOHL (0x454c0000),  // name = ORB_CTRL_MODEL
-  20, ACE_NTOHL (0x53494e47), ACE_NTOHL (0x4c455f54), ACE_NTOHL (0x48524541), ACE_NTOHL (0x445f4d4f), ACE_NTOHL (0x44454c00),  // name = SINGLE_THREAD_MODEL
+  15,
+  ACE_NTOHL (0x4f52425f), 
+  ACE_NTOHL (0x4354524c), 
+  ACE_NTOHL (0x5f4d4f44), 
+  ACE_NTOHL (0x454c0000),  // name = ORB_CTRL_MODEL
+  20,
+  ACE_NTOHL (0x53494e47), 
+  ACE_NTOHL (0x4c455f54), 
+  ACE_NTOHL (0x48524541), 
+  ACE_NTOHL (0x445f4d4f), 
+  ACE_NTOHL (0x44454c00),  // name = SINGLE_THREAD_MODEL
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_ThreadPolicyValue), (char *) &_oc_PortableServer_ThreadPolicyValue, 0, sizeof (PortableServer::ThreadPolicyValue));
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicyValue (
+    CORBA::tk_enum,
+    sizeof (_oc_PortableServer_ThreadPolicyValue),
+    (char *) &_oc_PortableServer_ThreadPolicyValue,
+    0,
+    sizeof (PortableServer::ThreadPolicyValue)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ThreadPolicyValue, &_tc_TAO_tc_PortableServer_ThreadPolicyValue)
 TAO_NAMESPACE_END
 
-// default constructor
-PortableServer::ThreadPolicy::ThreadPolicy (void)
+// *************************************************************
+// Operations for class PortableServer::ThreadPolicy_var
+// *************************************************************
+
+PortableServer::ThreadPolicy_var::ThreadPolicy_var (void) // default constructor
+  : ptr_ (ThreadPolicy::_nil ())
+{}
+
+::PortableServer::ThreadPolicy_ptr
+PortableServer::ThreadPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableServer::ThreadPolicy_var::ThreadPolicy_var (const ::PortableServer::ThreadPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ThreadPolicy::_duplicate (p.ptr ()))
+{}
+
+PortableServer::ThreadPolicy_var::~ThreadPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableServer::ThreadPolicy_var &
+PortableServer::ThreadPolicy_var::operator= (ThreadPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::ThreadPolicy_var &
+PortableServer::ThreadPolicy_var::operator= (const ::PortableServer::ThreadPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableServer::ThreadPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableServer::ThreadPolicy_var::operator const ::PortableServer::ThreadPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableServer::ThreadPolicy_var::operator ::PortableServer::ThreadPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableServer::ThreadPolicy_ptr
+PortableServer::ThreadPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::ThreadPolicy_ptr
+PortableServer::ThreadPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::ThreadPolicy_ptr &
+PortableServer::ThreadPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableServer::ThreadPolicy_ptr &
+PortableServer::ThreadPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::ThreadPolicy::_nil ();
+  return this->ptr_;
+}
+
+::PortableServer::ThreadPolicy_ptr
+PortableServer::ThreadPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableServer::ThreadPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::PortableServer::ThreadPolicy::_nil ();
+  return val;
+}
+
+::PortableServer::ThreadPolicy_ptr
+PortableServer::ThreadPolicy_var::duplicate (ThreadPolicy_ptr p)
+{
+  return ::PortableServer::ThreadPolicy::_duplicate (p);
+}
+
+void
+PortableServer::ThreadPolicy_var::release (ThreadPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableServer::ThreadPolicy_ptr
+PortableServer::ThreadPolicy_var::nil (void)
+{
+  return ::PortableServer::ThreadPolicy::_nil ();
+}
+
+::PortableServer::ThreadPolicy_ptr
+PortableServer::ThreadPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableServer::ThreadPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableServer::ThreadPolicy_var::upcast (void *src)
+{
+  ThreadPolicy **tmp =
+    ACE_static_cast (ThreadPolicy **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class PortableServer::ThreadPolicy_out
+// *************************************************************
+
+PortableServer::ThreadPolicy_out::ThreadPolicy_out (ThreadPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableServer::ThreadPolicy::_nil ();
+}
+
+PortableServer::ThreadPolicy_out::ThreadPolicy_out (ThreadPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::ThreadPolicy::_nil ();
+}
+
+PortableServer::ThreadPolicy_out::ThreadPolicy_out (const ::PortableServer::ThreadPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ThreadPolicy_out &, p).ptr_)
 {}
 
+::PortableServer::ThreadPolicy_out &
+PortableServer::ThreadPolicy_out::operator= (const ::PortableServer::ThreadPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (ThreadPolicy_out&, p).ptr_;
+  return *this;
+}
+
+PortableServer::ThreadPolicy_out &
+PortableServer::ThreadPolicy_out::operator= (const ::PortableServer::ThreadPolicy_var &p)
+{
+  this->ptr_ = ::PortableServer::ThreadPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableServer::ThreadPolicy_out &
+PortableServer::ThreadPolicy_out::operator= (ThreadPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::ThreadPolicy_out::operator ::PortableServer::ThreadPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableServer::ThreadPolicy_ptr &
+PortableServer::ThreadPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableServer::ThreadPolicy_ptr
+PortableServer::ThreadPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+PortableServer::ThreadPolicy::ThreadPolicy ()
+{
+  }
+
 // destructor
 PortableServer::ThreadPolicy::~ThreadPolicy (void)
 {}
@@ -445,7 +751,7 @@ void *PortableServer::ThreadPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -461,22 +767,236 @@ const char* PortableServer::ThreadPolicy::_interface_repository_id (void) const
 static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4c), ACE_NTOHL (0x69666573), ACE_NTOHL (0x70616e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableServer/LifespanPolicyValue:1.0
-  20, ACE_NTOHL (0x4c696665), ACE_NTOHL (0x7370616e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500),  // name = LifespanPolicyValue
+  43,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f4c), 
+  ACE_NTOHL (0x69666573), 
+  ACE_NTOHL (0x70616e50), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x7956616c), 
+  ACE_NTOHL (0x75653a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableServer/LifespanPolicyValue:1.0
+  20,
+  ACE_NTOHL (0x4c696665), 
+  ACE_NTOHL (0x7370616e), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
+  ACE_NTOHL (0x6c756500),  // name = LifespanPolicyValue
   2, // member count
-  10, ACE_NTOHL (0x5452414e), ACE_NTOHL (0x5349454e), ACE_NTOHL (0x54000000),  // name = TRANSIENT
-  11, ACE_NTOHL (0x50455253), ACE_NTOHL (0x49535445), ACE_NTOHL (0x4e540000),  // name = PERSISTENT
+  10,
+  ACE_NTOHL (0x5452414e), 
+  ACE_NTOHL (0x5349454e), 
+  ACE_NTOHL (0x54000000),  // name = TRANSIENT
+  11,
+  ACE_NTOHL (0x50455253), 
+  ACE_NTOHL (0x49535445), 
+  ACE_NTOHL (0x4e540000),  // name = PERSISTENT
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_LifespanPolicyValue), (char *) &_oc_PortableServer_LifespanPolicyValue, 0, sizeof (PortableServer::LifespanPolicyValue));
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicyValue (
+    CORBA::tk_enum,
+    sizeof (_oc_PortableServer_LifespanPolicyValue),
+    (char *) &_oc_PortableServer_LifespanPolicyValue,
+    0,
+    sizeof (PortableServer::LifespanPolicyValue)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_LifespanPolicyValue, &_tc_TAO_tc_PortableServer_LifespanPolicyValue)
 TAO_NAMESPACE_END
 
-// default constructor
-PortableServer::LifespanPolicy::LifespanPolicy (void)
+// *************************************************************
+// Operations for class PortableServer::LifespanPolicy_var
+// *************************************************************
+
+PortableServer::LifespanPolicy_var::LifespanPolicy_var (void) // default constructor
+  : ptr_ (LifespanPolicy::_nil ())
+{}
+
+::PortableServer::LifespanPolicy_ptr
+PortableServer::LifespanPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableServer::LifespanPolicy_var::LifespanPolicy_var (const ::PortableServer::LifespanPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (LifespanPolicy::_duplicate (p.ptr ()))
+{}
+
+PortableServer::LifespanPolicy_var::~LifespanPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableServer::LifespanPolicy_var &
+PortableServer::LifespanPolicy_var::operator= (LifespanPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::LifespanPolicy_var &
+PortableServer::LifespanPolicy_var::operator= (const ::PortableServer::LifespanPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableServer::LifespanPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableServer::LifespanPolicy_var::operator const ::PortableServer::LifespanPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableServer::LifespanPolicy_var::operator ::PortableServer::LifespanPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableServer::LifespanPolicy_ptr
+PortableServer::LifespanPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::LifespanPolicy_ptr
+PortableServer::LifespanPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::LifespanPolicy_ptr &
+PortableServer::LifespanPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableServer::LifespanPolicy_ptr &
+PortableServer::LifespanPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::LifespanPolicy::_nil ();
+  return this->ptr_;
+}
+
+::PortableServer::LifespanPolicy_ptr
+PortableServer::LifespanPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableServer::LifespanPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::PortableServer::LifespanPolicy::_nil ();
+  return val;
+}
+
+::PortableServer::LifespanPolicy_ptr
+PortableServer::LifespanPolicy_var::duplicate (LifespanPolicy_ptr p)
+{
+  return ::PortableServer::LifespanPolicy::_duplicate (p);
+}
+
+void
+PortableServer::LifespanPolicy_var::release (LifespanPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableServer::LifespanPolicy_ptr
+PortableServer::LifespanPolicy_var::nil (void)
+{
+  return ::PortableServer::LifespanPolicy::_nil ();
+}
+
+::PortableServer::LifespanPolicy_ptr
+PortableServer::LifespanPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableServer::LifespanPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableServer::LifespanPolicy_var::upcast (void *src)
+{
+  LifespanPolicy **tmp =
+    ACE_static_cast (LifespanPolicy **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class PortableServer::LifespanPolicy_out
+// *************************************************************
+
+PortableServer::LifespanPolicy_out::LifespanPolicy_out (LifespanPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableServer::LifespanPolicy::_nil ();
+}
+
+PortableServer::LifespanPolicy_out::LifespanPolicy_out (LifespanPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::LifespanPolicy::_nil ();
+}
+
+PortableServer::LifespanPolicy_out::LifespanPolicy_out (const ::PortableServer::LifespanPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (LifespanPolicy_out &, p).ptr_)
 {}
 
+::PortableServer::LifespanPolicy_out &
+PortableServer::LifespanPolicy_out::operator= (const ::PortableServer::LifespanPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (LifespanPolicy_out&, p).ptr_;
+  return *this;
+}
+
+PortableServer::LifespanPolicy_out &
+PortableServer::LifespanPolicy_out::operator= (const ::PortableServer::LifespanPolicy_var &p)
+{
+  this->ptr_ = ::PortableServer::LifespanPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableServer::LifespanPolicy_out &
+PortableServer::LifespanPolicy_out::operator= (LifespanPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::LifespanPolicy_out::operator ::PortableServer::LifespanPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableServer::LifespanPolicy_ptr &
+PortableServer::LifespanPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableServer::LifespanPolicy_ptr
+PortableServer::LifespanPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+PortableServer::LifespanPolicy::LifespanPolicy ()
+{
+  }
+
 // destructor
 PortableServer::LifespanPolicy::~LifespanPolicy (void)
 {}
@@ -541,7 +1061,7 @@ void *PortableServer::LifespanPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -555,22 +1075,238 @@ const char* PortableServer::LifespanPolicy::_interface_repository_id (void) cons
 static const CORBA::Long _oc_PortableServer_IdUniquenessPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64556e69), ACE_NTOHL (0x7175656e), ACE_NTOHL (0x65737350), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableServer/IdUniquenessPolicyValue:1.0
-  24, ACE_NTOHL (0x4964556e), ACE_NTOHL (0x69717565), ACE_NTOHL (0x6e657373), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500),  // name = IdUniquenessPolicyValue
+  47,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x64556e69), 
+  ACE_NTOHL (0x7175656e), 
+  ACE_NTOHL (0x65737350), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x7956616c), 
+  ACE_NTOHL (0x75653a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableServer/IdUniquenessPolicyValue:1.0
+  24,
+  ACE_NTOHL (0x4964556e), 
+  ACE_NTOHL (0x69717565), 
+  ACE_NTOHL (0x6e657373), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
+  ACE_NTOHL (0x6c756500),  // name = IdUniquenessPolicyValue
   2, // member count
-  10, ACE_NTOHL (0x554e4951), ACE_NTOHL (0x55455f49), ACE_NTOHL (0x44000000),  // name = UNIQUE_ID
-  12, ACE_NTOHL (0x4d554c54), ACE_NTOHL (0x49504c45), ACE_NTOHL (0x5f494400),  // name = MULTIPLE_ID
+  10,
+  ACE_NTOHL (0x554e4951), 
+  ACE_NTOHL (0x55455f49), 
+  ACE_NTOHL (0x44000000),  // name = UNIQUE_ID
+  12,
+  ACE_NTOHL (0x4d554c54), 
+  ACE_NTOHL (0x49504c45), 
+  ACE_NTOHL (0x5f494400),  // name = MULTIPLE_ID
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_IdUniquenessPolicyValue), (char *) &_oc_PortableServer_IdUniquenessPolicyValue, 0, sizeof (PortableServer::IdUniquenessPolicyValue));
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicyValue (
+    CORBA::tk_enum,
+    sizeof (_oc_PortableServer_IdUniquenessPolicyValue),
+    (char *) &_oc_PortableServer_IdUniquenessPolicyValue,
+    0,
+    sizeof (PortableServer::IdUniquenessPolicyValue)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IdUniquenessPolicyValue, &_tc_TAO_tc_PortableServer_IdUniquenessPolicyValue)
 TAO_NAMESPACE_END
 
-// default constructor
-PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
+// *************************************************************
+// Operations for class PortableServer::IdUniquenessPolicy_var
+// *************************************************************
+
+PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (void) // default constructor
+  : ptr_ (IdUniquenessPolicy::_nil ())
+{}
+
+::PortableServer::IdUniquenessPolicy_ptr
+PortableServer::IdUniquenessPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (const ::PortableServer::IdUniquenessPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (IdUniquenessPolicy::_duplicate (p.ptr ()))
 {}
 
+PortableServer::IdUniquenessPolicy_var::~IdUniquenessPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableServer::IdUniquenessPolicy_var &
+PortableServer::IdUniquenessPolicy_var::operator= (IdUniquenessPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::IdUniquenessPolicy_var &
+PortableServer::IdUniquenessPolicy_var::operator= (const ::PortableServer::IdUniquenessPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableServer::IdUniquenessPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableServer::IdUniquenessPolicy_var::operator const ::PortableServer::IdUniquenessPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableServer::IdUniquenessPolicy_var::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableServer::IdUniquenessPolicy_ptr
+PortableServer::IdUniquenessPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::IdUniquenessPolicy_ptr
+PortableServer::IdUniquenessPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::IdUniquenessPolicy_ptr &
+PortableServer::IdUniquenessPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableServer::IdUniquenessPolicy_ptr &
+PortableServer::IdUniquenessPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::IdUniquenessPolicy::_nil ();
+  return this->ptr_;
+}
+
+::PortableServer::IdUniquenessPolicy_ptr
+PortableServer::IdUniquenessPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableServer::IdUniquenessPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::PortableServer::IdUniquenessPolicy::_nil ();
+  return val;
+}
+
+::PortableServer::IdUniquenessPolicy_ptr
+PortableServer::IdUniquenessPolicy_var::duplicate (IdUniquenessPolicy_ptr p)
+{
+  return ::PortableServer::IdUniquenessPolicy::_duplicate (p);
+}
+
+void
+PortableServer::IdUniquenessPolicy_var::release (IdUniquenessPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableServer::IdUniquenessPolicy_ptr
+PortableServer::IdUniquenessPolicy_var::nil (void)
+{
+  return ::PortableServer::IdUniquenessPolicy::_nil ();
+}
+
+::PortableServer::IdUniquenessPolicy_ptr
+PortableServer::IdUniquenessPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableServer::IdUniquenessPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableServer::IdUniquenessPolicy_var::upcast (void *src)
+{
+  IdUniquenessPolicy **tmp =
+    ACE_static_cast (IdUniquenessPolicy **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class PortableServer::IdUniquenessPolicy_out
+// *************************************************************
+
+PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableServer::IdUniquenessPolicy::_nil ();
+}
+
+PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (IdUniquenessPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::IdUniquenessPolicy::_nil ();
+}
+
+PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (const ::PortableServer::IdUniquenessPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (IdUniquenessPolicy_out &, p).ptr_)
+{}
+
+::PortableServer::IdUniquenessPolicy_out &
+PortableServer::IdUniquenessPolicy_out::operator= (const ::PortableServer::IdUniquenessPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (IdUniquenessPolicy_out&, p).ptr_;
+  return *this;
+}
+
+PortableServer::IdUniquenessPolicy_out &
+PortableServer::IdUniquenessPolicy_out::operator= (const ::PortableServer::IdUniquenessPolicy_var &p)
+{
+  this->ptr_ = ::PortableServer::IdUniquenessPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableServer::IdUniquenessPolicy_out &
+PortableServer::IdUniquenessPolicy_out::operator= (IdUniquenessPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::IdUniquenessPolicy_out::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableServer::IdUniquenessPolicy_ptr &
+PortableServer::IdUniquenessPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableServer::IdUniquenessPolicy_ptr
+PortableServer::IdUniquenessPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+PortableServer::IdUniquenessPolicy::IdUniquenessPolicy ()
+{
+  }
+
 // destructor
 PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
 {}
@@ -635,7 +1371,7 @@ void *PortableServer::IdUniquenessPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -649,22 +1385,237 @@ const char* PortableServer::IdUniquenessPolicy::_interface_repository_id (void)
 static const CORBA::Long _oc_PortableServer_IdAssignmentPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64417373), ACE_NTOHL (0x69676e6d), ACE_NTOHL (0x656e7450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableServer/IdAssignmentPolicyValue:1.0
-  24, ACE_NTOHL (0x49644173), ACE_NTOHL (0x7369676e), ACE_NTOHL (0x6d656e74), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500),  // name = IdAssignmentPolicyValue
+  47,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x64417373), 
+  ACE_NTOHL (0x69676e6d), 
+  ACE_NTOHL (0x656e7450), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x7956616c), 
+  ACE_NTOHL (0x75653a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableServer/IdAssignmentPolicyValue:1.0
+  24,
+  ACE_NTOHL (0x49644173), 
+  ACE_NTOHL (0x7369676e), 
+  ACE_NTOHL (0x6d656e74), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
+  ACE_NTOHL (0x6c756500),  // name = IdAssignmentPolicyValue
   2, // member count
-  8, ACE_NTOHL (0x55534552), ACE_NTOHL (0x5f494400),  // name = USER_ID
-  10, ACE_NTOHL (0x53595354), ACE_NTOHL (0x454d5f49), ACE_NTOHL (0x44000000),  // name = SYSTEM_ID
+  8,
+  ACE_NTOHL (0x55534552), 
+  ACE_NTOHL (0x5f494400),  // name = USER_ID
+  10,
+  ACE_NTOHL (0x53595354), 
+  ACE_NTOHL (0x454d5f49), 
+  ACE_NTOHL (0x44000000),  // name = SYSTEM_ID
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_IdAssignmentPolicyValue), (char *) &_oc_PortableServer_IdAssignmentPolicyValue, 0, sizeof (PortableServer::IdAssignmentPolicyValue));
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicyValue (
+    CORBA::tk_enum,
+    sizeof (_oc_PortableServer_IdAssignmentPolicyValue),
+    (char *) &_oc_PortableServer_IdAssignmentPolicyValue,
+    0,
+    sizeof (PortableServer::IdAssignmentPolicyValue)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IdAssignmentPolicyValue, &_tc_TAO_tc_PortableServer_IdAssignmentPolicyValue)
 TAO_NAMESPACE_END
 
-// default constructor
-PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
+// *************************************************************
+// Operations for class PortableServer::IdAssignmentPolicy_var
+// *************************************************************
+
+PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (void) // default constructor
+  : ptr_ (IdAssignmentPolicy::_nil ())
 {}
 
+::PortableServer::IdAssignmentPolicy_ptr
+PortableServer::IdAssignmentPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (const ::PortableServer::IdAssignmentPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (IdAssignmentPolicy::_duplicate (p.ptr ()))
+{}
+
+PortableServer::IdAssignmentPolicy_var::~IdAssignmentPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableServer::IdAssignmentPolicy_var &
+PortableServer::IdAssignmentPolicy_var::operator= (IdAssignmentPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::IdAssignmentPolicy_var &
+PortableServer::IdAssignmentPolicy_var::operator= (const ::PortableServer::IdAssignmentPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableServer::IdAssignmentPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableServer::IdAssignmentPolicy_var::operator const ::PortableServer::IdAssignmentPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableServer::IdAssignmentPolicy_var::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableServer::IdAssignmentPolicy_ptr
+PortableServer::IdAssignmentPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::IdAssignmentPolicy_ptr
+PortableServer::IdAssignmentPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::IdAssignmentPolicy_ptr &
+PortableServer::IdAssignmentPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableServer::IdAssignmentPolicy_ptr &
+PortableServer::IdAssignmentPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::IdAssignmentPolicy::_nil ();
+  return this->ptr_;
+}
+
+::PortableServer::IdAssignmentPolicy_ptr
+PortableServer::IdAssignmentPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableServer::IdAssignmentPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::PortableServer::IdAssignmentPolicy::_nil ();
+  return val;
+}
+
+::PortableServer::IdAssignmentPolicy_ptr
+PortableServer::IdAssignmentPolicy_var::duplicate (IdAssignmentPolicy_ptr p)
+{
+  return ::PortableServer::IdAssignmentPolicy::_duplicate (p);
+}
+
+void
+PortableServer::IdAssignmentPolicy_var::release (IdAssignmentPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableServer::IdAssignmentPolicy_ptr
+PortableServer::IdAssignmentPolicy_var::nil (void)
+{
+  return ::PortableServer::IdAssignmentPolicy::_nil ();
+}
+
+::PortableServer::IdAssignmentPolicy_ptr
+PortableServer::IdAssignmentPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableServer::IdAssignmentPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableServer::IdAssignmentPolicy_var::upcast (void *src)
+{
+  IdAssignmentPolicy **tmp =
+    ACE_static_cast (IdAssignmentPolicy **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class PortableServer::IdAssignmentPolicy_out
+// *************************************************************
+
+PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableServer::IdAssignmentPolicy::_nil ();
+}
+
+PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (IdAssignmentPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::IdAssignmentPolicy::_nil ();
+}
+
+PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (const ::PortableServer::IdAssignmentPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (IdAssignmentPolicy_out &, p).ptr_)
+{}
+
+::PortableServer::IdAssignmentPolicy_out &
+PortableServer::IdAssignmentPolicy_out::operator= (const ::PortableServer::IdAssignmentPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (IdAssignmentPolicy_out&, p).ptr_;
+  return *this;
+}
+
+PortableServer::IdAssignmentPolicy_out &
+PortableServer::IdAssignmentPolicy_out::operator= (const ::PortableServer::IdAssignmentPolicy_var &p)
+{
+  this->ptr_ = ::PortableServer::IdAssignmentPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableServer::IdAssignmentPolicy_out &
+PortableServer::IdAssignmentPolicy_out::operator= (IdAssignmentPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::IdAssignmentPolicy_out::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableServer::IdAssignmentPolicy_ptr &
+PortableServer::IdAssignmentPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableServer::IdAssignmentPolicy_ptr
+PortableServer::IdAssignmentPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+PortableServer::IdAssignmentPolicy::IdAssignmentPolicy ()
+{
+  }
+
 // destructor
 PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
 {}
@@ -729,7 +1680,7 @@ void *PortableServer::IdAssignmentPolicy::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -745,22 +1696,247 @@ const char* PortableServer::IdAssignmentPolicy::_interface_repository_id (void)
 static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  53, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x6d706c69), ACE_NTOHL (0x63697441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:PortableServer/ImplicitActivationPolicyValue:1.0
-  30, ACE_NTOHL (0x496d706c), ACE_NTOHL (0x69636974), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000),  // name = ImplicitActivationPolicyValue
+  53,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x6d706c69), 
+  ACE_NTOHL (0x63697441), 
+  ACE_NTOHL (0x63746976), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e506f6c), 
+  ACE_NTOHL (0x69637956), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:PortableServer/ImplicitActivationPolicyValue:1.0
+  30,
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x69636974), 
+  ACE_NTOHL (0x41637469), 
+  ACE_NTOHL (0x76617469), 
+  ACE_NTOHL (0x6f6e506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x56616c75), 
+  ACE_NTOHL (0x65000000),  // name = ImplicitActivationPolicyValue
   2, // member count
-  20, ACE_NTOHL (0x494d504c), ACE_NTOHL (0x49434954), ACE_NTOHL (0x5f414354), ACE_NTOHL (0x49564154), ACE_NTOHL (0x494f4e00),  // name = IMPLICIT_ACTIVATION
-  23, ACE_NTOHL (0x4e4f5f49), ACE_NTOHL (0x4d504c49), ACE_NTOHL (0x4349545f), ACE_NTOHL (0x41435449), ACE_NTOHL (0x56415449), ACE_NTOHL (0x4f4e0000),  // name = NO_IMPLICIT_ACTIVATION
+  20,
+  ACE_NTOHL (0x494d504c), 
+  ACE_NTOHL (0x49434954), 
+  ACE_NTOHL (0x5f414354), 
+  ACE_NTOHL (0x49564154), 
+  ACE_NTOHL (0x494f4e00),  // name = IMPLICIT_ACTIVATION
+  23,
+  ACE_NTOHL (0x4e4f5f49), 
+  ACE_NTOHL (0x4d504c49), 
+  ACE_NTOHL (0x4349545f), 
+  ACE_NTOHL (0x41435449), 
+  ACE_NTOHL (0x56415449), 
+  ACE_NTOHL (0x4f4e0000),  // name = NO_IMPLICIT_ACTIVATION
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_ImplicitActivationPolicyValue), (char *) &_oc_PortableServer_ImplicitActivationPolicyValue, 0, sizeof (PortableServer::ImplicitActivationPolicyValue));
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue (
+    CORBA::tk_enum,
+    sizeof (_oc_PortableServer_ImplicitActivationPolicyValue),
+    (char *) &_oc_PortableServer_ImplicitActivationPolicyValue,
+    0,
+    sizeof (PortableServer::ImplicitActivationPolicyValue)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ImplicitActivationPolicyValue, &_tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue)
 TAO_NAMESPACE_END
 
-// default constructor
-PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
+// *************************************************************
+// Operations for class PortableServer::ImplicitActivationPolicy_var
+// *************************************************************
+
+PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (void) // default constructor
+  : ptr_ (ImplicitActivationPolicy::_nil ())
 {}
 
+::PortableServer::ImplicitActivationPolicy_ptr
+PortableServer::ImplicitActivationPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (const ::PortableServer::ImplicitActivationPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ImplicitActivationPolicy::_duplicate (p.ptr ()))
+{}
+
+PortableServer::ImplicitActivationPolicy_var::~ImplicitActivationPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableServer::ImplicitActivationPolicy_var &
+PortableServer::ImplicitActivationPolicy_var::operator= (ImplicitActivationPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::ImplicitActivationPolicy_var &
+PortableServer::ImplicitActivationPolicy_var::operator= (const ::PortableServer::ImplicitActivationPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableServer::ImplicitActivationPolicy_var::operator const ::PortableServer::ImplicitActivationPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableServer::ImplicitActivationPolicy_var::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableServer::ImplicitActivationPolicy_ptr
+PortableServer::ImplicitActivationPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::ImplicitActivationPolicy_ptr
+PortableServer::ImplicitActivationPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::ImplicitActivationPolicy_ptr &
+PortableServer::ImplicitActivationPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableServer::ImplicitActivationPolicy_ptr &
+PortableServer::ImplicitActivationPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_nil ();
+  return this->ptr_;
+}
+
+::PortableServer::ImplicitActivationPolicy_ptr
+PortableServer::ImplicitActivationPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableServer::ImplicitActivationPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_nil ();
+  return val;
+}
+
+::PortableServer::ImplicitActivationPolicy_ptr
+PortableServer::ImplicitActivationPolicy_var::duplicate (ImplicitActivationPolicy_ptr p)
+{
+  return ::PortableServer::ImplicitActivationPolicy::_duplicate (p);
+}
+
+void
+PortableServer::ImplicitActivationPolicy_var::release (ImplicitActivationPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableServer::ImplicitActivationPolicy_ptr
+PortableServer::ImplicitActivationPolicy_var::nil (void)
+{
+  return ::PortableServer::ImplicitActivationPolicy::_nil ();
+}
+
+::PortableServer::ImplicitActivationPolicy_ptr
+PortableServer::ImplicitActivationPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableServer::ImplicitActivationPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableServer::ImplicitActivationPolicy_var::upcast (void *src)
+{
+  ImplicitActivationPolicy **tmp =
+    ACE_static_cast (ImplicitActivationPolicy **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class PortableServer::ImplicitActivationPolicy_out
+// *************************************************************
+
+PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_nil ();
+}
+
+PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (ImplicitActivationPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_nil ();
+}
+
+PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (const ::PortableServer::ImplicitActivationPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ImplicitActivationPolicy_out &, p).ptr_)
+{}
+
+::PortableServer::ImplicitActivationPolicy_out &
+PortableServer::ImplicitActivationPolicy_out::operator= (const ::PortableServer::ImplicitActivationPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (ImplicitActivationPolicy_out&, p).ptr_;
+  return *this;
+}
+
+PortableServer::ImplicitActivationPolicy_out &
+PortableServer::ImplicitActivationPolicy_out::operator= (const ::PortableServer::ImplicitActivationPolicy_var &p)
+{
+  this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableServer::ImplicitActivationPolicy_out &
+PortableServer::ImplicitActivationPolicy_out::operator= (ImplicitActivationPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::ImplicitActivationPolicy_out::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableServer::ImplicitActivationPolicy_ptr &
+PortableServer::ImplicitActivationPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableServer::ImplicitActivationPolicy_ptr
+PortableServer::ImplicitActivationPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy ()
+{
+  }
+
 // destructor
 PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
 {}
@@ -825,7 +2001,7 @@ void *PortableServer::ImplicitActivationPolicy::_tao_QueryInterface (ptr_arith_t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -839,22 +2015,239 @@ const char* PortableServer::ImplicitActivationPolicy::_interface_repository_id (
 static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  51, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e745265), ACE_NTOHL (0x74656e74), ACE_NTOHL (0x696f6e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableServer/ServantRetentionPolicyValue:1.0
-  28, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7452), ACE_NTOHL (0x6574656e), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500),  // name = ServantRetentionPolicyValue
+  51,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f53), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x74656e74), 
+  ACE_NTOHL (0x696f6e50), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x7956616c), 
+  ACE_NTOHL (0x75653a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:PortableServer/ServantRetentionPolicyValue:1.0
+  28,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e7452), 
+  ACE_NTOHL (0x6574656e), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
+  ACE_NTOHL (0x6c756500),  // name = ServantRetentionPolicyValue
   2, // member count
-  7, ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e0000),  // name = RETAIN
-  11, ACE_NTOHL (0x4e4f4e5f), ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e0000),  // name = NON_RETAIN
+  7,
+  ACE_NTOHL (0x52455441), 
+  ACE_NTOHL (0x494e0000),  // name = RETAIN
+  11,
+  ACE_NTOHL (0x4e4f4e5f), 
+  ACE_NTOHL (0x52455441), 
+  ACE_NTOHL (0x494e0000),  // name = NON_RETAIN
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_ServantRetentionPolicyValue), (char *) &_oc_PortableServer_ServantRetentionPolicyValue, 0, sizeof (PortableServer::ServantRetentionPolicyValue));
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicyValue (
+    CORBA::tk_enum,
+    sizeof (_oc_PortableServer_ServantRetentionPolicyValue),
+    (char *) &_oc_PortableServer_ServantRetentionPolicyValue,
+    0,
+    sizeof (PortableServer::ServantRetentionPolicyValue)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServantRetentionPolicyValue, &_tc_TAO_tc_PortableServer_ServantRetentionPolicyValue)
 TAO_NAMESPACE_END
 
-// default constructor
-PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
+// *************************************************************
+// Operations for class PortableServer::ServantRetentionPolicy_var
+// *************************************************************
+
+PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (void) // default constructor
+  : ptr_ (ServantRetentionPolicy::_nil ())
+{}
+
+::PortableServer::ServantRetentionPolicy_ptr
+PortableServer::ServantRetentionPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (const ::PortableServer::ServantRetentionPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ServantRetentionPolicy::_duplicate (p.ptr ()))
 {}
 
+PortableServer::ServantRetentionPolicy_var::~ServantRetentionPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableServer::ServantRetentionPolicy_var &
+PortableServer::ServantRetentionPolicy_var::operator= (ServantRetentionPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::ServantRetentionPolicy_var &
+PortableServer::ServantRetentionPolicy_var::operator= (const ::PortableServer::ServantRetentionPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableServer::ServantRetentionPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableServer::ServantRetentionPolicy_var::operator const ::PortableServer::ServantRetentionPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableServer::ServantRetentionPolicy_var::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantRetentionPolicy_ptr
+PortableServer::ServantRetentionPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantRetentionPolicy_ptr
+PortableServer::ServantRetentionPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantRetentionPolicy_ptr &
+PortableServer::ServantRetentionPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantRetentionPolicy_ptr &
+PortableServer::ServantRetentionPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::ServantRetentionPolicy::_nil ();
+  return this->ptr_;
+}
+
+::PortableServer::ServantRetentionPolicy_ptr
+PortableServer::ServantRetentionPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableServer::ServantRetentionPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::PortableServer::ServantRetentionPolicy::_nil ();
+  return val;
+}
+
+::PortableServer::ServantRetentionPolicy_ptr
+PortableServer::ServantRetentionPolicy_var::duplicate (ServantRetentionPolicy_ptr p)
+{
+  return ::PortableServer::ServantRetentionPolicy::_duplicate (p);
+}
+
+void
+PortableServer::ServantRetentionPolicy_var::release (ServantRetentionPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableServer::ServantRetentionPolicy_ptr
+PortableServer::ServantRetentionPolicy_var::nil (void)
+{
+  return ::PortableServer::ServantRetentionPolicy::_nil ();
+}
+
+::PortableServer::ServantRetentionPolicy_ptr
+PortableServer::ServantRetentionPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableServer::ServantRetentionPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableServer::ServantRetentionPolicy_var::upcast (void *src)
+{
+  ServantRetentionPolicy **tmp =
+    ACE_static_cast (ServantRetentionPolicy **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class PortableServer::ServantRetentionPolicy_out
+// *************************************************************
+
+PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableServer::ServantRetentionPolicy::_nil ();
+}
+
+PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (ServantRetentionPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::ServantRetentionPolicy::_nil ();
+}
+
+PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (const ::PortableServer::ServantRetentionPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ServantRetentionPolicy_out &, p).ptr_)
+{}
+
+::PortableServer::ServantRetentionPolicy_out &
+PortableServer::ServantRetentionPolicy_out::operator= (const ::PortableServer::ServantRetentionPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (ServantRetentionPolicy_out&, p).ptr_;
+  return *this;
+}
+
+PortableServer::ServantRetentionPolicy_out &
+PortableServer::ServantRetentionPolicy_out::operator= (const ::PortableServer::ServantRetentionPolicy_var &p)
+{
+  this->ptr_ = ::PortableServer::ServantRetentionPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableServer::ServantRetentionPolicy_out &
+PortableServer::ServantRetentionPolicy_out::operator= (ServantRetentionPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::ServantRetentionPolicy_out::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantRetentionPolicy_ptr &
+PortableServer::ServantRetentionPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantRetentionPolicy_ptr
+PortableServer::ServantRetentionPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+PortableServer::ServantRetentionPolicy::ServantRetentionPolicy ()
+{
+  }
+
 // destructor
 PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
 {}
@@ -919,7 +2312,7 @@ void *PortableServer::ServantRetentionPolicy::_tao_QueryInterface (ptr_arith_t t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -933,23 +2326,253 @@ const char* PortableServer::ServantRetentionPolicy::_interface_repository_id (vo
 static const CORBA::Long _oc_PortableServer_RequestProcessingPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  52, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f52), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73745072), ACE_NTOHL (0x6f636573), ACE_NTOHL (0x73696e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c75653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/RequestProcessingPolicyValue:1.0
-  29, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737450), ACE_NTOHL (0x726f6365), ACE_NTOHL (0x7373696e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0),  // name = RequestProcessingPolicyValue
+  52,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f52), 
+  ACE_NTOHL (0x65717565), 
+  ACE_NTOHL (0x73745072), 
+  ACE_NTOHL (0x6f636573), 
+  ACE_NTOHL (0x73696e67), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
+  ACE_NTOHL (0x6c75653a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/RequestProcessingPolicyValue:1.0
+  29,
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737450), 
+  ACE_NTOHL (0x726f6365), 
+  ACE_NTOHL (0x7373696e), 
+  ACE_NTOHL (0x67506f6c), 
+  ACE_NTOHL (0x69637956), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x0),  // name = RequestProcessingPolicyValue
   3, // member count
-  27, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x41435449), ACE_NTOHL (0x56455f4f), ACE_NTOHL (0x424a4543), ACE_NTOHL (0x545f4d41), ACE_NTOHL (0x505f4f4e), ACE_NTOHL (0x4c590000),  // name = USE_ACTIVE_OBJECT_MAP_ONLY
-  20, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x44454641), ACE_NTOHL (0x554c545f), ACE_NTOHL (0x53455256), ACE_NTOHL (0x414e5400),  // name = USE_DEFAULT_SERVANT
-  20, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x53455256), ACE_NTOHL (0x414e545f), ACE_NTOHL (0x4d414e41), ACE_NTOHL (0x47455200),  // name = USE_SERVANT_MANAGER
+  27,
+  ACE_NTOHL (0x5553455f), 
+  ACE_NTOHL (0x41435449), 
+  ACE_NTOHL (0x56455f4f), 
+  ACE_NTOHL (0x424a4543), 
+  ACE_NTOHL (0x545f4d41), 
+  ACE_NTOHL (0x505f4f4e), 
+  ACE_NTOHL (0x4c590000),  // name = USE_ACTIVE_OBJECT_MAP_ONLY
+  20,
+  ACE_NTOHL (0x5553455f), 
+  ACE_NTOHL (0x44454641), 
+  ACE_NTOHL (0x554c545f), 
+  ACE_NTOHL (0x53455256), 
+  ACE_NTOHL (0x414e5400),  // name = USE_DEFAULT_SERVANT
+  20,
+  ACE_NTOHL (0x5553455f), 
+  ACE_NTOHL (0x53455256), 
+  ACE_NTOHL (0x414e545f), 
+  ACE_NTOHL (0x4d414e41), 
+  ACE_NTOHL (0x47455200),  // name = USE_SERVANT_MANAGER
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicyValue (CORBA::tk_enum, sizeof (_oc_PortableServer_RequestProcessingPolicyValue), (char *) &_oc_PortableServer_RequestProcessingPolicyValue, 0, sizeof (PortableServer::RequestProcessingPolicyValue));
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicyValue (
+    CORBA::tk_enum,
+    sizeof (_oc_PortableServer_RequestProcessingPolicyValue),
+    (char *) &_oc_PortableServer_RequestProcessingPolicyValue,
+    0,
+    sizeof (PortableServer::RequestProcessingPolicyValue)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (PortableServer)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestProcessingPolicyValue, &_tc_TAO_tc_PortableServer_RequestProcessingPolicyValue)
 TAO_NAMESPACE_END
 
-// default constructor
-PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
+// *************************************************************
+// Operations for class PortableServer::RequestProcessingPolicy_var
+// *************************************************************
+
+PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (void) // default constructor
+  : ptr_ (RequestProcessingPolicy::_nil ())
 {}
 
+::PortableServer::RequestProcessingPolicy_ptr
+PortableServer::RequestProcessingPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (const ::PortableServer::RequestProcessingPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (RequestProcessingPolicy::_duplicate (p.ptr ()))
+{}
+
+PortableServer::RequestProcessingPolicy_var::~RequestProcessingPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableServer::RequestProcessingPolicy_var &
+PortableServer::RequestProcessingPolicy_var::operator= (RequestProcessingPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::RequestProcessingPolicy_var &
+PortableServer::RequestProcessingPolicy_var::operator= (const ::PortableServer::RequestProcessingPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableServer::RequestProcessingPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableServer::RequestProcessingPolicy_var::operator const ::PortableServer::RequestProcessingPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableServer::RequestProcessingPolicy_var::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableServer::RequestProcessingPolicy_ptr
+PortableServer::RequestProcessingPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::RequestProcessingPolicy_ptr
+PortableServer::RequestProcessingPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::RequestProcessingPolicy_ptr &
+PortableServer::RequestProcessingPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableServer::RequestProcessingPolicy_ptr &
+PortableServer::RequestProcessingPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::RequestProcessingPolicy::_nil ();
+  return this->ptr_;
+}
+
+::PortableServer::RequestProcessingPolicy_ptr
+PortableServer::RequestProcessingPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableServer::RequestProcessingPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::PortableServer::RequestProcessingPolicy::_nil ();
+  return val;
+}
+
+::PortableServer::RequestProcessingPolicy_ptr
+PortableServer::RequestProcessingPolicy_var::duplicate (RequestProcessingPolicy_ptr p)
+{
+  return ::PortableServer::RequestProcessingPolicy::_duplicate (p);
+}
+
+void
+PortableServer::RequestProcessingPolicy_var::release (RequestProcessingPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableServer::RequestProcessingPolicy_ptr
+PortableServer::RequestProcessingPolicy_var::nil (void)
+{
+  return ::PortableServer::RequestProcessingPolicy::_nil ();
+}
+
+::PortableServer::RequestProcessingPolicy_ptr
+PortableServer::RequestProcessingPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableServer::RequestProcessingPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableServer::RequestProcessingPolicy_var::upcast (void *src)
+{
+  RequestProcessingPolicy **tmp =
+    ACE_static_cast (RequestProcessingPolicy **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class PortableServer::RequestProcessingPolicy_out
+// *************************************************************
+
+PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableServer::RequestProcessingPolicy::_nil ();
+}
+
+PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (RequestProcessingPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::RequestProcessingPolicy::_nil ();
+}
+
+PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (const ::PortableServer::RequestProcessingPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (RequestProcessingPolicy_out &, p).ptr_)
+{}
+
+::PortableServer::RequestProcessingPolicy_out &
+PortableServer::RequestProcessingPolicy_out::operator= (const ::PortableServer::RequestProcessingPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (RequestProcessingPolicy_out&, p).ptr_;
+  return *this;
+}
+
+PortableServer::RequestProcessingPolicy_out &
+PortableServer::RequestProcessingPolicy_out::operator= (const ::PortableServer::RequestProcessingPolicy_var &p)
+{
+  this->ptr_ = ::PortableServer::RequestProcessingPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableServer::RequestProcessingPolicy_out &
+PortableServer::RequestProcessingPolicy_out::operator= (RequestProcessingPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::RequestProcessingPolicy_out::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableServer::RequestProcessingPolicy_ptr &
+PortableServer::RequestProcessingPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableServer::RequestProcessingPolicy_ptr
+PortableServer::RequestProcessingPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+PortableServer::RequestProcessingPolicy::RequestProcessingPolicy ()
+{
+  }
+
 // destructor
 PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
 {}
@@ -1014,7 +2637,7 @@ void *PortableServer::RequestProcessingPolicy::_tao_QueryInterface (ptr_arith_t
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1027,10 +2650,194 @@ const char* PortableServer::RequestProcessingPolicy::_interface_repository_id (v
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-// default constructor
-PortableServer::POAManager::POAManager (void)
+// *************************************************************
+// Operations for class PortableServer::POAManager_var
+// *************************************************************
+
+PortableServer::POAManager_var::POAManager_var (void) // default constructor
+  : ptr_ (POAManager::_nil ())
 {}
 
+::PortableServer::POAManager_ptr
+PortableServer::POAManager_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableServer::POAManager_var::POAManager_var (const ::PortableServer::POAManager_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (POAManager::_duplicate (p.ptr ()))
+{}
+
+PortableServer::POAManager_var::~POAManager_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableServer::POAManager_var &
+PortableServer::POAManager_var::operator= (POAManager_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::POAManager_var &
+PortableServer::POAManager_var::operator= (const ::PortableServer::POAManager_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableServer::POAManager::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableServer::POAManager_var::operator const ::PortableServer::POAManager_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableServer::POAManager_var::operator ::PortableServer::POAManager_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableServer::POAManager_ptr
+PortableServer::POAManager_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::POAManager_ptr
+PortableServer::POAManager_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::POAManager_ptr &
+PortableServer::POAManager_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableServer::POAManager_ptr &
+PortableServer::POAManager_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::POAManager::_nil ();
+  return this->ptr_;
+}
+
+::PortableServer::POAManager_ptr
+PortableServer::POAManager_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableServer::POAManager_ptr val = this->ptr_;
+  this->ptr_ = ::PortableServer::POAManager::_nil ();
+  return val;
+}
+
+::PortableServer::POAManager_ptr
+PortableServer::POAManager_var::duplicate (POAManager_ptr p)
+{
+  return ::PortableServer::POAManager::_duplicate (p);
+}
+
+void
+PortableServer::POAManager_var::release (POAManager_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableServer::POAManager_ptr
+PortableServer::POAManager_var::nil (void)
+{
+  return ::PortableServer::POAManager::_nil ();
+}
+
+::PortableServer::POAManager_ptr
+PortableServer::POAManager_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableServer::POAManager::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableServer::POAManager_var::upcast (void *src)
+{
+  POAManager **tmp =
+    ACE_static_cast (POAManager **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class PortableServer::POAManager_out
+// *************************************************************
+
+PortableServer::POAManager_out::POAManager_out (POAManager_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableServer::POAManager::_nil ();
+}
+
+PortableServer::POAManager_out::POAManager_out (POAManager_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::POAManager::_nil ();
+}
+
+PortableServer::POAManager_out::POAManager_out (const ::PortableServer::POAManager_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (POAManager_out &, p).ptr_)
+{}
+
+::PortableServer::POAManager_out &
+PortableServer::POAManager_out::operator= (const ::PortableServer::POAManager_out &p)
+{
+  this->ptr_ = ACE_const_cast (POAManager_out&, p).ptr_;
+  return *this;
+}
+
+PortableServer::POAManager_out &
+PortableServer::POAManager_out::operator= (const ::PortableServer::POAManager_var &p)
+{
+  this->ptr_ = ::PortableServer::POAManager::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableServer::POAManager_out &
+PortableServer::POAManager_out::operator= (POAManager_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::POAManager_out::operator ::PortableServer::POAManager_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableServer::POAManager_ptr &
+PortableServer::POAManager_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableServer::POAManager_ptr
+PortableServer::POAManager_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+PortableServer::POAManager::POAManager ()
+{
+  }
+
 // destructor
 PortableServer::POAManager::~POAManager (void)
 {}
@@ -1083,77 +2890,78 @@ void *PortableServer::POAManager::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
 }
 
-
 const char* PortableServer::POAManager::_interface_repository_id (void) const
 {
   return "IDL:PortableServer/POAManager:1.0";
 }
 
-// default constructor
+// Default constructor.
 PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
   : CORBA_UserException ("IDL:PortableServer/POAManager/AdapterInactive:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 PortableServer::POAManager::AdapterInactive::~AdapterInactive (void)
 {
 }
 
-// copy constructor
+// Copy constructor.
 PortableServer::POAManager::AdapterInactive::AdapterInactive (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 PortableServer::POAManager::AdapterInactive&
 PortableServer::POAManager::AdapterInactive::operator= (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 PortableServer::POAManager::AdapterInactive *
 PortableServer::POAManager::AdapterInactive::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POAManager/AdapterInactive:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (AdapterInactive *, exc);
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POAManager/AdapterInactive:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (AdapterInactive *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void PortableServer::POAManager::AdapterInactive::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void PortableServer::POAManager::AdapterInactive::_tao_encode (
     TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV) const
+    CORBA::Environment &ACE_TRY_ENV
+  ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void PortableServer::POAManager::AdapterInactive::_tao_decode (
     TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *PortableServer::POAManager::AdapterInactive::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -1163,10 +2971,194 @@ CORBA::Exception *PortableServer::POAManager::AdapterInactive::_alloc (void)
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-// default constructor
-PortableServer::AdapterActivator::AdapterActivator (void)
+// *************************************************************
+// Operations for class PortableServer::AdapterActivator_var
+// *************************************************************
+
+PortableServer::AdapterActivator_var::AdapterActivator_var (void) // default constructor
+  : ptr_ (AdapterActivator::_nil ())
 {}
 
+::PortableServer::AdapterActivator_ptr
+PortableServer::AdapterActivator_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableServer::AdapterActivator_var::AdapterActivator_var (const ::PortableServer::AdapterActivator_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (AdapterActivator::_duplicate (p.ptr ()))
+{}
+
+PortableServer::AdapterActivator_var::~AdapterActivator_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableServer::AdapterActivator_var &
+PortableServer::AdapterActivator_var::operator= (AdapterActivator_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::AdapterActivator_var &
+PortableServer::AdapterActivator_var::operator= (const ::PortableServer::AdapterActivator_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableServer::AdapterActivator::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableServer::AdapterActivator_var::operator const ::PortableServer::AdapterActivator_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableServer::AdapterActivator_var::operator ::PortableServer::AdapterActivator_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableServer::AdapterActivator_ptr
+PortableServer::AdapterActivator_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::AdapterActivator_ptr
+PortableServer::AdapterActivator_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::AdapterActivator_ptr &
+PortableServer::AdapterActivator_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableServer::AdapterActivator_ptr &
+PortableServer::AdapterActivator_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::AdapterActivator::_nil ();
+  return this->ptr_;
+}
+
+::PortableServer::AdapterActivator_ptr
+PortableServer::AdapterActivator_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableServer::AdapterActivator_ptr val = this->ptr_;
+  this->ptr_ = ::PortableServer::AdapterActivator::_nil ();
+  return val;
+}
+
+::PortableServer::AdapterActivator_ptr
+PortableServer::AdapterActivator_var::duplicate (AdapterActivator_ptr p)
+{
+  return ::PortableServer::AdapterActivator::_duplicate (p);
+}
+
+void
+PortableServer::AdapterActivator_var::release (AdapterActivator_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableServer::AdapterActivator_ptr
+PortableServer::AdapterActivator_var::nil (void)
+{
+  return ::PortableServer::AdapterActivator::_nil ();
+}
+
+::PortableServer::AdapterActivator_ptr
+PortableServer::AdapterActivator_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableServer::AdapterActivator::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableServer::AdapterActivator_var::upcast (void *src)
+{
+  AdapterActivator **tmp =
+    ACE_static_cast (AdapterActivator **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class PortableServer::AdapterActivator_out
+// *************************************************************
+
+PortableServer::AdapterActivator_out::AdapterActivator_out (AdapterActivator_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableServer::AdapterActivator::_nil ();
+}
+
+PortableServer::AdapterActivator_out::AdapterActivator_out (AdapterActivator_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::AdapterActivator::_nil ();
+}
+
+PortableServer::AdapterActivator_out::AdapterActivator_out (const ::PortableServer::AdapterActivator_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (AdapterActivator_out &, p).ptr_)
+{}
+
+::PortableServer::AdapterActivator_out &
+PortableServer::AdapterActivator_out::operator= (const ::PortableServer::AdapterActivator_out &p)
+{
+  this->ptr_ = ACE_const_cast (AdapterActivator_out&, p).ptr_;
+  return *this;
+}
+
+PortableServer::AdapterActivator_out &
+PortableServer::AdapterActivator_out::operator= (const ::PortableServer::AdapterActivator_var &p)
+{
+  this->ptr_ = ::PortableServer::AdapterActivator::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableServer::AdapterActivator_out &
+PortableServer::AdapterActivator_out::operator= (AdapterActivator_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::AdapterActivator_out::operator ::PortableServer::AdapterActivator_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableServer::AdapterActivator_ptr &
+PortableServer::AdapterActivator_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableServer::AdapterActivator_ptr
+PortableServer::AdapterActivator_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+PortableServer::AdapterActivator::AdapterActivator ()
+{
+  }
+
 // destructor
 PortableServer::AdapterActivator::~AdapterActivator (void)
 {}
@@ -1219,7 +3211,7 @@ void *PortableServer::AdapterActivator::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1230,11 +3222,194 @@ const char* PortableServer::AdapterActivator::_interface_repository_id (void) co
   return "IDL:PortableServer/AdapterActivator:1.0";
 }
 
+// *************************************************************
+// Operations for class PortableServer::ServantManager_var
+// *************************************************************
 
-// default constructor
-PortableServer::ServantManager::ServantManager (void)
+PortableServer::ServantManager_var::ServantManager_var (void) // default constructor
+  : ptr_ (ServantManager::_nil ())
+{}
+
+::PortableServer::ServantManager_ptr
+PortableServer::ServantManager_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableServer::ServantManager_var::ServantManager_var (const ::PortableServer::ServantManager_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ServantManager::_duplicate (p.ptr ()))
+{}
+
+PortableServer::ServantManager_var::~ServantManager_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableServer::ServantManager_var &
+PortableServer::ServantManager_var::operator= (ServantManager_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::ServantManager_var &
+PortableServer::ServantManager_var::operator= (const ::PortableServer::ServantManager_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableServer::ServantManager::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableServer::ServantManager_var::operator const ::PortableServer::ServantManager_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableServer::ServantManager_var::operator ::PortableServer::ServantManager_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantManager_ptr
+PortableServer::ServantManager_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantManager_ptr
+PortableServer::ServantManager_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantManager_ptr &
+PortableServer::ServantManager_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantManager_ptr &
+PortableServer::ServantManager_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::ServantManager::_nil ();
+  return this->ptr_;
+}
+
+::PortableServer::ServantManager_ptr
+PortableServer::ServantManager_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableServer::ServantManager_ptr val = this->ptr_;
+  this->ptr_ = ::PortableServer::ServantManager::_nil ();
+  return val;
+}
+
+::PortableServer::ServantManager_ptr
+PortableServer::ServantManager_var::duplicate (ServantManager_ptr p)
+{
+  return ::PortableServer::ServantManager::_duplicate (p);
+}
+
+void
+PortableServer::ServantManager_var::release (ServantManager_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableServer::ServantManager_ptr
+PortableServer::ServantManager_var::nil (void)
+{
+  return ::PortableServer::ServantManager::_nil ();
+}
+
+::PortableServer::ServantManager_ptr
+PortableServer::ServantManager_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableServer::ServantManager::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableServer::ServantManager_var::upcast (void *src)
+{
+  ServantManager **tmp =
+    ACE_static_cast (ServantManager **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class PortableServer::ServantManager_out
+// *************************************************************
+
+PortableServer::ServantManager_out::ServantManager_out (ServantManager_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableServer::ServantManager::_nil ();
+}
+
+PortableServer::ServantManager_out::ServantManager_out (ServantManager_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::ServantManager::_nil ();
+}
+
+PortableServer::ServantManager_out::ServantManager_out (const ::PortableServer::ServantManager_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ServantManager_out &, p).ptr_)
 {}
 
+::PortableServer::ServantManager_out &
+PortableServer::ServantManager_out::operator= (const ::PortableServer::ServantManager_out &p)
+{
+  this->ptr_ = ACE_const_cast (ServantManager_out&, p).ptr_;
+  return *this;
+}
+
+PortableServer::ServantManager_out &
+PortableServer::ServantManager_out::operator= (const ::PortableServer::ServantManager_var &p)
+{
+  this->ptr_ = ::PortableServer::ServantManager::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableServer::ServantManager_out &
+PortableServer::ServantManager_out::operator= (ServantManager_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::ServantManager_out::operator ::PortableServer::ServantManager_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantManager_ptr &
+PortableServer::ServantManager_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantManager_ptr
+PortableServer::ServantManager_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+PortableServer::ServantManager::ServantManager ()
+{
+  }
+
 // destructor
 PortableServer::ServantManager::~ServantManager (void)
 {}
@@ -1287,7 +3462,7 @@ void *PortableServer::ServantManager::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1298,11 +3473,194 @@ const char* PortableServer::ServantManager::_interface_repository_id (void) cons
   return "IDL:PortableServer/ServantManager:1.0";
 }
 
+// *************************************************************
+// Operations for class PortableServer::ServantActivator_var
+// *************************************************************
 
-// default constructor
-PortableServer::ServantActivator::ServantActivator (void)
+PortableServer::ServantActivator_var::ServantActivator_var (void) // default constructor
+  : ptr_ (ServantActivator::_nil ())
 {}
 
+::PortableServer::ServantActivator_ptr
+PortableServer::ServantActivator_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableServer::ServantActivator_var::ServantActivator_var (const ::PortableServer::ServantActivator_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ServantActivator::_duplicate (p.ptr ()))
+{}
+
+PortableServer::ServantActivator_var::~ServantActivator_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableServer::ServantActivator_var &
+PortableServer::ServantActivator_var::operator= (ServantActivator_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::ServantActivator_var &
+PortableServer::ServantActivator_var::operator= (const ::PortableServer::ServantActivator_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableServer::ServantActivator::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableServer::ServantActivator_var::operator const ::PortableServer::ServantActivator_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableServer::ServantActivator_var::operator ::PortableServer::ServantActivator_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantActivator_ptr
+PortableServer::ServantActivator_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantActivator_ptr
+PortableServer::ServantActivator_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantActivator_ptr &
+PortableServer::ServantActivator_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantActivator_ptr &
+PortableServer::ServantActivator_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::ServantActivator::_nil ();
+  return this->ptr_;
+}
+
+::PortableServer::ServantActivator_ptr
+PortableServer::ServantActivator_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableServer::ServantActivator_ptr val = this->ptr_;
+  this->ptr_ = ::PortableServer::ServantActivator::_nil ();
+  return val;
+}
+
+::PortableServer::ServantActivator_ptr
+PortableServer::ServantActivator_var::duplicate (ServantActivator_ptr p)
+{
+  return ::PortableServer::ServantActivator::_duplicate (p);
+}
+
+void
+PortableServer::ServantActivator_var::release (ServantActivator_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableServer::ServantActivator_ptr
+PortableServer::ServantActivator_var::nil (void)
+{
+  return ::PortableServer::ServantActivator::_nil ();
+}
+
+::PortableServer::ServantActivator_ptr
+PortableServer::ServantActivator_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableServer::ServantActivator::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableServer::ServantActivator_var::upcast (void *src)
+{
+  ServantActivator **tmp =
+    ACE_static_cast (ServantActivator **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class PortableServer::ServantActivator_out
+// *************************************************************
+
+PortableServer::ServantActivator_out::ServantActivator_out (ServantActivator_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableServer::ServantActivator::_nil ();
+}
+
+PortableServer::ServantActivator_out::ServantActivator_out (ServantActivator_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::ServantActivator::_nil ();
+}
+
+PortableServer::ServantActivator_out::ServantActivator_out (const ::PortableServer::ServantActivator_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ServantActivator_out &, p).ptr_)
+{}
+
+::PortableServer::ServantActivator_out &
+PortableServer::ServantActivator_out::operator= (const ::PortableServer::ServantActivator_out &p)
+{
+  this->ptr_ = ACE_const_cast (ServantActivator_out&, p).ptr_;
+  return *this;
+}
+
+PortableServer::ServantActivator_out &
+PortableServer::ServantActivator_out::operator= (const ::PortableServer::ServantActivator_var &p)
+{
+  this->ptr_ = ::PortableServer::ServantActivator::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableServer::ServantActivator_out &
+PortableServer::ServantActivator_out::operator= (ServantActivator_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::ServantActivator_out::operator ::PortableServer::ServantActivator_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantActivator_ptr &
+PortableServer::ServantActivator_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantActivator_ptr
+PortableServer::ServantActivator_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+PortableServer::ServantActivator::ServantActivator ()
+{
+  }
+
 // destructor
 PortableServer::ServantActivator::~ServantActivator (void)
 {}
@@ -1367,7 +3725,7 @@ void *PortableServer::ServantActivator::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1378,11 +3736,194 @@ const char* PortableServer::ServantActivator::_interface_repository_id (void) co
   return "IDL:PortableServer/ServantActivator:1.0";
 }
 
+// *************************************************************
+// Operations for class PortableServer::ServantLocator_var
+// *************************************************************
+
+PortableServer::ServantLocator_var::ServantLocator_var (void) // default constructor
+  : ptr_ (ServantLocator::_nil ())
+{}
 
-// default constructor
-PortableServer::ServantLocator::ServantLocator (void)
+::PortableServer::ServantLocator_ptr
+PortableServer::ServantLocator_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableServer::ServantLocator_var::ServantLocator_var (const ::PortableServer::ServantLocator_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ServantLocator::_duplicate (p.ptr ()))
 {}
 
+PortableServer::ServantLocator_var::~ServantLocator_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableServer::ServantLocator_var &
+PortableServer::ServantLocator_var::operator= (ServantLocator_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::ServantLocator_var &
+PortableServer::ServantLocator_var::operator= (const ::PortableServer::ServantLocator_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableServer::ServantLocator::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableServer::ServantLocator_var::operator const ::PortableServer::ServantLocator_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableServer::ServantLocator_var::operator ::PortableServer::ServantLocator_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantLocator_ptr
+PortableServer::ServantLocator_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantLocator_ptr
+PortableServer::ServantLocator_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantLocator_ptr &
+PortableServer::ServantLocator_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantLocator_ptr &
+PortableServer::ServantLocator_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::ServantLocator::_nil ();
+  return this->ptr_;
+}
+
+::PortableServer::ServantLocator_ptr
+PortableServer::ServantLocator_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableServer::ServantLocator_ptr val = this->ptr_;
+  this->ptr_ = ::PortableServer::ServantLocator::_nil ();
+  return val;
+}
+
+::PortableServer::ServantLocator_ptr
+PortableServer::ServantLocator_var::duplicate (ServantLocator_ptr p)
+{
+  return ::PortableServer::ServantLocator::_duplicate (p);
+}
+
+void
+PortableServer::ServantLocator_var::release (ServantLocator_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableServer::ServantLocator_ptr
+PortableServer::ServantLocator_var::nil (void)
+{
+  return ::PortableServer::ServantLocator::_nil ();
+}
+
+::PortableServer::ServantLocator_ptr
+PortableServer::ServantLocator_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableServer::ServantLocator::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableServer::ServantLocator_var::upcast (void *src)
+{
+  ServantLocator **tmp =
+    ACE_static_cast (ServantLocator **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class PortableServer::ServantLocator_out
+// *************************************************************
+
+PortableServer::ServantLocator_out::ServantLocator_out (ServantLocator_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableServer::ServantLocator::_nil ();
+}
+
+PortableServer::ServantLocator_out::ServantLocator_out (ServantLocator_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::ServantLocator::_nil ();
+}
+
+PortableServer::ServantLocator_out::ServantLocator_out (const ::PortableServer::ServantLocator_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ServantLocator_out &, p).ptr_)
+{}
+
+::PortableServer::ServantLocator_out &
+PortableServer::ServantLocator_out::operator= (const ::PortableServer::ServantLocator_out &p)
+{
+  this->ptr_ = ACE_const_cast (ServantLocator_out&, p).ptr_;
+  return *this;
+}
+
+PortableServer::ServantLocator_out &
+PortableServer::ServantLocator_out::operator= (const ::PortableServer::ServantLocator_var &p)
+{
+  this->ptr_ = ::PortableServer::ServantLocator::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableServer::ServantLocator_out &
+PortableServer::ServantLocator_out::operator= (ServantLocator_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::ServantLocator_out::operator ::PortableServer::ServantLocator_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantLocator_ptr &
+PortableServer::ServantLocator_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableServer::ServantLocator_ptr
+PortableServer::ServantLocator_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+PortableServer::ServantLocator::ServantLocator ()
+{
+  }
+
 // destructor
 PortableServer::ServantLocator::~ServantLocator (void)
 {}
@@ -1447,7 +3988,7 @@ void *PortableServer::ServantLocator::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
@@ -1460,10 +4001,194 @@ const char* PortableServer::ServantLocator::_interface_repository_id (void) cons
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-// default constructor
-PortableServer::POA::POA (void)
+// *************************************************************
+// Operations for class PortableServer::POA_var
+// *************************************************************
+
+PortableServer::POA_var::POA_var (void) // default constructor
+  : ptr_ (POA::_nil ())
+{}
+
+::PortableServer::POA_ptr
+PortableServer::POA_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+PortableServer::POA_var::POA_var (const ::PortableServer::POA_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (POA::_duplicate (p.ptr ()))
+{}
+
+PortableServer::POA_var::~POA_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+PortableServer::POA_var &
+PortableServer::POA_var::operator= (POA_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::POA_var &
+PortableServer::POA_var::operator= (const ::PortableServer::POA_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableServer::POA::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+PortableServer::POA_var::operator const ::PortableServer::POA_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableServer::POA_var::operator ::PortableServer::POA_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableServer::POA_ptr
+PortableServer::POA_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::POA_ptr
+PortableServer::POA_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::POA_ptr &
+PortableServer::POA_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableServer::POA_ptr &
+PortableServer::POA_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::POA::_nil ();
+  return this->ptr_;
+}
+
+::PortableServer::POA_ptr
+PortableServer::POA_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableServer::POA_ptr val = this->ptr_;
+  this->ptr_ = ::PortableServer::POA::_nil ();
+  return val;
+}
+
+::PortableServer::POA_ptr
+PortableServer::POA_var::duplicate (POA_ptr p)
+{
+  return ::PortableServer::POA::_duplicate (p);
+}
+
+void
+PortableServer::POA_var::release (POA_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableServer::POA_ptr
+PortableServer::POA_var::nil (void)
+{
+  return ::PortableServer::POA::_nil ();
+}
+
+::PortableServer::POA_ptr
+PortableServer::POA_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableServer::POA::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableServer::POA_var::upcast (void *src)
+{
+  POA **tmp =
+    ACE_static_cast (POA **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class PortableServer::POA_out
+// *************************************************************
+
+PortableServer::POA_out::POA_out (POA_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableServer::POA::_nil ();
+}
+
+PortableServer::POA_out::POA_out (POA_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::POA::_nil ();
+}
+
+PortableServer::POA_out::POA_out (const ::PortableServer::POA_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (POA_out &, p).ptr_)
 {}
 
+::PortableServer::POA_out &
+PortableServer::POA_out::operator= (const ::PortableServer::POA_out &p)
+{
+  this->ptr_ = ACE_const_cast (POA_out&, p).ptr_;
+  return *this;
+}
+
+PortableServer::POA_out &
+PortableServer::POA_out::operator= (const ::PortableServer::POA_var &p)
+{
+  this->ptr_ = ::PortableServer::POA::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableServer::POA_out &
+PortableServer::POA_out::operator= (POA_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::POA_out::operator ::PortableServer::POA_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableServer::POA_ptr &
+PortableServer::POA_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableServer::POA_ptr
+PortableServer::POA_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+PortableServer::POA::POA ()
+{
+  }
+
 // destructor
 PortableServer::POA::~POA (void)
 {}
@@ -1506,65 +4231,88 @@ PortableServer::POA::_duplicate (POA_ptr obj)
   return obj;
 }
 
-// default constructor
+void *PortableServer::POA::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *retv = 0;
+  if (type == ACE_reinterpret_cast
+    (ptr_arith_t,
+      &ACE_NESTED_CLASS (::PortableServer, POA)::_narrow))
+    retv = ACE_reinterpret_cast (void*, this);
+  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+    retv = ACE_reinterpret_cast (void *,
+      ACE_static_cast (CORBA::Object_ptr, this));
+    
+  if (retv)
+    this->_add_ref ();
+  return retv;
+}
+
+const char* PortableServer::POA::_interface_repository_id (void) const
+{
+  return "IDL:PortableServer/POA:1.0";
+}
+
+// Default constructor.
 PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (void)
   : CORBA_UserException ("IDL:PortableServer/POA/AdapterAlreadyExists:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 PortableServer::POA::AdapterAlreadyExists::~AdapterAlreadyExists (void)
 {
 }
 
-// copy constructor
+// Copy constructor.
 PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const ::PortableServer::POA::AdapterAlreadyExists &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 PortableServer::POA::AdapterAlreadyExists&
 PortableServer::POA::AdapterAlreadyExists::operator= (const ::PortableServer::POA::AdapterAlreadyExists &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 PortableServer::POA::AdapterAlreadyExists *
 PortableServer::POA::AdapterAlreadyExists::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/AdapterAlreadyExists:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (AdapterAlreadyExists *, exc);
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/AdapterAlreadyExists:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (AdapterAlreadyExists *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void PortableServer::POA::AdapterAlreadyExists::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void PortableServer::POA::AdapterAlreadyExists::_tao_encode (
     TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV) const
+    CORBA::Environment &ACE_TRY_ENV
+  ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void PortableServer::POA::AdapterAlreadyExists::_tao_decode (
     TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *PortableServer::POA::AdapterAlreadyExists::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -1572,65 +4320,67 @@ CORBA::Exception *PortableServer::POA::AdapterAlreadyExists::_alloc (void)
   return retval;
 }
 
-// default constructor
+// Default constructor.
 PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void)
   : CORBA_UserException ("IDL:PortableServer/POA/AdapterNonExistent:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 PortableServer::POA::AdapterNonExistent::~AdapterNonExistent (void)
 {
 }
 
-// copy constructor
+// Copy constructor.
 PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const ::PortableServer::POA::AdapterNonExistent &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 PortableServer::POA::AdapterNonExistent&
 PortableServer::POA::AdapterNonExistent::operator= (const ::PortableServer::POA::AdapterNonExistent &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 PortableServer::POA::AdapterNonExistent *
 PortableServer::POA::AdapterNonExistent::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/AdapterNonExistent:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (AdapterNonExistent *, exc);
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/AdapterNonExistent:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (AdapterNonExistent *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void PortableServer::POA::AdapterNonExistent::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void PortableServer::POA::AdapterNonExistent::_tao_encode (
     TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV) const
+    CORBA::Environment &ACE_TRY_ENV
+  ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void PortableServer::POA::AdapterNonExistent::_tao_decode (
     TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *PortableServer::POA::AdapterNonExistent::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -1638,67 +4388,69 @@ CORBA::Exception *PortableServer::POA::AdapterNonExistent::_alloc (void)
   return retval;
 }
 
-// default constructor
+// Default constructor.
 PortableServer::POA::InvalidPolicy::InvalidPolicy (void)
   : CORBA_UserException ("IDL:PortableServer/POA/InvalidPolicy:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 PortableServer::POA::InvalidPolicy::~InvalidPolicy (void)
 {
 }
 
-// copy constructor
+// Copy constructor.
 PortableServer::POA::InvalidPolicy::InvalidPolicy (const ::PortableServer::POA::InvalidPolicy &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
-    this->index = _tao_excp.index;
+  this->index = _tao_excp.index;
 }
 
-// assignment operator
+// Assignment operator.
 PortableServer::POA::InvalidPolicy&
 PortableServer::POA::InvalidPolicy::operator= (const ::PortableServer::POA::InvalidPolicy &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   this->index = _tao_excp.index;
   return *this;
 }
 
-// narrow
+// Narrow.
 PortableServer::POA::InvalidPolicy *
 PortableServer::POA::InvalidPolicy::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/InvalidPolicy:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (InvalidPolicy *, exc);
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/InvalidPolicy:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (InvalidPolicy *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void PortableServer::POA::InvalidPolicy::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void PortableServer::POA::InvalidPolicy::_tao_encode (
     TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV) const
+    CORBA::Environment &ACE_TRY_ENV
+  ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void PortableServer::POA::InvalidPolicy::_tao_decode (
     TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *PortableServer::POA::InvalidPolicy::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -1707,73 +4459,76 @@ CORBA::Exception *PortableServer::POA::InvalidPolicy::_alloc (void)
 }
 
 PortableServer::POA::InvalidPolicy::InvalidPolicy (
-  CORBA::UShort _tao_index
-)
+    CORBA::UShort _tao_index
+  )
+  : CORBA_UserException ("IDL:PortableServer/POA/InvalidPolicy:1.0")
 {
-    this->index = _tao_index;
+  this->index = _tao_index;
 }
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-// default constructor
+// Default constructor.
 PortableServer::POA::NoServant::NoServant (void)
   : CORBA_UserException ("IDL:PortableServer/POA/NoServant:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 PortableServer::POA::NoServant::~NoServant (void)
 {
 }
 
-// copy constructor
+// Copy constructor.
 PortableServer::POA::NoServant::NoServant (const ::PortableServer::POA::NoServant &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 PortableServer::POA::NoServant&
 PortableServer::POA::NoServant::operator= (const ::PortableServer::POA::NoServant &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 PortableServer::POA::NoServant *
 PortableServer::POA::NoServant::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/NoServant:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (NoServant *, exc);
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/NoServant:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (NoServant *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void PortableServer::POA::NoServant::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void PortableServer::POA::NoServant::_tao_encode (
     TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV) const
+    CORBA::Environment &ACE_TRY_ENV
+  ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void PortableServer::POA::NoServant::_tao_decode (
     TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *PortableServer::POA::NoServant::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -1783,65 +4538,67 @@ CORBA::Exception *PortableServer::POA::NoServant::_alloc (void)
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-// default constructor
+// Default constructor.
 PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
   : CORBA_UserException ("IDL:PortableServer/POA/ObjectAlreadyActive:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 PortableServer::POA::ObjectAlreadyActive::~ObjectAlreadyActive (void)
 {
 }
 
-// copy constructor
+// Copy constructor.
 PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const ::PortableServer::POA::ObjectAlreadyActive &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 PortableServer::POA::ObjectAlreadyActive&
 PortableServer::POA::ObjectAlreadyActive::operator= (const ::PortableServer::POA::ObjectAlreadyActive &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 PortableServer::POA::ObjectAlreadyActive *
 PortableServer::POA::ObjectAlreadyActive::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ObjectAlreadyActive:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (ObjectAlreadyActive *, exc);
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ObjectAlreadyActive:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (ObjectAlreadyActive *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void PortableServer::POA::ObjectAlreadyActive::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void PortableServer::POA::ObjectAlreadyActive::_tao_encode (
     TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV) const
+    CORBA::Environment &ACE_TRY_ENV
+  ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void PortableServer::POA::ObjectAlreadyActive::_tao_decode (
     TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *PortableServer::POA::ObjectAlreadyActive::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -1849,65 +4606,67 @@ CORBA::Exception *PortableServer::POA::ObjectAlreadyActive::_alloc (void)
   return retval;
 }
 
-// default constructor
+// Default constructor.
 PortableServer::POA::ObjectNotActive::ObjectNotActive (void)
   : CORBA_UserException ("IDL:PortableServer/POA/ObjectNotActive:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 PortableServer::POA::ObjectNotActive::~ObjectNotActive (void)
 {
 }
 
-// copy constructor
+// Copy constructor.
 PortableServer::POA::ObjectNotActive::ObjectNotActive (const ::PortableServer::POA::ObjectNotActive &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 PortableServer::POA::ObjectNotActive&
 PortableServer::POA::ObjectNotActive::operator= (const ::PortableServer::POA::ObjectNotActive &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 PortableServer::POA::ObjectNotActive *
 PortableServer::POA::ObjectNotActive::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ObjectNotActive:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (ObjectNotActive *, exc);
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ObjectNotActive:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (ObjectNotActive *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void PortableServer::POA::ObjectNotActive::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void PortableServer::POA::ObjectNotActive::_tao_encode (
     TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV) const
+    CORBA::Environment &ACE_TRY_ENV
+  ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void PortableServer::POA::ObjectNotActive::_tao_decode (
     TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *PortableServer::POA::ObjectNotActive::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -1915,65 +4674,67 @@ CORBA::Exception *PortableServer::POA::ObjectNotActive::_alloc (void)
   return retval;
 }
 
-// default constructor
+// Default constructor.
 PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void)
   : CORBA_UserException ("IDL:PortableServer/POA/ServantAlreadyActive:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 PortableServer::POA::ServantAlreadyActive::~ServantAlreadyActive (void)
 {
 }
 
-// copy constructor
+// Copy constructor.
 PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const ::PortableServer::POA::ServantAlreadyActive &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 PortableServer::POA::ServantAlreadyActive&
 PortableServer::POA::ServantAlreadyActive::operator= (const ::PortableServer::POA::ServantAlreadyActive &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 PortableServer::POA::ServantAlreadyActive *
 PortableServer::POA::ServantAlreadyActive::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ServantAlreadyActive:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (ServantAlreadyActive *, exc);
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ServantAlreadyActive:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (ServantAlreadyActive *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void PortableServer::POA::ServantAlreadyActive::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void PortableServer::POA::ServantAlreadyActive::_tao_encode (
     TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV) const
+    CORBA::Environment &ACE_TRY_ENV
+  ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void PortableServer::POA::ServantAlreadyActive::_tao_decode (
     TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *PortableServer::POA::ServantAlreadyActive::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -1981,65 +4742,67 @@ CORBA::Exception *PortableServer::POA::ServantAlreadyActive::_alloc (void)
   return retval;
 }
 
-// default constructor
+// Default constructor.
 PortableServer::POA::ServantNotActive::ServantNotActive (void)
   : CORBA_UserException ("IDL:PortableServer/POA/ServantNotActive:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 PortableServer::POA::ServantNotActive::~ServantNotActive (void)
 {
 }
 
-// copy constructor
+// Copy constructor.
 PortableServer::POA::ServantNotActive::ServantNotActive (const ::PortableServer::POA::ServantNotActive &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 PortableServer::POA::ServantNotActive&
 PortableServer::POA::ServantNotActive::operator= (const ::PortableServer::POA::ServantNotActive &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 PortableServer::POA::ServantNotActive *
 PortableServer::POA::ServantNotActive::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ServantNotActive:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (ServantNotActive *, exc);
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ServantNotActive:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (ServantNotActive *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void PortableServer::POA::ServantNotActive::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void PortableServer::POA::ServantNotActive::_tao_encode (
     TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV) const
+    CORBA::Environment &ACE_TRY_ENV
+  ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void PortableServer::POA::ServantNotActive::_tao_decode (
     TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *PortableServer::POA::ServantNotActive::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -2047,65 +4810,67 @@ CORBA::Exception *PortableServer::POA::ServantNotActive::_alloc (void)
   return retval;
 }
 
-// default constructor
+// Default constructor.
 PortableServer::POA::WrongAdapter::WrongAdapter (void)
   : CORBA_UserException ("IDL:PortableServer/POA/WrongAdapter:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 PortableServer::POA::WrongAdapter::~WrongAdapter (void)
 {
 }
 
-// copy constructor
+// Copy constructor.
 PortableServer::POA::WrongAdapter::WrongAdapter (const ::PortableServer::POA::WrongAdapter &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 PortableServer::POA::WrongAdapter&
 PortableServer::POA::WrongAdapter::operator= (const ::PortableServer::POA::WrongAdapter &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 PortableServer::POA::WrongAdapter *
 PortableServer::POA::WrongAdapter::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/WrongAdapter:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (WrongAdapter *, exc);
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/WrongAdapter:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (WrongAdapter *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void PortableServer::POA::WrongAdapter::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void PortableServer::POA::WrongAdapter::_tao_encode (
     TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV) const
+    CORBA::Environment &ACE_TRY_ENV
+  ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void PortableServer::POA::WrongAdapter::_tao_decode (
     TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *PortableServer::POA::WrongAdapter::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -2113,65 +4878,67 @@ CORBA::Exception *PortableServer::POA::WrongAdapter::_alloc (void)
   return retval;
 }
 
-// default constructor
+// Default constructor.
 PortableServer::POA::WrongPolicy::WrongPolicy (void)
   : CORBA_UserException ("IDL:PortableServer/POA/WrongPolicy:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 PortableServer::POA::WrongPolicy::~WrongPolicy (void)
 {
 }
 
-// copy constructor
+// Copy constructor.
 PortableServer::POA::WrongPolicy::WrongPolicy (const ::PortableServer::POA::WrongPolicy &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 PortableServer::POA::WrongPolicy&
 PortableServer::POA::WrongPolicy::operator= (const ::PortableServer::POA::WrongPolicy &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 PortableServer::POA::WrongPolicy *
 PortableServer::POA::WrongPolicy::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/WrongPolicy:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (WrongPolicy *, exc);
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/WrongPolicy:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (WrongPolicy *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void PortableServer::POA::WrongPolicy::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void PortableServer::POA::WrongPolicy::_tao_encode (
     TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV) const
+    CORBA::Environment &ACE_TRY_ENV
+  ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void PortableServer::POA::WrongPolicy::_tao_decode (
     TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *PortableServer::POA::WrongPolicy::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -2179,32 +4946,194 @@ CORBA::Exception *PortableServer::POA::WrongPolicy::_alloc (void)
   return retval;
 }
 
-void *PortableServer::POA::_tao_QueryInterface (ptr_arith_t type)
+// *************************************************************
+// Operations for class PortableServer::Current_var
+// *************************************************************
+
+PortableServer::Current_var::Current_var (void) // default constructor
+  : ptr_ (Current::_nil ())
+{}
+
+::PortableServer::Current_ptr
+PortableServer::Current_var::ptr (void) const
 {
-  void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, POA)::_narrow))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
+  return this->ptr_;
+}
 
-  if (retv)
-    this->_add_ref ();
-  return retv;
+PortableServer::Current_var::Current_var (const ::PortableServer::Current_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (Current::_duplicate (p.ptr ()))
+{}
+
+PortableServer::Current_var::~Current_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
 }
 
-const char* PortableServer::POA::_interface_repository_id (void) const
+PortableServer::Current_var &
+PortableServer::Current_var::operator= (Current_ptr p)
 {
-  return "IDL:PortableServer/POA:1.0";
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
 }
 
+PortableServer::Current_var &
+PortableServer::Current_var::operator= (const ::PortableServer::Current_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::PortableServer::Current::_duplicate (p.ptr ());
+  }
+  return *this;
+}
 
-// default constructor
-PortableServer::Current::Current (void)
+PortableServer::Current_var::operator const ::PortableServer::Current_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+PortableServer::Current_var::operator ::PortableServer::Current_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::PortableServer::Current_ptr
+PortableServer::Current_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::Current_ptr
+PortableServer::Current_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::PortableServer::Current_ptr &
+PortableServer::Current_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::PortableServer::Current_ptr &
+PortableServer::Current_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::Current::_nil ();
+  return this->ptr_;
+}
+
+::PortableServer::Current_ptr
+PortableServer::Current_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::PortableServer::Current_ptr val = this->ptr_;
+  this->ptr_ = ::PortableServer::Current::_nil ();
+  return val;
+}
+
+::PortableServer::Current_ptr
+PortableServer::Current_var::duplicate (Current_ptr p)
+{
+  return ::PortableServer::Current::_duplicate (p);
+}
+
+void
+PortableServer::Current_var::release (Current_ptr p)
+{
+  CORBA::release (p);
+}
+
+::PortableServer::Current_ptr
+PortableServer::Current_var::nil (void)
+{
+  return ::PortableServer::Current::_nil ();
+}
+
+::PortableServer::Current_ptr
+PortableServer::Current_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::PortableServer::Current::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+PortableServer::Current_var::upcast (void *src)
+{
+  Current **tmp =
+    ACE_static_cast (Current **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class PortableServer::Current_out
+// *************************************************************
+
+PortableServer::Current_out::Current_out (Current_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::PortableServer::Current::_nil ();
+}
+
+PortableServer::Current_out::Current_out (Current_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::PortableServer::Current::_nil ();
+}
+
+PortableServer::Current_out::Current_out (const ::PortableServer::Current_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
 {}
 
+::PortableServer::Current_out &
+PortableServer::Current_out::operator= (const ::PortableServer::Current_out &p)
+{
+  this->ptr_ = ACE_const_cast (Current_out&, p).ptr_;
+  return *this;
+}
+
+PortableServer::Current_out &
+PortableServer::Current_out::operator= (const ::PortableServer::Current_var &p)
+{
+  this->ptr_ = ::PortableServer::Current::_duplicate (p.ptr ());
+  return *this;
+}
+
+PortableServer::Current_out &
+PortableServer::Current_out::operator= (Current_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+PortableServer::Current_out::operator ::PortableServer::Current_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::PortableServer::Current_ptr &
+PortableServer::Current_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::PortableServer::Current_ptr
+PortableServer::Current_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+PortableServer::Current::Current ()
+{
+  }
+
 // destructor
 PortableServer::Current::~Current (void)
 {}
@@ -2247,65 +5176,100 @@ PortableServer::Current::_duplicate (Current_ptr obj)
   return obj;
 }
 
-// default constructor
+void *PortableServer::Current::_tao_QueryInterface (ptr_arith_t type)
+{
+  void *retv = 0;
+  if (type == ACE_reinterpret_cast
+    (ptr_arith_t,
+      &ACE_NESTED_CLASS (::PortableServer, Current)::_narrow))
+    retv = ACE_reinterpret_cast (void*, this);
+  else if (type == ACE_reinterpret_cast
+    (ptr_arith_t,
+      &::CORBA::Current::_narrow))
+    retv = ACE_reinterpret_cast
+      (
+        void *,
+        ACE_static_cast
+          (
+            CORBA::Current_ptr,
+            this
+          )
+      );
+  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+    retv = ACE_reinterpret_cast (void *,
+      ACE_static_cast (CORBA::Object_ptr, this));
+    
+  if (retv)
+    this->_add_ref ();
+  return retv;
+}
+
+const char* PortableServer::Current::_interface_repository_id (void) const
+{
+  return "IDL:PortableServer/Current:1.0";
+}
+
+// Default constructor.
 PortableServer::Current::NoContext::NoContext (void)
   : CORBA_UserException ("IDL:PortableServer/Current/NoContext:1.0")
 {
 }
 
-// destructor - all members are of self managing types
+// Destructor - all members are of self managing types.
 PortableServer::Current::NoContext::~NoContext (void)
 {
 }
 
-// copy constructor
+// Copy constructor.
 PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current::NoContext &_tao_excp)
   : CORBA_UserException (_tao_excp._id ())
 {
 }
 
-// assignment operator
+// Assignment operator.
 PortableServer::Current::NoContext&
 PortableServer::Current::NoContext::operator= (const ::PortableServer::Current::NoContext &_tao_excp)
 {
-
   this->CORBA_UserException::operator= (_tao_excp);
   return *this;
 }
 
-// narrow
+// Narrow.
 PortableServer::Current::NoContext *
 PortableServer::Current::NoContext::_downcast (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:PortableServer/Current/NoContext:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (NoContext *, exc);
+  if (!ACE_OS::strcmp ("IDL:PortableServer/Current/NoContext:1.0", exc->_id ()))
+    {
+      return ACE_dynamic_cast (NoContext *, exc);
+    }
   else
-    return 0;
+    {
+      return 0;
+    }
 }
 
-
 void PortableServer::Current::NoContext::_raise ()
 {
-  TAO_RAISE(*this);
+  TAO_RAISE (*this);
 }
 
-
 void PortableServer::Current::NoContext::_tao_encode (
     TAO_OutputCDR &,
-    CORBA::Environment &ACE_TRY_ENV) const
+    CORBA::Environment &ACE_TRY_ENV
+  ) const
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-
 void PortableServer::Current::NoContext::_tao_decode (
     TAO_InputCDR &,
-    CORBA::Environment &ACE_TRY_ENV)
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
   ACE_THROW (CORBA::MARSHAL ());
 }
 
-// TAO extension - the _alloc method
+// TAO extension - the _alloc method.
 CORBA::Exception *PortableServer::Current::NoContext::_alloc (void)
 {
   CORBA::Exception *retval = 0;
@@ -2313,39 +5277,6 @@ CORBA::Exception *PortableServer::Current::NoContext::_alloc (void)
   return retval;
 }
 
-void *PortableServer::Current::_tao_QueryInterface (ptr_arith_t type)
-{
-  void *retv = 0;
-  if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &ACE_NESTED_CLASS (::PortableServer, Current)::_narrow))
-    retv = ACE_reinterpret_cast (void*, this);
-  else if (type == ACE_reinterpret_cast
-    (ptr_arith_t,
-      &::CORBA::Current::_narrow))
-    retv = ACE_reinterpret_cast
-      (
-        void *,
-        ACE_static_cast
-          (
-            CORBA::Current_ptr,
-            this
-          )
-      );
-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-    retv = ACE_reinterpret_cast (void *,
-      ACE_static_cast (CORBA::Object_ptr, this));
-
-  if (retv)
-    this->_add_ref ();
-  return retv;
-}
-
-const char* PortableServer::Current::_interface_repository_id (void) const
-{
-  return "IDL:PortableServer/Current:1.0";
-}
-
 char *
 PortableServer::ObjectId_to_string (const PortableServer::ObjectId &id)
 {
@@ -2414,15 +5345,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Ob
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (PortableServer::_tc_ObjectId, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ObjectId, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = ACE_static_cast(
@@ -2504,15 +5433,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableServer::Fo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (PortableServer::_tc_ForwardRequest, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ForwardRequest, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     if (_tao_any.any_owns_data ())
     {
       _tao_elem = (PortableServer::ForwardRequest *)_tao_any.value ();
@@ -2577,15 +5504,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ThreadPo
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (PortableServer::_tc_ThreadPolicyValue, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ThreadPolicyValue, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -2628,15 +5553,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Lifespan
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (PortableServer::_tc_LifespanPolicyValue, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_LifespanPolicyValue, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -2677,15 +5600,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdUnique
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (PortableServer::_tc_IdUniquenessPolicyValue, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdUniquenessPolicyValue, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -2726,15 +5647,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::IdAssign
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (PortableServer::_tc_IdAssignmentPolicyValue, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_IdAssignmentPolicyValue, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -2777,15 +5696,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Implicit
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (PortableServer::_tc_ImplicitActivationPolicyValue, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ImplicitActivationPolicyValue, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -2826,15 +5743,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ServantR
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (PortableServer::_tc_ServantRetentionPolicyValue, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_ServantRetentionPolicyValue, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -2875,15 +5790,13 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::RequestP
   ACE_TRY_NEW_ENV
   {
     CORBA::TypeCode_var type = _tao_any.type ();
-    CORBA::Boolean result =
-      type->equivalent (PortableServer::_tc_RequestProcessingPolicyValue, ACE_TRY_ENV);
+    
+    CORBA::Boolean result = type->equivalent (PortableServer::_tc_RequestProcessingPolicyValue, ACE_TRY_ENV);
     ACE_TRY_CHECK;
-
+    
     if (!result)
-      {
-        return 0;
-      }
-
+      return 0; // not equivalent
+    
     TAO_InputCDR stream (
         _tao_any._tao_get_cdr (),
         _tao_any._tao_byte_order ()
@@ -2971,20 +5884,20 @@ CORBA::Boolean operator<< (
   if (strm << _tao_sequence.length ())
   {
     // encode all elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
         ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (PortableServer::ObjectId *)&_tao_sequence);
       if (oseq->mb ())
         return strm.write_octet_array_mb (oseq->mb ());
       else
         return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
@@ -3001,14 +5914,14 @@ CORBA::Boolean operator>> (
     // set the length of the sequence
     _tao_sequence.length (_tao_seq_len);
     // If length is 0 we return true.
-    if (0 >= _tao_seq_len)
+    if (0 >= _tao_seq_len) 
       return 1;
     // retrieve all the elements
-
+    
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
     {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
+      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
         ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
       oseq->replace (_tao_seq_len, strm.start ());
       oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
@@ -3017,11 +5930,12 @@ CORBA::Boolean operator>> (
     }
     else
       return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
+    
 #else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
+  
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
   }
   return 0; // error
 }
+
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index b5bad284a5c..1d14c0d2b14 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -1,24 +1,31 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_PORTABLESERVERC_H_
-#define _TAO_IDL_PORTABLESERVERC_H_
+#ifndef _TAO_IDL_ORIG_PORTABLESERVERC_H_
+#define _TAO_IDL_ORIG_PORTABLESERVERC_H_
 
 #include "ace/pre.h"
-
 #include "portableserver_export.h"
 #include "tao/corbafwd.h"
 
-#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
-#include "ace/streams.h"
-#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -47,6 +54,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
 class TAO_ServantBase;
 class TAO_ServantBase_var;
 class TAO_RefCountServantBase;
@@ -64,11 +75,11 @@ TAO_NAMESPACE  PortableServer
   typedef TAO_DynamicImplementation DynamicImplementation;
 
   class POA;
-
+  
 #if !defined (_PORTABLESERVER_POA___PTR_CH_)
 #define _PORTABLESERVER_POA___PTR_CH_
 
-typedef POA *POA_ptr;
+  typedef POA *POA_ptr;
 
 #endif /* end #if !defined */
 
@@ -80,23 +91,31 @@ typedef POA *POA_ptr;
   {
   public:
     POA_var (void); // default constructor
-    POA_var (POA_ptr p) : ptr_ (p) {}
+    POA_var (POA_ptr p) : ptr_ (p) {} 
     POA_var (const POA_var &); // copy constructor
     ~POA_var (void); // destructor
-
+    
     POA_var &operator= (POA_ptr);
     POA_var &operator= (const POA_var &);
     POA_ptr operator-> (void) const;
-
+    
     operator const POA_ptr &() const;
     operator POA_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     POA_ptr in (void) const;
     POA_ptr &inout (void);
     POA_ptr &out (void);
     POA_ptr _retn (void);
     POA_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static POA_ptr duplicate (POA_ptr);
+    static void release (POA_ptr);
+    static POA_ptr nil (void);
+    static POA_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     POA_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -123,7 +142,7 @@ typedef POA *POA_ptr;
     operator POA_ptr &();
     POA_ptr &ptr (void);
     POA_ptr operator-> (void);
-
+  
   private:
     POA_ptr &ptr_;
   };
@@ -133,7 +152,7 @@ typedef POA *POA_ptr;
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+    
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CH_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CH_
 
@@ -141,7 +160,7 @@ typedef POA *POA_ptr;
     {
     public:
       // = Initialization and termination methods.
-
+      
       _TAO_Unbounded_Object_Sequence_PortableServer_POAList (void);
       _TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum);
       _TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum,
@@ -163,43 +182,43 @@ typedef POA *POA_ptr;
       virtual void _downcast (
           void* target,
           CORBA_Object *src,
-          CORBA_Environment &ACE_TRY_ENV =
+          CORBA_Environment &ACE_TRY_ENV = 
             TAO_default_environment ()
         );
       virtual CORBA_Object* _upcast (void *src) const;
-
+      
     };
 
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  
 #if !defined (_PORTABLESERVER_POALIST_CH_)
 #define _PORTABLESERVER_POALIST_CH_
 
   class POAList;
   class POAList_var;
-
+  
   // *************************************************************
   // POAList
   // *************************************************************
-
-  class TAO_PortableServer_Export POAList : public
+  
+  class TAO_PortableServer_Export POAList : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     _TAO_Unbounded_Object_Sequence_PortableServer_POAList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Object_Sequence<POA,POA_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     POAList (void); // default ctor
     POAList (CORBA::ULong max); // uses max size
     POAList (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      POA_ptr *buffer,
-      CORBA::Boolean release=0
+      CORBA::ULong max, 
+      CORBA::ULong length, 
+      POA_ptr *buffer, 
+      CORBA::Boolean release = 0
     );
     POAList (const POAList &); // copy ctor
     ~POAList (void);
@@ -210,7 +229,7 @@ typedef POA *POA_ptr;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
   };
-
+  
 #endif /* end #if !defined */
 
 
@@ -228,19 +247,20 @@ typedef POA *POA_ptr;
     POAList_var (POAList *);
     POAList_var (const POAList_var &); // copy constructor
     ~POAList_var (void); // destructor
-
+    
     POAList_var &operator= (POAList *);
     POAList_var &operator= (const POAList_var &);
     POAList *operator-> (void);
     const POAList *operator-> (void) const;
-
+    
     operator const POAList &() const;
     operator POAList &();
     operator POAList &() const;
     operator POAList *&(); // variable-size base types only
-
+    
     TAO_Object_Manager<POA, POA_var> operator[] (CORBA::ULong index);
-    // in, inout, out, _retn
+    
+    // in, inout, out, _retn 
     const POAList &in (void) const;
     POAList &inout (void);
     POAList *&out (void);
@@ -270,7 +290,7 @@ typedef POA *POA_ptr;
     POAList *&ptr (void);
     POAList *operator-> (void);
     TAO_Object_Manager<POA, POA_var> operator[] (CORBA::ULong index);
-
+    
   private:
     POAList *&ptr_;
     // assignment from T_var not allowed
@@ -286,26 +306,26 @@ typedef POA *POA_ptr;
 
   class ObjectId;
   class ObjectId_var;
-
+  
   // *************************************************************
   // ObjectId
   // *************************************************************
-
-  class TAO_PortableServer_Export ObjectId : public
+  
+  class TAO_PortableServer_Export ObjectId : public 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
     TAO_Unbounded_Sequence<CORBA::Octet>
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
     TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
   {
   public:
     ObjectId (void); // default ctor
     ObjectId (CORBA::ULong max); // uses max size
     ObjectId (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      CORBA::Octet *buffer,
-      CORBA::Boolean release=0
+      CORBA::ULong max, 
+      CORBA::ULong length, 
+      CORBA::Octet *buffer, 
+      CORBA::Boolean release = 0
     );
     ObjectId (const ObjectId &); // copy ctor
     ~ObjectId (void);
@@ -316,16 +336,16 @@ typedef POA *POA_ptr;
 #endif /* ! __GNUC__ || g++ >= 2.8 */
 
 
-#if defined(TAO_NO_COPY_OCTET_SEQUENCES)
+#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
     ObjectId (
         CORBA::ULong length,
         const ACE_Message_Block* mb
       )
       : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
+#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
 
   };
-
+  
 #endif /* end #if !defined */
 
 
@@ -344,19 +364,21 @@ typedef POA *POA_ptr;
     ObjectId_var (const ObjectId_var &); // copy constructor
     ObjectId_var (const ObjectId &); // fixed-size base types only
     ~ObjectId_var (void); // destructor
-
+    
     ObjectId_var &operator= (ObjectId *);
     ObjectId_var &operator= (const ObjectId_var &);
     ObjectId_var &operator= (const ObjectId &); // fixed-size base types only
     ObjectId *operator-> (void);
     const ObjectId *operator-> (void) const;
-
+    
     operator const ObjectId &() const;
     operator ObjectId &();
     operator ObjectId &() const;
-
-    CORBA::Octet &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn
+    
+    CORBA::Octet & operator[] (CORBA::ULong index);
+    const CORBA::Octet & operator[] (CORBA::ULong index) const;
+    
+    // in, inout, out, _retn 
     const ObjectId &in (void) const;
     ObjectId &inout (void);
     ObjectId *&out (void);
@@ -385,8 +407,8 @@ typedef POA *POA_ptr;
     operator ObjectId *&();
     ObjectId *&ptr (void);
     ObjectId *operator-> (void);
-    CORBA::Octet &operator[] (CORBA::ULong index);
-
+    CORBA::Octet & operator[] (CORBA::ULong index);
+    
   private:
     ObjectId *&ptr_;
     // assignment from T_var not allowed
@@ -407,110 +429,124 @@ typedef POA *POA_ptr;
   class TAO_PortableServer_Export ForwardRequest : public CORBA::UserException
   {
   public:
+    CORBA::Object_var forward_reference;
+
+    ForwardRequest (void);
+    // Default constructor.
+    
+    ForwardRequest (const ForwardRequest &);
+    // Copy constructor.
+    
+    ~ForwardRequest (void);
+    // Destructor.
+    
+    static void _tao_any_destructor (void*);
+    
+    ForwardRequest &operator= (const ForwardRequest &);
+    
+    virtual void _raise (void);
 
-  CORBA::Object_var forward_reference;
-
-  ForwardRequest (void); // default ctor
-  ForwardRequest (const ForwardRequest &); // copy ctor
-  ~ForwardRequest (void);
-  static void _tao_any_destructor (void*);
-  ForwardRequest &operator= (const ForwardRequest &);
-
-
-  virtual void _raise (void);
-
-  virtual void _tao_encode (
-      TAO_OutputCDR &,
-      CORBA::Environment &) const;
-  virtual void _tao_decode (
-      TAO_InputCDR &,
-      CORBA::Environment &);
-
-  static ForwardRequest *_downcast (CORBA::Exception *);
-
-  ForwardRequest (
-    const CORBA::Object_ptr  _tao_forward_reference
-  );
-
-  // = TAO extension
-  static CORBA::Exception *_alloc (void);
-  virtual CORBA::TypeCode_ptr _type (void) const;
+    virtual void _tao_encode (
+        TAO_OutputCDR &,
+        CORBA::Environment &
+      ) const;
+    
+    virtual void _tao_decode (
+        TAO_InputCDR &,
+        CORBA::Environment &
+      );
+    
+    static ForwardRequest *_downcast (CORBA::Exception *);
 
-}; // exception PortableServer::ForwardRequest
+    ForwardRequest (
+        const CORBA::Object_ptr  _tao_forward_reference
+      );
+    
+    // = TAO extension.
+    static CORBA::Exception *_alloc (void);
+    virtual CORBA::TypeCode_ptr _type (void) const;
+  }; // Exception PortableServer::ForwardRequest.
 
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ForwardRequest;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ForwardRequest;
 
 
 #endif /* end #if !defined */
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong THREAD_POLICY_ID;
+  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong THREAD_POLICY_ID;
 
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong LIFESPAN_POLICY_ID;
+  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong LIFESPAN_POLICY_ID;
 
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ID_UNIQUENESS_POLICY_ID;
+  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ID_UNIQUENESS_POLICY_ID;
 
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ID_ASSIGNMENT_POLICY_ID;
+  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ID_ASSIGNMENT_POLICY_ID;
 
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong IMPLICIT_ACTIVATION_POLICY_ID;
+  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong IMPLICIT_ACTIVATION_POLICY_ID;
 
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SERVANT_RETENTION_POLICY_ID;
+  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SERVANT_RETENTION_POLICY_ID;
 
-TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_PROCESSING_POLICY_ID;
+  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_PROCESSING_POLICY_ID;
 
-enum ThreadPolicyValue
-{
-    ORB_CTRL_MODEL,
-    SINGLE_THREAD_MODEL,
-    ThreadPolicyValue_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF
-};
+  enum ThreadPolicyValue
+  {
+        ORB_CTRL_MODEL,
+        SINGLE_THREAD_MODEL    
+  };
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-typedef ThreadPolicyValue &ThreadPolicyValue_out;
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadPolicyValue;
+  typedef ThreadPolicyValue &ThreadPolicyValue_out;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadPolicyValue;
 
 
 #if !defined (_PORTABLESERVER_THREADPOLICY___PTR_CH_)
 #define _PORTABLESERVER_THREADPOLICY___PTR_CH_
 
-class ThreadPolicy;
-typedef ThreadPolicy *ThreadPolicy_ptr;
-
+  class ThreadPolicy;
+  typedef ThreadPolicy *ThreadPolicy_ptr;
+  
 #endif /* end #if !defined */
 
 
 #if !defined (_PORTABLESERVER_THREADPOLICY___VAR_CH_)
 #define _PORTABLESERVER_THREADPOLICY___VAR_CH_
 
-class TAO_PortableServer_Export ThreadPolicy_var : public TAO_Base_var
-{
-public:
-  ThreadPolicy_var (void); // default constructor
-  ThreadPolicy_var (ThreadPolicy_ptr p) : ptr_ (p) {}
-  ThreadPolicy_var (const ThreadPolicy_var &); // copy constructor
-  ~ThreadPolicy_var (void); // destructor
-
-  ThreadPolicy_var &operator= (ThreadPolicy_ptr);
-  ThreadPolicy_var &operator= (const ThreadPolicy_var &);
-  ThreadPolicy_ptr operator-> (void) const;
-
-  operator const ThreadPolicy_ptr &() const;
-  operator ThreadPolicy_ptr &();
-  // in, inout, out, _retn
-  ThreadPolicy_ptr in (void) const;
-  ThreadPolicy_ptr &inout (void);
-  ThreadPolicy_ptr &out (void);
-  ThreadPolicy_ptr _retn (void);
-  ThreadPolicy_ptr ptr (void) const;
-
-private:
-  ThreadPolicy_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  ThreadPolicy_var (const TAO_Base_var &rhs);
-  ThreadPolicy_var &operator= (const TAO_Base_var &rhs);
-};
+  class TAO_PortableServer_Export ThreadPolicy_var : public TAO_Base_var
+  {
+  public:
+    ThreadPolicy_var (void); // default constructor
+    ThreadPolicy_var (ThreadPolicy_ptr p) : ptr_ (p) {} 
+    ThreadPolicy_var (const ThreadPolicy_var &); // copy constructor
+    ~ThreadPolicy_var (void); // destructor
+    
+    ThreadPolicy_var &operator= (ThreadPolicy_ptr);
+    ThreadPolicy_var &operator= (const ThreadPolicy_var &);
+    ThreadPolicy_ptr operator-> (void) const;
+    
+    operator const ThreadPolicy_ptr &() const;
+    operator ThreadPolicy_ptr &();
+    // in, inout, out, _retn 
+    ThreadPolicy_ptr in (void) const;
+    ThreadPolicy_ptr &inout (void);
+    ThreadPolicy_ptr &out (void);
+    ThreadPolicy_ptr _retn (void);
+    ThreadPolicy_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ThreadPolicy_ptr duplicate (ThreadPolicy_ptr);
+    static void release (ThreadPolicy_ptr);
+    static ThreadPolicy_ptr nil (void);
+    static ThreadPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
+  private:
+    ThreadPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ThreadPolicy_var (const TAO_Base_var &rhs);
+    ThreadPolicy_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -519,22 +555,22 @@ private:
 #if !defined (_PORTABLESERVER_THREADPOLICY___OUT_CH_)
 #define _PORTABLESERVER_THREADPOLICY___OUT_CH_
 
-class TAO_PortableServer_Export ThreadPolicy_out
-{
-public:
-  ThreadPolicy_out (ThreadPolicy_ptr &);
-  ThreadPolicy_out (ThreadPolicy_var &);
-  ThreadPolicy_out (const ThreadPolicy_out &);
-  ThreadPolicy_out &operator= (const ThreadPolicy_out &);
-  ThreadPolicy_out &operator= (const ThreadPolicy_var &);
-  ThreadPolicy_out &operator= (ThreadPolicy_ptr);
-  operator ThreadPolicy_ptr &();
-  ThreadPolicy_ptr &ptr (void);
-  ThreadPolicy_ptr operator-> (void);
-
-private:
-  ThreadPolicy_ptr &ptr_;
-};
+  class TAO_PortableServer_Export ThreadPolicy_out
+  {
+  public:
+    ThreadPolicy_out (ThreadPolicy_ptr &);
+    ThreadPolicy_out (ThreadPolicy_var &);
+    ThreadPolicy_out (const ThreadPolicy_out &);
+    ThreadPolicy_out &operator= (const ThreadPolicy_out &);
+    ThreadPolicy_out &operator= (const ThreadPolicy_var &);
+    ThreadPolicy_out &operator= (ThreadPolicy_ptr);
+    operator ThreadPolicy_ptr &();
+    ThreadPolicy_ptr &ptr (void);
+    ThreadPolicy_ptr operator-> (void);
+  
+  private:
+    ThreadPolicy_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -544,104 +580,112 @@ private:
 #define _PORTABLESERVER_THREADPOLICY_CH_
 
 class TAO_PortableServer_Export ThreadPolicy: public virtual CORBA::Policy
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ThreadPolicy_ptr _ptr_type;
-  typedef ThreadPolicy_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj);
-  static ThreadPolicy_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static ThreadPolicy_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static ThreadPolicy_ptr _nil (void)
-    {
-      return (ThreadPolicy_ptr)0;
-    }
-
-  virtual PortableServer::ThreadPolicyValue value (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  ThreadPolicy (void);
-  virtual ~ThreadPolicy (void);
-private:
-  ThreadPolicy (const ThreadPolicy &);
-  void operator= (const ThreadPolicy &);
-};
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef ThreadPolicy_ptr _ptr_type;
+    typedef ThreadPolicy_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj);
+    static ThreadPolicy_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static ThreadPolicy_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static ThreadPolicy_ptr _nil (void)
+      {
+        return (ThreadPolicy_ptr)0;
+      }
+
+    virtual PortableServer::ThreadPolicyValue value (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    ThreadPolicy ();
+    
+    virtual ~ThreadPolicy (void);
+  private:
+    ThreadPolicy (const ThreadPolicy &);
+    void operator= (const ThreadPolicy &);
+  };
 
 
 #endif /* end #if !defined */
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-enum LifespanPolicyValue
-{
-    TRANSIENT,
-    PERSISTENT,
-    LifespanPolicyValue_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF
-};
-typedef LifespanPolicyValue &LifespanPolicyValue_out;
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_LifespanPolicyValue;
+  enum LifespanPolicyValue
+  {
+        TRANSIENT,
+        PERSISTENT    
+  };
+  typedef LifespanPolicyValue &LifespanPolicyValue_out;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_LifespanPolicyValue;
 
 
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY___PTR_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY___PTR_CH_
 
-class LifespanPolicy;
-typedef LifespanPolicy *LifespanPolicy_ptr;
-
+  class LifespanPolicy;
+  typedef LifespanPolicy *LifespanPolicy_ptr;
+  
 #endif /* end #if !defined */
 
 
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY___VAR_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY___VAR_CH_
 
-class TAO_PortableServer_Export LifespanPolicy_var : public TAO_Base_var
-{
-public:
-  LifespanPolicy_var (void); // default constructor
-  LifespanPolicy_var (LifespanPolicy_ptr p) : ptr_ (p) {}
-  LifespanPolicy_var (const LifespanPolicy_var &); // copy constructor
-  ~LifespanPolicy_var (void); // destructor
-
-  LifespanPolicy_var &operator= (LifespanPolicy_ptr);
-  LifespanPolicy_var &operator= (const LifespanPolicy_var &);
-  LifespanPolicy_ptr operator-> (void) const;
-
-  operator const LifespanPolicy_ptr &() const;
-  operator LifespanPolicy_ptr &();
-  // in, inout, out, _retn
-  LifespanPolicy_ptr in (void) const;
-  LifespanPolicy_ptr &inout (void);
-  LifespanPolicy_ptr &out (void);
-  LifespanPolicy_ptr _retn (void);
-  LifespanPolicy_ptr ptr (void) const;
-
-private:
-  LifespanPolicy_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  LifespanPolicy_var (const TAO_Base_var &rhs);
-  LifespanPolicy_var &operator= (const TAO_Base_var &rhs);
-};
+  class TAO_PortableServer_Export LifespanPolicy_var : public TAO_Base_var
+  {
+  public:
+    LifespanPolicy_var (void); // default constructor
+    LifespanPolicy_var (LifespanPolicy_ptr p) : ptr_ (p) {} 
+    LifespanPolicy_var (const LifespanPolicy_var &); // copy constructor
+    ~LifespanPolicy_var (void); // destructor
+    
+    LifespanPolicy_var &operator= (LifespanPolicy_ptr);
+    LifespanPolicy_var &operator= (const LifespanPolicy_var &);
+    LifespanPolicy_ptr operator-> (void) const;
+    
+    operator const LifespanPolicy_ptr &() const;
+    operator LifespanPolicy_ptr &();
+    // in, inout, out, _retn 
+    LifespanPolicy_ptr in (void) const;
+    LifespanPolicy_ptr &inout (void);
+    LifespanPolicy_ptr &out (void);
+    LifespanPolicy_ptr _retn (void);
+    LifespanPolicy_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static LifespanPolicy_ptr duplicate (LifespanPolicy_ptr);
+    static void release (LifespanPolicy_ptr);
+    static LifespanPolicy_ptr nil (void);
+    static LifespanPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
+  private:
+    LifespanPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    LifespanPolicy_var (const TAO_Base_var &rhs);
+    LifespanPolicy_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -650,22 +694,22 @@ private:
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY___OUT_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY___OUT_CH_
 
-class TAO_PortableServer_Export LifespanPolicy_out
-{
-public:
-  LifespanPolicy_out (LifespanPolicy_ptr &);
-  LifespanPolicy_out (LifespanPolicy_var &);
-  LifespanPolicy_out (const LifespanPolicy_out &);
-  LifespanPolicy_out &operator= (const LifespanPolicy_out &);
-  LifespanPolicy_out &operator= (const LifespanPolicy_var &);
-  LifespanPolicy_out &operator= (LifespanPolicy_ptr);
-  operator LifespanPolicy_ptr &();
-  LifespanPolicy_ptr &ptr (void);
-  LifespanPolicy_ptr operator-> (void);
-
-private:
-  LifespanPolicy_ptr &ptr_;
-};
+  class TAO_PortableServer_Export LifespanPolicy_out
+  {
+  public:
+    LifespanPolicy_out (LifespanPolicy_ptr &);
+    LifespanPolicy_out (LifespanPolicy_var &);
+    LifespanPolicy_out (const LifespanPolicy_out &);
+    LifespanPolicy_out &operator= (const LifespanPolicy_out &);
+    LifespanPolicy_out &operator= (const LifespanPolicy_var &);
+    LifespanPolicy_out &operator= (LifespanPolicy_ptr);
+    operator LifespanPolicy_ptr &();
+    LifespanPolicy_ptr &ptr (void);
+    LifespanPolicy_ptr operator-> (void);
+  
+  private:
+    LifespanPolicy_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -675,102 +719,110 @@ private:
 #define _PORTABLESERVER_LIFESPANPOLICY_CH_
 
 class TAO_PortableServer_Export LifespanPolicy: public virtual CORBA::Policy
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef LifespanPolicy_ptr _ptr_type;
-  typedef LifespanPolicy_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj);
-  static LifespanPolicy_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static LifespanPolicy_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static LifespanPolicy_ptr _nil (void)
-    {
-      return (LifespanPolicy_ptr)0;
-    }
-
-  virtual PortableServer::LifespanPolicyValue value (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  LifespanPolicy (void);
-  virtual ~LifespanPolicy (void);
-private:
-  LifespanPolicy (const LifespanPolicy &);
-  void operator= (const LifespanPolicy &);
-};
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef LifespanPolicy_ptr _ptr_type;
+    typedef LifespanPolicy_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj);
+    static LifespanPolicy_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static LifespanPolicy_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static LifespanPolicy_ptr _nil (void)
+      {
+        return (LifespanPolicy_ptr)0;
+      }
+
+    virtual PortableServer::LifespanPolicyValue value (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    LifespanPolicy ();
+    
+    virtual ~LifespanPolicy (void);
+  private:
+    LifespanPolicy (const LifespanPolicy &);
+    void operator= (const LifespanPolicy &);
+  };
 
 
 #endif /* end #if !defined */
 
-enum IdUniquenessPolicyValue
-{
-    UNIQUE_ID,
-    MULTIPLE_ID,
-    IdUniquenessPolicyValue_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF
-};
-typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out;
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue;
+  enum IdUniquenessPolicyValue
+  {
+        UNIQUE_ID,
+        MULTIPLE_ID    
+  };
+  typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue;
 
 
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_
 
-class IdUniquenessPolicy;
-typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr;
-
+  class IdUniquenessPolicy;
+  typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr;
+  
 #endif /* end #if !defined */
 
 
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CH_
 
-class TAO_PortableServer_Export IdUniquenessPolicy_var : public TAO_Base_var
-{
-public:
-  IdUniquenessPolicy_var (void); // default constructor
-  IdUniquenessPolicy_var (IdUniquenessPolicy_ptr p) : ptr_ (p) {}
-  IdUniquenessPolicy_var (const IdUniquenessPolicy_var &); // copy constructor
-  ~IdUniquenessPolicy_var (void); // destructor
-
-  IdUniquenessPolicy_var &operator= (IdUniquenessPolicy_ptr);
-  IdUniquenessPolicy_var &operator= (const IdUniquenessPolicy_var &);
-  IdUniquenessPolicy_ptr operator-> (void) const;
-
-  operator const IdUniquenessPolicy_ptr &() const;
-  operator IdUniquenessPolicy_ptr &();
-  // in, inout, out, _retn
-  IdUniquenessPolicy_ptr in (void) const;
-  IdUniquenessPolicy_ptr &inout (void);
-  IdUniquenessPolicy_ptr &out (void);
-  IdUniquenessPolicy_ptr _retn (void);
-  IdUniquenessPolicy_ptr ptr (void) const;
-
-private:
-  IdUniquenessPolicy_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  IdUniquenessPolicy_var (const TAO_Base_var &rhs);
-  IdUniquenessPolicy_var &operator= (const TAO_Base_var &rhs);
-};
+  class TAO_PortableServer_Export IdUniquenessPolicy_var : public TAO_Base_var
+  {
+  public:
+    IdUniquenessPolicy_var (void); // default constructor
+    IdUniquenessPolicy_var (IdUniquenessPolicy_ptr p) : ptr_ (p) {} 
+    IdUniquenessPolicy_var (const IdUniquenessPolicy_var &); // copy constructor
+    ~IdUniquenessPolicy_var (void); // destructor
+    
+    IdUniquenessPolicy_var &operator= (IdUniquenessPolicy_ptr);
+    IdUniquenessPolicy_var &operator= (const IdUniquenessPolicy_var &);
+    IdUniquenessPolicy_ptr operator-> (void) const;
+    
+    operator const IdUniquenessPolicy_ptr &() const;
+    operator IdUniquenessPolicy_ptr &();
+    // in, inout, out, _retn 
+    IdUniquenessPolicy_ptr in (void) const;
+    IdUniquenessPolicy_ptr &inout (void);
+    IdUniquenessPolicy_ptr &out (void);
+    IdUniquenessPolicy_ptr _retn (void);
+    IdUniquenessPolicy_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static IdUniquenessPolicy_ptr duplicate (IdUniquenessPolicy_ptr);
+    static void release (IdUniquenessPolicy_ptr);
+    static IdUniquenessPolicy_ptr nil (void);
+    static IdUniquenessPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
+  private:
+    IdUniquenessPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    IdUniquenessPolicy_var (const TAO_Base_var &rhs);
+    IdUniquenessPolicy_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -779,22 +831,22 @@ private:
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CH_
 
-class TAO_PortableServer_Export IdUniquenessPolicy_out
-{
-public:
-  IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &);
-  IdUniquenessPolicy_out (IdUniquenessPolicy_var &);
-  IdUniquenessPolicy_out (const IdUniquenessPolicy_out &);
-  IdUniquenessPolicy_out &operator= (const IdUniquenessPolicy_out &);
-  IdUniquenessPolicy_out &operator= (const IdUniquenessPolicy_var &);
-  IdUniquenessPolicy_out &operator= (IdUniquenessPolicy_ptr);
-  operator IdUniquenessPolicy_ptr &();
-  IdUniquenessPolicy_ptr &ptr (void);
-  IdUniquenessPolicy_ptr operator-> (void);
-
-private:
-  IdUniquenessPolicy_ptr &ptr_;
-};
+  class TAO_PortableServer_Export IdUniquenessPolicy_out
+  {
+  public:
+    IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &);
+    IdUniquenessPolicy_out (IdUniquenessPolicy_var &);
+    IdUniquenessPolicy_out (const IdUniquenessPolicy_out &);
+    IdUniquenessPolicy_out &operator= (const IdUniquenessPolicy_out &);
+    IdUniquenessPolicy_out &operator= (const IdUniquenessPolicy_var &);
+    IdUniquenessPolicy_out &operator= (IdUniquenessPolicy_ptr);
+    operator IdUniquenessPolicy_ptr &();
+    IdUniquenessPolicy_ptr &ptr (void);
+    IdUniquenessPolicy_ptr operator-> (void);
+  
+  private:
+    IdUniquenessPolicy_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -804,102 +856,110 @@ private:
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY_CH_
 
 class TAO_PortableServer_Export IdUniquenessPolicy: public virtual CORBA::Policy
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef IdUniquenessPolicy_ptr _ptr_type;
-  typedef IdUniquenessPolicy_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj);
-  static IdUniquenessPolicy_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static IdUniquenessPolicy_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static IdUniquenessPolicy_ptr _nil (void)
-    {
-      return (IdUniquenessPolicy_ptr)0;
-    }
-
-  virtual PortableServer::IdUniquenessPolicyValue value (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  IdUniquenessPolicy (void);
-  virtual ~IdUniquenessPolicy (void);
-private:
-  IdUniquenessPolicy (const IdUniquenessPolicy &);
-  void operator= (const IdUniquenessPolicy &);
-};
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef IdUniquenessPolicy_ptr _ptr_type;
+    typedef IdUniquenessPolicy_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj);
+    static IdUniquenessPolicy_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static IdUniquenessPolicy_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static IdUniquenessPolicy_ptr _nil (void)
+      {
+        return (IdUniquenessPolicy_ptr)0;
+      }
+
+    virtual PortableServer::IdUniquenessPolicyValue value (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    IdUniquenessPolicy ();
+    
+    virtual ~IdUniquenessPolicy (void);
+  private:
+    IdUniquenessPolicy (const IdUniquenessPolicy &);
+    void operator= (const IdUniquenessPolicy &);
+  };
 
 
 #endif /* end #if !defined */
 
-enum IdAssignmentPolicyValue
-{
-    USER_ID,
-    SYSTEM_ID,
-    IdAssignmentPolicyValue_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF
-};
-typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out;
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue;
+  enum IdAssignmentPolicyValue
+  {
+        USER_ID,
+        SYSTEM_ID    
+  };
+  typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue;
 
 
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_
 
-class IdAssignmentPolicy;
-typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr;
-
+  class IdAssignmentPolicy;
+  typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr;
+  
 #endif /* end #if !defined */
 
 
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CH_
 
-class TAO_PortableServer_Export IdAssignmentPolicy_var : public TAO_Base_var
-{
-public:
-  IdAssignmentPolicy_var (void); // default constructor
-  IdAssignmentPolicy_var (IdAssignmentPolicy_ptr p) : ptr_ (p) {}
-  IdAssignmentPolicy_var (const IdAssignmentPolicy_var &); // copy constructor
-  ~IdAssignmentPolicy_var (void); // destructor
-
-  IdAssignmentPolicy_var &operator= (IdAssignmentPolicy_ptr);
-  IdAssignmentPolicy_var &operator= (const IdAssignmentPolicy_var &);
-  IdAssignmentPolicy_ptr operator-> (void) const;
-
-  operator const IdAssignmentPolicy_ptr &() const;
-  operator IdAssignmentPolicy_ptr &();
-  // in, inout, out, _retn
-  IdAssignmentPolicy_ptr in (void) const;
-  IdAssignmentPolicy_ptr &inout (void);
-  IdAssignmentPolicy_ptr &out (void);
-  IdAssignmentPolicy_ptr _retn (void);
-  IdAssignmentPolicy_ptr ptr (void) const;
-
-private:
-  IdAssignmentPolicy_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  IdAssignmentPolicy_var (const TAO_Base_var &rhs);
-  IdAssignmentPolicy_var &operator= (const TAO_Base_var &rhs);
-};
+  class TAO_PortableServer_Export IdAssignmentPolicy_var : public TAO_Base_var
+  {
+  public:
+    IdAssignmentPolicy_var (void); // default constructor
+    IdAssignmentPolicy_var (IdAssignmentPolicy_ptr p) : ptr_ (p) {} 
+    IdAssignmentPolicy_var (const IdAssignmentPolicy_var &); // copy constructor
+    ~IdAssignmentPolicy_var (void); // destructor
+    
+    IdAssignmentPolicy_var &operator= (IdAssignmentPolicy_ptr);
+    IdAssignmentPolicy_var &operator= (const IdAssignmentPolicy_var &);
+    IdAssignmentPolicy_ptr operator-> (void) const;
+    
+    operator const IdAssignmentPolicy_ptr &() const;
+    operator IdAssignmentPolicy_ptr &();
+    // in, inout, out, _retn 
+    IdAssignmentPolicy_ptr in (void) const;
+    IdAssignmentPolicy_ptr &inout (void);
+    IdAssignmentPolicy_ptr &out (void);
+    IdAssignmentPolicy_ptr _retn (void);
+    IdAssignmentPolicy_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static IdAssignmentPolicy_ptr duplicate (IdAssignmentPolicy_ptr);
+    static void release (IdAssignmentPolicy_ptr);
+    static IdAssignmentPolicy_ptr nil (void);
+    static IdAssignmentPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
+  private:
+    IdAssignmentPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    IdAssignmentPolicy_var (const TAO_Base_var &rhs);
+    IdAssignmentPolicy_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -908,22 +968,22 @@ private:
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CH_
 
-class TAO_PortableServer_Export IdAssignmentPolicy_out
-{
-public:
-  IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &);
-  IdAssignmentPolicy_out (IdAssignmentPolicy_var &);
-  IdAssignmentPolicy_out (const IdAssignmentPolicy_out &);
-  IdAssignmentPolicy_out &operator= (const IdAssignmentPolicy_out &);
-  IdAssignmentPolicy_out &operator= (const IdAssignmentPolicy_var &);
-  IdAssignmentPolicy_out &operator= (IdAssignmentPolicy_ptr);
-  operator IdAssignmentPolicy_ptr &();
-  IdAssignmentPolicy_ptr &ptr (void);
-  IdAssignmentPolicy_ptr operator-> (void);
-
-private:
-  IdAssignmentPolicy_ptr &ptr_;
-};
+  class TAO_PortableServer_Export IdAssignmentPolicy_out
+  {
+  public:
+    IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &);
+    IdAssignmentPolicy_out (IdAssignmentPolicy_var &);
+    IdAssignmentPolicy_out (const IdAssignmentPolicy_out &);
+    IdAssignmentPolicy_out &operator= (const IdAssignmentPolicy_out &);
+    IdAssignmentPolicy_out &operator= (const IdAssignmentPolicy_var &);
+    IdAssignmentPolicy_out &operator= (IdAssignmentPolicy_ptr);
+    operator IdAssignmentPolicy_ptr &();
+    IdAssignmentPolicy_ptr &ptr (void);
+    IdAssignmentPolicy_ptr operator-> (void);
+  
+  private:
+    IdAssignmentPolicy_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -933,105 +993,113 @@ private:
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY_CH_
 
 class TAO_PortableServer_Export IdAssignmentPolicy: public virtual CORBA::Policy
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef IdAssignmentPolicy_ptr _ptr_type;
-  typedef IdAssignmentPolicy_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj);
-  static IdAssignmentPolicy_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static IdAssignmentPolicy_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static IdAssignmentPolicy_ptr _nil (void)
-    {
-      return (IdAssignmentPolicy_ptr)0;
-    }
-
-  virtual PortableServer::IdAssignmentPolicyValue value (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  IdAssignmentPolicy (void);
-  virtual ~IdAssignmentPolicy (void);
-private:
-  IdAssignmentPolicy (const IdAssignmentPolicy &);
-  void operator= (const IdAssignmentPolicy &);
-};
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef IdAssignmentPolicy_ptr _ptr_type;
+    typedef IdAssignmentPolicy_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj);
+    static IdAssignmentPolicy_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static IdAssignmentPolicy_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static IdAssignmentPolicy_ptr _nil (void)
+      {
+        return (IdAssignmentPolicy_ptr)0;
+      }
+
+    virtual PortableServer::IdAssignmentPolicyValue value (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    IdAssignmentPolicy ();
+    
+    virtual ~IdAssignmentPolicy (void);
+  private:
+    IdAssignmentPolicy (const IdAssignmentPolicy &);
+    void operator= (const IdAssignmentPolicy &);
+  };
 
 
 #endif /* end #if !defined */
 
-enum ImplicitActivationPolicyValue
-{
-    IMPLICIT_ACTIVATION,
-    NO_IMPLICIT_ACTIVATION,
-    ImplicitActivationPolicyValue_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF
-};
+  enum ImplicitActivationPolicyValue
+  {
+        IMPLICIT_ACTIVATION,
+        NO_IMPLICIT_ACTIVATION    
+  };
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue;
+  typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue;
 
 
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_
 
-class ImplicitActivationPolicy;
-typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr;
-
+  class ImplicitActivationPolicy;
+  typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr;
+  
 #endif /* end #if !defined */
 
 
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CH_
 
-class TAO_PortableServer_Export ImplicitActivationPolicy_var : public TAO_Base_var
-{
-public:
-  ImplicitActivationPolicy_var (void); // default constructor
-  ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr p) : ptr_ (p) {}
-  ImplicitActivationPolicy_var (const ImplicitActivationPolicy_var &); // copy constructor
-  ~ImplicitActivationPolicy_var (void); // destructor
-
-  ImplicitActivationPolicy_var &operator= (ImplicitActivationPolicy_ptr);
-  ImplicitActivationPolicy_var &operator= (const ImplicitActivationPolicy_var &);
-  ImplicitActivationPolicy_ptr operator-> (void) const;
-
-  operator const ImplicitActivationPolicy_ptr &() const;
-  operator ImplicitActivationPolicy_ptr &();
-  // in, inout, out, _retn
-  ImplicitActivationPolicy_ptr in (void) const;
-  ImplicitActivationPolicy_ptr &inout (void);
-  ImplicitActivationPolicy_ptr &out (void);
-  ImplicitActivationPolicy_ptr _retn (void);
-  ImplicitActivationPolicy_ptr ptr (void) const;
-
-private:
-  ImplicitActivationPolicy_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  ImplicitActivationPolicy_var (const TAO_Base_var &rhs);
-  ImplicitActivationPolicy_var &operator= (const TAO_Base_var &rhs);
-};
+  class TAO_PortableServer_Export ImplicitActivationPolicy_var : public TAO_Base_var
+  {
+  public:
+    ImplicitActivationPolicy_var (void); // default constructor
+    ImplicitActivationPolicy_var (ImplicitActivationPolicy_ptr p) : ptr_ (p) {} 
+    ImplicitActivationPolicy_var (const ImplicitActivationPolicy_var &); // copy constructor
+    ~ImplicitActivationPolicy_var (void); // destructor
+    
+    ImplicitActivationPolicy_var &operator= (ImplicitActivationPolicy_ptr);
+    ImplicitActivationPolicy_var &operator= (const ImplicitActivationPolicy_var &);
+    ImplicitActivationPolicy_ptr operator-> (void) const;
+    
+    operator const ImplicitActivationPolicy_ptr &() const;
+    operator ImplicitActivationPolicy_ptr &();
+    // in, inout, out, _retn 
+    ImplicitActivationPolicy_ptr in (void) const;
+    ImplicitActivationPolicy_ptr &inout (void);
+    ImplicitActivationPolicy_ptr &out (void);
+    ImplicitActivationPolicy_ptr _retn (void);
+    ImplicitActivationPolicy_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ImplicitActivationPolicy_ptr duplicate (ImplicitActivationPolicy_ptr);
+    static void release (ImplicitActivationPolicy_ptr);
+    static ImplicitActivationPolicy_ptr nil (void);
+    static ImplicitActivationPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
+  private:
+    ImplicitActivationPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ImplicitActivationPolicy_var (const TAO_Base_var &rhs);
+    ImplicitActivationPolicy_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -1040,22 +1108,22 @@ private:
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CH_
 
-class TAO_PortableServer_Export ImplicitActivationPolicy_out
-{
-public:
-  ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &);
-  ImplicitActivationPolicy_out (ImplicitActivationPolicy_var &);
-  ImplicitActivationPolicy_out (const ImplicitActivationPolicy_out &);
-  ImplicitActivationPolicy_out &operator= (const ImplicitActivationPolicy_out &);
-  ImplicitActivationPolicy_out &operator= (const ImplicitActivationPolicy_var &);
-  ImplicitActivationPolicy_out &operator= (ImplicitActivationPolicy_ptr);
-  operator ImplicitActivationPolicy_ptr &();
-  ImplicitActivationPolicy_ptr &ptr (void);
-  ImplicitActivationPolicy_ptr operator-> (void);
-
-private:
-  ImplicitActivationPolicy_ptr &ptr_;
-};
+  class TAO_PortableServer_Export ImplicitActivationPolicy_out
+  {
+  public:
+    ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &);
+    ImplicitActivationPolicy_out (ImplicitActivationPolicy_var &);
+    ImplicitActivationPolicy_out (const ImplicitActivationPolicy_out &);
+    ImplicitActivationPolicy_out &operator= (const ImplicitActivationPolicy_out &);
+    ImplicitActivationPolicy_out &operator= (const ImplicitActivationPolicy_var &);
+    ImplicitActivationPolicy_out &operator= (ImplicitActivationPolicy_ptr);
+    operator ImplicitActivationPolicy_ptr &();
+    ImplicitActivationPolicy_ptr &ptr (void);
+    ImplicitActivationPolicy_ptr operator-> (void);
+  
+  private:
+    ImplicitActivationPolicy_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -1065,107 +1133,115 @@ private:
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_
 
 class TAO_PortableServer_Export ImplicitActivationPolicy: public virtual CORBA::Policy
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ImplicitActivationPolicy_ptr _ptr_type;
-  typedef ImplicitActivationPolicy_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj);
-  static ImplicitActivationPolicy_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static ImplicitActivationPolicy_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static ImplicitActivationPolicy_ptr _nil (void)
-    {
-      return (ImplicitActivationPolicy_ptr)0;
-    }
-
-  virtual PortableServer::ImplicitActivationPolicyValue value (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  ImplicitActivationPolicy (void);
-  virtual ~ImplicitActivationPolicy (void);
-private:
-  ImplicitActivationPolicy (const ImplicitActivationPolicy &);
-  void operator= (const ImplicitActivationPolicy &);
-};
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef ImplicitActivationPolicy_ptr _ptr_type;
+    typedef ImplicitActivationPolicy_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj);
+    static ImplicitActivationPolicy_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static ImplicitActivationPolicy_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static ImplicitActivationPolicy_ptr _nil (void)
+      {
+        return (ImplicitActivationPolicy_ptr)0;
+      }
+
+    virtual PortableServer::ImplicitActivationPolicyValue value (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    ImplicitActivationPolicy ();
+    
+    virtual ~ImplicitActivationPolicy (void);
+  private:
+    ImplicitActivationPolicy (const ImplicitActivationPolicy &);
+    void operator= (const ImplicitActivationPolicy &);
+  };
 
 
 #endif /* end #if !defined */
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-enum ServantRetentionPolicyValue
-{
-    RETAIN,
-    NON_RETAIN,
-    ServantRetentionPolicyValue_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF
-};
+  enum ServantRetentionPolicyValue
+  {
+        RETAIN,
+        NON_RETAIN    
+  };
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue;
+  typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue;
 
 
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_
 
-class ServantRetentionPolicy;
-typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr;
-
+  class ServantRetentionPolicy;
+  typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr;
+  
 #endif /* end #if !defined */
 
 
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CH_
 
-class TAO_PortableServer_Export ServantRetentionPolicy_var : public TAO_Base_var
-{
-public:
-  ServantRetentionPolicy_var (void); // default constructor
-  ServantRetentionPolicy_var (ServantRetentionPolicy_ptr p) : ptr_ (p) {}
-  ServantRetentionPolicy_var (const ServantRetentionPolicy_var &); // copy constructor
-  ~ServantRetentionPolicy_var (void); // destructor
-
-  ServantRetentionPolicy_var &operator= (ServantRetentionPolicy_ptr);
-  ServantRetentionPolicy_var &operator= (const ServantRetentionPolicy_var &);
-  ServantRetentionPolicy_ptr operator-> (void) const;
-
-  operator const ServantRetentionPolicy_ptr &() const;
-  operator ServantRetentionPolicy_ptr &();
-  // in, inout, out, _retn
-  ServantRetentionPolicy_ptr in (void) const;
-  ServantRetentionPolicy_ptr &inout (void);
-  ServantRetentionPolicy_ptr &out (void);
-  ServantRetentionPolicy_ptr _retn (void);
-  ServantRetentionPolicy_ptr ptr (void) const;
-
-private:
-  ServantRetentionPolicy_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  ServantRetentionPolicy_var (const TAO_Base_var &rhs);
-  ServantRetentionPolicy_var &operator= (const TAO_Base_var &rhs);
-};
+  class TAO_PortableServer_Export ServantRetentionPolicy_var : public TAO_Base_var
+  {
+  public:
+    ServantRetentionPolicy_var (void); // default constructor
+    ServantRetentionPolicy_var (ServantRetentionPolicy_ptr p) : ptr_ (p) {} 
+    ServantRetentionPolicy_var (const ServantRetentionPolicy_var &); // copy constructor
+    ~ServantRetentionPolicy_var (void); // destructor
+    
+    ServantRetentionPolicy_var &operator= (ServantRetentionPolicy_ptr);
+    ServantRetentionPolicy_var &operator= (const ServantRetentionPolicy_var &);
+    ServantRetentionPolicy_ptr operator-> (void) const;
+    
+    operator const ServantRetentionPolicy_ptr &() const;
+    operator ServantRetentionPolicy_ptr &();
+    // in, inout, out, _retn 
+    ServantRetentionPolicy_ptr in (void) const;
+    ServantRetentionPolicy_ptr &inout (void);
+    ServantRetentionPolicy_ptr &out (void);
+    ServantRetentionPolicy_ptr _retn (void);
+    ServantRetentionPolicy_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ServantRetentionPolicy_ptr duplicate (ServantRetentionPolicy_ptr);
+    static void release (ServantRetentionPolicy_ptr);
+    static ServantRetentionPolicy_ptr nil (void);
+    static ServantRetentionPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
+  private:
+    ServantRetentionPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ServantRetentionPolicy_var (const TAO_Base_var &rhs);
+    ServantRetentionPolicy_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -1174,22 +1250,22 @@ private:
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CH_
 
-class TAO_PortableServer_Export ServantRetentionPolicy_out
-{
-public:
-  ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &);
-  ServantRetentionPolicy_out (ServantRetentionPolicy_var &);
-  ServantRetentionPolicy_out (const ServantRetentionPolicy_out &);
-  ServantRetentionPolicy_out &operator= (const ServantRetentionPolicy_out &);
-  ServantRetentionPolicy_out &operator= (const ServantRetentionPolicy_var &);
-  ServantRetentionPolicy_out &operator= (ServantRetentionPolicy_ptr);
-  operator ServantRetentionPolicy_ptr &();
-  ServantRetentionPolicy_ptr &ptr (void);
-  ServantRetentionPolicy_ptr operator-> (void);
-
-private:
-  ServantRetentionPolicy_ptr &ptr_;
-};
+  class TAO_PortableServer_Export ServantRetentionPolicy_out
+  {
+  public:
+    ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &);
+    ServantRetentionPolicy_out (ServantRetentionPolicy_var &);
+    ServantRetentionPolicy_out (const ServantRetentionPolicy_out &);
+    ServantRetentionPolicy_out &operator= (const ServantRetentionPolicy_out &);
+    ServantRetentionPolicy_out &operator= (const ServantRetentionPolicy_var &);
+    ServantRetentionPolicy_out &operator= (ServantRetentionPolicy_ptr);
+    operator ServantRetentionPolicy_ptr &();
+    ServantRetentionPolicy_ptr &ptr (void);
+    ServantRetentionPolicy_ptr operator-> (void);
+  
+  private:
+    ServantRetentionPolicy_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -1199,108 +1275,116 @@ private:
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_
 
 class TAO_PortableServer_Export ServantRetentionPolicy: public virtual CORBA::Policy
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ServantRetentionPolicy_ptr _ptr_type;
-  typedef ServantRetentionPolicy_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj);
-  static ServantRetentionPolicy_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static ServantRetentionPolicy_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static ServantRetentionPolicy_ptr _nil (void)
-    {
-      return (ServantRetentionPolicy_ptr)0;
-    }
-
-  virtual PortableServer::ServantRetentionPolicyValue value (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  ServantRetentionPolicy (void);
-  virtual ~ServantRetentionPolicy (void);
-private:
-  ServantRetentionPolicy (const ServantRetentionPolicy &);
-  void operator= (const ServantRetentionPolicy &);
-};
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef ServantRetentionPolicy_ptr _ptr_type;
+    typedef ServantRetentionPolicy_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj);
+    static ServantRetentionPolicy_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static ServantRetentionPolicy_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static ServantRetentionPolicy_ptr _nil (void)
+      {
+        return (ServantRetentionPolicy_ptr)0;
+      }
+
+    virtual PortableServer::ServantRetentionPolicyValue value (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    ServantRetentionPolicy ();
+    
+    virtual ~ServantRetentionPolicy (void);
+  private:
+    ServantRetentionPolicy (const ServantRetentionPolicy &);
+    void operator= (const ServantRetentionPolicy &);
+  };
 
 
 #endif /* end #if !defined */
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-enum RequestProcessingPolicyValue
-{
-    USE_ACTIVE_OBJECT_MAP_ONLY,
-    USE_DEFAULT_SERVANT,
-    USE_SERVANT_MANAGER,
-    RequestProcessingPolicyValue_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF
-};
+  enum RequestProcessingPolicyValue
+  {
+        USE_ACTIVE_OBJECT_MAP_ONLY,
+        USE_DEFAULT_SERVANT,
+        USE_SERVANT_MANAGER    
+  };
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue;
+  typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue;
 
 
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_
 
-class RequestProcessingPolicy;
-typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr;
-
+  class RequestProcessingPolicy;
+  typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr;
+  
 #endif /* end #if !defined */
 
 
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CH_
 
-class TAO_PortableServer_Export RequestProcessingPolicy_var : public TAO_Base_var
-{
-public:
-  RequestProcessingPolicy_var (void); // default constructor
-  RequestProcessingPolicy_var (RequestProcessingPolicy_ptr p) : ptr_ (p) {}
-  RequestProcessingPolicy_var (const RequestProcessingPolicy_var &); // copy constructor
-  ~RequestProcessingPolicy_var (void); // destructor
-
-  RequestProcessingPolicy_var &operator= (RequestProcessingPolicy_ptr);
-  RequestProcessingPolicy_var &operator= (const RequestProcessingPolicy_var &);
-  RequestProcessingPolicy_ptr operator-> (void) const;
-
-  operator const RequestProcessingPolicy_ptr &() const;
-  operator RequestProcessingPolicy_ptr &();
-  // in, inout, out, _retn
-  RequestProcessingPolicy_ptr in (void) const;
-  RequestProcessingPolicy_ptr &inout (void);
-  RequestProcessingPolicy_ptr &out (void);
-  RequestProcessingPolicy_ptr _retn (void);
-  RequestProcessingPolicy_ptr ptr (void) const;
-
-private:
-  RequestProcessingPolicy_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  RequestProcessingPolicy_var (const TAO_Base_var &rhs);
-  RequestProcessingPolicy_var &operator= (const TAO_Base_var &rhs);
-};
+  class TAO_PortableServer_Export RequestProcessingPolicy_var : public TAO_Base_var
+  {
+  public:
+    RequestProcessingPolicy_var (void); // default constructor
+    RequestProcessingPolicy_var (RequestProcessingPolicy_ptr p) : ptr_ (p) {} 
+    RequestProcessingPolicy_var (const RequestProcessingPolicy_var &); // copy constructor
+    ~RequestProcessingPolicy_var (void); // destructor
+    
+    RequestProcessingPolicy_var &operator= (RequestProcessingPolicy_ptr);
+    RequestProcessingPolicy_var &operator= (const RequestProcessingPolicy_var &);
+    RequestProcessingPolicy_ptr operator-> (void) const;
+    
+    operator const RequestProcessingPolicy_ptr &() const;
+    operator RequestProcessingPolicy_ptr &();
+    // in, inout, out, _retn 
+    RequestProcessingPolicy_ptr in (void) const;
+    RequestProcessingPolicy_ptr &inout (void);
+    RequestProcessingPolicy_ptr &out (void);
+    RequestProcessingPolicy_ptr _retn (void);
+    RequestProcessingPolicy_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static RequestProcessingPolicy_ptr duplicate (RequestProcessingPolicy_ptr);
+    static void release (RequestProcessingPolicy_ptr);
+    static RequestProcessingPolicy_ptr nil (void);
+    static RequestProcessingPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
+  private:
+    RequestProcessingPolicy_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    RequestProcessingPolicy_var (const TAO_Base_var &rhs);
+    RequestProcessingPolicy_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -1309,22 +1393,22 @@ private:
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CH_
 
-class TAO_PortableServer_Export RequestProcessingPolicy_out
-{
-public:
-  RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &);
-  RequestProcessingPolicy_out (RequestProcessingPolicy_var &);
-  RequestProcessingPolicy_out (const RequestProcessingPolicy_out &);
-  RequestProcessingPolicy_out &operator= (const RequestProcessingPolicy_out &);
-  RequestProcessingPolicy_out &operator= (const RequestProcessingPolicy_var &);
-  RequestProcessingPolicy_out &operator= (RequestProcessingPolicy_ptr);
-  operator RequestProcessingPolicy_ptr &();
-  RequestProcessingPolicy_ptr &ptr (void);
-  RequestProcessingPolicy_ptr operator-> (void);
-
-private:
-  RequestProcessingPolicy_ptr &ptr_;
-};
+  class TAO_PortableServer_Export RequestProcessingPolicy_out
+  {
+  public:
+    RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &);
+    RequestProcessingPolicy_out (RequestProcessingPolicy_var &);
+    RequestProcessingPolicy_out (const RequestProcessingPolicy_out &);
+    RequestProcessingPolicy_out &operator= (const RequestProcessingPolicy_out &);
+    RequestProcessingPolicy_out &operator= (const RequestProcessingPolicy_var &);
+    RequestProcessingPolicy_out &operator= (RequestProcessingPolicy_ptr);
+    operator RequestProcessingPolicy_ptr &();
+    RequestProcessingPolicy_ptr &ptr (void);
+    RequestProcessingPolicy_ptr operator-> (void);
+  
+  private:
+    RequestProcessingPolicy_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -1334,94 +1418,104 @@ private:
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_
 
 class TAO_PortableServer_Export RequestProcessingPolicy: public virtual CORBA::Policy
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef RequestProcessingPolicy_ptr _ptr_type;
-  typedef RequestProcessingPolicy_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj);
-  static RequestProcessingPolicy_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static RequestProcessingPolicy_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static RequestProcessingPolicy_ptr _nil (void)
-    {
-      return (RequestProcessingPolicy_ptr)0;
-    }
-
-  virtual PortableServer::RequestProcessingPolicyValue value (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  RequestProcessingPolicy (void);
-  virtual ~RequestProcessingPolicy (void);
-private:
-  RequestProcessingPolicy (const RequestProcessingPolicy &);
-  void operator= (const RequestProcessingPolicy &);
-};
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef RequestProcessingPolicy_ptr _ptr_type;
+    typedef RequestProcessingPolicy_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj);
+    static RequestProcessingPolicy_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static RequestProcessingPolicy_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static RequestProcessingPolicy_ptr _nil (void)
+      {
+        return (RequestProcessingPolicy_ptr)0;
+      }
+
+    virtual PortableServer::RequestProcessingPolicyValue value (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    RequestProcessingPolicy ();
+    
+    virtual ~RequestProcessingPolicy (void);
+  private:
+    RequestProcessingPolicy (const RequestProcessingPolicy &);
+    void operator= (const RequestProcessingPolicy &);
+  };
 
 
 #endif /* end #if !defined */
 
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #if !defined (_PORTABLESERVER_POAMANAGER___PTR_CH_)
 #define _PORTABLESERVER_POAMANAGER___PTR_CH_
 
-class POAManager;
-typedef POAManager *POAManager_ptr;
-
+  class POAManager;
+  typedef POAManager *POAManager_ptr;
+  
 #endif /* end #if !defined */
 
 
 #if !defined (_PORTABLESERVER_POAMANAGER___VAR_CH_)
 #define _PORTABLESERVER_POAMANAGER___VAR_CH_
 
-class TAO_PortableServer_Export POAManager_var : public TAO_Base_var
-{
-public:
-  POAManager_var (void); // default constructor
-  POAManager_var (POAManager_ptr p) : ptr_ (p) {}
-  POAManager_var (const POAManager_var &); // copy constructor
-  ~POAManager_var (void); // destructor
-
-  POAManager_var &operator= (POAManager_ptr);
-  POAManager_var &operator= (const POAManager_var &);
-  POAManager_ptr operator-> (void) const;
-
-  operator const POAManager_ptr &() const;
-  operator POAManager_ptr &();
-  // in, inout, out, _retn
-  POAManager_ptr in (void) const;
-  POAManager_ptr &inout (void);
-  POAManager_ptr &out (void);
-  POAManager_ptr _retn (void);
-  POAManager_ptr ptr (void) const;
-
-private:
-  POAManager_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  POAManager_var (const TAO_Base_var &rhs);
-  POAManager_var &operator= (const TAO_Base_var &rhs);
-};
+  class TAO_PortableServer_Export POAManager_var : public TAO_Base_var
+  {
+  public:
+    POAManager_var (void); // default constructor
+    POAManager_var (POAManager_ptr p) : ptr_ (p) {} 
+    POAManager_var (const POAManager_var &); // copy constructor
+    ~POAManager_var (void); // destructor
+    
+    POAManager_var &operator= (POAManager_ptr);
+    POAManager_var &operator= (const POAManager_var &);
+    POAManager_ptr operator-> (void) const;
+    
+    operator const POAManager_ptr &() const;
+    operator POAManager_ptr &();
+    // in, inout, out, _retn 
+    POAManager_ptr in (void) const;
+    POAManager_ptr &inout (void);
+    POAManager_ptr &out (void);
+    POAManager_ptr _retn (void);
+    POAManager_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static POAManager_ptr duplicate (POAManager_ptr);
+    static void release (POAManager_ptr);
+    static POAManager_ptr nil (void);
+    static POAManager_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
+  private:
+    POAManager_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    POAManager_var (const TAO_Base_var &rhs);
+    POAManager_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -1430,22 +1524,22 @@ private:
 #if !defined (_PORTABLESERVER_POAMANAGER___OUT_CH_)
 #define _PORTABLESERVER_POAMANAGER___OUT_CH_
 
-class TAO_PortableServer_Export POAManager_out
-{
-public:
-  POAManager_out (POAManager_ptr &);
-  POAManager_out (POAManager_var &);
-  POAManager_out (const POAManager_out &);
-  POAManager_out &operator= (const POAManager_out &);
-  POAManager_out &operator= (const POAManager_var &);
-  POAManager_out &operator= (POAManager_ptr);
-  operator POAManager_ptr &();
-  POAManager_ptr &ptr (void);
-  POAManager_ptr operator-> (void);
-
-private:
-  POAManager_ptr &ptr_;
-};
+  class TAO_PortableServer_Export POAManager_out
+  {
+  public:
+    POAManager_out (POAManager_ptr &);
+    POAManager_out (POAManager_var &);
+    POAManager_out (const POAManager_out &);
+    POAManager_out &operator= (const POAManager_out &);
+    POAManager_out &operator= (const POAManager_var &);
+    POAManager_out &operator= (POAManager_ptr);
+    operator POAManager_ptr &();
+    POAManager_ptr &ptr (void);
+    POAManager_ptr operator-> (void);
+  
+  private:
+    POAManager_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -1455,137 +1549,143 @@ private:
 #define _PORTABLESERVER_POAMANAGER_CH_
 
 class TAO_PortableServer_Export POAManager : public virtual CORBA_Object
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef POAManager_ptr _ptr_type;
-  typedef POAManager_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static POAManager_ptr _duplicate (POAManager_ptr obj);
-  static POAManager_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static POAManager_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static POAManager_ptr _nil (void)
-    {
-      return (POAManager_ptr)0;
-    }
-
-
-#if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_)
-#define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_
-
-  class TAO_PortableServer_Export AdapterInactive : public CORBA::UserException
   {
   public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef POAManager_ptr _ptr_type;
+    typedef POAManager_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static POAManager_ptr _duplicate (POAManager_ptr obj);
+    static POAManager_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static POAManager_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static POAManager_ptr _nil (void)
+      {
+        return (POAManager_ptr)0;
+      }
 
 
-  AdapterInactive (void); // default ctor
-  AdapterInactive (const AdapterInactive &); // copy ctor
-  ~AdapterInactive (void);
-  AdapterInactive &operator= (const AdapterInactive &);
-
-
-  virtual void _raise (void);
-
-  virtual void _tao_encode (
-      TAO_OutputCDR &,
-      CORBA::Environment &) const;
-  virtual void _tao_decode (
-      TAO_InputCDR &,
-      CORBA::Environment &);
+#if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_)
+#define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_
 
-  static AdapterInactive *_downcast (CORBA::Exception *);
+    class TAO_PortableServer_Export AdapterInactive : public CORBA::UserException
+    {
+    public:
 
+      AdapterInactive (void);
+      // Default constructor.
+      
+      AdapterInactive (const AdapterInactive &);
+      // Copy constructor.
+      
+      ~AdapterInactive (void);
+      // Destructor.
+      
+      AdapterInactive &operator= (const AdapterInactive &);
+      
+      virtual void _raise (void);
+
+      virtual void _tao_encode (
+          TAO_OutputCDR &,
+          CORBA::Environment &
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &,
+          CORBA::Environment &
+        );
+      
+      static AdapterInactive *_downcast (CORBA::Exception *);
 
-  // = TAO extension
-  static CORBA::Exception *_alloc (void);
 
-}; // exception PortableServer::POAManager::AdapterInactive
+      // = TAO extension.
+      static CORBA::Exception *_alloc (void);
+    }; // Exception PortableServer::POAManager::AdapterInactive.
 
 
 #endif /* end #if !defined */
 
-enum State
-{
-    HOLDING,
-    ACTIVE,
-    DISCARDING,
-    INACTIVE,
-    State_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF
-};
-typedef State &State_out;
-virtual void activate (
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POAManager::AdapterInactive
-  )) = 0;
+    enum State
+    {
+            HOLDING,
+            ACTIVE,
+            DISCARDING,
+            INACTIVE      
+    };
+    typedef State &State_out;
+    virtual void activate (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POAManager::AdapterInactive
+      )) = 0;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-virtual void hold_requests (
-    CORBA::Boolean wait_for_completion,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POAManager::AdapterInactive
-  )) = 0;
-
-virtual void discard_requests (
-    CORBA::Boolean wait_for_completion,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POAManager::AdapterInactive
-  )) = 0;
-
-virtual void deactivate (
-    CORBA::Boolean etherealize_objects,
-    CORBA::Boolean wait_for_completion,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POAManager::AdapterInactive
-  )) = 0;
+    virtual void hold_requests (
+        CORBA::Boolean wait_for_completion,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POAManager::AdapterInactive
+      )) = 0;
+
+    virtual void discard_requests (
+        CORBA::Boolean wait_for_completion,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POAManager::AdapterInactive
+      )) = 0;
+
+    virtual void deactivate (
+        CORBA::Boolean etherealize_objects,
+        CORBA::Boolean wait_for_completion,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POAManager::AdapterInactive
+      )) = 0;
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-virtual PortableServer::POAManager::State get_state (
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  )) = 0;
-
-virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-virtual const char* _interface_repository_id (void) const;
-
-protected:
-  POAManager (void);
-  virtual ~POAManager (void);
-private:
-  POAManager (const POAManager &);
-  void operator= (const POAManager &);
-};
+    virtual PortableServer::POAManager::State get_state (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    POAManager ();
+    
+    virtual ~POAManager (void);
+  private:
+    POAManager (const POAManager &);
+    void operator= (const POAManager &);
+  };
 
 
 #endif /* end #if !defined */
@@ -1596,42 +1696,50 @@ private:
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_
 
-class AdapterActivator;
-typedef AdapterActivator *AdapterActivator_ptr;
-
+  class AdapterActivator;
+  typedef AdapterActivator *AdapterActivator_ptr;
+  
 #endif /* end #if !defined */
 
 
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR___VAR_CH_
 
-class TAO_PortableServer_Export AdapterActivator_var : public TAO_Base_var
-{
-public:
-  AdapterActivator_var (void); // default constructor
-  AdapterActivator_var (AdapterActivator_ptr p) : ptr_ (p) {}
-  AdapterActivator_var (const AdapterActivator_var &); // copy constructor
-  ~AdapterActivator_var (void); // destructor
-
-  AdapterActivator_var &operator= (AdapterActivator_ptr);
-  AdapterActivator_var &operator= (const AdapterActivator_var &);
-  AdapterActivator_ptr operator-> (void) const;
-
-  operator const AdapterActivator_ptr &() const;
-  operator AdapterActivator_ptr &();
-  // in, inout, out, _retn
-  AdapterActivator_ptr in (void) const;
-  AdapterActivator_ptr &inout (void);
-  AdapterActivator_ptr &out (void);
-  AdapterActivator_ptr _retn (void);
-  AdapterActivator_ptr ptr (void) const;
-
-private:
-  AdapterActivator_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  AdapterActivator_var (const TAO_Base_var &rhs);
-  AdapterActivator_var &operator= (const TAO_Base_var &rhs);
-};
+  class TAO_PortableServer_Export AdapterActivator_var : public TAO_Base_var
+  {
+  public:
+    AdapterActivator_var (void); // default constructor
+    AdapterActivator_var (AdapterActivator_ptr p) : ptr_ (p) {} 
+    AdapterActivator_var (const AdapterActivator_var &); // copy constructor
+    ~AdapterActivator_var (void); // destructor
+    
+    AdapterActivator_var &operator= (AdapterActivator_ptr);
+    AdapterActivator_var &operator= (const AdapterActivator_var &);
+    AdapterActivator_ptr operator-> (void) const;
+    
+    operator const AdapterActivator_ptr &() const;
+    operator AdapterActivator_ptr &();
+    // in, inout, out, _retn 
+    AdapterActivator_ptr in (void) const;
+    AdapterActivator_ptr &inout (void);
+    AdapterActivator_ptr &out (void);
+    AdapterActivator_ptr _retn (void);
+    AdapterActivator_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static AdapterActivator_ptr duplicate (AdapterActivator_ptr);
+    static void release (AdapterActivator_ptr);
+    static AdapterActivator_ptr nil (void);
+    static AdapterActivator_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
+  private:
+    AdapterActivator_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    AdapterActivator_var (const TAO_Base_var &rhs);
+    AdapterActivator_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -1640,22 +1748,22 @@ private:
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___OUT_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR___OUT_CH_
 
-class TAO_PortableServer_Export AdapterActivator_out
-{
-public:
-  AdapterActivator_out (AdapterActivator_ptr &);
-  AdapterActivator_out (AdapterActivator_var &);
-  AdapterActivator_out (const AdapterActivator_out &);
-  AdapterActivator_out &operator= (const AdapterActivator_out &);
-  AdapterActivator_out &operator= (const AdapterActivator_var &);
-  AdapterActivator_out &operator= (AdapterActivator_ptr);
-  operator AdapterActivator_ptr &();
-  AdapterActivator_ptr &ptr (void);
-  AdapterActivator_ptr operator-> (void);
-
-private:
-  AdapterActivator_ptr &ptr_;
-};
+  class TAO_PortableServer_Export AdapterActivator_out
+  {
+  public:
+    AdapterActivator_out (AdapterActivator_ptr &);
+    AdapterActivator_out (AdapterActivator_var &);
+    AdapterActivator_out (const AdapterActivator_out &);
+    AdapterActivator_out &operator= (const AdapterActivator_out &);
+    AdapterActivator_out &operator= (const AdapterActivator_var &);
+    AdapterActivator_out &operator= (AdapterActivator_ptr);
+    operator AdapterActivator_ptr &();
+    AdapterActivator_ptr &ptr (void);
+    AdapterActivator_ptr operator-> (void);
+  
+  private:
+    AdapterActivator_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -1665,51 +1773,52 @@ private:
 #define _PORTABLESERVER_ADAPTERACTIVATOR_CH_
 
 class TAO_PortableServer_Export AdapterActivator : public virtual CORBA_Object
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef AdapterActivator_ptr _ptr_type;
-  typedef AdapterActivator_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj);
-  static AdapterActivator_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static AdapterActivator_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static AdapterActivator_ptr _nil (void)
-    {
-      return (AdapterActivator_ptr)0;
-    }
-
-  virtual CORBA::Boolean unknown_adapter (
-      PortableServer::POA_ptr parent,
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  AdapterActivator (void);
-  virtual ~AdapterActivator (void);
-private:
-  AdapterActivator (const AdapterActivator &);
-  void operator= (const AdapterActivator &);
-};
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef AdapterActivator_ptr _ptr_type;
+    typedef AdapterActivator_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj);
+    static AdapterActivator_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static AdapterActivator_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static AdapterActivator_ptr _nil (void)
+      {
+        return (AdapterActivator_ptr)0;
+      }
+
+    virtual CORBA::Boolean unknown_adapter (
+        PortableServer::POA_ptr parent,
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    AdapterActivator ();
+    
+    virtual ~AdapterActivator (void);
+  private:
+    AdapterActivator (const AdapterActivator &);
+    void operator= (const AdapterActivator &);
+  };
 
 
 #endif /* end #if !defined */
@@ -1718,42 +1827,50 @@ private:
 #if !defined (_PORTABLESERVER_SERVANTMANAGER___PTR_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER___PTR_CH_
 
-class ServantManager;
-typedef ServantManager *ServantManager_ptr;
-
+  class ServantManager;
+  typedef ServantManager *ServantManager_ptr;
+  
 #endif /* end #if !defined */
 
 
 #if !defined (_PORTABLESERVER_SERVANTMANAGER___VAR_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER___VAR_CH_
 
-class TAO_PortableServer_Export ServantManager_var : public TAO_Base_var
-{
-public:
-  ServantManager_var (void); // default constructor
-  ServantManager_var (ServantManager_ptr p) : ptr_ (p) {}
-  ServantManager_var (const ServantManager_var &); // copy constructor
-  ~ServantManager_var (void); // destructor
-
-  ServantManager_var &operator= (ServantManager_ptr);
-  ServantManager_var &operator= (const ServantManager_var &);
-  ServantManager_ptr operator-> (void) const;
-
-  operator const ServantManager_ptr &() const;
-  operator ServantManager_ptr &();
-  // in, inout, out, _retn
-  ServantManager_ptr in (void) const;
-  ServantManager_ptr &inout (void);
-  ServantManager_ptr &out (void);
-  ServantManager_ptr _retn (void);
-  ServantManager_ptr ptr (void) const;
-
-private:
-  ServantManager_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  ServantManager_var (const TAO_Base_var &rhs);
-  ServantManager_var &operator= (const TAO_Base_var &rhs);
-};
+  class TAO_PortableServer_Export ServantManager_var : public TAO_Base_var
+  {
+  public:
+    ServantManager_var (void); // default constructor
+    ServantManager_var (ServantManager_ptr p) : ptr_ (p) {} 
+    ServantManager_var (const ServantManager_var &); // copy constructor
+    ~ServantManager_var (void); // destructor
+    
+    ServantManager_var &operator= (ServantManager_ptr);
+    ServantManager_var &operator= (const ServantManager_var &);
+    ServantManager_ptr operator-> (void) const;
+    
+    operator const ServantManager_ptr &() const;
+    operator ServantManager_ptr &();
+    // in, inout, out, _retn 
+    ServantManager_ptr in (void) const;
+    ServantManager_ptr &inout (void);
+    ServantManager_ptr &out (void);
+    ServantManager_ptr _retn (void);
+    ServantManager_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ServantManager_ptr duplicate (ServantManager_ptr);
+    static void release (ServantManager_ptr);
+    static ServantManager_ptr nil (void);
+    static ServantManager_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
+  private:
+    ServantManager_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ServantManager_var (const TAO_Base_var &rhs);
+    ServantManager_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -1762,22 +1879,22 @@ private:
 #if !defined (_PORTABLESERVER_SERVANTMANAGER___OUT_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER___OUT_CH_
 
-class TAO_PortableServer_Export ServantManager_out
-{
-public:
-  ServantManager_out (ServantManager_ptr &);
-  ServantManager_out (ServantManager_var &);
-  ServantManager_out (const ServantManager_out &);
-  ServantManager_out &operator= (const ServantManager_out &);
-  ServantManager_out &operator= (const ServantManager_var &);
-  ServantManager_out &operator= (ServantManager_ptr);
-  operator ServantManager_ptr &();
-  ServantManager_ptr &ptr (void);
-  ServantManager_ptr operator-> (void);
-
-private:
-  ServantManager_ptr &ptr_;
-};
+  class TAO_PortableServer_Export ServantManager_out
+  {
+  public:
+    ServantManager_out (ServantManager_ptr &);
+    ServantManager_out (ServantManager_var &);
+    ServantManager_out (const ServantManager_out &);
+    ServantManager_out &operator= (const ServantManager_out &);
+    ServantManager_out &operator= (const ServantManager_var &);
+    ServantManager_out &operator= (ServantManager_ptr);
+    operator ServantManager_ptr &();
+    ServantManager_ptr &ptr (void);
+    ServantManager_ptr operator-> (void);
+  
+  private:
+    ServantManager_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -1787,41 +1904,42 @@ private:
 #define _PORTABLESERVER_SERVANTMANAGER_CH_
 
 class TAO_PortableServer_Export ServantManager : public virtual CORBA_Object
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ServantManager_ptr _ptr_type;
-  typedef ServantManager_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static ServantManager_ptr _duplicate (ServantManager_ptr obj);
-  static ServantManager_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static ServantManager_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static ServantManager_ptr _nil (void)
-    {
-      return (ServantManager_ptr)0;
-    }
-
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  ServantManager (void);
-  virtual ~ServantManager (void);
-private:
-  ServantManager (const ServantManager &);
-  void operator= (const ServantManager &);
-};
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef ServantManager_ptr _ptr_type;
+    typedef ServantManager_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static ServantManager_ptr _duplicate (ServantManager_ptr obj);
+    static ServantManager_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static ServantManager_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static ServantManager_ptr _nil (void)
+      {
+        return (ServantManager_ptr)0;
+      }
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    ServantManager ();
+    
+    virtual ~ServantManager (void);
+  private:
+    ServantManager (const ServantManager &);
+    void operator= (const ServantManager &);
+  };
 
 
 #endif /* end #if !defined */
@@ -1830,42 +1948,50 @@ private:
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_)
 #define _PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_
 
-class ServantActivator;
-typedef ServantActivator *ServantActivator_ptr;
-
+  class ServantActivator;
+  typedef ServantActivator *ServantActivator_ptr;
+  
 #endif /* end #if !defined */
 
 
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_)
 #define _PORTABLESERVER_SERVANTACTIVATOR___VAR_CH_
 
-class TAO_PortableServer_Export ServantActivator_var : public TAO_Base_var
-{
-public:
-  ServantActivator_var (void); // default constructor
-  ServantActivator_var (ServantActivator_ptr p) : ptr_ (p) {}
-  ServantActivator_var (const ServantActivator_var &); // copy constructor
-  ~ServantActivator_var (void); // destructor
-
-  ServantActivator_var &operator= (ServantActivator_ptr);
-  ServantActivator_var &operator= (const ServantActivator_var &);
-  ServantActivator_ptr operator-> (void) const;
-
-  operator const ServantActivator_ptr &() const;
-  operator ServantActivator_ptr &();
-  // in, inout, out, _retn
-  ServantActivator_ptr in (void) const;
-  ServantActivator_ptr &inout (void);
-  ServantActivator_ptr &out (void);
-  ServantActivator_ptr _retn (void);
-  ServantActivator_ptr ptr (void) const;
-
-private:
-  ServantActivator_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  ServantActivator_var (const TAO_Base_var &rhs);
-  ServantActivator_var &operator= (const TAO_Base_var &rhs);
-};
+  class TAO_PortableServer_Export ServantActivator_var : public TAO_Base_var
+  {
+  public:
+    ServantActivator_var (void); // default constructor
+    ServantActivator_var (ServantActivator_ptr p) : ptr_ (p) {} 
+    ServantActivator_var (const ServantActivator_var &); // copy constructor
+    ~ServantActivator_var (void); // destructor
+    
+    ServantActivator_var &operator= (ServantActivator_ptr);
+    ServantActivator_var &operator= (const ServantActivator_var &);
+    ServantActivator_ptr operator-> (void) const;
+    
+    operator const ServantActivator_ptr &() const;
+    operator ServantActivator_ptr &();
+    // in, inout, out, _retn 
+    ServantActivator_ptr in (void) const;
+    ServantActivator_ptr &inout (void);
+    ServantActivator_ptr &out (void);
+    ServantActivator_ptr _retn (void);
+    ServantActivator_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ServantActivator_ptr duplicate (ServantActivator_ptr);
+    static void release (ServantActivator_ptr);
+    static ServantActivator_ptr nil (void);
+    static ServantActivator_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
+  private:
+    ServantActivator_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ServantActivator_var (const TAO_Base_var &rhs);
+    ServantActivator_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -1874,22 +2000,22 @@ private:
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___OUT_CH_)
 #define _PORTABLESERVER_SERVANTACTIVATOR___OUT_CH_
 
-class TAO_PortableServer_Export ServantActivator_out
-{
-public:
-  ServantActivator_out (ServantActivator_ptr &);
-  ServantActivator_out (ServantActivator_var &);
-  ServantActivator_out (const ServantActivator_out &);
-  ServantActivator_out &operator= (const ServantActivator_out &);
-  ServantActivator_out &operator= (const ServantActivator_var &);
-  ServantActivator_out &operator= (ServantActivator_ptr);
-  operator ServantActivator_ptr &();
-  ServantActivator_ptr &ptr (void);
-  ServantActivator_ptr operator-> (void);
-
-private:
-  ServantActivator_ptr &ptr_;
-};
+  class TAO_PortableServer_Export ServantActivator_out
+  {
+  public:
+    ServantActivator_out (ServantActivator_ptr &);
+    ServantActivator_out (ServantActivator_var &);
+    ServantActivator_out (const ServantActivator_out &);
+    ServantActivator_out &operator= (const ServantActivator_out &);
+    ServantActivator_out &operator= (const ServantActivator_var &);
+    ServantActivator_out &operator= (ServantActivator_ptr);
+    operator ServantActivator_ptr &();
+    ServantActivator_ptr &ptr (void);
+    ServantActivator_ptr operator-> (void);
+  
+  private:
+    ServantActivator_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -1899,35 +2025,35 @@ private:
 #define _PORTABLESERVER_SERVANTACTIVATOR_CH_
 
 class TAO_PortableServer_Export ServantActivator: public virtual ServantManager
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ServantActivator_ptr _ptr_type;
-  typedef ServantActivator_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static ServantActivator_ptr _duplicate (ServantActivator_ptr obj);
-  static ServantActivator_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static ServantActivator_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static ServantActivator_ptr _nil (void)
-    {
-      return (ServantActivator_ptr)0;
-    }
-
-  virtual PortableServer::Servant incarnate (
-      const PortableServer::ObjectId & oid,
-      PortableServer::POA_ptr adapter
+  {
+  public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef ServantActivator_ptr _ptr_type;
+    typedef ServantActivator_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static ServantActivator_ptr _duplicate (ServantActivator_ptr obj);
+    static ServantActivator_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static ServantActivator_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static ServantActivator_ptr _nil (void)
+      {
+        return (ServantActivator_ptr)0;
+      }
+
+    virtual PortableServer::Servant incarnate (
+        const PortableServer::ObjectId & oid,
+        PortableServer::POA_ptr adapter
       TAO_ENV_ARG_DECL_WITH_DEFAULTS
-    )
+      )
 #if (TAO_HAS_MINIMUM_CORBA == 0)
     ACE_THROW_SPEC ((
       CORBA::SystemException,
@@ -1939,29 +2065,31 @@ public:
     )) = 0;
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
-  virtual void etherealize (
-      const PortableServer::ObjectId & oid,
-      PortableServer::POA_ptr adapter,
-      PortableServer::Servant serv,
-      CORBA::Boolean cleanup_in_progress,
-      CORBA::Boolean remaining_activations
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  ServantActivator (void);
-  virtual ~ServantActivator (void);
-private:
-  ServantActivator (const ServantActivator &);
-  void operator= (const ServantActivator &);
-};
+    virtual void etherealize (
+        const PortableServer::ObjectId & oid,
+        PortableServer::POA_ptr adapter,
+        PortableServer::Servant serv,
+        CORBA::Boolean cleanup_in_progress,
+        CORBA::Boolean remaining_activations,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    ServantActivator ();
+    
+    virtual ~ServantActivator (void);
+  private:
+    ServantActivator (const ServantActivator &);
+    void operator= (const ServantActivator &);
+  };
 
 
 #endif /* end #if !defined */
@@ -1970,42 +2098,50 @@ private:
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR___PTR_CH_)
 #define _PORTABLESERVER_SERVANTLOCATOR___PTR_CH_
 
-class ServantLocator;
-typedef ServantLocator *ServantLocator_ptr;
-
+  class ServantLocator;
+  typedef ServantLocator *ServantLocator_ptr;
+  
 #endif /* end #if !defined */
 
 
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR___VAR_CH_)
 #define _PORTABLESERVER_SERVANTLOCATOR___VAR_CH_
 
-class TAO_PortableServer_Export ServantLocator_var : public TAO_Base_var
-{
-public:
-  ServantLocator_var (void); // default constructor
-  ServantLocator_var (ServantLocator_ptr p) : ptr_ (p) {}
-  ServantLocator_var (const ServantLocator_var &); // copy constructor
-  ~ServantLocator_var (void); // destructor
-
-  ServantLocator_var &operator= (ServantLocator_ptr);
-  ServantLocator_var &operator= (const ServantLocator_var &);
-  ServantLocator_ptr operator-> (void) const;
-
-  operator const ServantLocator_ptr &() const;
-  operator ServantLocator_ptr &();
-  // in, inout, out, _retn
-  ServantLocator_ptr in (void) const;
-  ServantLocator_ptr &inout (void);
-  ServantLocator_ptr &out (void);
-  ServantLocator_ptr _retn (void);
-  ServantLocator_ptr ptr (void) const;
-
-private:
-  ServantLocator_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  ServantLocator_var (const TAO_Base_var &rhs);
-  ServantLocator_var &operator= (const TAO_Base_var &rhs);
-};
+  class TAO_PortableServer_Export ServantLocator_var : public TAO_Base_var
+  {
+  public:
+    ServantLocator_var (void); // default constructor
+    ServantLocator_var (ServantLocator_ptr p) : ptr_ (p) {} 
+    ServantLocator_var (const ServantLocator_var &); // copy constructor
+    ~ServantLocator_var (void); // destructor
+    
+    ServantLocator_var &operator= (ServantLocator_ptr);
+    ServantLocator_var &operator= (const ServantLocator_var &);
+    ServantLocator_ptr operator-> (void) const;
+    
+    operator const ServantLocator_ptr &() const;
+    operator ServantLocator_ptr &();
+    // in, inout, out, _retn 
+    ServantLocator_ptr in (void) const;
+    ServantLocator_ptr &inout (void);
+    ServantLocator_ptr &out (void);
+    ServantLocator_ptr _retn (void);
+    ServantLocator_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ServantLocator_ptr duplicate (ServantLocator_ptr);
+    static void release (ServantLocator_ptr);
+    static ServantLocator_ptr nil (void);
+    static ServantLocator_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
+  private:
+    ServantLocator_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    ServantLocator_var (const TAO_Base_var &rhs);
+    ServantLocator_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -2014,22 +2150,22 @@ private:
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR___OUT_CH_)
 #define _PORTABLESERVER_SERVANTLOCATOR___OUT_CH_
 
-class TAO_PortableServer_Export ServantLocator_out
-{
-public:
-  ServantLocator_out (ServantLocator_ptr &);
-  ServantLocator_out (ServantLocator_var &);
-  ServantLocator_out (const ServantLocator_out &);
-  ServantLocator_out &operator= (const ServantLocator_out &);
-  ServantLocator_out &operator= (const ServantLocator_var &);
-  ServantLocator_out &operator= (ServantLocator_ptr);
-  operator ServantLocator_ptr &();
-  ServantLocator_ptr &ptr (void);
-  ServantLocator_ptr operator-> (void);
-
-private:
-  ServantLocator_ptr &ptr_;
-};
+  class TAO_PortableServer_Export ServantLocator_out
+  {
+  public:
+    ServantLocator_out (ServantLocator_ptr &);
+    ServantLocator_out (ServantLocator_var &);
+    ServantLocator_out (const ServantLocator_out &);
+    ServantLocator_out &operator= (const ServantLocator_out &);
+    ServantLocator_out &operator= (const ServantLocator_var &);
+    ServantLocator_out &operator= (ServantLocator_ptr);
+    operator ServantLocator_ptr &();
+    ServantLocator_ptr &ptr (void);
+    ServantLocator_ptr operator-> (void);
+  
+  private:
+    ServantLocator_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -2039,74 +2175,75 @@ private:
 #define _PORTABLESERVER_SERVANTLOCATOR_CH_
 
 class TAO_PortableServer_Export ServantLocator: public virtual ServantManager
-{
-public:
+  {
+  public:
 
     typedef void *Cookie;
 
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef ServantLocator_ptr _ptr_type;
-  typedef ServantLocator_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static ServantLocator_ptr _duplicate (ServantLocator_ptr obj);
-  static ServantLocator_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static ServantLocator_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static ServantLocator_ptr _nil (void)
-    {
-      return (ServantLocator_ptr)0;
-    }
-
-  virtual PortableServer::Servant preinvoke (
-      const PortableServer::ObjectId & oid,
-      PortableServer::POA_ptr adapter,
-      const char * operation,
-      PortableServer::ServantLocator::Cookie & the_cookie
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
-    )
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef ServantLocator_ptr _ptr_type;
+    typedef ServantLocator_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static ServantLocator_ptr _duplicate (ServantLocator_ptr obj);
+    static ServantLocator_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static ServantLocator_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static ServantLocator_ptr _nil (void)
+      {
+        return (ServantLocator_ptr)0;
+      }
+
+    virtual PortableServer::Servant preinvoke (
+        const PortableServer::ObjectId & oid,
+        PortableServer::POA_ptr adapter,
+        const char * operation,
+        PortableServer::ServantLocator::Cookie & the_cookie
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      )
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::ForwardRequest
-    )) = 0;
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::ForwardRequest
+      )) = 0;
 #else
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
-  virtual void postinvoke (
-      const PortableServer::ObjectId & oid,
-      PortableServer::POA_ptr adapter,
-      const char * operation,
-      PortableServer::ServantLocator::Cookie the_cookie,
-      PortableServer::Servant the_servant
-      TAO_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) = 0;
-
-  virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  ServantLocator (void);
-  virtual ~ServantLocator (void);
-private:
-  ServantLocator (const ServantLocator &);
-  void operator= (const ServantLocator &);
-};
+    virtual void postinvoke (
+        const PortableServer::ObjectId & oid,
+        PortableServer::POA_ptr adapter,
+        const char * operation,
+        PortableServer::ServantLocator::Cookie the_cookie,
+        PortableServer::Servant the_servant
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    ServantLocator ();
+    
+    virtual ~ServantLocator (void);
+  private:
+    ServantLocator (const ServantLocator &);
+    void operator= (const ServantLocator &);
+  };
 
 
 #endif /* end #if !defined */
@@ -2114,133 +2251,71 @@ private:
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-#if !defined (_PORTABLESERVER_POA___PTR_CH_)
-#define _PORTABLESERVER_POA___PTR_CH_
-
-class POA;
-typedef POA *POA_ptr;
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLESERVER_POA___VAR_CH_)
-#define _PORTABLESERVER_POA___VAR_CH_
-
-class TAO_PortableServer_Export POA_var : public TAO_Base_var
-{
-public:
-  POA_var (void); // default constructor
-  POA_var (POA_ptr p) : ptr_ (p) {}
-  POA_var (const POA_var &); // copy constructor
-  ~POA_var (void); // destructor
-
-  POA_var &operator= (POA_ptr);
-  POA_var &operator= (const POA_var &);
-  POA_ptr operator-> (void) const;
-
-  operator const POA_ptr &() const;
-  operator POA_ptr &();
-  // in, inout, out, _retn
-  POA_ptr in (void) const;
-  POA_ptr &inout (void);
-  POA_ptr &out (void);
-  POA_ptr _retn (void);
-  POA_ptr ptr (void) const;
-
-private:
-  POA_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  POA_var (const TAO_Base_var &rhs);
-  POA_var &operator= (const TAO_Base_var &rhs);
-};
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLESERVER_POA___OUT_CH_)
-#define _PORTABLESERVER_POA___OUT_CH_
-
-class TAO_PortableServer_Export POA_out
-{
-public:
-  POA_out (POA_ptr &);
-  POA_out (POA_var &);
-  POA_out (const POA_out &);
-  POA_out &operator= (const POA_out &);
-  POA_out &operator= (const POA_var &);
-  POA_out &operator= (POA_ptr);
-  operator POA_ptr &();
-  POA_ptr &ptr (void);
-  POA_ptr operator-> (void);
-
-private:
-  POA_ptr &ptr_;
-};
-
-
-#endif /* end #if !defined */
-
-
 #if !defined (_PORTABLESERVER_POA_CH_)
 #define _PORTABLESERVER_POA_CH_
 
 class TAO_PortableServer_Export POA : public virtual CORBA_Object
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef POA_ptr _ptr_type;
-  typedef POA_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static POA_ptr _duplicate (POA_ptr obj);
-  static POA_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static POA_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static POA_ptr _nil (void)
-    {
-      return (POA_ptr)0;
-    }
-
-
-#if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_)
-#define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_
-
-  class TAO_PortableServer_Export AdapterAlreadyExists : public CORBA::UserException
   {
   public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef POA_ptr _ptr_type;
+    typedef POA_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static POA_ptr _duplicate (POA_ptr obj);
+    static POA_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static POA_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static POA_ptr _nil (void)
+      {
+        return (POA_ptr)0;
+      }
 
 
-  AdapterAlreadyExists (void); // default ctor
-  AdapterAlreadyExists (const AdapterAlreadyExists &); // copy ctor
-  ~AdapterAlreadyExists (void);
-  AdapterAlreadyExists &operator= (const AdapterAlreadyExists &);
-
-
-  virtual void _raise (void);
-
-  virtual void _tao_encode (
-      TAO_OutputCDR &,
-      CORBA::Environment &) const;
-  virtual void _tao_decode (
-      TAO_InputCDR &,
-      CORBA::Environment &);
+#if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_)
+#define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_
 
-  static AdapterAlreadyExists *_downcast (CORBA::Exception *);
+    class TAO_PortableServer_Export AdapterAlreadyExists : public CORBA::UserException
+    {
+    public:
 
+      AdapterAlreadyExists (void);
+      // Default constructor.
+      
+      AdapterAlreadyExists (const AdapterAlreadyExists &);
+      // Copy constructor.
+      
+      ~AdapterAlreadyExists (void);
+      // Destructor.
+      
+      AdapterAlreadyExists &operator= (const AdapterAlreadyExists &);
+      
+      virtual void _raise (void);
+
+      virtual void _tao_encode (
+          TAO_OutputCDR &,
+          CORBA::Environment &
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &,
+          CORBA::Environment &
+        );
+      
+      static AdapterAlreadyExists *_downcast (CORBA::Exception *);
 
-  // = TAO extension
-  static CORBA::Exception *_alloc (void);
 
-}; // exception PortableServer::POA::AdapterAlreadyExists
+      // = TAO extension.
+      static CORBA::Exception *_alloc (void);
+    }; // Exception PortableServer::POA::AdapterAlreadyExists.
 
 
 #endif /* end #if !defined */
@@ -2249,33 +2324,39 @@ public:
 #if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_)
 #define _PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_
 
-class TAO_PortableServer_Export AdapterNonExistent : public CORBA::UserException
-{
-public:
-
-
-AdapterNonExistent (void); // default ctor
-AdapterNonExistent (const AdapterNonExistent &); // copy ctor
-~AdapterNonExistent (void);
-AdapterNonExistent &operator= (const AdapterNonExistent &);
-
-
-virtual void _raise (void);
-
-virtual void _tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &) const;
-virtual void _tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &);
-
-static AdapterNonExistent *_downcast (CORBA::Exception *);
+    class TAO_PortableServer_Export AdapterNonExistent : public CORBA::UserException
+    {
+    public:
 
+      AdapterNonExistent (void);
+      // Default constructor.
+      
+      AdapterNonExistent (const AdapterNonExistent &);
+      // Copy constructor.
+      
+      ~AdapterNonExistent (void);
+      // Destructor.
+      
+      AdapterNonExistent &operator= (const AdapterNonExistent &);
+      
+      virtual void _raise (void);
+
+      virtual void _tao_encode (
+          TAO_OutputCDR &,
+          CORBA::Environment &
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &,
+          CORBA::Environment &
+        );
+      
+      static AdapterNonExistent *_downcast (CORBA::Exception *);
 
-// = TAO extension
-static CORBA::Exception *_alloc (void);
 
-}; // exception PortableServer::POA::AdapterNonExistent
+      // = TAO extension.
+      static CORBA::Exception *_alloc (void);
+    }; // Exception PortableServer::POA::AdapterNonExistent.
 
 
 #endif /* end #if !defined */
@@ -2284,37 +2365,43 @@ static CORBA::Exception *_alloc (void);
 #if !defined (_PORTABLESERVER_POA_INVALIDPOLICY_CH_)
 #define _PORTABLESERVER_POA_INVALIDPOLICY_CH_
 
-class TAO_PortableServer_Export InvalidPolicy : public CORBA::UserException
-{
-public:
-
-CORBA::UShort index;
-
-InvalidPolicy (void); // default ctor
-InvalidPolicy (const InvalidPolicy &); // copy ctor
-~InvalidPolicy (void);
-InvalidPolicy &operator= (const InvalidPolicy &);
-
-
-virtual void _raise (void);
-
-virtual void _tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &) const;
-virtual void _tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &);
-
-static InvalidPolicy *_downcast (CORBA::Exception *);
-
-InvalidPolicy (
-  CORBA::UShort _tao_index
-);
-
-// = TAO extension
-static CORBA::Exception *_alloc (void);
+    class TAO_PortableServer_Export InvalidPolicy : public CORBA::UserException
+    {
+    public:
+      CORBA::UShort index;
+
+      InvalidPolicy (void);
+      // Default constructor.
+      
+      InvalidPolicy (const InvalidPolicy &);
+      // Copy constructor.
+      
+      ~InvalidPolicy (void);
+      // Destructor.
+      
+      InvalidPolicy &operator= (const InvalidPolicy &);
+      
+      virtual void _raise (void);
+
+      virtual void _tao_encode (
+          TAO_OutputCDR &,
+          CORBA::Environment &
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &,
+          CORBA::Environment &
+        );
+      
+      static InvalidPolicy *_downcast (CORBA::Exception *);
 
-}; // exception PortableServer::POA::InvalidPolicy
+      InvalidPolicy (
+          CORBA::UShort _tao_index
+        );
+      
+      // = TAO extension.
+      static CORBA::Exception *_alloc (void);
+    }; // Exception PortableServer::POA::InvalidPolicy.
 
 
 #endif /* end #if !defined */
@@ -2325,69 +2412,82 @@ static CORBA::Exception *_alloc (void);
 #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
 #define _PORTABLESERVER_POA_NOSERVANT_CH_
 
-class TAO_PortableServer_Export NoServant : public CORBA::UserException
-{
-public:
-
-
-NoServant (void); // default ctor
-NoServant (const NoServant &); // copy ctor
-~NoServant (void);
-NoServant &operator= (const NoServant &);
-
-
-virtual void _raise (void);
-
-virtual void _tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &) const;
-virtual void _tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &);
-
-static NoServant *_downcast (CORBA::Exception *);
+    class TAO_PortableServer_Export NoServant : public CORBA::UserException
+    {
+    public:
 
+      NoServant (void);
+      // Default constructor.
+      
+      NoServant (const NoServant &);
+      // Copy constructor.
+      
+      ~NoServant (void);
+      // Destructor.
+      
+      NoServant &operator= (const NoServant &);
+      
+      virtual void _raise (void);
+
+      virtual void _tao_encode (
+          TAO_OutputCDR &,
+          CORBA::Environment &
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &,
+          CORBA::Environment &
+        );
+      
+      static NoServant *_downcast (CORBA::Exception *);
 
-// = TAO extension
-static CORBA::Exception *_alloc (void);
 
-}; // exception PortableServer::POA::NoServant
+      // = TAO extension.
+      static CORBA::Exception *_alloc (void);
+    }; // Exception PortableServer::POA::NoServant.
 
 
 #endif /* end #if !defined */
 
+
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_)
 #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_
 
-class TAO_PortableServer_Export ObjectAlreadyActive : public CORBA::UserException
-{
-public:
-
-
-ObjectAlreadyActive (void); // default ctor
-ObjectAlreadyActive (const ObjectAlreadyActive &); // copy ctor
-~ObjectAlreadyActive (void);
-ObjectAlreadyActive &operator= (const ObjectAlreadyActive &);
-
-
-virtual void _raise (void);
-
-virtual void _tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &) const;
-virtual void _tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &);
-
-static ObjectAlreadyActive *_downcast (CORBA::Exception *);
+    class TAO_PortableServer_Export ObjectAlreadyActive : public CORBA::UserException
+    {
+    public:
 
+      ObjectAlreadyActive (void);
+      // Default constructor.
+      
+      ObjectAlreadyActive (const ObjectAlreadyActive &);
+      // Copy constructor.
+      
+      ~ObjectAlreadyActive (void);
+      // Destructor.
+      
+      ObjectAlreadyActive &operator= (const ObjectAlreadyActive &);
+      
+      virtual void _raise (void);
+
+      virtual void _tao_encode (
+          TAO_OutputCDR &,
+          CORBA::Environment &
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &,
+          CORBA::Environment &
+        );
+      
+      static ObjectAlreadyActive *_downcast (CORBA::Exception *);
 
-// = TAO extension
-static CORBA::Exception *_alloc (void);
 
-}; // exception PortableServer::POA::ObjectAlreadyActive
+      // = TAO extension.
+      static CORBA::Exception *_alloc (void);
+    }; // Exception PortableServer::POA::ObjectAlreadyActive.
 
 
 #endif /* end #if !defined */
@@ -2396,33 +2496,39 @@ static CORBA::Exception *_alloc (void);
 #if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_)
 #define _PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_
 
-class TAO_PortableServer_Export ObjectNotActive : public CORBA::UserException
-{
-public:
-
-
-ObjectNotActive (void); // default ctor
-ObjectNotActive (const ObjectNotActive &); // copy ctor
-~ObjectNotActive (void);
-ObjectNotActive &operator= (const ObjectNotActive &);
-
-
-virtual void _raise (void);
-
-virtual void _tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &) const;
-virtual void _tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &);
-
-static ObjectNotActive *_downcast (CORBA::Exception *);
+    class TAO_PortableServer_Export ObjectNotActive : public CORBA::UserException
+    {
+    public:
 
+      ObjectNotActive (void);
+      // Default constructor.
+      
+      ObjectNotActive (const ObjectNotActive &);
+      // Copy constructor.
+      
+      ~ObjectNotActive (void);
+      // Destructor.
+      
+      ObjectNotActive &operator= (const ObjectNotActive &);
+      
+      virtual void _raise (void);
+
+      virtual void _tao_encode (
+          TAO_OutputCDR &,
+          CORBA::Environment &
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &,
+          CORBA::Environment &
+        );
+      
+      static ObjectNotActive *_downcast (CORBA::Exception *);
 
-// = TAO extension
-static CORBA::Exception *_alloc (void);
 
-}; // exception PortableServer::POA::ObjectNotActive
+      // = TAO extension.
+      static CORBA::Exception *_alloc (void);
+    }; // Exception PortableServer::POA::ObjectNotActive.
 
 
 #endif /* end #if !defined */
@@ -2431,33 +2537,39 @@ static CORBA::Exception *_alloc (void);
 #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_)
 #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_
 
-class TAO_PortableServer_Export ServantAlreadyActive : public CORBA::UserException
-{
-public:
-
-
-ServantAlreadyActive (void); // default ctor
-ServantAlreadyActive (const ServantAlreadyActive &); // copy ctor
-~ServantAlreadyActive (void);
-ServantAlreadyActive &operator= (const ServantAlreadyActive &);
-
-
-virtual void _raise (void);
-
-virtual void _tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &) const;
-virtual void _tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &);
-
-static ServantAlreadyActive *_downcast (CORBA::Exception *);
+    class TAO_PortableServer_Export ServantAlreadyActive : public CORBA::UserException
+    {
+    public:
 
+      ServantAlreadyActive (void);
+      // Default constructor.
+      
+      ServantAlreadyActive (const ServantAlreadyActive &);
+      // Copy constructor.
+      
+      ~ServantAlreadyActive (void);
+      // Destructor.
+      
+      ServantAlreadyActive &operator= (const ServantAlreadyActive &);
+      
+      virtual void _raise (void);
+
+      virtual void _tao_encode (
+          TAO_OutputCDR &,
+          CORBA::Environment &
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &,
+          CORBA::Environment &
+        );
+      
+      static ServantAlreadyActive *_downcast (CORBA::Exception *);
 
-// = TAO extension
-static CORBA::Exception *_alloc (void);
 
-}; // exception PortableServer::POA::ServantAlreadyActive
+      // = TAO extension.
+      static CORBA::Exception *_alloc (void);
+    }; // Exception PortableServer::POA::ServantAlreadyActive.
 
 
 #endif /* end #if !defined */
@@ -2466,33 +2578,39 @@ static CORBA::Exception *_alloc (void);
 #if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_)
 #define _PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_
 
-class TAO_PortableServer_Export ServantNotActive : public CORBA::UserException
-{
-public:
-
-
-ServantNotActive (void); // default ctor
-ServantNotActive (const ServantNotActive &); // copy ctor
-~ServantNotActive (void);
-ServantNotActive &operator= (const ServantNotActive &);
-
-
-virtual void _raise (void);
-
-virtual void _tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &) const;
-virtual void _tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &);
-
-static ServantNotActive *_downcast (CORBA::Exception *);
+    class TAO_PortableServer_Export ServantNotActive : public CORBA::UserException
+    {
+    public:
 
+      ServantNotActive (void);
+      // Default constructor.
+      
+      ServantNotActive (const ServantNotActive &);
+      // Copy constructor.
+      
+      ~ServantNotActive (void);
+      // Destructor.
+      
+      ServantNotActive &operator= (const ServantNotActive &);
+      
+      virtual void _raise (void);
+
+      virtual void _tao_encode (
+          TAO_OutputCDR &,
+          CORBA::Environment &
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &,
+          CORBA::Environment &
+        );
+      
+      static ServantNotActive *_downcast (CORBA::Exception *);
 
-// = TAO extension
-static CORBA::Exception *_alloc (void);
 
-}; // exception PortableServer::POA::ServantNotActive
+      // = TAO extension.
+      static CORBA::Exception *_alloc (void);
+    }; // Exception PortableServer::POA::ServantNotActive.
 
 
 #endif /* end #if !defined */
@@ -2501,33 +2619,39 @@ static CORBA::Exception *_alloc (void);
 #if !defined (_PORTABLESERVER_POA_WRONGADAPTER_CH_)
 #define _PORTABLESERVER_POA_WRONGADAPTER_CH_
 
-class TAO_PortableServer_Export WrongAdapter : public CORBA::UserException
-{
-public:
-
-
-WrongAdapter (void); // default ctor
-WrongAdapter (const WrongAdapter &); // copy ctor
-~WrongAdapter (void);
-WrongAdapter &operator= (const WrongAdapter &);
-
-
-virtual void _raise (void);
-
-virtual void _tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &) const;
-virtual void _tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &);
-
-static WrongAdapter *_downcast (CORBA::Exception *);
+    class TAO_PortableServer_Export WrongAdapter : public CORBA::UserException
+    {
+    public:
 
+      WrongAdapter (void);
+      // Default constructor.
+      
+      WrongAdapter (const WrongAdapter &);
+      // Copy constructor.
+      
+      ~WrongAdapter (void);
+      // Destructor.
+      
+      WrongAdapter &operator= (const WrongAdapter &);
+      
+      virtual void _raise (void);
+
+      virtual void _tao_encode (
+          TAO_OutputCDR &,
+          CORBA::Environment &
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &,
+          CORBA::Environment &
+        );
+      
+      static WrongAdapter *_downcast (CORBA::Exception *);
 
-// = TAO extension
-static CORBA::Exception *_alloc (void);
 
-}; // exception PortableServer::POA::WrongAdapter
+      // = TAO extension.
+      static CORBA::Exception *_alloc (void);
+    }; // Exception PortableServer::POA::WrongAdapter.
 
 
 #endif /* end #if !defined */
@@ -2536,368 +2660,375 @@ static CORBA::Exception *_alloc (void);
 #if !defined (_PORTABLESERVER_POA_WRONGPOLICY_CH_)
 #define _PORTABLESERVER_POA_WRONGPOLICY_CH_
 
-class TAO_PortableServer_Export WrongPolicy : public CORBA::UserException
-{
-public:
-
-
-WrongPolicy (void); // default ctor
-WrongPolicy (const WrongPolicy &); // copy ctor
-~WrongPolicy (void);
-WrongPolicy &operator= (const WrongPolicy &);
-
-
-virtual void _raise (void);
-
-virtual void _tao_encode (
-    TAO_OutputCDR &,
-    CORBA::Environment &) const;
-virtual void _tao_decode (
-    TAO_InputCDR &,
-    CORBA::Environment &);
-
-static WrongPolicy *_downcast (CORBA::Exception *);
+    class TAO_PortableServer_Export WrongPolicy : public CORBA::UserException
+    {
+    public:
 
+      WrongPolicy (void);
+      // Default constructor.
+      
+      WrongPolicy (const WrongPolicy &);
+      // Copy constructor.
+      
+      ~WrongPolicy (void);
+      // Destructor.
+      
+      WrongPolicy &operator= (const WrongPolicy &);
+      
+      virtual void _raise (void);
+
+      virtual void _tao_encode (
+          TAO_OutputCDR &,
+          CORBA::Environment &
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &,
+          CORBA::Environment &
+        );
+      
+      static WrongPolicy *_downcast (CORBA::Exception *);
 
-// = TAO extension
-static CORBA::Exception *_alloc (void);
 
-}; // exception PortableServer::POA::WrongPolicy
+      // = TAO extension.
+      static CORBA::Exception *_alloc (void);
+    }; // Exception PortableServer::POA::WrongPolicy.
 
 
 #endif /* end #if !defined */
 
-virtual PortableServer::POA_ptr create_POA (
-    const char * adapter_name,
-    PortableServer::POAManager_ptr a_POAManager,
-    const CORBA::PolicyList & policies,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::AdapterAlreadyExists,
-    PortableServer::POA::InvalidPolicy
-  )) = 0;
-
-virtual PortableServer::POA_ptr find_POA (
-    const char * adapter_name,
-    CORBA::Boolean activate_it,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::AdapterNonExistent
-  )) = 0;
-
-virtual void destroy (
-    CORBA::Boolean etherealize_objects,
-    CORBA::Boolean wait_for_completion,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  )) = 0;
+    virtual PortableServer::POA_ptr create_POA (
+        const char * adapter_name,
+        PortableServer::POAManager_ptr a_POAManager,
+        const CORBA::PolicyList & policies,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::AdapterAlreadyExists,
+        PortableServer::POA::InvalidPolicy
+      )) = 0;
+
+    virtual PortableServer::POA_ptr find_POA (
+        const char * adapter_name,
+        CORBA::Boolean activate_it,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::AdapterNonExistent
+      )) = 0;
+
+    virtual void destroy (
+        CORBA::Boolean etherealize_objects,
+        CORBA::Boolean wait_for_completion,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-virtual PortableServer::ThreadPolicy_ptr create_thread_policy (
-    PortableServer::ThreadPolicyValue value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  )) = 0;
+    virtual PortableServer::ThreadPolicy_ptr create_thread_policy (
+        PortableServer::ThreadPolicyValue value,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (
-    PortableServer::LifespanPolicyValue value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  )) = 0;
-
-virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
-    PortableServer::IdUniquenessPolicyValue value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  )) = 0;
-
-virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
-    PortableServer::IdAssignmentPolicyValue value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  )) = 0;
+    virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (
+        PortableServer::LifespanPolicyValue value,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
+        PortableServer::IdUniquenessPolicyValue value,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
+        PortableServer::IdAssignmentPolicyValue value,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
-    PortableServer::ImplicitActivationPolicyValue value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  )) = 0;
-
-virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
-    PortableServer::ServantRetentionPolicyValue value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  )) = 0;
-
-virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
-    PortableServer::RequestProcessingPolicyValue value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  )) = 0;
+    virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
+        PortableServer::ImplicitActivationPolicyValue value,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
+        PortableServer::ServantRetentionPolicyValue value,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
+        PortableServer::RequestProcessingPolicyValue value,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-virtual char * the_name (
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  )) = 0;
-
-virtual PortableServer::POA_ptr the_parent (
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  )) = 0;
-
-virtual PortableServer::POAList * the_children (
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  )) = 0;
-
-virtual PortableServer::POAManager_ptr the_POAManager (
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  )) = 0;
+    virtual char * the_name (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual PortableServer::POA_ptr the_parent (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual PortableServer::POAList * the_children (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual PortableServer::POAManager_ptr the_POAManager (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-virtual PortableServer::AdapterActivator_ptr the_activator (
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  )) = 0;
-
-virtual void the_activator (
-    PortableServer::AdapterActivator_ptr the_activator,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  )) = 0;
-
-virtual PortableServer::ServantManager_ptr get_servant_manager (
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::WrongPolicy
-  )) = 0;
-
-virtual void set_servant_manager (
-    PortableServer::ServantManager_ptr imgr,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::WrongPolicy
-  )) = 0;
-
-virtual PortableServer::Servant get_servant (
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::NoServant,
-    PortableServer::POA::WrongPolicy
-  )) = 0;
-
-virtual void set_servant (
-    PortableServer::Servant p_servant,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::WrongPolicy
-  )) = 0;
+    virtual PortableServer::AdapterActivator_ptr the_activator (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual void the_activator (
+        PortableServer::AdapterActivator_ptr the_activator,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+
+    virtual PortableServer::ServantManager_ptr get_servant_manager (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::WrongPolicy
+      )) = 0;
+
+    virtual void set_servant_manager (
+        PortableServer::ServantManager_ptr imgr,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::WrongPolicy
+      )) = 0;
+
+    virtual PortableServer::Servant get_servant (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::NoServant,
+        PortableServer::POA::WrongPolicy
+      )) = 0;
+
+    virtual void set_servant (
+        PortableServer::Servant p_servant,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::WrongPolicy
+      )) = 0;
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-virtual PortableServer::ObjectId * activate_object (
-    PortableServer::Servant p_servant,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::ServantAlreadyActive,
-    PortableServer::POA::WrongPolicy
-  )) = 0;
-
-virtual void activate_object_with_id (
-    const PortableServer::ObjectId & id,
-    PortableServer::Servant p_servant,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::ServantAlreadyActive,
-    PortableServer::POA::ObjectAlreadyActive,
-    PortableServer::POA::WrongPolicy
-  )) = 0;
-
-virtual void deactivate_object (
-    const PortableServer::ObjectId & oid,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::ObjectNotActive,
-    PortableServer::POA::WrongPolicy
-  )) = 0;
-
-virtual CORBA::Object_ptr create_reference (
-    const char * intf,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::WrongPolicy
-  )) = 0;
-
-virtual CORBA::Object_ptr create_reference_with_id (
-    const PortableServer::ObjectId & oid,
-    const char * intf,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::WrongPolicy
-  )) = 0;
-
-virtual PortableServer::ObjectId * servant_to_id (
-    PortableServer::Servant p_servant,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::ServantNotActive,
-    PortableServer::POA::WrongPolicy
-  )) = 0;
-
-virtual CORBA::Object_ptr servant_to_reference (
-    PortableServer::Servant p_servant,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::ServantNotActive,
-    PortableServer::POA::WrongPolicy
-  )) = 0;
-
-virtual PortableServer::Servant reference_to_servant (
-    CORBA::Object_ptr reference,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::ObjectNotActive,
-    PortableServer::POA::WrongAdapter,
-    PortableServer::POA::WrongPolicy
-  )) = 0;
-
-virtual PortableServer::ObjectId * reference_to_id (
-    CORBA::Object_ptr reference,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::WrongAdapter,
-    PortableServer::POA::WrongPolicy
-  )) = 0;
-
-virtual PortableServer::Servant id_to_servant (
-    const PortableServer::ObjectId & oid,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::ObjectNotActive,
-    PortableServer::POA::WrongPolicy
-  )) = 0;
-
-virtual CORBA::Object_ptr id_to_reference (
-    const PortableServer::ObjectId & oid,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::POA::ObjectNotActive,
-    PortableServer::POA::WrongPolicy
-  )) = 0;
-
-virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-virtual const char* _interface_repository_id (void) const;
-
-protected:
-  POA (void);
-  virtual ~POA (void);
-private:
-  POA (const POA &);
-  void operator= (const POA &);
-};
+    virtual PortableServer::ObjectId * activate_object (
+        PortableServer::Servant p_servant,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::ServantAlreadyActive,
+        PortableServer::POA::WrongPolicy
+      )) = 0;
+
+    virtual void activate_object_with_id (
+        const PortableServer::ObjectId & id,
+        PortableServer::Servant p_servant,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::ServantAlreadyActive,
+        PortableServer::POA::ObjectAlreadyActive,
+        PortableServer::POA::WrongPolicy
+      )) = 0;
+
+    virtual void deactivate_object (
+        const PortableServer::ObjectId & oid,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::ObjectNotActive,
+        PortableServer::POA::WrongPolicy
+      )) = 0;
+
+    virtual CORBA::Object_ptr create_reference (
+        const char * intf,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::WrongPolicy
+      )) = 0;
+
+    virtual CORBA::Object_ptr create_reference_with_id (
+        const PortableServer::ObjectId & oid,
+        const char * intf,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::WrongPolicy
+      )) = 0;
+
+    virtual PortableServer::ObjectId * servant_to_id (
+        PortableServer::Servant p_servant,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::ServantNotActive,
+        PortableServer::POA::WrongPolicy
+      )) = 0;
+
+    virtual CORBA::Object_ptr servant_to_reference (
+        PortableServer::Servant p_servant,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::ServantNotActive,
+        PortableServer::POA::WrongPolicy
+      )) = 0;
+
+    virtual PortableServer::Servant reference_to_servant (
+        CORBA::Object_ptr reference,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::ObjectNotActive,
+        PortableServer::POA::WrongAdapter,
+        PortableServer::POA::WrongPolicy
+      )) = 0;
+
+    virtual PortableServer::ObjectId * reference_to_id (
+        CORBA::Object_ptr reference,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::WrongAdapter,
+        PortableServer::POA::WrongPolicy
+      )) = 0;
+
+    virtual PortableServer::Servant id_to_servant (
+        const PortableServer::ObjectId & oid,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::ObjectNotActive,
+        PortableServer::POA::WrongPolicy
+      )) = 0;
+
+    virtual CORBA::Object_ptr id_to_reference (
+        const PortableServer::ObjectId & oid,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::POA::ObjectNotActive,
+        PortableServer::POA::WrongPolicy
+      )) = 0;
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    POA ();
+    
+    virtual ~POA (void);
+  private:
+    POA (const POA &);
+    void operator= (const POA &);
+  };
 
 
 #endif /* end #if !defined */
@@ -2906,42 +3037,50 @@ private:
 #if !defined (_PORTABLESERVER_CURRENT___PTR_CH_)
 #define _PORTABLESERVER_CURRENT___PTR_CH_
 
-class Current;
-typedef Current *Current_ptr;
-
+  class Current;
+  typedef Current *Current_ptr;
+  
 #endif /* end #if !defined */
 
 
 #if !defined (_PORTABLESERVER_CURRENT___VAR_CH_)
 #define _PORTABLESERVER_CURRENT___VAR_CH_
 
-class TAO_PortableServer_Export Current_var : public TAO_Base_var
-{
-public:
-  Current_var (void); // default constructor
-  Current_var (Current_ptr p) : ptr_ (p) {}
-  Current_var (const Current_var &); // copy constructor
-  ~Current_var (void); // destructor
-
-  Current_var &operator= (Current_ptr);
-  Current_var &operator= (const Current_var &);
-  Current_ptr operator-> (void) const;
-
-  operator const Current_ptr &() const;
-  operator Current_ptr &();
-  // in, inout, out, _retn
-  Current_ptr in (void) const;
-  Current_ptr &inout (void);
-  Current_ptr &out (void);
-  Current_ptr _retn (void);
-  Current_ptr ptr (void) const;
-
-private:
-  Current_ptr ptr_;
-  // Unimplemented - prevents widening assignment.
-  Current_var (const TAO_Base_var &rhs);
-  Current_var &operator= (const TAO_Base_var &rhs);
-};
+  class TAO_PortableServer_Export Current_var : public TAO_Base_var
+  {
+  public:
+    Current_var (void); // default constructor
+    Current_var (Current_ptr p) : ptr_ (p) {} 
+    Current_var (const Current_var &); // copy constructor
+    ~Current_var (void); // destructor
+    
+    Current_var &operator= (Current_ptr);
+    Current_var &operator= (const Current_var &);
+    Current_ptr operator-> (void) const;
+    
+    operator const Current_ptr &() const;
+    operator Current_ptr &();
+    // in, inout, out, _retn 
+    Current_ptr in (void) const;
+    Current_ptr &inout (void);
+    Current_ptr &out (void);
+    Current_ptr _retn (void);
+    Current_ptr ptr (void) const;
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static Current_ptr duplicate (Current_ptr);
+    static void release (Current_ptr);
+    static Current_ptr nil (void);
+    static Current_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
+  private:
+    Current_ptr ptr_;
+    // Unimplemented - prevents widening assignment.
+    Current_var (const TAO_Base_var &rhs);
+    Current_var &operator= (const TAO_Base_var &rhs);
+  };
 
 
 #endif /* end #if !defined */
@@ -2950,22 +3089,22 @@ private:
 #if !defined (_PORTABLESERVER_CURRENT___OUT_CH_)
 #define _PORTABLESERVER_CURRENT___OUT_CH_
 
-class TAO_PortableServer_Export Current_out
-{
-public:
-  Current_out (Current_ptr &);
-  Current_out (Current_var &);
-  Current_out (const Current_out &);
-  Current_out &operator= (const Current_out &);
-  Current_out &operator= (const Current_var &);
-  Current_out &operator= (Current_ptr);
-  operator Current_ptr &();
-  Current_ptr &ptr (void);
-  Current_ptr operator-> (void);
-
-private:
-  Current_ptr &ptr_;
-};
+  class TAO_PortableServer_Export Current_out
+  {
+  public:
+    Current_out (Current_ptr &);
+    Current_out (Current_var &);
+    Current_out (const Current_out &);
+    Current_out &operator= (const Current_out &);
+    Current_out &operator= (const Current_var &);
+    Current_out &operator= (Current_ptr);
+    operator Current_ptr &();
+    Current_ptr &ptr (void);
+    Current_ptr operator-> (void);
+  
+  private:
+    Current_ptr &ptr_;
+  };
 
 
 #endif /* end #if !defined */
@@ -2975,98 +3114,106 @@ private:
 #define _PORTABLESERVER_CURRENT_CH_
 
 class TAO_PortableServer_Export Current: public virtual CORBA::Current
-{
-public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-  typedef Current_ptr _ptr_type;
-  typedef Current_var _var_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-  // the static operations
-  static Current_ptr _duplicate (Current_ptr obj);
-  static Current_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static Current_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
-  static Current_ptr _nil (void)
-    {
-      return (Current_ptr)0;
-    }
-
-
-#if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT_CH_)
-#define _PORTABLESERVER_CURRENT_NOCONTEXT_CH_
-
-  class TAO_PortableServer_Export NoContext : public CORBA::UserException
   {
   public:
+  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+    typedef Current_ptr _ptr_type;
+    typedef Current_var _var_type;
+  #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+    // the static operations
+    static Current_ptr _duplicate (Current_ptr obj);
+    static Current_ptr _narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static Current_ptr _unchecked_narrow (
+        CORBA::Object_ptr obj,
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      );
+    static Current_ptr _nil (void)
+      {
+        return (Current_ptr)0;
+      }
 
 
-  NoContext (void); // default ctor
-  NoContext (const NoContext &); // copy ctor
-  ~NoContext (void);
-  NoContext &operator= (const NoContext &);
-
-
-  virtual void _raise (void);
-
-  virtual void _tao_encode (
-      TAO_OutputCDR &,
-      CORBA::Environment &) const;
-  virtual void _tao_decode (
-      TAO_InputCDR &,
-      CORBA::Environment &);
+#if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT_CH_)
+#define _PORTABLESERVER_CURRENT_NOCONTEXT_CH_
 
-  static NoContext *_downcast (CORBA::Exception *);
+    class TAO_PortableServer_Export NoContext : public CORBA::UserException
+    {
+    public:
 
+      NoContext (void);
+      // Default constructor.
+      
+      NoContext (const NoContext &);
+      // Copy constructor.
+      
+      ~NoContext (void);
+      // Destructor.
+      
+      NoContext &operator= (const NoContext &);
+      
+      virtual void _raise (void);
+
+      virtual void _tao_encode (
+          TAO_OutputCDR &,
+          CORBA::Environment &
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &,
+          CORBA::Environment &
+        );
+      
+      static NoContext *_downcast (CORBA::Exception *);
 
-  // = TAO extension
-  static CORBA::Exception *_alloc (void);
 
-}; // exception PortableServer::Current::NoContext
+      // = TAO extension.
+      static CORBA::Exception *_alloc (void);
+    }; // Exception PortableServer::Current::NoContext.
 
 
 #endif /* end #if !defined */
 
-virtual PortableServer::POA_ptr get_POA (
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::Current::NoContext
-  )) = 0;
-
-virtual PortableServer::ObjectId * get_object_id (
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    PortableServer::Current::NoContext
-  )) = 0;
-
-virtual void *_tao_QueryInterface (ptr_arith_t type);
-
-virtual const char* _interface_repository_id (void) const;
-
-protected:
-  Current (void);
-  virtual ~Current (void);
-private:
-  Current (const Current &);
-  void operator= (const Current &);
-};
+    virtual PortableServer::POA_ptr get_POA (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::Current::NoContext
+      )) = 0;
+
+    virtual PortableServer::ObjectId * get_object_id (
+        CORBA::Environment &ACE_TRY_ENV = 
+          TAO_default_environment ()
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        PortableServer::Current::NoContext
+      )) = 0;
+
+    virtual void *_tao_QueryInterface (ptr_arith_t type);
+    
+    virtual const char* _interface_repository_id (void) const;
+
+  protected:
+    Current ();
+    
+    virtual ~Current (void);
+  private:
+    Current (const Current &);
+    void operator= (const Current &);
+  };
 
 
 #endif /* end #if !defined */
 
+
   TAO_NAMESPACE_STORAGE_CLASS char *ObjectId_to_string (const PortableServer::ObjectId &id);
   TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id);
   TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *string_to_ObjectId (const char *id);
@@ -3138,37 +3285,27 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
-# if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-TAO_PortableServer_Export ostream& operator<< (ostream &, const PortableServer::ForwardRequest &);
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-# endif /* ACE_LACKS_IOSTREAM_TOTALLY */
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); //
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); // 
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); //
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); // 
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); //
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); // 
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); //
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); // 
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); //
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); // 
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); //
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); // 
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); //
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); // 
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
@@ -3184,5 +3321,9 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i
index b249fd5a73e..9ba403e65a1 100644
--- a/TAO/tao/PortableServer/PortableServerC.i
+++ b/TAO/tao/PortableServer/PortableServerC.i
@@ -1,185 +1,27 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
-
-
-#if !defined (_PORTABLESERVER_POA___VAR_CI_)
-#define _PORTABLESERVER_POA___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::POA_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::POA_var::POA_var (void) // default constructor
-  : ptr_ (PortableServer::POA::_nil ())
-{}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POA_var::POA_var (const PortableServer::POA_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (POA::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::POA_var::~POA_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::POA_var &
-PortableServer::POA_var::operator= (PortableServer::POA_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::POA_var &
-PortableServer::POA_var::operator= (const PortableServer::POA_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = PortableServer::POA::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::POA_var::operator const PortableServer::POA_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POA_var::operator PortableServer::POA_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr &
-PortableServer::POA_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr &
-PortableServer::POA_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::POA::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  PortableServer::POA_ptr val = this->ptr_;
-  this->ptr_ = PortableServer::POA::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLESERVER_POA___OUT_CI_)
-#define _PORTABLESERVER_POA___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::POA_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::POA_out::POA_out (PortableServer::POA_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = PortableServer::POA::_nil ();
-}
-
-ACE_INLINE
-PortableServer::POA_out::POA_out (PortableServer::POA_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = PortableServer::POA::_nil ();
-}
-
-ACE_INLINE
-PortableServer::POA_out::POA_out (const PortableServer::POA_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (PortableServer::POA_out&,p).ptr_)
-{}
-
-ACE_INLINE PortableServer::POA_out &
-PortableServer::POA_out::operator= (const PortableServer::POA_out &p)
-{
-  this->ptr_ = ACE_const_cast (PortableServer::POA_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::POA_out &
-PortableServer::POA_out::operator= (const PortableServer::POA_var &p)
-{
-  this->ptr_ = PortableServer::POA::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::POA_out &
-PortableServer::POA_out::operator= (PortableServer::POA_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::POA_out::operator PortableServer::POA_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr &
-PortableServer::POA_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-PortableServer::POA_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+  
 #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CI_)
 #define __TAO_UNBOUNDED_OBJECT_SEQUENCE_PORTABLESERVER_POALIST_CI_
 
@@ -187,34 +29,36 @@ PortableServer::POA_out::operator-> (void)
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (CORBA::ULong nelems)
   {
     PortableServer::POA **buf = 0;
-
+    
     ACE_NEW_RETURN (buf, PortableServer::POA*[nelems], 0);
-
+    
     for (CORBA::ULong i = 0; i < nelems; i++)
-      buf[i] = PortableServer::POA::_nil ();
-
+      {
+        buf[i] = PortableServer::POA::_nil ();
+      }
+    
     return buf;
   }
-
-  ACE_INLINE void
+  
+  ACE_INLINE void 
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::freebuf (PortableServer::POA **buffer)
   {
     if (buffer == 0)
       return;
     delete[] buffer;
   }
-
+  
   ACE_INLINE
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (void)
   {
   }
-
+  
   ACE_INLINE
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum)
     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (maximum))
   {
   }
-
+  
   ACE_INLINE
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList (CORBA::ULong maximum,
     CORBA::ULong length,
@@ -223,7 +67,7 @@ PortableServer::POA_out::operator-> (void)
   : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
   {
   }
-
+  
   ACE_INLINE
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::_TAO_Unbounded_Object_Sequence_PortableServer_POAList(const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs)
     : TAO_Unbounded_Base_Sequence (rhs)
@@ -232,10 +76,12 @@ PortableServer::POA_out::operator-> (void)
     {
       PortableServer::POA **tmp1 = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (this->maximum_);
       PortableServer::POA ** const tmp2 = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, rhs.buffer_);
-
+      
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-        tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]);
-
+        {
+          tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]);
+        }
+      
       this->buffer_ = tmp1;
     }
     else
@@ -243,17 +89,17 @@ PortableServer::POA_out::operator-> (void)
       this->buffer_ = 0;
     }
   }
-
+  
   ACE_INLINE PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList &
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::operator= (const _TAO_Unbounded_Object_Sequence_PortableServer_POAList &rhs)
   {
     if (this == &rhs)
       return *this;
-
+    
     if (this->release_)
     {
       PortableServer::POA **tmp = ACE_reinterpret_cast (PortableServer::POA **, this->buffer_);
-
+      
       for (CORBA::ULong i = 0; i < this->length_; ++i)
       {
         CORBA::release (tmp[i]);
@@ -267,18 +113,20 @@ PortableServer::POA_out::operator-> (void)
     }
     else
       this->buffer_ = _TAO_Unbounded_Object_Sequence_PortableServer_POAList::allocbuf (rhs.maximum_);
-
+    
     TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+    
     PortableServer::POA **tmp1 = ACE_reinterpret_cast (PortableServer::POA **, this->buffer_);
     PortableServer::POA ** const tmp2 = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, rhs.buffer_);
-
+    
     for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-      tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]);
-
+      {
+        tmp1[i] = PortableServer::POA::_duplicate (tmp2[i]);
+      }
+    
     return *this;
   }
-
+  
   ACE_INLINE TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::operator[] (CORBA::ULong index) const
   // read-write accessor
@@ -287,7 +135,7 @@ PortableServer::POA_out::operator-> (void)
     PortableServer::POA ** const tmp = ACE_reinterpret_cast (PortableServer::POA ** ACE_CAST_CONST, this->buffer_);
     return TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var> (tmp + index, this->release_);
   }
-
+  
   ACE_INLINE PortableServer::POA* *
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::get_buffer (CORBA::Boolean orphan)
   {
@@ -321,18 +169,18 @@ PortableServer::POA_out::operator-> (void)
     }
     return result;
   }
-
+  
   ACE_INLINE const PortableServer::POA* *
   PortableServer::_TAO_Unbounded_Object_Sequence_PortableServer_POAList::get_buffer (void) const
   {
     return ACE_reinterpret_cast(const PortableServer::POA ** ACE_CAST_CONST, this->buffer_);
   }
-
-
+  
+  
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
 
 #if !defined (_PORTABLESERVER_POALIST_CI_)
 #define _PORTABLESERVER_POALIST_CI_
@@ -374,8 +222,8 @@ PortableServer::POAList_var::operator= (POAList *p)
   return *this;
 }
 
-ACE_INLINE PortableServer::POAList_var &
-PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p) // deep copy
+ACE_INLINE ::PortableServer::POAList_var &
+PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p)
 {
   if (this != &p)
     {
@@ -386,12 +234,12 @@ PortableServer::POAList_var::operator= (const ::PortableServer::POAList_var &p)
         }
       else
         {
-          PortableServer::POAList *deep_copy = 
-            new PortableServer::POAList (*p.ptr_);
+          POAList *deep_copy =
+            new POAList (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              PortableServer::POAList *tmp = deep_copy;
+              POAList *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -414,27 +262,27 @@ PortableServer::POAList_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE
+ACE_INLINE 
 PortableServer::POAList_var::operator const ::PortableServer::POAList &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList &() // cast
+ACE_INLINE 
+PortableServer::POAList_var::operator ::PortableServer::POAList &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList &() const // cast
+ACE_INLINE 
+PortableServer::POAList_var::operator ::PortableServer::POAList &() const // cast 
 {
   return *this->ptr_;
 }
 
 // variable-size types only
 ACE_INLINE
-PortableServer::POAList_var::operator ::PortableServer::POAList *&() // cast
+PortableServer::POAList_var::operator ::PortableServer::POAList *&() // cast 
 {
   return this->ptr_;
 }
@@ -457,7 +305,7 @@ PortableServer::POAList_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size
+// mapping for variable size 
 ACE_INLINE ::PortableServer::POAList *&
 PortableServer::POAList_var::out (void)
 {
@@ -518,7 +366,7 @@ PortableServer::POAList_out::operator= (POAList *p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 PortableServer::POAList_out::operator ::PortableServer::POAList *&() // cast
 {
   return this->ptr_;
@@ -593,8 +441,8 @@ PortableServer::ObjectId_var::operator= (ObjectId *p)
   return *this;
 }
 
-ACE_INLINE PortableServer::ObjectId_var &
-PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p) // deep copy
+ACE_INLINE ::PortableServer::ObjectId_var &
+PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p)
 {
   if (this != &p)
     {
@@ -605,12 +453,12 @@ PortableServer::ObjectId_var::operator= (const ::PortableServer::ObjectId_var &p
         }
       else
         {
-          PortableServer::ObjectId *deep_copy = 
-            new PortableServer::ObjectId (*p.ptr_);
+          ObjectId *deep_copy =
+            new ObjectId (*p.ptr_);
           
           if (deep_copy != 0)
             {
-              PortableServer::ObjectId *tmp = deep_copy;
+              ObjectId *tmp = deep_copy;
               deep_copy = this->ptr_;
               this->ptr_ = tmp;
               delete deep_copy;
@@ -645,20 +493,20 @@ PortableServer::ObjectId_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE
+ACE_INLINE 
 PortableServer::ObjectId_var::operator const ::PortableServer::ObjectId &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() // cast
+ACE_INLINE 
+PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() // cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE
-PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() const // cast
+ACE_INLINE 
+PortableServer::ObjectId_var::operator ::PortableServer::ObjectId &() const // cast 
 {
   return *this->ptr_;
 }
@@ -669,6 +517,12 @@ PortableServer::ObjectId_var::operator[] (CORBA::ULong index)
   return this->ptr_->operator[] (index);
 }
 
+ACE_INLINE const CORBA::Octet &
+PortableServer::ObjectId_var::operator[] (CORBA::ULong index) const
+{
+  return ACE_const_cast (const CORBA::Octet &, this->ptr_->operator[] (index));
+}
+
 ACE_INLINE const ::PortableServer::ObjectId &
 PortableServer::ObjectId_var::in (void) const
 {
@@ -681,7 +535,7 @@ PortableServer::ObjectId_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size
+// mapping for variable size 
 ACE_INLINE ::PortableServer::ObjectId *&
 PortableServer::ObjectId_var::out (void)
 {
@@ -742,7 +596,7 @@ PortableServer::ObjectId_out::operator= (ObjectId *p)
   return *this;
 }
 
-ACE_INLINE
+ACE_INLINE 
 PortableServer::ObjectId_out::operator ::PortableServer::ObjectId *&() // cast
 {
   return this->ptr_;
@@ -776,1192 +630,354 @@ PortableServer::ObjectId_out::operator[] (CORBA::ULong index)
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-#if !defined (_PORTABLESERVER_THREADPOLICY___VAR_CI_)
-#define _PORTABLESERVER_THREADPOLICY___VAR_CI_
+#if !defined (_PORTABLESERVER_THREADPOLICY___CI_)
+#define _PORTABLESERVER_THREADPOLICY___CI_
 
-// *************************************************************
-// Inline operations for class PortableServer::ThreadPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ThreadPolicy_var::ThreadPolicy_var (void) // default constructor
-  : ptr_ (ThreadPolicy::_nil ())
-{}
-
-ACE_INLINE ::PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_var::ThreadPolicy_var (const ::PortableServer::ThreadPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ThreadPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_var::~ThreadPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_var &
-PortableServer::ThreadPolicy_var::operator= (ThreadPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_var &
-PortableServer::ThreadPolicy_var::operator= (const ::PortableServer::ThreadPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::ThreadPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_var::operator const ::PortableServer::ThreadPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_var::operator ::PortableServer::ThreadPolicy_ptr &() // cast
+ACE_INLINE PortableServer::ThreadPolicy_ptr
+tao_PortableServer_ThreadPolicy_duplicate (
+    PortableServer::ThreadPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  return PortableServer::ThreadPolicy::_duplicate (p);
 }
 
-ACE_INLINE ::PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_var::operator-> (void) const
+ACE_INLINE void
+tao_PortableServer_ThreadPolicy_release (
+    PortableServer::ThreadPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_var::in (void) const
+ACE_INLINE PortableServer::ThreadPolicy_ptr
+tao_PortableServer_ThreadPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableServer::ThreadPolicy::_nil ();
 }
 
-ACE_INLINE ::PortableServer::ThreadPolicy_ptr &
-PortableServer::ThreadPolicy_var::inout (void)
+ACE_INLINE PortableServer::ThreadPolicy_ptr
+tao_PortableServer_ThreadPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return PortableServer::ThreadPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableServer::ThreadPolicy_ptr &
-PortableServer::ThreadPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ThreadPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_PortableServer_ThreadPolicy_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::PortableServer::ThreadPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::ThreadPolicy::_nil ();
-  return val;
+  PortableServer::ThreadPolicy **tmp =
+    ACE_static_cast (PortableServer::ThreadPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLESERVER_THREADPOLICY___OUT_CI_)
-#define _PORTABLESERVER_THREADPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ThreadPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ThreadPolicy_out::ThreadPolicy_out (ThreadPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::ThreadPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_out::ThreadPolicy_out (ThreadPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ThreadPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_out::ThreadPolicy_out (const ::PortableServer::ThreadPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ThreadPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableServer::ThreadPolicy_out &
-PortableServer::ThreadPolicy_out::operator= (const ::PortableServer::ThreadPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ThreadPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_out &
-PortableServer::ThreadPolicy_out::operator= (const ::PortableServer::ThreadPolicy_var &p)
-{
-  this->ptr_ = ::PortableServer::ThreadPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::ThreadPolicy_out &
-PortableServer::ThreadPolicy_out::operator= (ThreadPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ThreadPolicy_out::operator ::PortableServer::ThreadPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ThreadPolicy_ptr &
-PortableServer::ThreadPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___VAR_CI_)
-#define _PORTABLESERVER_LIFESPANPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::LifespanPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::LifespanPolicy_var::LifespanPolicy_var (void) // default constructor
-  : ptr_ (LifespanPolicy::_nil ())
-{}
-
-ACE_INLINE ::PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_var::LifespanPolicy_var (const ::PortableServer::LifespanPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (LifespanPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_var::~LifespanPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_var &
-PortableServer::LifespanPolicy_var::operator= (LifespanPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_var &
-PortableServer::LifespanPolicy_var::operator= (const ::PortableServer::LifespanPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::LifespanPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_var::operator const ::PortableServer::LifespanPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_var::operator ::PortableServer::LifespanPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::LifespanPolicy_ptr &
-PortableServer::LifespanPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::LifespanPolicy_ptr &
-PortableServer::LifespanPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::LifespanPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::LifespanPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::LifespanPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___OUT_CI_)
-#define _PORTABLESERVER_LIFESPANPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::LifespanPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::LifespanPolicy_out::LifespanPolicy_out (LifespanPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::LifespanPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_out::LifespanPolicy_out (LifespanPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::LifespanPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_out::LifespanPolicy_out (const ::PortableServer::LifespanPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (LifespanPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableServer::LifespanPolicy_out &
-PortableServer::LifespanPolicy_out::operator= (const ::PortableServer::LifespanPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (LifespanPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_out &
-PortableServer::LifespanPolicy_out::operator= (const ::PortableServer::LifespanPolicy_var &p)
-{
-  this->ptr_ = ::PortableServer::LifespanPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::LifespanPolicy_out &
-PortableServer::LifespanPolicy_out::operator= (LifespanPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::LifespanPolicy_out::operator ::PortableServer::LifespanPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::LifespanPolicy_ptr &
-PortableServer::LifespanPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
+#if !defined (_PORTABLESERVER_LIFESPANPOLICY___CI_)
+#define _PORTABLESERVER_LIFESPANPOLICY___CI_
 
-ACE_INLINE ::PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CI_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::IdUniquenessPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (void) // default constructor
-  : ptr_ (IdUniquenessPolicy::_nil ())
-{}
-
-ACE_INLINE ::PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_var::IdUniquenessPolicy_var (const ::PortableServer::IdUniquenessPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (IdUniquenessPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_var::~IdUniquenessPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_var &
-PortableServer::IdUniquenessPolicy_var::operator= (IdUniquenessPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::IdUniquenessPolicy_var &
-PortableServer::IdUniquenessPolicy_var::operator= (const ::PortableServer::IdUniquenessPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::IdUniquenessPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_var::operator const ::PortableServer::IdUniquenessPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_var::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_var::operator-> (void) const
+ACE_INLINE PortableServer::LifespanPolicy_ptr
+tao_PortableServer_LifespanPolicy_duplicate (
+    PortableServer::LifespanPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  return PortableServer::LifespanPolicy::_duplicate (p);
 }
 
-ACE_INLINE ::PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_var::in (void) const
+ACE_INLINE void
+tao_PortableServer_LifespanPolicy_release (
+    PortableServer::LifespanPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::PortableServer::IdUniquenessPolicy_ptr &
-PortableServer::IdUniquenessPolicy_var::inout (void)
+ACE_INLINE PortableServer::LifespanPolicy_ptr
+tao_PortableServer_LifespanPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableServer::LifespanPolicy::_nil ();
 }
 
-ACE_INLINE ::PortableServer::IdUniquenessPolicy_ptr &
-PortableServer::IdUniquenessPolicy_var::out (void)
+ACE_INLINE PortableServer::LifespanPolicy_ptr
+tao_PortableServer_LifespanPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::IdUniquenessPolicy::_nil ();
-  return this->ptr_;
+  return PortableServer::LifespanPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_PortableServer_LifespanPolicy_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::PortableServer::IdUniquenessPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::IdUniquenessPolicy::_nil ();
-  return val;
+  PortableServer::LifespanPolicy **tmp =
+    ACE_static_cast (PortableServer::LifespanPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CI_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::IdUniquenessPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::IdUniquenessPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (IdUniquenessPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::IdUniquenessPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (const ::PortableServer::IdUniquenessPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IdUniquenessPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableServer::IdUniquenessPolicy_out &
-PortableServer::IdUniquenessPolicy_out::operator= (const ::PortableServer::IdUniquenessPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (IdUniquenessPolicy_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___CI_)
+#define _PORTABLESERVER_IDUNIQUENESSPOLICY___CI_
 
-ACE_INLINE PortableServer::IdUniquenessPolicy_out &
-PortableServer::IdUniquenessPolicy_out::operator= (const ::PortableServer::IdUniquenessPolicy_var &p)
+ACE_INLINE PortableServer::IdUniquenessPolicy_ptr
+tao_PortableServer_IdUniquenessPolicy_duplicate (
+    PortableServer::IdUniquenessPolicy_ptr p
+  )
 {
-  this->ptr_ = ::PortableServer::IdUniquenessPolicy::_duplicate (p.ptr ());
-  return *this;
+  return PortableServer::IdUniquenessPolicy::_duplicate (p);
 }
 
-ACE_INLINE PortableServer::IdUniquenessPolicy_out &
-PortableServer::IdUniquenessPolicy_out::operator= (IdUniquenessPolicy_ptr p)
+ACE_INLINE void
+tao_PortableServer_IdUniquenessPolicy_release (
+    PortableServer::IdUniquenessPolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-PortableServer::IdUniquenessPolicy_out::operator ::PortableServer::IdUniquenessPolicy_ptr &() // cast
+ACE_INLINE PortableServer::IdUniquenessPolicy_ptr
+tao_PortableServer_IdUniquenessPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableServer::IdUniquenessPolicy::_nil ();
 }
 
-ACE_INLINE ::PortableServer::IdUniquenessPolicy_ptr &
-PortableServer::IdUniquenessPolicy_out::ptr (void) // ptr
+ACE_INLINE PortableServer::IdUniquenessPolicy_ptr
+tao_PortableServer_IdUniquenessPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return PortableServer::IdUniquenessPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_PortableServer_IdUniquenessPolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  PortableServer::IdUniquenessPolicy **tmp =
+    ACE_static_cast (PortableServer::IdUniquenessPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CI_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::IdAssignmentPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (void) // default constructor
-  : ptr_ (IdAssignmentPolicy::_nil ())
-{}
-
-ACE_INLINE ::PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_var::IdAssignmentPolicy_var (const ::PortableServer::IdAssignmentPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (IdAssignmentPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_var::~IdAssignmentPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_var &
-PortableServer::IdAssignmentPolicy_var::operator= (IdAssignmentPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_var &
-PortableServer::IdAssignmentPolicy_var::operator= (const ::PortableServer::IdAssignmentPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::IdAssignmentPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_var::operator const ::PortableServer::IdAssignmentPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_var::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
+#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___CI_)
+#define _PORTABLESERVER_IDASSIGNMENTPOLICY___CI_
 
-ACE_INLINE ::PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_var::operator-> (void) const
+ACE_INLINE PortableServer::IdAssignmentPolicy_ptr
+tao_PortableServer_IdAssignmentPolicy_duplicate (
+    PortableServer::IdAssignmentPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  return PortableServer::IdAssignmentPolicy::_duplicate (p);
 }
 
-ACE_INLINE ::PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_var::in (void) const
+ACE_INLINE void
+tao_PortableServer_IdAssignmentPolicy_release (
+    PortableServer::IdAssignmentPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::PortableServer::IdAssignmentPolicy_ptr &
-PortableServer::IdAssignmentPolicy_var::inout (void)
+ACE_INLINE PortableServer::IdAssignmentPolicy_ptr
+tao_PortableServer_IdAssignmentPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableServer::IdAssignmentPolicy::_nil ();
 }
 
-ACE_INLINE ::PortableServer::IdAssignmentPolicy_ptr &
-PortableServer::IdAssignmentPolicy_var::out (void)
+ACE_INLINE PortableServer::IdAssignmentPolicy_ptr
+tao_PortableServer_IdAssignmentPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::IdAssignmentPolicy::_nil ();
-  return this->ptr_;
+  return PortableServer::IdAssignmentPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_PortableServer_IdAssignmentPolicy_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::PortableServer::IdAssignmentPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::IdAssignmentPolicy::_nil ();
-  return val;
+  PortableServer::IdAssignmentPolicy **tmp =
+    ACE_static_cast (PortableServer::IdAssignmentPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CI_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::IdAssignmentPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::IdAssignmentPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (IdAssignmentPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::IdAssignmentPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (const ::PortableServer::IdAssignmentPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IdAssignmentPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableServer::IdAssignmentPolicy_out &
-PortableServer::IdAssignmentPolicy_out::operator= (const ::PortableServer::IdAssignmentPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (IdAssignmentPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_out &
-PortableServer::IdAssignmentPolicy_out::operator= (const ::PortableServer::IdAssignmentPolicy_var &p)
-{
-  this->ptr_ = ::PortableServer::IdAssignmentPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::IdAssignmentPolicy_out &
-PortableServer::IdAssignmentPolicy_out::operator= (IdAssignmentPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::IdAssignmentPolicy_out::operator ::PortableServer::IdAssignmentPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::IdAssignmentPolicy_ptr &
-PortableServer::IdAssignmentPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CI_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ImplicitActivationPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (void) // default constructor
-  : ptr_ (ImplicitActivationPolicy::_nil ())
-{}
-
-ACE_INLINE ::PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_var::ImplicitActivationPolicy_var (const ::PortableServer::ImplicitActivationPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ImplicitActivationPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_var::~ImplicitActivationPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_var &
-PortableServer::ImplicitActivationPolicy_var::operator= (ImplicitActivationPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_var &
-PortableServer::ImplicitActivationPolicy_var::operator= (const ::PortableServer::ImplicitActivationPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_var::operator const ::PortableServer::ImplicitActivationPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_var::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ImplicitActivationPolicy_ptr &
-PortableServer::ImplicitActivationPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ImplicitActivationPolicy_ptr &
-PortableServer::ImplicitActivationPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::ImplicitActivationPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CI_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ImplicitActivationPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (ImplicitActivationPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (const ::PortableServer::ImplicitActivationPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ImplicitActivationPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableServer::ImplicitActivationPolicy_out &
-PortableServer::ImplicitActivationPolicy_out::operator= (const ::PortableServer::ImplicitActivationPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ImplicitActivationPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_out &
-PortableServer::ImplicitActivationPolicy_out::operator= (const ::PortableServer::ImplicitActivationPolicy_var &p)
-{
-  this->ptr_ = ::PortableServer::ImplicitActivationPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::ImplicitActivationPolicy_out &
-PortableServer::ImplicitActivationPolicy_out::operator= (ImplicitActivationPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ImplicitActivationPolicy_out::operator ::PortableServer::ImplicitActivationPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ImplicitActivationPolicy_ptr &
-PortableServer::ImplicitActivationPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CI_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantRetentionPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (void) // default constructor
-  : ptr_ (ServantRetentionPolicy::_nil ())
-{}
-
-ACE_INLINE ::PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_var::ServantRetentionPolicy_var (const ::PortableServer::ServantRetentionPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ServantRetentionPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_var::~ServantRetentionPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_var &
-PortableServer::ServantRetentionPolicy_var::operator= (ServantRetentionPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantRetentionPolicy_var &
-PortableServer::ServantRetentionPolicy_var::operator= (const ::PortableServer::ServantRetentionPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::ServantRetentionPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
+#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_)
+#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_
 
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_var::operator const ::PortableServer::ServantRetentionPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_var::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ServantRetentionPolicy_ptr &
-PortableServer::ServantRetentionPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ServantRetentionPolicy_ptr &
-PortableServer::ServantRetentionPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ServantRetentionPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::ServantRetentionPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::ServantRetentionPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CI_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantRetentionPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::ServantRetentionPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (ServantRetentionPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ServantRetentionPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (const ::PortableServer::ServantRetentionPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServantRetentionPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableServer::ServantRetentionPolicy_out &
-PortableServer::ServantRetentionPolicy_out::operator= (const ::PortableServer::ServantRetentionPolicy_out &p)
+ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr
+tao_PortableServer_ImplicitActivationPolicy_duplicate (
+    PortableServer::ImplicitActivationPolicy_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (ServantRetentionPolicy_out&, p).ptr_;
-  return *this;
+  return PortableServer::ImplicitActivationPolicy::_duplicate (p);
 }
 
-ACE_INLINE PortableServer::ServantRetentionPolicy_out &
-PortableServer::ServantRetentionPolicy_out::operator= (const ::PortableServer::ServantRetentionPolicy_var &p)
+ACE_INLINE void
+tao_PortableServer_ImplicitActivationPolicy_release (
+    PortableServer::ImplicitActivationPolicy_ptr p
+  )
 {
-  this->ptr_ = ::PortableServer::ServantRetentionPolicy::_duplicate (p.ptr ());
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE PortableServer::ServantRetentionPolicy_out &
-PortableServer::ServantRetentionPolicy_out::operator= (ServantRetentionPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ServantRetentionPolicy_out::operator ::PortableServer::ServantRetentionPolicy_ptr &() // cast
+ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr
+tao_PortableServer_ImplicitActivationPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableServer::ImplicitActivationPolicy::_nil ();
 }
 
-ACE_INLINE ::PortableServer::ServantRetentionPolicy_ptr &
-PortableServer::ServantRetentionPolicy_out::ptr (void) // ptr
+ACE_INLINE PortableServer::ImplicitActivationPolicy_ptr
+tao_PortableServer_ImplicitActivationPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return PortableServer::ImplicitActivationPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_PortableServer_ImplicitActivationPolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  PortableServer::ImplicitActivationPolicy **tmp =
+    ACE_static_cast (PortableServer::ImplicitActivationPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CI_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::RequestProcessingPolicy_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (void) // default constructor
-  : ptr_ (RequestProcessingPolicy::_nil ())
-{}
-
-ACE_INLINE ::PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_var::RequestProcessingPolicy_var (const ::PortableServer::RequestProcessingPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (RequestProcessingPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_var::~RequestProcessingPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_var &
-PortableServer::RequestProcessingPolicy_var::operator= (RequestProcessingPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_var &
-PortableServer::RequestProcessingPolicy_var::operator= (const ::PortableServer::RequestProcessingPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::RequestProcessingPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_var::operator const ::PortableServer::RequestProcessingPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_var::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
+#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___CI_)
+#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___CI_
 
-ACE_INLINE ::PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_var::operator-> (void) const
+ACE_INLINE PortableServer::ServantRetentionPolicy_ptr
+tao_PortableServer_ServantRetentionPolicy_duplicate (
+    PortableServer::ServantRetentionPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  return PortableServer::ServantRetentionPolicy::_duplicate (p);
 }
 
-ACE_INLINE ::PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_var::in (void) const
+ACE_INLINE void
+tao_PortableServer_ServantRetentionPolicy_release (
+    PortableServer::ServantRetentionPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::PortableServer::RequestProcessingPolicy_ptr &
-PortableServer::RequestProcessingPolicy_var::inout (void)
+ACE_INLINE PortableServer::ServantRetentionPolicy_ptr
+tao_PortableServer_ServantRetentionPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableServer::ServantRetentionPolicy::_nil ();
 }
 
-ACE_INLINE ::PortableServer::RequestProcessingPolicy_ptr &
-PortableServer::RequestProcessingPolicy_var::out (void)
+ACE_INLINE PortableServer::ServantRetentionPolicy_ptr
+tao_PortableServer_ServantRetentionPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::RequestProcessingPolicy::_nil ();
-  return this->ptr_;
+  return PortableServer::ServantRetentionPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_PortableServer_ServantRetentionPolicy_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::PortableServer::RequestProcessingPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::RequestProcessingPolicy::_nil ();
-  return val;
+  PortableServer::ServantRetentionPolicy **tmp =
+    ACE_static_cast (PortableServer::ServantRetentionPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CI_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::RequestProcessingPolicy_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::RequestProcessingPolicy::_nil ();
-}
-
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (RequestProcessingPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::RequestProcessingPolicy::_nil ();
-}
+#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___CI_)
+#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___CI_
 
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (const ::PortableServer::RequestProcessingPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (RequestProcessingPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableServer::RequestProcessingPolicy_out &
-PortableServer::RequestProcessingPolicy_out::operator= (const ::PortableServer::RequestProcessingPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (RequestProcessingPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::RequestProcessingPolicy_out &
-PortableServer::RequestProcessingPolicy_out::operator= (const ::PortableServer::RequestProcessingPolicy_var &p)
+ACE_INLINE PortableServer::RequestProcessingPolicy_ptr
+tao_PortableServer_RequestProcessingPolicy_duplicate (
+    PortableServer::RequestProcessingPolicy_ptr p
+  )
 {
-  this->ptr_ = ::PortableServer::RequestProcessingPolicy::_duplicate (p.ptr ());
-  return *this;
+  return PortableServer::RequestProcessingPolicy::_duplicate (p);
 }
 
-ACE_INLINE PortableServer::RequestProcessingPolicy_out &
-PortableServer::RequestProcessingPolicy_out::operator= (RequestProcessingPolicy_ptr p)
+ACE_INLINE void
+tao_PortableServer_RequestProcessingPolicy_release (
+    PortableServer::RequestProcessingPolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-PortableServer::RequestProcessingPolicy_out::operator ::PortableServer::RequestProcessingPolicy_ptr &() // cast
+ACE_INLINE PortableServer::RequestProcessingPolicy_ptr
+tao_PortableServer_RequestProcessingPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableServer::RequestProcessingPolicy::_nil ();
 }
 
-ACE_INLINE ::PortableServer::RequestProcessingPolicy_ptr &
-PortableServer::RequestProcessingPolicy_out::ptr (void) // ptr
+ACE_INLINE PortableServer::RequestProcessingPolicy_ptr
+tao_PortableServer_RequestProcessingPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return PortableServer::RequestProcessingPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_PortableServer_RequestProcessingPolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  PortableServer::RequestProcessingPolicy **tmp =
+    ACE_static_cast (PortableServer::RequestProcessingPolicy **, src);
+  return *tmp;
 }
 
 
@@ -1974,851 +990,252 @@ PortableServer::RequestProcessingPolicy_out::operator-> (void)
 // *************************************************************
 
 
-#if !defined (_PORTABLESERVER_POAMANAGER___VAR_CI_)
-#define _PORTABLESERVER_POAMANAGER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::POAManager_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::POAManager_var::POAManager_var (void) // default constructor
-  : ptr_ (POAManager::_nil ())
-{}
-
-ACE_INLINE ::PortableServer::POAManager_ptr
-PortableServer::POAManager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POAManager_var::POAManager_var (const ::PortableServer::POAManager_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (POAManager::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::POAManager_var::~POAManager_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::POAManager_var &
-PortableServer::POAManager_var::operator= (POAManager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::POAManager_var &
-PortableServer::POAManager_var::operator= (const ::PortableServer::POAManager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::POAManager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::POAManager_var::operator const ::PortableServer::POAManager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::POAManager_var::operator ::PortableServer::POAManager_ptr &() // cast
-{
-  return this->ptr_;
-}
+#if !defined (_PORTABLESERVER_POAMANAGER___CI_)
+#define _PORTABLESERVER_POAMANAGER___CI_
 
-ACE_INLINE ::PortableServer::POAManager_ptr
-PortableServer::POAManager_var::operator-> (void) const
+ACE_INLINE PortableServer::POAManager_ptr
+tao_PortableServer_POAManager_duplicate (
+    PortableServer::POAManager_ptr p
+  )
 {
-  return this->ptr_;
+  return PortableServer::POAManager::_duplicate (p);
 }
 
-ACE_INLINE ::PortableServer::POAManager_ptr
-PortableServer::POAManager_var::in (void) const
+ACE_INLINE void
+tao_PortableServer_POAManager_release (
+    PortableServer::POAManager_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::PortableServer::POAManager_ptr &
-PortableServer::POAManager_var::inout (void)
+ACE_INLINE PortableServer::POAManager_ptr
+tao_PortableServer_POAManager_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableServer::POAManager::_nil ();
 }
 
-ACE_INLINE ::PortableServer::POAManager_ptr &
-PortableServer::POAManager_var::out (void)
+ACE_INLINE PortableServer::POAManager_ptr
+tao_PortableServer_POAManager_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::POAManager::_nil ();
-  return this->ptr_;
+  return PortableServer::POAManager::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableServer::POAManager_ptr
-PortableServer::POAManager_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_PortableServer_POAManager_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::PortableServer::POAManager_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::POAManager::_nil ();
-  return val;
+  PortableServer::POAManager **tmp =
+    ACE_static_cast (PortableServer::POAManager **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLESERVER_POAMANAGER___OUT_CI_)
-#define _PORTABLESERVER_POAMANAGER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::POAManager_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::POAManager_out::POAManager_out (POAManager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::POAManager::_nil ();
-}
-
-ACE_INLINE
-PortableServer::POAManager_out::POAManager_out (POAManager_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::POAManager::_nil ();
-}
-
-ACE_INLINE
-PortableServer::POAManager_out::POAManager_out (const ::PortableServer::POAManager_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (POAManager_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableServer::POAManager_out &
-PortableServer::POAManager_out::operator= (const ::PortableServer::POAManager_out &p)
-{
-  this->ptr_ = ACE_const_cast (POAManager_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::POAManager_out &
-PortableServer::POAManager_out::operator= (const ::PortableServer::POAManager_var &p)
-{
-  this->ptr_ = ::PortableServer::POAManager::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::POAManager_out &
-PortableServer::POAManager_out::operator= (POAManager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::POAManager_out::operator ::PortableServer::POAManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::POAManager_ptr &
-PortableServer::POAManager_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::POAManager_ptr
-PortableServer::POAManager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___VAR_CI_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::AdapterActivator_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::AdapterActivator_var::AdapterActivator_var (void) // default constructor
-  : ptr_ (AdapterActivator::_nil ())
-{}
-
-ACE_INLINE ::PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::AdapterActivator_var::AdapterActivator_var (const ::PortableServer::AdapterActivator_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (AdapterActivator::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::AdapterActivator_var::~AdapterActivator_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::AdapterActivator_var &
-PortableServer::AdapterActivator_var::operator= (AdapterActivator_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_var &
-PortableServer::AdapterActivator_var::operator= (const ::PortableServer::AdapterActivator_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::AdapterActivator::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::AdapterActivator_var::operator const ::PortableServer::AdapterActivator_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::AdapterActivator_var::operator ::PortableServer::AdapterActivator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::AdapterActivator_ptr &
-PortableServer::AdapterActivator_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::AdapterActivator_ptr &
-PortableServer::AdapterActivator_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::AdapterActivator::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::AdapterActivator_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::AdapterActivator::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___OUT_CI_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::AdapterActivator_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::AdapterActivator_out::AdapterActivator_out (AdapterActivator_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::AdapterActivator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::AdapterActivator_out::AdapterActivator_out (AdapterActivator_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::AdapterActivator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::AdapterActivator_out::AdapterActivator_out (const ::PortableServer::AdapterActivator_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (AdapterActivator_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableServer::AdapterActivator_out &
-PortableServer::AdapterActivator_out::operator= (const ::PortableServer::AdapterActivator_out &p)
-{
-  this->ptr_ = ACE_const_cast (AdapterActivator_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_out &
-PortableServer::AdapterActivator_out::operator= (const ::PortableServer::AdapterActivator_var &p)
-{
-  this->ptr_ = ::PortableServer::AdapterActivator::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::AdapterActivator_out &
-PortableServer::AdapterActivator_out::operator= (AdapterActivator_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::AdapterActivator_out::operator ::PortableServer::AdapterActivator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::AdapterActivator_ptr &
-PortableServer::AdapterActivator_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___VAR_CI_)
-#define _PORTABLESERVER_SERVANTMANAGER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantManager_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantManager_var::ServantManager_var (void) // default constructor
-  : ptr_ (ServantManager::_nil ())
-{}
-
-ACE_INLINE ::PortableServer::ServantManager_ptr
-PortableServer::ServantManager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantManager_var::ServantManager_var (const ::PortableServer::ServantManager_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ServantManager::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ServantManager_var::~ServantManager_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ServantManager_var &
-PortableServer::ServantManager_var::operator= (ServantManager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantManager_var &
-PortableServer::ServantManager_var::operator= (const ::PortableServer::ServantManager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::ServantManager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ServantManager_var::operator const ::PortableServer::ServantManager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantManager_var::operator ::PortableServer::ServantManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ServantManager_ptr
-PortableServer::ServantManager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ServantManager_ptr
-PortableServer::ServantManager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ServantManager_ptr &
-PortableServer::ServantManager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ServantManager_ptr &
-PortableServer::ServantManager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ServantManager::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ServantManager_ptr
-PortableServer::ServantManager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::PortableServer::ServantManager_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::ServantManager::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___OUT_CI_)
-#define _PORTABLESERVER_SERVANTMANAGER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantManager_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantManager_out::ServantManager_out (ServantManager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::ServantManager::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantManager_out::ServantManager_out (ServantManager_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ServantManager::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantManager_out::ServantManager_out (const ::PortableServer::ServantManager_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServantManager_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableServer::ServantManager_out &
-PortableServer::ServantManager_out::operator= (const ::PortableServer::ServantManager_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServantManager_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantManager_out &
-PortableServer::ServantManager_out::operator= (const ::PortableServer::ServantManager_var &p)
-{
-  this->ptr_ = ::PortableServer::ServantManager::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantManager_out &
-PortableServer::ServantManager_out::operator= (ServantManager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ServantManager_out::operator ::PortableServer::ServantManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ServantManager_ptr &
-PortableServer::ServantManager_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ServantManager_ptr
-PortableServer::ServantManager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___VAR_CI_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___VAR_CI_
+#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___CI_)
+#define _PORTABLESERVER_ADAPTERACTIVATOR___CI_
 
-// *************************************************************
-// Inline operations for class PortableServer::ServantActivator_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantActivator_var::ServantActivator_var (void) // default constructor
-  : ptr_ (ServantActivator::_nil ())
-{}
-
-ACE_INLINE ::PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantActivator_var::ServantActivator_var (const ::PortableServer::ServantActivator_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ServantActivator::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ServantActivator_var::~ServantActivator_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ServantActivator_var &
-PortableServer::ServantActivator_var::operator= (ServantActivator_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantActivator_var &
-PortableServer::ServantActivator_var::operator= (const ::PortableServer::ServantActivator_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::ServantActivator::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ServantActivator_var::operator const ::PortableServer::ServantActivator_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantActivator_var::operator ::PortableServer::ServantActivator_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_var::operator-> (void) const
+ACE_INLINE PortableServer::AdapterActivator_ptr
+tao_PortableServer_AdapterActivator_duplicate (
+    PortableServer::AdapterActivator_ptr p
+  )
 {
-  return this->ptr_;
+  return PortableServer::AdapterActivator::_duplicate (p);
 }
 
-ACE_INLINE ::PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_var::in (void) const
+ACE_INLINE void
+tao_PortableServer_AdapterActivator_release (
+    PortableServer::AdapterActivator_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::PortableServer::ServantActivator_ptr &
-PortableServer::ServantActivator_var::inout (void)
+ACE_INLINE PortableServer::AdapterActivator_ptr
+tao_PortableServer_AdapterActivator_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableServer::AdapterActivator::_nil ();
 }
 
-ACE_INLINE ::PortableServer::ServantActivator_ptr &
-PortableServer::ServantActivator_var::out (void)
+ACE_INLINE PortableServer::AdapterActivator_ptr
+tao_PortableServer_AdapterActivator_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ServantActivator::_nil ();
-  return this->ptr_;
+  return PortableServer::AdapterActivator::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_PortableServer_AdapterActivator_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::PortableServer::ServantActivator_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::ServantActivator::_nil ();
-  return val;
+  PortableServer::AdapterActivator **tmp =
+    ACE_static_cast (PortableServer::AdapterActivator **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___OUT_CI_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantActivator_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantActivator_out::ServantActivator_out (ServantActivator_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::ServantActivator::_nil ();
-}
+#if !defined (_PORTABLESERVER_SERVANTMANAGER___CI_)
+#define _PORTABLESERVER_SERVANTMANAGER___CI_
 
-ACE_INLINE
-PortableServer::ServantActivator_out::ServantActivator_out (ServantActivator_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ServantActivator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantActivator_out::ServantActivator_out (const ::PortableServer::ServantActivator_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServantActivator_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableServer::ServantActivator_out &
-PortableServer::ServantActivator_out::operator= (const ::PortableServer::ServantActivator_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServantActivator_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantActivator_out &
-PortableServer::ServantActivator_out::operator= (const ::PortableServer::ServantActivator_var &p)
+ACE_INLINE PortableServer::ServantManager_ptr
+tao_PortableServer_ServantManager_duplicate (
+    PortableServer::ServantManager_ptr p
+  )
 {
-  this->ptr_ = ::PortableServer::ServantActivator::_duplicate (p.ptr ());
-  return *this;
+  return PortableServer::ServantManager::_duplicate (p);
 }
 
-ACE_INLINE PortableServer::ServantActivator_out &
-PortableServer::ServantActivator_out::operator= (ServantActivator_ptr p)
+ACE_INLINE void
+tao_PortableServer_ServantManager_release (
+    PortableServer::ServantManager_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-PortableServer::ServantActivator_out::operator ::PortableServer::ServantActivator_ptr &() // cast
+ACE_INLINE PortableServer::ServantManager_ptr
+tao_PortableServer_ServantManager_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableServer::ServantManager::_nil ();
 }
 
-ACE_INLINE ::PortableServer::ServantActivator_ptr &
-PortableServer::ServantActivator_out::ptr (void) // ptr
+ACE_INLINE PortableServer::ServantManager_ptr
+tao_PortableServer_ServantManager_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return PortableServer::ServantManager::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_PortableServer_ServantManager_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  PortableServer::ServantManager **tmp =
+    ACE_static_cast (PortableServer::ServantManager **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___VAR_CI_)
-#define _PORTABLESERVER_SERVANTLOCATOR___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantLocator_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantLocator_var::ServantLocator_var (void) // default constructor
-  : ptr_ (ServantLocator::_nil ())
-{}
-
-ACE_INLINE ::PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantLocator_var::ServantLocator_var (const ::PortableServer::ServantLocator_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ServantLocator::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::ServantLocator_var::~ServantLocator_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::ServantLocator_var &
-PortableServer::ServantLocator_var::operator= (ServantLocator_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::ServantLocator_var &
-PortableServer::ServantLocator_var::operator= (const ::PortableServer::ServantLocator_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::ServantLocator::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-PortableServer::ServantLocator_var::operator const ::PortableServer::ServantLocator_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::ServantLocator_var::operator ::PortableServer::ServantLocator_ptr &() // cast
-{
-  return this->ptr_;
-}
+#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___CI_)
+#define _PORTABLESERVER_SERVANTACTIVATOR___CI_
 
-ACE_INLINE ::PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_var::operator-> (void) const
+ACE_INLINE PortableServer::ServantActivator_ptr
+tao_PortableServer_ServantActivator_duplicate (
+    PortableServer::ServantActivator_ptr p
+  )
 {
-  return this->ptr_;
+  return PortableServer::ServantActivator::_duplicate (p);
 }
 
-ACE_INLINE ::PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_var::in (void) const
+ACE_INLINE void
+tao_PortableServer_ServantActivator_release (
+    PortableServer::ServantActivator_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::PortableServer::ServantLocator_ptr &
-PortableServer::ServantLocator_var::inout (void)
+ACE_INLINE PortableServer::ServantActivator_ptr
+tao_PortableServer_ServantActivator_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableServer::ServantActivator::_nil ();
 }
 
-ACE_INLINE ::PortableServer::ServantLocator_ptr &
-PortableServer::ServantLocator_var::out (void)
+ACE_INLINE PortableServer::ServantActivator_ptr
+tao_PortableServer_ServantActivator_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ServantLocator::_nil ();
-  return this->ptr_;
+  return PortableServer::ServantActivator::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_PortableServer_ServantActivator_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::PortableServer::ServantLocator_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::ServantLocator::_nil ();
-  return val;
+  PortableServer::ServantActivator **tmp =
+    ACE_static_cast (PortableServer::ServantActivator **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___OUT_CI_)
-#define _PORTABLESERVER_SERVANTLOCATOR___OUT_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::ServantLocator_out
-// *************************************************************
-
-ACE_INLINE
-PortableServer::ServantLocator_out::ServantLocator_out (ServantLocator_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::ServantLocator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantLocator_out::ServantLocator_out (ServantLocator_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::ServantLocator::_nil ();
-}
-
-ACE_INLINE
-PortableServer::ServantLocator_out::ServantLocator_out (const ::PortableServer::ServantLocator_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServantLocator_out &, p).ptr_)
-{}
-
-ACE_INLINE ::PortableServer::ServantLocator_out &
-PortableServer::ServantLocator_out::operator= (const ::PortableServer::ServantLocator_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServantLocator_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_PORTABLESERVER_SERVANTLOCATOR___CI_)
+#define _PORTABLESERVER_SERVANTLOCATOR___CI_
 
-ACE_INLINE PortableServer::ServantLocator_out &
-PortableServer::ServantLocator_out::operator= (const ::PortableServer::ServantLocator_var &p)
+ACE_INLINE PortableServer::ServantLocator_ptr
+tao_PortableServer_ServantLocator_duplicate (
+    PortableServer::ServantLocator_ptr p
+  )
 {
-  this->ptr_ = ::PortableServer::ServantLocator::_duplicate (p.ptr ());
-  return *this;
+  return PortableServer::ServantLocator::_duplicate (p);
 }
 
-ACE_INLINE PortableServer::ServantLocator_out &
-PortableServer::ServantLocator_out::operator= (ServantLocator_ptr p)
+ACE_INLINE void
+tao_PortableServer_ServantLocator_release (
+    PortableServer::ServantLocator_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-PortableServer::ServantLocator_out::operator ::PortableServer::ServantLocator_ptr &() // cast
+ACE_INLINE PortableServer::ServantLocator_ptr
+tao_PortableServer_ServantLocator_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableServer::ServantLocator::_nil ();
 }
 
-ACE_INLINE ::PortableServer::ServantLocator_ptr &
-PortableServer::ServantLocator_out::ptr (void) // ptr
+ACE_INLINE PortableServer::ServantLocator_ptr
+tao_PortableServer_ServantLocator_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return PortableServer::ServantLocator::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_PortableServer_ServantLocator_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  PortableServer::ServantLocator **tmp =
+    ACE_static_cast (PortableServer::ServantLocator **, src);
+  return *tmp;
 }
 
 
@@ -2866,190 +1283,110 @@ PortableServer::ServantLocator_out::operator-> (void)
 // Inline operations for exception PortableServer::POA::WrongPolicy
 // *************************************************************
 
-// *************************************************************
-// Inline operations for exception PortableServer::Current::NoContext
-// *************************************************************
-
-
-#if !defined (_PORTABLESERVER_CURRENT___VAR_CI_)
-#define _PORTABLESERVER_CURRENT___VAR_CI_
-
-// *************************************************************
-// Inline operations for class PortableServer::Current_var
-// *************************************************************
-
-ACE_INLINE
-PortableServer::Current_var::Current_var (void) // default constructor
-  : ptr_ (Current::_nil ())
-{}
-
-ACE_INLINE ::PortableServer::Current_ptr
-PortableServer::Current_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-PortableServer::Current_var::Current_var (const ::PortableServer::Current_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (Current::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-PortableServer::Current_var::~Current_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE PortableServer::Current_var &
-PortableServer::Current_var::operator= (Current_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE PortableServer::Current_var &
-PortableServer::Current_var::operator= (const ::PortableServer::Current_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::PortableServer::Current::_duplicate (p.ptr ());
-  }
-  return *this;
-}
 
-ACE_INLINE
-PortableServer::Current_var::operator const ::PortableServer::Current_ptr &() const // cast
-{
-  return this->ptr_;
-}
+#if !defined (_PORTABLESERVER_POA___CI_)
+#define _PORTABLESERVER_POA___CI_
 
-ACE_INLINE
-PortableServer::Current_var::operator ::PortableServer::Current_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::PortableServer::Current_ptr
-PortableServer::Current_var::operator-> (void) const
+ACE_INLINE PortableServer::POA_ptr
+tao_PortableServer_POA_duplicate (
+    PortableServer::POA_ptr p
+  )
 {
-  return this->ptr_;
+  return PortableServer::POA::_duplicate (p);
 }
 
-ACE_INLINE ::PortableServer::Current_ptr
-PortableServer::Current_var::in (void) const
+ACE_INLINE void
+tao_PortableServer_POA_release (
+    PortableServer::POA_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::PortableServer::Current_ptr &
-PortableServer::Current_var::inout (void)
+ACE_INLINE PortableServer::POA_ptr
+tao_PortableServer_POA_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableServer::POA::_nil ();
 }
 
-ACE_INLINE ::PortableServer::Current_ptr &
-PortableServer::Current_var::out (void)
+ACE_INLINE PortableServer::POA_ptr
+tao_PortableServer_POA_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::Current::_nil ();
-  return this->ptr_;
+  return PortableServer::POA::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableServer::Current_ptr
-PortableServer::Current_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_PortableServer_POA_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::PortableServer::Current_ptr val = this->ptr_;
-  this->ptr_ = ::PortableServer::Current::_nil ();
-  return val;
+  PortableServer::POA **tmp =
+    ACE_static_cast (PortableServer::POA **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
-
-#if !defined (_PORTABLESERVER_CURRENT___OUT_CI_)
-#define _PORTABLESERVER_CURRENT___OUT_CI_
-
 // *************************************************************
-// Inline operations for class PortableServer::Current_out
+// Inline operations for exception PortableServer::Current::NoContext
 // *************************************************************
 
-ACE_INLINE
-PortableServer::Current_out::Current_out (Current_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::PortableServer::Current::_nil ();
-}
-
-ACE_INLINE
-PortableServer::Current_out::Current_out (Current_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::PortableServer::Current::_nil ();
-}
-
-ACE_INLINE
-PortableServer::Current_out::Current_out (const ::PortableServer::Current_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
-{}
 
-ACE_INLINE ::PortableServer::Current_out &
-PortableServer::Current_out::operator= (const ::PortableServer::Current_out &p)
-{
-  this->ptr_ = ACE_const_cast (Current_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_PORTABLESERVER_CURRENT___CI_)
+#define _PORTABLESERVER_CURRENT___CI_
 
-ACE_INLINE PortableServer::Current_out &
-PortableServer::Current_out::operator= (const ::PortableServer::Current_var &p)
+ACE_INLINE PortableServer::Current_ptr
+tao_PortableServer_Current_duplicate (
+    PortableServer::Current_ptr p
+  )
 {
-  this->ptr_ = ::PortableServer::Current::_duplicate (p.ptr ());
-  return *this;
+  return PortableServer::Current::_duplicate (p);
 }
 
-ACE_INLINE PortableServer::Current_out &
-PortableServer::Current_out::operator= (Current_ptr p)
+ACE_INLINE void
+tao_PortableServer_Current_release (
+    PortableServer::Current_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-PortableServer::Current_out::operator ::PortableServer::Current_ptr &() // cast
+ACE_INLINE PortableServer::Current_ptr
+tao_PortableServer_Current_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return PortableServer::Current::_nil ();
 }
 
-ACE_INLINE ::PortableServer::Current_ptr &
-PortableServer::Current_out::ptr (void) // ptr
+ACE_INLINE PortableServer::Current_ptr
+tao_PortableServer_Current_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return PortableServer::Current::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::PortableServer::Current_ptr
-PortableServer::Current_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_PortableServer_Current_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  PortableServer::Current **tmp =
+    ACE_static_cast (PortableServer::Current **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::POA_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::POA_ptr &
-  );
 
 #if !defined _TAO_CDR_OP_PortableServer_ObjectId_I_
 #define _TAO_CDR_OP_PortableServer_ObjectId_I_
@@ -3095,151 +1432,145 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,PortableServer::Forward
     return 0;
 }
 
-#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-
-ACE_INLINE
-ostream & operator<< (ostream &os, const PortableServer::ForwardRequest &_tao_aggregate)
-{
-  CORBA::TypeCode_ptr tc = _tao_aggregate._type ();
-  if (tc)
-    {
-      os << tc->name () << " (";
-    }
-  os << _tao_aggregate._id ();
-  if (tc)
-    {
-      os << ")";
-    }
-  return os;
-}
-
-#endif /* ACE_LACKS_IOSTREAM_TOTALLY */
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ThreadPolicyValue &_tao_enumval)
 {
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ThreadPolicyValue &_tao_enumval)
 {
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  
+  if (_tao_result == 1)
+    {
+      _tao_enumval = ACE_static_cast (PortableServer::ThreadPolicyValue, _tao_temp);
+    }
+  
+  return _tao_result;
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval)
 {
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::LifespanPolicyValue &_tao_enumval)
 {
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  
+  if (_tao_result == 1)
+    {
+      _tao_enumval = ACE_static_cast (PortableServer::LifespanPolicyValue, _tao_temp);
+    }
+  
+  return _tao_result;
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdUniquenessPolicyValue &_tao_enumval)
 {
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniquenessPolicyValue &_tao_enumval)
 {
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  
+  if (_tao_result == 1)
+    {
+      _tao_enumval = ACE_static_cast (PortableServer::IdUniquenessPolicyValue, _tao_temp);
+    }
+  
+  return _tao_result;
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdAssignmentPolicyValue &_tao_enumval)
 {
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssignmentPolicyValue &_tao_enumval)
 {
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  
+  if (_tao_result == 1)
+    {
+      _tao_enumval = ACE_static_cast (PortableServer::IdAssignmentPolicyValue, _tao_temp);
+    }
+  
+  return _tao_result;
 }
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
 {
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
 {
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  
+  if (_tao_result == 1)
+    {
+      _tao_enumval = ACE_static_cast (PortableServer::ImplicitActivationPolicyValue, _tao_temp);
+    }
+  
+  return _tao_result;
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ServantRetentionPolicyValue &_tao_enumval)
 {
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ServantRetentionPolicyValue &_tao_enumval)
 {
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  
+  if (_tao_result == 1)
+    {
+      _tao_enumval = ACE_static_cast (PortableServer::ServantRetentionPolicyValue, _tao_temp);
+    }
+  
+  return _tao_result;
 }
 
 ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::RequestProcessingPolicyValue &_tao_enumval)
 {
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessingPolicyValue &_tao_enumval)
 {
-  CORBA::ULong _tao_temp;
-  if (strm.read_ulong (_tao_temp))
-  {
-    ACE_OS::memcpy (&_tao_enumval, &_tao_temp, sizeof (CORBA::ULong));
-    return 1;
-  }
-  else
-    return 0;
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  
+  if (_tao_result == 1)
+    {
+      _tao_enumval = ACE_static_cast (PortableServer::RequestProcessingPolicyValue, _tao_temp);
+    }
+  
+  return _tao_result;
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/RTPortableServerC.cpp b/TAO/tao/PortableServer/RTPortableServerC.cpp
index 45f0aa01810..2690be06d38 100644
--- a/TAO/tao/PortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/PortableServer/RTPortableServerC.cpp
@@ -23,15 +23,202 @@
 
 #if (TAO_HAS_RT_CORBA == 1)
 
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus
+#endif /* __BORLANDC__ */
+
 #if !defined (__ACE_INLINE__)
 #include "RTPortableServerC.i"
 #endif /* !defined INLINE */
 
+// *************************************************************
+// Operations for class RTPortableServer::POA_var
+// *************************************************************
 
-// default constructor
-RTPortableServer::POA::POA (void)
+RTPortableServer::POA_var::POA_var (void) // default constructor
+  : ptr_ (POA::_nil ())
+{}
+
+::RTPortableServer::POA_ptr
+RTPortableServer::POA_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+RTPortableServer::POA_var::POA_var (const ::RTPortableServer::POA_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (POA::_duplicate (p.ptr ()))
+{}
+
+RTPortableServer::POA_var::~POA_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+RTPortableServer::POA_var &
+RTPortableServer::POA_var::operator= (POA_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+RTPortableServer::POA_var &
+RTPortableServer::POA_var::operator= (const ::RTPortableServer::POA_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::RTPortableServer::POA::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+RTPortableServer::POA_var::operator const ::RTPortableServer::POA_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+RTPortableServer::POA_var::operator ::RTPortableServer::POA_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::RTPortableServer::POA_ptr
+RTPortableServer::POA_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::RTPortableServer::POA_ptr
+RTPortableServer::POA_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::RTPortableServer::POA_ptr &
+RTPortableServer::POA_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::RTPortableServer::POA_ptr &
+RTPortableServer::POA_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTPortableServer::POA::_nil ();
+  return this->ptr_;
+}
+
+::RTPortableServer::POA_ptr
+RTPortableServer::POA_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::RTPortableServer::POA_ptr val = this->ptr_;
+  this->ptr_ = ::RTPortableServer::POA::_nil ();
+  return val;
+}
+
+::RTPortableServer::POA_ptr
+RTPortableServer::POA_var::duplicate (POA_ptr p)
+{
+  return ::RTPortableServer::POA::_duplicate (p);
+}
+
+void
+RTPortableServer::POA_var::release (POA_ptr p)
+{
+  CORBA::release (p);
+}
+
+::RTPortableServer::POA_ptr
+RTPortableServer::POA_var::nil (void)
+{
+  return ::RTPortableServer::POA::_nil ();
+}
+
+::RTPortableServer::POA_ptr
+RTPortableServer::POA_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::RTPortableServer::POA::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+RTPortableServer::POA_var::upcast (void *src)
+{
+  POA **tmp =
+    ACE_static_cast (POA **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class RTPortableServer::POA_out
+// *************************************************************
+
+RTPortableServer::POA_out::POA_out (POA_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::RTPortableServer::POA::_nil ();
+}
+
+RTPortableServer::POA_out::POA_out (POA_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTPortableServer::POA::_nil ();
+}
+
+RTPortableServer::POA_out::POA_out (const ::RTPortableServer::POA_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (POA_out &, p).ptr_)
 {}
 
+::RTPortableServer::POA_out &
+RTPortableServer::POA_out::operator= (const ::RTPortableServer::POA_out &p)
+{
+  this->ptr_ = ACE_const_cast (POA_out&, p).ptr_;
+  return *this;
+}
+
+RTPortableServer::POA_out &
+RTPortableServer::POA_out::operator= (const ::RTPortableServer::POA_var &p)
+{
+  this->ptr_ = ::RTPortableServer::POA::_duplicate (p.ptr ());
+  return *this;
+}
+
+RTPortableServer::POA_out &
+RTPortableServer::POA_out::operator= (POA_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+RTPortableServer::POA_out::operator ::RTPortableServer::POA_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::RTPortableServer::POA_ptr &
+RTPortableServer::POA_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::RTPortableServer::POA_ptr
+RTPortableServer::POA_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+RTPortableServer::POA::POA ()
+{
+  }
+
 // destructor
 RTPortableServer::POA::~POA (void)
 {}
@@ -96,7 +283,7 @@ void *RTPortableServer::POA::_tao_QueryInterface (ptr_arith_t type)
   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
     retv = ACE_reinterpret_cast (void *,
       ACE_static_cast (CORBA::Object_ptr, this));
-
+    
   if (retv)
     this->_add_ref ();
   return retv;
diff --git a/TAO/tao/PortableServer/RTPortableServerC.h b/TAO/tao/PortableServer/RTPortableServerC.h
index dac9e25c7b3..1a87e2ed792 100644
--- a/TAO/tao/PortableServer/RTPortableServerC.h
+++ b/TAO/tao/PortableServer/RTPortableServerC.h
@@ -19,8 +19,8 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef _TAO_IDL_RTPORTABLESERVERC_H_
-#define _TAO_IDL_RTPORTABLESERVERC_H_
+#ifndef _TAO_IDL_ORIG_RTPORTABLESERVERC_H_
+#define _TAO_IDL_ORIG_RTPORTABLESERVERC_H_
 
 #include "ace/pre.h"
 #include "PortableServerC.h"
@@ -52,6 +52,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
 TAO_NAMESPACE  RTPortableServer
 {
 
@@ -60,7 +64,7 @@ TAO_NAMESPACE  RTPortableServer
 
   class POA;
   typedef POA *POA_ptr;
-
+  
 #endif /* end #if !defined */
 
 
@@ -71,23 +75,31 @@ TAO_NAMESPACE  RTPortableServer
   {
   public:
     POA_var (void); // default constructor
-    POA_var (POA_ptr p) : ptr_ (p) {}
+    POA_var (POA_ptr p) : ptr_ (p) {} 
     POA_var (const POA_var &); // copy constructor
     ~POA_var (void); // destructor
-
+    
     POA_var &operator= (POA_ptr);
     POA_var &operator= (const POA_var &);
     POA_ptr operator-> (void) const;
-
+    
     operator const POA_ptr &() const;
     operator POA_ptr &();
-    // in, inout, out, _retn
+    // in, inout, out, _retn 
     POA_ptr in (void) const;
     POA_ptr &inout (void);
     POA_ptr &out (void);
     POA_ptr _retn (void);
     POA_ptr ptr (void) const;
-
+    
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static POA_ptr duplicate (POA_ptr);
+    static void release (POA_ptr);
+    static POA_ptr nil (void);
+    static POA_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     POA_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -114,7 +126,7 @@ TAO_NAMESPACE  RTPortableServer
     operator POA_ptr &();
     POA_ptr &ptr (void);
     POA_ptr operator-> (void);
-
+  
   private:
     POA_ptr &ptr_;
   };
@@ -126,7 +138,7 @@ TAO_NAMESPACE  RTPortableServer
 #if !defined (_RTPORTABLESERVER_POA_CH_)
 #define _RTPORTABLESERVER_POA_CH_
 
-class TAO_PortableServer_Export POA: public PortableServer::POA
+class TAO_PortableServer_Export POA: public virtual PortableServer::POA
   {
   public:
   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -138,12 +150,12 @@ class TAO_PortableServer_Export POA: public PortableServer::POA
     static POA_ptr _duplicate (POA_ptr obj);
     static POA_ptr _narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
     static POA_ptr _unchecked_narrow (
         CORBA::Object_ptr obj,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       );
     static POA_ptr _nil (void)
@@ -154,7 +166,7 @@ class TAO_PortableServer_Export POA: public PortableServer::POA
     virtual CORBA::Object_ptr create_reference_with_priority (
         const char * intf,
         RTCORBA::Priority priority,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -166,7 +178,7 @@ class TAO_PortableServer_Export POA: public PortableServer::POA
         const PortableServer::ObjectId & oid,
         const char * intf,
         RTCORBA::Priority priority,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -177,7 +189,7 @@ class TAO_PortableServer_Export POA: public PortableServer::POA
     virtual PortableServer::ObjectId * activate_object_with_priority (
         PortableServer::Servant p_servant,
         RTCORBA::Priority priority,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -190,7 +202,7 @@ class TAO_PortableServer_Export POA: public PortableServer::POA
         const PortableServer::ObjectId & oid,
         PortableServer::Servant p_servant,
         RTCORBA::Priority priority,
-        CORBA::Environment &ACE_TRY_ENV =
+        CORBA::Environment &ACE_TRY_ENV = 
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -201,11 +213,12 @@ class TAO_PortableServer_Export POA: public PortableServer::POA
       )) = 0;
 
     virtual void *_tao_QueryInterface (ptr_arith_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
 
   protected:
-    POA (void);
+    POA ();
+    
     virtual ~POA (void);
   private:
     POA (const POA &);
@@ -234,6 +247,10 @@ TAO_NAMESPACE_CLOSE // module RTPortableServer
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #endif /* TAO_HAS_RT_CORBA */
 
 #include "ace/post.h"
diff --git a/TAO/tao/PortableServer/RTPortableServerC.i b/TAO/tao/PortableServer/RTPortableServerC.i
index c649fb42cf0..675f6f14a80 100644
--- a/TAO/tao/PortableServer/RTPortableServerC.i
+++ b/TAO/tao/PortableServer/RTPortableServerC.i
@@ -20,170 +20,50 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-#if !defined (_RTPORTABLESERVER_POA___VAR_CI_)
-#define _RTPORTABLESERVER_POA___VAR_CI_
+#if !defined (_RTPORTABLESERVER_POA___CI_)
+#define _RTPORTABLESERVER_POA___CI_
 
-// *************************************************************
-// Inline operations for class RTPortableServer::POA_var
-// *************************************************************
-
-ACE_INLINE
-RTPortableServer::POA_var::POA_var (void) // default constructor
-  : ptr_ (POA::_nil ())
-{}
-
-ACE_INLINE ::RTPortableServer::POA_ptr
-RTPortableServer::POA_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTPortableServer::POA_var::POA_var (const ::RTPortableServer::POA_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (POA::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RTPortableServer::POA_var::~POA_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RTPortableServer::POA_var &
-RTPortableServer::POA_var::operator= (POA_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RTPortableServer::POA_var &
-RTPortableServer::POA_var::operator= (const ::RTPortableServer::POA_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTPortableServer::POA::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-RTPortableServer::POA_var::operator const ::RTPortableServer::POA_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-RTPortableServer::POA_var::operator ::RTPortableServer::POA_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTPortableServer::POA_ptr
-RTPortableServer::POA_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTPortableServer::POA_ptr
-RTPortableServer::POA_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTPortableServer::POA_ptr &
-RTPortableServer::POA_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTPortableServer::POA_ptr &
-RTPortableServer::POA_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTPortableServer::POA::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTPortableServer::POA_ptr
-RTPortableServer::POA_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTPortableServer::POA_ptr val = this->ptr_;
-  this->ptr_ = ::RTPortableServer::POA::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTPORTABLESERVER_POA___OUT_CI_)
-#define _RTPORTABLESERVER_POA___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RTPortableServer::POA_out
-// *************************************************************
-
-ACE_INLINE
-RTPortableServer::POA_out::POA_out (POA_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTPortableServer::POA::_nil ();
-}
-
-ACE_INLINE
-RTPortableServer::POA_out::POA_out (POA_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTPortableServer::POA::_nil ();
-}
-
-ACE_INLINE
-RTPortableServer::POA_out::POA_out (const ::RTPortableServer::POA_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (POA_out &, p).ptr_)
-{}
-
-ACE_INLINE ::RTPortableServer::POA_out &
-RTPortableServer::POA_out::operator= (const ::RTPortableServer::POA_out &p)
-{
-  this->ptr_ = ACE_const_cast (POA_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE RTPortableServer::POA_out &
-RTPortableServer::POA_out::operator= (const ::RTPortableServer::POA_var &p)
+ACE_INLINE RTPortableServer::POA_ptr
+tao_RTPortableServer_POA_duplicate (
+    RTPortableServer::POA_ptr p
+  )
 {
-  this->ptr_ = ::RTPortableServer::POA::_duplicate (p.ptr ());
-  return *this;
+  return RTPortableServer::POA::_duplicate (p);
 }
 
-ACE_INLINE RTPortableServer::POA_out &
-RTPortableServer::POA_out::operator= (POA_ptr p)
+ACE_INLINE void
+tao_RTPortableServer_POA_release (
+    RTPortableServer::POA_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE 
-RTPortableServer::POA_out::operator ::RTPortableServer::POA_ptr &() // cast
+ACE_INLINE RTPortableServer::POA_ptr
+tao_RTPortableServer_POA_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return RTPortableServer::POA::_nil ();
 }
 
-ACE_INLINE ::RTPortableServer::POA_ptr &
-RTPortableServer::POA_out::ptr (void) // ptr
+ACE_INLINE RTPortableServer::POA_ptr
+tao_RTPortableServer_POA_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return RTPortableServer::POA::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::RTPortableServer::POA_ptr
-RTPortableServer::POA_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_RTPortableServer_POA_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  RTPortableServer::POA **tmp =
+    ACE_static_cast (RTPortableServer::POA **, src);
+  return *tmp;
 }
 
 
diff --git a/TAO/tao/RTCORBAC.cpp b/TAO/tao/RTCORBAC.cpp
index 45feb88064a..144660881da 100644
--- a/TAO/tao/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBAC.cpp
@@ -481,6 +481,188 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PriorityModel, &_tc_TAO_tc_RTCORB
 TAO_NAMESPACE_END
 
 
+// *************************************************************
+// Operations for class RTCORBA::PriorityModelPolicy_var
+// *************************************************************
+
+RTCORBA::PriorityModelPolicy_var::PriorityModelPolicy_var (void) // default constructor
+  : ptr_ (PriorityModelPolicy::_nil ())
+{}
+
+::RTCORBA::PriorityModelPolicy_ptr
+RTCORBA::PriorityModelPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+RTCORBA::PriorityModelPolicy_var::PriorityModelPolicy_var (const ::RTCORBA::PriorityModelPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (PriorityModelPolicy::_duplicate (p.ptr ()))
+{}
+
+RTCORBA::PriorityModelPolicy_var::~PriorityModelPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+RTCORBA::PriorityModelPolicy_var &
+RTCORBA::PriorityModelPolicy_var::operator= (PriorityModelPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::PriorityModelPolicy_var &
+RTCORBA::PriorityModelPolicy_var::operator= (const ::RTCORBA::PriorityModelPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::RTCORBA::PriorityModelPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+RTCORBA::PriorityModelPolicy_var::operator const ::RTCORBA::PriorityModelPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+RTCORBA::PriorityModelPolicy_var::operator ::RTCORBA::PriorityModelPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PriorityModelPolicy_ptr
+RTCORBA::PriorityModelPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PriorityModelPolicy_ptr
+RTCORBA::PriorityModelPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PriorityModelPolicy_ptr &
+RTCORBA::PriorityModelPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PriorityModelPolicy_ptr &
+RTCORBA::PriorityModelPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::PriorityModelPolicy::_nil ();
+  return this->ptr_;
+}
+
+::RTCORBA::PriorityModelPolicy_ptr
+RTCORBA::PriorityModelPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::RTCORBA::PriorityModelPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::PriorityModelPolicy::_nil ();
+  return val;
+}
+
+::RTCORBA::PriorityModelPolicy_ptr
+RTCORBA::PriorityModelPolicy_var::duplicate (PriorityModelPolicy_ptr p)
+{
+  return ::RTCORBA::PriorityModelPolicy::_duplicate (p);
+}
+
+void
+RTCORBA::PriorityModelPolicy_var::release (PriorityModelPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::RTCORBA::PriorityModelPolicy_ptr
+RTCORBA::PriorityModelPolicy_var::nil (void)
+{
+  return ::RTCORBA::PriorityModelPolicy::_nil ();
+}
+
+::RTCORBA::PriorityModelPolicy_ptr
+RTCORBA::PriorityModelPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::RTCORBA::PriorityModelPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+RTCORBA::PriorityModelPolicy_var::upcast (void *src)
+{
+  PriorityModelPolicy **tmp =
+    ACE_static_cast (PriorityModelPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class RTCORBA::PriorityModelPolicy_out
+// *************************************************************
+
+RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (PriorityModelPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::RTCORBA::PriorityModelPolicy::_nil ();
+}
+
+RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (PriorityModelPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::PriorityModelPolicy::_nil ();
+}
+
+RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (const ::RTCORBA::PriorityModelPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (PriorityModelPolicy_out &, p).ptr_)
+{}
+
+::RTCORBA::PriorityModelPolicy_out &
+RTCORBA::PriorityModelPolicy_out::operator= (const ::RTCORBA::PriorityModelPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (PriorityModelPolicy_out&, p).ptr_;
+  return *this;
+}
+
+RTCORBA::PriorityModelPolicy_out &
+RTCORBA::PriorityModelPolicy_out::operator= (const ::RTCORBA::PriorityModelPolicy_var &p)
+{
+  this->ptr_ = ::RTCORBA::PriorityModelPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+RTCORBA::PriorityModelPolicy_out &
+RTCORBA::PriorityModelPolicy_out::operator= (PriorityModelPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::PriorityModelPolicy_out::operator ::RTCORBA::PriorityModelPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PriorityModelPolicy_ptr &
+RTCORBA::PriorityModelPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PriorityModelPolicy_ptr
+RTCORBA::PriorityModelPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 RTCORBA::PriorityModelPolicy::PriorityModelPolicy ()
 {
@@ -566,6 +748,188 @@ TAO_NAMESPACE_BEGIN (RTCORBA)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREADPOOL_POLICY_TYPE, 41U)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class RTCORBA::ThreadpoolPolicy_var
+// *************************************************************
+
+RTCORBA::ThreadpoolPolicy_var::ThreadpoolPolicy_var (void) // default constructor
+  : ptr_ (ThreadpoolPolicy::_nil ())
+{}
+
+::RTCORBA::ThreadpoolPolicy_ptr
+RTCORBA::ThreadpoolPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+RTCORBA::ThreadpoolPolicy_var::ThreadpoolPolicy_var (const ::RTCORBA::ThreadpoolPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ThreadpoolPolicy::_duplicate (p.ptr ()))
+{}
+
+RTCORBA::ThreadpoolPolicy_var::~ThreadpoolPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+RTCORBA::ThreadpoolPolicy_var &
+RTCORBA::ThreadpoolPolicy_var::operator= (ThreadpoolPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::ThreadpoolPolicy_var &
+RTCORBA::ThreadpoolPolicy_var::operator= (const ::RTCORBA::ThreadpoolPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+RTCORBA::ThreadpoolPolicy_var::operator const ::RTCORBA::ThreadpoolPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+RTCORBA::ThreadpoolPolicy_var::operator ::RTCORBA::ThreadpoolPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ThreadpoolPolicy_ptr
+RTCORBA::ThreadpoolPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ThreadpoolPolicy_ptr
+RTCORBA::ThreadpoolPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ThreadpoolPolicy_ptr &
+RTCORBA::ThreadpoolPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ThreadpoolPolicy_ptr &
+RTCORBA::ThreadpoolPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_nil ();
+  return this->ptr_;
+}
+
+::RTCORBA::ThreadpoolPolicy_ptr
+RTCORBA::ThreadpoolPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::RTCORBA::ThreadpoolPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_nil ();
+  return val;
+}
+
+::RTCORBA::ThreadpoolPolicy_ptr
+RTCORBA::ThreadpoolPolicy_var::duplicate (ThreadpoolPolicy_ptr p)
+{
+  return ::RTCORBA::ThreadpoolPolicy::_duplicate (p);
+}
+
+void
+RTCORBA::ThreadpoolPolicy_var::release (ThreadpoolPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::RTCORBA::ThreadpoolPolicy_ptr
+RTCORBA::ThreadpoolPolicy_var::nil (void)
+{
+  return ::RTCORBA::ThreadpoolPolicy::_nil ();
+}
+
+::RTCORBA::ThreadpoolPolicy_ptr
+RTCORBA::ThreadpoolPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::RTCORBA::ThreadpoolPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+RTCORBA::ThreadpoolPolicy_var::upcast (void *src)
+{
+  ThreadpoolPolicy **tmp =
+    ACE_static_cast (ThreadpoolPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class RTCORBA::ThreadpoolPolicy_out
+// *************************************************************
+
+RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (ThreadpoolPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_nil ();
+}
+
+RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (ThreadpoolPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_nil ();
+}
+
+RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (const ::RTCORBA::ThreadpoolPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ThreadpoolPolicy_out &, p).ptr_)
+{}
+
+::RTCORBA::ThreadpoolPolicy_out &
+RTCORBA::ThreadpoolPolicy_out::operator= (const ::RTCORBA::ThreadpoolPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (ThreadpoolPolicy_out&, p).ptr_;
+  return *this;
+}
+
+RTCORBA::ThreadpoolPolicy_out &
+RTCORBA::ThreadpoolPolicy_out::operator= (const ::RTCORBA::ThreadpoolPolicy_var &p)
+{
+  this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+RTCORBA::ThreadpoolPolicy_out &
+RTCORBA::ThreadpoolPolicy_out::operator= (ThreadpoolPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::ThreadpoolPolicy_out::operator ::RTCORBA::ThreadpoolPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ThreadpoolPolicy_ptr &
+RTCORBA::ThreadpoolPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ThreadpoolPolicy_ptr
+RTCORBA::ThreadpoolPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy ()
 {
@@ -647,6 +1011,188 @@ const char* RTCORBA::ThreadpoolPolicy::_interface_repository_id (void) const
 }
 
 
+// *************************************************************
+// Operations for class RTCORBA::ProtocolProperties_var
+// *************************************************************
+
+RTCORBA::ProtocolProperties_var::ProtocolProperties_var (void) // default constructor
+  : ptr_ (ProtocolProperties::_nil ())
+{}
+
+::RTCORBA::ProtocolProperties_ptr
+RTCORBA::ProtocolProperties_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+RTCORBA::ProtocolProperties_var::ProtocolProperties_var (const ::RTCORBA::ProtocolProperties_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ProtocolProperties::_duplicate (p.ptr ()))
+{}
+
+RTCORBA::ProtocolProperties_var::~ProtocolProperties_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+RTCORBA::ProtocolProperties_var &
+RTCORBA::ProtocolProperties_var::operator= (ProtocolProperties_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::ProtocolProperties_var &
+RTCORBA::ProtocolProperties_var::operator= (const ::RTCORBA::ProtocolProperties_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::RTCORBA::ProtocolProperties::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+RTCORBA::ProtocolProperties_var::operator const ::RTCORBA::ProtocolProperties_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+RTCORBA::ProtocolProperties_var::operator ::RTCORBA::ProtocolProperties_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ProtocolProperties_ptr
+RTCORBA::ProtocolProperties_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ProtocolProperties_ptr
+RTCORBA::ProtocolProperties_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ProtocolProperties_ptr &
+RTCORBA::ProtocolProperties_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ProtocolProperties_ptr &
+RTCORBA::ProtocolProperties_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
+  return this->ptr_;
+}
+
+::RTCORBA::ProtocolProperties_ptr
+RTCORBA::ProtocolProperties_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::RTCORBA::ProtocolProperties_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
+  return val;
+}
+
+::RTCORBA::ProtocolProperties_ptr
+RTCORBA::ProtocolProperties_var::duplicate (ProtocolProperties_ptr p)
+{
+  return ::RTCORBA::ProtocolProperties::_duplicate (p);
+}
+
+void
+RTCORBA::ProtocolProperties_var::release (ProtocolProperties_ptr p)
+{
+  CORBA::release (p);
+}
+
+::RTCORBA::ProtocolProperties_ptr
+RTCORBA::ProtocolProperties_var::nil (void)
+{
+  return ::RTCORBA::ProtocolProperties::_nil ();
+}
+
+::RTCORBA::ProtocolProperties_ptr
+RTCORBA::ProtocolProperties_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::RTCORBA::ProtocolProperties::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+RTCORBA::ProtocolProperties_var::upcast (void *src)
+{
+  ProtocolProperties **tmp =
+    ACE_static_cast (ProtocolProperties **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class RTCORBA::ProtocolProperties_out
+// *************************************************************
+
+RTCORBA::ProtocolProperties_out::ProtocolProperties_out (ProtocolProperties_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
+}
+
+RTCORBA::ProtocolProperties_out::ProtocolProperties_out (ProtocolProperties_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
+}
+
+RTCORBA::ProtocolProperties_out::ProtocolProperties_out (const ::RTCORBA::ProtocolProperties_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ProtocolProperties_out &, p).ptr_)
+{}
+
+::RTCORBA::ProtocolProperties_out &
+RTCORBA::ProtocolProperties_out::operator= (const ::RTCORBA::ProtocolProperties_out &p)
+{
+  this->ptr_ = ACE_const_cast (ProtocolProperties_out&, p).ptr_;
+  return *this;
+}
+
+RTCORBA::ProtocolProperties_out &
+RTCORBA::ProtocolProperties_out::operator= (const ::RTCORBA::ProtocolProperties_var &p)
+{
+  this->ptr_ = ::RTCORBA::ProtocolProperties::_duplicate (p.ptr ());
+  return *this;
+}
+
+RTCORBA::ProtocolProperties_out &
+RTCORBA::ProtocolProperties_out::operator= (ProtocolProperties_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::ProtocolProperties_out::operator ::RTCORBA::ProtocolProperties_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ProtocolProperties_ptr &
+RTCORBA::ProtocolProperties_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ProtocolProperties_ptr
+RTCORBA::ProtocolProperties_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 RTCORBA::ProtocolProperties::ProtocolProperties ()
 {
@@ -816,6 +1362,188 @@ TAO_NAMESPACE_BEGIN (RTCORBA)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, SERVER_PROTOCOL_POLICY_TYPE, 42U)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class RTCORBA::ServerProtocolPolicy_var
+// *************************************************************
+
+RTCORBA::ServerProtocolPolicy_var::ServerProtocolPolicy_var (void) // default constructor
+  : ptr_ (ServerProtocolPolicy::_nil ())
+{}
+
+::RTCORBA::ServerProtocolPolicy_ptr
+RTCORBA::ServerProtocolPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+RTCORBA::ServerProtocolPolicy_var::ServerProtocolPolicy_var (const ::RTCORBA::ServerProtocolPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ServerProtocolPolicy::_duplicate (p.ptr ()))
+{}
+
+RTCORBA::ServerProtocolPolicy_var::~ServerProtocolPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+RTCORBA::ServerProtocolPolicy_var &
+RTCORBA::ServerProtocolPolicy_var::operator= (ServerProtocolPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::ServerProtocolPolicy_var &
+RTCORBA::ServerProtocolPolicy_var::operator= (const ::RTCORBA::ServerProtocolPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+RTCORBA::ServerProtocolPolicy_var::operator const ::RTCORBA::ServerProtocolPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+RTCORBA::ServerProtocolPolicy_var::operator ::RTCORBA::ServerProtocolPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ServerProtocolPolicy_ptr
+RTCORBA::ServerProtocolPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ServerProtocolPolicy_ptr
+RTCORBA::ServerProtocolPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ServerProtocolPolicy_ptr &
+RTCORBA::ServerProtocolPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ServerProtocolPolicy_ptr &
+RTCORBA::ServerProtocolPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
+  return this->ptr_;
+}
+
+::RTCORBA::ServerProtocolPolicy_ptr
+RTCORBA::ServerProtocolPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::RTCORBA::ServerProtocolPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
+  return val;
+}
+
+::RTCORBA::ServerProtocolPolicy_ptr
+RTCORBA::ServerProtocolPolicy_var::duplicate (ServerProtocolPolicy_ptr p)
+{
+  return ::RTCORBA::ServerProtocolPolicy::_duplicate (p);
+}
+
+void
+RTCORBA::ServerProtocolPolicy_var::release (ServerProtocolPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::RTCORBA::ServerProtocolPolicy_ptr
+RTCORBA::ServerProtocolPolicy_var::nil (void)
+{
+  return ::RTCORBA::ServerProtocolPolicy::_nil ();
+}
+
+::RTCORBA::ServerProtocolPolicy_ptr
+RTCORBA::ServerProtocolPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::RTCORBA::ServerProtocolPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+RTCORBA::ServerProtocolPolicy_var::upcast (void *src)
+{
+  ServerProtocolPolicy **tmp =
+    ACE_static_cast (ServerProtocolPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class RTCORBA::ServerProtocolPolicy_out
+// *************************************************************
+
+RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (ServerProtocolPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
+}
+
+RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (ServerProtocolPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
+}
+
+RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (const ::RTCORBA::ServerProtocolPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ServerProtocolPolicy_out &, p).ptr_)
+{}
+
+::RTCORBA::ServerProtocolPolicy_out &
+RTCORBA::ServerProtocolPolicy_out::operator= (const ::RTCORBA::ServerProtocolPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (ServerProtocolPolicy_out&, p).ptr_;
+  return *this;
+}
+
+RTCORBA::ServerProtocolPolicy_out &
+RTCORBA::ServerProtocolPolicy_out::operator= (const ::RTCORBA::ServerProtocolPolicy_var &p)
+{
+  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+RTCORBA::ServerProtocolPolicy_out &
+RTCORBA::ServerProtocolPolicy_out::operator= (ServerProtocolPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::ServerProtocolPolicy_out::operator ::RTCORBA::ServerProtocolPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ServerProtocolPolicy_ptr &
+RTCORBA::ServerProtocolPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ServerProtocolPolicy_ptr
+RTCORBA::ServerProtocolPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy ()
 {
@@ -901,6 +1629,188 @@ TAO_NAMESPACE_BEGIN (RTCORBA)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, CLIENT_PROTOCOL_POLICY_TYPE, 43U)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class RTCORBA::ClientProtocolPolicy_var
+// *************************************************************
+
+RTCORBA::ClientProtocolPolicy_var::ClientProtocolPolicy_var (void) // default constructor
+  : ptr_ (ClientProtocolPolicy::_nil ())
+{}
+
+::RTCORBA::ClientProtocolPolicy_ptr
+RTCORBA::ClientProtocolPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+RTCORBA::ClientProtocolPolicy_var::ClientProtocolPolicy_var (const ::RTCORBA::ClientProtocolPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ClientProtocolPolicy::_duplicate (p.ptr ()))
+{}
+
+RTCORBA::ClientProtocolPolicy_var::~ClientProtocolPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+RTCORBA::ClientProtocolPolicy_var &
+RTCORBA::ClientProtocolPolicy_var::operator= (ClientProtocolPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::ClientProtocolPolicy_var &
+RTCORBA::ClientProtocolPolicy_var::operator= (const ::RTCORBA::ClientProtocolPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+RTCORBA::ClientProtocolPolicy_var::operator const ::RTCORBA::ClientProtocolPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+RTCORBA::ClientProtocolPolicy_var::operator ::RTCORBA::ClientProtocolPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ClientProtocolPolicy_ptr
+RTCORBA::ClientProtocolPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ClientProtocolPolicy_ptr
+RTCORBA::ClientProtocolPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ClientProtocolPolicy_ptr &
+RTCORBA::ClientProtocolPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ClientProtocolPolicy_ptr &
+RTCORBA::ClientProtocolPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
+  return this->ptr_;
+}
+
+::RTCORBA::ClientProtocolPolicy_ptr
+RTCORBA::ClientProtocolPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::RTCORBA::ClientProtocolPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
+  return val;
+}
+
+::RTCORBA::ClientProtocolPolicy_ptr
+RTCORBA::ClientProtocolPolicy_var::duplicate (ClientProtocolPolicy_ptr p)
+{
+  return ::RTCORBA::ClientProtocolPolicy::_duplicate (p);
+}
+
+void
+RTCORBA::ClientProtocolPolicy_var::release (ClientProtocolPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::RTCORBA::ClientProtocolPolicy_ptr
+RTCORBA::ClientProtocolPolicy_var::nil (void)
+{
+  return ::RTCORBA::ClientProtocolPolicy::_nil ();
+}
+
+::RTCORBA::ClientProtocolPolicy_ptr
+RTCORBA::ClientProtocolPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::RTCORBA::ClientProtocolPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+RTCORBA::ClientProtocolPolicy_var::upcast (void *src)
+{
+  ClientProtocolPolicy **tmp =
+    ACE_static_cast (ClientProtocolPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class RTCORBA::ClientProtocolPolicy_out
+// *************************************************************
+
+RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (ClientProtocolPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
+}
+
+RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (ClientProtocolPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
+}
+
+RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (const ::RTCORBA::ClientProtocolPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ClientProtocolPolicy_out &, p).ptr_)
+{}
+
+::RTCORBA::ClientProtocolPolicy_out &
+RTCORBA::ClientProtocolPolicy_out::operator= (const ::RTCORBA::ClientProtocolPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (ClientProtocolPolicy_out&, p).ptr_;
+  return *this;
+}
+
+RTCORBA::ClientProtocolPolicy_out &
+RTCORBA::ClientProtocolPolicy_out::operator= (const ::RTCORBA::ClientProtocolPolicy_var &p)
+{
+  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+RTCORBA::ClientProtocolPolicy_out &
+RTCORBA::ClientProtocolPolicy_out::operator= (ClientProtocolPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::ClientProtocolPolicy_out::operator ::RTCORBA::ClientProtocolPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ClientProtocolPolicy_ptr &
+RTCORBA::ClientProtocolPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::RTCORBA::ClientProtocolPolicy_ptr
+RTCORBA::ClientProtocolPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy ()
 {
@@ -986,6 +1896,188 @@ TAO_NAMESPACE_BEGIN (RTCORBA)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIVATE_CONNECTION_POLICY_TYPE, 44U)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class RTCORBA::PrivateConnectionPolicy_var
+// *************************************************************
+
+RTCORBA::PrivateConnectionPolicy_var::PrivateConnectionPolicy_var (void) // default constructor
+  : ptr_ (PrivateConnectionPolicy::_nil ())
+{}
+
+::RTCORBA::PrivateConnectionPolicy_ptr
+RTCORBA::PrivateConnectionPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+RTCORBA::PrivateConnectionPolicy_var::PrivateConnectionPolicy_var (const ::RTCORBA::PrivateConnectionPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (PrivateConnectionPolicy::_duplicate (p.ptr ()))
+{}
+
+RTCORBA::PrivateConnectionPolicy_var::~PrivateConnectionPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+RTCORBA::PrivateConnectionPolicy_var &
+RTCORBA::PrivateConnectionPolicy_var::operator= (PrivateConnectionPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::PrivateConnectionPolicy_var &
+RTCORBA::PrivateConnectionPolicy_var::operator= (const ::RTCORBA::PrivateConnectionPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+RTCORBA::PrivateConnectionPolicy_var::operator const ::RTCORBA::PrivateConnectionPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+RTCORBA::PrivateConnectionPolicy_var::operator ::RTCORBA::PrivateConnectionPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PrivateConnectionPolicy_ptr
+RTCORBA::PrivateConnectionPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PrivateConnectionPolicy_ptr
+RTCORBA::PrivateConnectionPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PrivateConnectionPolicy_ptr &
+RTCORBA::PrivateConnectionPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PrivateConnectionPolicy_ptr &
+RTCORBA::PrivateConnectionPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
+  return this->ptr_;
+}
+
+::RTCORBA::PrivateConnectionPolicy_ptr
+RTCORBA::PrivateConnectionPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::RTCORBA::PrivateConnectionPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
+  return val;
+}
+
+::RTCORBA::PrivateConnectionPolicy_ptr
+RTCORBA::PrivateConnectionPolicy_var::duplicate (PrivateConnectionPolicy_ptr p)
+{
+  return ::RTCORBA::PrivateConnectionPolicy::_duplicate (p);
+}
+
+void
+RTCORBA::PrivateConnectionPolicy_var::release (PrivateConnectionPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::RTCORBA::PrivateConnectionPolicy_ptr
+RTCORBA::PrivateConnectionPolicy_var::nil (void)
+{
+  return ::RTCORBA::PrivateConnectionPolicy::_nil ();
+}
+
+::RTCORBA::PrivateConnectionPolicy_ptr
+RTCORBA::PrivateConnectionPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::RTCORBA::PrivateConnectionPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+RTCORBA::PrivateConnectionPolicy_var::upcast (void *src)
+{
+  PrivateConnectionPolicy **tmp =
+    ACE_static_cast (PrivateConnectionPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class RTCORBA::PrivateConnectionPolicy_out
+// *************************************************************
+
+RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (PrivateConnectionPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
+}
+
+RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (PrivateConnectionPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
+}
+
+RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (const ::RTCORBA::PrivateConnectionPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (PrivateConnectionPolicy_out &, p).ptr_)
+{}
+
+::RTCORBA::PrivateConnectionPolicy_out &
+RTCORBA::PrivateConnectionPolicy_out::operator= (const ::RTCORBA::PrivateConnectionPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (PrivateConnectionPolicy_out&, p).ptr_;
+  return *this;
+}
+
+RTCORBA::PrivateConnectionPolicy_out &
+RTCORBA::PrivateConnectionPolicy_out::operator= (const ::RTCORBA::PrivateConnectionPolicy_var &p)
+{
+  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+RTCORBA::PrivateConnectionPolicy_out &
+RTCORBA::PrivateConnectionPolicy_out::operator= (PrivateConnectionPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::PrivateConnectionPolicy_out::operator ::RTCORBA::PrivateConnectionPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PrivateConnectionPolicy_ptr &
+RTCORBA::PrivateConnectionPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PrivateConnectionPolicy_ptr
+RTCORBA::PrivateConnectionPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy ()
 {
@@ -1066,6 +2158,188 @@ const char* RTCORBA::PrivateConnectionPolicy::_interface_repository_id (void) co
   return "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0";
 }
 
+// *************************************************************
+// Operations for class RTCORBA::TCPProtocolProperties_var
+// *************************************************************
+
+RTCORBA::TCPProtocolProperties_var::TCPProtocolProperties_var (void) // default constructor
+  : ptr_ (TCPProtocolProperties::_nil ())
+{}
+
+::RTCORBA::TCPProtocolProperties_ptr
+RTCORBA::TCPProtocolProperties_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+RTCORBA::TCPProtocolProperties_var::TCPProtocolProperties_var (const ::RTCORBA::TCPProtocolProperties_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (TCPProtocolProperties::_duplicate (p.ptr ()))
+{}
+
+RTCORBA::TCPProtocolProperties_var::~TCPProtocolProperties_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+RTCORBA::TCPProtocolProperties_var &
+RTCORBA::TCPProtocolProperties_var::operator= (TCPProtocolProperties_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::TCPProtocolProperties_var &
+RTCORBA::TCPProtocolProperties_var::operator= (const ::RTCORBA::TCPProtocolProperties_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::RTCORBA::TCPProtocolProperties::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+RTCORBA::TCPProtocolProperties_var::operator const ::RTCORBA::TCPProtocolProperties_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+RTCORBA::TCPProtocolProperties_var::operator ::RTCORBA::TCPProtocolProperties_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::RTCORBA::TCPProtocolProperties_ptr
+RTCORBA::TCPProtocolProperties_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::TCPProtocolProperties_ptr
+RTCORBA::TCPProtocolProperties_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::TCPProtocolProperties_ptr &
+RTCORBA::TCPProtocolProperties_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::RTCORBA::TCPProtocolProperties_ptr &
+RTCORBA::TCPProtocolProperties_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::TCPProtocolProperties::_nil ();
+  return this->ptr_;
+}
+
+::RTCORBA::TCPProtocolProperties_ptr
+RTCORBA::TCPProtocolProperties_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::RTCORBA::TCPProtocolProperties_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::TCPProtocolProperties::_nil ();
+  return val;
+}
+
+::RTCORBA::TCPProtocolProperties_ptr
+RTCORBA::TCPProtocolProperties_var::duplicate (TCPProtocolProperties_ptr p)
+{
+  return ::RTCORBA::TCPProtocolProperties::_duplicate (p);
+}
+
+void
+RTCORBA::TCPProtocolProperties_var::release (TCPProtocolProperties_ptr p)
+{
+  CORBA::release (p);
+}
+
+::RTCORBA::TCPProtocolProperties_ptr
+RTCORBA::TCPProtocolProperties_var::nil (void)
+{
+  return ::RTCORBA::TCPProtocolProperties::_nil ();
+}
+
+::RTCORBA::TCPProtocolProperties_ptr
+RTCORBA::TCPProtocolProperties_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::RTCORBA::TCPProtocolProperties::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+RTCORBA::TCPProtocolProperties_var::upcast (void *src)
+{
+  TCPProtocolProperties **tmp =
+    ACE_static_cast (TCPProtocolProperties **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class RTCORBA::TCPProtocolProperties_out
+// *************************************************************
+
+RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (TCPProtocolProperties_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::RTCORBA::TCPProtocolProperties::_nil ();
+}
+
+RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (TCPProtocolProperties_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::TCPProtocolProperties::_nil ();
+}
+
+RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (const ::RTCORBA::TCPProtocolProperties_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (TCPProtocolProperties_out &, p).ptr_)
+{}
+
+::RTCORBA::TCPProtocolProperties_out &
+RTCORBA::TCPProtocolProperties_out::operator= (const ::RTCORBA::TCPProtocolProperties_out &p)
+{
+  this->ptr_ = ACE_const_cast (TCPProtocolProperties_out&, p).ptr_;
+  return *this;
+}
+
+RTCORBA::TCPProtocolProperties_out &
+RTCORBA::TCPProtocolProperties_out::operator= (const ::RTCORBA::TCPProtocolProperties_var &p)
+{
+  this->ptr_ = ::RTCORBA::TCPProtocolProperties::_duplicate (p.ptr ());
+  return *this;
+}
+
+RTCORBA::TCPProtocolProperties_out &
+RTCORBA::TCPProtocolProperties_out::operator= (TCPProtocolProperties_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::TCPProtocolProperties_out::operator ::RTCORBA::TCPProtocolProperties_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::RTCORBA::TCPProtocolProperties_ptr &
+RTCORBA::TCPProtocolProperties_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::RTCORBA::TCPProtocolProperties_ptr
+RTCORBA::TCPProtocolProperties_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 //////////////////////////////////////////////////////
 // CDR Encoding Support
 
@@ -1162,6 +2436,188 @@ const char* RTCORBA::TCPProtocolProperties::_interface_repository_id (void) cons
 }
 
 
+// *************************************************************
+// Operations for class RTCORBA::GIOPProtocolProperties_var
+// *************************************************************
+
+RTCORBA::GIOPProtocolProperties_var::GIOPProtocolProperties_var (void) // default constructor
+  : ptr_ (GIOPProtocolProperties::_nil ())
+{}
+
+::RTCORBA::GIOPProtocolProperties_ptr
+RTCORBA::GIOPProtocolProperties_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+RTCORBA::GIOPProtocolProperties_var::GIOPProtocolProperties_var (const ::RTCORBA::GIOPProtocolProperties_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (GIOPProtocolProperties::_duplicate (p.ptr ()))
+{}
+
+RTCORBA::GIOPProtocolProperties_var::~GIOPProtocolProperties_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+RTCORBA::GIOPProtocolProperties_var &
+RTCORBA::GIOPProtocolProperties_var::operator= (GIOPProtocolProperties_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::GIOPProtocolProperties_var &
+RTCORBA::GIOPProtocolProperties_var::operator= (const ::RTCORBA::GIOPProtocolProperties_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+RTCORBA::GIOPProtocolProperties_var::operator const ::RTCORBA::GIOPProtocolProperties_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+RTCORBA::GIOPProtocolProperties_var::operator ::RTCORBA::GIOPProtocolProperties_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::RTCORBA::GIOPProtocolProperties_ptr
+RTCORBA::GIOPProtocolProperties_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::GIOPProtocolProperties_ptr
+RTCORBA::GIOPProtocolProperties_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::GIOPProtocolProperties_ptr &
+RTCORBA::GIOPProtocolProperties_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::RTCORBA::GIOPProtocolProperties_ptr &
+RTCORBA::GIOPProtocolProperties_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_nil ();
+  return this->ptr_;
+}
+
+::RTCORBA::GIOPProtocolProperties_ptr
+RTCORBA::GIOPProtocolProperties_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::RTCORBA::GIOPProtocolProperties_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_nil ();
+  return val;
+}
+
+::RTCORBA::GIOPProtocolProperties_ptr
+RTCORBA::GIOPProtocolProperties_var::duplicate (GIOPProtocolProperties_ptr p)
+{
+  return ::RTCORBA::GIOPProtocolProperties::_duplicate (p);
+}
+
+void
+RTCORBA::GIOPProtocolProperties_var::release (GIOPProtocolProperties_ptr p)
+{
+  CORBA::release (p);
+}
+
+::RTCORBA::GIOPProtocolProperties_ptr
+RTCORBA::GIOPProtocolProperties_var::nil (void)
+{
+  return ::RTCORBA::GIOPProtocolProperties::_nil ();
+}
+
+::RTCORBA::GIOPProtocolProperties_ptr
+RTCORBA::GIOPProtocolProperties_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::RTCORBA::GIOPProtocolProperties::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+RTCORBA::GIOPProtocolProperties_var::upcast (void *src)
+{
+  GIOPProtocolProperties **tmp =
+    ACE_static_cast (GIOPProtocolProperties **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class RTCORBA::GIOPProtocolProperties_out
+// *************************************************************
+
+RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (GIOPProtocolProperties_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_nil ();
+}
+
+RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (GIOPProtocolProperties_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_nil ();
+}
+
+RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (const ::RTCORBA::GIOPProtocolProperties_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (GIOPProtocolProperties_out &, p).ptr_)
+{}
+
+::RTCORBA::GIOPProtocolProperties_out &
+RTCORBA::GIOPProtocolProperties_out::operator= (const ::RTCORBA::GIOPProtocolProperties_out &p)
+{
+  this->ptr_ = ACE_const_cast (GIOPProtocolProperties_out&, p).ptr_;
+  return *this;
+}
+
+RTCORBA::GIOPProtocolProperties_out &
+RTCORBA::GIOPProtocolProperties_out::operator= (const ::RTCORBA::GIOPProtocolProperties_var &p)
+{
+  this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_duplicate (p.ptr ());
+  return *this;
+}
+
+RTCORBA::GIOPProtocolProperties_out &
+RTCORBA::GIOPProtocolProperties_out::operator= (GIOPProtocolProperties_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::GIOPProtocolProperties_out::operator ::RTCORBA::GIOPProtocolProperties_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::RTCORBA::GIOPProtocolProperties_ptr &
+RTCORBA::GIOPProtocolProperties_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::RTCORBA::GIOPProtocolProperties_ptr
+RTCORBA::GIOPProtocolProperties_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties ()
 {
@@ -1243,6 +2699,188 @@ const char* RTCORBA::GIOPProtocolProperties::_interface_repository_id (void) con
 }
 
 
+// *************************************************************
+// Operations for class RTCORBA::UnixDomainProtocolProperties_var
+// *************************************************************
+
+RTCORBA::UnixDomainProtocolProperties_var::UnixDomainProtocolProperties_var (void) // default constructor
+  : ptr_ (UnixDomainProtocolProperties::_nil ())
+{}
+
+::RTCORBA::UnixDomainProtocolProperties_ptr
+RTCORBA::UnixDomainProtocolProperties_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+RTCORBA::UnixDomainProtocolProperties_var::UnixDomainProtocolProperties_var (const ::RTCORBA::UnixDomainProtocolProperties_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (UnixDomainProtocolProperties::_duplicate (p.ptr ()))
+{}
+
+RTCORBA::UnixDomainProtocolProperties_var::~UnixDomainProtocolProperties_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+RTCORBA::UnixDomainProtocolProperties_var &
+RTCORBA::UnixDomainProtocolProperties_var::operator= (UnixDomainProtocolProperties_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::UnixDomainProtocolProperties_var &
+RTCORBA::UnixDomainProtocolProperties_var::operator= (const ::RTCORBA::UnixDomainProtocolProperties_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+RTCORBA::UnixDomainProtocolProperties_var::operator const ::RTCORBA::UnixDomainProtocolProperties_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+RTCORBA::UnixDomainProtocolProperties_var::operator ::RTCORBA::UnixDomainProtocolProperties_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::RTCORBA::UnixDomainProtocolProperties_ptr
+RTCORBA::UnixDomainProtocolProperties_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::UnixDomainProtocolProperties_ptr
+RTCORBA::UnixDomainProtocolProperties_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::UnixDomainProtocolProperties_ptr &
+RTCORBA::UnixDomainProtocolProperties_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::RTCORBA::UnixDomainProtocolProperties_ptr &
+RTCORBA::UnixDomainProtocolProperties_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil ();
+  return this->ptr_;
+}
+
+::RTCORBA::UnixDomainProtocolProperties_ptr
+RTCORBA::UnixDomainProtocolProperties_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::RTCORBA::UnixDomainProtocolProperties_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil ();
+  return val;
+}
+
+::RTCORBA::UnixDomainProtocolProperties_ptr
+RTCORBA::UnixDomainProtocolProperties_var::duplicate (UnixDomainProtocolProperties_ptr p)
+{
+  return ::RTCORBA::UnixDomainProtocolProperties::_duplicate (p);
+}
+
+void
+RTCORBA::UnixDomainProtocolProperties_var::release (UnixDomainProtocolProperties_ptr p)
+{
+  CORBA::release (p);
+}
+
+::RTCORBA::UnixDomainProtocolProperties_ptr
+RTCORBA::UnixDomainProtocolProperties_var::nil (void)
+{
+  return ::RTCORBA::UnixDomainProtocolProperties::_nil ();
+}
+
+::RTCORBA::UnixDomainProtocolProperties_ptr
+RTCORBA::UnixDomainProtocolProperties_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::RTCORBA::UnixDomainProtocolProperties::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+RTCORBA::UnixDomainProtocolProperties_var::upcast (void *src)
+{
+  UnixDomainProtocolProperties **tmp =
+    ACE_static_cast (UnixDomainProtocolProperties **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class RTCORBA::UnixDomainProtocolProperties_out
+// *************************************************************
+
+RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil ();
+}
+
+RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil ();
+}
+
+RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (const ::RTCORBA::UnixDomainProtocolProperties_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (UnixDomainProtocolProperties_out &, p).ptr_)
+{}
+
+::RTCORBA::UnixDomainProtocolProperties_out &
+RTCORBA::UnixDomainProtocolProperties_out::operator= (const ::RTCORBA::UnixDomainProtocolProperties_out &p)
+{
+  this->ptr_ = ACE_const_cast (UnixDomainProtocolProperties_out&, p).ptr_;
+  return *this;
+}
+
+RTCORBA::UnixDomainProtocolProperties_out &
+RTCORBA::UnixDomainProtocolProperties_out::operator= (const ::RTCORBA::UnixDomainProtocolProperties_var &p)
+{
+  this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_duplicate (p.ptr ());
+  return *this;
+}
+
+RTCORBA::UnixDomainProtocolProperties_out &
+RTCORBA::UnixDomainProtocolProperties_out::operator= (UnixDomainProtocolProperties_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::UnixDomainProtocolProperties_out::operator ::RTCORBA::UnixDomainProtocolProperties_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::RTCORBA::UnixDomainProtocolProperties_ptr &
+RTCORBA::UnixDomainProtocolProperties_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::RTCORBA::UnixDomainProtocolProperties_ptr
+RTCORBA::UnixDomainProtocolProperties_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties ()
 {
@@ -1324,6 +2962,188 @@ const char* RTCORBA::UnixDomainProtocolProperties::_interface_repository_id (voi
 }
 
 
+// *************************************************************
+// Operations for class RTCORBA::SharedMemoryProtocolProperties_var
+// *************************************************************
+
+RTCORBA::SharedMemoryProtocolProperties_var::SharedMemoryProtocolProperties_var (void) // default constructor
+  : ptr_ (SharedMemoryProtocolProperties::_nil ())
+{}
+
+::RTCORBA::SharedMemoryProtocolProperties_ptr
+RTCORBA::SharedMemoryProtocolProperties_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+RTCORBA::SharedMemoryProtocolProperties_var::SharedMemoryProtocolProperties_var (const ::RTCORBA::SharedMemoryProtocolProperties_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (SharedMemoryProtocolProperties::_duplicate (p.ptr ()))
+{}
+
+RTCORBA::SharedMemoryProtocolProperties_var::~SharedMemoryProtocolProperties_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+RTCORBA::SharedMemoryProtocolProperties_var &
+RTCORBA::SharedMemoryProtocolProperties_var::operator= (SharedMemoryProtocolProperties_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::SharedMemoryProtocolProperties_var &
+RTCORBA::SharedMemoryProtocolProperties_var::operator= (const ::RTCORBA::SharedMemoryProtocolProperties_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+RTCORBA::SharedMemoryProtocolProperties_var::operator const ::RTCORBA::SharedMemoryProtocolProperties_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+RTCORBA::SharedMemoryProtocolProperties_var::operator ::RTCORBA::SharedMemoryProtocolProperties_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::RTCORBA::SharedMemoryProtocolProperties_ptr
+RTCORBA::SharedMemoryProtocolProperties_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::SharedMemoryProtocolProperties_ptr
+RTCORBA::SharedMemoryProtocolProperties_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::SharedMemoryProtocolProperties_ptr &
+RTCORBA::SharedMemoryProtocolProperties_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::RTCORBA::SharedMemoryProtocolProperties_ptr &
+RTCORBA::SharedMemoryProtocolProperties_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil ();
+  return this->ptr_;
+}
+
+::RTCORBA::SharedMemoryProtocolProperties_ptr
+RTCORBA::SharedMemoryProtocolProperties_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::RTCORBA::SharedMemoryProtocolProperties_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil ();
+  return val;
+}
+
+::RTCORBA::SharedMemoryProtocolProperties_ptr
+RTCORBA::SharedMemoryProtocolProperties_var::duplicate (SharedMemoryProtocolProperties_ptr p)
+{
+  return ::RTCORBA::SharedMemoryProtocolProperties::_duplicate (p);
+}
+
+void
+RTCORBA::SharedMemoryProtocolProperties_var::release (SharedMemoryProtocolProperties_ptr p)
+{
+  CORBA::release (p);
+}
+
+::RTCORBA::SharedMemoryProtocolProperties_ptr
+RTCORBA::SharedMemoryProtocolProperties_var::nil (void)
+{
+  return ::RTCORBA::SharedMemoryProtocolProperties::_nil ();
+}
+
+::RTCORBA::SharedMemoryProtocolProperties_ptr
+RTCORBA::SharedMemoryProtocolProperties_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::RTCORBA::SharedMemoryProtocolProperties::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+RTCORBA::SharedMemoryProtocolProperties_var::upcast (void *src)
+{
+  SharedMemoryProtocolProperties **tmp =
+    ACE_static_cast (SharedMemoryProtocolProperties **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class RTCORBA::SharedMemoryProtocolProperties_out
+// *************************************************************
+
+RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil ();
+}
+
+RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil ();
+}
+
+RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (const ::RTCORBA::SharedMemoryProtocolProperties_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (SharedMemoryProtocolProperties_out &, p).ptr_)
+{}
+
+::RTCORBA::SharedMemoryProtocolProperties_out &
+RTCORBA::SharedMemoryProtocolProperties_out::operator= (const ::RTCORBA::SharedMemoryProtocolProperties_out &p)
+{
+  this->ptr_ = ACE_const_cast (SharedMemoryProtocolProperties_out&, p).ptr_;
+  return *this;
+}
+
+RTCORBA::SharedMemoryProtocolProperties_out &
+RTCORBA::SharedMemoryProtocolProperties_out::operator= (const ::RTCORBA::SharedMemoryProtocolProperties_var &p)
+{
+  this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_duplicate (p.ptr ());
+  return *this;
+}
+
+RTCORBA::SharedMemoryProtocolProperties_out &
+RTCORBA::SharedMemoryProtocolProperties_out::operator= (SharedMemoryProtocolProperties_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::SharedMemoryProtocolProperties_out::operator ::RTCORBA::SharedMemoryProtocolProperties_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::RTCORBA::SharedMemoryProtocolProperties_ptr &
+RTCORBA::SharedMemoryProtocolProperties_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::RTCORBA::SharedMemoryProtocolProperties_ptr
+RTCORBA::SharedMemoryProtocolProperties_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties ()
 {
@@ -1696,6 +3516,188 @@ TAO_NAMESPACE_BEGIN (RTCORBA)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIORITY_BANDED_CONNECTION_POLICY_TYPE, 45U)
 TAO_NAMESPACE_END
 
+// *************************************************************
+// Operations for class RTCORBA::PriorityBandedConnectionPolicy_var
+// *************************************************************
+
+RTCORBA::PriorityBandedConnectionPolicy_var::PriorityBandedConnectionPolicy_var (void) // default constructor
+  : ptr_ (PriorityBandedConnectionPolicy::_nil ())
+{}
+
+::RTCORBA::PriorityBandedConnectionPolicy_ptr
+RTCORBA::PriorityBandedConnectionPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+RTCORBA::PriorityBandedConnectionPolicy_var::PriorityBandedConnectionPolicy_var (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (PriorityBandedConnectionPolicy::_duplicate (p.ptr ()))
+{}
+
+RTCORBA::PriorityBandedConnectionPolicy_var::~PriorityBandedConnectionPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+RTCORBA::PriorityBandedConnectionPolicy_var &
+RTCORBA::PriorityBandedConnectionPolicy_var::operator= (PriorityBandedConnectionPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::PriorityBandedConnectionPolicy_var &
+RTCORBA::PriorityBandedConnectionPolicy_var::operator= (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+RTCORBA::PriorityBandedConnectionPolicy_var::operator const ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+RTCORBA::PriorityBandedConnectionPolicy_var::operator ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PriorityBandedConnectionPolicy_ptr
+RTCORBA::PriorityBandedConnectionPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PriorityBandedConnectionPolicy_ptr
+RTCORBA::PriorityBandedConnectionPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PriorityBandedConnectionPolicy_ptr &
+RTCORBA::PriorityBandedConnectionPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PriorityBandedConnectionPolicy_ptr &
+RTCORBA::PriorityBandedConnectionPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
+  return this->ptr_;
+}
+
+::RTCORBA::PriorityBandedConnectionPolicy_ptr
+RTCORBA::PriorityBandedConnectionPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::RTCORBA::PriorityBandedConnectionPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
+  return val;
+}
+
+::RTCORBA::PriorityBandedConnectionPolicy_ptr
+RTCORBA::PriorityBandedConnectionPolicy_var::duplicate (PriorityBandedConnectionPolicy_ptr p)
+{
+  return ::RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p);
+}
+
+void
+RTCORBA::PriorityBandedConnectionPolicy_var::release (PriorityBandedConnectionPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::RTCORBA::PriorityBandedConnectionPolicy_ptr
+RTCORBA::PriorityBandedConnectionPolicy_var::nil (void)
+{
+  return ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
+}
+
+::RTCORBA::PriorityBandedConnectionPolicy_ptr
+RTCORBA::PriorityBandedConnectionPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::RTCORBA::PriorityBandedConnectionPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+RTCORBA::PriorityBandedConnectionPolicy_var::upcast (void *src)
+{
+  PriorityBandedConnectionPolicy **tmp =
+    ACE_static_cast (PriorityBandedConnectionPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class RTCORBA::PriorityBandedConnectionPolicy_out
+// *************************************************************
+
+RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
+}
+
+RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
+}
+
+RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (const ::RTCORBA::PriorityBandedConnectionPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (PriorityBandedConnectionPolicy_out &, p).ptr_)
+{}
+
+::RTCORBA::PriorityBandedConnectionPolicy_out &
+RTCORBA::PriorityBandedConnectionPolicy_out::operator= (const ::RTCORBA::PriorityBandedConnectionPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (PriorityBandedConnectionPolicy_out&, p).ptr_;
+  return *this;
+}
+
+RTCORBA::PriorityBandedConnectionPolicy_out &
+RTCORBA::PriorityBandedConnectionPolicy_out::operator= (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p)
+{
+  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+RTCORBA::PriorityBandedConnectionPolicy_out &
+RTCORBA::PriorityBandedConnectionPolicy_out::operator= (PriorityBandedConnectionPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::PriorityBandedConnectionPolicy_out::operator ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PriorityBandedConnectionPolicy_ptr &
+RTCORBA::PriorityBandedConnectionPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::RTCORBA::PriorityBandedConnectionPolicy_ptr
+RTCORBA::PriorityBandedConnectionPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy ()
 {
@@ -1777,6 +3779,188 @@ const char* RTCORBA::PriorityBandedConnectionPolicy::_interface_repository_id (v
 }
 
 
+// *************************************************************
+// Operations for class RTCORBA::Current_var
+// *************************************************************
+
+RTCORBA::Current_var::Current_var (void) // default constructor
+  : ptr_ (Current::_nil ())
+{}
+
+::RTCORBA::Current_ptr
+RTCORBA::Current_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+RTCORBA::Current_var::Current_var (const ::RTCORBA::Current_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (Current::_duplicate (p.ptr ()))
+{}
+
+RTCORBA::Current_var::~Current_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+RTCORBA::Current_var &
+RTCORBA::Current_var::operator= (Current_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::Current_var &
+RTCORBA::Current_var::operator= (const ::RTCORBA::Current_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::RTCORBA::Current::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+RTCORBA::Current_var::operator const ::RTCORBA::Current_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+RTCORBA::Current_var::operator ::RTCORBA::Current_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::RTCORBA::Current_ptr
+RTCORBA::Current_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::Current_ptr
+RTCORBA::Current_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::Current_ptr &
+RTCORBA::Current_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::RTCORBA::Current_ptr &
+RTCORBA::Current_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::Current::_nil ();
+  return this->ptr_;
+}
+
+::RTCORBA::Current_ptr
+RTCORBA::Current_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::RTCORBA::Current_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::Current::_nil ();
+  return val;
+}
+
+::RTCORBA::Current_ptr
+RTCORBA::Current_var::duplicate (Current_ptr p)
+{
+  return ::RTCORBA::Current::_duplicate (p);
+}
+
+void
+RTCORBA::Current_var::release (Current_ptr p)
+{
+  CORBA::release (p);
+}
+
+::RTCORBA::Current_ptr
+RTCORBA::Current_var::nil (void)
+{
+  return ::RTCORBA::Current::_nil ();
+}
+
+::RTCORBA::Current_ptr
+RTCORBA::Current_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::RTCORBA::Current::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+RTCORBA::Current_var::upcast (void *src)
+{
+  Current **tmp =
+    ACE_static_cast (Current **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class RTCORBA::Current_out
+// *************************************************************
+
+RTCORBA::Current_out::Current_out (Current_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::RTCORBA::Current::_nil ();
+}
+
+RTCORBA::Current_out::Current_out (Current_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::Current::_nil ();
+}
+
+RTCORBA::Current_out::Current_out (const ::RTCORBA::Current_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
+{}
+
+::RTCORBA::Current_out &
+RTCORBA::Current_out::operator= (const ::RTCORBA::Current_out &p)
+{
+  this->ptr_ = ACE_const_cast (Current_out&, p).ptr_;
+  return *this;
+}
+
+RTCORBA::Current_out &
+RTCORBA::Current_out::operator= (const ::RTCORBA::Current_var &p)
+{
+  this->ptr_ = ::RTCORBA::Current::_duplicate (p.ptr ());
+  return *this;
+}
+
+RTCORBA::Current_out &
+RTCORBA::Current_out::operator= (Current_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::Current_out::operator ::RTCORBA::Current_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::RTCORBA::Current_ptr &
+RTCORBA::Current_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::RTCORBA::Current_ptr
+RTCORBA::Current_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 RTCORBA::Current::Current ()
 {
@@ -1858,6 +4042,188 @@ const char* RTCORBA::Current::_interface_repository_id (void) const
 }
 
 
+// *************************************************************
+// Operations for class RTCORBA::Mutex_var
+// *************************************************************
+
+RTCORBA::Mutex_var::Mutex_var (void) // default constructor
+  : ptr_ (Mutex::_nil ())
+{}
+
+::RTCORBA::Mutex_ptr
+RTCORBA::Mutex_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+RTCORBA::Mutex_var::Mutex_var (const ::RTCORBA::Mutex_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (Mutex::_duplicate (p.ptr ()))
+{}
+
+RTCORBA::Mutex_var::~Mutex_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+RTCORBA::Mutex_var &
+RTCORBA::Mutex_var::operator= (Mutex_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::Mutex_var &
+RTCORBA::Mutex_var::operator= (const ::RTCORBA::Mutex_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::RTCORBA::Mutex::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+RTCORBA::Mutex_var::operator const ::RTCORBA::Mutex_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+RTCORBA::Mutex_var::operator ::RTCORBA::Mutex_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::RTCORBA::Mutex_ptr
+RTCORBA::Mutex_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::Mutex_ptr
+RTCORBA::Mutex_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::Mutex_ptr &
+RTCORBA::Mutex_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::RTCORBA::Mutex_ptr &
+RTCORBA::Mutex_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::Mutex::_nil ();
+  return this->ptr_;
+}
+
+::RTCORBA::Mutex_ptr
+RTCORBA::Mutex_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::RTCORBA::Mutex_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::Mutex::_nil ();
+  return val;
+}
+
+::RTCORBA::Mutex_ptr
+RTCORBA::Mutex_var::duplicate (Mutex_ptr p)
+{
+  return ::RTCORBA::Mutex::_duplicate (p);
+}
+
+void
+RTCORBA::Mutex_var::release (Mutex_ptr p)
+{
+  CORBA::release (p);
+}
+
+::RTCORBA::Mutex_ptr
+RTCORBA::Mutex_var::nil (void)
+{
+  return ::RTCORBA::Mutex::_nil ();
+}
+
+::RTCORBA::Mutex_ptr
+RTCORBA::Mutex_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::RTCORBA::Mutex::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+RTCORBA::Mutex_var::upcast (void *src)
+{
+  Mutex **tmp =
+    ACE_static_cast (Mutex **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class RTCORBA::Mutex_out
+// *************************************************************
+
+RTCORBA::Mutex_out::Mutex_out (Mutex_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::RTCORBA::Mutex::_nil ();
+}
+
+RTCORBA::Mutex_out::Mutex_out (Mutex_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::Mutex::_nil ();
+}
+
+RTCORBA::Mutex_out::Mutex_out (const ::RTCORBA::Mutex_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (Mutex_out &, p).ptr_)
+{}
+
+::RTCORBA::Mutex_out &
+RTCORBA::Mutex_out::operator= (const ::RTCORBA::Mutex_out &p)
+{
+  this->ptr_ = ACE_const_cast (Mutex_out&, p).ptr_;
+  return *this;
+}
+
+RTCORBA::Mutex_out &
+RTCORBA::Mutex_out::operator= (const ::RTCORBA::Mutex_var &p)
+{
+  this->ptr_ = ::RTCORBA::Mutex::_duplicate (p.ptr ());
+  return *this;
+}
+
+RTCORBA::Mutex_out &
+RTCORBA::Mutex_out::operator= (Mutex_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::Mutex_out::operator ::RTCORBA::Mutex_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::RTCORBA::Mutex_ptr &
+RTCORBA::Mutex_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::RTCORBA::Mutex_ptr
+RTCORBA::Mutex_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 RTCORBA::Mutex::Mutex ()
 {
@@ -1927,6 +4293,188 @@ const char* RTCORBA::Mutex::_interface_repository_id (void) const
 }
 
 
+// *************************************************************
+// Operations for class RTCORBA::RTORB_var
+// *************************************************************
+
+RTCORBA::RTORB_var::RTORB_var (void) // default constructor
+  : ptr_ (RTORB::_nil ())
+{}
+
+::RTCORBA::RTORB_ptr
+RTCORBA::RTORB_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+RTCORBA::RTORB_var::RTORB_var (const ::RTCORBA::RTORB_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (RTORB::_duplicate (p.ptr ()))
+{}
+
+RTCORBA::RTORB_var::~RTORB_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+RTCORBA::RTORB_var &
+RTCORBA::RTORB_var::operator= (RTORB_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::RTORB_var &
+RTCORBA::RTORB_var::operator= (const ::RTCORBA::RTORB_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::RTCORBA::RTORB::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+RTCORBA::RTORB_var::operator const ::RTCORBA::RTORB_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+RTCORBA::RTORB_var::operator ::RTCORBA::RTORB_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::RTCORBA::RTORB_ptr
+RTCORBA::RTORB_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::RTORB_ptr
+RTCORBA::RTORB_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::RTCORBA::RTORB_ptr &
+RTCORBA::RTORB_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::RTCORBA::RTORB_ptr &
+RTCORBA::RTORB_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::RTORB::_nil ();
+  return this->ptr_;
+}
+
+::RTCORBA::RTORB_ptr
+RTCORBA::RTORB_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::RTCORBA::RTORB_ptr val = this->ptr_;
+  this->ptr_ = ::RTCORBA::RTORB::_nil ();
+  return val;
+}
+
+::RTCORBA::RTORB_ptr
+RTCORBA::RTORB_var::duplicate (RTORB_ptr p)
+{
+  return ::RTCORBA::RTORB::_duplicate (p);
+}
+
+void
+RTCORBA::RTORB_var::release (RTORB_ptr p)
+{
+  CORBA::release (p);
+}
+
+::RTCORBA::RTORB_ptr
+RTCORBA::RTORB_var::nil (void)
+{
+  return ::RTCORBA::RTORB::_nil ();
+}
+
+::RTCORBA::RTORB_ptr
+RTCORBA::RTORB_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::RTCORBA::RTORB::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+RTCORBA::RTORB_var::upcast (void *src)
+{
+  RTORB **tmp =
+    ACE_static_cast (RTORB **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class RTCORBA::RTORB_out
+// *************************************************************
+
+RTCORBA::RTORB_out::RTORB_out (RTORB_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::RTCORBA::RTORB::_nil ();
+}
+
+RTCORBA::RTORB_out::RTORB_out (RTORB_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::RTCORBA::RTORB::_nil ();
+}
+
+RTCORBA::RTORB_out::RTORB_out (const ::RTCORBA::RTORB_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (RTORB_out &, p).ptr_)
+{}
+
+::RTCORBA::RTORB_out &
+RTCORBA::RTORB_out::operator= (const ::RTCORBA::RTORB_out &p)
+{
+  this->ptr_ = ACE_const_cast (RTORB_out&, p).ptr_;
+  return *this;
+}
+
+RTCORBA::RTORB_out &
+RTCORBA::RTORB_out::operator= (const ::RTCORBA::RTORB_var &p)
+{
+  this->ptr_ = ::RTCORBA::RTORB::_duplicate (p.ptr ());
+  return *this;
+}
+
+RTCORBA::RTORB_out &
+RTCORBA::RTORB_out::operator= (RTORB_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+RTCORBA::RTORB_out::operator ::RTCORBA::RTORB_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::RTCORBA::RTORB_ptr &
+RTCORBA::RTORB_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::RTCORBA::RTORB_ptr
+RTCORBA::RTORB_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
 // default constructor
 RTCORBA::RTORB::RTORB ()
 {
diff --git a/TAO/tao/RTCORBAC.h b/TAO/tao/RTCORBAC.h
index 8dbf6c25a31..48afee82a7d 100644
--- a/TAO/tao/RTCORBAC.h
+++ b/TAO/tao/RTCORBAC.h
@@ -331,6 +331,14 @@ TAO_NAMESPACE  RTCORBA
     PriorityModelPolicy_ptr _retn (void);
     PriorityModelPolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static PriorityModelPolicy_ptr duplicate (PriorityModelPolicy_ptr);
+    static void release (PriorityModelPolicy_ptr);
+    static PriorityModelPolicy_ptr nil (void);
+    static PriorityModelPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     PriorityModelPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -462,6 +470,14 @@ class TAO_Export PriorityModelPolicy: public virtual CORBA::Policy
     ThreadpoolPolicy_ptr _retn (void);
     ThreadpoolPolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ThreadpoolPolicy_ptr duplicate (ThreadpoolPolicy_ptr);
+    static void release (ThreadpoolPolicy_ptr);
+    static ThreadpoolPolicy_ptr nil (void);
+    static ThreadpoolPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ThreadpoolPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -583,6 +599,14 @@ class TAO_Export ThreadpoolPolicy: public virtual CORBA::Policy
     ProtocolProperties_ptr _retn (void);
     ProtocolProperties_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ProtocolProperties_ptr duplicate (ProtocolProperties_ptr);
+    static void release (ProtocolProperties_ptr);
+    static ProtocolProperties_ptr nil (void);
+    static ProtocolProperties_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ProtocolProperties_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -916,6 +940,14 @@ class TAO_Export ProtocolProperties : public virtual CORBA_Object,
     ServerProtocolPolicy_ptr _retn (void);
     ServerProtocolPolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ServerProtocolPolicy_ptr duplicate (ServerProtocolPolicy_ptr);
+    static void release (ServerProtocolPolicy_ptr);
+    static ServerProtocolPolicy_ptr nil (void);
+    static ServerProtocolPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ServerProtocolPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1039,6 +1071,14 @@ class TAO_Export ServerProtocolPolicy: public virtual CORBA::Policy
     ClientProtocolPolicy_ptr _retn (void);
     ClientProtocolPolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ClientProtocolPolicy_ptr duplicate (ClientProtocolPolicy_ptr);
+    static void release (ClientProtocolPolicy_ptr);
+    static ClientProtocolPolicy_ptr nil (void);
+    static ClientProtocolPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ClientProtocolPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1162,6 +1202,14 @@ class TAO_Export ClientProtocolPolicy: public virtual CORBA::Policy
     PrivateConnectionPolicy_ptr _retn (void);
     PrivateConnectionPolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static PrivateConnectionPolicy_ptr duplicate (PrivateConnectionPolicy_ptr);
+    static void release (PrivateConnectionPolicy_ptr);
+    static PrivateConnectionPolicy_ptr nil (void);
+    static PrivateConnectionPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     PrivateConnectionPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1275,6 +1323,14 @@ class TAO_Export PrivateConnectionPolicy: public virtual CORBA::Policy
     TCPProtocolProperties_ptr _retn (void);
     TCPProtocolProperties_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static TCPProtocolProperties_ptr duplicate (TCPProtocolProperties_ptr);
+    static void release (TCPProtocolProperties_ptr);
+    static TCPProtocolProperties_ptr nil (void);
+    static TCPProtocolProperties_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     TCPProtocolProperties_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1473,6 +1529,14 @@ class TAO_Export TCPProtocolProperties: public virtual ProtocolProperties
     GIOPProtocolProperties_ptr _retn (void);
     GIOPProtocolProperties_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static GIOPProtocolProperties_ptr duplicate (GIOPProtocolProperties_ptr);
+    static void release (GIOPProtocolProperties_ptr);
+    static GIOPProtocolProperties_ptr nil (void);
+    static GIOPProtocolProperties_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     GIOPProtocolProperties_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1586,6 +1650,14 @@ class TAO_Export GIOPProtocolProperties: public virtual ProtocolProperties
     UnixDomainProtocolProperties_ptr _retn (void);
     UnixDomainProtocolProperties_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static UnixDomainProtocolProperties_ptr duplicate (UnixDomainProtocolProperties_ptr);
+    static void release (UnixDomainProtocolProperties_ptr);
+    static UnixDomainProtocolProperties_ptr nil (void);
+    static UnixDomainProtocolProperties_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     UnixDomainProtocolProperties_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -1733,6 +1805,14 @@ class TAO_Export UnixDomainProtocolProperties: public virtual ProtocolProperties
     SharedMemoryProtocolProperties_ptr _retn (void);
     SharedMemoryProtocolProperties_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static SharedMemoryProtocolProperties_ptr duplicate (SharedMemoryProtocolProperties_ptr);
+    static void release (SharedMemoryProtocolProperties_ptr);
+    static SharedMemoryProtocolProperties_ptr nil (void);
+    static SharedMemoryProtocolProperties_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     SharedMemoryProtocolProperties_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2102,6 +2182,14 @@ class TAO_Export SharedMemoryProtocolProperties: public virtual ProtocolProperti
     PriorityBandedConnectionPolicy_ptr _retn (void);
     PriorityBandedConnectionPolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static PriorityBandedConnectionPolicy_ptr duplicate (PriorityBandedConnectionPolicy_ptr);
+    static void release (PriorityBandedConnectionPolicy_ptr);
+    static PriorityBandedConnectionPolicy_ptr nil (void);
+    static PriorityBandedConnectionPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     PriorityBandedConnectionPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2223,6 +2311,14 @@ class TAO_Export PriorityBandedConnectionPolicy: public virtual CORBA::Policy
     Current_ptr _retn (void);
     Current_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static Current_ptr duplicate (Current_ptr);
+    static void release (Current_ptr);
+    static Current_ptr nil (void);
+    static Current_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     Current_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2353,6 +2449,14 @@ class TAO_Export Current: public virtual CORBA::Current
     Mutex_ptr _retn (void);
     Mutex_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static Mutex_ptr duplicate (Mutex_ptr);
+    static void release (Mutex_ptr);
+    static Mutex_ptr nil (void);
+    static Mutex_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     Mutex_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2491,6 +2595,14 @@ class TAO_Export Mutex : public virtual CORBA_Object
     RTORB_ptr _retn (void);
     RTORB_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static RTORB_ptr duplicate (RTORB_ptr);
+    static void release (RTORB_ptr);
+    static RTORB_ptr nil (void);
+    static RTORB_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     RTORB_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -2799,8 +2911,6 @@ class TAO_Export RTORB : public virtual CORBA_Object
 }
 TAO_NAMESPACE_CLOSE // module RTCORBA
 
-// Proxy Broker Factory function pointer declarations.
-
 TAO_Export void operator<<= (CORBA::Any &, const RTCORBA::ThreadpoolLane &); // copying version
 TAO_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolLane*); // noncopying version
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ThreadpoolLane *&); // deprecated
diff --git a/TAO/tao/RTCORBAC.i b/TAO/tao/RTCORBAC.i
index 75ab567264b..3c8ef6cd33b 100644
--- a/TAO/tao/RTCORBAC.i
+++ b/TAO/tao/RTCORBAC.i
@@ -571,510 +571,150 @@ RTCORBA::ThreadpoolLanes_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PRIORITYMODELPOLICY___VAR_CI_)
-#define _RTCORBA_PRIORITYMODELPOLICY___VAR_CI_
+#if !defined (_RTCORBA_PRIORITYMODELPOLICY___CI_)
+#define _RTCORBA_PRIORITYMODELPOLICY___CI_
 
-// *************************************************************
-// Inline operations for class RTCORBA::PriorityModelPolicy_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::PriorityModelPolicy_var::PriorityModelPolicy_var (void) // default constructor
-  : ptr_ (PriorityModelPolicy::_nil ())
-{}
-
-ACE_INLINE ::RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::PriorityModelPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::PriorityModelPolicy_var::PriorityModelPolicy_var (const ::RTCORBA::PriorityModelPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (PriorityModelPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RTCORBA::PriorityModelPolicy_var::~PriorityModelPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RTCORBA::PriorityModelPolicy_var &
-RTCORBA::PriorityModelPolicy_var::operator= (PriorityModelPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::PriorityModelPolicy_var &
-RTCORBA::PriorityModelPolicy_var::operator= (const ::RTCORBA::PriorityModelPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::PriorityModelPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::PriorityModelPolicy_var::operator const ::RTCORBA::PriorityModelPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::PriorityModelPolicy_var::operator ::RTCORBA::PriorityModelPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::PriorityModelPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::PriorityModelPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityModelPolicy_ptr &
-RTCORBA::PriorityModelPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityModelPolicy_ptr &
-RTCORBA::PriorityModelPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::PriorityModelPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::PriorityModelPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::PriorityModelPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::PriorityModelPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_PRIORITYMODELPOLICY___OUT_CI_)
-#define _RTCORBA_PRIORITYMODELPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::PriorityModelPolicy_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (PriorityModelPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::PriorityModelPolicy::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (PriorityModelPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::PriorityModelPolicy::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::PriorityModelPolicy_out::PriorityModelPolicy_out (const ::RTCORBA::PriorityModelPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (PriorityModelPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::RTCORBA::PriorityModelPolicy_out &
-RTCORBA::PriorityModelPolicy_out::operator= (const ::RTCORBA::PriorityModelPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (PriorityModelPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::PriorityModelPolicy_out &
-RTCORBA::PriorityModelPolicy_out::operator= (const ::RTCORBA::PriorityModelPolicy_var &p)
-{
-  this->ptr_ = ::RTCORBA::PriorityModelPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE RTCORBA::PriorityModelPolicy_out &
-RTCORBA::PriorityModelPolicy_out::operator= (PriorityModelPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::PriorityModelPolicy_out::operator ::RTCORBA::PriorityModelPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityModelPolicy_ptr &
-RTCORBA::PriorityModelPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityModelPolicy_ptr
-RTCORBA::PriorityModelPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_THREADPOOLPOLICY___VAR_CI_)
-#define _RTCORBA_THREADPOOLPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::ThreadpoolPolicy_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::ThreadpoolPolicy_var::ThreadpoolPolicy_var (void) // default constructor
-  : ptr_ (ThreadpoolPolicy::_nil ())
-{}
-
-ACE_INLINE ::RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::ThreadpoolPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolPolicy_var::ThreadpoolPolicy_var (const ::RTCORBA::ThreadpoolPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ThreadpoolPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RTCORBA::ThreadpoolPolicy_var::~ThreadpoolPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RTCORBA::ThreadpoolPolicy_var &
-RTCORBA::ThreadpoolPolicy_var::operator= (ThreadpoolPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::ThreadpoolPolicy_var &
-RTCORBA::ThreadpoolPolicy_var::operator= (const ::RTCORBA::ThreadpoolPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolPolicy_var::operator const ::RTCORBA::ThreadpoolPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolPolicy_var::operator ::RTCORBA::ThreadpoolPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::ThreadpoolPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::ThreadpoolPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ThreadpoolPolicy_ptr &
-RTCORBA::ThreadpoolPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ThreadpoolPolicy_ptr &
-RTCORBA::ThreadpoolPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::ThreadpoolPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::ThreadpoolPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_THREADPOOLPOLICY___OUT_CI_)
-#define _RTCORBA_THREADPOOLPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::ThreadpoolPolicy_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (ThreadpoolPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (ThreadpoolPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::ThreadpoolPolicy_out::ThreadpoolPolicy_out (const ::RTCORBA::ThreadpoolPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ThreadpoolPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::RTCORBA::ThreadpoolPolicy_out &
-RTCORBA::ThreadpoolPolicy_out::operator= (const ::RTCORBA::ThreadpoolPolicy_out &p)
+ACE_INLINE RTCORBA::PriorityModelPolicy_ptr
+tao_RTCORBA_PriorityModelPolicy_duplicate (
+    RTCORBA::PriorityModelPolicy_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (ThreadpoolPolicy_out&, p).ptr_;
-  return *this;
+  return RTCORBA::PriorityModelPolicy::_duplicate (p);
 }
 
-ACE_INLINE RTCORBA::ThreadpoolPolicy_out &
-RTCORBA::ThreadpoolPolicy_out::operator= (const ::RTCORBA::ThreadpoolPolicy_var &p)
-{
-  this->ptr_ = ::RTCORBA::ThreadpoolPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE RTCORBA::ThreadpoolPolicy_out &
-RTCORBA::ThreadpoolPolicy_out::operator= (ThreadpoolPolicy_ptr p)
+ACE_INLINE void
+tao_RTCORBA_PriorityModelPolicy_release (
+    RTCORBA::PriorityModelPolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-RTCORBA::ThreadpoolPolicy_out::operator ::RTCORBA::ThreadpoolPolicy_ptr &() // cast
+ACE_INLINE RTCORBA::PriorityModelPolicy_ptr
+tao_RTCORBA_PriorityModelPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return RTCORBA::PriorityModelPolicy::_nil ();
 }
 
-ACE_INLINE ::RTCORBA::ThreadpoolPolicy_ptr &
-RTCORBA::ThreadpoolPolicy_out::ptr (void) // ptr
+ACE_INLINE RTCORBA::PriorityModelPolicy_ptr
+tao_RTCORBA_PriorityModelPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return RTCORBA::PriorityModelPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::RTCORBA::ThreadpoolPolicy_ptr
-RTCORBA::ThreadpoolPolicy_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_RTCORBA_PriorityModelPolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  RTCORBA::PriorityModelPolicy **tmp =
+    ACE_static_cast (RTCORBA::PriorityModelPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PROTOCOLPROPERTIES___VAR_CI_)
-#define _RTCORBA_PROTOCOLPROPERTIES___VAR_CI_
+#if !defined (_RTCORBA_THREADPOOLPOLICY___CI_)
+#define _RTCORBA_THREADPOOLPOLICY___CI_
 
-// *************************************************************
-// Inline operations for class RTCORBA::ProtocolProperties_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::ProtocolProperties_var::ProtocolProperties_var (void) // default constructor
-  : ptr_ (ProtocolProperties::_nil ())
-{}
-
-ACE_INLINE ::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ProtocolProperties_var::ProtocolProperties_var (const ::RTCORBA::ProtocolProperties_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ProtocolProperties::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RTCORBA::ProtocolProperties_var::~ProtocolProperties_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RTCORBA::ProtocolProperties_var &
-RTCORBA::ProtocolProperties_var::operator= (ProtocolProperties_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::ProtocolProperties_var &
-RTCORBA::ProtocolProperties_var::operator= (const ::RTCORBA::ProtocolProperties_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::ProtocolProperties::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::ProtocolProperties_var::operator const ::RTCORBA::ProtocolProperties_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ProtocolProperties_var::operator ::RTCORBA::ProtocolProperties_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_var::operator-> (void) const
+ACE_INLINE RTCORBA::ThreadpoolPolicy_ptr
+tao_RTCORBA_ThreadpoolPolicy_duplicate (
+    RTCORBA::ThreadpoolPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  return RTCORBA::ThreadpoolPolicy::_duplicate (p);
 }
 
-ACE_INLINE ::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_var::in (void) const
+ACE_INLINE void
+tao_RTCORBA_ThreadpoolPolicy_release (
+    RTCORBA::ThreadpoolPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::RTCORBA::ProtocolProperties_ptr &
-RTCORBA::ProtocolProperties_var::inout (void)
+ACE_INLINE RTCORBA::ThreadpoolPolicy_ptr
+tao_RTCORBA_ThreadpoolPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return RTCORBA::ThreadpoolPolicy::_nil ();
 }
 
-ACE_INLINE ::RTCORBA::ProtocolProperties_ptr &
-RTCORBA::ProtocolProperties_var::out (void)
+ACE_INLINE RTCORBA::ThreadpoolPolicy_ptr
+tao_RTCORBA_ThreadpoolPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
-  return this->ptr_;
+  return RTCORBA::ThreadpoolPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_RTCORBA_ThreadpoolPolicy_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::RTCORBA::ProtocolProperties_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
-  return val;
+  RTCORBA::ThreadpoolPolicy **tmp =
+    ACE_static_cast (RTCORBA::ThreadpoolPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PROTOCOLPROPERTIES___OUT_CI_)
-#define _RTCORBA_PROTOCOLPROPERTIES___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::ProtocolProperties_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::ProtocolProperties_out::ProtocolProperties_out (ProtocolProperties_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::ProtocolProperties_out::ProtocolProperties_out (ProtocolProperties_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ProtocolProperties::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::ProtocolProperties_out::ProtocolProperties_out (const ::RTCORBA::ProtocolProperties_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ProtocolProperties_out &, p).ptr_)
-{}
-
-ACE_INLINE ::RTCORBA::ProtocolProperties_out &
-RTCORBA::ProtocolProperties_out::operator= (const ::RTCORBA::ProtocolProperties_out &p)
-{
-  this->ptr_ = ACE_const_cast (ProtocolProperties_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_RTCORBA_PROTOCOLPROPERTIES___CI_)
+#define _RTCORBA_PROTOCOLPROPERTIES___CI_
 
-ACE_INLINE RTCORBA::ProtocolProperties_out &
-RTCORBA::ProtocolProperties_out::operator= (const ::RTCORBA::ProtocolProperties_var &p)
+ACE_INLINE RTCORBA::ProtocolProperties_ptr
+tao_RTCORBA_ProtocolProperties_duplicate (
+    RTCORBA::ProtocolProperties_ptr p
+  )
 {
-  this->ptr_ = ::RTCORBA::ProtocolProperties::_duplicate (p.ptr ());
-  return *this;
+  return RTCORBA::ProtocolProperties::_duplicate (p);
 }
 
-ACE_INLINE RTCORBA::ProtocolProperties_out &
-RTCORBA::ProtocolProperties_out::operator= (ProtocolProperties_ptr p)
+ACE_INLINE void
+tao_RTCORBA_ProtocolProperties_release (
+    RTCORBA::ProtocolProperties_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-RTCORBA::ProtocolProperties_out::operator ::RTCORBA::ProtocolProperties_ptr &() // cast
+ACE_INLINE RTCORBA::ProtocolProperties_ptr
+tao_RTCORBA_ProtocolProperties_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return RTCORBA::ProtocolProperties::_nil ();
 }
 
-ACE_INLINE ::RTCORBA::ProtocolProperties_ptr &
-RTCORBA::ProtocolProperties_out::ptr (void) // ptr
+ACE_INLINE RTCORBA::ProtocolProperties_ptr
+tao_RTCORBA_ProtocolProperties_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return RTCORBA::ProtocolProperties::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::RTCORBA::ProtocolProperties_ptr
-RTCORBA::ProtocolProperties_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_RTCORBA_ProtocolProperties_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  RTCORBA::ProtocolProperties **tmp =
+    ACE_static_cast (RTCORBA::ProtocolProperties **, src);
+  return *tmp;
 }
 
 
@@ -1668,1190 +1308,350 @@ RTCORBA::ProtocolList_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___VAR_CI_)
-#define _RTCORBA_SERVERPROTOCOLPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::ServerProtocolPolicy_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_var::ServerProtocolPolicy_var (void) // default constructor
-  : ptr_ (ServerProtocolPolicy::_nil ())
-{}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_var::ServerProtocolPolicy_var (const ::RTCORBA::ServerProtocolPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ServerProtocolPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_var::~ServerProtocolPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RTCORBA::ServerProtocolPolicy_var &
-RTCORBA::ServerProtocolPolicy_var::operator= (ServerProtocolPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::ServerProtocolPolicy_var &
-RTCORBA::ServerProtocolPolicy_var::operator= (const ::RTCORBA::ServerProtocolPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_var::operator const ::RTCORBA::ServerProtocolPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_var::operator ::RTCORBA::ServerProtocolPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr &
-RTCORBA::ServerProtocolPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr &
-RTCORBA::ServerProtocolPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::ServerProtocolPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___OUT_CI_)
-#define _RTCORBA_SERVERPROTOCOLPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::ServerProtocolPolicy_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (ServerProtocolPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (ServerProtocolPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_out::ServerProtocolPolicy_out (const ::RTCORBA::ServerProtocolPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServerProtocolPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_out &
-RTCORBA::ServerProtocolPolicy_out::operator= (const ::RTCORBA::ServerProtocolPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ServerProtocolPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::ServerProtocolPolicy_out &
-RTCORBA::ServerProtocolPolicy_out::operator= (const ::RTCORBA::ServerProtocolPolicy_var &p)
-{
-  this->ptr_ = ::RTCORBA::ServerProtocolPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE RTCORBA::ServerProtocolPolicy_out &
-RTCORBA::ServerProtocolPolicy_out::operator= (ServerProtocolPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::ServerProtocolPolicy_out::operator ::RTCORBA::ServerProtocolPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr &
-RTCORBA::ServerProtocolPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ServerProtocolPolicy_ptr
-RTCORBA::ServerProtocolPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___VAR_CI_)
-#define _RTCORBA_CLIENTPROTOCOLPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::ClientProtocolPolicy_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::ClientProtocolPolicy_var::ClientProtocolPolicy_var (void) // default constructor
-  : ptr_ (ClientProtocolPolicy::_nil ())
-{}
-
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ClientProtocolPolicy_var::ClientProtocolPolicy_var (const ::RTCORBA::ClientProtocolPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ClientProtocolPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RTCORBA::ClientProtocolPolicy_var::~ClientProtocolPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RTCORBA::ClientProtocolPolicy_var &
-RTCORBA::ClientProtocolPolicy_var::operator= (ClientProtocolPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::ClientProtocolPolicy_var &
-RTCORBA::ClientProtocolPolicy_var::operator= (const ::RTCORBA::ClientProtocolPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::ClientProtocolPolicy_var::operator const ::RTCORBA::ClientProtocolPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::ClientProtocolPolicy_var::operator ::RTCORBA::ClientProtocolPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr &
-RTCORBA::ClientProtocolPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr &
-RTCORBA::ClientProtocolPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::ClientProtocolPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___OUT_CI_)
-#define _RTCORBA_CLIENTPROTOCOLPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::ClientProtocolPolicy_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (ClientProtocolPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (ClientProtocolPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::ClientProtocolPolicy_out::ClientProtocolPolicy_out (const ::RTCORBA::ClientProtocolPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ClientProtocolPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_out &
-RTCORBA::ClientProtocolPolicy_out::operator= (const ::RTCORBA::ClientProtocolPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ClientProtocolPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::ClientProtocolPolicy_out &
-RTCORBA::ClientProtocolPolicy_out::operator= (const ::RTCORBA::ClientProtocolPolicy_var &p)
-{
-  this->ptr_ = ::RTCORBA::ClientProtocolPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE RTCORBA::ClientProtocolPolicy_out &
-RTCORBA::ClientProtocolPolicy_out::operator= (ClientProtocolPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::ClientProtocolPolicy_out::operator ::RTCORBA::ClientProtocolPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr &
-RTCORBA::ClientProtocolPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::ClientProtocolPolicy_ptr
-RTCORBA::ClientProtocolPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___VAR_CI_)
-#define _RTCORBA_PRIVATECONNECTIONPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::PrivateConnectionPolicy_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_var::PrivateConnectionPolicy_var (void) // default constructor
-  : ptr_ (PrivateConnectionPolicy::_nil ())
-{}
-
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_var::PrivateConnectionPolicy_var (const ::RTCORBA::PrivateConnectionPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (PrivateConnectionPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_var::~PrivateConnectionPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RTCORBA::PrivateConnectionPolicy_var &
-RTCORBA::PrivateConnectionPolicy_var::operator= (PrivateConnectionPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::PrivateConnectionPolicy_var &
-RTCORBA::PrivateConnectionPolicy_var::operator= (const ::RTCORBA::PrivateConnectionPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_var::operator const ::RTCORBA::PrivateConnectionPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_var::operator ::RTCORBA::PrivateConnectionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr &
-RTCORBA::PrivateConnectionPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr &
-RTCORBA::PrivateConnectionPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::PrivateConnectionPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___OUT_CI_)
-#define _RTCORBA_PRIVATECONNECTIONPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::PrivateConnectionPolicy_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (PrivateConnectionPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (PrivateConnectionPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_out::PrivateConnectionPolicy_out (const ::RTCORBA::PrivateConnectionPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (PrivateConnectionPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_out &
-RTCORBA::PrivateConnectionPolicy_out::operator= (const ::RTCORBA::PrivateConnectionPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (PrivateConnectionPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::PrivateConnectionPolicy_out &
-RTCORBA::PrivateConnectionPolicy_out::operator= (const ::RTCORBA::PrivateConnectionPolicy_var &p)
-{
-  this->ptr_ = ::RTCORBA::PrivateConnectionPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE RTCORBA::PrivateConnectionPolicy_out &
-RTCORBA::PrivateConnectionPolicy_out::operator= (PrivateConnectionPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::PrivateConnectionPolicy_out::operator ::RTCORBA::PrivateConnectionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr &
-RTCORBA::PrivateConnectionPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PrivateConnectionPolicy_ptr
-RTCORBA::PrivateConnectionPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___VAR_CI_)
-#define _RTCORBA_TCPPROTOCOLPROPERTIES___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::TCPProtocolProperties_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::TCPProtocolProperties_var::TCPProtocolProperties_var (void) // default constructor
-  : ptr_ (TCPProtocolProperties::_nil ())
-{}
-
-ACE_INLINE ::RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::TCPProtocolProperties_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::TCPProtocolProperties_var::TCPProtocolProperties_var (const ::RTCORBA::TCPProtocolProperties_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (TCPProtocolProperties::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RTCORBA::TCPProtocolProperties_var::~TCPProtocolProperties_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RTCORBA::TCPProtocolProperties_var &
-RTCORBA::TCPProtocolProperties_var::operator= (TCPProtocolProperties_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::TCPProtocolProperties_var &
-RTCORBA::TCPProtocolProperties_var::operator= (const ::RTCORBA::TCPProtocolProperties_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::TCPProtocolProperties::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::TCPProtocolProperties_var::operator const ::RTCORBA::TCPProtocolProperties_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::TCPProtocolProperties_var::operator ::RTCORBA::TCPProtocolProperties_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::TCPProtocolProperties_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::TCPProtocolProperties_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::TCPProtocolProperties_ptr &
-RTCORBA::TCPProtocolProperties_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::TCPProtocolProperties_ptr &
-RTCORBA::TCPProtocolProperties_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::TCPProtocolProperties::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::TCPProtocolProperties_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::TCPProtocolProperties_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::TCPProtocolProperties::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___OUT_CI_)
-#define _RTCORBA_TCPPROTOCOLPROPERTIES___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::TCPProtocolProperties_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (TCPProtocolProperties_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::TCPProtocolProperties::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (TCPProtocolProperties_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::TCPProtocolProperties::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::TCPProtocolProperties_out::TCPProtocolProperties_out (const ::RTCORBA::TCPProtocolProperties_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (TCPProtocolProperties_out &, p).ptr_)
-{}
+#if !defined (_RTCORBA_SERVERPROTOCOLPOLICY___CI_)
+#define _RTCORBA_SERVERPROTOCOLPOLICY___CI_
 
-ACE_INLINE ::RTCORBA::TCPProtocolProperties_out &
-RTCORBA::TCPProtocolProperties_out::operator= (const ::RTCORBA::TCPProtocolProperties_out &p)
-{
-  this->ptr_ = ACE_const_cast (TCPProtocolProperties_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::TCPProtocolProperties_out &
-RTCORBA::TCPProtocolProperties_out::operator= (const ::RTCORBA::TCPProtocolProperties_var &p)
+ACE_INLINE RTCORBA::ServerProtocolPolicy_ptr
+tao_RTCORBA_ServerProtocolPolicy_duplicate (
+    RTCORBA::ServerProtocolPolicy_ptr p
+  )
 {
-  this->ptr_ = ::RTCORBA::TCPProtocolProperties::_duplicate (p.ptr ());
-  return *this;
+  return RTCORBA::ServerProtocolPolicy::_duplicate (p);
 }
 
-ACE_INLINE RTCORBA::TCPProtocolProperties_out &
-RTCORBA::TCPProtocolProperties_out::operator= (TCPProtocolProperties_ptr p)
+ACE_INLINE void
+tao_RTCORBA_ServerProtocolPolicy_release (
+    RTCORBA::ServerProtocolPolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-RTCORBA::TCPProtocolProperties_out::operator ::RTCORBA::TCPProtocolProperties_ptr &() // cast
+ACE_INLINE RTCORBA::ServerProtocolPolicy_ptr
+tao_RTCORBA_ServerProtocolPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return RTCORBA::ServerProtocolPolicy::_nil ();
 }
 
-ACE_INLINE ::RTCORBA::TCPProtocolProperties_ptr &
-RTCORBA::TCPProtocolProperties_out::ptr (void) // ptr
+ACE_INLINE RTCORBA::ServerProtocolPolicy_ptr
+tao_RTCORBA_ServerProtocolPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return RTCORBA::ServerProtocolPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::RTCORBA::TCPProtocolProperties_ptr
-RTCORBA::TCPProtocolProperties_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_RTCORBA_ServerProtocolPolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  RTCORBA::ServerProtocolPolicy **tmp =
+    ACE_static_cast (RTCORBA::ServerProtocolPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___VAR_CI_)
-#define _RTCORBA_GIOPPROTOCOLPROPERTIES___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::GIOPProtocolProperties_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::GIOPProtocolProperties_var::GIOPProtocolProperties_var (void) // default constructor
-  : ptr_ (GIOPProtocolProperties::_nil ())
-{}
-
-ACE_INLINE ::RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::GIOPProtocolProperties_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::GIOPProtocolProperties_var::GIOPProtocolProperties_var (const ::RTCORBA::GIOPProtocolProperties_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (GIOPProtocolProperties::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RTCORBA::GIOPProtocolProperties_var::~GIOPProtocolProperties_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RTCORBA::GIOPProtocolProperties_var &
-RTCORBA::GIOPProtocolProperties_var::operator= (GIOPProtocolProperties_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::GIOPProtocolProperties_var &
-RTCORBA::GIOPProtocolProperties_var::operator= (const ::RTCORBA::GIOPProtocolProperties_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::GIOPProtocolProperties_var::operator const ::RTCORBA::GIOPProtocolProperties_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::GIOPProtocolProperties_var::operator ::RTCORBA::GIOPProtocolProperties_ptr &() // cast
-{
-  return this->ptr_;
-}
+#if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY___CI_)
+#define _RTCORBA_CLIENTPROTOCOLPOLICY___CI_
 
-ACE_INLINE ::RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::GIOPProtocolProperties_var::operator-> (void) const
+ACE_INLINE RTCORBA::ClientProtocolPolicy_ptr
+tao_RTCORBA_ClientProtocolPolicy_duplicate (
+    RTCORBA::ClientProtocolPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  return RTCORBA::ClientProtocolPolicy::_duplicate (p);
 }
 
-ACE_INLINE ::RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::GIOPProtocolProperties_var::in (void) const
+ACE_INLINE void
+tao_RTCORBA_ClientProtocolPolicy_release (
+    RTCORBA::ClientProtocolPolicy_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::RTCORBA::GIOPProtocolProperties_ptr &
-RTCORBA::GIOPProtocolProperties_var::inout (void)
+ACE_INLINE RTCORBA::ClientProtocolPolicy_ptr
+tao_RTCORBA_ClientProtocolPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return RTCORBA::ClientProtocolPolicy::_nil ();
 }
 
-ACE_INLINE ::RTCORBA::GIOPProtocolProperties_ptr &
-RTCORBA::GIOPProtocolProperties_var::out (void)
+ACE_INLINE RTCORBA::ClientProtocolPolicy_ptr
+tao_RTCORBA_ClientProtocolPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_nil ();
-  return this->ptr_;
+  return RTCORBA::ClientProtocolPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::GIOPProtocolProperties_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_RTCORBA_ClientProtocolPolicy_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::RTCORBA::GIOPProtocolProperties_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_nil ();
-  return val;
+  RTCORBA::ClientProtocolPolicy **tmp =
+    ACE_static_cast (RTCORBA::ClientProtocolPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___OUT_CI_)
-#define _RTCORBA_GIOPPROTOCOLPROPERTIES___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::GIOPProtocolProperties_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (GIOPProtocolProperties_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (GIOPProtocolProperties_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::GIOPProtocolProperties_out::GIOPProtocolProperties_out (const ::RTCORBA::GIOPProtocolProperties_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (GIOPProtocolProperties_out &, p).ptr_)
-{}
-
-ACE_INLINE ::RTCORBA::GIOPProtocolProperties_out &
-RTCORBA::GIOPProtocolProperties_out::operator= (const ::RTCORBA::GIOPProtocolProperties_out &p)
-{
-  this->ptr_ = ACE_const_cast (GIOPProtocolProperties_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY___CI_)
+#define _RTCORBA_PRIVATECONNECTIONPOLICY___CI_
 
-ACE_INLINE RTCORBA::GIOPProtocolProperties_out &
-RTCORBA::GIOPProtocolProperties_out::operator= (const ::RTCORBA::GIOPProtocolProperties_var &p)
+ACE_INLINE RTCORBA::PrivateConnectionPolicy_ptr
+tao_RTCORBA_PrivateConnectionPolicy_duplicate (
+    RTCORBA::PrivateConnectionPolicy_ptr p
+  )
 {
-  this->ptr_ = ::RTCORBA::GIOPProtocolProperties::_duplicate (p.ptr ());
-  return *this;
+  return RTCORBA::PrivateConnectionPolicy::_duplicate (p);
 }
 
-ACE_INLINE RTCORBA::GIOPProtocolProperties_out &
-RTCORBA::GIOPProtocolProperties_out::operator= (GIOPProtocolProperties_ptr p)
+ACE_INLINE void
+tao_RTCORBA_PrivateConnectionPolicy_release (
+    RTCORBA::PrivateConnectionPolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-RTCORBA::GIOPProtocolProperties_out::operator ::RTCORBA::GIOPProtocolProperties_ptr &() // cast
+ACE_INLINE RTCORBA::PrivateConnectionPolicy_ptr
+tao_RTCORBA_PrivateConnectionPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return RTCORBA::PrivateConnectionPolicy::_nil ();
 }
 
-ACE_INLINE ::RTCORBA::GIOPProtocolProperties_ptr &
-RTCORBA::GIOPProtocolProperties_out::ptr (void) // ptr
+ACE_INLINE RTCORBA::PrivateConnectionPolicy_ptr
+tao_RTCORBA_PrivateConnectionPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return RTCORBA::PrivateConnectionPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::RTCORBA::GIOPProtocolProperties_ptr
-RTCORBA::GIOPProtocolProperties_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_RTCORBA_PrivateConnectionPolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  RTCORBA::PrivateConnectionPolicy **tmp =
+    ACE_static_cast (RTCORBA::PrivateConnectionPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___VAR_CI_)
-#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___VAR_CI_
+#if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES___CI_)
+#define _RTCORBA_TCPPROTOCOLPROPERTIES___CI_
 
-// *************************************************************
-// Inline operations for class RTCORBA::UnixDomainProtocolProperties_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::UnixDomainProtocolProperties_var::UnixDomainProtocolProperties_var (void) // default constructor
-  : ptr_ (UnixDomainProtocolProperties::_nil ())
-{}
-
-ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::UnixDomainProtocolProperties_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::UnixDomainProtocolProperties_var::UnixDomainProtocolProperties_var (const ::RTCORBA::UnixDomainProtocolProperties_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (UnixDomainProtocolProperties::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RTCORBA::UnixDomainProtocolProperties_var::~UnixDomainProtocolProperties_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RTCORBA::UnixDomainProtocolProperties_var &
-RTCORBA::UnixDomainProtocolProperties_var::operator= (UnixDomainProtocolProperties_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::UnixDomainProtocolProperties_var &
-RTCORBA::UnixDomainProtocolProperties_var::operator= (const ::RTCORBA::UnixDomainProtocolProperties_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::UnixDomainProtocolProperties_var::operator const ::RTCORBA::UnixDomainProtocolProperties_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::UnixDomainProtocolProperties_var::operator ::RTCORBA::UnixDomainProtocolProperties_ptr &() // cast
+ACE_INLINE RTCORBA::TCPProtocolProperties_ptr
+tao_RTCORBA_TCPProtocolProperties_duplicate (
+    RTCORBA::TCPProtocolProperties_ptr p
+  )
 {
-  return this->ptr_;
+  return RTCORBA::TCPProtocolProperties::_duplicate (p);
 }
 
-ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::UnixDomainProtocolProperties_var::operator-> (void) const
+ACE_INLINE void
+tao_RTCORBA_TCPProtocolProperties_release (
+    RTCORBA::TCPProtocolProperties_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::UnixDomainProtocolProperties_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_ptr &
-RTCORBA::UnixDomainProtocolProperties_var::inout (void)
+ACE_INLINE RTCORBA::TCPProtocolProperties_ptr
+tao_RTCORBA_TCPProtocolProperties_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return RTCORBA::TCPProtocolProperties::_nil ();
 }
 
-ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_ptr &
-RTCORBA::UnixDomainProtocolProperties_var::out (void)
+ACE_INLINE RTCORBA::TCPProtocolProperties_ptr
+tao_RTCORBA_TCPProtocolProperties_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil ();
-  return this->ptr_;
+  return RTCORBA::TCPProtocolProperties::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::UnixDomainProtocolProperties_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_RTCORBA_TCPProtocolProperties_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::RTCORBA::UnixDomainProtocolProperties_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil ();
-  return val;
+  RTCORBA::TCPProtocolProperties **tmp =
+    ACE_static_cast (RTCORBA::TCPProtocolProperties **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___OUT_CI_)
-#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::UnixDomainProtocolProperties_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (UnixDomainProtocolProperties_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::UnixDomainProtocolProperties_out::UnixDomainProtocolProperties_out (const ::RTCORBA::UnixDomainProtocolProperties_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (UnixDomainProtocolProperties_out &, p).ptr_)
-{}
-
-ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_out &
-RTCORBA::UnixDomainProtocolProperties_out::operator= (const ::RTCORBA::UnixDomainProtocolProperties_out &p)
-{
-  this->ptr_ = ACE_const_cast (UnixDomainProtocolProperties_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES___CI_)
+#define _RTCORBA_GIOPPROTOCOLPROPERTIES___CI_
 
-ACE_INLINE RTCORBA::UnixDomainProtocolProperties_out &
-RTCORBA::UnixDomainProtocolProperties_out::operator= (const ::RTCORBA::UnixDomainProtocolProperties_var &p)
+ACE_INLINE RTCORBA::GIOPProtocolProperties_ptr
+tao_RTCORBA_GIOPProtocolProperties_duplicate (
+    RTCORBA::GIOPProtocolProperties_ptr p
+  )
 {
-  this->ptr_ = ::RTCORBA::UnixDomainProtocolProperties::_duplicate (p.ptr ());
-  return *this;
+  return RTCORBA::GIOPProtocolProperties::_duplicate (p);
 }
 
-ACE_INLINE RTCORBA::UnixDomainProtocolProperties_out &
-RTCORBA::UnixDomainProtocolProperties_out::operator= (UnixDomainProtocolProperties_ptr p)
+ACE_INLINE void
+tao_RTCORBA_GIOPProtocolProperties_release (
+    RTCORBA::GIOPProtocolProperties_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-RTCORBA::UnixDomainProtocolProperties_out::operator ::RTCORBA::UnixDomainProtocolProperties_ptr &() // cast
+ACE_INLINE RTCORBA::GIOPProtocolProperties_ptr
+tao_RTCORBA_GIOPProtocolProperties_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return RTCORBA::GIOPProtocolProperties::_nil ();
 }
 
-ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_ptr &
-RTCORBA::UnixDomainProtocolProperties_out::ptr (void) // ptr
+ACE_INLINE RTCORBA::GIOPProtocolProperties_ptr
+tao_RTCORBA_GIOPProtocolProperties_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return RTCORBA::GIOPProtocolProperties::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::RTCORBA::UnixDomainProtocolProperties_ptr
-RTCORBA::UnixDomainProtocolProperties_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_RTCORBA_GIOPProtocolProperties_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  RTCORBA::GIOPProtocolProperties **tmp =
+    ACE_static_cast (RTCORBA::GIOPProtocolProperties **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___VAR_CI_)
-#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___VAR_CI_
+#if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___CI_)
+#define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES___CI_
 
-// *************************************************************
-// Inline operations for class RTCORBA::SharedMemoryProtocolProperties_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::SharedMemoryProtocolProperties_var::SharedMemoryProtocolProperties_var (void) // default constructor
-  : ptr_ (SharedMemoryProtocolProperties::_nil ())
-{}
-
-ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::SharedMemoryProtocolProperties_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::SharedMemoryProtocolProperties_var::SharedMemoryProtocolProperties_var (const ::RTCORBA::SharedMemoryProtocolProperties_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (SharedMemoryProtocolProperties::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RTCORBA::SharedMemoryProtocolProperties_var::~SharedMemoryProtocolProperties_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RTCORBA::SharedMemoryProtocolProperties_var &
-RTCORBA::SharedMemoryProtocolProperties_var::operator= (SharedMemoryProtocolProperties_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::SharedMemoryProtocolProperties_var &
-RTCORBA::SharedMemoryProtocolProperties_var::operator= (const ::RTCORBA::SharedMemoryProtocolProperties_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::SharedMemoryProtocolProperties_var::operator const ::RTCORBA::SharedMemoryProtocolProperties_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::SharedMemoryProtocolProperties_var::operator ::RTCORBA::SharedMemoryProtocolProperties_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::SharedMemoryProtocolProperties_var::operator-> (void) const
+ACE_INLINE RTCORBA::UnixDomainProtocolProperties_ptr
+tao_RTCORBA_UnixDomainProtocolProperties_duplicate (
+    RTCORBA::UnixDomainProtocolProperties_ptr p
+  )
 {
-  return this->ptr_;
+  return RTCORBA::UnixDomainProtocolProperties::_duplicate (p);
 }
 
-ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::SharedMemoryProtocolProperties_var::in (void) const
+ACE_INLINE void
+tao_RTCORBA_UnixDomainProtocolProperties_release (
+    RTCORBA::UnixDomainProtocolProperties_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_ptr &
-RTCORBA::SharedMemoryProtocolProperties_var::inout (void)
+ACE_INLINE RTCORBA::UnixDomainProtocolProperties_ptr
+tao_RTCORBA_UnixDomainProtocolProperties_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return RTCORBA::UnixDomainProtocolProperties::_nil ();
 }
 
-ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_ptr &
-RTCORBA::SharedMemoryProtocolProperties_var::out (void)
+ACE_INLINE RTCORBA::UnixDomainProtocolProperties_ptr
+tao_RTCORBA_UnixDomainProtocolProperties_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil ();
-  return this->ptr_;
+  return RTCORBA::UnixDomainProtocolProperties::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::SharedMemoryProtocolProperties_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_RTCORBA_UnixDomainProtocolProperties_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::RTCORBA::SharedMemoryProtocolProperties_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil ();
-  return val;
+  RTCORBA::UnixDomainProtocolProperties **tmp =
+    ACE_static_cast (RTCORBA::UnixDomainProtocolProperties **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___OUT_CI_)
-#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::SharedMemoryProtocolProperties_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (SharedMemoryProtocolProperties_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::SharedMemoryProtocolProperties_out::SharedMemoryProtocolProperties_out (const ::RTCORBA::SharedMemoryProtocolProperties_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (SharedMemoryProtocolProperties_out &, p).ptr_)
-{}
-
-ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_out &
-RTCORBA::SharedMemoryProtocolProperties_out::operator= (const ::RTCORBA::SharedMemoryProtocolProperties_out &p)
-{
-  this->ptr_ = ACE_const_cast (SharedMemoryProtocolProperties_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___CI_)
+#define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES___CI_
 
-ACE_INLINE RTCORBA::SharedMemoryProtocolProperties_out &
-RTCORBA::SharedMemoryProtocolProperties_out::operator= (const ::RTCORBA::SharedMemoryProtocolProperties_var &p)
+ACE_INLINE RTCORBA::SharedMemoryProtocolProperties_ptr
+tao_RTCORBA_SharedMemoryProtocolProperties_duplicate (
+    RTCORBA::SharedMemoryProtocolProperties_ptr p
+  )
 {
-  this->ptr_ = ::RTCORBA::SharedMemoryProtocolProperties::_duplicate (p.ptr ());
-  return *this;
+  return RTCORBA::SharedMemoryProtocolProperties::_duplicate (p);
 }
 
-ACE_INLINE RTCORBA::SharedMemoryProtocolProperties_out &
-RTCORBA::SharedMemoryProtocolProperties_out::operator= (SharedMemoryProtocolProperties_ptr p)
+ACE_INLINE void
+tao_RTCORBA_SharedMemoryProtocolProperties_release (
+    RTCORBA::SharedMemoryProtocolProperties_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-RTCORBA::SharedMemoryProtocolProperties_out::operator ::RTCORBA::SharedMemoryProtocolProperties_ptr &() // cast
+ACE_INLINE RTCORBA::SharedMemoryProtocolProperties_ptr
+tao_RTCORBA_SharedMemoryProtocolProperties_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return RTCORBA::SharedMemoryProtocolProperties::_nil ();
 }
 
-ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_ptr &
-RTCORBA::SharedMemoryProtocolProperties_out::ptr (void) // ptr
+ACE_INLINE RTCORBA::SharedMemoryProtocolProperties_ptr
+tao_RTCORBA_SharedMemoryProtocolProperties_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return RTCORBA::SharedMemoryProtocolProperties::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::RTCORBA::SharedMemoryProtocolProperties_ptr
-RTCORBA::SharedMemoryProtocolProperties_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_RTCORBA_SharedMemoryProtocolProperties_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  RTCORBA::SharedMemoryProtocolProperties **tmp =
+    ACE_static_cast (RTCORBA::SharedMemoryProtocolProperties **, src);
+  return *tmp;
 }
 
 
@@ -3409,510 +2209,150 @@ RTCORBA::PriorityBands_out::operator[] (CORBA::ULong index)
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___VAR_CI_)
-#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::PriorityBandedConnectionPolicy_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_var::PriorityBandedConnectionPolicy_var (void) // default constructor
-  : ptr_ (PriorityBandedConnectionPolicy::_nil ())
-{}
+#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___CI_)
+#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___CI_
 
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_var::PriorityBandedConnectionPolicy_var (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (PriorityBandedConnectionPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_var::~PriorityBandedConnectionPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_var &
-RTCORBA::PriorityBandedConnectionPolicy_var::operator= (PriorityBandedConnectionPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_var &
-RTCORBA::PriorityBandedConnectionPolicy_var::operator= (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_var::operator const ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_var::operator ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr &
-RTCORBA::PriorityBandedConnectionPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr &
-RTCORBA::PriorityBandedConnectionPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::PriorityBandedConnectionPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___OUT_CI_)
-#define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::PriorityBandedConnectionPolicy_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (PriorityBandedConnectionPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_out::PriorityBandedConnectionPolicy_out (const ::RTCORBA::PriorityBandedConnectionPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (PriorityBandedConnectionPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_out &
-RTCORBA::PriorityBandedConnectionPolicy_out::operator= (const ::RTCORBA::PriorityBandedConnectionPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (PriorityBandedConnectionPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_out &
-RTCORBA::PriorityBandedConnectionPolicy_out::operator= (const ::RTCORBA::PriorityBandedConnectionPolicy_var &p)
-{
-  this->ptr_ = ::RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_out &
-RTCORBA::PriorityBandedConnectionPolicy_out::operator= (PriorityBandedConnectionPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::PriorityBandedConnectionPolicy_out::operator ::RTCORBA::PriorityBandedConnectionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr &
-RTCORBA::PriorityBandedConnectionPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::PriorityBandedConnectionPolicy_ptr
-RTCORBA::PriorityBandedConnectionPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_CURRENT___VAR_CI_)
-#define _RTCORBA_CURRENT___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::Current_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::Current_var::Current_var (void) // default constructor
-  : ptr_ (Current::_nil ())
-{}
-
-ACE_INLINE ::RTCORBA::Current_ptr
-RTCORBA::Current_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::Current_var::Current_var (const ::RTCORBA::Current_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (Current::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RTCORBA::Current_var::~Current_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RTCORBA::Current_var &
-RTCORBA::Current_var::operator= (Current_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::Current_var &
-RTCORBA::Current_var::operator= (const ::RTCORBA::Current_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::Current::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::Current_var::operator const ::RTCORBA::Current_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::Current_var::operator ::RTCORBA::Current_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::Current_ptr
-RTCORBA::Current_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::Current_ptr
-RTCORBA::Current_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::Current_ptr &
-RTCORBA::Current_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::Current_ptr &
-RTCORBA::Current_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::Current::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::Current_ptr
-RTCORBA::Current_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::Current_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::Current::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_CURRENT___OUT_CI_)
-#define _RTCORBA_CURRENT___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::Current_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::Current_out::Current_out (Current_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::Current::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::Current_out::Current_out (Current_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::Current::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::Current_out::Current_out (const ::RTCORBA::Current_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Current_out &, p).ptr_)
-{}
-
-ACE_INLINE ::RTCORBA::Current_out &
-RTCORBA::Current_out::operator= (const ::RTCORBA::Current_out &p)
+ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_ptr
+tao_RTCORBA_PriorityBandedConnectionPolicy_duplicate (
+    RTCORBA::PriorityBandedConnectionPolicy_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (Current_out&, p).ptr_;
-  return *this;
+  return RTCORBA::PriorityBandedConnectionPolicy::_duplicate (p);
 }
 
-ACE_INLINE RTCORBA::Current_out &
-RTCORBA::Current_out::operator= (const ::RTCORBA::Current_var &p)
-{
-  this->ptr_ = ::RTCORBA::Current::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE RTCORBA::Current_out &
-RTCORBA::Current_out::operator= (Current_ptr p)
+ACE_INLINE void
+tao_RTCORBA_PriorityBandedConnectionPolicy_release (
+    RTCORBA::PriorityBandedConnectionPolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-RTCORBA::Current_out::operator ::RTCORBA::Current_ptr &() // cast
+ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_ptr
+tao_RTCORBA_PriorityBandedConnectionPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return RTCORBA::PriorityBandedConnectionPolicy::_nil ();
 }
 
-ACE_INLINE ::RTCORBA::Current_ptr &
-RTCORBA::Current_out::ptr (void) // ptr
+ACE_INLINE RTCORBA::PriorityBandedConnectionPolicy_ptr
+tao_RTCORBA_PriorityBandedConnectionPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return RTCORBA::PriorityBandedConnectionPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::RTCORBA::Current_ptr
-RTCORBA::Current_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_RTCORBA_PriorityBandedConnectionPolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  RTCORBA::PriorityBandedConnectionPolicy **tmp =
+    ACE_static_cast (RTCORBA::PriorityBandedConnectionPolicy **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_MUTEX___VAR_CI_)
-#define _RTCORBA_MUTEX___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::Mutex_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::Mutex_var::Mutex_var (void) // default constructor
-  : ptr_ (Mutex::_nil ())
-{}
-
-ACE_INLINE ::RTCORBA::Mutex_ptr
-RTCORBA::Mutex_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::Mutex_var::Mutex_var (const ::RTCORBA::Mutex_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (Mutex::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RTCORBA::Mutex_var::~Mutex_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RTCORBA::Mutex_var &
-RTCORBA::Mutex_var::operator= (Mutex_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::Mutex_var &
-RTCORBA::Mutex_var::operator= (const ::RTCORBA::Mutex_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::Mutex::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::Mutex_var::operator const ::RTCORBA::Mutex_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::Mutex_var::operator ::RTCORBA::Mutex_ptr &() // cast
-{
-  return this->ptr_;
-}
+#if !defined (_RTCORBA_CURRENT___CI_)
+#define _RTCORBA_CURRENT___CI_
 
-ACE_INLINE ::RTCORBA::Mutex_ptr
-RTCORBA::Mutex_var::operator-> (void) const
+ACE_INLINE RTCORBA::Current_ptr
+tao_RTCORBA_Current_duplicate (
+    RTCORBA::Current_ptr p
+  )
 {
-  return this->ptr_;
+  return RTCORBA::Current::_duplicate (p);
 }
 
-ACE_INLINE ::RTCORBA::Mutex_ptr
-RTCORBA::Mutex_var::in (void) const
+ACE_INLINE void
+tao_RTCORBA_Current_release (
+    RTCORBA::Current_ptr p
+  )
 {
-  return this->ptr_;
+  CORBA::release (p);
 }
 
-ACE_INLINE ::RTCORBA::Mutex_ptr &
-RTCORBA::Mutex_var::inout (void)
+ACE_INLINE RTCORBA::Current_ptr
+tao_RTCORBA_Current_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return RTCORBA::Current::_nil ();
 }
 
-ACE_INLINE ::RTCORBA::Mutex_ptr &
-RTCORBA::Mutex_var::out (void)
+ACE_INLINE RTCORBA::Current_ptr
+tao_RTCORBA_Current_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::Mutex::_nil ();
-  return this->ptr_;
+  return RTCORBA::Current::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::RTCORBA::Mutex_ptr
-RTCORBA::Mutex_var::_retn (void)
+ACE_INLINE CORBA::Object *
+tao_RTCORBA_Current_upcast (
+    void *src
+  )
 {
-  // yield ownership of managed obj reference
-  ::RTCORBA::Mutex_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::Mutex::_nil ();
-  return val;
+  RTCORBA::Current **tmp =
+    ACE_static_cast (RTCORBA::Current **, src);
+  return *tmp;
 }
 
 
 #endif /* end #if !defined */
 
 
-#if !defined (_RTCORBA_MUTEX___OUT_CI_)
-#define _RTCORBA_MUTEX___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::Mutex_out
-// *************************************************************
+#if !defined (_RTCORBA_MUTEX___CI_)
+#define _RTCORBA_MUTEX___CI_
 
-ACE_INLINE
-RTCORBA::Mutex_out::Mutex_out (Mutex_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::Mutex::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::Mutex_out::Mutex_out (Mutex_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::Mutex::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::Mutex_out::Mutex_out (const ::RTCORBA::Mutex_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Mutex_out &, p).ptr_)
-{}
-
-ACE_INLINE ::RTCORBA::Mutex_out &
-RTCORBA::Mutex_out::operator= (const ::RTCORBA::Mutex_out &p)
+ACE_INLINE RTCORBA::Mutex_ptr
+tao_RTCORBA_Mutex_duplicate (
+    RTCORBA::Mutex_ptr p
+  )
 {
-  this->ptr_ = ACE_const_cast (Mutex_out&, p).ptr_;
-  return *this;
+  return RTCORBA::Mutex::_duplicate (p);
 }
 
-ACE_INLINE RTCORBA::Mutex_out &
-RTCORBA::Mutex_out::operator= (const ::RTCORBA::Mutex_var &p)
+ACE_INLINE void
+tao_RTCORBA_Mutex_release (
+    RTCORBA::Mutex_ptr p
+  )
 {
-  this->ptr_ = ::RTCORBA::Mutex::_duplicate (p.ptr ());
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE RTCORBA::Mutex_out &
-RTCORBA::Mutex_out::operator= (Mutex_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::Mutex_out::operator ::RTCORBA::Mutex_ptr &() // cast
+ACE_INLINE RTCORBA::Mutex_ptr
+tao_RTCORBA_Mutex_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return RTCORBA::Mutex::_nil ();
 }
 
-ACE_INLINE ::RTCORBA::Mutex_ptr &
-RTCORBA::Mutex_out::ptr (void) // ptr
+ACE_INLINE RTCORBA::Mutex_ptr
+tao_RTCORBA_Mutex_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return RTCORBA::Mutex::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::RTCORBA::Mutex_ptr
-RTCORBA::Mutex_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_RTCORBA_Mutex_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  RTCORBA::Mutex **tmp =
+    ACE_static_cast (RTCORBA::Mutex **, src);
+  return *tmp;
 }
 
 
@@ -3927,170 +2367,50 @@ RTCORBA::Mutex_out::operator-> (void)
 // *************************************************************
 
 
-#if !defined (_RTCORBA_RTORB___VAR_CI_)
-#define _RTCORBA_RTORB___VAR_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::RTORB_var
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::RTORB_var::RTORB_var (void) // default constructor
-  : ptr_ (RTORB::_nil ())
-{}
-
-ACE_INLINE ::RTCORBA::RTORB_ptr
-RTCORBA::RTORB_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::RTORB_var::RTORB_var (const ::RTCORBA::RTORB_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (RTORB::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-RTCORBA::RTORB_var::~RTORB_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE RTCORBA::RTORB_var &
-RTCORBA::RTORB_var::operator= (RTORB_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE RTCORBA::RTORB_var &
-RTCORBA::RTORB_var::operator= (const ::RTCORBA::RTORB_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::RTCORBA::RTORB::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-RTCORBA::RTORB_var::operator const ::RTCORBA::RTORB_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-RTCORBA::RTORB_var::operator ::RTCORBA::RTORB_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::RTORB_ptr
-RTCORBA::RTORB_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::RTORB_ptr
-RTCORBA::RTORB_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::RTORB_ptr &
-RTCORBA::RTORB_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::RTORB_ptr &
-RTCORBA::RTORB_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::RTORB::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::RTCORBA::RTORB_ptr
-RTCORBA::RTORB_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::RTCORBA::RTORB_ptr val = this->ptr_;
-  this->ptr_ = ::RTCORBA::RTORB::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_RTCORBA_RTORB___OUT_CI_)
-#define _RTCORBA_RTORB___OUT_CI_
-
-// *************************************************************
-// Inline operations for class RTCORBA::RTORB_out
-// *************************************************************
-
-ACE_INLINE
-RTCORBA::RTORB_out::RTORB_out (RTORB_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::RTCORBA::RTORB::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::RTORB_out::RTORB_out (RTORB_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::RTCORBA::RTORB::_nil ();
-}
-
-ACE_INLINE
-RTCORBA::RTORB_out::RTORB_out (const ::RTCORBA::RTORB_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (RTORB_out &, p).ptr_)
-{}
-
-ACE_INLINE ::RTCORBA::RTORB_out &
-RTCORBA::RTORB_out::operator= (const ::RTCORBA::RTORB_out &p)
-{
-  this->ptr_ = ACE_const_cast (RTORB_out&, p).ptr_;
-  return *this;
-}
+#if !defined (_RTCORBA_RTORB___CI_)
+#define _RTCORBA_RTORB___CI_
 
-ACE_INLINE RTCORBA::RTORB_out &
-RTCORBA::RTORB_out::operator= (const ::RTCORBA::RTORB_var &p)
+ACE_INLINE RTCORBA::RTORB_ptr
+tao_RTCORBA_RTORB_duplicate (
+    RTCORBA::RTORB_ptr p
+  )
 {
-  this->ptr_ = ::RTCORBA::RTORB::_duplicate (p.ptr ());
-  return *this;
+  return RTCORBA::RTORB::_duplicate (p);
 }
 
-ACE_INLINE RTCORBA::RTORB_out &
-RTCORBA::RTORB_out::operator= (RTORB_ptr p)
+ACE_INLINE void
+tao_RTCORBA_RTORB_release (
+    RTCORBA::RTORB_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-RTCORBA::RTORB_out::operator ::RTCORBA::RTORB_ptr &() // cast
+ACE_INLINE RTCORBA::RTORB_ptr
+tao_RTCORBA_RTORB_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return RTCORBA::RTORB::_nil ();
 }
 
-ACE_INLINE ::RTCORBA::RTORB_ptr &
-RTCORBA::RTORB_out::ptr (void) // ptr
+ACE_INLINE RTCORBA::RTORB_ptr
+tao_RTCORBA_RTORB_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return RTCORBA::RTORB::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::RTCORBA::RTORB_ptr
-RTCORBA::RTORB_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_RTCORBA_RTORB_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  RTCORBA::RTORB **tmp =
+    ACE_static_cast (RTCORBA::RTORB **, src);
+  return *tmp;
 }
 
 
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
index 513b9bf7da7..ca69fd4abfe 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -241,8 +241,8 @@ TAO_Object_Manager<T,T_var>::
 
   if (this->release_)
     {
-      CORBA::release (*this->ptr_);
-      *this->ptr_ = T::_duplicate (*rhs.ptr_);
+      T_var::release (*this->ptr_);
+      *this->ptr_ = T_var::duplicate (*rhs.ptr_);
     }
   else
     *this->ptr_ = *rhs.ptr_;
@@ -259,7 +259,7 @@ TAO_Object_Manager<T,T_var>::operator=(T* p)
       // that of a var variable.  Therefore we will not duplicate the
       // user provided pointer before assigning it to the internal
       // variable.
-      CORBA::release (*this->ptr_);
+      T_var::release (*this->ptr_);
       *this->ptr_ = p;
     }
   else
@@ -277,8 +277,8 @@ TAO_Object_Manager<T,T_var>::operator=(const T_var &p)
       // that of a var variable.  Therefore we duplicate p's
       // pointer before assigning it to the internal
       // variable.
-      CORBA::release (*this->ptr_);
-      *this->ptr_ = T::_duplicate (p.in ());
+      T_var::release (*this->ptr_);
+      *this->ptr_ = T_var::duplicate (p.in ());
     }
   else
     *this->ptr_ = p.in ();
@@ -289,8 +289,8 @@ TAO_Object_Manager<T,T_var>::operator=(const T_var &p)
 template <class T, class T_var> T *&
 TAO_Object_Manager<T,T_var>::out (void)
 {
-  CORBA::release (*this->ptr_);
-  *this->ptr_ = T::_nil ();
+  T_var::release (*this->ptr_);
+  *this->ptr_ = T_var::nil ();
   return *this->ptr_;
 }
 
@@ -298,7 +298,7 @@ template <class T, class T_var> T *
 TAO_Object_Manager<T,T_var>::_retn (void)
 {
   T *temp = *this->ptr_;
-  *this->ptr_ = T::_nil ();
+  *this->ptr_ = T_var::nil ();
   return temp;
 }
 
@@ -387,7 +387,7 @@ TAO_Unbounded_Object_Sequence (const TAO_Unbounded_Object_Sequence<T,T_var> &rhs
 
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
-          tmp1[i] = T::_duplicate (tmp2[i]);
+          tmp1[i] = T_var::duplicate (tmp2[i]);
         }
 
       this->buffer_ = tmp1;
@@ -419,8 +419,8 @@ operator= (const TAO_Unbounded_Object_Sequence<T,T_var> &rhs)
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          CORBA::release (tmp[i]);
-          tmp[i] = T::_nil ();
+          T_var::release (tmp[i]);
+          tmp[i] = T_var::nil ();
         }
       if (this->maximum_ < rhs.maximum_)
         {
@@ -448,7 +448,7 @@ operator= (const TAO_Unbounded_Object_Sequence<T,T_var> &rhs)
   T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
 
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
-    tmp1[i] = T::_duplicate (tmp2[i]);
+    tmp1[i] = T_var::duplicate (tmp2[i]);
 
   return *this;
 }
@@ -461,7 +461,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (CORBA::ULong nelems)
   ACE_NEW_RETURN (buf, T*[nelems], 0);
 
   for (CORBA::ULong i = 0; i < nelems; i++)
-    buf[i] = T::_nil ();
+    buf[i] = T_var::nil ();
 
   return buf;
 }
@@ -502,7 +502,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_allocate_buffer (CORBA::ULong length)
         // need to copy them, if we did we would also have to remove
         // the old instances.
         if (!this->release_)
-          tmp[i] = T::_duplicate (old[i]);
+          tmp[i] = T_var::duplicate (old[i]);
         else
           tmp[i] = old[i];
 
@@ -520,8 +520,8 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_deallocate_buffer (void)
   T **tmp = ACE_reinterpret_cast (T**, this->buffer_);
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
-      CORBA::release (tmp[i]);
-      tmp[i] = T::_nil ();
+      T_var::release (tmp[i]);
+      tmp[i] = T_var::nil ();
     }
   TAO_Unbounded_Object_Sequence<T,T_var>::freebuf (tmp);
   this->buffer_ = 0;
@@ -535,8 +535,8 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer (CORBA::ULong nl,
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
-      CORBA::release (tmp[i]);
-      tmp[i] = T::_nil ();
+      T_var::release (tmp[i]);
+      tmp[i] = T_var::nil ();
     }
 }
 
@@ -547,7 +547,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_downcast (void* target,
 {
   T **tmp = ACE_static_cast (T**, target);
 
-  *tmp = T::_narrow (src, ACE_TRY_ENV);
+  *tmp = T_var::narrow (src, ACE_TRY_ENV);
 
   ACE_CHECK;
 }
@@ -555,9 +555,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_downcast (void* target,
 template <class T, class T_var> CORBA_Object*
 TAO_Unbounded_Object_Sequence<T,T_var>::_upcast (void* src) const
 {
-  T **tmp = ACE_static_cast (T**, src);
-
-  return *tmp;
+  return T_var::upcast (src);
 }
 
 // *************************************************************
@@ -587,7 +585,7 @@ TAO_Bounded_Object_Sequence (const TAO_Bounded_Object_Sequence<T, T_var,MAX> &rh
 
       for (CORBA::ULong i = 0; i < rhs.length_; i++)
         {
-          tmp1[i] = T::_duplicate (tmp2[i]);
+          tmp1[i] = T_var::duplicate (tmp2[i]);
         }
 
       this->buffer_ = tmp1;
@@ -611,8 +609,8 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator=
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
-          CORBA::release (tmp[i]);
-          tmp[i] = T::_nil ();
+          T_var::release (tmp[i]);
+          tmp[i] = T_var::nil ();
         }
       // No need to reallocate the buffer since it is always of size
       // MAX
@@ -634,8 +632,12 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::operator=
 
   T **tmp1 = ACE_reinterpret_cast (T **, this->buffer_);
   T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
+
   for (CORBA::ULong i=0; i < rhs.length_; ++i)
-    tmp1[i] = T::_duplicate (tmp2[i]);
+    {
+      tmp1[i] = T_var::duplicate (tmp2[i]);
+    }
+
   return *this;
 }
 
@@ -647,7 +649,9 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::allocbuf (CORBA::ULong)
   ACE_NEW_RETURN (buf, T*[MAX], 0);
 
   for (CORBA::ULong i = 0; i < MAX; i++)
-    buf[i] = T::_nil ();
+    {
+      buf[i] = T_var::nil ();
+    }
 
   return buf;
 }
@@ -659,11 +663,13 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::freebuf (T **buffer)
   // elements and initialize them to T::_nil().  So we can be
   // complaint and call CORBA::release() on each one.
   for (CORBA::ULong i = 0; i < MAX; ++i)
-    if (buffer[i] != T::_nil ())
-      {
-        CORBA::release (buffer[i]);
-        buffer[i] = T::_nil ();
-      }
+    {
+      if (buffer[i] != T_var::nil ())
+        {
+          T_var::release (buffer[i]);
+          buffer[i] = T_var::nil ();
+        }
+    }
 
   delete[] buffer;
 }
@@ -681,7 +687,10 @@ template<class T, class T_var, size_t MAX> void
 TAO_Bounded_Object_Sequence<T,T_var,MAX>::_deallocate_buffer (void)
 {
   if (this->release_ == 0)
-    return;
+    {
+      return;
+    }
+
   T **tmp = ACE_reinterpret_cast (T **, this->buffer_);
   TAO_Bounded_Object_Sequence<T,T_var,MAX>::freebuf (tmp);
   this->buffer_ = 0;
@@ -695,8 +704,8 @@ TAO_Bounded_Object_Sequence<T,T_var, MAX>::_shrink_buffer (CORBA::ULong nl,
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
-      CORBA::release (tmp[i]);
-      tmp[i] = T::_nil ();
+      T_var::release (tmp[i]);
+      tmp[i] = T_var::nil ();
     }
 }
 
@@ -707,7 +716,7 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::_downcast (void* target,
 {
   T **tmp = ACE_static_cast (T**, target);
 
-  *tmp = T::_narrow (src, ACE_TRY_ENV);
+  *tmp = T_var::narrow (src, ACE_TRY_ENV);
 
   ACE_CHECK;
 }
@@ -715,9 +724,7 @@ TAO_Bounded_Object_Sequence<T, T_var,MAX>::_downcast (void* target,
 template <class T, class T_var, size_t MAX> CORBA_Object*
 TAO_Bounded_Object_Sequence<T, T_var,MAX>::_upcast (void* src) const
 {
-  T **tmp = ACE_static_cast (T**, src);
-
-  return *tmp;
+  return T_var::upcast (src);
 }
 
 // *************************************************************
diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i
index df96a2d58b9..c747c35ab7d 100644
--- a/TAO/tao/Sequence_T.i
+++ b/TAO/tao/Sequence_T.i
@@ -240,7 +240,7 @@ TAO_Object_Manager<T,T_var>::operator-> (void) const
 template <class T, class T_var> ACE_INLINE
 TAO_Object_Manager<T,T_var>::operator const T_var () const
 {
-  return T::_duplicate (*this->ptr_);
+  return T_var::duplicate (*this->ptr_);
 }
 
 template <class T, class T_var> ACE_INLINE
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index d3855c61fb2..28e5d674603 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -1,11 +1,23 @@
-/* -*- C++ -*- $Id$ */
+// -*- C++ -*-
+//
+// $Id$ */
 
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "TAOC.h"
 
@@ -20,16 +32,40 @@
 static const CORBA::Long _oc_TAO_PrioritySelectionMode[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f2f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x53656c65), ACE_NTOHL (0x6374696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO/PrioritySelectionMode:1.0
-  22, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x53656c65), ACE_NTOHL (0x6374696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000),  // name = PrioritySelectionMode
+  34,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x53656c65), 
+  ACE_NTOHL (0x6374696f), 
+  ACE_NTOHL (0x6e4d6f64), 
+  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO/PrioritySelectionMode:1.0
+  22,
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x53656c65), 
+  ACE_NTOHL (0x6374696f), 
+  ACE_NTOHL (0x6e4d6f64), 
+  ACE_NTOHL (0x65000000),  // name = PrioritySelectionMode
   CORBA::tk_short,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_TAO_PrioritySelectionMode (CORBA::tk_alias, sizeof (_oc_TAO_PrioritySelectionMode), (char *) &_oc_TAO_PrioritySelectionMode, 0, sizeof (TAO::PrioritySelectionMode));
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_PrioritySelectionMode (
+    CORBA::tk_alias,
+    sizeof (_oc_TAO_PrioritySelectionMode),
+    (char *) &_oc_TAO_PrioritySelectionMode,
+    0,
+    sizeof (TAO::PrioritySelectionMode)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrioritySelectionMode, &_tc_TAO_tc_TAO_PrioritySelectionMode)
 TAO_NAMESPACE_END
+
 TAO_NAMESPACE_TYPE (const CORBA::Short)
 TAO_NAMESPACE_BEGIN (TAO)
 TAO_NAMESPACE_DEFINE (const CORBA::Short, USE_NO_PRIORITY, 0)
@@ -45,30 +81,79 @@ TAO_NAMESPACE_END
 static const CORBA::Long _oc_TAO_PrioritySpecification[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f2f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x53706563), ACE_NTOHL (0x69666963), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e3a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO/PrioritySpecification:1.0
-  22, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x53706563), ACE_NTOHL (0x69666963), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e000000),  // name = PrioritySpecification
+  34,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x53706563), 
+  ACE_NTOHL (0x69666963), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e3a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO/PrioritySpecification:1.0
+  22,
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x53706563), 
+  ACE_NTOHL (0x69666963), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e000000),  // name = PrioritySpecification
   3, // member count
-  5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
+  5,
+  ACE_NTOHL (0x6d6f6465), 
+  ACE_NTOHL (0x0),  // name = mode
   CORBA::tk_alias, // typecode kind for typedefs
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f2f), ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x53656c65), ACE_NTOHL (0x6374696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO/PrioritySelectionMode:1.0
-    22, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x53656c65), ACE_NTOHL (0x6374696f), ACE_NTOHL (0x6e4d6f64), ACE_NTOHL (0x65000000),  // name = PrioritySelectionMode
+    34,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x54414f2f), 
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x53656c65), 
+    ACE_NTOHL (0x6374696f), 
+    ACE_NTOHL (0x6e4d6f64), 
+    ACE_NTOHL (0x653a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO/PrioritySelectionMode:1.0
+    22,
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x53656c65), 
+    ACE_NTOHL (0x6374696f), 
+    ACE_NTOHL (0x6e4d6f64), 
+    ACE_NTOHL (0x65000000),  // name = PrioritySelectionMode
     CORBA::tk_short,
 
 
-  13, ACE_NTOHL (0x6d696e5f), ACE_NTOHL (0x7072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0),  // name = min_priority
+  13,
+  ACE_NTOHL (0x6d696e5f), 
+  ACE_NTOHL (0x7072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x0),  // name = min_priority
   CORBA::tk_short,
 
-  13, ACE_NTOHL (0x6d61785f), ACE_NTOHL (0x7072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0),  // name = max_priority
+  13,
+  ACE_NTOHL (0x6d61785f), 
+  ACE_NTOHL (0x7072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x0),  // name = max_priority
   CORBA::tk_short,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_TAO_PrioritySpecification (CORBA::tk_struct, sizeof (_oc_TAO_PrioritySpecification), (char *) &_oc_TAO_PrioritySpecification, 0, sizeof (TAO::PrioritySpecification));
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_PrioritySpecification (
+    CORBA::tk_struct,
+    sizeof (_oc_TAO_PrioritySpecification),
+    (char *) &_oc_TAO_PrioritySpecification,
+    0,
+    sizeof (TAO::PrioritySpecification)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrioritySpecification, &_tc_TAO_tc_TAO_PrioritySpecification)
 TAO_NAMESPACE_END
+
 void TAO::PrioritySpecification::_tao_any_destructor (void *x)
 {
   PrioritySpecification *tmp = ACE_static_cast (PrioritySpecification*,x);
@@ -79,6 +164,198 @@ TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (TAO)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, CLIENT_PRIORITY_POLICY_TYPE, 1413545984U)
 TAO_NAMESPACE_END
+
+// *************************************************************
+// Operations for class TAO::ClientPriorityPolicy_var
+// *************************************************************
+
+TAO::ClientPriorityPolicy_var::ClientPriorityPolicy_var (void) // default constructor
+  : ptr_ (ClientPriorityPolicy::_nil ())
+{}
+
+::TAO::ClientPriorityPolicy_ptr
+TAO::ClientPriorityPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+TAO::ClientPriorityPolicy_var::ClientPriorityPolicy_var (const ::TAO::ClientPriorityPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (ClientPriorityPolicy::_duplicate (p.ptr ()))
+{}
+
+TAO::ClientPriorityPolicy_var::~ClientPriorityPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+TAO::ClientPriorityPolicy_var &
+TAO::ClientPriorityPolicy_var::operator= (ClientPriorityPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+TAO::ClientPriorityPolicy_var &
+TAO::ClientPriorityPolicy_var::operator= (const ::TAO::ClientPriorityPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::TAO::ClientPriorityPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+TAO::ClientPriorityPolicy_var::operator const ::TAO::ClientPriorityPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+TAO::ClientPriorityPolicy_var::operator ::TAO::ClientPriorityPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::TAO::ClientPriorityPolicy_ptr
+TAO::ClientPriorityPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::TAO::ClientPriorityPolicy_ptr
+TAO::ClientPriorityPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::TAO::ClientPriorityPolicy_ptr &
+TAO::ClientPriorityPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::TAO::ClientPriorityPolicy_ptr &
+TAO::ClientPriorityPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::TAO::ClientPriorityPolicy::_nil ();
+  return this->ptr_;
+}
+
+::TAO::ClientPriorityPolicy_ptr
+TAO::ClientPriorityPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::TAO::ClientPriorityPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::TAO::ClientPriorityPolicy::_nil ();
+  return val;
+}
+
+::TAO::ClientPriorityPolicy_ptr
+TAO::ClientPriorityPolicy_var::duplicate (ClientPriorityPolicy_ptr p)
+{
+  return ::TAO::ClientPriorityPolicy::_duplicate (p);
+}
+
+void
+TAO::ClientPriorityPolicy_var::release (ClientPriorityPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::TAO::ClientPriorityPolicy_ptr
+TAO::ClientPriorityPolicy_var::nil (void)
+{
+  return ::TAO::ClientPriorityPolicy::_nil ();
+}
+
+::TAO::ClientPriorityPolicy_ptr
+TAO::ClientPriorityPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::TAO::ClientPriorityPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+TAO::ClientPriorityPolicy_var::upcast (void *src)
+{
+  ClientPriorityPolicy **tmp =
+    ACE_static_cast (ClientPriorityPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class TAO::ClientPriorityPolicy_out
+// *************************************************************
+
+TAO::ClientPriorityPolicy_out::ClientPriorityPolicy_out (ClientPriorityPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::TAO::ClientPriorityPolicy::_nil ();
+}
+
+TAO::ClientPriorityPolicy_out::ClientPriorityPolicy_out (ClientPriorityPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::TAO::ClientPriorityPolicy::_nil ();
+}
+
+TAO::ClientPriorityPolicy_out::ClientPriorityPolicy_out (const ::TAO::ClientPriorityPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (ClientPriorityPolicy_out &, p).ptr_)
+{}
+
+::TAO::ClientPriorityPolicy_out &
+TAO::ClientPriorityPolicy_out::operator= (const ::TAO::ClientPriorityPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (ClientPriorityPolicy_out&, p).ptr_;
+  return *this;
+}
+
+TAO::ClientPriorityPolicy_out &
+TAO::ClientPriorityPolicy_out::operator= (const ::TAO::ClientPriorityPolicy_var &p)
+{
+  this->ptr_ = ::TAO::ClientPriorityPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+TAO::ClientPriorityPolicy_out &
+TAO::ClientPriorityPolicy_out::operator= (ClientPriorityPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+TAO::ClientPriorityPolicy_out::operator ::TAO::ClientPriorityPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::TAO::ClientPriorityPolicy_ptr &
+TAO::ClientPriorityPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::TAO::ClientPriorityPolicy_ptr
+TAO::ClientPriorityPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+TAO::ClientPriorityPolicy::ClientPriorityPolicy ()
+{
+  }
+
+// destructor
+TAO::ClientPriorityPolicy::~ClientPriorityPolicy (void)
+{}
+
 TAO::ClientPriorityPolicy_ptr TAO::ClientPriorityPolicy::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
@@ -157,16 +434,40 @@ const char* TAO::ClientPriorityPolicy::_interface_repository_id (void) const
 static const CORBA::Long _oc_TAO_BufferingConstraintMode[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f2f), ACE_NTOHL (0x42756666), ACE_NTOHL (0x6572696e), ACE_NTOHL (0x67436f6e), ACE_NTOHL (0x73747261), ACE_NTOHL (0x696e744d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO/BufferingConstraintMode:1.0
-  24, ACE_NTOHL (0x42756666), ACE_NTOHL (0x6572696e), ACE_NTOHL (0x67436f6e), ACE_NTOHL (0x73747261), ACE_NTOHL (0x696e744d), ACE_NTOHL (0x6f646500),  // name = BufferingConstraintMode
+  36,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x42756666), 
+  ACE_NTOHL (0x6572696e), 
+  ACE_NTOHL (0x67436f6e), 
+  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x696e744d), 
+  ACE_NTOHL (0x6f64653a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO/BufferingConstraintMode:1.0
+  24,
+  ACE_NTOHL (0x42756666), 
+  ACE_NTOHL (0x6572696e), 
+  ACE_NTOHL (0x67436f6e), 
+  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x696e744d), 
+  ACE_NTOHL (0x6f646500),  // name = BufferingConstraintMode
   CORBA::tk_ushort,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintMode (CORBA::tk_alias, sizeof (_oc_TAO_BufferingConstraintMode), (char *) &_oc_TAO_BufferingConstraintMode, 0, sizeof (TAO::BufferingConstraintMode));
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraintMode (
+    CORBA::tk_alias,
+    sizeof (_oc_TAO_BufferingConstraintMode),
+    (char *) &_oc_TAO_BufferingConstraintMode,
+    0,
+    sizeof (TAO::BufferingConstraintMode)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_BufferingConstraintMode, &_tc_TAO_tc_TAO_BufferingConstraintMode)
 TAO_NAMESPACE_END
+
 TAO_NAMESPACE_TYPE (const CORBA::UShort)
 TAO_NAMESPACE_BEGIN (TAO)
 TAO_NAMESPACE_DEFINE (const CORBA::UShort, BUFFER_FLUSH, 0U)
@@ -186,39 +487,98 @@ TAO_NAMESPACE_END
 static const CORBA::Long _oc_TAO_BufferingConstraint[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f2f), ACE_NTOHL (0x42756666), ACE_NTOHL (0x6572696e), ACE_NTOHL (0x67436f6e), ACE_NTOHL (0x73747261), ACE_NTOHL (0x696e743a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO/BufferingConstraint:1.0
-  20, ACE_NTOHL (0x42756666), ACE_NTOHL (0x6572696e), ACE_NTOHL (0x67436f6e), ACE_NTOHL (0x73747261), ACE_NTOHL (0x696e7400),  // name = BufferingConstraint
+  32,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x42756666), 
+  ACE_NTOHL (0x6572696e), 
+  ACE_NTOHL (0x67436f6e), 
+  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x696e743a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO/BufferingConstraint:1.0
+  20,
+  ACE_NTOHL (0x42756666), 
+  ACE_NTOHL (0x6572696e), 
+  ACE_NTOHL (0x67436f6e), 
+  ACE_NTOHL (0x73747261), 
+  ACE_NTOHL (0x696e7400),  // name = BufferingConstraint
   4, // member count
-  5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0),  // name = mode
+  5,
+  ACE_NTOHL (0x6d6f6465), 
+  ACE_NTOHL (0x0),  // name = mode
   CORBA::tk_alias, // typecode kind for typedefs
   76, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f2f), ACE_NTOHL (0x42756666), ACE_NTOHL (0x6572696e), ACE_NTOHL (0x67436f6e), ACE_NTOHL (0x73747261), ACE_NTOHL (0x696e744d), ACE_NTOHL (0x6f64653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO/BufferingConstraintMode:1.0
-    24, ACE_NTOHL (0x42756666), ACE_NTOHL (0x6572696e), ACE_NTOHL (0x67436f6e), ACE_NTOHL (0x73747261), ACE_NTOHL (0x696e744d), ACE_NTOHL (0x6f646500),  // name = BufferingConstraintMode
+    36,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x54414f2f), 
+    ACE_NTOHL (0x42756666), 
+    ACE_NTOHL (0x6572696e), 
+    ACE_NTOHL (0x67436f6e), 
+    ACE_NTOHL (0x73747261), 
+    ACE_NTOHL (0x696e744d), 
+    ACE_NTOHL (0x6f64653a), 
+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO/BufferingConstraintMode:1.0
+    24,
+    ACE_NTOHL (0x42756666), 
+    ACE_NTOHL (0x6572696e), 
+    ACE_NTOHL (0x67436f6e), 
+    ACE_NTOHL (0x73747261), 
+    ACE_NTOHL (0x696e744d), 
+    ACE_NTOHL (0x6f646500),  // name = BufferingConstraintMode
     CORBA::tk_ushort,
 
 
-  8, ACE_NTOHL (0x74696d65), ACE_NTOHL (0x6f757400),  // name = timeout
+  8,
+  ACE_NTOHL (0x74696d65), 
+  ACE_NTOHL (0x6f757400),  // name = timeout
   CORBA::tk_alias, // typecode kind for typedefs
   56, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f54696d), ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000),  // name = TimeT
+    31,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x42617365), 
+    ACE_NTOHL (0x2f54696d), 
+    ACE_NTOHL (0x65543a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
+    6,
+    ACE_NTOHL (0x54696d65), 
+    ACE_NTOHL (0x54000000),  // name = TimeT
     CORBA::tk_ulonglong,
 
 
-  14, ACE_NTOHL (0x6d657373), ACE_NTOHL (0x6167655f), ACE_NTOHL (0x636f756e), ACE_NTOHL (0x74000000),  // name = message_count
+  14,
+  ACE_NTOHL (0x6d657373), 
+  ACE_NTOHL (0x6167655f), 
+  ACE_NTOHL (0x636f756e), 
+  ACE_NTOHL (0x74000000),  // name = message_count
   CORBA::tk_ulong,
 
-  14, ACE_NTOHL (0x6d657373), ACE_NTOHL (0x6167655f), ACE_NTOHL (0x62797465), ACE_NTOHL (0x73000000),  // name = message_bytes
+  14,
+  ACE_NTOHL (0x6d657373), 
+  ACE_NTOHL (0x6167655f), 
+  ACE_NTOHL (0x62797465), 
+  ACE_NTOHL (0x73000000),  // name = message_bytes
   CORBA::tk_ulong,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraint (CORBA::tk_struct, sizeof (_oc_TAO_BufferingConstraint), (char *) &_oc_TAO_BufferingConstraint, 0, sizeof (TAO::BufferingConstraint));
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_BufferingConstraint (
+    CORBA::tk_struct,
+    sizeof (_oc_TAO_BufferingConstraint),
+    (char *) &_oc_TAO_BufferingConstraint,
+    0,
+    sizeof (TAO::BufferingConstraint)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_BufferingConstraint, &_tc_TAO_tc_TAO_BufferingConstraint)
 TAO_NAMESPACE_END
+
 void TAO::BufferingConstraint::_tao_any_destructor (void *x)
 {
   BufferingConstraint *tmp = ACE_static_cast (BufferingConstraint*,x);
@@ -229,6 +589,198 @@ TAO_NAMESPACE_TYPE (const CORBA::ULong)
 TAO_NAMESPACE_BEGIN (TAO)
 TAO_NAMESPACE_DEFINE (const CORBA::ULong, BUFFERING_CONSTRAINT_POLICY_TYPE, 1413545985U)
 TAO_NAMESPACE_END
+
+// *************************************************************
+// Operations for class TAO::BufferingConstraintPolicy_var
+// *************************************************************
+
+TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (void) // default constructor
+  : ptr_ (BufferingConstraintPolicy::_nil ())
+{}
+
+::TAO::BufferingConstraintPolicy_ptr
+TAO::BufferingConstraintPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (const ::TAO::BufferingConstraintPolicy_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (BufferingConstraintPolicy::_duplicate (p.ptr ()))
+{}
+
+TAO::BufferingConstraintPolicy_var::~BufferingConstraintPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+TAO::BufferingConstraintPolicy_var &
+TAO::BufferingConstraintPolicy_var::operator= (BufferingConstraintPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+TAO::BufferingConstraintPolicy_var &
+TAO::BufferingConstraintPolicy_var::operator= (const ::TAO::BufferingConstraintPolicy_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::TAO::BufferingConstraintPolicy::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+TAO::BufferingConstraintPolicy_var::operator const ::TAO::BufferingConstraintPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+TAO::BufferingConstraintPolicy_var::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::TAO::BufferingConstraintPolicy_ptr
+TAO::BufferingConstraintPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::TAO::BufferingConstraintPolicy_ptr
+TAO::BufferingConstraintPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::TAO::BufferingConstraintPolicy_ptr &
+TAO::BufferingConstraintPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::TAO::BufferingConstraintPolicy_ptr &
+TAO::BufferingConstraintPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil ();
+  return this->ptr_;
+}
+
+::TAO::BufferingConstraintPolicy_ptr
+TAO::BufferingConstraintPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::TAO::BufferingConstraintPolicy_ptr val = this->ptr_;
+  this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil ();
+  return val;
+}
+
+::TAO::BufferingConstraintPolicy_ptr
+TAO::BufferingConstraintPolicy_var::duplicate (BufferingConstraintPolicy_ptr p)
+{
+  return ::TAO::BufferingConstraintPolicy::_duplicate (p);
+}
+
+void
+TAO::BufferingConstraintPolicy_var::release (BufferingConstraintPolicy_ptr p)
+{
+  CORBA::release (p);
+}
+
+::TAO::BufferingConstraintPolicy_ptr
+TAO::BufferingConstraintPolicy_var::nil (void)
+{
+  return ::TAO::BufferingConstraintPolicy::_nil ();
+}
+
+::TAO::BufferingConstraintPolicy_ptr
+TAO::BufferingConstraintPolicy_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::TAO::BufferingConstraintPolicy::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+TAO::BufferingConstraintPolicy_var::upcast (void *src)
+{
+  BufferingConstraintPolicy **tmp =
+    ACE_static_cast (BufferingConstraintPolicy **, src);
+  return *tmp;
+}
+// *************************************************************
+// Inline operations for class TAO::BufferingConstraintPolicy_out
+// *************************************************************
+
+TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingConstraintPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil ();
+}
+
+TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingConstraintPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil ();
+}
+
+TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (const ::TAO::BufferingConstraintPolicy_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (BufferingConstraintPolicy_out &, p).ptr_)
+{}
+
+::TAO::BufferingConstraintPolicy_out &
+TAO::BufferingConstraintPolicy_out::operator= (const ::TAO::BufferingConstraintPolicy_out &p)
+{
+  this->ptr_ = ACE_const_cast (BufferingConstraintPolicy_out&, p).ptr_;
+  return *this;
+}
+
+TAO::BufferingConstraintPolicy_out &
+TAO::BufferingConstraintPolicy_out::operator= (const ::TAO::BufferingConstraintPolicy_var &p)
+{
+  this->ptr_ = ::TAO::BufferingConstraintPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+TAO::BufferingConstraintPolicy_out &
+TAO::BufferingConstraintPolicy_out::operator= (BufferingConstraintPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+TAO::BufferingConstraintPolicy_out::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::TAO::BufferingConstraintPolicy_ptr &
+TAO::BufferingConstraintPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::TAO::BufferingConstraintPolicy_ptr
+TAO::BufferingConstraintPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+TAO::BufferingConstraintPolicy::BufferingConstraintPolicy ()
+{
+  }
+
+// destructor
+TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void)
+{}
+
 TAO::BufferingConstraintPolicy_ptr TAO::BufferingConstraintPolicy::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
@@ -305,16 +857,34 @@ const char* TAO::BufferingConstraintPolicy::_interface_repository_id (void) cons
 static const CORBA::Long _oc_TAO_SyncScope[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  22, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x54414f2f), ACE_NTOHL (0x53796e63), ACE_NTOHL (0x53636f70), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO/SyncScope:1.0
-  10, ACE_NTOHL (0x53796e63), ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65000000),  // name = SyncScope
+  22,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f2f), 
+  ACE_NTOHL (0x53796e63), 
+  ACE_NTOHL (0x53636f70), 
+  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO/SyncScope:1.0
+  10,
+  ACE_NTOHL (0x53796e63), 
+  ACE_NTOHL (0x53636f70), 
+  ACE_NTOHL (0x65000000),  // name = SyncScope
   CORBA::tk_short,
 
 };
-static CORBA::TypeCode _tc_TAO_tc_TAO_SyncScope (CORBA::tk_alias, sizeof (_oc_TAO_SyncScope), (char *) &_oc_TAO_SyncScope, 0, sizeof (TAO::SyncScope));
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_SyncScope (
+    CORBA::tk_alias,
+    sizeof (_oc_TAO_SyncScope),
+    (char *) &_oc_TAO_SyncScope,
+    0,
+    sizeof (TAO::SyncScope)
+  );
+
 TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 TAO_NAMESPACE_BEGIN (TAO)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SyncScope, &_tc_TAO_tc_TAO_SyncScope)
 TAO_NAMESPACE_END
+
 TAO_NAMESPACE_TYPE (const CORBA::Short)
 TAO_NAMESPACE_BEGIN (TAO)
 TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_NONE, 0)
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index 03790e6bf3c..80b606d27d5 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -1,4 +1,23 @@
-/* -*- C++ -*- $Id$ */
+// -*- C++ -*-
+//
+// $Id$ Id: TAOC.h,v 1.24 2000/06/28 03:47:12 marina Exp $ */
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO and the TAO IDL Compiler have been developed by the Center for
@@ -47,6 +66,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
 TAO_NAMESPACE  TAO
 {
 
@@ -142,7 +165,7 @@ TAO_NAMESPACE  TAO
   {
   public:
     ClientPriorityPolicy_var (void); // default constructor
-    ClientPriorityPolicy_var (ClientPriorityPolicy_ptr);
+    ClientPriorityPolicy_var (ClientPriorityPolicy_ptr p) : ptr_ (p) {}
     ClientPriorityPolicy_var (const ClientPriorityPolicy_var &); // copy constructor
     ~ClientPriorityPolicy_var (void); // destructor
 
@@ -159,6 +182,14 @@ TAO_NAMESPACE  TAO
     ClientPriorityPolicy_ptr _retn (void);
     ClientPriorityPolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static ClientPriorityPolicy_ptr duplicate (ClientPriorityPolicy_ptr);
+    static void release (ClientPriorityPolicy_ptr);
+    static ClientPriorityPolicy_ptr nil (void);
+    static ClientPriorityPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     ClientPriorityPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -332,7 +363,7 @@ class TAO_Export ClientPriorityPolicy: public virtual CORBA::Policy
   {
   public:
     BufferingConstraintPolicy_var (void); // default constructor
-    BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr);
+    BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr p) : ptr_ (p) {}
     BufferingConstraintPolicy_var (const BufferingConstraintPolicy_var &); // copy constructor
     ~BufferingConstraintPolicy_var (void); // destructor
 
@@ -349,6 +380,14 @@ class TAO_Export ClientPriorityPolicy: public virtual CORBA::Policy
     BufferingConstraintPolicy_ptr _retn (void);
     BufferingConstraintPolicy_ptr ptr (void) const;
 
+    // Hooks used by template sequence and object manager classes
+    // for non-defined forward declared interfaces.
+    static BufferingConstraintPolicy_ptr duplicate (BufferingConstraintPolicy_ptr);
+    static void release (BufferingConstraintPolicy_ptr);
+    static BufferingConstraintPolicy_ptr nil (void);
+    static BufferingConstraintPolicy_ptr narrow (CORBA::Object *, CORBA::Environment &);
+    static CORBA::Object * upcast (void *);
+  
   private:
     BufferingConstraintPolicy_ptr ptr_;
     // Unimplemented - prevents widening assignment.
@@ -500,5 +539,9 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
 #include "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/TAOC.i b/TAO/tao/TAOC.i
index d72d46bd08f..7a7ea6bcb67 100644
--- a/TAO/tao/TAOC.i
+++ b/TAO/tao/TAOC.i
@@ -1,11 +1,23 @@
-/* -*- C++ -*- $Id$ */
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*-
+//
+// $Id$ TAOC.i,v 1.8 2001/01/17 02:59:45 parsons Exp $ */
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // *************************************************************
 // Inline operations for class TAO::PrioritySpecification_var
@@ -154,184 +166,50 @@ TAO::PrioritySpecification_var::ptr (void) const
   return this->ptr_;
 }
 
-ACE_INLINE
-TAO::ClientPriorityPolicy::ClientPriorityPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-TAO::ClientPriorityPolicy::~ClientPriorityPolicy (void) // destructor
-{}
-
-
-#if !defined (_TAO_CLIENTPRIORITYPOLICY___VAR_CI_)
-#define _TAO_CLIENTPRIORITYPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class TAO::ClientPriorityPolicy_var
-// *************************************************************
-
-ACE_INLINE
-TAO::ClientPriorityPolicy_var::ClientPriorityPolicy_var (void) // default constructor
-  : ptr_ (ClientPriorityPolicy::_nil ())
-{}
-
-ACE_INLINE
-TAO::ClientPriorityPolicy_var::ClientPriorityPolicy_var (ClientPriorityPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE ::TAO::ClientPriorityPolicy_ptr
-TAO::ClientPriorityPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO::ClientPriorityPolicy_var::ClientPriorityPolicy_var (const ::TAO::ClientPriorityPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (ClientPriorityPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-TAO::ClientPriorityPolicy_var::~ClientPriorityPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE TAO::ClientPriorityPolicy_var &
-TAO::ClientPriorityPolicy_var::operator= (ClientPriorityPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TAO::ClientPriorityPolicy_var &
-TAO::ClientPriorityPolicy_var::operator= (const ::TAO::ClientPriorityPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::TAO::ClientPriorityPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-TAO::ClientPriorityPolicy_var::operator const ::TAO::ClientPriorityPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO::ClientPriorityPolicy_var::operator ::TAO::ClientPriorityPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO::ClientPriorityPolicy_ptr
-TAO::ClientPriorityPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO::ClientPriorityPolicy_ptr
-TAO::ClientPriorityPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
+#if !defined (_TAO_CLIENTPRIORITYPOLICY___CI_)
+#define _TAO_CLIENTPRIORITYPOLICY___CI_
 
-ACE_INLINE ::TAO::ClientPriorityPolicy_ptr &
-TAO::ClientPriorityPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO::ClientPriorityPolicy_ptr &
-TAO::ClientPriorityPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO::ClientPriorityPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO::ClientPriorityPolicy_ptr
-TAO::ClientPriorityPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::TAO::ClientPriorityPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::TAO::ClientPriorityPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_CLIENTPRIORITYPOLICY___OUT_CI_)
-#define _TAO_CLIENTPRIORITYPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class TAO::ClientPriorityPolicy_out
-// *************************************************************
-
-ACE_INLINE
-TAO::ClientPriorityPolicy_out::ClientPriorityPolicy_out (ClientPriorityPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::TAO::ClientPriorityPolicy::_nil ();
-}
-
-ACE_INLINE
-TAO::ClientPriorityPolicy_out::ClientPriorityPolicy_out (ClientPriorityPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO::ClientPriorityPolicy::_nil ();
-}
-
-ACE_INLINE
-TAO::ClientPriorityPolicy_out::ClientPriorityPolicy_out (const ::TAO::ClientPriorityPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ClientPriorityPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::TAO::ClientPriorityPolicy_out &
-TAO::ClientPriorityPolicy_out::operator= (const ::TAO::ClientPriorityPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (ClientPriorityPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE TAO::ClientPriorityPolicy_out &
-TAO::ClientPriorityPolicy_out::operator= (const ::TAO::ClientPriorityPolicy_var &p)
+ACE_INLINE TAO::ClientPriorityPolicy_ptr
+tao_TAO_ClientPriorityPolicy_duplicate (
+    TAO::ClientPriorityPolicy_ptr p
+  )
 {
-  this->ptr_ = ::TAO::ClientPriorityPolicy::_duplicate (p.ptr ());
-  return *this;
+  return TAO::ClientPriorityPolicy::_duplicate (p);
 }
 
-ACE_INLINE TAO::ClientPriorityPolicy_out &
-TAO::ClientPriorityPolicy_out::operator= (ClientPriorityPolicy_ptr p)
+ACE_INLINE void
+tao_TAO_ClientPriorityPolicy_release (
+    TAO::ClientPriorityPolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-TAO::ClientPriorityPolicy_out::operator ::TAO::ClientPriorityPolicy_ptr &() // cast
+ACE_INLINE TAO::ClientPriorityPolicy_ptr
+tao_TAO_ClientPriorityPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return TAO::ClientPriorityPolicy::_nil ();
 }
 
-ACE_INLINE ::TAO::ClientPriorityPolicy_ptr &
-TAO::ClientPriorityPolicy_out::ptr (void) // ptr
+ACE_INLINE TAO::ClientPriorityPolicy_ptr
+tao_TAO_ClientPriorityPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return TAO::ClientPriorityPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::TAO::ClientPriorityPolicy_ptr
-TAO::ClientPriorityPolicy_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_TAO_ClientPriorityPolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  TAO::ClientPriorityPolicy **tmp =
+    ACE_static_cast (TAO::ClientPriorityPolicy **, src);
+  return *tmp;
 }
 
 
@@ -511,184 +389,50 @@ TAO::BufferingConstraint_var::ptr (void) const
   return this->ptr_;
 }
 
-ACE_INLINE
-TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void) // destructor
-{}
-
-
-#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___VAR_CI_)
-#define _TAO_BUFFERINGCONSTRAINTPOLICY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class TAO::BufferingConstraintPolicy_var
-// *************************************************************
-
-ACE_INLINE
-TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (void) // default constructor
-  : ptr_ (BufferingConstraintPolicy::_nil ())
-{}
-
-ACE_INLINE
-TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE ::TAO::BufferingConstraintPolicy_ptr
-TAO::BufferingConstraintPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO::BufferingConstraintPolicy_var::BufferingConstraintPolicy_var (const ::TAO::BufferingConstraintPolicy_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (BufferingConstraintPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-TAO::BufferingConstraintPolicy_var::~BufferingConstraintPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE TAO::BufferingConstraintPolicy_var &
-TAO::BufferingConstraintPolicy_var::operator= (BufferingConstraintPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TAO::BufferingConstraintPolicy_var &
-TAO::BufferingConstraintPolicy_var::operator= (const ::TAO::BufferingConstraintPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::TAO::BufferingConstraintPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-TAO::BufferingConstraintPolicy_var::operator const ::TAO::BufferingConstraintPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TAO::BufferingConstraintPolicy_var::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO::BufferingConstraintPolicy_ptr
-TAO::BufferingConstraintPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO::BufferingConstraintPolicy_ptr
-TAO::BufferingConstraintPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO::BufferingConstraintPolicy_ptr &
-TAO::BufferingConstraintPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::TAO::BufferingConstraintPolicy_ptr &
-TAO::BufferingConstraintPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil ();
-  return this->ptr_;
-}
+#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___CI_)
+#define _TAO_BUFFERINGCONSTRAINTPOLICY___CI_
 
-ACE_INLINE ::TAO::BufferingConstraintPolicy_ptr
-TAO::BufferingConstraintPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::TAO::BufferingConstraintPolicy_ptr val = this->ptr_;
-  this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___OUT_CI_)
-#define _TAO_BUFFERINGCONSTRAINTPOLICY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class TAO::BufferingConstraintPolicy_out
-// *************************************************************
-
-ACE_INLINE
-TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingConstraintPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil ();
-}
-
-ACE_INLINE
-TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (BufferingConstraintPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::TAO::BufferingConstraintPolicy::_nil ();
-}
-
-ACE_INLINE
-TAO::BufferingConstraintPolicy_out::BufferingConstraintPolicy_out (const ::TAO::BufferingConstraintPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (BufferingConstraintPolicy_out &, p).ptr_)
-{}
-
-ACE_INLINE ::TAO::BufferingConstraintPolicy_out &
-TAO::BufferingConstraintPolicy_out::operator= (const ::TAO::BufferingConstraintPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (BufferingConstraintPolicy_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE TAO::BufferingConstraintPolicy_out &
-TAO::BufferingConstraintPolicy_out::operator= (const ::TAO::BufferingConstraintPolicy_var &p)
+ACE_INLINE TAO::BufferingConstraintPolicy_ptr
+tao_TAO_BufferingConstraintPolicy_duplicate (
+    TAO::BufferingConstraintPolicy_ptr p
+  )
 {
-  this->ptr_ = ::TAO::BufferingConstraintPolicy::_duplicate (p.ptr ());
-  return *this;
+  return TAO::BufferingConstraintPolicy::_duplicate (p);
 }
 
-ACE_INLINE TAO::BufferingConstraintPolicy_out &
-TAO::BufferingConstraintPolicy_out::operator= (BufferingConstraintPolicy_ptr p)
+ACE_INLINE void
+tao_TAO_BufferingConstraintPolicy_release (
+    TAO::BufferingConstraintPolicy_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-TAO::BufferingConstraintPolicy_out::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast
+ACE_INLINE TAO::BufferingConstraintPolicy_ptr
+tao_TAO_BufferingConstraintPolicy_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return TAO::BufferingConstraintPolicy::_nil ();
 }
 
-ACE_INLINE ::TAO::BufferingConstraintPolicy_ptr &
-TAO::BufferingConstraintPolicy_out::ptr (void) // ptr
+ACE_INLINE TAO::BufferingConstraintPolicy_ptr
+tao_TAO_BufferingConstraintPolicy_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return TAO::BufferingConstraintPolicy::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::TAO::BufferingConstraintPolicy_ptr
-TAO::BufferingConstraintPolicy_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_TAO_BufferingConstraintPolicy_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  TAO::BufferingConstraintPolicy **tmp =
+    ACE_static_cast (TAO::BufferingConstraintPolicy **, src);
+  return *tmp;
 }
 
 
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl
index c6fca988bc3..41bcbe67348 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl
@@ -17,43 +17,48 @@
 //   code in TypeCodeFactoryC.* by splitting Interface.idl into two
 //   parts.
 //
-//   The command used to generate code from this file is:
+//   1. Patch this pidl file with
 //
-//     tao_idl -o orig -Ge 1 -ci "C.inl" \
-//          -Wb,export_macro=TAO_TypeCodeFactory_Export \
-//          -Wb,export_include=typecodefactory_export.h \
+//      patch < diffs/TypeCodeFactory.pidl.diff
+//
+//   This will remove the CORBA module, rename most types foo
+//   declared in it as CORBA_foo, unalias the simple typedefs
+//   which don't have a CORBA_ analog in corbafwd.h.
+//
+//   2. Generate the code. The command used to generate code from this 
+//   IDL file is:
+//
+//     tao_idl -o orig -Ge 1 -I../.. -ci "C.inl" \
+//          -Wb,export_macro=TAO_IFR_Client_Export \
+//          -Wb,export_include=ifr_client_export.h \
 //          -Wb,pre_include="ace/pre.h" \
 //          -Wb,post_include="ace/post.h" \
 //          TypeCodeFactory.pidl
 //
-//   after the file is generated a patch must be applied.  The patch
-//   removes generated code for the typedefs appearing at the top of
-//   the IDL file below, since they are already included in the TAO
-//   library. Also the scoped names of the Interface Repository datatypes
-//   used in this file have been changed to their flat name counterparts
-//   (see the explanation in TAO/tao/IFR_Client/Interface.pidl).
+//   3. Copy the generated files to the current directory.
 //
-//   Apply patches using the following commands:
+//   4. Patch the generated files, using
+//      
+//      patch < diffs/TypeCodeFactoryC.h.diff
+//      patch < diffs/TypeCodeFactoryC.i.diff
+//      patch < diffs/TypeCodeFactoryC.cpp.diff
 //
-//   patch < diffs/TypeCodeFactoryC.h.diff
-//   patch < diffs/TypeCodeFactoryC.inl.diff
-//   patch < diffs/TypeCodeFactoryC.cpp.diff
+//   If this fails for some reason, the files must be patched
+//   by hand, and the diff files regenerated with
 //
-//   These patches are used to automate the above changes when the
-//   code, which is part of the TAO library, must be regenerated because
-//   of modifications to the output of the TAO IDL compiler.
+//      diff -wbu orig/TypeCodeFactoryC.h TypeCodeFactoryC.h > diffs/TypeCodeFactoryC.h.diff
+//      diff -wbu orig/TypeCodeFactoryC.i TypeCodeFactoryC.i > diffs/TypeCodeFactoryC.i.diff
+//      diff -wbu orig/TypeCodeFactoryC.cpp TypeCodeFactoryC.cpp > diffs/TypeCodeFactoryC.cpp.diff
 //
-//   Note: The diffs were generated with these commands:
-//
-//   diff -wbu orig/TypeCodeFactoryC.h TypeCodeFactoryC.h > diffs/TypeCodeFactoryC.h.diff
-//   diff -wbu orig/TypeCodeFactoryC.inl TypeCodeFactoryC.inl > diffs/TypeCodeFactoryC.inl.diff
-//   diff -wbu orig/TypeCodeFactoryC.cpp TypeCodeFactoryC.cpp > diffs/TypeCodeFactoryC.cpp.diff
+//   5. Restore TypeCodeFactory.pidl.
 //
 // ================================================================
 
 #ifndef _TYPECODEFACTORY_IDL_
 #define _TYPECODEFACTORY_IDL_
 
+#include "tao/IFR_Client/IFR_Extended.pidl"
+
 #pragma prefix "omg.org"
 
 module CORBA
@@ -67,20 +72,20 @@ module CORBA
     TypeCode create_struct_tc (
         in RepositoryId id,
         in Identifier name,
-        in IR::StructMemberSeq members
+        in StructMemberSeq members
       );
 
     TypeCode create_union_tc (
         in RepositoryId id,
         in Identifier name,
         in TypeCode discriminator_type,
-        in IR::UnionMemberSeq members
+        in UnionMemberSeq members
       );
 
     TypeCode create_enum_tc (
         in RepositoryId id,
         in Identifier name,
-        in IR::EnumMemberSeq members
+        in EnumMemberSeq members
       );
 
     TypeCode create_alias_tc (
@@ -92,7 +97,7 @@ module CORBA
     TypeCode create_exception_tc (
         in RepositoryId id,
         in Identifier name,
-        in IR::StructMemberSeq members
+        in StructMemberSeq members
       );
 
     TypeCode create_interface_tc (
@@ -128,7 +133,7 @@ module CORBA
         in Identifier name,
         in ValueModifier type_modifier,
         in TypeCode concrete_base,
-        in IR::ValueMemberSeq members
+        in ValueMemberSeq members
       );
 
     TypeCode create_value_box_tc (
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
index c2caf7e5483..737e89edda5 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
@@ -1,4 +1,4 @@
-// -*- C++ -*- 
+// -*- C++ -*-
 //
 // $Id$
 
@@ -17,14 +17,10 @@
 //       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-# include "TypeCodeFactory_Loader.h"
-# include "tao/Sequence_T.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+#include "TypeCodeFactory_Loader.h"
+#include "tao/Sequence_T.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
@@ -34,30 +30,213 @@
 #include "TypeCodeFactoryC.inl"
 #endif /* !defined INLINE */
 
-// Default constructor.
-CORBA_TypeCodeFactory::CORBA_TypeCodeFactory (void)
+// *************************************************************
+// Operations for class CORBA_TypeCodeFactory_var
+// *************************************************************
+
+CORBA_TypeCodeFactory_var::CORBA_TypeCodeFactory_var (void) // default constructor
+  : ptr_ (CORBA_TypeCodeFactory::_nil ())
 {}
 
-// Destructor.
+::CORBA_TypeCodeFactory_ptr
+CORBA_TypeCodeFactory_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+CORBA_TypeCodeFactory_var::CORBA_TypeCodeFactory_var (const ::CORBA_TypeCodeFactory_var &p) // copy constructor
+  : TAO_Base_var (),
+    ptr_ (CORBA_TypeCodeFactory::_duplicate (p.ptr ()))
+{}
+
+CORBA_TypeCodeFactory_var::~CORBA_TypeCodeFactory_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+CORBA_TypeCodeFactory_var &
+CORBA_TypeCodeFactory_var::operator= (CORBA_TypeCodeFactory_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_TypeCodeFactory_var &
+CORBA_TypeCodeFactory_var::operator= (const ::CORBA_TypeCodeFactory_var &p)
+{
+  if (this != &p)
+  {
+    CORBA::release (this->ptr_);
+    this->ptr_ = ::CORBA_TypeCodeFactory::_duplicate (p.ptr ());
+  }
+  return *this;
+}
+
+CORBA_TypeCodeFactory_var::operator const ::CORBA_TypeCodeFactory_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+CORBA_TypeCodeFactory_var::operator ::CORBA_TypeCodeFactory_ptr &() // cast 
+{
+  return this->ptr_;
+}
+
+::CORBA_TypeCodeFactory_ptr
+CORBA_TypeCodeFactory_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_TypeCodeFactory_ptr
+CORBA_TypeCodeFactory_var::in (void) const
+{
+  return this->ptr_;
+}
+
+::CORBA_TypeCodeFactory_ptr &
+CORBA_TypeCodeFactory_var::inout (void)
+{
+  return this->ptr_;
+}
+
+::CORBA_TypeCodeFactory_ptr &
+CORBA_TypeCodeFactory_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_TypeCodeFactory::_nil ();
+  return this->ptr_;
+}
+
+::CORBA_TypeCodeFactory_ptr
+CORBA_TypeCodeFactory_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  ::CORBA_TypeCodeFactory_ptr val = this->ptr_;
+  this->ptr_ = ::CORBA_TypeCodeFactory::_nil ();
+  return val;
+}
+
+::CORBA_TypeCodeFactory_ptr
+CORBA_TypeCodeFactory_var::duplicate (CORBA_TypeCodeFactory_ptr p)
+{
+  return ::CORBA_TypeCodeFactory::_duplicate (p);
+}
+
+void
+CORBA_TypeCodeFactory_var::release (CORBA_TypeCodeFactory_ptr p)
+{
+  CORBA::release (p);
+}
+
+::CORBA_TypeCodeFactory_ptr
+CORBA_TypeCodeFactory_var::nil (void)
+{
+  return ::CORBA_TypeCodeFactory::_nil ();
+}
+
+::CORBA_TypeCodeFactory_ptr
+CORBA_TypeCodeFactory_var::narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return ::CORBA_TypeCodeFactory::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+CORBA_TypeCodeFactory_var::upcast (void *src)
+{
+  CORBA_TypeCodeFactory **tmp =
+    ACE_static_cast (CORBA_TypeCodeFactory **, src);
+  return *tmp;
+}
+
+// *************************************************************
+// Inline operations for class CORBA_TypeCodeFactory_out
+// *************************************************************
+
+CORBA_TypeCodeFactory_out::CORBA_TypeCodeFactory_out (CORBA_TypeCodeFactory_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = ::CORBA_TypeCodeFactory::_nil ();
+}
+
+CORBA_TypeCodeFactory_out::CORBA_TypeCodeFactory_out (CORBA_TypeCodeFactory_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = ::CORBA_TypeCodeFactory::_nil ();
+}
+
+CORBA_TypeCodeFactory_out::CORBA_TypeCodeFactory_out (const ::CORBA_TypeCodeFactory_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (CORBA_TypeCodeFactory_out &, p).ptr_)
+{}
+
+::CORBA_TypeCodeFactory_out &
+CORBA_TypeCodeFactory_out::operator= (const ::CORBA_TypeCodeFactory_out &p)
+{
+  this->ptr_ = ACE_const_cast (CORBA_TypeCodeFactory_out&, p).ptr_;
+  return *this;
+}
+
+CORBA_TypeCodeFactory_out &
+CORBA_TypeCodeFactory_out::operator= (const ::CORBA_TypeCodeFactory_var &p)
+{
+  this->ptr_ = ::CORBA_TypeCodeFactory::_duplicate (p.ptr ());
+  return *this;
+}
+
+CORBA_TypeCodeFactory_out &
+CORBA_TypeCodeFactory_out::operator= (CORBA_TypeCodeFactory_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+CORBA_TypeCodeFactory_out::operator ::CORBA_TypeCodeFactory_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+::CORBA_TypeCodeFactory_ptr &
+CORBA_TypeCodeFactory_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+::CORBA_TypeCodeFactory_ptr
+CORBA_TypeCodeFactory_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+// default constructor
+CORBA_TypeCodeFactory::CORBA_TypeCodeFactory ()
+{
+  }
+
+// destructor
 CORBA_TypeCodeFactory::~CORBA_TypeCodeFactory (void)
 {}
 
-CORBA::TypeCodeFactory_ptr CORBA::TypeCodeFactory::_narrow (
+CORBA_TypeCodeFactory_ptr CORBA_TypeCodeFactory::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
 {
-  return CORBA::TypeCodeFactory::_unchecked_narrow (obj, ACE_TRY_ENV);
+  return CORBA_TypeCodeFactory::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::TypeCodeFactory_ptr CORBA::TypeCodeFactory::_unchecked_narrow (
+CORBA_TypeCodeFactory_ptr CORBA_TypeCodeFactory::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
 {
   if (CORBA::is_nil (obj))
-    return CORBA::TypeCodeFactory::_nil ();
-
+    return CORBA_TypeCodeFactory::_nil ();
   return
       ACE_reinterpret_cast
         (
@@ -73,16 +252,15 @@ CORBA::TypeCodeFactory_ptr CORBA::TypeCodeFactory::_unchecked_narrow (
         );
 }
 
-CORBA::TypeCodeFactory_ptr
-CORBA::TypeCodeFactory::_duplicate (CORBA::TypeCodeFactory_ptr obj)
+CORBA_TypeCodeFactory_ptr
+CORBA_TypeCodeFactory::_duplicate (CORBA_TypeCodeFactory_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
   return obj;
 }
 
-void *
-CORBA::TypeCodeFactory::_tao_QueryInterface (ptr_arith_t type)
+void *CORBA_TypeCodeFactory::_tao_QueryInterface (ptr_arith_t type)
 {
   void *retv = 0;
   if (type == ACE_reinterpret_cast
@@ -98,16 +276,15 @@ CORBA::TypeCodeFactory::_tao_QueryInterface (ptr_arith_t type)
   return retv;
 }
 
-const char *
-CORBA::TypeCodeFactory::_interface_repository_id (void) const
+const char* CORBA_TypeCodeFactory::_interface_repository_id (void) const
 {
   return "IDL:omg.org/CORBA/TypeCodeFactory:1.0";
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
     defined (ACE_HAS_GNU_REPO)
-    template class TAO_Object_Manager<CORBA::TypeCodeFactory,CORBA::TypeCodeFactory_var>;
+    template class TAO_Object_Manager<CORBA_TypeCodeFactory,CORBA_TypeCodeFactory_var>;
   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #  pragma instantiate TAO_Object_Manager<CORBA::TypeCodeFactory,CORBA::TypeCodeFactory_var>
+  #  pragma instantiate TAO_Object_Manager<CORBA_TypeCodeFactory,CORBA_TypeCodeFactory_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
index 387a0439c92..c52cec47948 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
@@ -1,4 +1,4 @@
-// -*- C++ -*- 
+// -*- C++ -*-
 //
 // $Id$
 
@@ -17,10 +17,10 @@
 //       http://doc.ece.uci.edu/
 //
 // Information about TAO is available at:
-//                 http://www.cs.wustl.edu/~schmidt/TAO.html
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#ifndef TAO_TYPECODEFACTORYC_H
-#define TAO_TYPECODEFACTORYC_H
+#ifndef _TAO_IDL_TYPECODEFACTORYC_H_
+#define _TAO_IDL_TYPECODEFACTORYC_H_
 
 #ifndef TAO_TYPECODEFACTORY_SAFE_INCLUDE
 #error "You should not include TypeCodeFactoryC.h directly, use TCF_Loader.h"
@@ -58,27 +58,47 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-class TAO_TypeCodeFactory_Export CORBA_TypeCodeFactory_var 
-  : public TAO_Base_var
+
+#if !defined (_CORBA_TYPECODEFACTORY___PTR_CH_)
+#define _CORBA_TYPECODEFACTORY___PTR_CH_
+
+class CORBA_TypeCodeFactory;
+typedef CORBA_TypeCodeFactory *CORBA_TypeCodeFactory_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_TYPECODEFACTORY___VAR_CH_)
+#define _CORBA_TYPECODEFACTORY___VAR_CH_
+
+class TAO_TypeCodeFactory_Export CORBA_TypeCodeFactory_var : public TAO_Base_var
 {
 public:
   CORBA_TypeCodeFactory_var (void); // default constructor
   CORBA_TypeCodeFactory_var (CORBA_TypeCodeFactory_ptr p) : ptr_ (p) {} 
   CORBA_TypeCodeFactory_var (const CORBA_TypeCodeFactory_var &); // copy constructor
   ~CORBA_TypeCodeFactory_var (void); // destructor
-
+  
   CORBA_TypeCodeFactory_var &operator= (CORBA_TypeCodeFactory_ptr);
   CORBA_TypeCodeFactory_var &operator= (const CORBA_TypeCodeFactory_var &);
   CORBA_TypeCodeFactory_ptr operator-> (void) const;
-
+  
   operator const CORBA_TypeCodeFactory_ptr &() const;
   operator CORBA_TypeCodeFactory_ptr &();
-  // in, inout, out, _retn
+  // in, inout, out, _retn 
   CORBA_TypeCodeFactory_ptr in (void) const;
   CORBA_TypeCodeFactory_ptr &inout (void);
   CORBA_TypeCodeFactory_ptr &out (void);
   CORBA_TypeCodeFactory_ptr _retn (void);
   CORBA_TypeCodeFactory_ptr ptr (void) const;
+  
+  // Hooks used by template sequence and object manager classes
+  // for non-defined forward declared interfaces.
+  static CORBA_TypeCodeFactory_ptr duplicate (CORBA_TypeCodeFactory_ptr);
+  static void release (CORBA_TypeCodeFactory_ptr);
+  static CORBA_TypeCodeFactory_ptr nil (void);
+  static CORBA_TypeCodeFactory_ptr narrow (CORBA::Object *, CORBA::Environment &);
+  static CORBA::Object * upcast (void *);
 
 private:
   CORBA_TypeCodeFactory_ptr ptr_;
@@ -87,6 +107,13 @@ private:
   CORBA_TypeCodeFactory_var &operator= (const TAO_Base_var &rhs);
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_TYPECODEFACTORY___OUT_CH_)
+#define _CORBA_TYPECODEFACTORY___OUT_CH_
+
 class TAO_TypeCodeFactory_Export CORBA_TypeCodeFactory_out
 {
 public:
@@ -104,241 +131,258 @@ private:
   CORBA_TypeCodeFactory_ptr &ptr_;
 };
 
-class TAO_TypeCodeFactory_Export CORBA_TypeCodeFactory 
-  : public virtual CORBA_Object
-  {
-  public:
-  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-    typedef CORBA_TypeCodeFactory_ptr _ptr_type;
-    typedef CORBA_TypeCodeFactory_var _var_type;
-  #endif /* ! __GNUC__ || g++ >= 2.8 */
-
-    // the static operations
-    static CORBA_TypeCodeFactory_ptr _duplicate (CORBA_TypeCodeFactory_ptr obj);
-    static CORBA_TypeCodeFactory_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-    static CORBA_TypeCodeFactory_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-    static CORBA_TypeCodeFactory_ptr _nil (void)
-      {
-        return (CORBA_TypeCodeFactory_ptr)0;
-      }
-
-    virtual CORBA::TypeCode_ptr create_struct_tc (
-        const char * id,
-        const char * name,
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_union_tc (
-        const char * id,
-        const char * name,
-        CORBA::TypeCode_ptr discriminator_type,
-        const CORBA_UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_enum_tc (
-        const char * id,
-        const char * name,
-        const CORBA_EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_alias_tc (
-        const char * id,
-        const char * name,
-        CORBA::TypeCode_ptr original_type,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_exception_tc (
-        const char * id,
-        const char * name,
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_interface_tc (
-        const char * id,
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_string_tc (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_wstring_tc (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_fixed_tc (
-        CORBA::UShort digits,
-        CORBA::UShort scale,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_sequence_tc (
-        CORBA::ULong bound,
-        CORBA::TypeCode_ptr element_type,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_array_tc (
-        CORBA::ULong length,
-        CORBA::TypeCode_ptr element_type,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_value_tc (
-        const char * id,
-        const char * name,
-        CORBA::ValueModifier type_modifier,
-        CORBA::TypeCode_ptr concrete_base,
-        const CORBA_ValueMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_value_box_tc (
-        const char * id,
-        const char * name,
-        CORBA::TypeCode_ptr boxed_type,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_native_tc (
-        const char * id,
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_recursive_tc (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
-        const char * id,
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_local_interface_tc (
-        const char *id,
-        const char *name,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_component_tc (
-        const char * id,
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual CORBA::TypeCode_ptr create_home_tc (
-        const char * id,
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    virtual void *_tao_QueryInterface (ptr_arith_t type);
-    
-    virtual const char* _interface_repository_id (void) const;
-
-  protected:
-    CORBA_TypeCodeFactory (void);
-    virtual ~CORBA_TypeCodeFactory (void);
-  private:
-    CORBA_TypeCodeFactory (const CORBA_TypeCodeFactory &);
-    void operator= (const CORBA_TypeCodeFactory &);
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_TYPECODEFACTORY_CH_)
+#define _CORBA_TYPECODEFACTORY_CH_
+
+class TAO_TypeCodeFactory_Export CORBA_TypeCodeFactory : public virtual CORBA_Object
+{
+public:
+#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+  typedef CORBA_TypeCodeFactory_ptr _ptr_type;
+  typedef CORBA_TypeCodeFactory_var _var_type;
+#endif /* ! __GNUC__ || g++ >= 2.8 */
+
+  // the static operations
+  static CORBA_TypeCodeFactory_ptr _duplicate (CORBA_TypeCodeFactory_ptr obj);
+  static CORBA_TypeCodeFactory_ptr _narrow (
+      CORBA::Object_ptr obj,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  static CORBA_TypeCodeFactory_ptr _unchecked_narrow (
+      CORBA::Object_ptr obj,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    );
+  static CORBA_TypeCodeFactory_ptr _nil (void)
+    {
+      return (CORBA_TypeCodeFactory_ptr)0;
+    }
+
+  virtual CORBA::TypeCode_ptr create_struct_tc (
+      const char * id,
+      const char * name,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_union_tc (
+      const char * id,
+      const char * name,
+      CORBA::TypeCode_ptr discriminator_type,
+      const CORBA_UnionMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_enum_tc (
+      const char * id,
+      const char * name,
+      const CORBA_EnumMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_alias_tc (
+      const char * id,
+      const char * name,
+      CORBA::TypeCode_ptr original_type,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_exception_tc (
+      const char * id,
+      const char * name,
+      const CORBA_StructMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_interface_tc (
+      const char * id,
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_string_tc (
+      CORBA::ULong bound,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_wstring_tc (
+      CORBA::ULong bound,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_fixed_tc (
+      CORBA::UShort digits,
+      CORBA::UShort scale,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_sequence_tc (
+      CORBA::ULong bound,
+      CORBA::TypeCode_ptr element_type,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_array_tc (
+      CORBA::ULong length,
+      CORBA::TypeCode_ptr element_type,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_value_tc (
+      const char * id,
+      const char * name,
+      CORBA::Short type_modifier,
+      CORBA::TypeCode_ptr concrete_base,
+      const CORBA_ValueMemberSeq & members,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_value_box_tc (
+      const char * id,
+      const char * name,
+      CORBA::TypeCode_ptr boxed_type,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_native_tc (
+      const char * id,
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_recursive_tc (
+      const char * id,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
+      const char * id,
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_local_interface_tc (
+      const char * id,
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_component_tc (
+      const char * id,
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual CORBA::TypeCode_ptr create_home_tc (
+      const char * id,
+      const char * name,
+      CORBA::Environment &ACE_TRY_ENV = 
+        TAO_default_environment ()
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    )) = 0;
+
+  virtual void *_tao_QueryInterface (ptr_arith_t type);
+  
+  virtual const char* _interface_repository_id (void) const;
+
+protected:
+  CORBA_TypeCodeFactory ();
+  
+  virtual ~CORBA_TypeCodeFactory (void);
+private:
+  CORBA_TypeCodeFactory (const CORBA_TypeCodeFactory &);
+  void operator= (const CORBA_TypeCodeFactory &);
 };
 
+
+#endif /* end #if !defined */
+
+
+#ifndef __ACE_INLINE__
+
+
+#endif /* __ACE_INLINE__ */
+
+
 #if defined (__ACE_INLINE__)
 #include "TypeCodeFactoryC.inl"
 #endif /* defined INLINE */
@@ -352,4 +396,4 @@ class TAO_TypeCodeFactory_Export CORBA_TypeCodeFactory
 #endif /* __BORLANDC__ */
 
 #include "ace/post.h"
-#endif /* TAO_TYPECODEFACTORYC_H */
+#endif /* ifndef */
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
index a82f282ba04..b9575962bd6 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
@@ -1,170 +1,69 @@
-/* -*- C++ -*- */
-//$Id$
+// -*- C++ -*-
+//
+// $Id$
 
-#if !defined (_CORBA_TYPECODEFACTORY___VAR_CI_)
-#define _CORBA_TYPECODEFACTORY___VAR_CI_
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// *************************************************************
-// Inline operations for class CORBA_TypeCodeFactory_var
-// *************************************************************
 
-ACE_INLINE
-CORBA_TypeCodeFactory_var::CORBA_TypeCodeFactory_var (void) // default constructor
-  : ptr_ (CORBA_TypeCodeFactory::_nil ())
-{}
+#if !defined (_CORBA_TYPECODEFACTORY___CI_)
+#define _CORBA_TYPECODEFACTORY___CI_
 
-ACE_INLINE ::CORBA_TypeCodeFactory_ptr
-CORBA_TypeCodeFactory_var::ptr (void) const
+ACE_INLINE CORBA_TypeCodeFactory_ptr
+tao_CORBA_TypeCodeFactory_duplicate (
+    CORBA_TypeCodeFactory_ptr p
+  )
 {
-  return this->ptr_;
+  return CORBA_TypeCodeFactory::_duplicate (p);
 }
 
-ACE_INLINE
-CORBA_TypeCodeFactory_var::CORBA_TypeCodeFactory_var (const ::CORBA_TypeCodeFactory_var &p) // copy constructor
-  : TAO_Base_var (),
-    ptr_ (CORBA_TypeCodeFactory::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_TypeCodeFactory_var::~CORBA_TypeCodeFactory_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_TypeCodeFactory_var &
-CORBA_TypeCodeFactory_var::operator= (CORBA_TypeCodeFactory_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_TypeCodeFactory_var &
-CORBA_TypeCodeFactory_var::operator= (const ::CORBA_TypeCodeFactory_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = ::CORBA_TypeCodeFactory::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_TypeCodeFactory_var::operator const ::CORBA_TypeCodeFactory_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_TypeCodeFactory_var::operator ::CORBA_TypeCodeFactory_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_TypeCodeFactory_ptr
-CORBA_TypeCodeFactory_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_TypeCodeFactory_ptr
-CORBA_TypeCodeFactory_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_TypeCodeFactory_ptr &
-CORBA_TypeCodeFactory_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_TypeCodeFactory_ptr &
-CORBA_TypeCodeFactory_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_TypeCodeFactory::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE ::CORBA_TypeCodeFactory_ptr
-CORBA_TypeCodeFactory_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  ::CORBA_TypeCodeFactory_ptr val = this->ptr_;
-  this->ptr_ = ::CORBA_TypeCodeFactory::_nil ();
-  return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_TYPECODEFACTORY___OUT_CI_)
-#define _CORBA_TYPECODEFACTORY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_TypeCodeFactory_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_TypeCodeFactory_out::CORBA_TypeCodeFactory_out (CORBA_TypeCodeFactory_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = ::CORBA_TypeCodeFactory::_nil ();
-}
-
-ACE_INLINE
-CORBA_TypeCodeFactory_out::CORBA_TypeCodeFactory_out (CORBA_TypeCodeFactory_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = ::CORBA_TypeCodeFactory::_nil ();
-}
-
-ACE_INLINE
-CORBA_TypeCodeFactory_out::CORBA_TypeCodeFactory_out (const ::CORBA_TypeCodeFactory_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_TypeCodeFactory_out &, p).ptr_)
-{}
-
-ACE_INLINE ::CORBA_TypeCodeFactory_out &
-CORBA_TypeCodeFactory_out::operator= (const ::CORBA_TypeCodeFactory_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_TypeCodeFactory_out&, p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_TypeCodeFactory_out &
-CORBA_TypeCodeFactory_out::operator= (const ::CORBA_TypeCodeFactory_var &p)
-{
-  this->ptr_ = ::CORBA_TypeCodeFactory::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_TypeCodeFactory_out &
-CORBA_TypeCodeFactory_out::operator= (CORBA_TypeCodeFactory_ptr p)
+ACE_INLINE void
+tao_CORBA_TypeCodeFactory_release (
+    CORBA_TypeCodeFactory_ptr p
+  )
 {
-  this->ptr_ = p;
-  return *this;
+  CORBA::release (p);
 }
 
-ACE_INLINE
-CORBA_TypeCodeFactory_out::operator ::CORBA_TypeCodeFactory_ptr &() // cast
+ACE_INLINE CORBA_TypeCodeFactory_ptr
+tao_CORBA_TypeCodeFactory_nil (
+    void
+  )
 {
-  return this->ptr_;
+  return CORBA_TypeCodeFactory::_nil ();
 }
 
-ACE_INLINE ::CORBA_TypeCodeFactory_ptr &
-CORBA_TypeCodeFactory_out::ptr (void) // ptr
+ACE_INLINE CORBA_TypeCodeFactory_ptr
+tao_CORBA_TypeCodeFactory_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
 {
-  return this->ptr_;
+  return CORBA_TypeCodeFactory::_narrow (p, ACE_TRY_ENV);
 }
 
-ACE_INLINE ::CORBA_TypeCodeFactory_ptr
-CORBA_TypeCodeFactory_out::operator-> (void)
+ACE_INLINE CORBA::Object *
+tao_CORBA_TypeCodeFactory_upcast (
+    void *src
+  )
 {
-  return this->ptr_;
+  CORBA_TypeCodeFactory **tmp =
+    ACE_static_cast (CORBA_TypeCodeFactory **, src);
+  return *tmp;
 }
 
 
diff --git a/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactory.pidl.diff b/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactory.pidl.diff
new file mode 100644
index 00000000000..609eb95a8d8
--- /dev/null
+++ b/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactory.pidl.diff
@@ -0,0 +1,183 @@
+--- orig/TypeCodeFactory.pidl	Mon Apr 23 23:32:24 2001
++++ TypeCodeFactory.pidl	Mon Apr 23 23:31:30 2001
+@@ -57,113 +57,120 @@
+ #ifndef _TYPECODEFACTORY_IDL_
+ #define _TYPECODEFACTORY_IDL_
+ 
+-#include "tao/IFR_Client/orig/IFR_Extended.pidl"
++#include "tao/IFR_Client/IFR_Extended.pidl"
+ 
+ #pragma prefix "omg.org"
+ 
+-  local interface CORBA_TypeCodeFactory  // PIDL
++module CORBA
+   {
+-    CORBA::TypeCode create_struct_tc (
+-        in string id,
+-        in string name,
+-        in CORBA_StructMemberSeq members
++  typedef string Identifier;
++  typedef string RepositoryId;
++  typedef short ValueModifier;
++
++  local interface TypeCodeFactory  // PIDL
++  {
++    TypeCode create_struct_tc (
++        in RepositoryId id,
++        in Identifier name,
++        in StructMemberSeq members
+       );
+ 
+-    CORBA::TypeCode create_union_tc (
+-        in string id,
+-        in string name,
+-        in CORBA::TypeCode discriminator_type,
+-        in CORBA_UnionMemberSeq members
++    TypeCode create_union_tc (
++        in RepositoryId id,
++        in Identifier name,
++        in TypeCode discriminator_type,
++        in UnionMemberSeq members
+       );
+ 
+-    CORBA::TypeCode create_enum_tc (
+-        in string id,
+-        in string name,
+-        in CORBA_EnumMemberSeq members
++    TypeCode create_enum_tc (
++        in RepositoryId id,
++        in Identifier name,
++        in EnumMemberSeq members
+       );
+ 
+-    CORBA::TypeCode create_alias_tc (
+-        in string id,
+-        in string name,
+-        in CORBA::TypeCode original_type
++    TypeCode create_alias_tc (
++        in RepositoryId id,
++        in Identifier name,
++        in TypeCode original_type
+       );
+ 
+-    CORBA::TypeCode create_exception_tc (
+-        in string id,
+-        in string name,
+-        in CORBA_StructMemberSeq members
++    TypeCode create_exception_tc (
++        in RepositoryId id,
++        in Identifier name,
++        in StructMemberSeq members
+       );
+ 
+-    CORBA::TypeCode create_interface_tc (
+-        in string id,
+-        in string name
++    TypeCode create_interface_tc (
++        in RepositoryId id,
++        in Identifier name
+       );
+ 
+-    CORBA::TypeCode create_string_tc (
++    TypeCode create_string_tc (
+         in unsigned long bound
+       );
+ 
+-    CORBA::TypeCode create_wstring_tc (
++    TypeCode create_wstring_tc (
+         in unsigned long bound
+       );
+ 
+-    CORBA::TypeCode create_fixed_tc (
++    TypeCode create_fixed_tc (
+         in unsigned short digits,
+         in unsigned short scale
+       );
+ 
+-    CORBA::TypeCode create_sequence_tc (
++    TypeCode create_sequence_tc (
+         in unsigned long bound,
+-        in CORBA::TypeCode element_type
++        in TypeCode element_type
+       );
+ 
+-    CORBA::TypeCode create_array_tc (
++    TypeCode create_array_tc (
+         in unsigned long length,
+-        in CORBA::TypeCode element_type
++        in TypeCode element_type
+       );
+ 
+-    CORBA::TypeCode create_value_tc (
+-        in string id,
+-        in string name,
+-        in short type_modifier,
+-        in CORBA::TypeCode concrete_base,
+-        in CORBA_ValueMemberSeq members
++    TypeCode create_value_tc (
++        in RepositoryId id,
++        in Identifier name,
++        in ValueModifier type_modifier,
++        in TypeCode concrete_base,
++        in ValueMemberSeq members
+       );
+ 
+-    CORBA::TypeCode create_value_box_tc (
+-        in string id,
+-        in string name,
+-        in CORBA::TypeCode boxed_type
++    TypeCode create_value_box_tc (
++        in RepositoryId id,
++        in Identifier name,
++        in TypeCode boxed_type
+       );
+ 
+-    CORBA::TypeCode create_native_tc (
+-        in string id,
+-        in string name
++    TypeCode create_native_tc (
++        in RepositoryId id,
++        in Identifier name
+       );
+ 
+-    CORBA::TypeCode create_recursive_tc (
+-        in string id
++    TypeCode create_recursive_tc (
++        in RepositoryId id
+       );
+ 
+-    CORBA::TypeCode create_abstract_interface_tc (
+-        in string id,
+-        in string name
++    TypeCode create_abstract_interface_tc (
++        in RepositoryId id,
++        in Identifier name
+       );
+ 
+-    CORBA::TypeCode create_local_interface_tc (
+-        in string id,
+-        in string name
++    TypeCode create_local_interface_tc (
++        in RepositoryId id,
++        in Identifier name
+       );
+-    CORBA::TypeCode create_component_tc (
+-        in string id,
+-        in string name
++    TypeCode create_component_tc (
++        in RepositoryId id,
++        in Identifier name
+       );
+ 
+-    CORBA::TypeCode create_home_tc (
+-        in string id,
+-        in string name
++    TypeCode create_home_tc (
++        in RepositoryId id,
++        in Identifier name
+       );
+   };
++};
+ 
+ #pragma prefix ""
+ #endif // _TYPECODEFACTORY_IDL_
diff --git a/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactoryC.cpp.diff b/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactoryC.cpp.diff
index b00cba99963..48beeedaa09 100644
--- a/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactoryC.cpp.diff
+++ b/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactoryC.cpp.diff
@@ -1,5 +1,5 @@
---- orig/TypeCodeFactoryC.cpp	Mon Mar 12 22:17:35 2001
-+++ TypeCodeFactoryC.cpp	Mon Mar 12 22:41:37 2001
+--- orig/TypeCodeFactoryC.cpp	Mon Apr 23 23:49:14 2001
++++ TypeCodeFactoryC.cpp	Mon Apr 23 23:52:13 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -8,135 +8,29 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -19,7 +19,7 @@
+@@ -19,14 +19,8 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
 -#include "TypeCodeFactoryC.h"
-+#include "TypeCodeFactory_Loader.h"
- 
- #if TAO_HAS_INTERCEPTORS == 1
- #include "tao/RequestInfo_Util.h"
-@@ -33,53 +33,12 @@
- #include "TypeCodeFactoryC.inl"
- #endif /* !defined INLINE */
- 
--static const CORBA::Long _oc_CORBA_Identifier[] =
--{
--  TAO_ENCAP_BYTE_ORDER, // byte order
--  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
--  11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000),  // name = Identifier
--  CORBA::tk_string, 
--  0U, // string length
--};
--static CORBA::TypeCode _tc_TAO_tc_CORBA_Identifier (CORBA::tk_alias, sizeof (_oc_CORBA_Identifier), (char *) &_oc_CORBA_Identifier, 0, sizeof (CORBA::Identifier));
--TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Identifier, &_tc_TAO_tc_CORBA_Identifier)
--TAO_NAMESPACE_END
--static const CORBA::Long _oc_CORBA_RepositoryId[] =
--{
--  TAO_ENCAP_BYTE_ORDER, // byte order
--  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
--  13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0),  // name = RepositoryId
--  CORBA::tk_string, 
--  0U, // string length
--};
--static CORBA::TypeCode _tc_TAO_tc_CORBA_RepositoryId (CORBA::tk_alias, sizeof (_oc_CORBA_RepositoryId), (char *) &_oc_CORBA_RepositoryId, 0, sizeof (CORBA::RepositoryId));
--TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryId, &_tc_TAO_tc_CORBA_RepositoryId)
--TAO_NAMESPACE_END
--static const CORBA::Long _oc_CORBA_ValueModifier[] =
--{
--  TAO_ENCAP_BYTE_ORDER, // byte order
--  36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5661), ACE_NTOHL (0x6c75654d), ACE_NTOHL (0x6f646966), ACE_NTOHL (0x6965723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ValueModifier:1.0
--  14, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d6f64), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000),  // name = ValueModifier
--  CORBA::tk_short,
--
--};
--static CORBA::TypeCode _tc_TAO_tc_CORBA_ValueModifier (CORBA::tk_alias, sizeof (_oc_CORBA_ValueModifier), (char *) &_oc_CORBA_ValueModifier, 0, sizeof (CORBA::ValueModifier));
--TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueModifier, &_tc_TAO_tc_CORBA_ValueModifier)
--TAO_NAMESPACE_END
 -
--// default constructor
--CORBA::TypeCodeFactory::TypeCodeFactory ()
--{
--  }
-+// Default constructor.
-+CORBA_TypeCodeFactory::CORBA_TypeCodeFactory (void)
-+{}
- 
--// destructor
--CORBA::TypeCodeFactory::~TypeCodeFactory (void)
-+// Destructor.
-+CORBA_TypeCodeFactory::~CORBA_TypeCodeFactory (void)
- {}
- 
- CORBA::TypeCodeFactory_ptr CORBA::TypeCodeFactory::_narrow (
-@@ -87,7 +46,7 @@
-     CORBA::Environment &ACE_TRY_ENV
-   )
- {
--  return TypeCodeFactory::_unchecked_narrow (obj, ACE_TRY_ENV);
-+  return CORBA::TypeCodeFactory::_unchecked_narrow (obj, ACE_TRY_ENV);
- }
- 
- CORBA::TypeCodeFactory_ptr CORBA::TypeCodeFactory::_unchecked_narrow (
-@@ -96,36 +55,38 @@
-   )
- {
-   if (CORBA::is_nil (obj))
--    return TypeCodeFactory::_nil ();
-+    return CORBA::TypeCodeFactory::_nil ();
-+
-   return
-       ACE_reinterpret_cast
-         (
--          TypeCodeFactory_ptr,
-+          CORBA::TypeCodeFactory_ptr,
-             obj->_tao_QueryInterface
-               (
-                 ACE_reinterpret_cast
-                   (
-                     ptr_arith_t,
--                    &TypeCodeFactory::_narrow
-+                    &CORBA::TypeCodeFactory::_narrow
-                   )
-               )
-         );
- }
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+-#include "tao/ClientRequestInfo.h"
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
++#include "TypeCodeFactory_Loader.h"
++#include "tao/Sequence_T.h"
  
- CORBA::TypeCodeFactory_ptr
--CORBA::TypeCodeFactory::_duplicate (TypeCodeFactory_ptr obj)
-+CORBA::TypeCodeFactory::_duplicate (CORBA::TypeCodeFactory_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-     obj->_add_ref ();
-   return obj;
- }
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus
+@@ -284,7 +278,7 @@
  
--void *CORBA::TypeCodeFactory::_tao_QueryInterface (ptr_arith_t type)
-+void *
-+CORBA::TypeCodeFactory::_tao_QueryInterface (ptr_arith_t type)
+ const char* CORBA_TypeCodeFactory::_interface_repository_id (void) const
  {
-   void *retv = 0;
-   if (type == ACE_reinterpret_cast
-     (ptr_arith_t,
--      &ACE_NESTED_CLASS (::CORBA, TypeCodeFactory)::_narrow))
-+      &CORBA_TypeCodeFactory::_narrow))
-     retv = ACE_reinterpret_cast (void*, this);
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-@@ -136,7 +97,8 @@
-   return retv;
+-  return "IDL:omg.org/CORBA_TypeCodeFactory:1.0";
++  return "IDL:omg.org/CORBA/TypeCodeFactory:1.0";
  }
  
--const char* CORBA::TypeCodeFactory::_interface_repository_id (void) const
-+const char *
-+CORBA::TypeCodeFactory::_interface_repository_id (void) const
- {
-   return "IDL:omg.org/CORBA/TypeCodeFactory:1.0";
- }
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
diff --git a/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactoryC.h.diff b/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactoryC.h.diff
index e88593e0b2c..6c5e48f6baf 100644
--- a/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactoryC.h.diff
+++ b/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactoryC.h.diff
@@ -1,5 +1,5 @@
---- orig/TypeCodeFactoryC.h	Mon Mar 12 22:17:35 2001
-+++ TypeCodeFactoryC.h	Mon Mar 12 22:49:58 2001
+--- orig/TypeCodeFactoryC.h	Mon Apr 23 23:49:14 2001
++++ TypeCodeFactoryC.h	Mon Apr 23 23:43:00 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -8,271 +8,25 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -19,8 +19,12 @@
- // Information about TAO is available at:
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
+@@ -22,15 +22,18 @@
+ #ifndef _TAO_IDL_TYPECODEFACTORYC_H_
+ #define _TAO_IDL_TYPECODEFACTORYC_H_
  
--#ifndef _TAO_IDL_ORIG_TYPECODEFACTORYC_H_
--#define _TAO_IDL_ORIG_TYPECODEFACTORYC_H_
-+#ifndef TAO_TYPECODEFACTORYC_H
-+#define TAO_TYPECODEFACTORYC_H
-+
 +#ifndef TAO_TYPECODEFACTORY_SAFE_INCLUDE
 +#error "You should not include TypeCodeFactoryC.h directly, use TCF_Loader.h"
 +#endif /* !TAO_TYPECODEFACTORY_SAFE_INCLUDE */
- 
++
  #include "ace/pre.h"
- #include "tao/corba.h"
-@@ -30,7 +34,7 @@
+-#include "tao/corba.h"
++#include "typecodefactory_export.h"
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
- #include "typecodefactory_export.h"
--#include "../IFR_Client/InterfaceC.h"
-+#include "tao/IFR_Client/InterfaceC.h"
+-#include "typecodefactory_export.h"
+-#include "tao/IFR_Client/orig/IFR_ExtendedC.h"
++#include "tao/Object.h"
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -55,123 +59,82 @@
- #pragma option push -w-rvl -w-rch -w-ccc -w-inl
- #endif /* __BORLANDC__ */
- 
--TAO_NAMESPACE  CORBA
--{
--  typedef char * Identifier;
--  typedef CORBA::String_var Identifier_var;
--  typedef CORBA::String_out Identifier_out;
--    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Identifier;
--
--  typedef char * RepositoryId;
--  typedef CORBA::String_var RepositoryId_var;
--  typedef CORBA::String_out RepositoryId_out;
--    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryId;
--
--  typedef CORBA::Short ValueModifier;
--  typedef CORBA::Short_out ValueModifier_out;
--    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueModifier;
--
--
--#if !defined (_CORBA_TYPECODEFACTORY___PTR_CH_)
--#define _CORBA_TYPECODEFACTORY___PTR_CH_
--
--  class TypeCodeFactory;
--  typedef TypeCodeFactory *TypeCodeFactory_ptr;
--  
--#endif /* end #if !defined */
--
--
--#if !defined (_CORBA_TYPECODEFACTORY___VAR_CH_)
--#define _CORBA_TYPECODEFACTORY___VAR_CH_
--
--  class TAO_TypeCodeFactory_Export TypeCodeFactory_var : public TAO_Base_var
-+class TAO_TypeCodeFactory_Export CORBA_TypeCodeFactory_var 
-+  : public TAO_Base_var
-   {
-   public:
--    TypeCodeFactory_var (void); // default constructor
--    TypeCodeFactory_var (TypeCodeFactory_ptr p) : ptr_ (p) {} 
--    TypeCodeFactory_var (const TypeCodeFactory_var &); // copy constructor
--    ~TypeCodeFactory_var (void); // destructor
--    
--    TypeCodeFactory_var &operator= (TypeCodeFactory_ptr);
--    TypeCodeFactory_var &operator= (const TypeCodeFactory_var &);
--    TypeCodeFactory_ptr operator-> (void) const;
-+  CORBA_TypeCodeFactory_var (void); // default constructor
-+  CORBA_TypeCodeFactory_var (CORBA_TypeCodeFactory_ptr p) : ptr_ (p) {} 
-+  CORBA_TypeCodeFactory_var (const CORBA_TypeCodeFactory_var &); // copy constructor
-+  ~CORBA_TypeCodeFactory_var (void); // destructor
-+
-+  CORBA_TypeCodeFactory_var &operator= (CORBA_TypeCodeFactory_ptr);
-+  CORBA_TypeCodeFactory_var &operator= (const CORBA_TypeCodeFactory_var &);
-+  CORBA_TypeCodeFactory_ptr operator-> (void) const;
-     
--    operator const TypeCodeFactory_ptr &() const;
--    operator TypeCodeFactory_ptr &();
-+  operator const CORBA_TypeCodeFactory_ptr &() const;
-+  operator CORBA_TypeCodeFactory_ptr &();
-     // in, inout, out, _retn 
--    TypeCodeFactory_ptr in (void) const;
--    TypeCodeFactory_ptr &inout (void);
--    TypeCodeFactory_ptr &out (void);
--    TypeCodeFactory_ptr _retn (void);
--    TypeCodeFactory_ptr ptr (void) const;
-+  CORBA_TypeCodeFactory_ptr in (void) const;
-+  CORBA_TypeCodeFactory_ptr &inout (void);
-+  CORBA_TypeCodeFactory_ptr &out (void);
-+  CORBA_TypeCodeFactory_ptr _retn (void);
-+  CORBA_TypeCodeFactory_ptr ptr (void) const;
- 
-   private:
--    TypeCodeFactory_ptr ptr_;
-+  CORBA_TypeCodeFactory_ptr ptr_;
-     // Unimplemented - prevents widening assignment.
--    TypeCodeFactory_var (const TAO_Base_var &rhs);
--    TypeCodeFactory_var &operator= (const TAO_Base_var &rhs);
-+  CORBA_TypeCodeFactory_var (const TAO_Base_var &rhs);
-+  CORBA_TypeCodeFactory_var &operator= (const TAO_Base_var &rhs);
-   };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_CORBA_TYPECODEFACTORY___OUT_CH_)
--#define _CORBA_TYPECODEFACTORY___OUT_CH_
--
--  class TAO_TypeCodeFactory_Export TypeCodeFactory_out
-+class TAO_TypeCodeFactory_Export CORBA_TypeCodeFactory_out
-   {
-   public:
--    TypeCodeFactory_out (TypeCodeFactory_ptr &);
--    TypeCodeFactory_out (TypeCodeFactory_var &);
--    TypeCodeFactory_out (const TypeCodeFactory_out &);
--    TypeCodeFactory_out &operator= (const TypeCodeFactory_out &);
--    TypeCodeFactory_out &operator= (const TypeCodeFactory_var &);
--    TypeCodeFactory_out &operator= (TypeCodeFactory_ptr);
--    operator TypeCodeFactory_ptr &();
--    TypeCodeFactory_ptr &ptr (void);
--    TypeCodeFactory_ptr operator-> (void);
-+  CORBA_TypeCodeFactory_out (CORBA_TypeCodeFactory_ptr &);
-+  CORBA_TypeCodeFactory_out (CORBA_TypeCodeFactory_var &);
-+  CORBA_TypeCodeFactory_out (const CORBA_TypeCodeFactory_out &);
-+  CORBA_TypeCodeFactory_out &operator= (const CORBA_TypeCodeFactory_out &);
-+  CORBA_TypeCodeFactory_out &operator= (const CORBA_TypeCodeFactory_var &);
-+  CORBA_TypeCodeFactory_out &operator= (CORBA_TypeCodeFactory_ptr);
-+  operator CORBA_TypeCodeFactory_ptr &();
-+  CORBA_TypeCodeFactory_ptr &ptr (void);
-+  CORBA_TypeCodeFactory_ptr operator-> (void);
-     
-   private:
--    TypeCodeFactory_ptr &ptr_;
-+  CORBA_TypeCodeFactory_ptr &ptr_;
-   };
- 
--
--#endif /* end #if !defined */
--
--
--#if !defined (_CORBA_TYPECODEFACTORY_CH_)
--#define _CORBA_TYPECODEFACTORY_CH_
--
--class TAO_TypeCodeFactory_Export TypeCodeFactory : public virtual CORBA_Object
-+class TAO_TypeCodeFactory_Export CORBA_TypeCodeFactory 
-+  : public virtual CORBA_Object
-   {
-   public:
-   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--    typedef TypeCodeFactory_ptr _ptr_type;
--    typedef TypeCodeFactory_var _var_type;
-+    typedef CORBA_TypeCodeFactory_ptr _ptr_type;
-+    typedef CORBA_TypeCodeFactory_var _var_type;
-   #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
-     // the static operations
--    static TypeCodeFactory_ptr _duplicate (TypeCodeFactory_ptr obj);
--    static TypeCodeFactory_ptr _narrow (
-+    static CORBA_TypeCodeFactory_ptr _duplicate (CORBA_TypeCodeFactory_ptr obj);
-+    static CORBA_TypeCodeFactory_ptr _narrow (
-         CORBA::Object_ptr obj,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-           TAO_default_environment ()
-       );
--    static TypeCodeFactory_ptr _unchecked_narrow (
-+    static CORBA_TypeCodeFactory_ptr _unchecked_narrow (
-         CORBA::Object_ptr obj,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &env =
-           TAO_default_environment ()
-       );
--    static TypeCodeFactory_ptr _nil (void)
-+    static CORBA_TypeCodeFactory_ptr _nil (void)
-       {
--        return (TypeCodeFactory_ptr)0;
-+        return (CORBA_TypeCodeFactory_ptr)0;
-       }
- 
-     virtual CORBA::TypeCode_ptr create_struct_tc (
-         const char * id,
-         const char * name,
--        const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       )
-@@ -183,7 +146,7 @@
-         const char * id,
-         const char * name,
-         CORBA::TypeCode_ptr discriminator_type,
--        const IR::UnionMemberSeq & members,
-+        const IR_UnionMemberSeq & members,
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       )
-@@ -194,7 +157,7 @@
-     virtual CORBA::TypeCode_ptr create_enum_tc (
-         const char * id,
-         const char * name,
--        const IR::EnumMemberSeq & members,
-+        const IR_EnumMemberSeq & members,
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       )
-@@ -216,7 +179,7 @@
-     virtual CORBA::TypeCode_ptr create_exception_tc (
-         const char * id,
-         const char * name,
--        const IR::StructMemberSeq & members,
-+        const IR_StructMemberSeq & members,
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       )
-@@ -287,7 +250,7 @@
-         const char * name,
-         CORBA::ValueModifier type_modifier,
-         CORBA::TypeCode_ptr concrete_base,
--        const IR::ValueMemberSeq & members,
-+        const IR_ValueMemberSeq & members,
-         CORBA::Environment &ACE_TRY_ENV = 
-           TAO_default_environment ()
-       )
-@@ -370,30 +333,13 @@
-     virtual const char* _interface_repository_id (void) const;
- 
-   protected:
--    TypeCodeFactory ();
--    
--    virtual ~TypeCodeFactory (void);
-+    CORBA_TypeCodeFactory (void);
-+    virtual ~CORBA_TypeCodeFactory (void);
-   private:
--    TypeCodeFactory (const TypeCodeFactory &);
--    void operator= (const TypeCodeFactory &);
-+    CORBA_TypeCodeFactory (const CORBA_TypeCodeFactory &);
-+    void operator= (const CORBA_TypeCodeFactory &);
-   };
- 
--
--#endif /* end #if !defined */
--
--
--}
--TAO_NAMESPACE_CLOSE // module CORBA
--
--// Proxy Broker Factory function pointer declarations.
--
--
--#ifndef __ACE_INLINE__
--
--
--#endif /* __ACE_INLINE__ */
--
--
- #if defined (__ACE_INLINE__)
- #include "TypeCodeFactoryC.inl"
- #endif /* defined INLINE */
-@@ -407,4 +353,4 @@
- #endif /* __BORLANDC__ */
- 
- #include "ace/post.h"
--#endif /* ifndef */
-+#endif /* TAO_TYPECODEFACTORYC_H */
diff --git a/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactoryC.inl.diff b/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactoryC.inl.diff
index 7cc48ce5c9f..397389956a7 100644
--- a/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactoryC.inl.diff
+++ b/TAO/tao/TypeCodeFactory/diffs/TypeCodeFactoryC.inl.diff
@@ -1,236 +1,10 @@
---- orig/TypeCodeFactoryC.inl	Mon Mar 12 22:17:35 2001
-+++ TypeCodeFactoryC.inl	Mon Mar 12 22:32:17 2001
-@@ -1,118 +1,99 @@
--// -*- C++ -*-
--//
+--- orig/TypeCodeFactoryC.inl	Mon Apr 23 23:49:14 2001
++++ TypeCodeFactoryC.inl	Mon Apr 23 23:43:21 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
 -// $Id$
--
--// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
--// TAO and the TAO IDL Compiler have been developed by:
--//       Center for Distributed Object Computing
--//       Washington University
--//       St. Louis, MO
--//       USA
--//       http://www.cs.wustl.edu/~schmidt/doc-center.html
--// and
--//       Distributed Object Computing Laboratory
--//       University of California at Irvine
--//       Irvine, CA
--//       USA
--//       http://doc.ece.uci.edu/
--//
--// Information about TAO is available at:
--//     http://www.cs.wustl.edu/~schmidt/TAO.html
--
-+/* -*- C++ -*- */
-+//$Id$
++// $Id$
  
- #if !defined (_CORBA_TYPECODEFACTORY___VAR_CI_)
- #define _CORBA_TYPECODEFACTORY___VAR_CI_
- 
- // *************************************************************
--// Inline operations for class CORBA::TypeCodeFactory_var
-+// Inline operations for class CORBA_TypeCodeFactory_var
- // *************************************************************
- 
- ACE_INLINE
--CORBA::TypeCodeFactory_var::TypeCodeFactory_var (void) // default constructor
--  : ptr_ (TypeCodeFactory::_nil ())
-+CORBA_TypeCodeFactory_var::CORBA_TypeCodeFactory_var (void) // default constructor
-+  : ptr_ (CORBA_TypeCodeFactory::_nil ())
- {}
- 
--ACE_INLINE ::CORBA::TypeCodeFactory_ptr
--CORBA::TypeCodeFactory_var::ptr (void) const
-+ACE_INLINE ::CORBA_TypeCodeFactory_ptr
-+CORBA_TypeCodeFactory_var::ptr (void) const
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE
--CORBA::TypeCodeFactory_var::TypeCodeFactory_var (const ::CORBA::TypeCodeFactory_var &p) // copy constructor
-+CORBA_TypeCodeFactory_var::CORBA_TypeCodeFactory_var (const ::CORBA_TypeCodeFactory_var &p) // copy constructor
-   : TAO_Base_var (),
--    ptr_ (TypeCodeFactory::_duplicate (p.ptr ()))
-+    ptr_ (CORBA_TypeCodeFactory::_duplicate (p.ptr ()))
- {}
- 
- ACE_INLINE
--CORBA::TypeCodeFactory_var::~TypeCodeFactory_var (void) // destructor
-+CORBA_TypeCodeFactory_var::~CORBA_TypeCodeFactory_var (void) // destructor
- {
-   CORBA::release (this->ptr_);
- }
- 
--ACE_INLINE CORBA::TypeCodeFactory_var &
--CORBA::TypeCodeFactory_var::operator= (TypeCodeFactory_ptr p)
-+ACE_INLINE CORBA_TypeCodeFactory_var &
-+CORBA_TypeCodeFactory_var::operator= (CORBA_TypeCodeFactory_ptr p)
- {
-   CORBA::release (this->ptr_);
-   this->ptr_ = p;
-   return *this;
- }
- 
--ACE_INLINE CORBA::TypeCodeFactory_var &
--CORBA::TypeCodeFactory_var::operator= (const ::CORBA::TypeCodeFactory_var &p)
-+ACE_INLINE CORBA_TypeCodeFactory_var &
-+CORBA_TypeCodeFactory_var::operator= (const ::CORBA_TypeCodeFactory_var &p)
- {
-   if (this != &p)
-   {
-     CORBA::release (this->ptr_);
--    this->ptr_ = ::CORBA::TypeCodeFactory::_duplicate (p.ptr ());
-+    this->ptr_ = ::CORBA_TypeCodeFactory::_duplicate (p.ptr ());
-   }
-   return *this;
- }
- 
- ACE_INLINE 
--CORBA::TypeCodeFactory_var::operator const ::CORBA::TypeCodeFactory_ptr &() const // cast
-+CORBA_TypeCodeFactory_var::operator const ::CORBA_TypeCodeFactory_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
- ACE_INLINE 
--CORBA::TypeCodeFactory_var::operator ::CORBA::TypeCodeFactory_ptr &() // cast 
-+CORBA_TypeCodeFactory_var::operator ::CORBA_TypeCodeFactory_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::TypeCodeFactory_ptr
--CORBA::TypeCodeFactory_var::operator-> (void) const
-+ACE_INLINE ::CORBA_TypeCodeFactory_ptr
-+CORBA_TypeCodeFactory_var::operator-> (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::TypeCodeFactory_ptr
--CORBA::TypeCodeFactory_var::in (void) const
-+ACE_INLINE ::CORBA_TypeCodeFactory_ptr
-+CORBA_TypeCodeFactory_var::in (void) const
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::TypeCodeFactory_ptr &
--CORBA::TypeCodeFactory_var::inout (void)
-+ACE_INLINE ::CORBA_TypeCodeFactory_ptr &
-+CORBA_TypeCodeFactory_var::inout (void)
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::TypeCodeFactory_ptr &
--CORBA::TypeCodeFactory_var::out (void)
-+ACE_INLINE ::CORBA_TypeCodeFactory_ptr &
-+CORBA_TypeCodeFactory_var::out (void)
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = ::CORBA::TypeCodeFactory::_nil ();
-+  this->ptr_ = ::CORBA_TypeCodeFactory::_nil ();
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::TypeCodeFactory_ptr
--CORBA::TypeCodeFactory_var::_retn (void)
-+ACE_INLINE ::CORBA_TypeCodeFactory_ptr
-+CORBA_TypeCodeFactory_var::_retn (void)
- {
-   // yield ownership of managed obj reference
--  ::CORBA::TypeCodeFactory_ptr val = this->ptr_;
--  this->ptr_ = ::CORBA::TypeCodeFactory::_nil ();
-+  ::CORBA_TypeCodeFactory_ptr val = this->ptr_;
-+  this->ptr_ = ::CORBA_TypeCodeFactory::_nil ();
-   return val;
- }
- 
-@@ -124,64 +105,64 @@
- #define _CORBA_TYPECODEFACTORY___OUT_CI_
- 
- // *************************************************************
--// Inline operations for class CORBA::TypeCodeFactory_out
-+// Inline operations for class CORBA_TypeCodeFactory_out
- // *************************************************************
- 
- ACE_INLINE
--CORBA::TypeCodeFactory_out::TypeCodeFactory_out (TypeCodeFactory_ptr &p)
-+CORBA_TypeCodeFactory_out::CORBA_TypeCodeFactory_out (CORBA_TypeCodeFactory_ptr &p)
-   : ptr_ (p)
- {
--  this->ptr_ = ::CORBA::TypeCodeFactory::_nil ();
-+  this->ptr_ = ::CORBA_TypeCodeFactory::_nil ();
- }
- 
- ACE_INLINE
--CORBA::TypeCodeFactory_out::TypeCodeFactory_out (TypeCodeFactory_var &p) // constructor from _var
-+CORBA_TypeCodeFactory_out::CORBA_TypeCodeFactory_out (CORBA_TypeCodeFactory_var &p) // constructor from _var
-   : ptr_ (p.out ())
- {
-   CORBA::release (this->ptr_);
--  this->ptr_ = ::CORBA::TypeCodeFactory::_nil ();
-+  this->ptr_ = ::CORBA_TypeCodeFactory::_nil ();
- }
- 
- ACE_INLINE
--CORBA::TypeCodeFactory_out::TypeCodeFactory_out (const ::CORBA::TypeCodeFactory_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (TypeCodeFactory_out &, p).ptr_)
-+CORBA_TypeCodeFactory_out::CORBA_TypeCodeFactory_out (const ::CORBA_TypeCodeFactory_out &p) // copy constructor
-+  : ptr_ (ACE_const_cast (CORBA_TypeCodeFactory_out &, p).ptr_)
- {}
- 
--ACE_INLINE ::CORBA::TypeCodeFactory_out &
--CORBA::TypeCodeFactory_out::operator= (const ::CORBA::TypeCodeFactory_out &p)
-+ACE_INLINE ::CORBA_TypeCodeFactory_out &
-+CORBA_TypeCodeFactory_out::operator= (const ::CORBA_TypeCodeFactory_out &p)
- {
--  this->ptr_ = ACE_const_cast (TypeCodeFactory_out&, p).ptr_;
-+  this->ptr_ = ACE_const_cast (CORBA_TypeCodeFactory_out&, p).ptr_;
-   return *this;
- }
- 
--ACE_INLINE CORBA::TypeCodeFactory_out &
--CORBA::TypeCodeFactory_out::operator= (const ::CORBA::TypeCodeFactory_var &p)
-+ACE_INLINE CORBA_TypeCodeFactory_out &
-+CORBA_TypeCodeFactory_out::operator= (const ::CORBA_TypeCodeFactory_var &p)
- {
--  this->ptr_ = ::CORBA::TypeCodeFactory::_duplicate (p.ptr ());
-+  this->ptr_ = ::CORBA_TypeCodeFactory::_duplicate (p.ptr ());
-   return *this;
- }
- 
--ACE_INLINE CORBA::TypeCodeFactory_out &
--CORBA::TypeCodeFactory_out::operator= (TypeCodeFactory_ptr p)
-+ACE_INLINE CORBA_TypeCodeFactory_out &
-+CORBA_TypeCodeFactory_out::operator= (CORBA_TypeCodeFactory_ptr p)
- {
-   this->ptr_ = p;
-   return *this;
- }
- 
- ACE_INLINE 
--CORBA::TypeCodeFactory_out::operator ::CORBA::TypeCodeFactory_ptr &() // cast
-+CORBA_TypeCodeFactory_out::operator ::CORBA_TypeCodeFactory_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::TypeCodeFactory_ptr &
--CORBA::TypeCodeFactory_out::ptr (void) // ptr
-+ACE_INLINE ::CORBA_TypeCodeFactory_ptr &
-+CORBA_TypeCodeFactory_out::ptr (void) // ptr
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ::CORBA::TypeCodeFactory_ptr
--CORBA::TypeCodeFactory_out::operator-> (void)
-+ACE_INLINE ::CORBA_TypeCodeFactory_ptr
-+CORBA_TypeCodeFactory_out::operator-> (void)
- {
-   return this->ptr_;
- }
+ // ****  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/corbafwd.h b/TAO/tao/corbafwd.h
index 39ebc75c4e4..57269e7258a 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -382,8 +382,6 @@ class CORBA_InterfaceDef_var;
 class CORBA_InterfaceDef_out;
 typedef CORBA_InterfaceDef *CORBA_InterfaceDef_ptr;
 
-typedef CORBA_InterfaceDef IR_InterfaceDef;
-
 class CORBA_AbstractInterfaceDef;
 class CORBA_AbstractInterfaceDef_var;
 class CORBA_AbstractInterfaceDef_out;
diff --git a/TAO/tao/diffs/CurrentC.cpp.diff b/TAO/tao/diffs/CurrentC.cpp.diff
index 89379304e65..075e2e1dd51 100644
--- a/TAO/tao/diffs/CurrentC.cpp.diff
+++ b/TAO/tao/diffs/CurrentC.cpp.diff
@@ -1,10 +1,27 @@
---- CurrentC.cpp	Sat Jun 24 02:48:51 2000
-+++ CurrentC.cpp.mod	Sat Jun 24 02:47:40 2000
-@@ -7,10 +7,10 @@
+--- orig/CurrentC.cpp	Mon Apr 16 19:17:32 2001
++++ CurrentC.cpp	Mon Apr 16 19:21:24 2001
+@@ -1,4 +1,4 @@
+-// -*- C++ -*-
++// -*- C++ -*- $Id$ */
+ //
+ // $Id$
+ 
+@@ -19,21 +19,10 @@
  // Information about TAO is available at:
- //                 http://www.cs.wustl.edu/~schmidt/TAO.html
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
 -#include "CurrentC.h"
+-
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+-#include "tao/ClientRequestInfo.h"
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+-
+-#if defined (__BORLANDC__)
+-#pragma option -w-rvl -w-rch -w-ccc -w-aus
+-#endif /* __BORLANDC__ */
 +#include "tao/CurrentC.h"
  
  #if !defined (__ACE_INLINE__)
@@ -12,8 +29,29 @@
 +#include "tao/CurrentC.i"
  #endif /* !defined INLINE */
  
+ // *************************************************************
+@@ -159,7 +148,7 @@
+   return *tmp;
+ }
+ // *************************************************************
+-// Inline operations for class CORBA_Current_out
++// Operations for class CORBA_Current_out
+ // *************************************************************
+ 
+ CORBA_Current_out::CORBA_Current_out (CORBA_Current_ptr &p)
+@@ -219,9 +208,8 @@
+ 
+ 
+ // default constructor
+-CORBA_Current::CORBA_Current ()
+-{
+-  }
++CORBA_Current::CORBA_Current (void)
++{}
  
-@@ -78,7 +78,7 @@
+ // destructor
+ CORBA_Current::~CORBA_Current (void)
+@@ -283,7 +271,7 @@
  
  const char* CORBA_Current::_interface_repository_id (void) const
  {
@@ -22,7 +60,7 @@
  }
  
  #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-@@ -87,4 +87,3 @@
+@@ -292,4 +280,3 @@
    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
    #  pragma instantiate TAO_Object_Manager<CORBA_Current,CORBA_Current_var>
  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/diffs/CurrentC.h.diff b/TAO/tao/diffs/CurrentC.h.diff
index b181d8237bc..755852adee9 100644
--- a/TAO/tao/diffs/CurrentC.h.diff
+++ b/TAO/tao/diffs/CurrentC.h.diff
@@ -1,15 +1,30 @@
---- CurrentC.h	Sat Jun 24 02:48:51 2000
-+++ CurrentC.h.mod	Sat Jun 24 02:47:49 2000
-@@ -11,7 +11,7 @@
+--- orig/CurrentC.h	Mon Apr 16 19:17:32 2001
++++ CurrentC.h	Mon Apr 16 19:16:18 2001
+@@ -1,4 +1,4 @@
+-// -*- C++ -*-
++// -*- C++ -*- $Id$ */
+ //
+ // $Id$
+ 
+@@ -23,7 +23,7 @@
  #define _TAO_IDL_CURRENTC_H_
  
  #include "ace/pre.h"
 -#include "tao/corba.h"
 +#include "tao/Object.h"
  
- #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
- #include "ace/streams.h"
-@@ -162,7 +162,7 @@
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+@@ -164,7 +164,7 @@
+   virtual const char* _interface_repository_id (void) const;
+ 
+ protected:
+-  CORBA_Current ();
++  CORBA_Current (void);
+   
+   virtual ~CORBA_Current (void);
+ private:
+@@ -183,7 +183,7 @@
  
  
  #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/diffs/CurrentC.i.diff b/TAO/tao/diffs/CurrentC.i.diff
index e69de29bb2d..1b53b182ac9 100644
--- a/TAO/tao/diffs/CurrentC.i.diff
+++ b/TAO/tao/diffs/CurrentC.i.diff
@@ -0,0 +1,8 @@
+--- orig/CurrentC.i	Mon Apr 16 19:17:32 2001
++++ CurrentC.i	Mon Apr 16 19:19:48 2001
+@@ -1,4 +1,4 @@
+-// -*- C++ -*-
++// -*- C++ -*- $Id$ */
+ //
+ // $Id$
+ 
diff --git a/TAO/tao/diffs/Domain.pidl.diff b/TAO/tao/diffs/Domain.pidl.diff
new file mode 100644
index 00000000000..564131de371
--- /dev/null
+++ b/TAO/tao/diffs/Domain.pidl.diff
@@ -0,0 +1,39 @@
+--- Domain.pidl	Fri Apr 13 23:29:22 2001
++++ orig/Domain.pidl	Fri Apr 13 23:27:34 2001
+@@ -75,18 +75,19 @@
+ 
+ module CORBA
+ {
+-  interface InterfaceDef;
++  const PolicyType SecConstruction = 11;
++};
++
++interface CORBA_InterfaceDef;
+ 
+-  interface DomainManager
++interface CORBA_DomainManager
+   {
+-    Policy get_domain_policy (
+-        in PolicyType policy_type
++  CORBA_Policy get_domain_policy (
++      in CORBA_PolicyType policy_type
+       );
+   };
+ 
+-  const PolicyType SecConstruction = 11;
+-
+-  interface ConstructionPolicy : Policy
++interface CORBA_ConstructionPolicy : CORBA_Policy
+   {
+     void make_domain_manager (
+         in InterfaceDef object_type,
+@@ -94,8 +95,7 @@
+       );
+   };
+ 
+-  typedef sequence <DomainManager> DomainManagerList;
+-};
++typedef sequence <CORBA_DomainManager> CORBA_DomainManagerList;
+ 
+ #pragma prefix ""
+ 
diff --git a/TAO/tao/diffs/DomainC.cpp.diff b/TAO/tao/diffs/DomainC.cpp.diff
index fd62b11ab2c..0dc68a773da 100644
--- a/TAO/tao/diffs/DomainC.cpp.diff
+++ b/TAO/tao/diffs/DomainC.cpp.diff
@@ -1,5 +1,13 @@
---- orig/DomainC.cpp	Tue Apr  3 17:47:30 2001
-+++ patched/DomainC.cpp	Tue Apr  3 20:30:02 2001
+--- orig/DomainC.cpp	Mon Apr 16 19:23:19 2001
++++ DomainC.cpp	Mon Apr 16 19:36:57 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:
 @@ -27,6 +27,8 @@
  #if TAO_HAS_INTERCEPTORS == 1
  #include "tao/RequestInfo_Util.h"
@@ -9,250 +17,128 @@
  
  #if defined (__BORLANDC__)
  #pragma option -w-rvl -w-rch -w-ccc -w-aus
-@@ -38,242 +40,6 @@
- 
+@@ -36,10 +38,7 @@
+ #include "DomainC.i"
+ #endif /* !defined INLINE */
  
- #if (TAO_HAS_INTERCEPTORS == 1)
--#endif /* TAO_HAS_INTERCEPTORS */
--
--///////////////////////////////////////////////////////////////////////
--//                Base & Remote Proxy  Implementation. 
--//
--
--CORBA::_TAO_InterfaceDef_Proxy_Impl::_TAO_InterfaceDef_Proxy_Impl (void)
--{}
--
--CORBA::_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl (void)
--{}
--
--// Remote Implementation of the IDL interface methods
--
--
--//
--//            End  Base & Remote  Proxy Implemeentation. 
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--//           Remote & Base  Proxy Broker Implementation
--//
--
--CORBA::_TAO_InterfaceDef_Proxy_Broker::_TAO_InterfaceDef_Proxy_Broker (void)
--{
--}
--
--CORBA::_TAO_InterfaceDef_Proxy_Broker::~_TAO_InterfaceDef_Proxy_Broker (void)
--{
--}
--
--CORBA::_TAO_InterfaceDef_Proxy_Broker * (*CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
--    CORBA::Object_ptr obj
--  ) = 0;
--
--// Factory Member function Implementation.
--CORBA::_TAO_InterfaceDef_Remote_Proxy_Broker *
--CORBA::_TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker (void)
--{
--  static ::CORBA::_TAO_InterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
--  return &remote_proxy_broker;
--}
--
--CORBA::_TAO_InterfaceDef_Remote_Proxy_Broker::_TAO_InterfaceDef_Remote_Proxy_Broker (void)
--{
--}
--
--CORBA::_TAO_InterfaceDef_Remote_Proxy_Broker::~_TAO_InterfaceDef_Remote_Proxy_Broker (void)
--{
--}
--
--CORBA::_TAO_InterfaceDef_Proxy_Impl&
--CORBA::_TAO_InterfaceDef_Remote_Proxy_Broker::select_proxy (
--  ::CORBA::InterfaceDef *,
--  CORBA::Environment &
--)
--{
--  return this->remote_proxy_impl_;
--}
--
--
--//
--//           End Remote & Base Proxy Broker Implementation
--///////////////////////////////////////////////////////////////////////
--
--
--// default constructor
--CORBA::InterfaceDef::InterfaceDef (int collocated)
--{
--  this->CORBA_InterfaceDef_setup_collocation (collocated);
--}
--
--// destructor
--CORBA::InterfaceDef::~InterfaceDef (void)
--{}
--
--void
--CORBA::InterfaceDef::CORBA_InterfaceDef_setup_collocation (int collocated)
--{
--  if (collocated)
--    this->the_TAO_InterfaceDef_Proxy_Broker_ =
--      ::CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer (this);
--  else
--    this->the_TAO_InterfaceDef_Proxy_Broker_ =
--      ::CORBA::_TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker ();
--}
--
--void CORBA::InterfaceDef::_tao_any_destructor (void *x)
--{
--  InterfaceDef *tmp = ACE_static_cast (InterfaceDef*,x);
--  CORBA::release (tmp);
--}
--
--CORBA::InterfaceDef_ptr CORBA::InterfaceDef::_narrow (
--    CORBA::Object_ptr obj,
--    CORBA::Environment &ACE_TRY_ENV
--  )
--{
--  if (CORBA::is_nil (obj))
--    return InterfaceDef::_nil ();
--  if (! obj->_is_local ())
--    {
--      CORBA::Boolean is_a = obj->_is_a ("IDL:CORBA/InterfaceDef:1.0", ACE_TRY_ENV);
--      ACE_CHECK_RETURN (InterfaceDef::_nil ());
--      if (is_a == 0)
--        return InterfaceDef::_nil ();
--    }
--  return InterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
--}
--
--CORBA::InterfaceDef_ptr CORBA::InterfaceDef::_unchecked_narrow (
--    CORBA::Object_ptr obj,
--    CORBA::Environment &
--  )
--{
--  if (CORBA::is_nil (obj))
--    return InterfaceDef::_nil ();
--  if (! obj->_is_local ())
--    {
--      TAO_Stub* stub = obj->_stubobj ();
--      if (stub)
--        stub->_incr_refcnt ();
--      InterfaceDef_ptr default_proxy = InterfaceDef::_nil ();
--
--      if (
--          !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
--          stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
--          obj->_is_collocated () &&CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer != 0
--        )
--      {
--        ACE_NEW_RETURN (
--          default_proxy,
--          ::CORBA::InterfaceDef (
--            stub,
--            1,
--            obj->_servant ()),
--            
--          InterfaceDef::_nil ());
--        }
--      if (CORBA::is_nil (default_proxy))
--        ACE_NEW_RETURN (default_proxy, ::CORBA::InterfaceDef (stub, 0, obj->_servant ()), InterfaceDef::_nil ());
--        return default_proxy;
--      }
--    else 
--      return
--        ACE_reinterpret_cast
--          (
--            InterfaceDef_ptr,
--              obj->_tao_QueryInterface
--                (
--                  ACE_reinterpret_cast
--                    (
--                      ptr_arith_t,
--                      &InterfaceDef::_narrow
--                    )
--                )
--          );
--}
--
--CORBA::InterfaceDef_ptr
--CORBA::InterfaceDef::_duplicate (InterfaceDef_ptr obj)
--{
--  if (!CORBA::is_nil (obj))
--    obj->_add_ref ();
--  return obj;
--}
--
--CORBA::Boolean CORBA::InterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
--{
--  if (
--    (!ACE_OS::strcmp ((char *)value, "IDL:CORBA/InterfaceDef:1.0")) ||
--    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
--  return 1; // success using local knowledge
--  else
--    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
--}
--
--void *CORBA::InterfaceDef::_tao_QueryInterface (ptr_arith_t type)
--{
--  void *retv = 0;
--  if (type == ACE_reinterpret_cast
--    (ptr_arith_t,
--      &ACE_NESTED_CLASS (::CORBA, InterfaceDef)::_narrow))
--    retv = ACE_reinterpret_cast (void*, this);
--  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
--    retv = ACE_reinterpret_cast (void *,
--      ACE_static_cast (CORBA::Object_ptr, this));
--    
--  if (retv)
--    this->_add_ref ();
--  return retv;
--}
--
--const char* CORBA::InterfaceDef::_interface_repository_id (void) const
--{
--  return "IDL:CORBA/InterfaceDef:1.0";
--}
--
--static const CORBA::Long _oc_CORBA_InterfaceDef[] =
--{
--  TAO_ENCAP_BYTE_ORDER, // byte order
--  27,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x434f5242), 
--  ACE_NTOHL (0x412f496e), 
--  ACE_NTOHL (0x74657266), 
--  ACE_NTOHL (0x61636544), 
--  ACE_NTOHL (0x65663a31), 
--  ACE_NTOHL (0x2e300000),  // repository ID = IDL:CORBA/InterfaceDef:1.0
--  13,
--  ACE_NTOHL (0x496e7465), 
--  ACE_NTOHL (0x72666163), 
--  ACE_NTOHL (0x65446566), 
--  ACE_NTOHL (0x0),  // name = InterfaceDef
--};
--
--static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDef (
--    CORBA::tk_objref,
--    sizeof (_oc_CORBA_InterfaceDef),
--    (char *) &_oc_CORBA_InterfaceDef,
--    0,
--    sizeof (CORBA::InterfaceDef)
--  );
--
--TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
--TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDef, &_tc_TAO_tc_CORBA_InterfaceDef)
--TAO_NAMESPACE_END
--
 -TAO_NAMESPACE_TYPE (const CORBA::ULong)
 -TAO_NAMESPACE_BEGIN (CORBA)
 -TAO_NAMESPACE_DEFINE (const CORBA::ULong, SecConstruction, 11U)
 -TAO_NAMESPACE_END
--
--#if (TAO_HAS_INTERCEPTORS == 1)
- class TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy : public TAO_ClientRequestInfo
++
+ // *************************************************************
+ // Operations for class CORBA_DomainManager_var
+ // *************************************************************
+@@ -163,7 +162,7 @@
+   return *tmp;
+ }
+ // *************************************************************
+-// Inline operations for class CORBA_DomainManager_out
++// Operations for class CORBA_DomainManager_out
+ // *************************************************************
+ 
+ CORBA_DomainManager_out::CORBA_DomainManager_out (CORBA_DomainManager_ptr &p)
+@@ -252,14 +251,14 @@
+     )
+     ACE_THROW_SPEC ((CORBA::SystemException));
+ 
+-  void result (CORBA_Policy_ptr result);
++  void result (CORBA::Policy_ptr result);
+ 
+ private:
+   TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (const TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy &);
+   void operator= (const TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy &);
+ 
+   const CORBA::PolicyType & policy_type_;
+-  CORBA_Policy_ptr _result;
++  CORBA::Policy_ptr _result;
+ };
+ 
+ TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy (
+@@ -321,7 +320,7 @@
+ }
+ 
+ void 
+-TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (CORBA_Policy_ptr result)
++TAO_ClientRequestInfo_CORBA_DomainManager_get_domain_policy::result (CORBA::Policy_ptr result)
  {
- public:
-@@ -862,9 +628,17 @@
+   // update the result 
+   this->_result = result;
+@@ -341,7 +340,7 @@
+ 
+ // Remote Implementation of the IDL interface methods
+ 
+-CORBA_Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy (
++CORBA::Policy_ptr _TAO_CORBA_DomainManager_Remote_Proxy_Impl::get_domain_policy (
+     CORBA_Object *_collocated_tao_target_,
+     CORBA::PolicyType policy_type,
+     CORBA::Environment &ACE_TRY_ENV
+@@ -351,8 +350,8 @@
+   ))
+ {
+   
+-  CORBA_Policy_ptr _tao_retval = CORBA_Policy::_nil ();
+-  CORBA_Policy_var _tao_safe_retval (_tao_retval);
++  CORBA::Policy_ptr _tao_retval = CORBA::Policy::_nil ();
++  CORBA::Policy_var _tao_safe_retval (_tao_retval);
+   
+   
+   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -447,7 +446,7 @@
+             }
+           
+           TAO_INTERCEPTOR (
+-              CORBA_Policy_ptr _tao_retval_info = _tao_safe_retval._retn ();
++              CORBA::Policy_ptr _tao_retval_info = _tao_safe_retval._retn ();
+               ri.result (_tao_retval_info);
+               _tao_safe_retval = _tao_retval_info;
+             );
+@@ -698,7 +697,7 @@
+   return "IDL:CORBA_DomainManager:1.0";
+ }
+ 
+-CORBA_Policy_ptr CORBA_DomainManager::get_domain_policy (
++CORBA::Policy_ptr CORBA_DomainManager::get_domain_policy (
+     CORBA::PolicyType policy_type,
+     CORBA::Environment &ACE_TRY_ENV
+   )
+@@ -870,7 +869,7 @@
+   return *tmp;
+ }
+ // *************************************************************
+-// Inline operations for class CORBA_ConstructionPolicy_out
++// Operations for class CORBA_ConstructionPolicy_out
+ // *************************************************************
+ 
+ CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_ptr &p)
+@@ -936,7 +935,7 @@
+   TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
+       TAO_GIOP_Invocation *_tao_invocation,
+       CORBA::Object_ptr _tao_target,
+-      CORBA_InterfaceDef_ptr object_type,
++      CORBA::InterfaceDef_ptr object_type,
+       const CORBA::Boolean & constr_policy,
+       CORBA::Environment &ACE_TRY_ENV = 
+         TAO_default_environment ()
+@@ -964,7 +963,7 @@
+   TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &);
+   void operator= (const TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager &);
+ 
+-  CORBA_InterfaceDef_ptr object_type_;
++  CORBA::InterfaceDef_ptr object_type_;
+   const CORBA::Boolean & constr_policy_;
+   
+ };
+@@ -972,7 +971,7 @@
+ TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ClientRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
+     TAO_GIOP_Invocation *_tao_invocation,
+     CORBA::Object_ptr _tao_target,
+-    CORBA_InterfaceDef_ptr object_type,
++    CORBA::InterfaceDef_ptr object_type,
+     const CORBA::Boolean & constr_policy,
+     CORBA::Environment &    
+   )
+@@ -992,9 +991,17 @@
    
    Dynamic::ParameterList_var safe_parameter_list = parameter_list;
      
@@ -271,7 +157,16 @@
    
    (*parameter_list)[length_object_type].mode = Dynamic::PARAM_IN;
      
-@@ -950,6 +724,11 @@
+@@ -1048,7 +1055,7 @@
+ 
+ void _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl::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
+   )
+@@ -1080,6 +1087,11 @@
    
  #endif  /* TAO_HAS_INTERCEPTORS */
    
@@ -283,7 +178,7 @@
    for (;;)
      {
        int _invoke_status = TAO_INVOKE_EXCEPTION;
-@@ -990,7 +769,7 @@
+@@ -1120,7 +1132,7 @@
            
            TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
            if (!(
@@ -292,75 +187,41 @@
                (_tao_out << CORBA::Any::from_boolean (constr_policy))
              ))
              TAO_INTERCEPTOR_THROW (
-@@ -1512,67 +1291,6 @@
- CORBA::TypeCode_ptr _tc_CORBA_DomainManagerList =
-   &_tc_TAO_tc_CORBA_DomainManagerList;
- 
--void operator<<= (CORBA::Any &_tao_any, CORBA::InterfaceDef_ptr _tao_elem)
--{
--  TAO_OutputCDR stream;
--  if (stream << _tao_elem)
--  {
--    _tao_any._tao_replace (
--        CORBA::_tc_InterfaceDef, 
--        TAO_ENCAP_BYTE_ORDER,
--        stream.begin (),
--        1,
--        CORBA::InterfaceDef::_duplicate (_tao_elem),
--        CORBA::InterfaceDef::_tao_any_destructor
--      );
--  }
--}
--
--CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::InterfaceDef_ptr &_tao_elem)
--{
--  ACE_TRY_NEW_ENV
--  {
--    _tao_elem = CORBA::InterfaceDef::_nil ();
--    CORBA::TypeCode_var type = _tao_any.type ();
--    
--    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDef, ACE_TRY_ENV);
--    ACE_TRY_CHECK;
--    
--    if (!result)
--      return 0; // not equivalent
--    
--    TAO_InputCDR stream (
--        _tao_any._tao_get_cdr (),
--        _tao_any._tao_byte_order ()
--      );
--    if (stream >> _tao_elem)
--    {
--      ((CORBA::Any *)&_tao_any)->_tao_replace (
--          CORBA::_tc_InterfaceDef,
--          1,
--          _tao_elem,
--          CORBA::InterfaceDef::_tao_any_destructor
--        );
--      return 1;
--    }
--  }
--  ACE_CATCHANY
--  {
--    _tao_elem = CORBA::InterfaceDef::_nil ();
--    return 0;
--  }
--  ACE_ENDTRY;
--  _tao_elem = CORBA::InterfaceDef::_nil ();
--  return 0;
--}
--
--#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
--    defined (ACE_HAS_GNU_REPO)
--    template class TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var>;
--  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
--  #  pragma instantiate TAO_Object_Manager<CORBA::InterfaceDef,CORBA::InterfaceDef_var>
--#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
--
- void operator<<= (CORBA::Any &_tao_any, CORBA_DomainManager_ptr _tao_elem)
+@@ -1361,7 +1373,7 @@
  {
-   TAO_OutputCDR stream;
-@@ -1827,4 +1545,3 @@
+   if (
+     (!ACE_OS::strcmp ((char *)value, "IDL:CORBA_ConstructionPolicy:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Policy:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -1377,13 +1389,13 @@
+     retv = ACE_reinterpret_cast (void*, this);
+   else if (type == ACE_reinterpret_cast
+     (ptr_arith_t,
+-      &CORBA_Policy::_narrow))
++      &::CORBA::Policy::_narrow))
+     retv = ACE_reinterpret_cast
+       (
+         void *,
+         ACE_static_cast
+           (
+-            CORBA_Policy_ptr,
++            CORBA::Policy_ptr,
+             this
+           )
+       );
+@@ -1402,7 +1414,7 @@
+ }
+ 
+ void CORBA_ConstructionPolicy::make_domain_manager (
+-    CORBA_InterfaceDef_ptr object_type,
++    CORBA::InterfaceDef_ptr object_type,
+     CORBA::Boolean constr_policy,
+     CORBA::Environment &ACE_TRY_ENV
+   )
+@@ -1978,4 +1990,3 @@
    }
    return 0; // error
  }
diff --git a/TAO/tao/diffs/DomainC.h.diff b/TAO/tao/diffs/DomainC.h.diff
index 07e68ad7502..b9df09d3e8f 100644
--- a/TAO/tao/diffs/DomainC.h.diff
+++ b/TAO/tao/diffs/DomainC.h.diff
@@ -1,317 +1,235 @@
---- orig/DomainC.h	Tue Apr  3 17:47:30 2001
-+++ patched/DomainC.h	Tue Apr  3 20:25:02 2001
-@@ -55,266 +55,6 @@
+--- orig/DomainC.h	Mon Apr 16 19:23:19 2001
++++ DomainC.h	Fri Apr 13 23:59:15 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_DOMAINC_H_
+-#define _TAO_IDL_DOMAINC_H_
++#ifndef _TAO_IDL_ORIG_DOMAINC_H_
++#define _TAO_IDL_ORIG_DOMAINC_H_
+ 
+ #include "ace/pre.h"
+ #include "tao/corba.h"
+@@ -29,8 +29,8 @@
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
+-#include "tao/corbafwd.h"
+-#include "PolicyC.h"
++#include "tao/TAO_Export.h"
++#include "tao/PolicyC.h"
+ 
+ #if defined (TAO_EXPORT_MACRO)
+ #undef TAO_EXPORT_MACRO
+@@ -55,91 +55,6 @@
  #pragma option push -w-rvl -w-rch -w-ccc -w-inl
  #endif /* __BORLANDC__ */
  
 -TAO_NAMESPACE  CORBA
 -{
--
--#if !defined (_CORBA_INTERFACEDEF___PTR_CH_)
--#define _CORBA_INTERFACEDEF___PTR_CH_
--
--  class InterfaceDef;
--  typedef InterfaceDef *InterfaceDef_ptr;
--  
--#endif /* end #if !defined */
+-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SecConstruction;
 -
 -
--#if !defined (_CORBA_INTERFACEDEF___VAR_CH_)
--#define _CORBA_INTERFACEDEF___VAR_CH_
--
--  class TAO_Export InterfaceDef_var : public TAO_Base_var
--  {
--  public:
--    InterfaceDef_var (void); // default constructor
--    InterfaceDef_var (InterfaceDef_ptr p) : ptr_ (p) {} 
--    InterfaceDef_var (const InterfaceDef_var &); // copy constructor
--    ~InterfaceDef_var (void); // destructor
--    
--    InterfaceDef_var &operator= (InterfaceDef_ptr);
--    InterfaceDef_var &operator= (const InterfaceDef_var &);
--    InterfaceDef_ptr operator-> (void) const;
--    
--    operator const InterfaceDef_ptr &() const;
--    operator InterfaceDef_ptr &();
--    // in, inout, out, _retn 
--    InterfaceDef_ptr in (void) const;
--    InterfaceDef_ptr &inout (void);
--    InterfaceDef_ptr &out (void);
--    InterfaceDef_ptr _retn (void);
--    InterfaceDef_ptr ptr (void) const;
--
--  private:
--    InterfaceDef_ptr ptr_;
--    // Unimplemented - prevents widening assignment.
--    InterfaceDef_var (const TAO_Base_var &rhs);
--    InterfaceDef_var &operator= (const TAO_Base_var &rhs);
--  };
--
--
--#endif /* end #if !defined */
+-}
+-TAO_NAMESPACE_CLOSE // module CORBA
 -
+-class CORBA_InterfaceDef;
 -
--#if !defined (_CORBA_INTERFACEDEF___OUT_CH_)
--#define _CORBA_INTERFACEDEF___OUT_CH_
--
--  class TAO_Export InterfaceDef_out
--  {
--  public:
--    InterfaceDef_out (InterfaceDef_ptr &);
--    InterfaceDef_out (InterfaceDef_var &);
--    InterfaceDef_out (const InterfaceDef_out &);
--    InterfaceDef_out &operator= (const InterfaceDef_out &);
--    InterfaceDef_out &operator= (const InterfaceDef_var &);
--    InterfaceDef_out &operator= (InterfaceDef_ptr);
--    operator InterfaceDef_ptr &();
--    InterfaceDef_ptr &ptr (void);
--    InterfaceDef_ptr operator-> (void);
--    
--  private:
--    InterfaceDef_ptr &ptr_;
--  };
+-#if !defined (_CORBA_INTERFACEDEF___PTR_CH_)
+-#define _CORBA_INTERFACEDEF___PTR_CH_
 -
+-typedef CORBA_InterfaceDef *CORBA_InterfaceDef_ptr;
 -
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_CORBA_INTERFACEDEF_CH_)
--#define _CORBA_INTERFACEDEF_CH_
--
--// Forward Classes Declaration
--  class _TAO_InterfaceDef_Proxy_Impl;
--  class _TAO_InterfaceDef_Remote_Proxy_Impl;
--  class _TAO_InterfaceDef_Proxy_Broker;
--  class _TAO_InterfaceDef_Remote_Proxy_Broker;
--  
--  class TAO_Export InterfaceDef : public virtual CORBA_Object
--  {
--  public:
--  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
--    typedef InterfaceDef_ptr _ptr_type;
--    typedef InterfaceDef_var _var_type;
--  #endif /* ! __GNUC__ || g++ >= 2.8 */
--
--    // the static operations
--    static InterfaceDef_ptr _duplicate (InterfaceDef_ptr obj);
--    static InterfaceDef_ptr _narrow (
--        CORBA::Object_ptr obj,
--        CORBA::Environment &ACE_TRY_ENV = 
--          TAO_default_environment ()
--      );
--    static InterfaceDef_ptr _unchecked_narrow (
--        CORBA::Object_ptr obj,
--        CORBA::Environment &ACE_TRY_ENV = 
--          TAO_default_environment ()
--      );
--    static InterfaceDef_ptr _nil (void)
--      {
--        return (InterfaceDef_ptr)0;
--      }
--
--    static void _tao_any_destructor (void*);
--
--    virtual CORBA::Boolean _is_a (
--        const CORBA::Char *type_id, 
--        CORBA::Environment &ACE_TRY_ENV = 
--          TAO_default_environment ()
--      );
--    virtual void *_tao_QueryInterface (ptr_arith_t type);
--    
--    virtual const char* _interface_repository_id (void) const;
--
--  private:
--    _TAO_InterfaceDef_Proxy_Broker *the_TAO_InterfaceDef_Proxy_Broker_;
--    
--  protected:
--    InterfaceDef (int collocated = 0);
--    
--    protected:
--      // This methods travese the inheritance tree and set the
--      // parents piece of the given class in the right mode
--      virtual void CORBA_InterfaceDef_setup_collocation (int collocated);
--      
--      InterfaceDef (
--        TAO_Stub *objref, 
--        CORBA::Boolean _tao_collocated = 0,
--        TAO_Abstract_ServantBase *servant = 0
--        );
--      
--      friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
--      friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
--      friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
--    
--    virtual ~InterfaceDef (void);
--  private:
--    InterfaceDef (const InterfaceDef &);
--    void operator= (const InterfaceDef &);
--  };
--
--  
--// The Proxy Implementations are used by each interface to
--// perform a call. Each different implementation encapsulate
--// an invocation logics.
--
--
--  ///////////////////////////////////////////////////////////////////////
--  //                    Base  Impl. Declaration
--  //
--  
--  class TAO_Export _TAO_InterfaceDef_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
--  {
--  public:
--    virtual ~_TAO_InterfaceDef_Proxy_Impl (void) { }
--    
--    protected:
--    _TAO_InterfaceDef_Proxy_Impl (void);
--  
--  };
--  //
--  //                Base  Proxy Impl. Declaration
--  ///////////////////////////////////////////////////////////////////////
--  
--  
--///////////////////////////////////////////////////////////////////////
--//                    Remote  Impl. Declaration
--//
+-#if !defined (_CORBA_INTERFACEDEF___VAR_CH_)
+-#define _CORBA_INTERFACEDEF___VAR_CH_
 -
--class TAO_Export _TAO_InterfaceDef_Remote_Proxy_Impl : 
--  public virtual _TAO_InterfaceDef_Proxy_Impl,
--  public virtual TAO_Remote_Object_Proxy_Impl
+-class TAO_Export CORBA_InterfaceDef_var : public TAO_Base_var
 -{
 -public:
--  _TAO_InterfaceDef_Remote_Proxy_Impl (void);
+-  CORBA_InterfaceDef_var (void); // default constructor
+-  CORBA_InterfaceDef_var (CORBA_InterfaceDef_ptr p) : ptr_ (p) {} 
+-  CORBA_InterfaceDef_var (const CORBA_InterfaceDef_var &); // copy constructor
+-  ~CORBA_InterfaceDef_var (void); // destructor
 -  
--  virtual ~_TAO_InterfaceDef_Remote_Proxy_Impl (void) { }
+-  CORBA_InterfaceDef_var &operator= (CORBA_InterfaceDef_ptr);
+-  CORBA_InterfaceDef_var &operator= (const CORBA_InterfaceDef_var &);
+-  CORBA_InterfaceDef_ptr operator-> (void) const;
 -  
--  };
--
--//
--//                Base  Proxy Impl. Declaration
--///////////////////////////////////////////////////////////////////////
+-  operator const CORBA_InterfaceDef_ptr &() const;
+-  operator CORBA_InterfaceDef_ptr &();
+-  // in, inout, out, _retn 
+-  CORBA_InterfaceDef_ptr in (void) const;
+-  CORBA_InterfaceDef_ptr &inout (void);
+-  CORBA_InterfaceDef_ptr &out (void);
+-  CORBA_InterfaceDef_ptr _retn (void);
+-  CORBA_InterfaceDef_ptr ptr (void) const;
+-  
+-  // Hooks used by template sequence and object manager classes
+-  // for non-defined forward declared interfaces.
+-  static CORBA_InterfaceDef_ptr duplicate (CORBA_InterfaceDef_ptr);
+-  static void release (CORBA_InterfaceDef_ptr);
+-  static CORBA_InterfaceDef_ptr nil (void);
+-  static CORBA_InterfaceDef_ptr narrow (CORBA::Object *, CORBA::Environment &);
+-  static CORBA::Object * upcast (void *);
 -
+-private:
+-  CORBA_InterfaceDef_ptr ptr_;
+-  // Unimplemented - prevents widening assignment.
+-  CORBA_InterfaceDef_var (const TAO_Base_var &rhs);
+-  CORBA_InterfaceDef_var &operator= (const TAO_Base_var &rhs);
+-};
 -
--// The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new 
--// collocation scheme, the proxy to be used can vary on
--// a call by call basis. 
 -
+-#endif /* end #if !defined */
 -
 -
--///////////////////////////////////////////////////////////////////////
--//                 Base Proxy Broker Declaration 
--//
+-#if !defined (_CORBA_INTERFACEDEF___OUT_CH_)
+-#define _CORBA_INTERFACEDEF___OUT_CH_
 -
--class TAO_Export _TAO_InterfaceDef_Proxy_Broker
+-class TAO_Export CORBA_InterfaceDef_out
 -{
 -public:
--  virtual ~_TAO_InterfaceDef_Proxy_Broker (void);
--  virtual _TAO_InterfaceDef_Proxy_Impl &select_proxy (
--    InterfaceDef *object,
--    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
--  ) = 0;
--
--protected:
--  _TAO_InterfaceDef_Proxy_Broker (void);
--  
--};
--
--//
--//              End Base Proxy Broker Declaration 
--///////////////////////////////////////////////////////////////////////
--
--
--///////////////////////////////////////////////////////////////////////
--//                 Remote Proxy Broker Declaration 
--//
--
--class TAO_Export _TAO_InterfaceDef_Remote_Proxy_Broker : public virtual _TAO_InterfaceDef_Proxy_Broker
--{
--public: 
--  _TAO_InterfaceDef_Remote_Proxy_Broker (void);
--  
--  virtual ~_TAO_InterfaceDef_Remote_Proxy_Broker (void);
--  
--  virtual _TAO_InterfaceDef_Proxy_Impl &select_proxy (
--    InterfaceDef *object,
--    CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
--  );
+-  CORBA_InterfaceDef_out (CORBA_InterfaceDef_ptr &);
+-  CORBA_InterfaceDef_out (CORBA_InterfaceDef_var &);
+-  CORBA_InterfaceDef_out (const CORBA_InterfaceDef_out &);
+-  CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_out &);
+-  CORBA_InterfaceDef_out &operator= (const CORBA_InterfaceDef_var &);
+-  CORBA_InterfaceDef_out &operator= (CORBA_InterfaceDef_ptr);
+-  operator CORBA_InterfaceDef_ptr &();
+-  CORBA_InterfaceDef_ptr &ptr (void);
+-  CORBA_InterfaceDef_ptr operator-> (void);
 -
 -private:
--  _TAO_InterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
--// This member function is used to get an handle to the unique instance
--// of the Remote Proxy Broker that is available for a given
--// interface.
--
--public:
--  static _TAO_InterfaceDef_Remote_Proxy_Broker *the_TAO_InterfaceDef_Remote_Proxy_Broker (void);
+-  CORBA_InterfaceDef_ptr &ptr_;
 -};
 -
 -
--//
--//              End Remote Proxy Broker Declaration 
--///////////////////////////////////////////////////////////////////////
--
--
 -#endif /* end #if !defined */
 -
--TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDef;
--
--TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SecConstruction;
--
--
--}
--TAO_NAMESPACE_CLOSE // module CORBA
--
 -
  #if !defined (_CORBA_DOMAINMANAGER___PTR_CH_)
  #define _CORBA_DOMAINMANAGER___PTR_CH_
  
-@@ -754,7 +494,7 @@
- //
+@@ -252,7 +167,7 @@
  
- class TAO_Export _TAO_CORBA_ConstructionPolicy_Proxy_Impl : 
--  public virtual CORBA::_TAO_Policy_Proxy_Impl
-+  public virtual _TAO_CORBA_Policy_Proxy_Impl
- {
+   static void _tao_any_destructor (void*);
+ 
+-  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 ()
+@@ -312,7 +227,7 @@
  public:
-   virtual ~_TAO_CORBA_ConstructionPolicy_Proxy_Impl (void) { }
-@@ -785,7 +525,7 @@
- class TAO_Export _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Impl : 
-   public virtual _TAO_CORBA_ConstructionPolicy_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl,
--  public virtual CORBA::_TAO_Policy_Remote_Proxy_Impl
-+  public virtual _TAO_CORBA_Policy_Remote_Proxy_Impl
+   virtual ~_TAO_CORBA_DomainManager_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
+@@ -343,7 +258,7 @@
+   
+   virtual ~_TAO_CORBA_DomainManager_Remote_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
+@@ -511,7 +426,7 @@
+ class _TAO_CORBA_ConstructionPolicy_Proxy_Broker;
+ class _TAO_CORBA_ConstructionPolicy_Remote_Proxy_Broker;
+ 
+-class TAO_Export CORBA_ConstructionPolicy: public virtual CORBA_Policy
++class TAO_Export CORBA_ConstructionPolicy: public virtual CORBA::Policy
  {
  public:
-@@ -1030,10 +770,6 @@
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+@@ -539,7 +454,7 @@
+   static void _tao_any_destructor (void*);
  
- // Proxy Broker Factory function pointer declarations.
- 
--extern TAO_Export CORBA::_TAO_InterfaceDef_Proxy_Broker * (*CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
--    CORBA::Object_ptr obj
--  );
--
- extern TAO_Export _TAO_CORBA_DomainManager_Proxy_Broker * (*_TAO_CORBA_DomainManager_Proxy_Broker_Factory_function_pointer) (
-     CORBA::Object_ptr obj
-   );
-@@ -1042,9 +778,6 @@
+   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 ()
+@@ -602,7 +517,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
+     )
+@@ -636,7 +551,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
+     )
+@@ -883,38 +798,6 @@
      CORBA::Object_ptr obj
    );
  
--// Any operators for interface CORBA::InterfaceDef
--TAO_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr);
--TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceDef *&);
+-// External declarations for undefined interface
+-// CORBA_InterfaceDef
+-extern TAO_Export
+-CORBA_InterfaceDef_ptr
+-tao_CORBA_InterfaceDef_duplicate (
+-    CORBA_InterfaceDef_ptr
+-  );
+-extern TAO_Export
+-void
+-tao_CORBA_InterfaceDef_release (
+-    CORBA_InterfaceDef_ptr
+-  );
+-extern TAO_Export
+-CORBA_InterfaceDef_ptr
+-tao_CORBA_InterfaceDef_nil (
+-    void
+-  );
+-extern TAO_Export
+-CORBA_InterfaceDef_ptr
+-tao_CORBA_InterfaceDef_narrow (
+-    CORBA::Object *,
+-    CORBA::Environment &
+-  );
+-extern TAO_Export
+-CORBA::Object *
+-tao_CORBA_InterfaceDef_upcast (
+-    void *
+-  );
+-
+-// Any operators for interface CORBA_InterfaceDef
+-TAO_Export void operator<<= (CORBA::Any &, CORBA_InterfaceDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_InterfaceDef *&);
  // Any operators for interface CORBA_DomainManager
  TAO_Export void operator<<= (CORBA::Any &, CORBA_DomainManager_ptr);
  TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_DomainManager *&);
-@@ -1058,8 +791,6 @@
+@@ -928,8 +811,6 @@
  
  #ifndef __ACE_INLINE__
  
--TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::InterfaceDef_ptr );
--TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::InterfaceDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_InterfaceDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_InterfaceDef_ptr &);
  TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_DomainManager_ptr );
  TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_DomainManager_ptr &);
  TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_ConstructionPolicy_ptr );
diff --git a/TAO/tao/diffs/DomainC.i.diff b/TAO/tao/diffs/DomainC.i.diff
index fc1b0ac6368..b5efb7b8832 100644
--- a/TAO/tao/diffs/DomainC.i.diff
+++ b/TAO/tao/diffs/DomainC.i.diff
@@ -1,256 +1,51 @@
---- orig/DomainC.i	Tue Apr  3 17:47:30 2001
-+++ patched/DomainC.i	Tue Apr  3 20:26:11 2001
-@@ -20,193 +20,6 @@
- //     http://www.cs.wustl.edu/~schmidt/TAO.html
+--- orig/DomainC.i	Tue Apr 17 22:53:25 2001
++++ DomainC.i	Tue Apr 17 17:50:15 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:
+@@ -515,32 +515,22 @@
  
--#if !defined (_CORBA_INTERFACEDEF___CI_)
--#define _CORBA_INTERFACEDEF___CI_
--
--ACE_INLINE
--CORBA::InterfaceDef::InterfaceDef (
--    TAO_Stub *objref,
--    CORBA::Boolean _tao_collocated,
--    TAO_Abstract_ServantBase *servant
--  )
--  : CORBA_Object (objref, _tao_collocated, servant)
--{
--  this->CORBA_InterfaceDef_setup_collocation (_tao_collocated);
--}
--
--#endif /* end #if !defined */
--
--
--#if !defined (_CORBA_INTERFACEDEF___VAR_CI_)
--#define _CORBA_INTERFACEDEF___VAR_CI_
--
--// *************************************************************
--// Inline operations for class CORBA::InterfaceDef_var
--// *************************************************************
--
--ACE_INLINE
--CORBA::InterfaceDef_var::InterfaceDef_var (void) // default constructor
--  : ptr_ (InterfaceDef::_nil ())
--{}
--
--ACE_INLINE ::CORBA::InterfaceDef_ptr
--CORBA::InterfaceDef_var::ptr (void) const
--{
--  return this->ptr_;
--}
--
--ACE_INLINE
--CORBA::InterfaceDef_var::InterfaceDef_var (const ::CORBA::InterfaceDef_var &p) // copy constructor
--  : TAO_Base_var (),
--    ptr_ (InterfaceDef::_duplicate (p.ptr ()))
--{}
--
--ACE_INLINE
--CORBA::InterfaceDef_var::~InterfaceDef_var (void) // destructor
--{
--  CORBA::release (this->ptr_);
--}
--
--ACE_INLINE CORBA::InterfaceDef_var &
--CORBA::InterfaceDef_var::operator= (InterfaceDef_ptr p)
--{
--  CORBA::release (this->ptr_);
--  this->ptr_ = p;
--  return *this;
--}
--
--ACE_INLINE CORBA::InterfaceDef_var &
--CORBA::InterfaceDef_var::operator= (const ::CORBA::InterfaceDef_var &p)
--{
--  if (this != &p)
--  {
--    CORBA::release (this->ptr_);
--    this->ptr_ = ::CORBA::InterfaceDef::_duplicate (p.ptr ());
--  }
--  return *this;
--}
--
--ACE_INLINE 
--CORBA::InterfaceDef_var::operator const ::CORBA::InterfaceDef_ptr &() const // cast
--{
--  return this->ptr_;
--}
--
--ACE_INLINE 
--CORBA::InterfaceDef_var::operator ::CORBA::InterfaceDef_ptr &() // cast 
--{
--  return this->ptr_;
--}
--
--ACE_INLINE ::CORBA::InterfaceDef_ptr
--CORBA::InterfaceDef_var::operator-> (void) const
--{
--  return this->ptr_;
--}
--
--ACE_INLINE ::CORBA::InterfaceDef_ptr
--CORBA::InterfaceDef_var::in (void) const
--{
--  return this->ptr_;
--}
--
--ACE_INLINE ::CORBA::InterfaceDef_ptr &
--CORBA::InterfaceDef_var::inout (void)
--{
--  return this->ptr_;
--}
--
--ACE_INLINE ::CORBA::InterfaceDef_ptr &
--CORBA::InterfaceDef_var::out (void)
--{
--  CORBA::release (this->ptr_);
--  this->ptr_ = ::CORBA::InterfaceDef::_nil ();
--  return this->ptr_;
--}
--
--ACE_INLINE ::CORBA::InterfaceDef_ptr
--CORBA::InterfaceDef_var::_retn (void)
--{
--  // yield ownership of managed obj reference
--  ::CORBA::InterfaceDef_ptr val = this->ptr_;
--  this->ptr_ = ::CORBA::InterfaceDef::_nil ();
--  return val;
--}
--
--
--#endif /* end #if !defined */
--
--
--#if !defined (_CORBA_INTERFACEDEF___OUT_CI_)
--#define _CORBA_INTERFACEDEF___OUT_CI_
--
--// *************************************************************
--// Inline operations for class CORBA::InterfaceDef_out
--// *************************************************************
--
--ACE_INLINE
--CORBA::InterfaceDef_out::InterfaceDef_out (InterfaceDef_ptr &p)
--  : ptr_ (p)
--{
--  this->ptr_ = ::CORBA::InterfaceDef::_nil ();
--}
--
--ACE_INLINE
--CORBA::InterfaceDef_out::InterfaceDef_out (InterfaceDef_var &p) // constructor from _var
--  : ptr_ (p.out ())
--{
--  CORBA::release (this->ptr_);
--  this->ptr_ = ::CORBA::InterfaceDef::_nil ();
--}
--
--ACE_INLINE
--CORBA::InterfaceDef_out::InterfaceDef_out (const ::CORBA::InterfaceDef_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (InterfaceDef_out &, p).ptr_)
--{}
--
--ACE_INLINE ::CORBA::InterfaceDef_out &
--CORBA::InterfaceDef_out::operator= (const ::CORBA::InterfaceDef_out &p)
--{
--  this->ptr_ = ACE_const_cast (InterfaceDef_out&, p).ptr_;
--  return *this;
--}
--
--ACE_INLINE CORBA::InterfaceDef_out &
--CORBA::InterfaceDef_out::operator= (const ::CORBA::InterfaceDef_var &p)
--{
--  this->ptr_ = ::CORBA::InterfaceDef::_duplicate (p.ptr ());
--  return *this;
--}
--
--ACE_INLINE CORBA::InterfaceDef_out &
--CORBA::InterfaceDef_out::operator= (InterfaceDef_ptr p)
--{
--  this->ptr_ = p;
--  return *this;
--}
--
--ACE_INLINE 
--CORBA::InterfaceDef_out::operator ::CORBA::InterfaceDef_ptr &() // cast
--{
--  return this->ptr_;
--}
--
--ACE_INLINE ::CORBA::InterfaceDef_ptr &
--CORBA::InterfaceDef_out::ptr (void) // ptr
--{
--  return this->ptr_;
--}
--
--ACE_INLINE ::CORBA::InterfaceDef_ptr
--CORBA::InterfaceDef_out::operator-> (void)
--{
--  return this->ptr_;
--}
--
--
--#endif /* end #if !defined */
--
--
- #if !defined (_CORBA_DOMAINMANAGER___CI_)
- #define _CORBA_DOMAINMANAGER___CI_
+ #endif /* end #if !defined */
  
-@@ -951,55 +764,6 @@
- ACE_INLINE CORBA::Boolean
- operator<< (
-     TAO_OutputCDR &,
--    const CORBA::InterfaceDef_ptr
+-TAO_Export CORBA::Boolean operator<< (
+-    TAO_OutputCDR &,
+-    const CORBA_InterfaceDef_ptr
 -  );
--ACE_INLINE CORBA::Boolean
--operator>> (
+-
+-TAO_Export CORBA::Boolean operator>> (
 -    TAO_InputCDR &,
--    CORBA::InterfaceDef_ptr &
+-    CORBA_InterfaceDef_ptr &
 -  );
 -
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &strm,
--    const CORBA::InterfaceDef_ptr _tao_objref
--  )
--{
--  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
--  return (strm << _tao_corba_obj);
--}
--
--ACE_INLINE CORBA::Boolean
--operator>> (
--    TAO_InputCDR &strm,
--    CORBA::InterfaceDef_ptr &_tao_objref
--  )
--{
--  ACE_TRY_NEW_ENV
--  {
--    CORBA::Object_var obj;
--    if ((strm >> obj.inout ()) == 0)
--      return 0;
--    // narrow to the right type
--    _tao_objref =
--      CORBA::InterfaceDef::_unchecked_narrow (
--          obj.in (),
--          ACE_TRY_ENV
--        );
--    ACE_TRY_CHECK;
--    return 1;
--  }
--  ACE_CATCHANY
--  {
--    // do nothing
--  }
--  ACE_ENDTRY;
--  return 0;
--}
--
--ACE_INLINE CORBA::Boolean
--operator<< (
--    TAO_OutputCDR &,
+-TAO_Export CORBA::Boolean operator<< (
++CORBA::Boolean TAO_Export operator<< (
+     TAO_OutputCDR &,
      const CORBA_DomainManager_ptr
    );
- ACE_INLINE CORBA::Boolean
-@@ -1109,4 +873,3 @@
+ 
+-TAO_Export CORBA::Boolean operator>> (
++CORBA::Boolean TAO_Export operator>> (
+     TAO_InputCDR &,
+     CORBA_DomainManager_ptr &
+   );
+ 
+-TAO_Export CORBA::Boolean operator<< (
++CORBA::Boolean TAO_Export operator<< (
+     TAO_OutputCDR &,
+     const CORBA_ConstructionPolicy_ptr
+   );
+ 
+-TAO_Export CORBA::Boolean operator>> (
++CORBA::Boolean TAO_Export operator>> (
+     TAO_InputCDR &,
+     CORBA_ConstructionPolicy_ptr &
+   );
+@@ -559,4 +549,3 @@
    );
  
  #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_I_ */
diff --git a/TAO/tao/diffs/IOPC.cpp.diff b/TAO/tao/diffs/IOPC.cpp.diff
new file mode 100644
index 00000000000..b7c4051d5bb
--- /dev/null
+++ b/TAO/tao/diffs/IOPC.cpp.diff
@@ -0,0 +1,33 @@
+--- orig/IOPC.cpp	Wed Apr 18 02:12:29 2001
++++ IOPC.cpp	Wed Apr 18 01:33:39 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:
+@@ -21,13 +21,6 @@
+ 
+ #include "IOPC.h"
+ 
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+-#include "tao/ClientRequestInfo.h"
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+-
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus
+ #endif /* __BORLANDC__ */
+@@ -35,6 +28,8 @@
+ #if !defined (__ACE_INLINE__)
+ #include "IOPC.i"
+ #endif /* !defined INLINE */
++
++#include "Typecode.h"
+ 
+ static const CORBA::Long _oc_IOP_ProfileId[] =
+ {
diff --git a/TAO/tao/diffs/IOPC.h.diff b/TAO/tao/diffs/IOPC.h.diff
new file mode 100644
index 00000000000..4e78b18c0f0
--- /dev/null
+++ b/TAO/tao/diffs/IOPC.h.diff
@@ -0,0 +1,30 @@
+--- orig/IOPC.h	Wed Apr 18 02:12:29 2001
++++ IOPC.h	Wed Apr 18 01:28:59 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,13 +23,17 @@
+ #define _TAO_IDL_ORIG_IOPC_H_
+ 
+ #include "ace/pre.h"
+-#include "tao/corba.h"
++#include "TAO_Export.h"
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
+-#include "tao/TAO_Export.h"
++#include "Any.h"
++#include "Object.h"
++#include "Exception.h"
++#include "CDR.h"
++#include "Sequence.h"
+ 
+ #if defined (TAO_EXPORT_MACRO)
+ #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/diffs/IOPC.i.diff b/TAO/tao/diffs/IOPC.i.diff
new file mode 100644
index 00000000000..e8cceb98558
--- /dev/null
+++ b/TAO/tao/diffs/IOPC.i.diff
@@ -0,0 +1,10 @@
+--- orig/IOPC.i	Wed Apr 18 02:12:29 2001
++++ IOPC.i	Wed Apr 18 01:31: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/tao/diffs/ImplRepoC.cpp.diff b/TAO/tao/diffs/ImplRepoC.cpp.diff
index 472cb87c049..11a2e527780 100644
--- a/TAO/tao/diffs/ImplRepoC.cpp.diff
+++ b/TAO/tao/diffs/ImplRepoC.cpp.diff
@@ -1,5019 +1,43 @@
---- orig/ImplRepoC.cpp	Sun Apr  1 16:33:09 2001
-+++ ImplRepoC.cpp	Sun Apr  1 17:47:26 2001
-@@ -23,6 +23,7 @@
+--- orig/ImplRepoC.cpp	Wed Apr 18 01:09:40 2001
++++ ImplRepoC.cpp	Tue Apr 17 23:15:55 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,7 +23,7 @@
  
  #include "tao/Stub.h"
  #include "tao/Invocation.h"
+-#include "tao/ClientRequestInfo.h"
 +#include "tao/PortableInterceptor.h"
- 
  #if TAO_HAS_INTERCEPTORS == 1
  #include "tao/RequestInfo_Util.h"
-@@ -38,7 +39,7 @@
- 
- 
- ///////////////////////////////////////////////////////////////////////
--//                Base & Remote Proxy  Implementation. 
-+//                Base & Remote Proxy  Implementation.
- //
- 
- ImplementationRepository::_TAO_ServerObject_Proxy_Impl::_TAO_ServerObject_Proxy_Impl (void)
-@@ -57,15 +58,15 @@
-     CORBA::SystemException
-   ))
- {
--  
- 
--  
--  
-+
-+
-+
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-+
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "ping",
-@@ -78,13 +79,13 @@
-   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-       istub->orb_core ()->client_request_interceptors ()
-     );
--  
-+
- #endif  /* TAO_HAS_INTERCEPTORS */
--  
-+
-   for (;;)
-     {
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
--      
-+
- #if TAO_HAS_INTERCEPTORS == 1
-       ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping ri (
-         &_tao_call,
-@@ -92,17 +93,17 @@
-         ACE_TRY_ENV
-       );
-       ACE_CHECK;
--      
-+
-       ACE_TRY
-         {
- #endif /* TAO_HAS_INTERCEPTORS */
--        
-+
-           _tao_call.start (ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-           TAO_INTERCEPTOR (ri.response_expected (1));
--          
-+
-           TAO_INTERCEPTOR (
-             _tao_vfr.send_request (
-               &ri,
-@@ -110,7 +111,7 @@
-             )
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           _tao_call.prepare_header (
-               ACE_static_cast (CORBA::Octet, _tao_response_flag),
-               ACE_TRY_ENV
-@@ -119,16 +120,16 @@
-           _invoke_status =
-             _tao_call.invoke (0, 0, ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           if (_invoke_status == TAO_INVOKE_EXCEPTION)
-             {
-               TAO_INTERCEPTOR_THROW (
-                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-               );
--              
-+
-             }
--          
--          
-+
-+
-           TAO_INTERCEPTOR (
-             ri.reply_status (_invoke_status);
-             if (_invoke_status == TAO_INVOKE_OK)
-@@ -145,10 +146,10 @@
-                   ACE_TRY_ENV
-                 );
-               }
--            
-+
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
- #if TAO_HAS_INTERCEPTORS == 1
-         }
-       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-@@ -156,8 +157,8 @@
-           _invoke_status =
-             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-           ACE_TRY_CHECK;
--          
--          ri.forward_reference (exc); 
-+
-+          ri.forward_reference (exc);
-           _tao_vfr.receive_other (
-             &ri,
-             ACE_TRY_ENV
-@@ -176,7 +177,7 @@
-         }
-       ACE_ENDTRY;
-       ACE_CHECK;
--      
-+
- #endif /* TAO_HAS_INTERCEPTORS */
- 
-       if (_invoke_status == TAO_INVOKE_RESTART)
-@@ -184,10 +185,10 @@
-           _tao_call.restart_flag (1);
-           continue;
-         }
--      
-+
-       break;
-     }
--  
-+
- }
- 
- void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
-@@ -198,15 +199,15 @@
-     CORBA::SystemException
-   ))
- {
--  
- 
--  
--  
-+
-+
-+
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-+
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "shutdown",
-@@ -219,13 +220,13 @@
-   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-       istub->orb_core ()->client_request_interceptors ()
-     );
--  
-+
- #endif  /* TAO_HAS_INTERCEPTORS */
--  
-+
-   for (;;)
-     {
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
--      
-+
- #if TAO_HAS_INTERCEPTORS == 1
-       ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown ri (
-         &_tao_call,
-@@ -233,17 +234,17 @@
-         ACE_TRY_ENV
-       );
-       ACE_CHECK;
--      
-+
-       ACE_TRY
-         {
- #endif /* TAO_HAS_INTERCEPTORS */
--        
-+
-           _tao_call.start (ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-           TAO_INTERCEPTOR (ri.response_expected (1));
--          
-+
-           TAO_INTERCEPTOR (
-             _tao_vfr.send_request (
-               &ri,
-@@ -251,7 +252,7 @@
-             )
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           _tao_call.prepare_header (
-               ACE_static_cast (CORBA::Octet, _tao_response_flag),
-               ACE_TRY_ENV
-@@ -260,16 +261,16 @@
-           _invoke_status =
-             _tao_call.invoke (0, 0, ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           if (_invoke_status == TAO_INVOKE_EXCEPTION)
-             {
-               TAO_INTERCEPTOR_THROW (
-                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-               );
--              
-+
-             }
--          
--          
-+
-+
-           TAO_INTERCEPTOR (
-             ri.reply_status (_invoke_status);
-             if (_invoke_status == TAO_INVOKE_OK)
-@@ -286,10 +287,10 @@
-                   ACE_TRY_ENV
-                 );
-               }
--            
-+
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
- #if TAO_HAS_INTERCEPTORS == 1
-         }
-       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-@@ -297,8 +298,8 @@
-           _invoke_status =
-             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-           ACE_TRY_CHECK;
--          
--          ri.forward_reference (exc); 
-+
-+          ri.forward_reference (exc);
-           _tao_vfr.receive_other (
-             &ri,
-             ACE_TRY_ENV
-@@ -317,7 +318,7 @@
-         }
-       ACE_ENDTRY;
-       ACE_CHECK;
--      
-+
- #endif /* TAO_HAS_INTERCEPTORS */
- 
-       if (_invoke_status == TAO_INVOKE_RESTART)
-@@ -325,15 +326,15 @@
-           _tao_call.restart_flag (1);
-           continue;
-         }
--      
-+
-       break;
-     }
--  
-+
- }
- 
- 
- //
--//            End  Base & Remote  Proxy Implemeentation. 
-+//            End  Base & Remote  Proxy Implemeentation.
- ///////////////////////////////////////////////////////////////////////
- 
- 
-@@ -454,14 +455,14 @@
-             stub,
-             1,
-             obj->_servant ()),
--            
-+
-           ServerObject::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
-         ACE_NEW_RETURN (default_proxy, ::ImplementationRepository::ServerObject (stub, 0, obj->_servant ()), ServerObject::_nil ());
-         return default_proxy;
-       }
--    else 
-+    else
-       return
-         ACE_reinterpret_cast
-           (
-@@ -505,7 +506,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -523,10 +524,10 @@
-     CORBA::SystemException
-   ))
- {
--  _TAO_ServerObject_Proxy_Impl &proxy = 
-+  _TAO_ServerObject_Proxy_Impl &proxy =
-     this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
-   ACE_CHECK;
--  
-+
-   proxy.ping (
-       this,
-       ACE_TRY_ENV
-@@ -540,10 +541,10 @@
-     CORBA::SystemException
-   ))
- {
--  _TAO_ServerObject_Proxy_Impl &proxy = 
-+  _TAO_ServerObject_Proxy_Impl &proxy =
-     this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
-   ACE_CHECK;
--  
-+
-   proxy.shutdown (
-       this,
-       ACE_TRY_ENV
-@@ -555,7 +556,7 @@
- ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    CORBA::Environment &    
-+    CORBA::Environment &
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
- {}
-@@ -568,7 +569,7 @@
-   Dynamic::ParameterList *parameter_list =
-     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return parameter_list;
- }
- 
-@@ -580,12 +581,12 @@
-   Dynamic::ExceptionList *exception_list =
-     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return exception_list;
- }
- 
- 
--CORBA::Any * 
-+CORBA::Any *
- ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-@@ -594,14 +595,14 @@
-   CORBA::Any *result_any =
-     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return result_any;
- }
- 
- ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    CORBA::Environment &    
-+    CORBA::Environment &
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
- {}
-@@ -614,7 +615,7 @@
-   Dynamic::ParameterList *parameter_list =
-     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return parameter_list;
- }
- 
-@@ -626,12 +627,12 @@
-   Dynamic::ExceptionList *exception_list =
-     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return exception_list;
- }
- 
- 
--CORBA::Any * 
-+CORBA::Any *
- ImplementationRepository::ServerObject::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-@@ -640,7 +641,7 @@
-   CORBA::Any *result_any =
-     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return result_any;
- }
- 
-@@ -649,22 +650,22 @@
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   46,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x496d706c), 
--  ACE_NTOHL (0x656d656e), 
--  ACE_NTOHL (0x74617469), 
--  ACE_NTOHL (0x6f6e5265), 
--  ACE_NTOHL (0x706f7369), 
--  ACE_NTOHL (0x746f7279), 
--  ACE_NTOHL (0x2f536572), 
--  ACE_NTOHL (0x7665724f), 
--  ACE_NTOHL (0x626a6563), 
--  ACE_NTOHL (0x743a312e), 
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x496d706c),
-+  ACE_NTOHL (0x656d656e),
-+  ACE_NTOHL (0x74617469),
-+  ACE_NTOHL (0x6f6e5265),
-+  ACE_NTOHL (0x706f7369),
-+  ACE_NTOHL (0x746f7279),
-+  ACE_NTOHL (0x2f536572),
-+  ACE_NTOHL (0x7665724f),
-+  ACE_NTOHL (0x626a6563),
-+  ACE_NTOHL (0x743a312e),
-   ACE_NTOHL (0x30000000),  // repository ID = IDL:ImplementationRepository/ServerObject:1.0
-   13,
--  ACE_NTOHL (0x53657276), 
--  ACE_NTOHL (0x65724f62), 
--  ACE_NTOHL (0x6a656374), 
-+  ACE_NTOHL (0x53657276),
-+  ACE_NTOHL (0x65724f62),
-+  ACE_NTOHL (0x6a656374),
-   ACE_NTOHL (0x0),  // name = ServerObject
- };
- 
-@@ -685,36 +686,36 @@
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   53,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x496d706c), 
--  ACE_NTOHL (0x656d656e), 
--  ACE_NTOHL (0x74617469), 
--  ACE_NTOHL (0x6f6e5265), 
--  ACE_NTOHL (0x706f7369), 
--  ACE_NTOHL (0x746f7279), 
--  ACE_NTOHL (0x2f456e76), 
--  ACE_NTOHL (0x69726f6e), 
--  ACE_NTOHL (0x6d656e74), 
--  ACE_NTOHL (0x56617269), 
--  ACE_NTOHL (0x61626c65), 
--  ACE_NTOHL (0x3a312e30), 
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x496d706c),
-+  ACE_NTOHL (0x656d656e),
-+  ACE_NTOHL (0x74617469),
-+  ACE_NTOHL (0x6f6e5265),
-+  ACE_NTOHL (0x706f7369),
-+  ACE_NTOHL (0x746f7279),
-+  ACE_NTOHL (0x2f456e76),
-+  ACE_NTOHL (0x69726f6e),
-+  ACE_NTOHL (0x6d656e74),
-+  ACE_NTOHL (0x56617269),
-+  ACE_NTOHL (0x61626c65),
-+  ACE_NTOHL (0x3a312e30),
-   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
-   20,
--  ACE_NTOHL (0x456e7669), 
--  ACE_NTOHL (0x726f6e6d), 
--  ACE_NTOHL (0x656e7456), 
--  ACE_NTOHL (0x61726961), 
-+  ACE_NTOHL (0x456e7669),
-+  ACE_NTOHL (0x726f6e6d),
-+  ACE_NTOHL (0x656e7456),
-+  ACE_NTOHL (0x61726961),
-   ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
-   2, // member count
-   5,
--  ACE_NTOHL (0x6e616d65), 
-+  ACE_NTOHL (0x6e616d65),
-   ACE_NTOHL (0x0),  // name = name
--  CORBA::tk_string, 
-+  CORBA::tk_string,
-   0U, // string length
-   6,
--  ACE_NTOHL (0x76616c75), 
-+  ACE_NTOHL (0x76616c75),
-   ACE_NTOHL (0x65000000),  // name = value
--  CORBA::tk_string, 
-+  CORBA::tk_string,
-   0U, // string length
- };
- 
-@@ -741,21 +742,21 @@
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   41,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x496d706c), 
--  ACE_NTOHL (0x656d656e), 
--  ACE_NTOHL (0x74617469), 
--  ACE_NTOHL (0x6f6e5265), 
--  ACE_NTOHL (0x706f7369), 
--  ACE_NTOHL (0x746f7279), 
--  ACE_NTOHL (0x2f416464), 
--  ACE_NTOHL (0x72657373), 
--  ACE_NTOHL (0x3a312e30), 
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x496d706c),
-+  ACE_NTOHL (0x656d656e),
-+  ACE_NTOHL (0x74617469),
-+  ACE_NTOHL (0x6f6e5265),
-+  ACE_NTOHL (0x706f7369),
-+  ACE_NTOHL (0x746f7279),
-+  ACE_NTOHL (0x2f416464),
-+  ACE_NTOHL (0x72657373),
-+  ACE_NTOHL (0x3a312e30),
-   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
-   8,
--  ACE_NTOHL (0x41646472), 
-+  ACE_NTOHL (0x41646472),
-   ACE_NTOHL (0x65737300),  // name = Address
--  CORBA::tk_string, 
-+  CORBA::tk_string,
-   0U, // string length
- };
- 
-@@ -774,7 +775,7 @@
- 
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--  
-+
- #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
- #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
- 
-@@ -783,43 +784,43 @@
-   {
-     ImplementationRepository::EnvironmentVariable* tmp = 0;
-     tmp = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (length);
--    
-+
-     if (this->buffer_ != 0)
-     {
-       ImplementationRepository::EnvironmentVariable *old = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_);
--      
-+
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp[i] = old[i];
--      
-+
-       if (this->release_)
-         _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (old);
--      
-+
-     }
-     this->buffer_ = tmp;
-   }
--  
-+
-   void
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
--    
-+
-     ImplementationRepository::EnvironmentVariable *tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_);
--    
-+
-     _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp);
-     this->buffer_ = 0;
--  } 
--  
-+  }
-+
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void) // Dtor.
-   {
-     this->_deallocate_buffer ();
-   }
--  
--  
-+
-+
- #endif /* end #if !defined */
- 
- 
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- 
- #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
- #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
-@@ -831,30 +832,30 @@
- ImplementationRepository::EnvironmentList::EnvironmentList (void)
- {}
- ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max) // uses max size
--  : 
-+  :
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  (max)
- {}
- ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::EnvironmentVariable *buffer, CORBA::Boolean release)
--  : 
-+  :
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  (max, length, buffer, release)
- {}
- ImplementationRepository::EnvironmentList::EnvironmentList (const EnvironmentList &seq) // copy ctor
--  : 
-+  :
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  (seq)
- {}
- ImplementationRepository::EnvironmentList::~EnvironmentList (void) // dtor
-@@ -872,23 +873,23 @@
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   49,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x496d706c), 
--  ACE_NTOHL (0x656d656e), 
--  ACE_NTOHL (0x74617469), 
--  ACE_NTOHL (0x6f6e5265), 
--  ACE_NTOHL (0x706f7369), 
--  ACE_NTOHL (0x746f7279), 
--  ACE_NTOHL (0x2f456e76), 
--  ACE_NTOHL (0x69726f6e), 
--  ACE_NTOHL (0x6d656e74), 
--  ACE_NTOHL (0x4c697374), 
--  ACE_NTOHL (0x3a312e30), 
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x496d706c),
-+  ACE_NTOHL (0x656d656e),
-+  ACE_NTOHL (0x74617469),
-+  ACE_NTOHL (0x6f6e5265),
-+  ACE_NTOHL (0x706f7369),
-+  ACE_NTOHL (0x746f7279),
-+  ACE_NTOHL (0x2f456e76),
-+  ACE_NTOHL (0x69726f6e),
-+  ACE_NTOHL (0x6d656e74),
-+  ACE_NTOHL (0x4c697374),
-+  ACE_NTOHL (0x3a312e30),
-   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
-   16,
--  ACE_NTOHL (0x456e7669), 
--  ACE_NTOHL (0x726f6e6d), 
--  ACE_NTOHL (0x656e744c), 
-+  ACE_NTOHL (0x456e7669),
-+  ACE_NTOHL (0x726f6e6d),
-+  ACE_NTOHL (0x656e744c),
-   ACE_NTOHL (0x69737400),  // name = EnvironmentList
-   CORBA::tk_sequence, // typecode kind
-   148, // encapsulation length
-@@ -897,36 +898,36 @@
-     132, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       53,
--      ACE_NTOHL (0x49444c3a), 
--      ACE_NTOHL (0x496d706c), 
--      ACE_NTOHL (0x656d656e), 
--      ACE_NTOHL (0x74617469), 
--      ACE_NTOHL (0x6f6e5265), 
--      ACE_NTOHL (0x706f7369), 
--      ACE_NTOHL (0x746f7279), 
--      ACE_NTOHL (0x2f456e76), 
--      ACE_NTOHL (0x69726f6e), 
--      ACE_NTOHL (0x6d656e74), 
--      ACE_NTOHL (0x56617269), 
--      ACE_NTOHL (0x61626c65), 
--      ACE_NTOHL (0x3a312e30), 
-+      ACE_NTOHL (0x49444c3a),
-+      ACE_NTOHL (0x496d706c),
-+      ACE_NTOHL (0x656d656e),
-+      ACE_NTOHL (0x74617469),
-+      ACE_NTOHL (0x6f6e5265),
-+      ACE_NTOHL (0x706f7369),
-+      ACE_NTOHL (0x746f7279),
-+      ACE_NTOHL (0x2f456e76),
-+      ACE_NTOHL (0x69726f6e),
-+      ACE_NTOHL (0x6d656e74),
-+      ACE_NTOHL (0x56617269),
-+      ACE_NTOHL (0x61626c65),
-+      ACE_NTOHL (0x3a312e30),
-       ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
-       20,
--      ACE_NTOHL (0x456e7669), 
--      ACE_NTOHL (0x726f6e6d), 
--      ACE_NTOHL (0x656e7456), 
--      ACE_NTOHL (0x61726961), 
-+      ACE_NTOHL (0x456e7669),
-+      ACE_NTOHL (0x726f6e6d),
-+      ACE_NTOHL (0x656e7456),
-+      ACE_NTOHL (0x61726961),
-       ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
-       2, // member count
-       5,
--      ACE_NTOHL (0x6e616d65), 
-+      ACE_NTOHL (0x6e616d65),
-       ACE_NTOHL (0x0),  // name = name
--      CORBA::tk_string, 
-+      CORBA::tk_string,
-       0U, // string length
-       6,
--      ACE_NTOHL (0x76616c75), 
-+      ACE_NTOHL (0x76616c75),
-       ACE_NTOHL (0x65000000),  // name = value
--      CORBA::tk_string, 
-+      CORBA::tk_string,
-       0U, // string length
- 
-     0U,
-@@ -950,37 +951,37 @@
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   48,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x496d706c), 
--  ACE_NTOHL (0x656d656e), 
--  ACE_NTOHL (0x74617469), 
--  ACE_NTOHL (0x6f6e5265), 
--  ACE_NTOHL (0x706f7369), 
--  ACE_NTOHL (0x746f7279), 
--  ACE_NTOHL (0x2f416374), 
--  ACE_NTOHL (0x69766174), 
--  ACE_NTOHL (0x696f6e4d), 
--  ACE_NTOHL (0x6f64653a), 
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x496d706c),
-+  ACE_NTOHL (0x656d656e),
-+  ACE_NTOHL (0x74617469),
-+  ACE_NTOHL (0x6f6e5265),
-+  ACE_NTOHL (0x706f7369),
-+  ACE_NTOHL (0x746f7279),
-+  ACE_NTOHL (0x2f416374),
-+  ACE_NTOHL (0x69766174),
-+  ACE_NTOHL (0x696f6e4d),
-+  ACE_NTOHL (0x6f64653a),
-   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
-   15,
--  ACE_NTOHL (0x41637469), 
--  ACE_NTOHL (0x76617469), 
--  ACE_NTOHL (0x6f6e4d6f), 
-+  ACE_NTOHL (0x41637469),
-+  ACE_NTOHL (0x76617469),
-+  ACE_NTOHL (0x6f6e4d6f),
-   ACE_NTOHL (0x64650000),  // name = ActivationMode
-   4, // member count
-   7,
--  ACE_NTOHL (0x4e4f524d), 
-+  ACE_NTOHL (0x4e4f524d),
-   ACE_NTOHL (0x414c0000),  // name = NORMAL
-   7,
--  ACE_NTOHL (0x4d414e55), 
-+  ACE_NTOHL (0x4d414e55),
-   ACE_NTOHL (0x414c0000),  // name = MANUAL
-   11,
--  ACE_NTOHL (0x5045525f), 
--  ACE_NTOHL (0x434c4945), 
-+  ACE_NTOHL (0x5045525f),
-+  ACE_NTOHL (0x434c4945),
-   ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
-   11,
--  ACE_NTOHL (0x4155544f), 
--  ACE_NTOHL (0x5f535441), 
-+  ACE_NTOHL (0x4155544f),
-+  ACE_NTOHL (0x5f535441),
-   ACE_NTOHL (0x52540000),  // name = AUTO_START
- };
- 
-@@ -1001,56 +1002,56 @@
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   48,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x496d706c), 
--  ACE_NTOHL (0x656d656e), 
--  ACE_NTOHL (0x74617469), 
--  ACE_NTOHL (0x6f6e5265), 
--  ACE_NTOHL (0x706f7369), 
--  ACE_NTOHL (0x746f7279), 
--  ACE_NTOHL (0x2f537461), 
--  ACE_NTOHL (0x72747570), 
--  ACE_NTOHL (0x4f707469), 
--  ACE_NTOHL (0x6f6e733a), 
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x496d706c),
-+  ACE_NTOHL (0x656d656e),
-+  ACE_NTOHL (0x74617469),
-+  ACE_NTOHL (0x6f6e5265),
-+  ACE_NTOHL (0x706f7369),
-+  ACE_NTOHL (0x746f7279),
-+  ACE_NTOHL (0x2f537461),
-+  ACE_NTOHL (0x72747570),
-+  ACE_NTOHL (0x4f707469),
-+  ACE_NTOHL (0x6f6e733a),
-   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
-   15,
--  ACE_NTOHL (0x53746172), 
--  ACE_NTOHL (0x7475704f), 
--  ACE_NTOHL (0x7074696f), 
-+  ACE_NTOHL (0x53746172),
-+  ACE_NTOHL (0x7475704f),
-+  ACE_NTOHL (0x7074696f),
-   ACE_NTOHL (0x6e730000),  // name = StartupOptions
-   4, // member count
-   13,
--  ACE_NTOHL (0x636f6d6d), 
--  ACE_NTOHL (0x616e645f), 
--  ACE_NTOHL (0x6c696e65), 
-+  ACE_NTOHL (0x636f6d6d),
-+  ACE_NTOHL (0x616e645f),
-+  ACE_NTOHL (0x6c696e65),
-   ACE_NTOHL (0x0),  // name = command_line
--  CORBA::tk_string, 
-+  CORBA::tk_string,
-   0U, // string length
-   12,
--  ACE_NTOHL (0x656e7669), 
--  ACE_NTOHL (0x726f6e6d), 
-+  ACE_NTOHL (0x656e7669),
-+  ACE_NTOHL (0x726f6e6d),
-   ACE_NTOHL (0x656e7400),  // name = environment
-   CORBA::tk_alias, // typecode kind for typedefs
-   236, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     49,
--    ACE_NTOHL (0x49444c3a), 
--    ACE_NTOHL (0x496d706c), 
--    ACE_NTOHL (0x656d656e), 
--    ACE_NTOHL (0x74617469), 
--    ACE_NTOHL (0x6f6e5265), 
--    ACE_NTOHL (0x706f7369), 
--    ACE_NTOHL (0x746f7279), 
--    ACE_NTOHL (0x2f456e76), 
--    ACE_NTOHL (0x69726f6e), 
--    ACE_NTOHL (0x6d656e74), 
--    ACE_NTOHL (0x4c697374), 
--    ACE_NTOHL (0x3a312e30), 
-+    ACE_NTOHL (0x49444c3a),
-+    ACE_NTOHL (0x496d706c),
-+    ACE_NTOHL (0x656d656e),
-+    ACE_NTOHL (0x74617469),
-+    ACE_NTOHL (0x6f6e5265),
-+    ACE_NTOHL (0x706f7369),
-+    ACE_NTOHL (0x746f7279),
-+    ACE_NTOHL (0x2f456e76),
-+    ACE_NTOHL (0x69726f6e),
-+    ACE_NTOHL (0x6d656e74),
-+    ACE_NTOHL (0x4c697374),
-+    ACE_NTOHL (0x3a312e30),
-     ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
-     16,
--    ACE_NTOHL (0x456e7669), 
--    ACE_NTOHL (0x726f6e6d), 
--    ACE_NTOHL (0x656e744c), 
-+    ACE_NTOHL (0x456e7669),
-+    ACE_NTOHL (0x726f6e6d),
-+    ACE_NTOHL (0x656e744c),
-     ACE_NTOHL (0x69737400),  // name = EnvironmentList
-     CORBA::tk_sequence, // typecode kind
-     148, // encapsulation length
-@@ -1059,88 +1060,88 @@
-       132, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         53,
--        ACE_NTOHL (0x49444c3a), 
--        ACE_NTOHL (0x496d706c), 
--        ACE_NTOHL (0x656d656e), 
--        ACE_NTOHL (0x74617469), 
--        ACE_NTOHL (0x6f6e5265), 
--        ACE_NTOHL (0x706f7369), 
--        ACE_NTOHL (0x746f7279), 
--        ACE_NTOHL (0x2f456e76), 
--        ACE_NTOHL (0x69726f6e), 
--        ACE_NTOHL (0x6d656e74), 
--        ACE_NTOHL (0x56617269), 
--        ACE_NTOHL (0x61626c65), 
--        ACE_NTOHL (0x3a312e30), 
-+        ACE_NTOHL (0x49444c3a),
-+        ACE_NTOHL (0x496d706c),
-+        ACE_NTOHL (0x656d656e),
-+        ACE_NTOHL (0x74617469),
-+        ACE_NTOHL (0x6f6e5265),
-+        ACE_NTOHL (0x706f7369),
-+        ACE_NTOHL (0x746f7279),
-+        ACE_NTOHL (0x2f456e76),
-+        ACE_NTOHL (0x69726f6e),
-+        ACE_NTOHL (0x6d656e74),
-+        ACE_NTOHL (0x56617269),
-+        ACE_NTOHL (0x61626c65),
-+        ACE_NTOHL (0x3a312e30),
-         ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
-         20,
--        ACE_NTOHL (0x456e7669), 
--        ACE_NTOHL (0x726f6e6d), 
--        ACE_NTOHL (0x656e7456), 
--        ACE_NTOHL (0x61726961), 
-+        ACE_NTOHL (0x456e7669),
-+        ACE_NTOHL (0x726f6e6d),
-+        ACE_NTOHL (0x656e7456),
-+        ACE_NTOHL (0x61726961),
-         ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
-         2, // member count
-         5,
--        ACE_NTOHL (0x6e616d65), 
-+        ACE_NTOHL (0x6e616d65),
-         ACE_NTOHL (0x0),  // name = name
--        CORBA::tk_string, 
-+        CORBA::tk_string,
-         0U, // string length
-         6,
--        ACE_NTOHL (0x76616c75), 
-+        ACE_NTOHL (0x76616c75),
-         ACE_NTOHL (0x65000000),  // name = value
--        CORBA::tk_string, 
-+        CORBA::tk_string,
-         0U, // string length
- 
-       0U,
- 
- 
-   18,
--  ACE_NTOHL (0x776f726b), 
--  ACE_NTOHL (0x696e675f), 
--  ACE_NTOHL (0x64697265), 
--  ACE_NTOHL (0x63746f72), 
-+  ACE_NTOHL (0x776f726b),
-+  ACE_NTOHL (0x696e675f),
-+  ACE_NTOHL (0x64697265),
-+  ACE_NTOHL (0x63746f72),
-   ACE_NTOHL (0x79000000),  // name = working_directory
--  CORBA::tk_string, 
-+  CORBA::tk_string,
-   0U, // string length
-   11,
--  ACE_NTOHL (0x61637469), 
--  ACE_NTOHL (0x76617469), 
-+  ACE_NTOHL (0x61637469),
-+  ACE_NTOHL (0x76617469),
-   ACE_NTOHL (0x6f6e0000),  // name = activation
-   CORBA::tk_enum, // typecode kind
-   136, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     48,
--    ACE_NTOHL (0x49444c3a), 
--    ACE_NTOHL (0x496d706c), 
--    ACE_NTOHL (0x656d656e), 
--    ACE_NTOHL (0x74617469), 
--    ACE_NTOHL (0x6f6e5265), 
--    ACE_NTOHL (0x706f7369), 
--    ACE_NTOHL (0x746f7279), 
--    ACE_NTOHL (0x2f416374), 
--    ACE_NTOHL (0x69766174), 
--    ACE_NTOHL (0x696f6e4d), 
--    ACE_NTOHL (0x6f64653a), 
-+    ACE_NTOHL (0x49444c3a),
-+    ACE_NTOHL (0x496d706c),
-+    ACE_NTOHL (0x656d656e),
-+    ACE_NTOHL (0x74617469),
-+    ACE_NTOHL (0x6f6e5265),
-+    ACE_NTOHL (0x706f7369),
-+    ACE_NTOHL (0x746f7279),
-+    ACE_NTOHL (0x2f416374),
-+    ACE_NTOHL (0x69766174),
-+    ACE_NTOHL (0x696f6e4d),
-+    ACE_NTOHL (0x6f64653a),
-     ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
-     15,
--    ACE_NTOHL (0x41637469), 
--    ACE_NTOHL (0x76617469), 
--    ACE_NTOHL (0x6f6e4d6f), 
-+    ACE_NTOHL (0x41637469),
-+    ACE_NTOHL (0x76617469),
-+    ACE_NTOHL (0x6f6e4d6f),
-     ACE_NTOHL (0x64650000),  // name = ActivationMode
-     4, // member count
-     7,
--    ACE_NTOHL (0x4e4f524d), 
-+    ACE_NTOHL (0x4e4f524d),
-     ACE_NTOHL (0x414c0000),  // name = NORMAL
-     7,
--    ACE_NTOHL (0x4d414e55), 
-+    ACE_NTOHL (0x4d414e55),
-     ACE_NTOHL (0x414c0000),  // name = MANUAL
-     11,
--    ACE_NTOHL (0x5045525f), 
--    ACE_NTOHL (0x434c4945), 
-+    ACE_NTOHL (0x5045525f),
-+    ACE_NTOHL (0x434c4945),
-     ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
-     11,
--    ACE_NTOHL (0x4155544f), 
--    ACE_NTOHL (0x5f535441), 
-+    ACE_NTOHL (0x4155544f),
-+    ACE_NTOHL (0x5f535441),
-     ACE_NTOHL (0x52540000),  // name = AUTO_START
- 
- };
-@@ -1168,95 +1169,95 @@
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   51,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x496d706c), 
--  ACE_NTOHL (0x656d656e), 
--  ACE_NTOHL (0x74617469), 
--  ACE_NTOHL (0x6f6e5265), 
--  ACE_NTOHL (0x706f7369), 
--  ACE_NTOHL (0x746f7279), 
--  ACE_NTOHL (0x2f536572), 
--  ACE_NTOHL (0x76657249), 
--  ACE_NTOHL (0x6e666f72), 
--  ACE_NTOHL (0x6d617469), 
--  ACE_NTOHL (0x6f6e3a31), 
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x496d706c),
-+  ACE_NTOHL (0x656d656e),
-+  ACE_NTOHL (0x74617469),
-+  ACE_NTOHL (0x6f6e5265),
-+  ACE_NTOHL (0x706f7369),
-+  ACE_NTOHL (0x746f7279),
-+  ACE_NTOHL (0x2f536572),
-+  ACE_NTOHL (0x76657249),
-+  ACE_NTOHL (0x6e666f72),
-+  ACE_NTOHL (0x6d617469),
-+  ACE_NTOHL (0x6f6e3a31),
-   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformation:1.0
-   18,
--  ACE_NTOHL (0x53657276), 
--  ACE_NTOHL (0x6572496e), 
--  ACE_NTOHL (0x666f726d), 
--  ACE_NTOHL (0x6174696f), 
-+  ACE_NTOHL (0x53657276),
-+  ACE_NTOHL (0x6572496e),
-+  ACE_NTOHL (0x666f726d),
-+  ACE_NTOHL (0x6174696f),
-   ACE_NTOHL (0x6e000000),  // name = ServerInformation
-   4, // member count
-   15,
--  ACE_NTOHL (0x6c6f6769), 
--  ACE_NTOHL (0x63616c5f), 
--  ACE_NTOHL (0x73657276), 
-+  ACE_NTOHL (0x6c6f6769),
-+  ACE_NTOHL (0x63616c5f),
-+  ACE_NTOHL (0x73657276),
-   ACE_NTOHL (0x65720000),  // name = logical_server
--  CORBA::tk_string, 
-+  CORBA::tk_string,
-   0U, // string length
-   7,
--  ACE_NTOHL (0x73657276), 
-+  ACE_NTOHL (0x73657276),
-   ACE_NTOHL (0x65720000),  // name = server
--  CORBA::tk_string, 
-+  CORBA::tk_string,
-   0U, // string length
-   8,
--  ACE_NTOHL (0x73746172), 
-+  ACE_NTOHL (0x73746172),
-   ACE_NTOHL (0x74757000),  // name = startup
-   CORBA::tk_struct, // typecode kind
-   560, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     48,
--    ACE_NTOHL (0x49444c3a), 
--    ACE_NTOHL (0x496d706c), 
--    ACE_NTOHL (0x656d656e), 
--    ACE_NTOHL (0x74617469), 
--    ACE_NTOHL (0x6f6e5265), 
--    ACE_NTOHL (0x706f7369), 
--    ACE_NTOHL (0x746f7279), 
--    ACE_NTOHL (0x2f537461), 
--    ACE_NTOHL (0x72747570), 
--    ACE_NTOHL (0x4f707469), 
--    ACE_NTOHL (0x6f6e733a), 
-+    ACE_NTOHL (0x49444c3a),
-+    ACE_NTOHL (0x496d706c),
-+    ACE_NTOHL (0x656d656e),
-+    ACE_NTOHL (0x74617469),
-+    ACE_NTOHL (0x6f6e5265),
-+    ACE_NTOHL (0x706f7369),
-+    ACE_NTOHL (0x746f7279),
-+    ACE_NTOHL (0x2f537461),
-+    ACE_NTOHL (0x72747570),
-+    ACE_NTOHL (0x4f707469),
-+    ACE_NTOHL (0x6f6e733a),
-     ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
-     15,
--    ACE_NTOHL (0x53746172), 
--    ACE_NTOHL (0x7475704f), 
--    ACE_NTOHL (0x7074696f), 
-+    ACE_NTOHL (0x53746172),
-+    ACE_NTOHL (0x7475704f),
-+    ACE_NTOHL (0x7074696f),
-     ACE_NTOHL (0x6e730000),  // name = StartupOptions
-     4, // member count
-     13,
--    ACE_NTOHL (0x636f6d6d), 
--    ACE_NTOHL (0x616e645f), 
--    ACE_NTOHL (0x6c696e65), 
-+    ACE_NTOHL (0x636f6d6d),
-+    ACE_NTOHL (0x616e645f),
-+    ACE_NTOHL (0x6c696e65),
-     ACE_NTOHL (0x0),  // name = command_line
--    CORBA::tk_string, 
-+    CORBA::tk_string,
-     0U, // string length
-     12,
--    ACE_NTOHL (0x656e7669), 
--    ACE_NTOHL (0x726f6e6d), 
-+    ACE_NTOHL (0x656e7669),
-+    ACE_NTOHL (0x726f6e6d),
-     ACE_NTOHL (0x656e7400),  // name = environment
-     CORBA::tk_alias, // typecode kind for typedefs
-     236, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       49,
--      ACE_NTOHL (0x49444c3a), 
--      ACE_NTOHL (0x496d706c), 
--      ACE_NTOHL (0x656d656e), 
--      ACE_NTOHL (0x74617469), 
--      ACE_NTOHL (0x6f6e5265), 
--      ACE_NTOHL (0x706f7369), 
--      ACE_NTOHL (0x746f7279), 
--      ACE_NTOHL (0x2f456e76), 
--      ACE_NTOHL (0x69726f6e), 
--      ACE_NTOHL (0x6d656e74), 
--      ACE_NTOHL (0x4c697374), 
--      ACE_NTOHL (0x3a312e30), 
-+      ACE_NTOHL (0x49444c3a),
-+      ACE_NTOHL (0x496d706c),
-+      ACE_NTOHL (0x656d656e),
-+      ACE_NTOHL (0x74617469),
-+      ACE_NTOHL (0x6f6e5265),
-+      ACE_NTOHL (0x706f7369),
-+      ACE_NTOHL (0x746f7279),
-+      ACE_NTOHL (0x2f456e76),
-+      ACE_NTOHL (0x69726f6e),
-+      ACE_NTOHL (0x6d656e74),
-+      ACE_NTOHL (0x4c697374),
-+      ACE_NTOHL (0x3a312e30),
-       ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
-       16,
--      ACE_NTOHL (0x456e7669), 
--      ACE_NTOHL (0x726f6e6d), 
--      ACE_NTOHL (0x656e744c), 
-+      ACE_NTOHL (0x456e7669),
-+      ACE_NTOHL (0x726f6e6d),
-+      ACE_NTOHL (0x656e744c),
-       ACE_NTOHL (0x69737400),  // name = EnvironmentList
-       CORBA::tk_sequence, // typecode kind
-       148, // encapsulation length
-@@ -1265,114 +1266,114 @@
-         132, // encapsulation length
-           TAO_ENCAP_BYTE_ORDER, // byte order
-           53,
--          ACE_NTOHL (0x49444c3a), 
--          ACE_NTOHL (0x496d706c), 
--          ACE_NTOHL (0x656d656e), 
--          ACE_NTOHL (0x74617469), 
--          ACE_NTOHL (0x6f6e5265), 
--          ACE_NTOHL (0x706f7369), 
--          ACE_NTOHL (0x746f7279), 
--          ACE_NTOHL (0x2f456e76), 
--          ACE_NTOHL (0x69726f6e), 
--          ACE_NTOHL (0x6d656e74), 
--          ACE_NTOHL (0x56617269), 
--          ACE_NTOHL (0x61626c65), 
--          ACE_NTOHL (0x3a312e30), 
-+          ACE_NTOHL (0x49444c3a),
-+          ACE_NTOHL (0x496d706c),
-+          ACE_NTOHL (0x656d656e),
-+          ACE_NTOHL (0x74617469),
-+          ACE_NTOHL (0x6f6e5265),
-+          ACE_NTOHL (0x706f7369),
-+          ACE_NTOHL (0x746f7279),
-+          ACE_NTOHL (0x2f456e76),
-+          ACE_NTOHL (0x69726f6e),
-+          ACE_NTOHL (0x6d656e74),
-+          ACE_NTOHL (0x56617269),
-+          ACE_NTOHL (0x61626c65),
-+          ACE_NTOHL (0x3a312e30),
-           ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
-           20,
--          ACE_NTOHL (0x456e7669), 
--          ACE_NTOHL (0x726f6e6d), 
--          ACE_NTOHL (0x656e7456), 
--          ACE_NTOHL (0x61726961), 
-+          ACE_NTOHL (0x456e7669),
-+          ACE_NTOHL (0x726f6e6d),
-+          ACE_NTOHL (0x656e7456),
-+          ACE_NTOHL (0x61726961),
-           ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
-           2, // member count
-           5,
--          ACE_NTOHL (0x6e616d65), 
-+          ACE_NTOHL (0x6e616d65),
-           ACE_NTOHL (0x0),  // name = name
--          CORBA::tk_string, 
-+          CORBA::tk_string,
-           0U, // string length
-           6,
--          ACE_NTOHL (0x76616c75), 
-+          ACE_NTOHL (0x76616c75),
-           ACE_NTOHL (0x65000000),  // name = value
--          CORBA::tk_string, 
-+          CORBA::tk_string,
-           0U, // string length
- 
-         0U,
- 
- 
-     18,
--    ACE_NTOHL (0x776f726b), 
--    ACE_NTOHL (0x696e675f), 
--    ACE_NTOHL (0x64697265), 
--    ACE_NTOHL (0x63746f72), 
-+    ACE_NTOHL (0x776f726b),
-+    ACE_NTOHL (0x696e675f),
-+    ACE_NTOHL (0x64697265),
-+    ACE_NTOHL (0x63746f72),
-     ACE_NTOHL (0x79000000),  // name = working_directory
--    CORBA::tk_string, 
-+    CORBA::tk_string,
-     0U, // string length
-     11,
--    ACE_NTOHL (0x61637469), 
--    ACE_NTOHL (0x76617469), 
-+    ACE_NTOHL (0x61637469),
-+    ACE_NTOHL (0x76617469),
-     ACE_NTOHL (0x6f6e0000),  // name = activation
-     CORBA::tk_enum, // typecode kind
-     136, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       48,
--      ACE_NTOHL (0x49444c3a), 
--      ACE_NTOHL (0x496d706c), 
--      ACE_NTOHL (0x656d656e), 
--      ACE_NTOHL (0x74617469), 
--      ACE_NTOHL (0x6f6e5265), 
--      ACE_NTOHL (0x706f7369), 
--      ACE_NTOHL (0x746f7279), 
--      ACE_NTOHL (0x2f416374), 
--      ACE_NTOHL (0x69766174), 
--      ACE_NTOHL (0x696f6e4d), 
--      ACE_NTOHL (0x6f64653a), 
-+      ACE_NTOHL (0x49444c3a),
-+      ACE_NTOHL (0x496d706c),
-+      ACE_NTOHL (0x656d656e),
-+      ACE_NTOHL (0x74617469),
-+      ACE_NTOHL (0x6f6e5265),
-+      ACE_NTOHL (0x706f7369),
-+      ACE_NTOHL (0x746f7279),
-+      ACE_NTOHL (0x2f416374),
-+      ACE_NTOHL (0x69766174),
-+      ACE_NTOHL (0x696f6e4d),
-+      ACE_NTOHL (0x6f64653a),
-       ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
-       15,
--      ACE_NTOHL (0x41637469), 
--      ACE_NTOHL (0x76617469), 
--      ACE_NTOHL (0x6f6e4d6f), 
-+      ACE_NTOHL (0x41637469),
-+      ACE_NTOHL (0x76617469),
-+      ACE_NTOHL (0x6f6e4d6f),
-       ACE_NTOHL (0x64650000),  // name = ActivationMode
-       4, // member count
-       7,
--      ACE_NTOHL (0x4e4f524d), 
-+      ACE_NTOHL (0x4e4f524d),
-       ACE_NTOHL (0x414c0000),  // name = NORMAL
-       7,
--      ACE_NTOHL (0x4d414e55), 
-+      ACE_NTOHL (0x4d414e55),
-       ACE_NTOHL (0x414c0000),  // name = MANUAL
-       11,
--      ACE_NTOHL (0x5045525f), 
--      ACE_NTOHL (0x434c4945), 
-+      ACE_NTOHL (0x5045525f),
-+      ACE_NTOHL (0x434c4945),
-       ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
-       11,
--      ACE_NTOHL (0x4155544f), 
--      ACE_NTOHL (0x5f535441), 
-+      ACE_NTOHL (0x4155544f),
-+      ACE_NTOHL (0x5f535441),
-       ACE_NTOHL (0x52540000),  // name = AUTO_START
- 
- 
-   9,
--  ACE_NTOHL (0x6c6f6361), 
--  ACE_NTOHL (0x74696f6e), 
-+  ACE_NTOHL (0x6c6f6361),
-+  ACE_NTOHL (0x74696f6e),
-   ACE_NTOHL (0x0),  // name = location
-   CORBA::tk_alias, // typecode kind for typedefs
-   72, // encapsulation length
-     TAO_ENCAP_BYTE_ORDER, // byte order
-     41,
--    ACE_NTOHL (0x49444c3a), 
--    ACE_NTOHL (0x496d706c), 
--    ACE_NTOHL (0x656d656e), 
--    ACE_NTOHL (0x74617469), 
--    ACE_NTOHL (0x6f6e5265), 
--    ACE_NTOHL (0x706f7369), 
--    ACE_NTOHL (0x746f7279), 
--    ACE_NTOHL (0x2f416464), 
--    ACE_NTOHL (0x72657373), 
--    ACE_NTOHL (0x3a312e30), 
-+    ACE_NTOHL (0x49444c3a),
-+    ACE_NTOHL (0x496d706c),
-+    ACE_NTOHL (0x656d656e),
-+    ACE_NTOHL (0x74617469),
-+    ACE_NTOHL (0x6f6e5265),
-+    ACE_NTOHL (0x706f7369),
-+    ACE_NTOHL (0x746f7279),
-+    ACE_NTOHL (0x2f416464),
-+    ACE_NTOHL (0x72657373),
-+    ACE_NTOHL (0x3a312e30),
-     ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
-     8,
--    ACE_NTOHL (0x41646472), 
-+    ACE_NTOHL (0x41646472),
-     ACE_NTOHL (0x65737300),  // name = Address
--    CORBA::tk_string, 
-+    CORBA::tk_string,
-     0U, // string length
- 
- };
-@@ -1398,7 +1399,7 @@
- 
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--  
-+
- #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
- #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
- 
-@@ -1407,43 +1408,43 @@
-   {
-     ImplementationRepository::ServerInformation* tmp = 0;
-     tmp = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (length);
--    
-+
-     if (this->buffer_ != 0)
-     {
-       ImplementationRepository::ServerInformation *old = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_);
--      
-+
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp[i] = old[i];
--      
-+
-       if (this->release_)
-         _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (old);
--      
-+
-     }
-     this->buffer_ = tmp;
-   }
--  
-+
-   void
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_deallocate_buffer (void)
-   {
-     if (this->buffer_ == 0 || this->release_ == 0)
-       return;
--    
-+
-     ImplementationRepository::ServerInformation *tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_);
--    
-+
-     _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
-     this->buffer_ = 0;
--  } 
--  
-+  }
-+
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Dtor.
-   {
-     this->_deallocate_buffer ();
-   }
--  
--  
-+
-+
- #endif /* end #if !defined */
- 
- 
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- 
- #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
- #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
-@@ -1455,30 +1456,30 @@
- ImplementationRepository::ServerInformationList::ServerInformationList (void)
- {}
- ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max) // uses max size
--  : 
-+  :
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  (max)
- {}
- ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::ServerInformation *buffer, CORBA::Boolean release)
--  : 
-+  :
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  (max, length, buffer, release)
- {}
- ImplementationRepository::ServerInformationList::ServerInformationList (const ServerInformationList &seq) // copy ctor
--  : 
-+  :
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  (seq)
- {}
- ImplementationRepository::ServerInformationList::~ServerInformationList (void) // dtor
-@@ -1496,26 +1497,26 @@
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   55,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x496d706c), 
--  ACE_NTOHL (0x656d656e), 
--  ACE_NTOHL (0x74617469), 
--  ACE_NTOHL (0x6f6e5265), 
--  ACE_NTOHL (0x706f7369), 
--  ACE_NTOHL (0x746f7279), 
--  ACE_NTOHL (0x2f536572), 
--  ACE_NTOHL (0x76657249), 
--  ACE_NTOHL (0x6e666f72), 
--  ACE_NTOHL (0x6d617469), 
--  ACE_NTOHL (0x6f6e4c69), 
--  ACE_NTOHL (0x73743a31), 
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x496d706c),
-+  ACE_NTOHL (0x656d656e),
-+  ACE_NTOHL (0x74617469),
-+  ACE_NTOHL (0x6f6e5265),
-+  ACE_NTOHL (0x706f7369),
-+  ACE_NTOHL (0x746f7279),
-+  ACE_NTOHL (0x2f536572),
-+  ACE_NTOHL (0x76657249),
-+  ACE_NTOHL (0x6e666f72),
-+  ACE_NTOHL (0x6d617469),
-+  ACE_NTOHL (0x6f6e4c69),
-+  ACE_NTOHL (0x73743a31),
-   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformationList:1.0
-   22,
--  ACE_NTOHL (0x53657276), 
--  ACE_NTOHL (0x6572496e), 
--  ACE_NTOHL (0x666f726d), 
--  ACE_NTOHL (0x6174696f), 
--  ACE_NTOHL (0x6e4c6973), 
-+  ACE_NTOHL (0x53657276),
-+  ACE_NTOHL (0x6572496e),
-+  ACE_NTOHL (0x666f726d),
-+  ACE_NTOHL (0x6174696f),
-+  ACE_NTOHL (0x6e4c6973),
-   ACE_NTOHL (0x74000000),  // name = ServerInformationList
-   CORBA::tk_sequence, // typecode kind
-   828, // encapsulation length
-@@ -1524,95 +1525,95 @@
-     812, // encapsulation length
-       TAO_ENCAP_BYTE_ORDER, // byte order
-       51,
--      ACE_NTOHL (0x49444c3a), 
--      ACE_NTOHL (0x496d706c), 
--      ACE_NTOHL (0x656d656e), 
--      ACE_NTOHL (0x74617469), 
--      ACE_NTOHL (0x6f6e5265), 
--      ACE_NTOHL (0x706f7369), 
--      ACE_NTOHL (0x746f7279), 
--      ACE_NTOHL (0x2f536572), 
--      ACE_NTOHL (0x76657249), 
--      ACE_NTOHL (0x6e666f72), 
--      ACE_NTOHL (0x6d617469), 
--      ACE_NTOHL (0x6f6e3a31), 
-+      ACE_NTOHL (0x49444c3a),
-+      ACE_NTOHL (0x496d706c),
-+      ACE_NTOHL (0x656d656e),
-+      ACE_NTOHL (0x74617469),
-+      ACE_NTOHL (0x6f6e5265),
-+      ACE_NTOHL (0x706f7369),
-+      ACE_NTOHL (0x746f7279),
-+      ACE_NTOHL (0x2f536572),
-+      ACE_NTOHL (0x76657249),
-+      ACE_NTOHL (0x6e666f72),
-+      ACE_NTOHL (0x6d617469),
-+      ACE_NTOHL (0x6f6e3a31),
-       ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformation:1.0
-       18,
--      ACE_NTOHL (0x53657276), 
--      ACE_NTOHL (0x6572496e), 
--      ACE_NTOHL (0x666f726d), 
--      ACE_NTOHL (0x6174696f), 
-+      ACE_NTOHL (0x53657276),
-+      ACE_NTOHL (0x6572496e),
-+      ACE_NTOHL (0x666f726d),
-+      ACE_NTOHL (0x6174696f),
-       ACE_NTOHL (0x6e000000),  // name = ServerInformation
-       4, // member count
-       15,
--      ACE_NTOHL (0x6c6f6769), 
--      ACE_NTOHL (0x63616c5f), 
--      ACE_NTOHL (0x73657276), 
-+      ACE_NTOHL (0x6c6f6769),
-+      ACE_NTOHL (0x63616c5f),
-+      ACE_NTOHL (0x73657276),
-       ACE_NTOHL (0x65720000),  // name = logical_server
--      CORBA::tk_string, 
-+      CORBA::tk_string,
-       0U, // string length
-       7,
--      ACE_NTOHL (0x73657276), 
-+      ACE_NTOHL (0x73657276),
-       ACE_NTOHL (0x65720000),  // name = server
--      CORBA::tk_string, 
-+      CORBA::tk_string,
-       0U, // string length
-       8,
--      ACE_NTOHL (0x73746172), 
-+      ACE_NTOHL (0x73746172),
-       ACE_NTOHL (0x74757000),  // name = startup
-       CORBA::tk_struct, // typecode kind
-       560, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         48,
--        ACE_NTOHL (0x49444c3a), 
--        ACE_NTOHL (0x496d706c), 
--        ACE_NTOHL (0x656d656e), 
--        ACE_NTOHL (0x74617469), 
--        ACE_NTOHL (0x6f6e5265), 
--        ACE_NTOHL (0x706f7369), 
--        ACE_NTOHL (0x746f7279), 
--        ACE_NTOHL (0x2f537461), 
--        ACE_NTOHL (0x72747570), 
--        ACE_NTOHL (0x4f707469), 
--        ACE_NTOHL (0x6f6e733a), 
-+        ACE_NTOHL (0x49444c3a),
-+        ACE_NTOHL (0x496d706c),
-+        ACE_NTOHL (0x656d656e),
-+        ACE_NTOHL (0x74617469),
-+        ACE_NTOHL (0x6f6e5265),
-+        ACE_NTOHL (0x706f7369),
-+        ACE_NTOHL (0x746f7279),
-+        ACE_NTOHL (0x2f537461),
-+        ACE_NTOHL (0x72747570),
-+        ACE_NTOHL (0x4f707469),
-+        ACE_NTOHL (0x6f6e733a),
-         ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
-         15,
--        ACE_NTOHL (0x53746172), 
--        ACE_NTOHL (0x7475704f), 
--        ACE_NTOHL (0x7074696f), 
-+        ACE_NTOHL (0x53746172),
-+        ACE_NTOHL (0x7475704f),
-+        ACE_NTOHL (0x7074696f),
-         ACE_NTOHL (0x6e730000),  // name = StartupOptions
-         4, // member count
-         13,
--        ACE_NTOHL (0x636f6d6d), 
--        ACE_NTOHL (0x616e645f), 
--        ACE_NTOHL (0x6c696e65), 
-+        ACE_NTOHL (0x636f6d6d),
-+        ACE_NTOHL (0x616e645f),
-+        ACE_NTOHL (0x6c696e65),
-         ACE_NTOHL (0x0),  // name = command_line
--        CORBA::tk_string, 
-+        CORBA::tk_string,
-         0U, // string length
-         12,
--        ACE_NTOHL (0x656e7669), 
--        ACE_NTOHL (0x726f6e6d), 
-+        ACE_NTOHL (0x656e7669),
-+        ACE_NTOHL (0x726f6e6d),
-         ACE_NTOHL (0x656e7400),  // name = environment
-         CORBA::tk_alias, // typecode kind for typedefs
-         236, // encapsulation length
-           TAO_ENCAP_BYTE_ORDER, // byte order
-           49,
--          ACE_NTOHL (0x49444c3a), 
--          ACE_NTOHL (0x496d706c), 
--          ACE_NTOHL (0x656d656e), 
--          ACE_NTOHL (0x74617469), 
--          ACE_NTOHL (0x6f6e5265), 
--          ACE_NTOHL (0x706f7369), 
--          ACE_NTOHL (0x746f7279), 
--          ACE_NTOHL (0x2f456e76), 
--          ACE_NTOHL (0x69726f6e), 
--          ACE_NTOHL (0x6d656e74), 
--          ACE_NTOHL (0x4c697374), 
--          ACE_NTOHL (0x3a312e30), 
-+          ACE_NTOHL (0x49444c3a),
-+          ACE_NTOHL (0x496d706c),
-+          ACE_NTOHL (0x656d656e),
-+          ACE_NTOHL (0x74617469),
-+          ACE_NTOHL (0x6f6e5265),
-+          ACE_NTOHL (0x706f7369),
-+          ACE_NTOHL (0x746f7279),
-+          ACE_NTOHL (0x2f456e76),
-+          ACE_NTOHL (0x69726f6e),
-+          ACE_NTOHL (0x6d656e74),
-+          ACE_NTOHL (0x4c697374),
-+          ACE_NTOHL (0x3a312e30),
-           ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
-           16,
--          ACE_NTOHL (0x456e7669), 
--          ACE_NTOHL (0x726f6e6d), 
--          ACE_NTOHL (0x656e744c), 
-+          ACE_NTOHL (0x456e7669),
-+          ACE_NTOHL (0x726f6e6d),
-+          ACE_NTOHL (0x656e744c),
-           ACE_NTOHL (0x69737400),  // name = EnvironmentList
-           CORBA::tk_sequence, // typecode kind
-           148, // encapsulation length
-@@ -1621,114 +1622,114 @@
-             132, // encapsulation length
-               TAO_ENCAP_BYTE_ORDER, // byte order
-               53,
--              ACE_NTOHL (0x49444c3a), 
--              ACE_NTOHL (0x496d706c), 
--              ACE_NTOHL (0x656d656e), 
--              ACE_NTOHL (0x74617469), 
--              ACE_NTOHL (0x6f6e5265), 
--              ACE_NTOHL (0x706f7369), 
--              ACE_NTOHL (0x746f7279), 
--              ACE_NTOHL (0x2f456e76), 
--              ACE_NTOHL (0x69726f6e), 
--              ACE_NTOHL (0x6d656e74), 
--              ACE_NTOHL (0x56617269), 
--              ACE_NTOHL (0x61626c65), 
--              ACE_NTOHL (0x3a312e30), 
-+              ACE_NTOHL (0x49444c3a),
-+              ACE_NTOHL (0x496d706c),
-+              ACE_NTOHL (0x656d656e),
-+              ACE_NTOHL (0x74617469),
-+              ACE_NTOHL (0x6f6e5265),
-+              ACE_NTOHL (0x706f7369),
-+              ACE_NTOHL (0x746f7279),
-+              ACE_NTOHL (0x2f456e76),
-+              ACE_NTOHL (0x69726f6e),
-+              ACE_NTOHL (0x6d656e74),
-+              ACE_NTOHL (0x56617269),
-+              ACE_NTOHL (0x61626c65),
-+              ACE_NTOHL (0x3a312e30),
-               ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
-               20,
--              ACE_NTOHL (0x456e7669), 
--              ACE_NTOHL (0x726f6e6d), 
--              ACE_NTOHL (0x656e7456), 
--              ACE_NTOHL (0x61726961), 
-+              ACE_NTOHL (0x456e7669),
-+              ACE_NTOHL (0x726f6e6d),
-+              ACE_NTOHL (0x656e7456),
-+              ACE_NTOHL (0x61726961),
-               ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
-               2, // member count
-               5,
--              ACE_NTOHL (0x6e616d65), 
-+              ACE_NTOHL (0x6e616d65),
-               ACE_NTOHL (0x0),  // name = name
--              CORBA::tk_string, 
-+              CORBA::tk_string,
-               0U, // string length
-               6,
--              ACE_NTOHL (0x76616c75), 
-+              ACE_NTOHL (0x76616c75),
-               ACE_NTOHL (0x65000000),  // name = value
--              CORBA::tk_string, 
-+              CORBA::tk_string,
-               0U, // string length
- 
-             0U,
- 
- 
-         18,
--        ACE_NTOHL (0x776f726b), 
--        ACE_NTOHL (0x696e675f), 
--        ACE_NTOHL (0x64697265), 
--        ACE_NTOHL (0x63746f72), 
-+        ACE_NTOHL (0x776f726b),
-+        ACE_NTOHL (0x696e675f),
-+        ACE_NTOHL (0x64697265),
-+        ACE_NTOHL (0x63746f72),
-         ACE_NTOHL (0x79000000),  // name = working_directory
--        CORBA::tk_string, 
-+        CORBA::tk_string,
-         0U, // string length
-         11,
--        ACE_NTOHL (0x61637469), 
--        ACE_NTOHL (0x76617469), 
-+        ACE_NTOHL (0x61637469),
-+        ACE_NTOHL (0x76617469),
-         ACE_NTOHL (0x6f6e0000),  // name = activation
-         CORBA::tk_enum, // typecode kind
-         136, // encapsulation length
-           TAO_ENCAP_BYTE_ORDER, // byte order
-           48,
--          ACE_NTOHL (0x49444c3a), 
--          ACE_NTOHL (0x496d706c), 
--          ACE_NTOHL (0x656d656e), 
--          ACE_NTOHL (0x74617469), 
--          ACE_NTOHL (0x6f6e5265), 
--          ACE_NTOHL (0x706f7369), 
--          ACE_NTOHL (0x746f7279), 
--          ACE_NTOHL (0x2f416374), 
--          ACE_NTOHL (0x69766174), 
--          ACE_NTOHL (0x696f6e4d), 
--          ACE_NTOHL (0x6f64653a), 
-+          ACE_NTOHL (0x49444c3a),
-+          ACE_NTOHL (0x496d706c),
-+          ACE_NTOHL (0x656d656e),
-+          ACE_NTOHL (0x74617469),
-+          ACE_NTOHL (0x6f6e5265),
-+          ACE_NTOHL (0x706f7369),
-+          ACE_NTOHL (0x746f7279),
-+          ACE_NTOHL (0x2f416374),
-+          ACE_NTOHL (0x69766174),
-+          ACE_NTOHL (0x696f6e4d),
-+          ACE_NTOHL (0x6f64653a),
-           ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
-           15,
--          ACE_NTOHL (0x41637469), 
--          ACE_NTOHL (0x76617469), 
--          ACE_NTOHL (0x6f6e4d6f), 
-+          ACE_NTOHL (0x41637469),
-+          ACE_NTOHL (0x76617469),
-+          ACE_NTOHL (0x6f6e4d6f),
-           ACE_NTOHL (0x64650000),  // name = ActivationMode
-           4, // member count
-           7,
--          ACE_NTOHL (0x4e4f524d), 
-+          ACE_NTOHL (0x4e4f524d),
-           ACE_NTOHL (0x414c0000),  // name = NORMAL
-           7,
--          ACE_NTOHL (0x4d414e55), 
-+          ACE_NTOHL (0x4d414e55),
-           ACE_NTOHL (0x414c0000),  // name = MANUAL
-           11,
--          ACE_NTOHL (0x5045525f), 
--          ACE_NTOHL (0x434c4945), 
-+          ACE_NTOHL (0x5045525f),
-+          ACE_NTOHL (0x434c4945),
-           ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
-           11,
--          ACE_NTOHL (0x4155544f), 
--          ACE_NTOHL (0x5f535441), 
-+          ACE_NTOHL (0x4155544f),
-+          ACE_NTOHL (0x5f535441),
-           ACE_NTOHL (0x52540000),  // name = AUTO_START
- 
- 
-       9,
--      ACE_NTOHL (0x6c6f6361), 
--      ACE_NTOHL (0x74696f6e), 
-+      ACE_NTOHL (0x6c6f6361),
-+      ACE_NTOHL (0x74696f6e),
-       ACE_NTOHL (0x0),  // name = location
-       CORBA::tk_alias, // typecode kind for typedefs
-       72, // encapsulation length
-         TAO_ENCAP_BYTE_ORDER, // byte order
-         41,
--        ACE_NTOHL (0x49444c3a), 
--        ACE_NTOHL (0x496d706c), 
--        ACE_NTOHL (0x656d656e), 
--        ACE_NTOHL (0x74617469), 
--        ACE_NTOHL (0x6f6e5265), 
--        ACE_NTOHL (0x706f7369), 
--        ACE_NTOHL (0x746f7279), 
--        ACE_NTOHL (0x2f416464), 
--        ACE_NTOHL (0x72657373), 
--        ACE_NTOHL (0x3a312e30), 
-+        ACE_NTOHL (0x49444c3a),
-+        ACE_NTOHL (0x496d706c),
-+        ACE_NTOHL (0x656d656e),
-+        ACE_NTOHL (0x74617469),
-+        ACE_NTOHL (0x6f6e5265),
-+        ACE_NTOHL (0x706f7369),
-+        ACE_NTOHL (0x746f7279),
-+        ACE_NTOHL (0x2f416464),
-+        ACE_NTOHL (0x72657373),
-+        ACE_NTOHL (0x3a312e30),
-         ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
-         8,
--        ACE_NTOHL (0x41646472), 
-+        ACE_NTOHL (0x41646472),
-         ACE_NTOHL (0x65737300),  // name = Address
--        CORBA::tk_string, 
-+        CORBA::tk_string,
-         0U, // string length
- 
- 
-@@ -1751,7 +1752,7 @@
- 
- 
- ///////////////////////////////////////////////////////////////////////
--//                Base & Remote Proxy  Implementation. 
-+//                Base & Remote Proxy  Implementation.
- //
- 
- ImplementationRepository::_TAO_Administration_Proxy_Impl::_TAO_Administration_Proxy_Impl (void)
-@@ -1773,21 +1774,21 @@
-     ImplementationRepository::Administration::CannotActivate
-   ))
- {
--  
--  static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = 
-+
-+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] =
-   {
-     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc},
-     {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc}
-   };
- 
- 
--  
--  
-+
-+
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-+
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "activate_server",
-@@ -1800,13 +1801,13 @@
-   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-       istub->orb_core ()->client_request_interceptors ()
-     );
--  
-+
- #endif  /* TAO_HAS_INTERCEPTORS */
--  
-+
-   for (;;)
-     {
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
--      
-+
- #if TAO_HAS_INTERCEPTORS == 1
-       ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server ri (
-         &_tao_call,
-@@ -1815,17 +1816,17 @@
-         ACE_TRY_ENV
-       );
-       ACE_CHECK;
--      
-+
-       ACE_TRY
-         {
- #endif /* TAO_HAS_INTERCEPTORS */
--        
-+
-           _tao_call.start (ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-           TAO_INTERCEPTOR (ri.response_expected (1));
--          
-+
-           TAO_INTERCEPTOR (
-             _tao_vfr.send_request (
-               &ri,
-@@ -1833,13 +1834,13 @@
-             )
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           _tao_call.prepare_header (
-               ACE_static_cast (CORBA::Octet, _tao_response_flag),
-               ACE_TRY_ENV
-             );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-           if (!(
-                             (_tao_out << server)
-@@ -1847,20 +1848,20 @@
-             TAO_INTERCEPTOR_THROW (
-               CORBA::MARSHAL ()
-             );
--            
-+
-           _invoke_status =
-             _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2, ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           if (_invoke_status == TAO_INVOKE_EXCEPTION)
-             {
-               TAO_INTERCEPTOR_THROW (
-                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-               );
--              
-+
-             }
--          
--          
-+
-+
-           TAO_INTERCEPTOR (
-             ri.reply_status (_invoke_status);
-             if (_invoke_status == TAO_INVOKE_OK)
-@@ -1877,10 +1878,10 @@
-                   ACE_TRY_ENV
-                 );
-               }
--            
-+
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
- #if TAO_HAS_INTERCEPTORS == 1
-         }
-       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-@@ -1888,8 +1889,8 @@
-           _invoke_status =
-             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-           ACE_TRY_CHECK;
--          
--          ri.forward_reference (exc); 
-+
-+          ri.forward_reference (exc);
-           _tao_vfr.receive_other (
-             &ri,
-             ACE_TRY_ENV
-@@ -1908,7 +1909,7 @@
-         }
-       ACE_ENDTRY;
-       ACE_CHECK;
--      
-+
- #endif /* TAO_HAS_INTERCEPTORS */
- 
-       if (_invoke_status == TAO_INVOKE_RESTART)
-@@ -1916,10 +1917,10 @@
-           _tao_call.restart_flag (1);
-           continue;
-         }
--      
-+
-       break;
-     }
--  
-+
- }
- 
- void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_server (
-@@ -1933,20 +1934,20 @@
-     ImplementationRepository::Administration::AlreadyRegistered
-   ))
- {
--  
--  static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = 
-+
-+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] =
-   {
-     {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc}
-   };
- 
- 
--  
--  
-+
-+
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-+
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "register_server",
-@@ -1959,13 +1960,13 @@
-   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-       istub->orb_core ()->client_request_interceptors ()
-     );
--  
-+
- #endif  /* TAO_HAS_INTERCEPTORS */
--  
-+
-   for (;;)
-     {
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
--      
-+
- #if TAO_HAS_INTERCEPTORS == 1
-       ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server ri (
-         &_tao_call,
-@@ -1975,17 +1976,17 @@
-         ACE_TRY_ENV
-       );
-       ACE_CHECK;
--      
-+
-       ACE_TRY
-         {
- #endif /* TAO_HAS_INTERCEPTORS */
--        
-+
-           _tao_call.start (ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-           TAO_INTERCEPTOR (ri.response_expected (1));
--          
-+
-           TAO_INTERCEPTOR (
-             _tao_vfr.send_request (
-               &ri,
-@@ -1993,13 +1994,13 @@
-             )
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           _tao_call.prepare_header (
-               ACE_static_cast (CORBA::Octet, _tao_response_flag),
-               ACE_TRY_ENV
-             );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-           if (!(
-                             (_tao_out << server) &&
-@@ -2008,20 +2009,20 @@
-             TAO_INTERCEPTOR_THROW (
-               CORBA::MARSHAL ()
-             );
--            
-+
-           _invoke_status =
-             _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1, ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           if (_invoke_status == TAO_INVOKE_EXCEPTION)
-             {
-               TAO_INTERCEPTOR_THROW (
-                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-               );
--              
-+
-             }
--          
--          
-+
-+
-           TAO_INTERCEPTOR (
-             ri.reply_status (_invoke_status);
-             if (_invoke_status == TAO_INVOKE_OK)
-@@ -2038,10 +2039,10 @@
-                   ACE_TRY_ENV
-                 );
-               }
--            
-+
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
- #if TAO_HAS_INTERCEPTORS == 1
-         }
-       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-@@ -2049,8 +2050,8 @@
-           _invoke_status =
-             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-           ACE_TRY_CHECK;
--          
--          ri.forward_reference (exc); 
-+
-+          ri.forward_reference (exc);
-           _tao_vfr.receive_other (
-             &ri,
-             ACE_TRY_ENV
-@@ -2069,7 +2070,7 @@
-         }
-       ACE_ENDTRY;
-       ACE_CHECK;
--      
-+
- #endif /* TAO_HAS_INTERCEPTORS */
- 
-       if (_invoke_status == TAO_INVOKE_RESTART)
-@@ -2077,10 +2078,10 @@
-           _tao_call.restart_flag (1);
-           continue;
-         }
--      
-+
-       break;
-     }
--  
-+
- }
- 
- void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister_server (
-@@ -2093,15 +2094,15 @@
-     CORBA::SystemException
-   ))
- {
--  
- 
--  
--  
-+
-+
-+
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-+
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "reregister_server",
-@@ -2114,13 +2115,13 @@
-   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-       istub->orb_core ()->client_request_interceptors ()
-     );
--  
-+
- #endif  /* TAO_HAS_INTERCEPTORS */
--  
-+
-   for (;;)
-     {
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
--      
-+
- #if TAO_HAS_INTERCEPTORS == 1
-       ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server ri (
-         &_tao_call,
-@@ -2130,17 +2131,17 @@
-         ACE_TRY_ENV
-       );
-       ACE_CHECK;
--      
-+
-       ACE_TRY
-         {
- #endif /* TAO_HAS_INTERCEPTORS */
--        
-+
-           _tao_call.start (ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-           TAO_INTERCEPTOR (ri.response_expected (1));
--          
-+
-           TAO_INTERCEPTOR (
-             _tao_vfr.send_request (
-               &ri,
-@@ -2148,13 +2149,13 @@
-             )
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           _tao_call.prepare_header (
-               ACE_static_cast (CORBA::Octet, _tao_response_flag),
-               ACE_TRY_ENV
-             );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-           if (!(
-                             (_tao_out << server) &&
-@@ -2163,20 +2164,20 @@
-             TAO_INTERCEPTOR_THROW (
-               CORBA::MARSHAL ()
-             );
--            
-+
-           _invoke_status =
-             _tao_call.invoke (0, 0, ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           if (_invoke_status == TAO_INVOKE_EXCEPTION)
-             {
-               TAO_INTERCEPTOR_THROW (
-                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-               );
--              
-+
-             }
--          
--          
-+
-+
-           TAO_INTERCEPTOR (
-             ri.reply_status (_invoke_status);
-             if (_invoke_status == TAO_INVOKE_OK)
-@@ -2193,10 +2194,10 @@
-                   ACE_TRY_ENV
-                 );
-               }
--            
-+
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
- #if TAO_HAS_INTERCEPTORS == 1
-         }
-       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-@@ -2204,8 +2205,8 @@
-           _invoke_status =
-             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-           ACE_TRY_CHECK;
--          
--          ri.forward_reference (exc); 
-+
-+          ri.forward_reference (exc);
-           _tao_vfr.receive_other (
-             &ri,
-             ACE_TRY_ENV
-@@ -2224,7 +2225,7 @@
-         }
-       ACE_ENDTRY;
-       ACE_CHECK;
--      
-+
- #endif /* TAO_HAS_INTERCEPTORS */
- 
-       if (_invoke_status == TAO_INVOKE_RESTART)
-@@ -2232,10 +2233,10 @@
-           _tao_call.restart_flag (1);
-           continue;
-         }
--      
-+
-       break;
-     }
--  
-+
- }
- 
- void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_server (
-@@ -2248,20 +2249,20 @@
-     ImplementationRepository::Administration::NotFound
-   ))
- {
--  
--  static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = 
-+
-+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] =
-   {
-     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-   };
- 
- 
--  
--  
-+
-+
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-+
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "remove_server",
-@@ -2274,13 +2275,13 @@
-   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-       istub->orb_core ()->client_request_interceptors ()
-     );
--  
-+
- #endif  /* TAO_HAS_INTERCEPTORS */
--  
-+
-   for (;;)
-     {
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
--      
-+
- #if TAO_HAS_INTERCEPTORS == 1
-       ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server ri (
-         &_tao_call,
-@@ -2289,17 +2290,17 @@
-         ACE_TRY_ENV
-       );
-       ACE_CHECK;
--      
-+
-       ACE_TRY
-         {
- #endif /* TAO_HAS_INTERCEPTORS */
--        
-+
-           _tao_call.start (ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-           TAO_INTERCEPTOR (ri.response_expected (1));
--          
-+
-           TAO_INTERCEPTOR (
-             _tao_vfr.send_request (
-               &ri,
-@@ -2307,13 +2308,13 @@
-             )
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           _tao_call.prepare_header (
-               ACE_static_cast (CORBA::Octet, _tao_response_flag),
-               ACE_TRY_ENV
-             );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-           if (!(
-                             (_tao_out << server)
-@@ -2321,20 +2322,20 @@
-             TAO_INTERCEPTOR_THROW (
-               CORBA::MARSHAL ()
-             );
--            
-+
-           _invoke_status =
-             _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1, ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           if (_invoke_status == TAO_INVOKE_EXCEPTION)
-             {
-               TAO_INTERCEPTOR_THROW (
-                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-               );
--              
-+
-             }
--          
--          
-+
-+
-           TAO_INTERCEPTOR (
-             ri.reply_status (_invoke_status);
-             if (_invoke_status == TAO_INVOKE_OK)
-@@ -2351,10 +2352,10 @@
-                   ACE_TRY_ENV
-                 );
-               }
--            
-+
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
- #if TAO_HAS_INTERCEPTORS == 1
-         }
-       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-@@ -2362,8 +2363,8 @@
-           _invoke_status =
-             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-           ACE_TRY_CHECK;
--          
--          ri.forward_reference (exc); 
-+
-+          ri.forward_reference (exc);
-           _tao_vfr.receive_other (
-             &ri,
-             ACE_TRY_ENV
-@@ -2382,7 +2383,7 @@
-         }
-       ACE_ENDTRY;
-       ACE_CHECK;
--      
-+
- #endif /* TAO_HAS_INTERCEPTORS */
- 
-       if (_invoke_status == TAO_INVOKE_RESTART)
-@@ -2390,10 +2391,10 @@
-           _tao_call.restart_flag (1);
-           continue;
-         }
--      
-+
-       break;
-     }
--  
-+
+ #endif  /* TAO_HAS_INTERCEPTORS == 1 */
+@@ -158,7 +158,6 @@
+     ACE_static_cast (ServerObject **, src);
+   return *tmp;
  }
- 
- void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_server (
-@@ -2406,20 +2407,20 @@
-     ImplementationRepository::Administration::NotFound
-   ))
- {
--  
--  static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = 
-+
-+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] =
-   {
-     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-   };
- 
- 
--  
--  
-+
-+
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-+
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "shutdown_server",
-@@ -2432,13 +2433,13 @@
-   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-       istub->orb_core ()->client_request_interceptors ()
-     );
--  
-+
- #endif  /* TAO_HAS_INTERCEPTORS */
--  
-+
-   for (;;)
-     {
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
--      
-+
- #if TAO_HAS_INTERCEPTORS == 1
-       ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server ri (
-         &_tao_call,
-@@ -2447,17 +2448,17 @@
-         ACE_TRY_ENV
-       );
-       ACE_CHECK;
--      
-+
-       ACE_TRY
-         {
- #endif /* TAO_HAS_INTERCEPTORS */
--        
-+
-           _tao_call.start (ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-           TAO_INTERCEPTOR (ri.response_expected (1));
--          
-+
-           TAO_INTERCEPTOR (
-             _tao_vfr.send_request (
-               &ri,
-@@ -2465,13 +2466,13 @@
-             )
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           _tao_call.prepare_header (
-               ACE_static_cast (CORBA::Octet, _tao_response_flag),
-               ACE_TRY_ENV
-             );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-           if (!(
-                             (_tao_out << server)
-@@ -2479,20 +2480,20 @@
-             TAO_INTERCEPTOR_THROW (
-               CORBA::MARSHAL ()
-             );
--            
-+
-           _invoke_status =
-             _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1, ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           if (_invoke_status == TAO_INVOKE_EXCEPTION)
-             {
-               TAO_INTERCEPTOR_THROW (
-                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-               );
--              
-+
-             }
--          
--          
-+
-+
-           TAO_INTERCEPTOR (
-             ri.reply_status (_invoke_status);
-             if (_invoke_status == TAO_INVOKE_OK)
-@@ -2509,10 +2510,10 @@
-                   ACE_TRY_ENV
-                 );
-               }
--            
-+
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
- #if TAO_HAS_INTERCEPTORS == 1
-         }
-       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-@@ -2520,8 +2521,8 @@
-           _invoke_status =
-             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-           ACE_TRY_CHECK;
--          
--          ri.forward_reference (exc); 
-+
-+          ri.forward_reference (exc);
-           _tao_vfr.receive_other (
-             &ri,
-             ACE_TRY_ENV
-@@ -2540,7 +2541,7 @@
-         }
-       ACE_ENDTRY;
-       ACE_CHECK;
--      
-+
- #endif /* TAO_HAS_INTERCEPTORS */
- 
-       if (_invoke_status == TAO_INVOKE_RESTART)
-@@ -2548,10 +2549,10 @@
-           _tao_call.restart_flag (1);
-           continue;
-         }
--      
-+
-       break;
-     }
--  
-+
- }
- 
- char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_running (
-@@ -2566,20 +2567,20 @@
-     ImplementationRepository::Administration::NotFound
-   ))
- {
--  
--  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = 
-+
-+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] =
-   {
-     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-   };
- 
-   CORBA::String_var _tao_safe_retval;
--  
--  
-+
-+
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- 
--  
-+
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "server_is_running",
-@@ -2592,13 +2593,13 @@
-   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-       istub->orb_core ()->client_request_interceptors ()
-     );
--  
-+
- #endif  /* TAO_HAS_INTERCEPTORS */
--  
-+
-   for (;;)
-     {
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
--      
-+
- #if TAO_HAS_INTERCEPTORS == 1
-       ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running ri (
-         &_tao_call,
-@@ -2609,17 +2610,17 @@
-         ACE_TRY_ENV
-       );
-       ACE_CHECK_RETURN (0);
--      
-+
-       ACE_TRY
-         {
- #endif /* TAO_HAS_INTERCEPTORS */
--        
-+
-           _tao_call.start (ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK_RETURN (0);
--          
-+
-           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-           TAO_INTERCEPTOR (ri.response_expected (1));
--          
-+
-           TAO_INTERCEPTOR (
-             _tao_vfr.send_request (
-               &ri,
-@@ -2627,13 +2628,13 @@
-             )
-           );
-           TAO_INTERCEPTOR_CHECK_RETURN (0);
--          
-+
-           _tao_call.prepare_header (
-               ACE_static_cast (CORBA::Octet, _tao_response_flag),
-               ACE_TRY_ENV
-             );
-           TAO_INTERCEPTOR_CHECK_RETURN (0);
--          
-+
-           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-           if (!(
-                             (_tao_out << server) &&
-@@ -2644,20 +2645,20 @@
-               CORBA::MARSHAL (),
-               0
-             );
--            
-+
-           _invoke_status =
-             _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1, ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK_RETURN (0);
--          
-+
-           if (_invoke_status == TAO_INVOKE_EXCEPTION)
-             {
-               TAO_INTERCEPTOR_THROW_RETURN (
-                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                 0
-               );
--              
-+
-             }
--          
-+
-           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-           if (!(
-                             (_tao_in >> _tao_safe_retval.inout ())
-@@ -2667,15 +2668,15 @@
-                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                 0
-               );
--              
-+
-             }
--          
-+
-           TAO_INTERCEPTOR (
-               char * _tao_retval_info = _tao_safe_retval._retn ();
-               ri.result (_tao_retval_info);
-               _tao_safe_retval = _tao_retval_info;
-             );
--          
-+
-           TAO_INTERCEPTOR (
-             ri.reply_status (_invoke_status);
-             if (_invoke_status == TAO_INVOKE_OK)
-@@ -2692,10 +2693,10 @@
-                   ACE_TRY_ENV
-                 );
-               }
--            
-+
-           );
-           TAO_INTERCEPTOR_CHECK_RETURN (0);
--          
-+
- #if TAO_HAS_INTERCEPTORS == 1
-         }
-       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-@@ -2703,8 +2704,8 @@
-           _invoke_status =
-             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-           ACE_TRY_CHECK;
--          
--          ri.forward_reference (exc); 
-+
-+          ri.forward_reference (exc);
-           _tao_vfr.receive_other (
-             &ri,
-             ACE_TRY_ENV
-@@ -2723,7 +2724,7 @@
-         }
-       ACE_ENDTRY;
-       ACE_CHECK_RETURN (0);
--      
-+
- #endif /* TAO_HAS_INTERCEPTORS */
- 
-       if (_invoke_status == TAO_INVOKE_RESTART)
-@@ -2731,7 +2732,7 @@
-           _tao_call.restart_flag (1);
-           continue;
-         }
--      
-+
-       break;
-     }
-   return _tao_safe_retval._retn ();
-@@ -2747,20 +2748,20 @@
-     ImplementationRepository::Administration::NotFound
-   ))
- {
--  
--  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = 
-+
-+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] =
-   {
-     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-   };
- 
- 
--  
--  
-+
-+
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-+
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "server_is_shutting_down",
-@@ -2773,13 +2774,13 @@
-   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-       istub->orb_core ()->client_request_interceptors ()
-     );
--  
-+
- #endif  /* TAO_HAS_INTERCEPTORS */
--  
-+
-   for (;;)
-     {
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
--      
-+
- #if TAO_HAS_INTERCEPTORS == 1
-       ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down ri (
-         &_tao_call,
-@@ -2788,17 +2789,17 @@
-         ACE_TRY_ENV
-       );
-       ACE_CHECK;
--      
-+
-       ACE_TRY
-         {
- #endif /* TAO_HAS_INTERCEPTORS */
--        
-+
-           _tao_call.start (ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-           TAO_INTERCEPTOR (ri.response_expected (1));
--          
-+
-           TAO_INTERCEPTOR (
-             _tao_vfr.send_request (
-               &ri,
-@@ -2806,13 +2807,13 @@
-             )
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           _tao_call.prepare_header (
-               ACE_static_cast (CORBA::Octet, _tao_response_flag),
-               ACE_TRY_ENV
-             );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-           if (!(
-                             (_tao_out << server)
-@@ -2820,20 +2821,20 @@
-             TAO_INTERCEPTOR_THROW (
-               CORBA::MARSHAL ()
-             );
--            
-+
-           _invoke_status =
-             _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1, ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           if (_invoke_status == TAO_INVOKE_EXCEPTION)
-             {
-               TAO_INTERCEPTOR_THROW (
-                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-               );
--              
-+
-             }
--          
--          
-+
-+
-           TAO_INTERCEPTOR (
-             ri.reply_status (_invoke_status);
-             if (_invoke_status == TAO_INVOKE_OK)
-@@ -2850,10 +2851,10 @@
-                   ACE_TRY_ENV
-                 );
-               }
--            
-+
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
- #if TAO_HAS_INTERCEPTORS == 1
-         }
-       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-@@ -2861,8 +2862,8 @@
-           _invoke_status =
-             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-           ACE_TRY_CHECK;
--          
--          ri.forward_reference (exc); 
-+
-+          ri.forward_reference (exc);
-           _tao_vfr.receive_other (
-             &ri,
-             ACE_TRY_ENV
-@@ -2881,7 +2882,7 @@
-         }
-       ACE_ENDTRY;
-       ACE_CHECK;
--      
-+
- #endif /* TAO_HAS_INTERCEPTORS */
- 
-       if (_invoke_status == TAO_INVOKE_RESTART)
-@@ -2889,10 +2890,10 @@
-           _tao_call.restart_flag (1);
-           continue;
-         }
--      
-+
-       break;
-     }
--  
-+
- }
- 
- void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
-@@ -2906,20 +2907,20 @@
-     ImplementationRepository::Administration::NotFound
-   ))
- {
--  
--  static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] = 
-+
-+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] =
-   {
-     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-   };
- 
- 
--  
--  
-+
-+
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-+
-   ACE_NEW (info.ptr (), ImplementationRepository::ServerInformation);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-@@ -2933,13 +2934,13 @@
-   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-       istub->orb_core ()->client_request_interceptors ()
-     );
--  
-+
- #endif  /* TAO_HAS_INTERCEPTORS */
--  
-+
-   for (;;)
-     {
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
--      
-+
- #if TAO_HAS_INTERCEPTORS == 1
-       ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_find ri (
-         &_tao_call,
-@@ -2948,17 +2949,17 @@
-         ACE_TRY_ENV
-       );
-       ACE_CHECK;
--      
-+
-       ACE_TRY
-         {
- #endif /* TAO_HAS_INTERCEPTORS */
--        
-+
-           _tao_call.start (ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-           TAO_INTERCEPTOR (ri.response_expected (1));
--          
-+
-           TAO_INTERCEPTOR (
-             _tao_vfr.send_request (
-               &ri,
-@@ -2966,33 +2967,33 @@
-             )
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           _tao_call.prepare_header (
-               ACE_static_cast (CORBA::Octet, _tao_response_flag),
-               ACE_TRY_ENV
-             );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-           if (!(
--                            (_tao_out << server)              
-+                            (_tao_out << server)
-             ))
-             TAO_INTERCEPTOR_THROW (
-               CORBA::MARSHAL ()
-             );
--            
-+
-           _invoke_status =
-             _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1, ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           if (_invoke_status == TAO_INVOKE_EXCEPTION)
-             {
-               TAO_INTERCEPTOR_THROW (
-                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-               );
--              
-+
-             }
--          
-+
-           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-           if (!(
-                                           (_tao_in >> *info.ptr ())
-@@ -3001,9 +3002,9 @@
-               TAO_INTERCEPTOR_THROW (
-                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-               );
--              
-+
-             }
--          
-+
-           TAO_INTERCEPTOR (
-             ri.reply_status (_invoke_status);
-             if (_invoke_status == TAO_INVOKE_OK)
-@@ -3020,10 +3021,10 @@
-                   ACE_TRY_ENV
-                 );
-               }
--            
-+
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
- #if TAO_HAS_INTERCEPTORS == 1
-         }
-       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-@@ -3031,8 +3032,8 @@
-           _invoke_status =
-             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-           ACE_TRY_CHECK;
--          
--          ri.forward_reference (exc); 
-+
-+          ri.forward_reference (exc);
-           _tao_vfr.receive_other (
-             &ri,
-             ACE_TRY_ENV
-@@ -3051,7 +3052,7 @@
-         }
-       ACE_ENDTRY;
-       ACE_CHECK;
--      
-+
- #endif /* TAO_HAS_INTERCEPTORS */
- 
-       if (_invoke_status == TAO_INVOKE_RESTART)
-@@ -3059,10 +3060,10 @@
-           _tao_call.restart_flag (1);
-           continue;
-         }
--      
-+
-       break;
-     }
--  
-+
- }
- 
- void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
-@@ -3076,15 +3077,15 @@
-     CORBA::SystemException
-   ))
- {
--  
- 
--  
--  
-+
-+
-+
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-+
-   ACE_NEW (server_list.ptr (), ImplementationRepository::ServerInformationList);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-@@ -3098,33 +3099,33 @@
-   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-       istub->orb_core ()->client_request_interceptors ()
-     );
--  
-+
- #endif  /* TAO_HAS_INTERCEPTORS */
--  
-+
-   for (;;)
-     {
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
--      
-+
- #if TAO_HAS_INTERCEPTORS == 1
-       ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_list ri (
-         &_tao_call,
-         _collocated_tao_target_,
--        how_many        
-+        how_many
- ,
-         ACE_TRY_ENV
-       );
-       ACE_CHECK;
--      
-+
-       ACE_TRY
-         {
- #endif /* TAO_HAS_INTERCEPTORS */
--        
-+
-           _tao_call.start (ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-           TAO_INTERCEPTOR (ri.response_expected (1));
--          
-+
-           TAO_INTERCEPTOR (
-             _tao_vfr.send_request (
-               &ri,
-@@ -3132,33 +3133,33 @@
-             )
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           _tao_call.prepare_header (
-               ACE_static_cast (CORBA::Octet, _tao_response_flag),
-               ACE_TRY_ENV
-             );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-           if (!(
--                            (_tao_out << how_many)                            
-+                            (_tao_out << how_many)
-             ))
-             TAO_INTERCEPTOR_THROW (
-               CORBA::MARSHAL ()
-             );
--            
-+
-           _invoke_status =
-             _tao_call.invoke (0, 0, ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           if (_invoke_status == TAO_INVOKE_EXCEPTION)
-             {
-               TAO_INTERCEPTOR_THROW (
-                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-               );
--              
-+
-             }
--          
-+
-           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-           if (!(
-                                           (_tao_in >> *server_list.ptr ()) &&
-@@ -3168,9 +3169,9 @@
-               TAO_INTERCEPTOR_THROW (
-                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-               );
--              
-+
-             }
--          
-+
-           TAO_INTERCEPTOR (
-             ri.reply_status (_invoke_status);
-             if (_invoke_status == TAO_INVOKE_OK)
-@@ -3187,10 +3188,10 @@
-                   ACE_TRY_ENV
-                 );
-               }
--            
-+
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
- #if TAO_HAS_INTERCEPTORS == 1
-         }
-       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-@@ -3198,8 +3199,8 @@
-           _invoke_status =
-             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-           ACE_TRY_CHECK;
--          
--          ri.forward_reference (exc); 
-+
-+          ri.forward_reference (exc);
-           _tao_vfr.receive_other (
-             &ri,
-             ACE_TRY_ENV
-@@ -3218,7 +3219,7 @@
-         }
-       ACE_ENDTRY;
-       ACE_CHECK;
--      
-+
- #endif /* TAO_HAS_INTERCEPTORS */
- 
-       if (_invoke_status == TAO_INVOKE_RESTART)
-@@ -3226,15 +3227,15 @@
-           _tao_call.restart_flag (1);
-           continue;
-         }
--      
-+
-       break;
-     }
--  
-+
- }
- 
- 
- //
--//            End  Base & Remote  Proxy Implemeentation. 
-+//            End  Base & Remote  Proxy Implemeentation.
- ///////////////////////////////////////////////////////////////////////
- 
- 
-@@ -3355,14 +3356,14 @@
-             stub,
-             1,
-             obj->_servant ()),
--            
-+
-           Administration::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
-         ACE_NEW_RETURN (default_proxy, ::ImplementationRepository::Administration (stub, 0, obj->_servant ()), Administration::_nil ());
-         return default_proxy;
-       }
--    else 
-+    else
-       return
-         ACE_reinterpret_cast
-           (
-@@ -3406,7 +3407,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -3476,7 +3477,7 @@
-     {
-       return;
-     }
--  
-+
-   ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -3489,7 +3490,7 @@
-     {
-       return;
-     }
--  
-+
-   ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -3505,28 +3506,28 @@
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   66,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x496d706c), 
--  ACE_NTOHL (0x656d656e), 
--  ACE_NTOHL (0x74617469), 
--  ACE_NTOHL (0x6f6e5265), 
--  ACE_NTOHL (0x706f7369), 
--  ACE_NTOHL (0x746f7279), 
--  ACE_NTOHL (0x2f41646d), 
--  ACE_NTOHL (0x696e6973), 
--  ACE_NTOHL (0x74726174), 
--  ACE_NTOHL (0x696f6e2f), 
--  ACE_NTOHL (0x416c7265), 
--  ACE_NTOHL (0x61647952), 
--  ACE_NTOHL (0x65676973), 
--  ACE_NTOHL (0x74657265), 
--  ACE_NTOHL (0x643a312e), 
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x496d706c),
-+  ACE_NTOHL (0x656d656e),
-+  ACE_NTOHL (0x74617469),
-+  ACE_NTOHL (0x6f6e5265),
-+  ACE_NTOHL (0x706f7369),
-+  ACE_NTOHL (0x746f7279),
-+  ACE_NTOHL (0x2f41646d),
-+  ACE_NTOHL (0x696e6973),
-+  ACE_NTOHL (0x74726174),
-+  ACE_NTOHL (0x696f6e2f),
-+  ACE_NTOHL (0x416c7265),
-+  ACE_NTOHL (0x61647952),
-+  ACE_NTOHL (0x65676973),
-+  ACE_NTOHL (0x74657265),
-+  ACE_NTOHL (0x643a312e),
-   ACE_NTOHL (0x30000000),  // repository ID = IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0
-   18,
--  ACE_NTOHL (0x416c7265), 
--  ACE_NTOHL (0x61647952), 
--  ACE_NTOHL (0x65676973), 
--  ACE_NTOHL (0x74657265), 
-+  ACE_NTOHL (0x416c7265),
-+  ACE_NTOHL (0x61647952),
-+  ACE_NTOHL (0x65676973),
-+  ACE_NTOHL (0x74657265),
-   ACE_NTOHL (0x64000000),  // name = AlreadyRegistered
-   0, // member count
- };
-@@ -3610,7 +3611,7 @@
-     {
-       return;
-     }
--  
-+
-   ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -3623,7 +3624,7 @@
-     {
-       return;
-     }
--  
-+
-   ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -3647,32 +3648,32 @@
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   63,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x496d706c), 
--  ACE_NTOHL (0x656d656e), 
--  ACE_NTOHL (0x74617469), 
--  ACE_NTOHL (0x6f6e5265), 
--  ACE_NTOHL (0x706f7369), 
--  ACE_NTOHL (0x746f7279), 
--  ACE_NTOHL (0x2f41646d), 
--  ACE_NTOHL (0x696e6973), 
--  ACE_NTOHL (0x74726174), 
--  ACE_NTOHL (0x696f6e2f), 
--  ACE_NTOHL (0x43616e6e), 
--  ACE_NTOHL (0x6f744163), 
--  ACE_NTOHL (0x74697661), 
--  ACE_NTOHL (0x74653a31), 
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x496d706c),
-+  ACE_NTOHL (0x656d656e),
-+  ACE_NTOHL (0x74617469),
-+  ACE_NTOHL (0x6f6e5265),
-+  ACE_NTOHL (0x706f7369),
-+  ACE_NTOHL (0x746f7279),
-+  ACE_NTOHL (0x2f41646d),
-+  ACE_NTOHL (0x696e6973),
-+  ACE_NTOHL (0x74726174),
-+  ACE_NTOHL (0x696f6e2f),
-+  ACE_NTOHL (0x43616e6e),
-+  ACE_NTOHL (0x6f744163),
-+  ACE_NTOHL (0x74697661),
-+  ACE_NTOHL (0x74653a31),
-   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/Administration/CannotActivate:1.0
-   15,
--  ACE_NTOHL (0x43616e6e), 
--  ACE_NTOHL (0x6f744163), 
--  ACE_NTOHL (0x74697661), 
-+  ACE_NTOHL (0x43616e6e),
-+  ACE_NTOHL (0x6f744163),
-+  ACE_NTOHL (0x74697661),
-   ACE_NTOHL (0x74650000),  // name = CannotActivate
-   1, // member count
-   7,
--  ACE_NTOHL (0x72656173), 
-+  ACE_NTOHL (0x72656173),
-   ACE_NTOHL (0x6f6e0000),  // name = reason
--  CORBA::tk_string, 
-+  CORBA::tk_string,
-   0U, // string length
- };
- 
-@@ -3753,7 +3754,7 @@
-     {
-       return;
-     }
--  
-+
-   ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -3766,7 +3767,7 @@
-     {
-       return;
-     }
--  
-+
-   ACE_THROW (CORBA::MARSHAL ());
- }
- 
-@@ -3782,24 +3783,24 @@
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   57,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x496d706c), 
--  ACE_NTOHL (0x656d656e), 
--  ACE_NTOHL (0x74617469), 
--  ACE_NTOHL (0x6f6e5265), 
--  ACE_NTOHL (0x706f7369), 
--  ACE_NTOHL (0x746f7279), 
--  ACE_NTOHL (0x2f41646d), 
--  ACE_NTOHL (0x696e6973), 
--  ACE_NTOHL (0x74726174), 
--  ACE_NTOHL (0x696f6e2f), 
--  ACE_NTOHL (0x4e6f7446), 
--  ACE_NTOHL (0x6f756e64), 
--  ACE_NTOHL (0x3a312e30), 
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x496d706c),
-+  ACE_NTOHL (0x656d656e),
-+  ACE_NTOHL (0x74617469),
-+  ACE_NTOHL (0x6f6e5265),
-+  ACE_NTOHL (0x706f7369),
-+  ACE_NTOHL (0x746f7279),
-+  ACE_NTOHL (0x2f41646d),
-+  ACE_NTOHL (0x696e6973),
-+  ACE_NTOHL (0x74726174),
-+  ACE_NTOHL (0x696f6e2f),
-+  ACE_NTOHL (0x4e6f7446),
-+  ACE_NTOHL (0x6f756e64),
-+  ACE_NTOHL (0x3a312e30),
-   ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Administration/NotFound:1.0
-   9,
--  ACE_NTOHL (0x4e6f7446), 
--  ACE_NTOHL (0x6f756e64), 
-+  ACE_NTOHL (0x4e6f7446),
-+  ACE_NTOHL (0x6f756e64),
-   ACE_NTOHL (0x0),  // name = NotFound
-   0, // member count
- };
-@@ -3832,10 +3833,10 @@
-     ImplementationRepository::Administration::CannotActivate
-   ))
- {
--  _TAO_Administration_Proxy_Impl &proxy = 
-+  _TAO_Administration_Proxy_Impl &proxy =
-     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
-   ACE_CHECK;
--  
-+
-   proxy.activate_server (
-       this,
-       server,
-@@ -3853,10 +3854,10 @@
-     ImplementationRepository::Administration::AlreadyRegistered
-   ))
- {
--  _TAO_Administration_Proxy_Impl &proxy = 
-+  _TAO_Administration_Proxy_Impl &proxy =
-     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
-   ACE_CHECK;
--  
-+
-   proxy.register_server (
-       this,
-       server,
-@@ -3874,10 +3875,10 @@
-     CORBA::SystemException
-   ))
- {
--  _TAO_Administration_Proxy_Impl &proxy = 
-+  _TAO_Administration_Proxy_Impl &proxy =
-     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
-   ACE_CHECK;
--  
-+
-   proxy.reregister_server (
-       this,
-       server,
-@@ -3895,10 +3896,10 @@
-     ImplementationRepository::Administration::NotFound
-   ))
- {
--  _TAO_Administration_Proxy_Impl &proxy = 
-+  _TAO_Administration_Proxy_Impl &proxy =
-     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
-   ACE_CHECK;
--  
-+
-   proxy.remove_server (
-       this,
-       server,
-@@ -3915,10 +3916,10 @@
-     ImplementationRepository::Administration::NotFound
-   ))
- {
--  _TAO_Administration_Proxy_Impl &proxy = 
-+  _TAO_Administration_Proxy_Impl &proxy =
-     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
-   ACE_CHECK;
--  
-+
-   proxy.shutdown_server (
-       this,
-       server,
-@@ -3937,10 +3938,10 @@
-     ImplementationRepository::Administration::NotFound
-   ))
- {
--  _TAO_Administration_Proxy_Impl &proxy = 
-+  _TAO_Administration_Proxy_Impl &proxy =
-     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return proxy.server_is_running (
-       this,
-       server,
-@@ -3959,10 +3960,10 @@
-     ImplementationRepository::Administration::NotFound
-   ))
- {
--  _TAO_Administration_Proxy_Impl &proxy = 
-+  _TAO_Administration_Proxy_Impl &proxy =
-     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
-   ACE_CHECK;
--  
-+
-   proxy.server_is_shutting_down (
-       this,
-       server,
-@@ -3980,10 +3981,10 @@
-     ImplementationRepository::Administration::NotFound
-   ))
- {
--  _TAO_Administration_Proxy_Impl &proxy = 
-+  _TAO_Administration_Proxy_Impl &proxy =
-     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
-   ACE_CHECK;
--  
-+
-   proxy.find (
-       this,
-       server,
-@@ -4002,10 +4003,10 @@
-     CORBA::SystemException
-   ))
- {
--  _TAO_Administration_Proxy_Impl &proxy = 
-+  _TAO_Administration_Proxy_Impl &proxy =
-     this->the_TAO_Administration_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
-   ACE_CHECK;
--  
-+
-   proxy.list (
-       this,
-       how_many,
-@@ -4021,7 +4022,7 @@
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * server,
--    CORBA::Environment &    
-+    CORBA::Environment &
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-     server_ (server)
-@@ -4035,14 +4036,14 @@
-   Dynamic::ParameterList *parameter_list =
-     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--    
-+
-   CORBA::ULong length_server = parameter_list->length ();
-   parameter_list->length (length_server + 1);
-   (*parameter_list)[length_server].argument <<= server_;
-   (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
--  
-+
-   return safe_parameter_list._retn ();
- }
- 
-@@ -4054,15 +4055,15 @@
-   Dynamic::ExceptionList *exception_list =
-     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ExceptionList_var safe_exception_list = exception_list;
--    
--  static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = 
-+
-+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] =
-   {
-     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc},
-     {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc}
-   };
--  
-+
-   exception_list->length (2);
-   for (CORBA::ULong i = 0; i < 2; ++i)
-     {
-@@ -4075,7 +4076,7 @@
- }
- 
- 
--CORBA::Any * 
-+CORBA::Any *
- ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-@@ -4084,7 +4085,7 @@
-   CORBA::Any *result_any =
-     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return result_any;
- }
- 
-@@ -4093,7 +4094,7 @@
-     CORBA::Object_ptr _tao_target,
-     const char * server,
-     const ImplementationRepository::StartupOptions & options,
--    CORBA::Environment &    
-+    CORBA::Environment &
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-     server_ (server),
-@@ -4108,20 +4109,20 @@
-   Dynamic::ParameterList *parameter_list =
-     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--    
-+
-   CORBA::ULong length_server = parameter_list->length ();
-   parameter_list->length (length_server + 1);
-   (*parameter_list)[length_server].argument <<= server_;
-   (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
--    
-+
-   CORBA::ULong length_options = parameter_list->length ();
-   parameter_list->length (length_options + 1);
-   (*parameter_list)[length_options].argument <<=  this->options_;
--  
-+
-   (*parameter_list)[length_options].mode = Dynamic::PARAM_IN;
--  
-+
-   return safe_parameter_list._retn ();
- }
- 
-@@ -4133,14 +4134,14 @@
-   Dynamic::ExceptionList *exception_list =
-     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ExceptionList_var safe_exception_list = exception_list;
--    
--  static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = 
-+
-+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata[] =
-   {
-     {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc}
-   };
--  
-+
-   exception_list->length (1);
-   for (CORBA::ULong i = 0; i < 1; ++i)
-     {
-@@ -4153,7 +4154,7 @@
- }
- 
- 
--CORBA::Any * 
-+CORBA::Any *
- ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-@@ -4162,7 +4163,7 @@
-   CORBA::Any *result_any =
-     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return result_any;
- }
- 
-@@ -4171,7 +4172,7 @@
-     CORBA::Object_ptr _tao_target,
-     const char * server,
-     const ImplementationRepository::StartupOptions & options,
--    CORBA::Environment &    
-+    CORBA::Environment &
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-     server_ (server),
-@@ -4186,20 +4187,20 @@
-   Dynamic::ParameterList *parameter_list =
-     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--    
-+
-   CORBA::ULong length_server = parameter_list->length ();
-   parameter_list->length (length_server + 1);
-   (*parameter_list)[length_server].argument <<= server_;
-   (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
--    
-+
-   CORBA::ULong length_options = parameter_list->length ();
-   parameter_list->length (length_options + 1);
-   (*parameter_list)[length_options].argument <<=  this->options_;
--  
-+
-   (*parameter_list)[length_options].mode = Dynamic::PARAM_IN;
--  
-+
-   return safe_parameter_list._retn ();
- }
- 
-@@ -4211,12 +4212,12 @@
-   Dynamic::ExceptionList *exception_list =
-     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return exception_list;
- }
- 
- 
--CORBA::Any * 
-+CORBA::Any *
- ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-@@ -4225,7 +4226,7 @@
-   CORBA::Any *result_any =
-     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return result_any;
- }
- 
-@@ -4233,7 +4234,7 @@
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * server,
--    CORBA::Environment &    
-+    CORBA::Environment &
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-     server_ (server)
-@@ -4247,14 +4248,14 @@
-   Dynamic::ParameterList *parameter_list =
-     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--    
-+
-   CORBA::ULong length_server = parameter_list->length ();
-   parameter_list->length (length_server + 1);
-   (*parameter_list)[length_server].argument <<= server_;
-   (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
--  
-+
-   return safe_parameter_list._retn ();
- }
- 
-@@ -4266,14 +4267,14 @@
-   Dynamic::ExceptionList *exception_list =
-     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ExceptionList_var safe_exception_list = exception_list;
--    
--  static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = 
-+
-+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] =
-   {
-     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-   };
--  
-+
-   exception_list->length (1);
-   for (CORBA::ULong i = 0; i < 1; ++i)
-     {
-@@ -4286,7 +4287,7 @@
- }
- 
- 
--CORBA::Any * 
-+CORBA::Any *
- ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-@@ -4295,7 +4296,7 @@
-   CORBA::Any *result_any =
-     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return result_any;
- }
- 
-@@ -4303,7 +4304,7 @@
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * server,
--    CORBA::Environment &    
-+    CORBA::Environment &
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-     server_ (server)
-@@ -4317,14 +4318,14 @@
-   Dynamic::ParameterList *parameter_list =
-     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--    
-+
-   CORBA::ULong length_server = parameter_list->length ();
-   parameter_list->length (length_server + 1);
-   (*parameter_list)[length_server].argument <<= server_;
-   (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
--  
-+
-   return safe_parameter_list._retn ();
- }
- 
-@@ -4336,14 +4337,14 @@
-   Dynamic::ExceptionList *exception_list =
-     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ExceptionList_var safe_exception_list = exception_list;
--    
--  static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = 
-+
-+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] =
-   {
-     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-   };
--  
-+
-   exception_list->length (1);
-   for (CORBA::ULong i = 0; i < 1; ++i)
-     {
-@@ -4356,7 +4357,7 @@
- }
- 
- 
--CORBA::Any * 
-+CORBA::Any *
- ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-@@ -4365,7 +4366,7 @@
-   CORBA::Any *result_any =
-     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return result_any;
- }
- 
-@@ -4375,7 +4376,7 @@
-     const char * server,
-     const char * addr,
-     ImplementationRepository::ServerObject_ptr server_object,
--    CORBA::Environment &    
-+    CORBA::Environment &
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-     server_ (server),
-@@ -4391,25 +4392,25 @@
-   Dynamic::ParameterList *parameter_list =
-     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--    
-+
-   CORBA::ULong length_server = parameter_list->length ();
-   parameter_list->length (length_server + 1);
-   (*parameter_list)[length_server].argument <<= server_;
-   (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
--    
-+
-   CORBA::ULong length_addr = parameter_list->length ();
-   parameter_list->length (length_addr + 1);
-   (*parameter_list)[length_addr].argument <<= addr_;
-   (*parameter_list)[length_addr].mode = Dynamic::PARAM_IN;
--    
-+
-   CORBA::ULong length_server_object = parameter_list->length ();
-   parameter_list->length (length_server_object + 1);
-   (*parameter_list)[length_server_object].argument <<=  this->server_object_;
--  
-+
-   (*parameter_list)[length_server_object].mode = Dynamic::PARAM_IN;
--  
-+
-   return safe_parameter_list._retn ();
- }
- 
-@@ -4421,14 +4422,14 @@
-   Dynamic::ExceptionList *exception_list =
-     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ExceptionList_var safe_exception_list = exception_list;
--    
--  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = 
-+
-+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] =
-   {
-     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-   };
--  
-+
-   exception_list->length (1);
-   for (CORBA::ULong i = 0; i < 1; ++i)
-     {
-@@ -4441,7 +4442,7 @@
- }
- 
- 
--CORBA::Any * 
-+CORBA::Any *
- ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-@@ -4450,17 +4451,17 @@
-   CORBA::Any *result_any =
-     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   CORBA::Any_var safe_result_any = result_any;
--  
-+
-   (*result_any) <<= this->_result;
-   return safe_result_any._retn ();
- }
- 
--void 
-+void
- ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result)
- {
--  // update the result 
-+  // update the result
-   this->_result = result;
- }
- 
-@@ -4468,7 +4469,7 @@
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * server,
--    CORBA::Environment &    
-+    CORBA::Environment &
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-     server_ (server)
-@@ -4482,14 +4483,14 @@
-   Dynamic::ParameterList *parameter_list =
-     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--    
-+
-   CORBA::ULong length_server = parameter_list->length ();
-   parameter_list->length (length_server + 1);
-   (*parameter_list)[length_server].argument <<= server_;
-   (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
--  
-+
-   return safe_parameter_list._retn ();
- }
- 
-@@ -4501,14 +4502,14 @@
-   Dynamic::ExceptionList *exception_list =
-     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ExceptionList_var safe_exception_list = exception_list;
--    
--  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = 
-+
-+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] =
-   {
-     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-   };
--  
-+
-   exception_list->length (1);
-   for (CORBA::ULong i = 0; i < 1; ++i)
-     {
-@@ -4521,7 +4522,7 @@
- }
- 
- 
--CORBA::Any * 
-+CORBA::Any *
- ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-@@ -4530,7 +4531,7 @@
-   CORBA::Any *result_any =
-     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return result_any;
- }
- 
-@@ -4538,7 +4539,7 @@
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * server,
--    CORBA::Environment &    
-+    CORBA::Environment &
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-     server_ (server)
-@@ -4552,14 +4553,14 @@
-   Dynamic::ParameterList *parameter_list =
-     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--    
-+
-   CORBA::ULong length_server = parameter_list->length ();
-   parameter_list->length (length_server + 1);
-   (*parameter_list)[length_server].argument <<= server_;
-   (*parameter_list)[length_server].mode = Dynamic::PARAM_IN;
--  
-+
-   return safe_parameter_list._retn ();
- }
- 
-@@ -4571,14 +4572,14 @@
-   Dynamic::ExceptionList *exception_list =
-     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ExceptionList_var safe_exception_list = exception_list;
--    
--  static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata[] = 
-+
-+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata[] =
-   {
-     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
-   };
--  
-+
-   exception_list->length (1);
-   for (CORBA::ULong i = 0; i < 1; ++i)
-     {
-@@ -4591,7 +4592,7 @@
- }
- 
- 
--CORBA::Any * 
-+CORBA::Any *
- ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-@@ -4600,16 +4601,16 @@
-   CORBA::Any *result_any =
-     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return result_any;
- }
- 
- ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRequestInfo_ImplementationRepository_Administration_list (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const CORBA::ULong & how_many    
-+    const CORBA::ULong & how_many
- ,
--    CORBA::Environment &    
-+    CORBA::Environment &
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-     how_many_ (how_many)
-@@ -4624,14 +4625,14 @@
-   Dynamic::ParameterList *parameter_list =
-     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--    
-+
-   CORBA::ULong length_how_many = parameter_list->length ();
-   parameter_list->length (length_how_many + 1);
-   (*parameter_list)[length_how_many].argument <<= how_many_;
-   (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN;
--    
-+
- 
-   return safe_parameter_list._retn ();
- }
-@@ -4644,12 +4645,12 @@
-   Dynamic::ExceptionList *exception_list =
-     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return exception_list;
- }
- 
- 
--CORBA::Any * 
-+CORBA::Any *
- ImplementationRepository::Administration::TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-@@ -4658,7 +4659,7 @@
-   CORBA::Any *result_any =
-     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return result_any;
- }
- 
-@@ -4667,22 +4668,22 @@
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   48,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x496d706c), 
--  ACE_NTOHL (0x656d656e), 
--  ACE_NTOHL (0x74617469), 
--  ACE_NTOHL (0x6f6e5265), 
--  ACE_NTOHL (0x706f7369), 
--  ACE_NTOHL (0x746f7279), 
--  ACE_NTOHL (0x2f41646d), 
--  ACE_NTOHL (0x696e6973), 
--  ACE_NTOHL (0x74726174), 
--  ACE_NTOHL (0x696f6e3a), 
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x496d706c),
-+  ACE_NTOHL (0x656d656e),
-+  ACE_NTOHL (0x74617469),
-+  ACE_NTOHL (0x6f6e5265),
-+  ACE_NTOHL (0x706f7369),
-+  ACE_NTOHL (0x746f7279),
-+  ACE_NTOHL (0x2f41646d),
-+  ACE_NTOHL (0x696e6973),
-+  ACE_NTOHL (0x74726174),
-+  ACE_NTOHL (0x696f6e3a),
-   ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/Administration:1.0
-   15,
--  ACE_NTOHL (0x41646d69), 
--  ACE_NTOHL (0x6e697374), 
--  ACE_NTOHL (0x72617469), 
-+  ACE_NTOHL (0x41646d69),
-+  ACE_NTOHL (0x6e697374),
-+  ACE_NTOHL (0x72617469),
-   ACE_NTOHL (0x6f6e0000),  // name = Administration
- };
- 
-@@ -4701,7 +4702,7 @@
- 
- 
- ///////////////////////////////////////////////////////////////////////
--//                Base & Remote Proxy  Implementation. 
-+//                Base & Remote Proxy  Implementation.
- //
- 
- ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl::_TAO_ServerInformationIterator_Proxy_Impl (void)
-@@ -4722,15 +4723,15 @@
-     CORBA::SystemException
-   ))
- {
--  
-+
-   CORBA::Boolean _tao_retval = 0;
--  
--  
-+
-+
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
- 
--  
-+
-   ACE_NEW_RETURN (server_list.ptr (), ImplementationRepository::ServerInformationList, 0);
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-@@ -4744,13 +4745,13 @@
-   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-       istub->orb_core ()->client_request_interceptors ()
-     );
--  
-+
- #endif  /* TAO_HAS_INTERCEPTORS */
--  
-+
-   for (;;)
-     {
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
--      
-+
- #if TAO_HAS_INTERCEPTORS == 1
-       ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n ri (
-         &_tao_call,
-@@ -4759,17 +4760,17 @@
-         ACE_TRY_ENV
-       );
-       ACE_CHECK_RETURN  (_tao_retval);
--      
-+
-       ACE_TRY
-         {
- #endif /* TAO_HAS_INTERCEPTORS */
--        
-+
-           _tao_call.start (ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
--          
-+
-           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-           TAO_INTERCEPTOR (ri.response_expected (1));
--          
-+
-           TAO_INTERCEPTOR (
-             _tao_vfr.send_request (
-               &ri,
-@@ -4777,35 +4778,35 @@
-             )
-           );
-           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
--          
-+
-           _tao_call.prepare_header (
-               ACE_static_cast (CORBA::Octet, _tao_response_flag),
-               ACE_TRY_ENV
-             );
-           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
--          
-+
-           TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-           if (!(
--                            (_tao_out << how_many)              
-+                            (_tao_out << how_many)
-             ))
-             TAO_INTERCEPTOR_THROW_RETURN (
-               CORBA::MARSHAL (),
-               _tao_retval
-             );
--            
-+
-           _invoke_status =
-             _tao_call.invoke (0, 0, ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
--          
-+
-           if (_invoke_status == TAO_INVOKE_EXCEPTION)
-             {
-               TAO_INTERCEPTOR_THROW_RETURN (
-                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                 _tao_retval
-               );
--              
-+
-             }
--          
-+
-           TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-           if (!(
-                             (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) &&
-@@ -4816,14 +4817,14 @@
-                 CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                 _tao_retval
-               );
--              
-+
-             }
--          
-+
-           TAO_INTERCEPTOR (
-               CORBA::Boolean  _tao_retval_info = _tao_retval;
-                ri.result (_tao_retval_info);
-             );
--          
-+
-           TAO_INTERCEPTOR (
-             ri.reply_status (_invoke_status);
-             if (_invoke_status == TAO_INVOKE_OK)
-@@ -4840,10 +4841,10 @@
-                   ACE_TRY_ENV
-                 );
-               }
--            
-+
-           );
-           TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
--          
-+
- #if TAO_HAS_INTERCEPTORS == 1
-         }
-       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-@@ -4851,8 +4852,8 @@
-           _invoke_status =
-             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-           ACE_TRY_CHECK;
--          
--          ri.forward_reference (exc); 
-+
-+          ri.forward_reference (exc);
-           _tao_vfr.receive_other (
-             &ri,
-             ACE_TRY_ENV
-@@ -4871,7 +4872,7 @@
-         }
-       ACE_ENDTRY;
-       ACE_CHECK_RETURN  (_tao_retval);
--      
-+
- #endif /* TAO_HAS_INTERCEPTORS */
- 
-       if (_invoke_status == TAO_INVOKE_RESTART)
-@@ -4879,7 +4880,7 @@
-           _tao_call.restart_flag (1);
-           continue;
-         }
--      
-+
-       break;
-     }
-   return _tao_retval;
-@@ -4893,15 +4894,15 @@
-     CORBA::SystemException
-   ))
- {
--  
- 
--  
--  
-+
-+
-+
-   TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
-   if (istub == 0)
-     ACE_THROW (CORBA::INTERNAL ());
- 
--  
-+
-   TAO_GIOP_Twoway_Invocation _tao_call (
-       istub,
-       "destroy",
-@@ -4914,13 +4915,13 @@
-   TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-       istub->orb_core ()->client_request_interceptors ()
-     );
--  
-+
- #endif  /* TAO_HAS_INTERCEPTORS */
--  
-+
-   for (;;)
-     {
-       int _invoke_status = TAO_INVOKE_EXCEPTION;
--      
-+
- #if TAO_HAS_INTERCEPTORS == 1
-       ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy ri (
-         &_tao_call,
-@@ -4928,17 +4929,17 @@
-         ACE_TRY_ENV
-       );
-       ACE_CHECK;
--      
-+
-       ACE_TRY
-         {
- #endif /* TAO_HAS_INTERCEPTORS */
--        
-+
-           _tao_call.start (ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-           TAO_INTERCEPTOR (ri.response_expected (1));
--          
-+
-           TAO_INTERCEPTOR (
-             _tao_vfr.send_request (
-               &ri,
-@@ -4946,7 +4947,7 @@
-             )
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           _tao_call.prepare_header (
-               ACE_static_cast (CORBA::Octet, _tao_response_flag),
-               ACE_TRY_ENV
-@@ -4955,16 +4956,16 @@
-           _invoke_status =
-             _tao_call.invoke (0, 0, ACE_TRY_ENV);
-           TAO_INTERCEPTOR_CHECK;
--          
-+
-           if (_invoke_status == TAO_INVOKE_EXCEPTION)
-             {
-               TAO_INTERCEPTOR_THROW (
-                 CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
-               );
--              
-+
-             }
--          
--          
-+
-+
-           TAO_INTERCEPTOR (
-             ri.reply_status (_invoke_status);
-             if (_invoke_status == TAO_INVOKE_OK)
-@@ -4981,10 +4982,10 @@
-                   ACE_TRY_ENV
-                 );
-               }
--            
-+
-           );
-           TAO_INTERCEPTOR_CHECK;
--          
-+
- #if TAO_HAS_INTERCEPTORS == 1
-         }
-       ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
-@@ -4992,8 +4993,8 @@
-           _invoke_status =
-             _tao_call.location_forward (exc.forward.in (), ACE_TRY_ENV);
-           ACE_TRY_CHECK;
--          
--          ri.forward_reference (exc); 
-+
-+          ri.forward_reference (exc);
-           _tao_vfr.receive_other (
-             &ri,
-             ACE_TRY_ENV
-@@ -5012,7 +5013,7 @@
-         }
-       ACE_ENDTRY;
-       ACE_CHECK;
--      
-+
- #endif /* TAO_HAS_INTERCEPTORS */
- 
-       if (_invoke_status == TAO_INVOKE_RESTART)
-@@ -5020,15 +5021,15 @@
-           _tao_call.restart_flag (1);
-           continue;
-         }
--      
-+
-       break;
-     }
--  
-+
- }
- 
- 
- //
--//            End  Base & Remote  Proxy Implemeentation. 
-+//            End  Base & Remote  Proxy Implemeentation.
- ///////////////////////////////////////////////////////////////////////
- 
- 
-@@ -5149,14 +5150,14 @@
-             stub,
-             1,
-             obj->_servant ()),
--            
-+
-           ServerInformationIterator::_nil ());
-         }
-       if (CORBA::is_nil (default_proxy))
-         ACE_NEW_RETURN (default_proxy, ::ImplementationRepository::ServerInformationIterator (stub, 0, obj->_servant ()), ServerInformationIterator::_nil ());
-         return default_proxy;
-       }
--    else 
-+    else
-       return
-         ACE_reinterpret_cast
-           (
-@@ -5200,7 +5201,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -5220,10 +5221,10 @@
-     CORBA::SystemException
-   ))
- {
--  _TAO_ServerInformationIterator_Proxy_Impl &proxy = 
-+  _TAO_ServerInformationIterator_Proxy_Impl &proxy =
-     this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return proxy.next_n (
-       this,
-       how_many,
-@@ -5239,10 +5240,10 @@
-     CORBA::SystemException
-   ))
- {
--  _TAO_ServerInformationIterator_Proxy_Impl &proxy = 
-+  _TAO_ServerInformationIterator_Proxy_Impl &proxy =
-     this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
-   ACE_CHECK;
--  
-+
-   proxy.destroy (
-       this,
-       ACE_TRY_ENV
-@@ -5255,7 +5256,7 @@
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const CORBA::ULong & how_many,
--    CORBA::Environment &    
-+    CORBA::Environment &
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target),
-     how_many_ (how_many)
-@@ -5269,14 +5270,14 @@
-   Dynamic::ParameterList *parameter_list =
-     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
--    
-+
-   CORBA::ULong length_how_many = parameter_list->length ();
-   parameter_list->length (length_how_many + 1);
-   (*parameter_list)[length_how_many].argument <<= how_many_;
-   (*parameter_list)[length_how_many].mode = Dynamic::PARAM_IN;
--  
-+
-   return safe_parameter_list._retn ();
- }
- 
-@@ -5288,12 +5289,12 @@
-   Dynamic::ExceptionList *exception_list =
-     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return exception_list;
- }
- 
- 
--CORBA::Any * 
-+CORBA::Any *
- ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-@@ -5302,24 +5303,24 @@
-   CORBA::Any *result_any =
-     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   CORBA::Any_var safe_result_any = result_any;
--  
-+
-   (*result_any) <<= CORBA::Any::from_boolean (this->_result);
-   return safe_result_any._retn ();
- }
- 
--void 
-+void
- ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result)
- {
--  // update the result 
-+  // update the result
-   this->_result = result;
- }
- 
- ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    CORBA::Environment &    
-+    CORBA::Environment &
-   )
-   : TAO_ClientRequestInfo (_tao_invocation, _tao_target)
- {}
-@@ -5332,7 +5333,7 @@
-   Dynamic::ParameterList *parameter_list =
-     TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return parameter_list;
- }
- 
-@@ -5344,12 +5345,12 @@
-   Dynamic::ExceptionList *exception_list =
-     TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return exception_list;
- }
- 
- 
--CORBA::Any * 
-+CORBA::Any *
- ImplementationRepository::ServerInformationIterator::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (CORBA::Environment &ACE_TRY_ENV)
-   ACE_THROW_SPEC ((CORBA::SystemException))
- {
-@@ -5358,7 +5359,7 @@
-   CORBA::Any *result_any =
-     TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
-   ACE_CHECK_RETURN (0);
--  
-+
-   return result_any;
+-
+ // *************************************************************
+ // Inline operations for class ImplementationRepository::ServerObject_out
+ // *************************************************************
+@@ -2123,7 +2122,6 @@
+     ACE_static_cast (Administration **, src);
+   return *tmp;
  }
- 
-@@ -5367,28 +5368,28 @@
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   59,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x496d706c), 
--  ACE_NTOHL (0x656d656e), 
--  ACE_NTOHL (0x74617469), 
--  ACE_NTOHL (0x6f6e5265), 
--  ACE_NTOHL (0x706f7369), 
--  ACE_NTOHL (0x746f7279), 
--  ACE_NTOHL (0x2f536572), 
--  ACE_NTOHL (0x76657249), 
--  ACE_NTOHL (0x6e666f72), 
--  ACE_NTOHL (0x6d617469), 
--  ACE_NTOHL (0x6f6e4974), 
--  ACE_NTOHL (0x65726174), 
--  ACE_NTOHL (0x6f723a31), 
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x496d706c),
-+  ACE_NTOHL (0x656d656e),
-+  ACE_NTOHL (0x74617469),
-+  ACE_NTOHL (0x6f6e5265),
-+  ACE_NTOHL (0x706f7369),
-+  ACE_NTOHL (0x746f7279),
-+  ACE_NTOHL (0x2f536572),
-+  ACE_NTOHL (0x76657249),
-+  ACE_NTOHL (0x6e666f72),
-+  ACE_NTOHL (0x6d617469),
-+  ACE_NTOHL (0x6f6e4974),
-+  ACE_NTOHL (0x65726174),
-+  ACE_NTOHL (0x6f723a31),
-   ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformationIterator:1.0
-   26,
--  ACE_NTOHL (0x53657276), 
--  ACE_NTOHL (0x6572496e), 
--  ACE_NTOHL (0x666f726d), 
--  ACE_NTOHL (0x6174696f), 
--  ACE_NTOHL (0x6e497465), 
--  ACE_NTOHL (0x7261746f), 
-+  ACE_NTOHL (0x53657276),
-+  ACE_NTOHL (0x6572496e),
-+  ACE_NTOHL (0x666f726d),
-+  ACE_NTOHL (0x6174696f),
-+  ACE_NTOHL (0x6e497465),
-+  ACE_NTOHL (0x7261746f),
-   ACE_NTOHL (0x72000000),  // name = ServerInformationIterator
- };
- 
-@@ -5411,7 +5412,7 @@
-   if (stream << _tao_elem)
-   {
-     _tao_any._tao_replace (
--        ImplementationRepository::_tc_ServerObject, 
-+        ImplementationRepository::_tc_ServerObject,
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
-@@ -5427,13 +5428,13 @@
-   {
-     _tao_elem = ImplementationRepository::ServerObject::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
-+
-     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerObject, ACE_TRY_ENV);
-     ACE_TRY_CHECK;
--    
-+
-     if (!result)
-       return 0; // not equivalent
--    
-+
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -5502,13 +5503,13 @@
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
-+
-     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentVariable, ACE_TRY_ENV);
-     ACE_TRY_CHECK;
--    
-+
-     if (!result)
-       return 0; // not equivalent
--    
-+
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
-@@ -5593,13 +5594,13 @@
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
-+
-     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_EnvironmentList, ACE_TRY_ENV);
-     ACE_TRY_CHECK;
--    
-+
-     if (!result)
-       return 0; // not equivalent
--    
-+
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
-@@ -5656,13 +5657,13 @@
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
-+
-     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ActivationMode, ACE_TRY_ENV);
-     ACE_TRY_CHECK;
--    
-+
-     if (!result)
-       return 0; // not equivalent
--    
-+
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -5716,13 +5717,13 @@
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
-+
-     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_StartupOptions, ACE_TRY_ENV);
-     ACE_TRY_CHECK;
--    
-+
-     if (!result)
-       return 0; // not equivalent
--    
-+
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
-@@ -5799,13 +5800,13 @@
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
-+
-     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformation, ACE_TRY_ENV);
-     ACE_TRY_CHECK;
--    
-+
-     if (!result)
-       return 0; // not equivalent
--    
-+
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
-@@ -5890,13 +5891,13 @@
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
-+
-     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationList, ACE_TRY_ENV);
-     ACE_TRY_CHECK;
--    
-+
-     if (!result)
-       return 0; // not equivalent
--    
-+
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = ACE_static_cast(
-@@ -5943,7 +5944,7 @@
-   if (stream << _tao_elem)
-   {
-     _tao_any._tao_replace (
--        ImplementationRepository::_tc_Administration, 
-+        ImplementationRepository::_tc_Administration,
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
-@@ -5959,13 +5960,13 @@
-   {
-     _tao_elem = ImplementationRepository::Administration::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
-+
-     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_Administration, ACE_TRY_ENV);
-     ACE_TRY_CHECK;
--    
-+
-     if (!result)
-       return 0; // not equivalent
--    
-+
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -6037,13 +6038,13 @@
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
-+
-     CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_AlreadyRegistered, ACE_TRY_ENV);
-     ACE_TRY_CHECK;
--    
-+
-     if (!result)
-       return 0; // not equivalent
--    
-+
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = (ImplementationRepository::Administration::AlreadyRegistered *)_tao_any.value ();
-@@ -6127,13 +6128,13 @@
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
-+
-     CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_CannotActivate, ACE_TRY_ENV);
-     ACE_TRY_CHECK;
--    
-+
-     if (!result)
-       return 0; // not equivalent
--    
-+
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = (ImplementationRepository::Administration::CannotActivate *)_tao_any.value ();
-@@ -6217,13 +6218,13 @@
-   ACE_TRY_NEW_ENV
-   {
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
-+
-     CORBA::Boolean result = type->equivalent (ImplementationRepository::Administration::_tc_NotFound, ACE_TRY_ENV);
-     ACE_TRY_CHECK;
--    
-+
-     if (!result)
-       return 0; // not equivalent
--    
-+
-     if (_tao_any.any_owns_data ())
-     {
-       _tao_elem = (ImplementationRepository::Administration::NotFound *)_tao_any.value ();
-@@ -6274,7 +6275,7 @@
-   if (stream << _tao_elem)
-   {
-     _tao_any._tao_replace (
--        ImplementationRepository::_tc_ServerInformationIterator, 
-+        ImplementationRepository::_tc_ServerInformationIterator,
-         TAO_ENCAP_BYTE_ORDER,
-         stream.begin (),
-         1,
-@@ -6290,13 +6291,13 @@
-   {
-     _tao_elem = ImplementationRepository::ServerInformationIterator::_nil ();
-     CORBA::TypeCode_var type = _tao_any.type ();
--    
-+
-     CORBA::Boolean result = type->equivalent (ImplementationRepository::_tc_ServerInformationIterator, ACE_TRY_ENV);
-     ACE_TRY_CHECK;
--    
-+
-     if (!result)
-       return 0; // not equivalent
--    
-+
-     TAO_InputCDR stream (
-         _tao_any._tao_get_cdr (),
-         _tao_any._tao_byte_order ()
-@@ -6358,7 +6359,7 @@
-     // set the length of the sequence
-     _tao_sequence.length (_tao_seq_len);
-     // If length is 0 we return true.
--    if (0 >= _tao_seq_len) 
-+    if (0 >= _tao_seq_len)
-       return 1;
-     // retrieve all the elements
-     CORBA::Boolean _tao_marshal_flag = 1;
-@@ -6400,7 +6401,7 @@
-     // set the length of the sequence
-     _tao_sequence.length (_tao_seq_len);
-     // If length is 0 we return true.
--    if (0 >= _tao_seq_len) 
-+    if (0 >= _tao_seq_len)
-       return 1;
-     // retrieve all the elements
-     CORBA::Boolean _tao_marshal_flag = 1;
-@@ -6412,4 +6413,3 @@
-   }
-   return 0; // error
+-
+ // *************************************************************
+ // Inline operations for class ImplementationRepository::Administration_out
+ // *************************************************************
+@@ -5600,7 +5598,6 @@
+     ACE_static_cast (ServerInformationIterator **, src);
+   return *tmp;
  }
 -
+ // *************************************************************
+ // Inline operations for class ImplementationRepository::ServerInformationIterator_out
+ // *************************************************************
diff --git a/TAO/tao/diffs/ImplRepoC.h.diff b/TAO/tao/diffs/ImplRepoC.h.diff
index 90061a2bdc8..983cbc4f41e 100644
--- a/TAO/tao/diffs/ImplRepoC.h.diff
+++ b/TAO/tao/diffs/ImplRepoC.h.diff
@@ -1,5 +1,5 @@
---- orig/ImplRepoC.h	Sun Apr  1 16:33:08 2001
-+++ ImplRepoC.h	Mon Apr  2 08:36:03 2001
+--- orig/ImplRepoC.h	Wed Apr 18 01:09:40 2001
++++ ImplRepoC.h	Tue Apr 17 01:38:08 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -8,12 +8,17 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -23,7 +23,14 @@
+@@ -23,12 +23,19 @@
  #define _TAO_IDL_ORIG_IMPLREPOC_H_
  
  #include "ace/pre.h"
 -#include "tao/corba.h"
 +#include "tao/corbafwd.h"
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
 +#include "tao/CDR.h"
 +#include "tao/Any.h"
 +#include "tao/Object.h"
@@ -21,1787 +26,6 @@
 +#include "tao/Remote_Object_Proxy_Impl.h"
 +#include "tao/Managed_Types.h"
 +#include "tao/Sequence.h"
+ #include "portableserver_export.h"
  
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
-@@ -62,7 +69,7 @@
- 
-   class ServerObject;
-   typedef ServerObject *ServerObject_ptr;
--  
-+
- #endif /* end #if !defined */
- 
- 
-@@ -73,17 +80,17 @@
-   {
-   public:
-     ServerObject_var (void); // default constructor
--    ServerObject_var (ServerObject_ptr p) : ptr_ (p) {} 
-+    ServerObject_var (ServerObject_ptr p) : ptr_ (p) {}
-     ServerObject_var (const ServerObject_var &); // copy constructor
-     ~ServerObject_var (void); // destructor
--    
-+
-     ServerObject_var &operator= (ServerObject_ptr);
-     ServerObject_var &operator= (const ServerObject_var &);
-     ServerObject_ptr operator-> (void) const;
--    
-+
-     operator const ServerObject_ptr &() const;
-     operator ServerObject_ptr &();
--    // in, inout, out, _retn 
-+    // in, inout, out, _retn
-     ServerObject_ptr in (void) const;
-     ServerObject_ptr &inout (void);
-     ServerObject_ptr &out (void);
-@@ -116,7 +123,7 @@
-     operator ServerObject_ptr &();
-     ServerObject_ptr &ptr (void);
-     ServerObject_ptr operator-> (void);
--    
-+
-   private:
-     ServerObject_ptr &ptr_;
-   };
-@@ -133,7 +140,7 @@
-   class _TAO_ServerObject_Remote_Proxy_Impl;
-   class _TAO_ServerObject_Proxy_Broker;
-   class _TAO_ServerObject_Remote_Proxy_Broker;
--  
-+
-   class TAO_PortableServer_Export ServerObject : public virtual CORBA_Object
-   {
-   public:
-@@ -146,12 +153,12 @@
-     static ServerObject_ptr _duplicate (ServerObject_ptr obj);
-     static ServerObject_ptr _narrow (
-         CORBA::Object_ptr obj,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
-     static ServerObject_ptr _unchecked_narrow (
-         CORBA::Object_ptr obj,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
-     static ServerObject_ptr _nil (void)
-@@ -162,7 +169,7 @@
-     static void _tao_any_destructor (void*);
- 
-     virtual void ping (
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((
-@@ -170,7 +177,7 @@
-       ));
- 
-     virtual void shutdown (
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((
-@@ -178,39 +185,39 @@
-       ));
- 
-     virtual CORBA::Boolean _is_a (
--        const CORBA::Char *type_id, 
--        CORBA::Environment &ACE_TRY_ENV = 
-+        const CORBA::Char *type_id,
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
-     virtual void *_tao_QueryInterface (ptr_arith_t type);
--    
-+
-     virtual const char* _interface_repository_id (void) const;
- 
-   private:
-     _TAO_ServerObject_Proxy_Broker *the_TAO_ServerObject_Proxy_Broker_;
--    
-+
-   protected:
-     ServerObject (int collocated = 0);
--    
-+
-     protected:
-       // This methods travese the inheritance tree and set the
-       // parents piece of the given class in the right mode
-       virtual void ImplementationRepository_ServerObject_setup_collocation (int collocated);
--      
-+
-       ServerObject (
--        TAO_Stub *objref, 
-+        TAO_Stub *objref,
-         CORBA::Boolean _tao_collocated = 0,
-         TAO_Abstract_ServantBase *servant = 0
-         );
--      
-+
-       friend class _TAO_ServerObject_Remote_Proxy_Impl;
-       friend class _TAO_ServerObject_ThruPOA_Proxy_Impl;
-       friend class _TAO_ServerObject_Direct_Proxy_Impl;
--    
-+
-     virtual ~ServerObject (void);
-   private:
-     ServerObject (const ServerObject &);
--    void operator= (const ServerObject &);    
-+    void operator= (const ServerObject &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-     // Generation of interceptors related RequestInfo classes per operation.
-@@ -221,80 +228,80 @@
-     {
-     public:
-       friend class ImplementationRepository::ServerObject;
--      
-+
-       friend class _TAO_ServerObject_Remote_Proxy_Impl;
-       friend class _TAO_ServerObject_ThruPOA_Proxy_Impl;
-       friend class _TAO_ServerObject_Direct_Proxy_Impl;
--    
-+
-     TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (
-         TAO_GIOP_Invocation *_tao_invocation,
-         CORBA::Object_ptr _tao_target,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
--    
-+
-     virtual Dynamic::ParameterList * arguments (
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual Dynamic::ExceptionList * exceptions (
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-     virtual CORBA::Any * result (
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((CORBA::SystemException));
--    
-+
-   private:
-     TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &);
-     void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &);
--    
-+
-   };
--  
-+
-   class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ClientRequestInfo
-   {
-   public:
-     friend class ImplementationRepository::ServerObject;
--    
-+
-     friend class _TAO_ServerObject_Remote_Proxy_Impl;
-     friend class _TAO_ServerObject_ThruPOA_Proxy_Impl;
-     friend class _TAO_ServerObject_Direct_Proxy_Impl;
--  
-+
-   TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (
-       TAO_GIOP_Invocation *_tao_invocation,
-       CORBA::Object_ptr _tao_target,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
--  
-+
-   virtual Dynamic::ParameterList * arguments (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((CORBA::SystemException));
--  
-+
-   virtual Dynamic::ExceptionList * exceptions (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((CORBA::SystemException));
--  
-+
-   virtual CORBA::Any * result (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((CORBA::SystemException));
--  
-+
- private:
-   TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &);
-   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &);
--  
-+
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-@@ -315,7 +322,7 @@
- {
- public:
-   virtual ~_TAO_ServerObject_Proxy_Impl (void) { }
--  
-+
-     virtual void ping (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -345,15 +352,15 @@
- //                    Remote  Impl. Declaration
- //
- 
--class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Impl : 
-+class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Impl :
-   public virtual _TAO_ServerObject_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl
- {
- public:
-   _TAO_ServerObject_Remote_Proxy_Impl (void);
--  
-+
-   virtual ~_TAO_ServerObject_Remote_Proxy_Impl (void) { }
--  
-+
-     virtual void ping (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::Environment &ACE_TRY_ENV
-@@ -378,14 +385,14 @@
- 
- 
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new 
-+// the right proxy for performing a call. In the new
- // collocation scheme, the proxy to be used can vary on
--// a call by call basis. 
-+// a call by call basis.
- 
- 
- 
- ///////////////////////////////////////////////////////////////////////
--//                 Base Proxy Broker Declaration 
-+//                 Base Proxy Broker Declaration
- //
- 
- class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Broker
-@@ -399,25 +406,25 @@
- 
- protected:
-   _TAO_ServerObject_Proxy_Broker (void);
--  
-+
- };
- 
- //
--//              End Base Proxy Broker Declaration 
-+//              End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
- 
- 
- ///////////////////////////////////////////////////////////////////////
--//                 Remote Proxy Broker Declaration 
-+//                 Remote Proxy Broker Declaration
- //
- 
- class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Broker : public virtual _TAO_ServerObject_Proxy_Broker
- {
--public: 
-+public:
-   _TAO_ServerObject_Remote_Proxy_Broker (void);
--  
-+
-   virtual ~_TAO_ServerObject_Remote_Proxy_Broker (void);
--  
-+
-   virtual _TAO_ServerObject_Proxy_Impl &select_proxy (
-     ServerObject *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-@@ -435,7 +442,7 @@
- 
- 
- //
--//              End Remote Proxy Broker Declaration 
-+//              End Remote Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
- 
- 
-@@ -466,18 +473,18 @@
-   EnvironmentVariable_var (EnvironmentVariable *);
-   EnvironmentVariable_var (const EnvironmentVariable_var &); // copy constructor
-   ~EnvironmentVariable_var (void); // destructor
--  
-+
-   EnvironmentVariable_var &operator= (EnvironmentVariable *);
-   EnvironmentVariable_var &operator= (const EnvironmentVariable_var &);
-   EnvironmentVariable *operator-> (void);
-   const EnvironmentVariable *operator-> (void) const;
--  
-+
-   operator const EnvironmentVariable &() const;
-   operator EnvironmentVariable &();
-   operator EnvironmentVariable &() const;
-   operator EnvironmentVariable *&(); // variable-size types only
--  
--  // in, inout, out, _retn 
-+
-+  // in, inout, out, _retn
-   const EnvironmentVariable &in (void) const;
-   EnvironmentVariable &inout (void);
-   EnvironmentVariable *&out (void);
-@@ -499,7 +506,7 @@
-   operator EnvironmentVariable *&();
-   EnvironmentVariable *&ptr (void);
-   EnvironmentVariable *operator-> (void);
--  
-+
- private:
-   EnvironmentVariable *&ptr_;
-   // assignment from T_var not allowed
-@@ -515,7 +522,7 @@
- 
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--  
-+
- #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
- #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
- 
-@@ -523,9 +530,9 @@
-   {
-   public:
-     // = Initialization and termination methods.
--    
-+
-     _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void); // Default constructor.
--    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum); 
-+    _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum);
-     _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum,
-       CORBA::ULong length,
-       EnvironmentVariable *data,
-@@ -542,7 +549,7 @@
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
-     // Implement the TAO_Base_Sequence methods (see Sequence.h)
--    
-+
-     EnvironmentVariable *get_buffer (CORBA::Boolean orphan = 0);
-     const EnvironmentVariable *get_buffer (void) const;
-     void replace (CORBA::ULong max,
-@@ -554,7 +561,7 @@
- #endif /* end #if !defined */
- 
- 
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- 
- #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
- #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
-@@ -566,20 +573,20 @@
- // EnvironmentList
- // *************************************************************
- 
--class TAO_PortableServer_Export EnvironmentList : public 
-+class TAO_PortableServer_Export EnvironmentList : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_Sequence<EnvironmentVariable>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- {
- public:
-   EnvironmentList (void); // default ctor
-   EnvironmentList (CORBA::ULong max); // uses max size
-   EnvironmentList (
--    CORBA::ULong max, 
--    CORBA::ULong length, 
--    EnvironmentVariable *buffer, 
-+    CORBA::ULong max,
-+    CORBA::ULong length,
-+    EnvironmentVariable *buffer,
-     CORBA::Boolean release = 0
-   );
-   EnvironmentList (const EnvironmentList &); // copy ctor
-@@ -609,21 +616,21 @@
-   EnvironmentList_var (EnvironmentList *);
-   EnvironmentList_var (const EnvironmentList_var &); // copy constructor
-   ~EnvironmentList_var (void); // destructor
--  
-+
-   EnvironmentList_var &operator= (EnvironmentList *);
-   EnvironmentList_var &operator= (const EnvironmentList_var &);
-   EnvironmentList *operator-> (void);
-   const EnvironmentList *operator-> (void) const;
--  
-+
-   operator const EnvironmentList &() const;
-   operator EnvironmentList &();
-   operator EnvironmentList &() const;
-   operator EnvironmentList *&(); // variable-size base types only
--  
-+
-   EnvironmentVariable & operator[] (CORBA::ULong index);
-   const EnvironmentVariable & operator[] (CORBA::ULong index) const;
--  
--  // in, inout, out, _retn 
-+
-+  // in, inout, out, _retn
-   const EnvironmentList &in (void) const;
-   EnvironmentList &inout (void);
-   EnvironmentList *&out (void);
-@@ -653,7 +660,7 @@
-   EnvironmentList *&ptr (void);
-   EnvironmentList *operator-> (void);
-   EnvironmentVariable & operator[] (CORBA::ULong index);
--  
-+
- private:
-   EnvironmentList *&ptr_;
-   // assignment from T_var not allowed
-@@ -670,7 +677,7 @@
-     NORMAL,
-     MANUAL,
-     PER_CLIENT,
--    AUTO_START  
-+    AUTO_START
- };
- typedef ActivationMode &ActivationMode_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ActivationMode;
-@@ -700,18 +707,18 @@
-   StartupOptions_var (StartupOptions *);
-   StartupOptions_var (const StartupOptions_var &); // copy constructor
-   ~StartupOptions_var (void); // destructor
--  
-+
-   StartupOptions_var &operator= (StartupOptions *);
-   StartupOptions_var &operator= (const StartupOptions_var &);
-   StartupOptions *operator-> (void);
-   const StartupOptions *operator-> (void) const;
--  
-+
-   operator const StartupOptions &() const;
-   operator StartupOptions &();
-   operator StartupOptions &() const;
-   operator StartupOptions *&(); // variable-size types only
--  
--  // in, inout, out, _retn 
-+
-+  // in, inout, out, _retn
-   const StartupOptions &in (void) const;
-   StartupOptions &inout (void);
-   StartupOptions *&out (void);
-@@ -733,7 +740,7 @@
-   operator StartupOptions *&();
-   StartupOptions *&ptr (void);
-   StartupOptions *operator-> (void);
--  
-+
- private:
-   StartupOptions *&ptr_;
-   // assignment from T_var not allowed
-@@ -767,18 +774,18 @@
-   ServerInformation_var (ServerInformation *);
-   ServerInformation_var (const ServerInformation_var &); // copy constructor
-   ~ServerInformation_var (void); // destructor
--  
-+
-   ServerInformation_var &operator= (ServerInformation *);
-   ServerInformation_var &operator= (const ServerInformation_var &);
-   ServerInformation *operator-> (void);
-   const ServerInformation *operator-> (void) const;
--  
-+
-   operator const ServerInformation &() const;
-   operator ServerInformation &();
-   operator ServerInformation &() const;
-   operator ServerInformation *&(); // variable-size types only
--  
--  // in, inout, out, _retn 
-+
-+  // in, inout, out, _retn
-   const ServerInformation &in (void) const;
-   ServerInformation &inout (void);
-   ServerInformation *&out (void);
-@@ -800,7 +807,7 @@
-   operator ServerInformation *&();
-   ServerInformation *&ptr (void);
-   ServerInformation *operator-> (void);
--  
-+
- private:
-   ServerInformation *&ptr_;
-   // assignment from T_var not allowed
-@@ -811,7 +818,7 @@
- 
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--  
-+
- #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
- #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
- 
-@@ -819,9 +826,9 @@
-   {
-   public:
-     // = Initialization and termination methods.
--    
-+
-     _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void); // Default constructor.
--    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum); 
-+    _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum);
-     _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum,
-       CORBA::ULong length,
-       ServerInformation *data,
-@@ -838,7 +845,7 @@
-     virtual void _allocate_buffer (CORBA::ULong length);
-     virtual void _deallocate_buffer (void);
-     // Implement the TAO_Base_Sequence methods (see Sequence.h)
--    
-+
-     ServerInformation *get_buffer (CORBA::Boolean orphan = 0);
-     const ServerInformation *get_buffer (void) const;
-     void replace (CORBA::ULong max,
-@@ -850,7 +857,7 @@
- #endif /* end #if !defined */
- 
- 
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- 
- #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
- #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
-@@ -862,20 +869,20 @@
- // ServerInformationList
- // *************************************************************
- 
--class TAO_PortableServer_Export ServerInformationList : public 
-+class TAO_PortableServer_Export ServerInformationList : public
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_Sequence<ServerInformation>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- {
- public:
-   ServerInformationList (void); // default ctor
-   ServerInformationList (CORBA::ULong max); // uses max size
-   ServerInformationList (
--    CORBA::ULong max, 
--    CORBA::ULong length, 
--    ServerInformation *buffer, 
-+    CORBA::ULong max,
-+    CORBA::ULong length,
-+    ServerInformation *buffer,
-     CORBA::Boolean release = 0
-   );
-   ServerInformationList (const ServerInformationList &); // copy ctor
-@@ -905,21 +912,21 @@
-   ServerInformationList_var (ServerInformationList *);
-   ServerInformationList_var (const ServerInformationList_var &); // copy constructor
-   ~ServerInformationList_var (void); // destructor
--  
-+
-   ServerInformationList_var &operator= (ServerInformationList *);
-   ServerInformationList_var &operator= (const ServerInformationList_var &);
-   ServerInformationList *operator-> (void);
-   const ServerInformationList *operator-> (void) const;
--  
-+
-   operator const ServerInformationList &() const;
-   operator ServerInformationList &();
-   operator ServerInformationList &() const;
-   operator ServerInformationList *&(); // variable-size base types only
--  
-+
-   ServerInformation & operator[] (CORBA::ULong index);
-   const ServerInformation & operator[] (CORBA::ULong index) const;
--  
--  // in, inout, out, _retn 
-+
-+  // in, inout, out, _retn
-   const ServerInformationList &in (void) const;
-   ServerInformationList &inout (void);
-   ServerInformationList *&out (void);
-@@ -949,7 +956,7 @@
-   ServerInformationList *&ptr (void);
-   ServerInformationList *operator-> (void);
-   ServerInformation & operator[] (CORBA::ULong index);
--  
-+
- private:
-   ServerInformationList *&ptr_;
-   // assignment from T_var not allowed
-@@ -978,17 +985,17 @@
- {
- public:
-   ServerInformationIterator_var (void); // default constructor
--  ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} 
-+  ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {}
-   ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor
-   ~ServerInformationIterator_var (void); // destructor
--  
-+
-   ServerInformationIterator_var &operator= (ServerInformationIterator_ptr);
-   ServerInformationIterator_var &operator= (const ServerInformationIterator_var &);
-   ServerInformationIterator_ptr operator-> (void) const;
--  
-+
-   operator const ServerInformationIterator_ptr &() const;
-   operator ServerInformationIterator_ptr &();
--  // in, inout, out, _retn 
-+  // in, inout, out, _retn
-   ServerInformationIterator_ptr in (void) const;
-   ServerInformationIterator_ptr &inout (void);
-   ServerInformationIterator_ptr &out (void);
-@@ -1021,7 +1028,7 @@
-   operator ServerInformationIterator_ptr &();
-   ServerInformationIterator_ptr &ptr (void);
-   ServerInformationIterator_ptr operator-> (void);
--  
-+
- private:
-   ServerInformationIterator_ptr &ptr_;
- };
-@@ -1046,17 +1053,17 @@
- {
- public:
-   Administration_var (void); // default constructor
--  Administration_var (Administration_ptr p) : ptr_ (p) {} 
-+  Administration_var (Administration_ptr p) : ptr_ (p) {}
-   Administration_var (const Administration_var &); // copy constructor
-   ~Administration_var (void); // destructor
--  
-+
-   Administration_var &operator= (Administration_ptr);
-   Administration_var &operator= (const Administration_var &);
-   Administration_ptr operator-> (void) const;
--  
-+
-   operator const Administration_ptr &() const;
-   operator Administration_ptr &();
--  // in, inout, out, _retn 
-+  // in, inout, out, _retn
-   Administration_ptr in (void) const;
-   Administration_ptr &inout (void);
-   Administration_ptr &out (void);
-@@ -1089,7 +1096,7 @@
-   operator Administration_ptr &();
-   Administration_ptr &ptr (void);
-   Administration_ptr operator-> (void);
--  
-+
- private:
-   Administration_ptr &ptr_;
- };
-@@ -1119,12 +1126,12 @@
-   static Administration_ptr _duplicate (Administration_ptr obj);
-   static Administration_ptr _narrow (
-       CORBA::Object_ptr obj,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
-   static Administration_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
-   static Administration_ptr _nil (void)
-@@ -1144,29 +1151,29 @@
- 
-     AlreadyRegistered (void);
-     // Default constructor.
--    
-+
-     AlreadyRegistered (const AlreadyRegistered &);
-     // Copy constructor.
--    
-+
-     ~AlreadyRegistered (void);
-     // Destructor.
--    
-+
-     static void _tao_any_destructor (void*);
--    
-+
-     AlreadyRegistered &operator= (const AlreadyRegistered &);
--    
-+
-     virtual void _raise (void);
- 
-     virtual void _tao_encode (
-         TAO_OutputCDR &,
-         CORBA::Environment &
-       ) const;
--    
-+
-     virtual void _tao_decode (
-         TAO_InputCDR &,
-         CORBA::Environment &
-       );
--    
-+
-     static AlreadyRegistered *_downcast (CORBA::Exception *);
- 
- 
-@@ -1191,35 +1198,35 @@
- 
-     CannotActivate (void);
-     // Default constructor.
--    
-+
-     CannotActivate (const CannotActivate &);
-     // Copy constructor.
--    
-+
-     ~CannotActivate (void);
-     // Destructor.
--    
-+
-     static void _tao_any_destructor (void*);
--    
-+
-     CannotActivate &operator= (const CannotActivate &);
--    
-+
-     virtual void _raise (void);
- 
-     virtual void _tao_encode (
-         TAO_OutputCDR &,
-         CORBA::Environment &
-       ) const;
--    
-+
-     virtual void _tao_decode (
-         TAO_InputCDR &,
-         CORBA::Environment &
-       );
--    
-+
-     static CannotActivate *_downcast (CORBA::Exception *);
- 
-     CannotActivate (
-         const char * _tao_reason
-       );
--    
-+
-     // = TAO extension.
-     static CORBA::Exception *_alloc (void);
-     virtual CORBA::TypeCode_ptr _type (void) const;
-@@ -1240,29 +1247,29 @@
- 
-     NotFound (void);
-     // Default constructor.
--    
-+
-     NotFound (const NotFound &);
-     // Copy constructor.
--    
-+
-     ~NotFound (void);
-     // Destructor.
--    
-+
-     static void _tao_any_destructor (void*);
--    
-+
-     NotFound &operator= (const NotFound &);
--    
-+
-     virtual void _raise (void);
- 
-     virtual void _tao_encode (
-         TAO_OutputCDR &,
-         CORBA::Environment &
-       ) const;
--    
-+
-     virtual void _tao_decode (
-         TAO_InputCDR &,
-         CORBA::Environment &
-       );
--    
-+
-     static NotFound *_downcast (CORBA::Exception *);
- 
- 
-@@ -1278,7 +1285,7 @@
- 
-   virtual void activate_server (
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -1290,7 +1297,7 @@
-   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 ((
-@@ -1301,7 +1308,7 @@
-   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 ((
-@@ -1310,7 +1317,7 @@
- 
-   virtual void remove_server (
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -1320,7 +1327,7 @@
- 
-   virtual void shutdown_server (
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -1332,7 +1339,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 ((
-@@ -1342,7 +1349,7 @@
- 
-   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 ((
-@@ -1353,7 +1360,7 @@
-   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 ((
-@@ -1365,7 +1372,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 ((
-@@ -1373,39 +1380,39 @@
-     ));
- 
-   virtual CORBA::Boolean _is_a (
--      const CORBA::Char *type_id, 
--      CORBA::Environment &ACE_TRY_ENV = 
-+      const CORBA::Char *type_id,
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
-   virtual void *_tao_QueryInterface (ptr_arith_t type);
--  
-+
-   virtual const char* _interface_repository_id (void) const;
- 
- private:
-   _TAO_Administration_Proxy_Broker *the_TAO_Administration_Proxy_Broker_;
--  
-+
- protected:
-   Administration (int collocated = 0);
--  
-+
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void ImplementationRepository_Administration_setup_collocation (int collocated);
--    
-+
-     Administration (
--      TAO_Stub *objref, 
-+      TAO_Stub *objref,
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-       );
--    
-+
-     friend class _TAO_Administration_Remote_Proxy_Impl;
-     friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-     friend class _TAO_Administration_Direct_Proxy_Impl;
--  
-+
-   virtual ~Administration (void);
- private:
-   Administration (const Administration &);
--  void operator= (const Administration &);  
-+  void operator= (const Administration &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -1416,49 +1423,49 @@
-   {
-   public:
-     friend class ImplementationRepository::Administration;
--    
-+
-     friend class _TAO_Administration_Remote_Proxy_Impl;
-     friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-     friend class _TAO_Administration_Direct_Proxy_Impl;
--  
-+
-   TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (
-       TAO_GIOP_Invocation *_tao_invocation,
-       CORBA::Object_ptr _tao_target,
-       const char * server,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
--  
-+
-   virtual Dynamic::ParameterList * arguments (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((CORBA::SystemException));
--  
-+
-   virtual Dynamic::ExceptionList * exceptions (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((CORBA::SystemException));
--  
-+
-   virtual CORBA::Any * result (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((CORBA::SystemException));
--  
-+
- private:
-   TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &);
-   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &);
-   const char * server_;
--  
-+
- };
- 
- class TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ClientRequestInfo
- {
- public:
-   friend class ImplementationRepository::Administration;
--  
-+
-   friend class _TAO_Administration_Remote_Proxy_Impl;
-   friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-   friend class _TAO_Administration_Direct_Proxy_Impl;
-@@ -1468,24 +1475,24 @@
-     CORBA::Object_ptr _tao_target,
-     const char * server,
-     const ImplementationRepository::StartupOptions & options,
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   );
- 
- virtual Dynamic::ParameterList * arguments (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual Dynamic::ExceptionList * exceptions (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual CORBA::Any * result (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
-@@ -1495,14 +1502,14 @@
-   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server &);
-   const char * server_;
-   const ImplementationRepository::StartupOptions & options_;
--  
-+
- };
- 
- class TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ClientRequestInfo
- {
- public:
-   friend class ImplementationRepository::Administration;
--  
-+
-   friend class _TAO_Administration_Remote_Proxy_Impl;
-   friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-   friend class _TAO_Administration_Direct_Proxy_Impl;
-@@ -1512,24 +1519,24 @@
-     CORBA::Object_ptr _tao_target,
-     const char * server,
-     const ImplementationRepository::StartupOptions & options,
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   );
- 
- virtual Dynamic::ParameterList * arguments (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual Dynamic::ExceptionList * exceptions (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual CORBA::Any * result (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
-@@ -1539,14 +1546,14 @@
-   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server &);
-   const char * server_;
-   const ImplementationRepository::StartupOptions & options_;
--  
-+
- };
- 
- class TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ClientRequestInfo
- {
- public:
-   friend class ImplementationRepository::Administration;
--  
-+
-   friend class _TAO_Administration_Remote_Proxy_Impl;
-   friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-   friend class _TAO_Administration_Direct_Proxy_Impl;
-@@ -1555,24 +1562,24 @@
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * server,
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   );
- 
- virtual Dynamic::ParameterList * arguments (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual Dynamic::ExceptionList * exceptions (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual CORBA::Any * result (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
-@@ -1581,14 +1588,14 @@
-   TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &);
-   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &);
-   const char * server_;
--  
-+
- };
- 
- class TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ClientRequestInfo
- {
- public:
-   friend class ImplementationRepository::Administration;
--  
-+
-   friend class _TAO_Administration_Remote_Proxy_Impl;
-   friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-   friend class _TAO_Administration_Direct_Proxy_Impl;
-@@ -1597,24 +1604,24 @@
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * server,
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   );
- 
- virtual Dynamic::ParameterList * arguments (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual Dynamic::ExceptionList * exceptions (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual CORBA::Any * result (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
-@@ -1623,14 +1630,14 @@
-   TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &);
-   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &);
-   const char * server_;
--  
-+
- };
- 
- class TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ClientRequestInfo
- {
- public:
-   friend class ImplementationRepository::Administration;
--  
-+
-   friend class _TAO_Administration_Remote_Proxy_Impl;
-   friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-   friend class _TAO_Administration_Direct_Proxy_Impl;
-@@ -1641,24 +1648,24 @@
-     const char * server,
-     const char * addr,
-     ImplementationRepository::ServerObject_ptr server_object,
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   );
- 
- virtual Dynamic::ParameterList * arguments (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual Dynamic::ExceptionList * exceptions (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual CORBA::Any * result (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
-@@ -1670,7 +1677,7 @@
-   const char * addr_;
-   ImplementationRepository::ServerObject_ptr server_object_;
-   void result (char * result);
--  // update the result 
-+  // update the result
-   char * _result;
- };
- 
-@@ -1678,7 +1685,7 @@
- {
- public:
-   friend class ImplementationRepository::Administration;
--  
-+
-   friend class _TAO_Administration_Remote_Proxy_Impl;
-   friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-   friend class _TAO_Administration_Direct_Proxy_Impl;
-@@ -1687,24 +1694,24 @@
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * server,
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   );
- 
- virtual Dynamic::ParameterList * arguments (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual Dynamic::ExceptionList * exceptions (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual CORBA::Any * result (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
-@@ -1713,14 +1720,14 @@
-   TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
-   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
-   const char * server_;
--  
-+
- };
- 
- class TAO_ClientRequestInfo_ImplementationRepository_Administration_find : public TAO_ClientRequestInfo
- {
- public:
-   friend class ImplementationRepository::Administration;
--  
-+
-   friend class _TAO_Administration_Remote_Proxy_Impl;
-   friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-   friend class _TAO_Administration_Direct_Proxy_Impl;
-@@ -1729,24 +1736,24 @@
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
-     const char * server,
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   );
- 
- virtual Dynamic::ParameterList * arguments (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual Dynamic::ExceptionList * exceptions (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual CORBA::Any * result (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
-@@ -1755,14 +1762,14 @@
-   TAO_ClientRequestInfo_ImplementationRepository_Administration_find (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &);
-   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &);
-   const char * server_;
--  
-+
- };
- 
- class TAO_ClientRequestInfo_ImplementationRepository_Administration_list : public TAO_ClientRequestInfo
- {
- public:
-   friend class ImplementationRepository::Administration;
--  
-+
-   friend class _TAO_Administration_Remote_Proxy_Impl;
-   friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-   friend class _TAO_Administration_Direct_Proxy_Impl;
-@@ -1770,26 +1777,26 @@
- TAO_ClientRequestInfo_ImplementationRepository_Administration_list (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    const CORBA::ULong & how_many    
-+    const CORBA::ULong & how_many
- ,
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   );
- 
- virtual Dynamic::ParameterList * arguments (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual Dynamic::ExceptionList * exceptions (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual CORBA::Any * result (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
-@@ -1798,7 +1805,7 @@
-   TAO_ClientRequestInfo_ImplementationRepository_Administration_list (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &);
-   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &);
-   const CORBA::ULong & how_many_;
--    
-+
- 
- };
- 
-@@ -1820,7 +1827,7 @@
- {
- public:
-   virtual ~_TAO_Administration_Proxy_Impl (void) { }
--  
-+
-     virtual void activate_server (
-       CORBA_Object *_collocated_tao_target_,
-       const char * server,
-@@ -1930,15 +1937,15 @@
- //                    Remote  Impl. Declaration
- //
- 
--class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl : 
-+class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl :
-   public virtual _TAO_Administration_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl
- {
- public:
-   _TAO_Administration_Remote_Proxy_Impl (void);
--  
-+
-   virtual ~_TAO_Administration_Remote_Proxy_Impl (void) { }
--  
-+
-     virtual void activate_server (
-       CORBA_Object *_collocated_tao_target_,
-       const char * server,
-@@ -2043,14 +2050,14 @@
- 
- 
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new 
-+// the right proxy for performing a call. In the new
- // collocation scheme, the proxy to be used can vary on
--// a call by call basis. 
-+// a call by call basis.
- 
- 
- 
- ///////////////////////////////////////////////////////////////////////
--//                 Base Proxy Broker Declaration 
-+//                 Base Proxy Broker Declaration
- //
- 
- class TAO_PortableServer_Export _TAO_Administration_Proxy_Broker
-@@ -2064,25 +2071,25 @@
- 
- protected:
-   _TAO_Administration_Proxy_Broker (void);
--  
-+
- };
- 
- //
--//              End Base Proxy Broker Declaration 
-+//              End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
- 
- 
- ///////////////////////////////////////////////////////////////////////
--//                 Remote Proxy Broker Declaration 
-+//                 Remote Proxy Broker Declaration
- //
- 
- class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Broker : public virtual _TAO_Administration_Proxy_Broker
- {
--public: 
-+public:
-   _TAO_Administration_Remote_Proxy_Broker (void);
--  
-+
-   virtual ~_TAO_Administration_Remote_Proxy_Broker (void);
--  
-+
-   virtual _TAO_Administration_Proxy_Impl &select_proxy (
-     Administration *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-@@ -2100,7 +2107,7 @@
- 
- 
- //
--//              End Remote Proxy Broker Declaration 
-+//              End Remote Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
- 
- 
-@@ -2125,17 +2132,17 @@
- {
- public:
-   ServerInformationIterator_var (void); // default constructor
--  ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {} 
-+  ServerInformationIterator_var (ServerInformationIterator_ptr p) : ptr_ (p) {}
-   ServerInformationIterator_var (const ServerInformationIterator_var &); // copy constructor
-   ~ServerInformationIterator_var (void); // destructor
--  
-+
-   ServerInformationIterator_var &operator= (ServerInformationIterator_ptr);
-   ServerInformationIterator_var &operator= (const ServerInformationIterator_var &);
-   ServerInformationIterator_ptr operator-> (void) const;
--  
-+
-   operator const ServerInformationIterator_ptr &() const;
-   operator ServerInformationIterator_ptr &();
--  // in, inout, out, _retn 
-+  // in, inout, out, _retn
-   ServerInformationIterator_ptr in (void) const;
-   ServerInformationIterator_ptr &inout (void);
-   ServerInformationIterator_ptr &out (void);
-@@ -2168,7 +2175,7 @@
-   operator ServerInformationIterator_ptr &();
-   ServerInformationIterator_ptr &ptr (void);
-   ServerInformationIterator_ptr operator-> (void);
--  
-+
- private:
-   ServerInformationIterator_ptr &ptr_;
- };
-@@ -2198,12 +2205,12 @@
-   static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
-   static ServerInformationIterator_ptr _narrow (
-       CORBA::Object_ptr obj,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
-   static ServerInformationIterator_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
-   static ServerInformationIterator_ptr _nil (void)
-@@ -2216,7 +2223,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 ((
-@@ -2224,7 +2231,7 @@
-     ));
- 
-   virtual void destroy (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -2232,39 +2239,39 @@
-     ));
- 
-   virtual CORBA::Boolean _is_a (
--      const CORBA::Char *type_id, 
--      CORBA::Environment &ACE_TRY_ENV = 
-+      const CORBA::Char *type_id,
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
-   virtual void *_tao_QueryInterface (ptr_arith_t type);
--  
-+
-   virtual const char* _interface_repository_id (void) const;
- 
- private:
-   _TAO_ServerInformationIterator_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_;
--  
-+
- protected:
-   ServerInformationIterator (int collocated = 0);
--  
-+
-   protected:
-     // This methods travese the inheritance tree and set the
-     // parents piece of the given class in the right mode
-     virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated);
--    
-+
-     ServerInformationIterator (
--      TAO_Stub *objref, 
-+      TAO_Stub *objref,
-       CORBA::Boolean _tao_collocated = 0,
-       TAO_Abstract_ServantBase *servant = 0
-       );
--    
-+
-     friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
-     friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
-     friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
--  
-+
-   virtual ~ServerInformationIterator (void);
- private:
-   ServerInformationIterator (const ServerInformationIterator &);
--  void operator= (const ServerInformationIterator &);  
-+  void operator= (const ServerInformationIterator &);
- 
- #if (TAO_HAS_INTERCEPTORS == 1)
-   // Generation of interceptors related RequestInfo classes per operation.
-@@ -2275,43 +2282,43 @@
-   {
-   public:
-     friend class ImplementationRepository::ServerInformationIterator;
--    
-+
-     friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
-     friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
-     friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
--  
-+
-   TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
-       TAO_GIOP_Invocation *_tao_invocation,
-       CORBA::Object_ptr _tao_target,
-       const CORBA::ULong & how_many,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
--  
-+
-   virtual Dynamic::ParameterList * arguments (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((CORBA::SystemException));
--  
-+
-   virtual Dynamic::ExceptionList * exceptions (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((CORBA::SystemException));
--  
-+
-   virtual CORBA::Any * result (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((CORBA::SystemException));
--  
-+
- private:
-   TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
-   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
-   const CORBA::ULong & how_many_;
-   void result (CORBA::Boolean result);
--  // update the result 
-+  // update the result
-   CORBA::Boolean _result;
- };
- 
-@@ -2319,7 +2326,7 @@
- {
- public:
-   friend class ImplementationRepository::ServerInformationIterator;
--  
-+
-   friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
-   friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
-   friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
-@@ -2327,24 +2334,24 @@
- TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
-     TAO_GIOP_Invocation *_tao_invocation,
-     CORBA::Object_ptr _tao_target,
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   );
- 
- virtual Dynamic::ParameterList * arguments (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual Dynamic::ExceptionList * exceptions (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
- 
- virtual CORBA::Any * result (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((CORBA::SystemException));
-@@ -2352,7 +2359,7 @@
- private:
-   TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
-   void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
--  
-+
- };
- 
- #endif /* TAO_HAS_INTERCEPTORS */
-@@ -2373,7 +2380,7 @@
- {
- public:
-   virtual ~_TAO_ServerInformationIterator_Proxy_Impl (void) { }
--  
-+
-     virtual CORBA::Boolean next_n (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::ULong how_many,
-@@ -2405,15 +2412,15 @@
- //                    Remote  Impl. Declaration
- //
- 
--class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Impl : 
-+class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Impl :
-   public virtual _TAO_ServerInformationIterator_Proxy_Impl,
-   public virtual TAO_Remote_Object_Proxy_Impl
- {
- public:
-   _TAO_ServerInformationIterator_Remote_Proxy_Impl (void);
--  
-+
-   virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Impl (void) { }
--  
-+
-     virtual CORBA::Boolean next_n (
-       CORBA_Object *_collocated_tao_target_,
-       CORBA::ULong how_many,
-@@ -2440,14 +2447,14 @@
- 
- 
- // The Proxy Brokers are used by each interface to get
--// the right proxy for performing a call. In the new 
-+// the right proxy for performing a call. In the new
- // collocation scheme, the proxy to be used can vary on
--// a call by call basis. 
-+// a call by call basis.
- 
- 
- 
- ///////////////////////////////////////////////////////////////////////
--//                 Base Proxy Broker Declaration 
-+//                 Base Proxy Broker Declaration
- //
- 
- class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Broker
-@@ -2461,25 +2468,25 @@
- 
- protected:
-   _TAO_ServerInformationIterator_Proxy_Broker (void);
--  
-+
- };
- 
- //
--//              End Base Proxy Broker Declaration 
-+//              End Base Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
- 
- 
- ///////////////////////////////////////////////////////////////////////
--//                 Remote Proxy Broker Declaration 
-+//                 Remote Proxy Broker Declaration
- //
- 
- class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Broker : public virtual _TAO_ServerInformationIterator_Proxy_Broker
- {
--public: 
-+public:
-   _TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
--  
-+
-   virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
--  
-+
-   virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
-     ServerInformationIterator *object,
-     CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-@@ -2497,7 +2504,7 @@
- 
- 
- //
--//              End Remote Proxy Broker Declaration 
-+//              End Remote Proxy Broker Declaration
- ///////////////////////////////////////////////////////////////////////
- 
- 
-@@ -2588,7 +2595,7 @@
- 
- #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */
- 
--TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); // 
-+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &); //
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
+ #if defined (TAO_EXPORT_MACRO)
diff --git a/TAO/tao/diffs/ImplRepoC.i.diff b/TAO/tao/diffs/ImplRepoC.i.diff
index ead551b5f09..d7f2cabfa09 100644
--- a/TAO/tao/diffs/ImplRepoC.i.diff
+++ b/TAO/tao/diffs/ImplRepoC.i.diff
@@ -1,814 +1,52 @@
---- orig/ImplRepoC.i	Sun Apr  1 16:33:08 2001
-+++ ImplRepoC.i	Sun Apr  1 17:47:35 2001
-@@ -86,14 +86,14 @@
-   return *this;
- }
+--- orig/ImplRepoC.i	Wed Apr 18 01:09:40 2001
++++ ImplRepoC.i	Tue Apr 17 17:57:07 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:
+@@ -1581,12 +1581,12 @@
  
--ACE_INLINE 
-+ACE_INLINE
- ImplementationRepository::ServerObject_var::operator const ::ImplementationRepository::ServerObject_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE 
--ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast 
-+ACE_INLINE
-+ImplementationRepository::ServerObject_var::operator ::ImplementationRepository::ServerObject_ptr &() // cast
- {
-   return this->ptr_;
- }
-@@ -185,7 +185,7 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- ImplementationRepository::ServerObject_out::operator ::ImplementationRepository::ServerObject_ptr &() // cast
- {
-   return this->ptr_;
-@@ -257,7 +257,7 @@
-         {
-           EnvironmentVariable *deep_copy =
-             new EnvironmentVariable (*p.ptr_);
--          
-+
-           if (deep_copy != 0)
-             {
-               EnvironmentVariable *tmp = deep_copy;
-@@ -267,7 +267,7 @@
-             }
-         }
-     }
--  
-+
-   return *this;
- }
- 
-@@ -290,20 +290,20 @@
- }
- 
- ACE_INLINE
--ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast 
-+ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast 
-+ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable &() const // cast
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast 
-+ImplementationRepository::EnvironmentVariable_var::operator ::ImplementationRepository::EnvironmentVariable *&() // cast
- {
-   return this->ptr_;
- }
-@@ -320,7 +320,7 @@
-   return *this->ptr_;
- }
- 
--// mapping for variable size 
-+// mapping for variable size
- ACE_INLINE ::ImplementationRepository::EnvironmentVariable *&
- ImplementationRepository::EnvironmentVariable_var::out (void)
- {
-@@ -381,7 +381,7 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- ImplementationRepository::EnvironmentVariable_out::operator ::ImplementationRepository::EnvironmentVariable *&() // cast
- {
-   return this->ptr_;
-@@ -401,7 +401,7 @@
- 
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--  
-+
- #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_)
- #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_
- 
-@@ -414,24 +414,24 @@
-     ACE_NEW_RETURN (retval, ImplementationRepository::EnvironmentVariable[size], 0);
-     return retval;
-   }
--  
-+
-   ACE_INLINE void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (ImplementationRepository::EnvironmentVariable *buffer)
-   // Free the sequence.
-   {
-     delete [] buffer;
-   }
--  
-+
-   ACE_INLINE
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void) // Default constructor.
-   {
-   }
--  
-+
-   ACE_INLINE
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum) // Constructor using a maximum length value.
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (maximum))
-   {
-   }
--  
-+
-   ACE_INLINE
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (CORBA::ULong maximum,
-     CORBA::ULong length,
-@@ -440,7 +440,7 @@
-   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-   {
-   }
--  
-+
-   ACE_INLINE
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs)
-   // Copy constructor.
-@@ -450,10 +450,10 @@
-     {
-       ImplementationRepository::EnvironmentVariable *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (this->maximum_);
-       ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_);
--      
-+
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp1[i] = tmp2[i];
--      
-+
-       this->buffer_ = tmp1;
-     }
-     else
-@@ -461,14 +461,14 @@
-       this->buffer_ = 0;
-     }
-   }
--  
-+
-   ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator= (const _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList &rhs)
-   // Assignment operator.
-   {
-     if (this == &rhs)
-       return *this;
--    
-+
-     if (this->release_)
-     {
-       if (this->maximum_ < rhs.maximum_)
-@@ -481,18 +481,18 @@
-     }
-     else
-       this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (rhs.maximum_);
--    
-+
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
--    
-+
-     ImplementationRepository::EnvironmentVariable *tmp1 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *, this->buffer_);
-     ImplementationRepository::EnvironmentVariable * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, rhs.buffer_);
--    
-+
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-       tmp1[i] = tmp2[i];
--    
-+
-     return *this;
-   }
--  
-+
-   // = Accessors.
-   ACE_INLINE ImplementationRepository::EnvironmentVariable &
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i)
-@@ -502,7 +502,7 @@
-     ImplementationRepository::EnvironmentVariable* tmp = ACE_reinterpret_cast(ImplementationRepository::EnvironmentVariable*,this->buffer_);
-     return tmp[i];
-   }
--  
-+
-   ACE_INLINE const ImplementationRepository::EnvironmentVariable &
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::operator[] (CORBA::ULong i) const
-   // operator []
-@@ -511,9 +511,9 @@
-     ImplementationRepository::EnvironmentVariable * const tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable* ACE_CAST_CONST, this->buffer_);
-     return tmp[i];
-   }
--  
-+
-   // Implement the TAO_Base_Sequence methods (see Sequence.h)
--  
-+
-   ACE_INLINE ImplementationRepository::EnvironmentVariable *
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (CORBA::Boolean orphan)
-   {
-@@ -547,13 +547,13 @@
-     }
-     return result;
-   }
--  
-+
-   ACE_INLINE const ImplementationRepository::EnvironmentVariable *
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::get_buffer (void) const
-   {
-     return ACE_reinterpret_cast(const ImplementationRepository::EnvironmentVariable * ACE_CAST_CONST, this->buffer_);
-   }
--  
-+
-   ACE_INLINE void
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::replace (CORBA::ULong max,
-   CORBA::ULong length,
-@@ -570,11 +570,11 @@
-     this->buffer_ = data;
-     this->release_ = release;
-   }
--  
-+
  #endif /* end #if !defined */
  
- 
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- 
- #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_)
- #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CI_
-@@ -630,7 +630,7 @@
-         {
-           EnvironmentList *deep_copy =
-             new EnvironmentList (*p.ptr_);
--          
-+
-           if (deep_copy != 0)
-             {
-               EnvironmentList *tmp = deep_copy;
-@@ -640,7 +640,7 @@
-             }
-         }
-     }
--  
-+
-   return *this;
- }
- 
-@@ -656,27 +656,27 @@
-   return this->ptr_;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- ImplementationRepository::EnvironmentList_var::operator const ::ImplementationRepository::EnvironmentList &() const // cast
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE 
--ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast 
-+ACE_INLINE
-+ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() // cast
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE 
--ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast 
-+ACE_INLINE
-+ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList &() const // cast
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast 
-+ImplementationRepository::EnvironmentList_var::operator ::ImplementationRepository::EnvironmentList *&() // cast
- {
-   return this->ptr_;
- }
-@@ -705,7 +705,7 @@
-   return *this->ptr_;
- }
- 
--// mapping for variable size 
-+// mapping for variable size
- ACE_INLINE ::ImplementationRepository::EnvironmentList *&
- ImplementationRepository::EnvironmentList_var::out (void)
- {
-@@ -766,7 +766,7 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- ImplementationRepository::EnvironmentList_out::operator ::ImplementationRepository::EnvironmentList *&() // cast
- {
-   return this->ptr_;
-@@ -844,7 +844,7 @@
-         {
-           StartupOptions *deep_copy =
-             new StartupOptions (*p.ptr_);
--          
-+
-           if (deep_copy != 0)
-             {
-               StartupOptions *tmp = deep_copy;
-@@ -854,7 +854,7 @@
-             }
-         }
-     }
--  
-+
-   return *this;
- }
- 
-@@ -877,20 +877,20 @@
- }
- 
- ACE_INLINE
--ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast 
-+ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast 
-+ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions &() const // cast
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast 
-+ImplementationRepository::StartupOptions_var::operator ::ImplementationRepository::StartupOptions *&() // cast
- {
-   return this->ptr_;
- }
-@@ -907,7 +907,7 @@
-   return *this->ptr_;
- }
- 
--// mapping for variable size 
-+// mapping for variable size
- ACE_INLINE ::ImplementationRepository::StartupOptions *&
- ImplementationRepository::StartupOptions_var::out (void)
- {
-@@ -968,7 +968,7 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- ImplementationRepository::StartupOptions_out::operator ::ImplementationRepository::StartupOptions *&() // cast
- {
-   return this->ptr_;
-@@ -1037,7 +1037,7 @@
-         {
-           ServerInformation *deep_copy =
-             new ServerInformation (*p.ptr_);
--          
-+
-           if (deep_copy != 0)
-             {
-               ServerInformation *tmp = deep_copy;
-@@ -1047,7 +1047,7 @@
-             }
-         }
-     }
--  
-+
-   return *this;
- }
- 
-@@ -1070,20 +1070,20 @@
- }
- 
- ACE_INLINE
--ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast 
-+ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast 
-+ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation &() const // cast
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast 
-+ImplementationRepository::ServerInformation_var::operator ::ImplementationRepository::ServerInformation *&() // cast
- {
-   return this->ptr_;
- }
-@@ -1100,7 +1100,7 @@
-   return *this->ptr_;
- }
- 
--// mapping for variable size 
-+// mapping for variable size
- ACE_INLINE ::ImplementationRepository::ServerInformation *&
- ImplementationRepository::ServerInformation_var::out (void)
- {
-@@ -1161,7 +1161,7 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- ImplementationRepository::ServerInformation_out::operator ::ImplementationRepository::ServerInformation *&() // cast
- {
-   return this->ptr_;
-@@ -1181,7 +1181,7 @@
- 
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--  
-+
- #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_)
- #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_
- 
-@@ -1194,24 +1194,24 @@
-     ACE_NEW_RETURN (retval, ImplementationRepository::ServerInformation[size], 0);
-     return retval;
-   }
--  
-+
-   ACE_INLINE void ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (ImplementationRepository::ServerInformation *buffer)
-   // Free the sequence.
-   {
-     delete [] buffer;
-   }
--  
-+
-   ACE_INLINE
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Default constructor.
-   {
-   }
--  
-+
-   ACE_INLINE
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum) // Constructor using a maximum length value.
-     : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (maximum))
-   {
-   }
--  
-+
-   ACE_INLINE
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (CORBA::ULong maximum,
-     CORBA::ULong length,
-@@ -1220,7 +1220,7 @@
-   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-   {
-   }
--  
-+
-   ACE_INLINE
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs)
-   // Copy constructor.
-@@ -1230,10 +1230,10 @@
-     {
-       ImplementationRepository::ServerInformation *tmp1 = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (this->maximum_);
-       ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_);
--      
-+
-       for (CORBA::ULong i = 0; i < this->length_; ++i)
-         tmp1[i] = tmp2[i];
--      
-+
-       this->buffer_ = tmp1;
-     }
-     else
-@@ -1241,14 +1241,14 @@
-       this->buffer_ = 0;
-     }
-   }
--  
-+
-   ACE_INLINE ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator= (const _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList &rhs)
-   // Assignment operator.
-   {
-     if (this == &rhs)
-       return *this;
--    
-+
-     if (this->release_)
-     {
-       if (this->maximum_ < rhs.maximum_)
-@@ -1261,18 +1261,18 @@
-     }
-     else
-       this->buffer_ = _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (rhs.maximum_);
--    
-+
-     TAO_Unbounded_Base_Sequence::operator= (rhs);
--    
-+
-     ImplementationRepository::ServerInformation *tmp1 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *, this->buffer_);
-     ImplementationRepository::ServerInformation * const tmp2 = ACE_reinterpret_cast (ImplementationRepository::ServerInformation * ACE_CAST_CONST, rhs.buffer_);
--    
-+
-     for (CORBA::ULong i = 0; i < this->length_; ++i)
-       tmp1[i] = tmp2[i];
--    
-+
-     return *this;
-   }
--  
-+
-   // = Accessors.
-   ACE_INLINE ImplementationRepository::ServerInformation &
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i)
-@@ -1282,7 +1282,7 @@
-     ImplementationRepository::ServerInformation* tmp = ACE_reinterpret_cast(ImplementationRepository::ServerInformation*,this->buffer_);
-     return tmp[i];
-   }
--  
-+
-   ACE_INLINE const ImplementationRepository::ServerInformation &
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::operator[] (CORBA::ULong i) const
-   // operator []
-@@ -1291,9 +1291,9 @@
-     ImplementationRepository::ServerInformation * const tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation* ACE_CAST_CONST, this->buffer_);
-     return tmp[i];
-   }
--  
-+
-   // Implement the TAO_Base_Sequence methods (see Sequence.h)
--  
-+
-   ACE_INLINE ImplementationRepository::ServerInformation *
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (CORBA::Boolean orphan)
-   {
-@@ -1327,13 +1327,13 @@
-     }
-     return result;
-   }
--  
-+
-   ACE_INLINE const ImplementationRepository::ServerInformation *
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::get_buffer (void) const
-   {
-     return ACE_reinterpret_cast(const ImplementationRepository::ServerInformation * ACE_CAST_CONST, this->buffer_);
-   }
--  
-+
-   ACE_INLINE void
-   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::replace (CORBA::ULong max,
-   CORBA::ULong length,
-@@ -1350,11 +1350,11 @@
-     this->buffer_ = data;
-     this->release_ = release;
-   }
--  
-+
- #endif /* end #if !defined */
- 
- 
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- 
- #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_)
- #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CI_
-@@ -1410,7 +1410,7 @@
-         {
-           ServerInformationList *deep_copy =
-             new ServerInformationList (*p.ptr_);
--          
-+
-           if (deep_copy != 0)
-             {
-               ServerInformationList *tmp = deep_copy;
-@@ -1420,7 +1420,7 @@
-             }
-         }
-     }
--  
-+
-   return *this;
- }
- 
-@@ -1436,27 +1436,27 @@
-   return this->ptr_;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- ImplementationRepository::ServerInformationList_var::operator const ::ImplementationRepository::ServerInformationList &() const // cast
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE 
--ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast 
-+ACE_INLINE
-+ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() // cast
- {
-   return *this->ptr_;
- }
- 
--ACE_INLINE 
--ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast 
-+ACE_INLINE
-+ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList &() const // cast
- {
-   return *this->ptr_;
- }
- 
- // variable-size types only
- ACE_INLINE
--ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast 
-+ImplementationRepository::ServerInformationList_var::operator ::ImplementationRepository::ServerInformationList *&() // cast
- {
-   return this->ptr_;
- }
-@@ -1485,7 +1485,7 @@
-   return *this->ptr_;
- }
- 
--// mapping for variable size 
-+// mapping for variable size
- ACE_INLINE ::ImplementationRepository::ServerInformationList *&
- ImplementationRepository::ServerInformationList_var::out (void)
- {
-@@ -1546,7 +1546,7 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- ImplementationRepository::ServerInformationList_out::operator ::ImplementationRepository::ServerInformationList *&() // cast
- {
-   return this->ptr_;
-@@ -1604,7 +1604,7 @@
-   : ptr_ (ImplementationRepository::ServerInformationIterator::_nil ())
- {}
- 
--ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr 
-+ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr
- ImplementationRepository::ServerInformationIterator_var::ptr (void) const
- {
-   return this->ptr_;
-@@ -1641,19 +1641,19 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- ImplementationRepository::ServerInformationIterator_var::operator const ImplementationRepository::ServerInformationIterator_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE 
--ImplementationRepository::ServerInformationIterator_var::operator ImplementationRepository::ServerInformationIterator_ptr &() // cast 
-+ACE_INLINE
-+ImplementationRepository::ServerInformationIterator_var::operator ImplementationRepository::ServerInformationIterator_ptr &() // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr 
-+ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr
- ImplementationRepository::ServerInformationIterator_var::operator-> (void) const
- {
-   return this->ptr_;
-@@ -1679,7 +1679,7 @@
-   return this->ptr_;
- }
- 
--ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr 
-+ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr
- ImplementationRepository::ServerInformationIterator_var::_retn (void)
- {
-   // yield ownership of managed obj reference
-@@ -1740,7 +1740,7 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- ImplementationRepository::ServerInformationIterator_out::operator ImplementationRepository::ServerInformationIterator_ptr &() // cast
- {
-   return this->ptr_;
-@@ -1752,7 +1752,7 @@
-   return this->ptr_;
- }
- 
--ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr 
-+ACE_INLINE ImplementationRepository::ServerInformationIterator_ptr
- ImplementationRepository::ServerInformationIterator_out::operator-> (void)
- {
-   return this->ptr_;
-@@ -1840,14 +1840,14 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- ImplementationRepository::Administration_var::operator const ::ImplementationRepository::Administration_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE 
--ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast 
-+ACE_INLINE
-+ImplementationRepository::Administration_var::operator ::ImplementationRepository::Administration_ptr &() // cast
- {
-   return this->ptr_;
- }
-@@ -1939,7 +1939,7 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- ImplementationRepository::Administration_out::operator ::ImplementationRepository::Administration_ptr &() // cast
- {
-   return this->ptr_;
-@@ -2018,7 +2018,7 @@
-     return 1;
-   else
-     return 0;
--  
-+
- }
- 
- ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::EnvironmentVariable &_tao_aggregate)
-@@ -2030,7 +2030,7 @@
-     return 1;
-   else
-     return 0;
--  
-+
- }
- 
- 
-@@ -2058,12 +2058,12 @@
- {
-   CORBA::ULong _tao_temp = 0;
-   CORBA::Boolean _tao_result = strm >> _tao_temp;
--  
-+
-   if (_tao_result == 1)
-     {
-       _tao_enumval = ACE_static_cast (ImplementationRepository::ActivationMode, _tao_temp);
-     }
--  
-+
-   return _tao_result;
- }
- 
-@@ -2078,7 +2078,7 @@
-     return 1;
-   else
-     return 0;
--  
-+
- }
- 
- ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::StartupOptions &_tao_aggregate)
-@@ -2092,7 +2092,7 @@
-     return 1;
-   else
-     return 0;
--  
-+
- }
- 
- ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::ServerInformation &_tao_aggregate)
-@@ -2106,7 +2106,7 @@
-     return 1;
-   else
-     return 0;
--  
-+
- }
- 
- ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::ServerInformation &_tao_aggregate)
-@@ -2120,7 +2120,7 @@
-     return 1;
-   else
-     return 0;
--  
-+
- }
- 
- 
-@@ -2301,4 +2301,3 @@
-   ACE_ENDTRY;
-   return 0;
- }
--
+-TAO_PortableServer_Export CORBA::Boolean operator<< (
++CORBA::Boolean TAO_PortableServer_Export operator<< (
+     TAO_OutputCDR &,
+     const ImplementationRepository::ServerObject_ptr
+   );
+ 
+-TAO_PortableServer_Export CORBA::Boolean operator>> (
++CORBA::Boolean TAO_PortableServer_Export operator>> (
+     TAO_InputCDR &,
+     ImplementationRepository::ServerObject_ptr &
+   );
+@@ -1720,22 +1720,22 @@
+ 
+ #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_ */
+ 
+-TAO_PortableServer_Export CORBA::Boolean operator<< (
++CORBA::Boolean TAO_PortableServer_Export operator<< (
+     TAO_OutputCDR &,
+     const ImplementationRepository::ServerInformationIterator_ptr
+   );
+ 
+-TAO_PortableServer_Export CORBA::Boolean operator>> (
++CORBA::Boolean TAO_PortableServer_Export operator>> (
+     TAO_InputCDR &,
+     ImplementationRepository::ServerInformationIterator_ptr &
+   );
+ 
+-TAO_PortableServer_Export CORBA::Boolean operator<< (
++CORBA::Boolean TAO_PortableServer_Export operator<< (
+     TAO_OutputCDR &,
+     const ImplementationRepository::Administration_ptr
+   );
+ 
+-TAO_PortableServer_Export CORBA::Boolean operator>> (
++CORBA::Boolean TAO_PortableServer_Export operator>> (
+     TAO_InputCDR &,
+     ImplementationRepository::Administration_ptr &
+   );
diff --git a/TAO/tao/diffs/MessagingC.cpp.diff b/TAO/tao/diffs/MessagingC.cpp.diff
index 36640e7d670..c008203e7ef 100644
--- a/TAO/tao/diffs/MessagingC.cpp.diff
+++ b/TAO/tao/diffs/MessagingC.cpp.diff
@@ -1,5 +1,13 @@
---- orig/MessagingC.cpp	Tue Apr  3 22:01:25 2001
-+++ patched/MessagingC.cpp	Thu Apr  5 09:06:52 2001
+--- orig/MessagingC.cpp	Tue Apr 17 22:53:18 2001
++++ MessagingC.cpp	Tue Apr 17 23:04:19 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:
 @@ -21,6 +21,8 @@
  
  #include "MessagingC.h"
@@ -9,7 +17,7 @@
  #include "tao/Stub.h"
  #include "tao/Invocation.h"
  #include "tao/ClientRequestInfo.h"
-@@ -321,6 +323,9 @@
+@@ -321,10 +323,14 @@
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_DEADLINE, 8U)
  TAO_NAMESPACE_END
@@ -19,18 +27,59 @@
  TAO_NAMESPACE_TYPE (const CORBA::ULong)
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, REBIND_POLICY_TYPE, 23U)
-@@ -406,6 +411,10 @@
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class Messaging::RebindPolicy_var
+ // *************************************************************
+@@ -447,7 +453,6 @@
+     ACE_static_cast (RebindPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class Messaging::RebindPolicy_out
+ // *************************************************************
+@@ -588,10 +593,13 @@
    return "IDL:omg.org/Messaging/RebindPolicy:1.0";
  }
  
-+#endif /* TAO_HAS_REBIND_POLICY == 1 */
-+
 +#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
 +
  TAO_NAMESPACE_TYPE (const CORBA::ULong)
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, SYNC_SCOPE_POLICY_TYPE, 24U)
-@@ -491,6 +500,10 @@
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class Messaging::SyncScopePolicy_var
+ // *************************************************************
+@@ -606,6 +614,8 @@
+   return this->ptr_;
+ }
+ 
++#endif /* TAO_HAS_REBIND_POLICY == 1 */
++
+ Messaging::SyncScopePolicy_var::SyncScopePolicy_var (const ::Messaging::SyncScopePolicy_var &p) // copy constructor
+   : TAO_Base_var (),
+     ptr_ (SyncScopePolicy::_duplicate (p.ptr ()))
+@@ -714,7 +724,6 @@
+     ACE_static_cast (SyncScopePolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class Messaging::SyncScopePolicy_out
+ // *************************************************************
+@@ -774,7 +783,6 @@
+   return this->ptr_;
+ }
+ 
+-
+ // default constructor
+ Messaging::SyncScopePolicy::SyncScopePolicy ()
+ {
+@@ -855,6 +863,10 @@
    return "IDL:omg.org/Messaging/SyncScopePolicy:1.0";
  }
  
@@ -41,18 +90,39 @@
  TAO_NAMESPACE_TYPE (const CORBA::ULong)
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_PRIORITY_POLICY_TYPE, 25U)
-@@ -661,6 +674,10 @@
-   return "IDL:omg.org/Messaging/RequestPriorityPolicy:1.0";
+@@ -944,6 +956,7 @@
+   delete tmp;
  }
  
-+#endif /* TAO_HAS_PRIORITY_POLICIES == 1 */
-+
-+#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1)
 +
- TAO_NAMESPACE_TYPE (const CORBA::ULong)
+ // *************************************************************
+ // Operations for class Messaging::RequestPriorityPolicy_var
+ // *************************************************************
+@@ -1066,7 +1079,6 @@
+     ACE_static_cast (RequestPriorityPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class Messaging::RequestPriorityPolicy_out
+ // *************************************************************
+@@ -1211,6 +1223,7 @@
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_PRIORITY_POLICY_TYPE, 26U)
-@@ -746,6 +763,10 @@
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class Messaging::ReplyPriorityPolicy_var
+ // *************************************************************
+@@ -1333,7 +1346,6 @@
+     ACE_static_cast (ReplyPriorityPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class Messaging::ReplyPriorityPolicy_out
+ // *************************************************************
+@@ -1474,10 +1486,15 @@
    return "IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0";
  }
  
@@ -63,7 +133,20 @@
  TAO_NAMESPACE_TYPE (const CORBA::ULong)
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_START_TIME_POLICY_TYPE, 27U)
-@@ -831,6 +852,10 @@
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class Messaging::RequestStartTimePolicy_var
+ // *************************************************************
+@@ -1600,7 +1617,6 @@
+     ACE_static_cast (RequestStartTimePolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class Messaging::RequestStartTimePolicy_out
+ // *************************************************************
+@@ -1741,10 +1757,15 @@
    return "IDL:omg.org/Messaging/RequestStartTimePolicy:1.0";
  }
  
@@ -74,7 +157,20 @@
  TAO_NAMESPACE_TYPE (const CORBA::ULong)
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_END_TIME_POLICY_TYPE, 28U)
-@@ -916,6 +941,10 @@
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class Messaging::RequestEndTimePolicy_var
+ // *************************************************************
+@@ -1867,7 +1888,6 @@
+     ACE_static_cast (RequestEndTimePolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class Messaging::RequestEndTimePolicy_out
+ // *************************************************************
+@@ -2008,10 +2028,15 @@
    return "IDL:omg.org/Messaging/RequestEndTimePolicy:1.0";
  }
  
@@ -85,7 +181,20 @@
  TAO_NAMESPACE_TYPE (const CORBA::ULong)
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_START_TIME_POLICY_TYPE, 29U)
-@@ -1001,6 +1030,10 @@
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class Messaging::ReplyStartTimePolicy_var
+ // *************************************************************
+@@ -2134,7 +2159,6 @@
+     ACE_static_cast (ReplyStartTimePolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class Messaging::ReplyStartTimePolicy_out
+ // *************************************************************
+@@ -2275,10 +2299,15 @@
    return "IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0";
  }
  
@@ -96,7 +205,20 @@
  TAO_NAMESPACE_TYPE (const CORBA::ULong)
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_END_TIME_POLICY_TYPE, 30U)
-@@ -1086,6 +1119,10 @@
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class Messaging::ReplyEndTimePolicy_var
+ // *************************************************************
+@@ -2401,7 +2430,6 @@
+     ACE_static_cast (ReplyEndTimePolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class Messaging::ReplyEndTimePolicy_out
+ // *************************************************************
+@@ -2542,10 +2570,15 @@
    return "IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0";
  }
  
@@ -107,7 +229,20 @@
  TAO_NAMESPACE_TYPE (const CORBA::ULong)
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, RELATIVE_REQ_TIMEOUT_POLICY_TYPE, 31U)
-@@ -1171,6 +1208,10 @@
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class Messaging::RelativeRequestTimeoutPolicy_var
+ // *************************************************************
+@@ -2668,7 +2701,6 @@
+     ACE_static_cast (RelativeRequestTimeoutPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class Messaging::RelativeRequestTimeoutPolicy_out
+ // *************************************************************
+@@ -2809,10 +2841,15 @@
    return "IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0";
  }
  
@@ -118,7 +253,20 @@
  TAO_NAMESPACE_TYPE (const CORBA::ULong)
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, RELATIVE_RT_TIMEOUT_POLICY_TYPE, 32U)
-@@ -1256,6 +1297,10 @@
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class Messaging::RelativeRoundtripTimeoutPolicy_var
+ // *************************************************************
+@@ -2935,7 +2972,6 @@
+     ACE_static_cast (RelativeRoundtripTimeoutPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class Messaging::RelativeRoundtripTimeoutPolicy_out
+ // *************************************************************
+@@ -3076,6 +3112,10 @@
    return "IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0";
  }
  
@@ -129,7 +277,23 @@
  TAO_NAMESPACE_TYPE (const CORBA::ULong)
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, ROUTING_POLICY_TYPE, 33U)
-@@ -1430,6 +1475,10 @@
+@@ -3169,6 +3209,7 @@
+   delete tmp;
+ }
+ 
++
+ // *************************************************************
+ // Operations for class Messaging::RoutingPolicy_var
+ // *************************************************************
+@@ -3291,7 +3332,6 @@
+     ACE_static_cast (RoutingPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class Messaging::RoutingPolicy_out
+ // *************************************************************
+@@ -3432,10 +3472,15 @@
    return "IDL:omg.org/Messaging/RoutingPolicy:1.0";
  }
  
@@ -140,7 +304,20 @@
  TAO_NAMESPACE_TYPE (const CORBA::ULong)
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, MAX_HOPS_POLICY_TYPE, 34U)
-@@ -1515,6 +1564,10 @@
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class Messaging::MaxHopsPolicy_var
+ // *************************************************************
+@@ -3558,7 +3603,6 @@
+     ACE_static_cast (MaxHopsPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class Messaging::MaxHopsPolicy_out
+ // *************************************************************
+@@ -3699,10 +3743,15 @@
    return "IDL:omg.org/Messaging/MaxHopsPolicy:1.0";
  }
  
@@ -151,7 +328,20 @@
  TAO_NAMESPACE_TYPE (const CORBA::ULong)
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, QUEUE_ORDER_POLICY_TYPE, 35U)
-@@ -1600,6 +1653,8 @@
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class Messaging::QueueOrderPolicy_var
+ // *************************************************************
+@@ -3825,7 +3874,6 @@
+     ACE_static_cast (QueueOrderPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class Messaging::QueueOrderPolicy_out
+ // *************************************************************
+@@ -3966,6 +4014,8 @@
    return "IDL:omg.org/Messaging/QueueOrderPolicy:1.0";
  }
  
@@ -160,7 +350,7 @@
  static const CORBA::Long _oc_Messaging_PolicyValue[] =
  {
    TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -1918,6 +1973,9 @@
+@@ -4284,6 +4334,9 @@
  TAO_NAMESPACE_BEGIN (Messaging)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 2U)
  TAO_NAMESPACE_END
@@ -170,7 +360,23 @@
  Messaging::ExceptionHolder* Messaging::ExceptionHolder::_downcast (CORBA::ValueBase* v)
  {
    if (v == 0) return 0;
-@@ -2226,6 +2284,11 @@
+@@ -4357,6 +4410,7 @@
+ 
+ #endif /* end #if !defined */
+ 
++
+ // *************************************************************
+ // Operations for class Messaging::ReplyHandler_var
+ // *************************************************************
+@@ -4479,7 +4533,6 @@
+     ACE_static_cast (ReplyHandler **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class Messaging::ReplyHandler_out
+ // *************************************************************
+@@ -4774,6 +4827,11 @@
  TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyHandler, &_tc_TAO_tc_Messaging_ReplyHandler)
  TAO_NAMESPACE_END
  
@@ -182,7 +388,7 @@
  CORBA::Boolean 
  OBV_Messaging::ExceptionHolder::_tao_marshal__Messaging_ExceptionHolder (TAO_OutputCDR &strm){
    return _tao_marshal_state (strm);
-@@ -2346,6 +2409,9 @@
+@@ -4894,6 +4952,9 @@
    #  pragma instantiate TAO_Object_Manager<Messaging::SyncScopePolicy,Messaging::SyncScopePolicy_var>
  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
  
@@ -192,7 +398,7 @@
  void operator<<= (CORBA::Any &_tao_any, const Messaging::PriorityRange &_tao_elem) // copying
  {
    TAO_OutputCDR stream;
-@@ -2763,6 +2829,8 @@
+@@ -5311,6 +5372,8 @@
    return 0;
  }
  
@@ -201,7 +407,7 @@
  void operator<<= (CORBA::Any &_tao_any, Messaging::ReplyHandler_ptr _tao_elem)
  {
    TAO_OutputCDR stream;
-@@ -2825,6 +2893,9 @@
+@@ -5373,6 +5436,9 @@
  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
  
  
@@ -211,8 +417,8 @@
  #if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_
  #define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_CPP_
  
-@@ -2935,3 +3006,4 @@
-   return 0; // error
+@@ -5519,3 +5585,4 @@
+   return 0;
  }
  
 +#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
diff --git a/TAO/tao/diffs/MessagingC.h.diff b/TAO/tao/diffs/MessagingC.h.diff
index 2c15cf354a2..eff7e21f9f6 100644
--- a/TAO/tao/diffs/MessagingC.h.diff
+++ b/TAO/tao/diffs/MessagingC.h.diff
@@ -1,5 +1,13 @@
---- orig/MessagingC.h	Tue Apr  3 22:01:25 2001
-+++ patched/MessagingC.h	Thu Apr  5 09:07:23 2001
+--- orig/MessagingC.h	Mon Apr 16 20:07:47 2001
++++ MessagingC.h	Mon Apr 16 20:21:22 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,13 +23,25 @@
  #define _TAO_IDL_ORIG_MESSAGINGC_H_
  
@@ -48,7 +56,7 @@
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REBIND_POLICY_TYPE;
  
  
-@@ -239,6 +258,10 @@
+@@ -247,6 +266,10 @@
  
  #endif /* end #if !defined */
  
@@ -59,7 +67,7 @@
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SYNC_SCOPE_POLICY_TYPE;
  
  
-@@ -362,6 +385,10 @@
+@@ -378,6 +401,10 @@
  
  #endif /* end #if !defined */
  
@@ -70,7 +78,7 @@
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_PRIORITY_POLICY_TYPE;
  
    struct PriorityRange;
-@@ -658,6 +685,10 @@
+@@ -690,6 +717,10 @@
  
  #endif /* end #if !defined */
  
@@ -81,7 +89,7 @@
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_START_TIME_POLICY_TYPE;
  
  
-@@ -781,6 +812,10 @@
+@@ -821,6 +852,10 @@
  
  #endif /* end #if !defined */
  
@@ -92,7 +100,7 @@
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_END_TIME_POLICY_TYPE;
  
  
-@@ -904,6 +939,10 @@
+@@ -952,6 +987,10 @@
  
  #endif /* end #if !defined */
  
@@ -103,7 +111,7 @@
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REPLY_START_TIME_POLICY_TYPE;
  
  
-@@ -1027,6 +1066,10 @@
+@@ -1083,6 +1122,10 @@
  
  #endif /* end #if !defined */
  
@@ -114,7 +122,7 @@
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REPLY_END_TIME_POLICY_TYPE;
  
  
-@@ -1150,6 +1193,10 @@
+@@ -1214,6 +1257,10 @@
  
  #endif /* end #if !defined */
  
@@ -125,7 +133,7 @@
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong RELATIVE_REQ_TIMEOUT_POLICY_TYPE;
  
  
-@@ -1273,6 +1320,10 @@
+@@ -1345,6 +1392,10 @@
  
  #endif /* end #if !defined */
  
@@ -136,7 +144,7 @@
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong RELATIVE_RT_TIMEOUT_POLICY_TYPE;
  
  
-@@ -1396,6 +1447,10 @@
+@@ -1476,6 +1527,10 @@
  
  #endif /* end #if !defined */
  
@@ -147,7 +155,7 @@
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ROUTING_POLICY_TYPE;
  
    struct RoutingTypeRange;
-@@ -1569,6 +1624,10 @@
+@@ -1657,6 +1712,10 @@
  
  #endif /* end #if !defined */
  
@@ -158,7 +166,7 @@
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong MAX_HOPS_POLICY_TYPE;
  
  
-@@ -1692,6 +1751,10 @@
+@@ -1788,6 +1847,10 @@
  
  #endif /* end #if !defined */
  
@@ -169,7 +177,7 @@
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong QUEUE_ORDER_POLICY_TYPE;
  
  
-@@ -1815,6 +1878,8 @@
+@@ -1919,6 +1982,8 @@
  
  #endif /* end #if !defined */
  
@@ -178,7 +186,7 @@
    struct PolicyValue;
    class PolicyValue_var;
    
-@@ -2088,6 +2153,8 @@
+@@ -2192,6 +2257,8 @@
  
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong INVOCATION_POLICIES;
  
@@ -187,7 +195,7 @@
  // valuetype class
    class ExceptionHolder;
    typedef ExceptionHolder *ExceptionHolder_ptr;
-@@ -2519,16 +2586,23 @@
+@@ -2631,18 +2698,25 @@
  
  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyHandler;
  
@@ -200,7 +208,9 @@
  
 +#if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1)
 +
- extern TAO_Export Messaging::_TAO_ReplyHandler_Proxy_Broker * (*Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer) (
+ extern TAO_Export
+ Messaging::_TAO_ReplyHandler_Proxy_Broker *
+ (*Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer) (
      CORBA::Object_ptr obj
    );
  
@@ -211,7 +221,7 @@
  TAO_NAMESPACE  OBV_Messaging
  {
  
-@@ -2536,7 +2610,7 @@
+@@ -2650,7 +2724,7 @@
  #define _MESSAGING_EXCEPTIONHOLDER___OBV_CH_
  
    // OBV_ class
@@ -220,7 +230,7 @@
    {
    public:
      virtual void is_system_exception (CORBA::Boolean);    // set
-@@ -2572,14 +2646,26 @@
+@@ -2686,14 +2760,26 @@
  }
  TAO_NAMESPACE_CLOSE
  
@@ -247,7 +257,7 @@
  TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValue &); // copying version
  TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValue*); // noncopying version
  TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValue *&); // deprecated
-@@ -2588,19 +2674,33 @@
+@@ -2702,19 +2788,33 @@
  TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValueSeq*); // noncopying version
  TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&); // deprecated
  TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValueSeq *&);
@@ -281,7 +291,7 @@
  #if !defined _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_
  #define _TAO_CDR_OP_Messaging_PolicyValue__tao_seq_Octet_H_
  
-@@ -2630,26 +2730,15 @@
+@@ -2744,26 +2844,15 @@
  
  #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ */
  
@@ -312,7 +322,7 @@
  #endif /* __ACE_INLINE__ */
  
  
-@@ -2666,4 +2755,6 @@
+@@ -2780,4 +2869,6 @@
  #endif /* __BORLANDC__ */
  
  #include "ace/post.h"
diff --git a/TAO/tao/diffs/MessagingC.i.diff b/TAO/tao/diffs/MessagingC.i.diff
index f6eb1fb1623..c51787038e6 100644
--- a/TAO/tao/diffs/MessagingC.i.diff
+++ b/TAO/tao/diffs/MessagingC.i.diff
@@ -1,26 +1,34 @@
---- orig/MessagingC.i	Tue Apr  3 22:01:25 2001
-+++ patched/MessagingC.i	Tue Apr  3 22:05:33 2001
-@@ -27,6 +27,8 @@
- // Inline operations for class Messaging::RebindPolicy_var
- // *************************************************************
+--- orig/MessagingC.i	Tue Apr 17 22:53:18 2001
++++ MessagingC.i	Tue Apr 17 17:54:58 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:
+@@ -20,6 +20,8 @@
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
  
 +#if (TAO_HAS_REBIND_POLICY == 1)
 +
- ACE_INLINE
- Messaging::RebindPolicy_var::RebindPolicy_var (void) // default constructor
-   : ptr_ (RebindPolicy::_nil ())
-@@ -208,6 +210,10 @@
-   return this->ptr_;
- }
+ #if !defined (_MESSAGING_REBINDPOLICY___CI_)
+ #define _MESSAGING_REBINDPOLICY___CI_
+ 
+@@ -70,6 +72,10 @@
+ #endif /* end #if !defined */
+ 
  
 +#endif /* TAO_HAS_REBIND_POLICY == 1 */
 +
 +#if (TAO_HAS_SYNC_SCOPE_POLICY == 1)
 +
- ACE_INLINE
- Messaging::SyncScopePolicy_var::SyncScopePolicy_var (const ::Messaging::SyncScopePolicy_var &p) // copy constructor
-   : TAO_Base_var (),
-@@ -359,6 +365,10 @@
+ #if !defined (_MESSAGING_SYNCSCOPEPOLICY___CI_)
+ #define _MESSAGING_SYNCSCOPEPOLICY___CI_
+ 
+@@ -119,6 +125,10 @@
  
  #endif /* end #if !defined */
  
@@ -31,106 +39,106 @@
  // *************************************************************
  // Inline operations for class Messaging::PriorityRange_var
  // *************************************************************
-@@ -852,6 +862,10 @@
- // Inline operations for class Messaging::RequestStartTimePolicy_var
- // *************************************************************
+@@ -365,6 +375,10 @@
+ #endif /* end #if !defined */
+ 
  
 +#endif /* TAO_HAS_PRIORITY_POLICIES == 1 */
 +
 +#if (TAO_HAS_REQUEST_START_TIME_POLICY == 1)
 +
- ACE_INLINE
- Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (void) // default constructor
-   : ptr_ (RequestStartTimePolicy::_nil ())
-@@ -1039,6 +1053,10 @@
-     ptr_ (RequestEndTimePolicy::_duplicate (p.ptr ()))
- {}
+ #if !defined (_MESSAGING_REQUESTSTARTTIMEPOLICY___CI_)
+ #define _MESSAGING_REQUESTSTARTTIMEPOLICY___CI_
+ 
+@@ -415,6 +429,10 @@
+ #endif /* end #if !defined */
+ 
  
 +#endif /* TAO_HAS_REQUEST_START_TIME_POLICY == 1 */
 +
 +#if (TAO_HAS_REQUEST_END_TIME_POLICY == 1)
 +
- ACE_INLINE
- Messaging::RequestEndTimePolicy_var::~RequestEndTimePolicy_var (void) // destructor
- {
-@@ -1209,6 +1227,10 @@
-     ptr_ (ReplyStartTimePolicy::_duplicate (p.ptr ()))
- {}
+ #if !defined (_MESSAGING_REQUESTENDTIMEPOLICY___CI_)
+ #define _MESSAGING_REQUESTENDTIMEPOLICY___CI_
+ 
+@@ -465,6 +483,10 @@
+ #endif /* end #if !defined */
+ 
  
 +#endif /* TAO_HAS_REQUEST_END_TIME_POLICY == 1 */
 +
 +#if (TAO_HAS_REPLY_START_TIME_POLICY == 1)
 +
- ACE_INLINE
- Messaging::ReplyStartTimePolicy_var::~ReplyStartTimePolicy_var (void) // destructor
- {
-@@ -1379,6 +1401,10 @@
-     ptr_ (ReplyEndTimePolicy::_duplicate (p.ptr ()))
- {}
+ #if !defined (_MESSAGING_REPLYSTARTTIMEPOLICY___CI_)
+ #define _MESSAGING_REPLYSTARTTIMEPOLICY___CI_
+ 
+@@ -515,6 +537,10 @@
+ #endif /* end #if !defined */
+ 
  
 +#endif /* TAO_HAS_REPLY_START_TIME_POLICY == 1 */
 +
 +#if (TAO_HAS_REPLY_END_TIME_POLICY == 1)
 +
- ACE_INLINE
- Messaging::ReplyEndTimePolicy_var::~ReplyEndTimePolicy_var (void) // destructor
- {
-@@ -1549,6 +1575,10 @@
-     ptr_ (RelativeRequestTimeoutPolicy::_duplicate (p.ptr ()))
- {}
+ #if !defined (_MESSAGING_REPLYENDTIMEPOLICY___CI_)
+ #define _MESSAGING_REPLYENDTIMEPOLICY___CI_
+ 
+@@ -565,6 +591,10 @@
+ #endif /* end #if !defined */
+ 
  
 +#endif /* TAO_HAS_REPLY_END_TIME_POLICY == 1 */
 +
 +#if (TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1)
 +
- ACE_INLINE
- Messaging::RelativeRequestTimeoutPolicy_var::~RelativeRequestTimeoutPolicy_var (void) // destructor
- {
-@@ -1719,6 +1749,10 @@
-     ptr_ (RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ()))
- {}
+ #if !defined (_MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___CI_)
+ #define _MESSAGING_RELATIVEREQUESTTIMEOUTPOLICY___CI_
+ 
+@@ -615,6 +645,10 @@
+ #endif /* end #if !defined */
+ 
  
 +#endif /* TAO_HAS_RELATIVE_REQUEST_TIMEOUT_POLICY == 1 */
 +
 +#if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
 +
- ACE_INLINE
- Messaging::RelativeRoundtripTimeoutPolicy_var::~RelativeRoundtripTimeoutPolicy_var (void) // destructor
- {
-@@ -1868,6 +1902,10 @@
- // Inline operations for class Messaging::RoutingTypeRange_var
- // *************************************************************
+ #if !defined (_MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___CI_)
+ #define _MESSAGING_RELATIVEROUNDTRIPTIMEOUTPOLICY___CI_
+ 
+@@ -664,6 +698,10 @@
+ 
+ #endif /* end #if !defined */
  
 +#endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 +
 +#if (TAO_HAS_ROUTING_POLICY == 1)
 +
- ACE_INLINE
- Messaging::RoutingTypeRange_var::RoutingTypeRange_var (void) // default constructor
-   : ptr_ (0)
-@@ -2204,6 +2242,10 @@
-     ptr_ (MaxHopsPolicy::_duplicate (p.ptr ()))
- {}
+ // *************************************************************
+ // Inline operations for class Messaging::RoutingTypeRange_var
+ // *************************************************************
+@@ -860,6 +898,10 @@
+ #endif /* end #if !defined */
+ 
  
 +#endif /* TAO_HAS_ROUTING_POLICY == 1 */
 +
 +#if (TAO_HAS_MAX_HOPS_POLICY == 1)
 +
- ACE_INLINE
- Messaging::MaxHopsPolicy_var::~MaxHopsPolicy_var (void) // destructor
- {
-@@ -2457,6 +2499,10 @@
- // Inline operations for class Messaging::QueueOrderPolicy_out
- // *************************************************************
+ #if !defined (_MESSAGING_MAXHOPSPOLICY___CI_)
+ #define _MESSAGING_MAXHOPSPOLICY___CI_
+ 
+@@ -910,6 +952,10 @@
+ #endif /* end #if !defined */
+ 
  
 +#endif /* TAO_HAS_MAX_HOPS_POLICY == 1 */
 +
 +#if (TAO_HAS_QUEUE_ORDER_POLICY == 1)
 +
- ACE_INLINE
- Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (QueueOrderPolicy_ptr &p)
-   : ptr_ (p)
-@@ -2519,6 +2565,8 @@
+ #if !defined (_MESSAGING_QUEUEORDERPOLICY___CI_)
+ #define _MESSAGING_QUEUEORDERPOLICY___CI_
+ 
+@@ -959,6 +1005,8 @@
  
  #endif /* end #if !defined */
  
@@ -139,7 +147,7 @@
  // *************************************************************
  // Inline operations for class Messaging::PolicyValue_var
  // *************************************************************
-@@ -3106,6 +3154,8 @@
+@@ -1546,6 +1594,8 @@
  
  #endif /* end #if !defined */
  
@@ -148,37 +156,20 @@
  ACE_INLINE
  Messaging::ExceptionHolder::ExceptionHolder () // default constructor
  {}
-@@ -3237,6 +3287,9 @@
- #if !defined (_MESSAGING_EXCEPTIONHOLDER___OUT_CI_)
- #define _MESSAGING_EXCEPTIONHOLDER___OUT_CI_
- 
-+#if !defined (_MESSAGING_EXCEPTIONHOLDER___VAR_CI_)
-+#define _MESSAGING_EXCEPTIONHOLDER___VAR_CI_
-+
- // *************************************************************
- // Inline operations for class Messaging::ExceptionHolder_out
- // *************************************************************
-@@ -3445,6 +3498,10 @@
-   this->ptr_ = ::Messaging::ReplyHandler::_nil ();
+@@ -1803,9 +1853,11 @@
+   this->Messaging_ReplyHandler_setup_collocation (_tao_collocated);
  }
  
-+
-+
-+#endif /* end #if !defined */
-+
- ACE_INLINE
- Messaging::ReplyHandler_out::ReplyHandler_out (const ::Messaging::ReplyHandler_out &p) // copy constructor
-   : ptr_ (ACE_const_cast (ReplyHandler_out &, p).ptr_)
-@@ -3492,6 +3549,8 @@
- 
+-
  #endif /* end #if !defined */
  
++
 +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
 +
  ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::PriorityRange &_tao_aggregate)
  {
    if (
-@@ -3594,6 +3653,8 @@
+@@ -1908,6 +1960,8 @@
  
  #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_I_ */
  
@@ -187,8 +178,22 @@
  ACE_INLINE CORBA::Boolean
  operator<< (TAO_OutputCDR &strm, const Messaging::ExceptionHolder *_tao_valuetype)
  {
-@@ -3685,3 +3746,4 @@
-   return 0;
+@@ -1950,13 +2004,15 @@
+   
  }
  
+-TAO_Export CORBA::Boolean operator<< (
++CORBA::Boolean TAO_Export 
++operator<< (
+     TAO_OutputCDR &,
+     const Messaging::ReplyHandler_ptr
+   );
+-
+-TAO_Export CORBA::Boolean operator>> (
++CORBA::Boolean TAO_Export 
++operator>> (
+     TAO_InputCDR &,
+     Messaging::ReplyHandler_ptr &
+   );
+ 
 +#endif /* TAO_HAS_AMI_CALLBACK == 1 || TAO_HAS_AMI_POLLER == 1 */
diff --git a/TAO/tao/diffs/PolicyC.cpp.diff b/TAO/tao/diffs/PolicyC.cpp.diff
index 1772a01be00..83ff94f7971 100644
--- a/TAO/tao/diffs/PolicyC.cpp.diff
+++ b/TAO/tao/diffs/PolicyC.cpp.diff
@@ -1,5 +1,13 @@
---- orig/PolicyC.cpp	Tue Apr  3 14:08:51 2001
-+++ patched/PolicyC.cpp	Tue Apr  3 14:51:45 2001
+--- orig/PolicyC.cpp	Mon Apr 16 18:53:06 2001
++++ PolicyC.cpp	Mon Apr 16 19:08:11 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,6 +23,7 @@
  
  #include "tao/Stub.h"
@@ -34,8 +42,7 @@
 -  CORBA::tk_short,
 -
 -};
-+// ****************************************************************
- 
+-
 -static CORBA::TypeCode _tc_TAO_tc_CORBA_PolicyErrorCode (
 -    CORBA::tk_alias,
 -    sizeof (_oc_CORBA_PolicyErrorCode),
@@ -43,7 +50,8 @@
 -    0,
 -    sizeof (CORBA::PolicyErrorCode)
 -  );
--
++// ****************************************************************
+ 
 -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 +TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode)
  TAO_NAMESPACE_BEGIN (CORBA)
@@ -129,21 +137,21 @@
 -
 -TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
 +TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode)
- TAO_NAMESPACE_BEGIN (CORBA)
--TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SetOverrideType, &_tc_TAO_tc_CORBA_SetOverrideType)
++TAO_NAMESPACE_BEGIN (CORBA)
 +TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, BAD_POLICY_TYPE, 2)
- TAO_NAMESPACE_END
++TAO_NAMESPACE_END
 +TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode)
 +TAO_NAMESPACE_BEGIN (CORBA)
 +TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, BAD_POLICY_VALUE, 3)
 +TAO_NAMESPACE_END
 +TAO_NAMESPACE_TYPE (const CORBA::PolicyErrorCode)
-+TAO_NAMESPACE_BEGIN (CORBA)
+ TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SetOverrideType, &_tc_TAO_tc_CORBA_SetOverrideType)
 +TAO_NAMESPACE_DEFINE (const CORBA::PolicyErrorCode, UNSUPPORTED_POLICY_VALUE, 4)
-+TAO_NAMESPACE_END
-+
-+// ****************************************************************
+ TAO_NAMESPACE_END
  
++// ****************************************************************
++
  // Default constructor.
  CORBA_PolicyError::CORBA_PolicyError (void)
 -  : CORBA_UserException ("IDL:omg.org/CORBA_PolicyError:1.0")
@@ -196,7 +204,16 @@
  {
    this->indices = _tao_indices;
  }
-@@ -1383,7 +1294,7 @@
+@@ -675,7 +586,7 @@
+   return *tmp;
+ }
+ // *************************************************************
+-// Inline operations for class CORBA_Policy_out
++// Operations for class CORBA_Policy_out
+ // *************************************************************
+ 
+ CORBA_Policy_out::CORBA_Policy_out (CORBA_Policy_ptr &p)
+@@ -1564,7 +1475,7 @@
      return CORBA_Policy::_nil ();
    if (! obj->_is_local ())
      {
@@ -205,7 +222,7 @@
        ACE_CHECK_RETURN (CORBA_Policy::_nil ());
        if (is_a == 0)
          return CORBA_Policy::_nil ();
-@@ -1451,7 +1362,7 @@
+@@ -1632,7 +1543,7 @@
  CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
  {
    if (
@@ -214,7 +231,7 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -1476,7 +1387,19 @@
+@@ -1657,7 +1568,19 @@
  
  const char* CORBA_Policy::_interface_repository_id (void) const
  {
@@ -235,13 +252,204 @@
  }
  
  CORBA::PolicyType CORBA_Policy::policy_type (
-@@ -1965,76 +1888,7 @@
+@@ -2213,7 +2136,7 @@
+   return *tmp;
+ }
+ // *************************************************************
+-// Inline operations for class CORBA_PolicyManager_out
++// Operations for class CORBA_PolicyManager_out
+ // *************************************************************
+ 
+ CORBA_PolicyManager_out::CORBA_PolicyManager_out (CORBA_PolicyManager_ptr &p)
+@@ -2337,258 +2260,9 @@
  
  const char* CORBA_PolicyManager::_interface_repository_id (void) const
  {
 -  return "IDL:omg.org/CORBA_PolicyManager:1.0";
 -}
 -
+-// *************************************************************
+-// Operations for class CORBA_Current_var
+-// *************************************************************
+-
+-CORBA_Current_var::CORBA_Current_var (void) // default constructor
+-  : ptr_ (CORBA_Current::_nil ())
+-{}
+-
+-::CORBA_Current_ptr
+-CORBA_Current_var::ptr (void) const
+-{
+-  return this->ptr_;
+-}
+-
+-CORBA_Current_var::CORBA_Current_var (const ::CORBA_Current_var &p) // copy constructor
+-  : TAO_Base_var (),
+-    ptr_ (CORBA_Current::_duplicate (p.ptr ()))
+-{}
+-
+-CORBA_Current_var::~CORBA_Current_var (void) // destructor
+-{
+-  CORBA::release (this->ptr_);
+-}
+-
+-CORBA_Current_var &
+-CORBA_Current_var::operator= (CORBA_Current_ptr p)
+-{
+-  CORBA::release (this->ptr_);
+-  this->ptr_ = p;
+-  return *this;
+-}
+-
+-CORBA_Current_var &
+-CORBA_Current_var::operator= (const ::CORBA_Current_var &p)
+-{
+-  if (this != &p)
+-  {
+-    CORBA::release (this->ptr_);
+-    this->ptr_ = ::CORBA_Current::_duplicate (p.ptr ());
+-  }
+-  return *this;
+-}
+-
+-CORBA_Current_var::operator const ::CORBA_Current_ptr &() const // cast
+-{
+-  return this->ptr_;
+-}
+-
+-CORBA_Current_var::operator ::CORBA_Current_ptr &() // cast 
+-{
+-  return this->ptr_;
+-}
+-
+-::CORBA_Current_ptr
+-CORBA_Current_var::operator-> (void) const
+-{
+-  return this->ptr_;
+-}
+-
+-::CORBA_Current_ptr
+-CORBA_Current_var::in (void) const
+-{
+-  return this->ptr_;
+-}
+-
+-::CORBA_Current_ptr &
+-CORBA_Current_var::inout (void)
+-{
+-  return this->ptr_;
+-}
+-
+-::CORBA_Current_ptr &
+-CORBA_Current_var::out (void)
+-{
+-  CORBA::release (this->ptr_);
+-  this->ptr_ = ::CORBA_Current::_nil ();
+-  return this->ptr_;
++  return "IDL:omg.org/CORBA/PolicyManager:1.0";
+ }
+ 
+-::CORBA_Current_ptr
+-CORBA_Current_var::_retn (void)
+-{
+-  // yield ownership of managed obj reference
+-  ::CORBA_Current_ptr val = this->ptr_;
+-  this->ptr_ = ::CORBA_Current::_nil ();
+-  return val;
+-}
+-
+-::CORBA_Current_ptr
+-CORBA_Current_var::duplicate (CORBA_Current_ptr p)
+-{
+-  return ::CORBA_Current::_duplicate (p);
+-}
+-
+-void
+-CORBA_Current_var::release (CORBA_Current_ptr p)
+-{
+-  CORBA::release (p);
+-}
+-
+-::CORBA_Current_ptr
+-CORBA_Current_var::nil (void)
+-{
+-  return ::CORBA_Current::_nil ();
+-}
+-
+-::CORBA_Current_ptr
+-CORBA_Current_var::narrow (
+-    CORBA::Object *p,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
+-{
+-  return ::CORBA_Current::_narrow (p, ACE_TRY_ENV);
+-}
+-
+-CORBA::Object *
+-CORBA_Current_var::upcast (void *src)
+-{
+-  CORBA_Current **tmp =
+-    ACE_static_cast (CORBA_Current **, src);
+-  return *tmp;
+-}
+-// *************************************************************
+-// Inline operations for class CORBA_Current_out
+-// *************************************************************
+-
+-CORBA_Current_out::CORBA_Current_out (CORBA_Current_ptr &p)
+-  : ptr_ (p)
+-{
+-  this->ptr_ = ::CORBA_Current::_nil ();
+-}
+-
+-CORBA_Current_out::CORBA_Current_out (CORBA_Current_var &p) // constructor from _var
+-  : ptr_ (p.out ())
+-{
+-  CORBA::release (this->ptr_);
+-  this->ptr_ = ::CORBA_Current::_nil ();
+-}
+-
+-CORBA_Current_out::CORBA_Current_out (const ::CORBA_Current_out &p) // copy constructor
+-  : ptr_ (ACE_const_cast (CORBA_Current_out &, p).ptr_)
+-{}
+-
+-::CORBA_Current_out &
+-CORBA_Current_out::operator= (const ::CORBA_Current_out &p)
+-{
+-  this->ptr_ = ACE_const_cast (CORBA_Current_out&, p).ptr_;
+-  return *this;
+-}
+-
+-CORBA_Current_out &
+-CORBA_Current_out::operator= (const ::CORBA_Current_var &p)
+-{
+-  this->ptr_ = ::CORBA_Current::_duplicate (p.ptr ());
+-  return *this;
+-}
+-
+-CORBA_Current_out &
+-CORBA_Current_out::operator= (CORBA_Current_ptr p)
+-{
+-  this->ptr_ = p;
+-  return *this;
+-}
+-
+-CORBA_Current_out::operator ::CORBA_Current_ptr &() // cast
+-{
+-  return this->ptr_;
+-}
+-
+-::CORBA_Current_ptr &
+-CORBA_Current_out::ptr (void) // ptr
+-{
+-  return this->ptr_;
+-}
+-
+-::CORBA_Current_ptr
+-CORBA_Current_out::operator-> (void)
+-{
+-  return this->ptr_;
+-}
+-
 -
 -// default constructor
 -CORBA_Current::CORBA_Current ()
@@ -309,11 +517,20 @@
 -const char* CORBA_Current::_interface_repository_id (void) const
 -{
 -  return "IDL:omg.org/CORBA_Current:1.0";
-+  return "IDL:omg.org/CORBA/PolicyManager:1.0";
- }
+-}
  
+ // *************************************************************
+ // Operations for class CORBA_PolicyCurrent_var
+@@ -2713,7 +2387,7 @@
+   return *tmp;
+ }
+ // *************************************************************
+-// Inline operations for class CORBA_PolicyCurrent_out
++// Operations for class CORBA_PolicyCurrent_out
+ // *************************************************************
  
-@@ -2127,7 +1981,7 @@
+ CORBA_PolicyCurrent_out::CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_ptr &p)
+@@ -2861,7 +2535,7 @@
  
  const char* CORBA_PolicyCurrent::_interface_repository_id (void) const
  {
@@ -322,7 +539,7 @@
  }
  
  void operator<<= (CORBA::Any &_tao_any, CORBA::SetOverrideType _tao_elem)
-@@ -2234,7 +2088,7 @@
+@@ -2968,7 +2642,7 @@
          return 0;
        if (ACE_OS::strcmp (
            interface_repository_id.in (),
@@ -331,7 +548,7 @@
          return 0;
        if (stream >> *tmp)
        {
-@@ -2324,7 +2178,7 @@
+@@ -3058,7 +2732,7 @@
          return 0;
        if (ACE_OS::strcmp (
            interface_repository_id.in (),
@@ -340,7 +557,7 @@
          return 0;
        if (stream >> *tmp)
        {
-@@ -2602,13 +2456,6 @@
+@@ -3336,13 +3010,6 @@
  
  #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
      defined (ACE_HAS_GNU_REPO)
@@ -354,7 +571,7 @@
      template class TAO_Object_Manager<CORBA_PolicyCurrent,CORBA_PolicyCurrent_var>;
    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
    #  pragma instantiate TAO_Object_Manager<CORBA_PolicyCurrent,CORBA_PolicyCurrent_var>
-@@ -2725,4 +2572,3 @@
+@@ -3495,4 +3162,3 @@
    }
    return 0; // error
  }
diff --git a/TAO/tao/diffs/PolicyC.h.diff b/TAO/tao/diffs/PolicyC.h.diff
index a379ff43bbd..cf8544e72ad 100644
--- a/TAO/tao/diffs/PolicyC.h.diff
+++ b/TAO/tao/diffs/PolicyC.h.diff
@@ -1,7 +1,21 @@
---- orig/PolicyC.h	Tue Apr  3 14:08:51 2001
-+++ patched/PolicyC.h	Thu Apr  5 14:50:12 2001
-@@ -23,13 +23,19 @@
- #define _TAO_IDL_ORIG_POLICYC_H_
+--- orig/PolicyC.h	Mon Apr 16 19:17:11 2001
++++ PolicyC.h	Fri Apr 13 21:49:35 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,17 +19,23 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#ifndef _TAO_IDL_POLICYC_H_
+-#define _TAO_IDL_POLICYC_H_
++#ifndef _TAO_IDL_ORIG_POLICYC_H_
++#define _TAO_IDL_ORIG_POLICYC_H_
  
  #include "ace/pre.h"
 -#include "tao/corba.h"
@@ -11,7 +25,8 @@
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
- #include "TAO_Export.h"
+-#include "tao/corbafwd.h"
++#include "TAO_Export.h"
 +#include "Encodable.h"
 +#include "Exception.h"
 +#include "Environment.h"
@@ -51,7 +66,7 @@
  #if !defined (_CORBA_POLICYERROR_CH_)
  #define _CORBA_POLICYERROR_CH_
  
-@@ -340,6 +323,7 @@
+@@ -348,6 +331,7 @@
  class _TAO_CORBA_Policy_Remote_Proxy_Broker;
  
  class TAO_Export CORBA_Policy : public virtual CORBA_Object
@@ -59,7 +74,7 @@
  {
  public:
  #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-@@ -399,6 +383,9 @@
+@@ -407,6 +391,9 @@
    
    virtual const char* _interface_repository_id (void) const;
  
@@ -69,7 +84,7 @@
  private:
    _TAO_CORBA_Policy_Proxy_Broker *the_TAO_CORBA_Policy_Proxy_Broker_;
    
-@@ -1023,119 +1010,6 @@
+@@ -1039,127 +1026,6 @@
  #endif /* end #if !defined */
  
  
@@ -105,6 +120,14 @@
 -  CORBA_Current_ptr &out (void);
 -  CORBA_Current_ptr _retn (void);
 -  CORBA_Current_ptr ptr (void) const;
+-  
+-  // Hooks used by template sequence and object manager classes
+-  // for non-defined forward declared interfaces.
+-  static CORBA_Current_ptr duplicate (CORBA_Current_ptr);
+-  static void release (CORBA_Current_ptr);
+-  static CORBA_Current_ptr nil (void);
+-  static CORBA_Current_ptr narrow (CORBA::Object *, CORBA::Environment &);
+-  static CORBA::Object * upcast (void *);
 -
 -private:
 -  CORBA_Current_ptr ptr_;
@@ -132,7 +155,7 @@
 -  operator CORBA_Current_ptr &();
 -  CORBA_Current_ptr &ptr (void);
 -  CORBA_Current_ptr operator-> (void);
--  
+-
 -private:
 -  CORBA_Current_ptr &ptr_;
 -};
@@ -189,7 +212,7 @@
  #if !defined (_CORBA_POLICYCURRENT___PTR_CH_)
  #define _CORBA_POLICYCURRENT___PTR_CH_
  
-@@ -1338,7 +1212,7 @@
+@@ -1372,7 +1238,7 @@
  
  
  #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/diffs/PolicyC.i.diff b/TAO/tao/diffs/PolicyC.i.diff
index 6ea7a567a90..b31ef147656 100644
--- a/TAO/tao/diffs/PolicyC.i.diff
+++ b/TAO/tao/diffs/PolicyC.i.diff
@@ -1,179 +1,82 @@
---- orig/PolicyC.i	Tue Apr  3 14:08:51 2001
-+++ patched/PolicyC.i	Tue Apr  3 14:10:45 2001
-@@ -1335,176 +1335,6 @@
+--- orig/PolicyC.i	Tue Apr 17 22:53:50 2001
++++ PolicyC.i	Tue Apr 17 16:02: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:
+@@ -1095,56 +1095,6 @@
  #endif /* end #if !defined */
  
  
--#if !defined (_CORBA_CURRENT___VAR_CI_)
--#define _CORBA_CURRENT___VAR_CI_
--
--// *************************************************************
--// Inline operations for class CORBA_Current_var
--// *************************************************************
--
--ACE_INLINE
--CORBA_Current_var::CORBA_Current_var (void) // default constructor
--  : ptr_ (CORBA_Current::_nil ())
--{}
--
--ACE_INLINE ::CORBA_Current_ptr
--CORBA_Current_var::ptr (void) const
--{
--  return this->ptr_;
--}
--
--ACE_INLINE
--CORBA_Current_var::CORBA_Current_var (const ::CORBA_Current_var &p) // copy constructor
--  : TAO_Base_var (),
--    ptr_ (CORBA_Current::_duplicate (p.ptr ()))
--{}
--
--ACE_INLINE
--CORBA_Current_var::~CORBA_Current_var (void) // destructor
--{
--  CORBA::release (this->ptr_);
--}
--
--ACE_INLINE CORBA_Current_var &
--CORBA_Current_var::operator= (CORBA_Current_ptr p)
--{
--  CORBA::release (this->ptr_);
--  this->ptr_ = p;
--  return *this;
--}
--
--ACE_INLINE CORBA_Current_var &
--CORBA_Current_var::operator= (const ::CORBA_Current_var &p)
--{
--  if (this != &p)
--  {
--    CORBA::release (this->ptr_);
--    this->ptr_ = ::CORBA_Current::_duplicate (p.ptr ());
--  }
--  return *this;
--}
--
--ACE_INLINE 
--CORBA_Current_var::operator const ::CORBA_Current_ptr &() const // cast
--{
--  return this->ptr_;
--}
--
--ACE_INLINE 
--CORBA_Current_var::operator ::CORBA_Current_ptr &() // cast 
--{
--  return this->ptr_;
--}
+-#if !defined (_CORBA_CURRENT___CI_)
+-#define _CORBA_CURRENT___CI_
 -
--ACE_INLINE ::CORBA_Current_ptr
--CORBA_Current_var::operator-> (void) const
+-ACE_INLINE CORBA_Current_ptr
+-tao_CORBA_Current_duplicate (
+-    CORBA_Current_ptr p
+-  )
 -{
--  return this->ptr_;
+-  return CORBA_Current::_duplicate (p);
 -}
 -
--ACE_INLINE ::CORBA_Current_ptr
--CORBA_Current_var::in (void) const
+-ACE_INLINE void
+-tao_CORBA_Current_release (
+-    CORBA_Current_ptr p
+-  )
 -{
--  return this->ptr_;
+-  CORBA::release (p);
 -}
 -
--ACE_INLINE ::CORBA_Current_ptr &
--CORBA_Current_var::inout (void)
+-ACE_INLINE CORBA_Current_ptr
+-tao_CORBA_Current_nil (
+-    void
+-  )
 -{
--  return this->ptr_;
+-  return CORBA_Current::_nil ();
 -}
 -
--ACE_INLINE ::CORBA_Current_ptr &
--CORBA_Current_var::out (void)
+-ACE_INLINE CORBA_Current_ptr
+-tao_CORBA_Current_narrow (
+-    CORBA::Object *p,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
 -{
--  CORBA::release (this->ptr_);
--  this->ptr_ = ::CORBA_Current::_nil ();
--  return this->ptr_;
+-  return CORBA_Current::_narrow (p, ACE_TRY_ENV);
 -}
 -
--ACE_INLINE ::CORBA_Current_ptr
--CORBA_Current_var::_retn (void)
+-ACE_INLINE CORBA::Object *
+-tao_CORBA_Current_upcast (
+-    void *src
+-  )
 -{
--  // yield ownership of managed obj reference
--  ::CORBA_Current_ptr val = this->ptr_;
--  this->ptr_ = ::CORBA_Current::_nil ();
--  return val;
+-  CORBA_Current **tmp =
+-    ACE_static_cast (CORBA_Current **, src);
+-  return *tmp;
 -}
 -
 -
 -#endif /* end #if !defined */
 -
 -
--#if !defined (_CORBA_CURRENT___OUT_CI_)
--#define _CORBA_CURRENT___OUT_CI_
--
--// *************************************************************
--// Inline operations for class CORBA_Current_out
--// *************************************************************
--
--ACE_INLINE
--CORBA_Current_out::CORBA_Current_out (CORBA_Current_ptr &p)
--  : ptr_ (p)
--{
--  this->ptr_ = ::CORBA_Current::_nil ();
--}
--
--ACE_INLINE
--CORBA_Current_out::CORBA_Current_out (CORBA_Current_var &p) // constructor from _var
--  : ptr_ (p.out ())
--{
--  CORBA::release (this->ptr_);
--  this->ptr_ = ::CORBA_Current::_nil ();
--}
--
--ACE_INLINE
--CORBA_Current_out::CORBA_Current_out (const ::CORBA_Current_out &p) // copy constructor
--  : ptr_ (ACE_const_cast (CORBA_Current_out &, p).ptr_)
--{}
--
--ACE_INLINE ::CORBA_Current_out &
--CORBA_Current_out::operator= (const ::CORBA_Current_out &p)
--{
--  this->ptr_ = ACE_const_cast (CORBA_Current_out&, p).ptr_;
--  return *this;
--}
--
--ACE_INLINE CORBA_Current_out &
--CORBA_Current_out::operator= (const ::CORBA_Current_var &p)
--{
--  this->ptr_ = ::CORBA_Current::_duplicate (p.ptr ());
--  return *this;
--}
--
--ACE_INLINE CORBA_Current_out &
--CORBA_Current_out::operator= (CORBA_Current_ptr p)
--{
--  this->ptr_ = p;
--  return *this;
--}
--
--ACE_INLINE 
--CORBA_Current_out::operator ::CORBA_Current_ptr &() // cast
--{
--  return this->ptr_;
--}
--
--ACE_INLINE ::CORBA_Current_ptr &
--CORBA_Current_out::ptr (void) // ptr
--{
--  return this->ptr_;
--}
--
--ACE_INLINE ::CORBA_Current_ptr
--CORBA_Current_out::operator-> (void)
--{
--  return this->ptr_;
--}
--
--
--#endif /* end #if !defined */
--
--
- #if !defined (_CORBA_POLICYCURRENT___VAR_CI_)
- #define _CORBA_POLICYCURRENT___VAR_CI_
+ #if !defined (_CORBA_POLICYCURRENT___CI_)
+ #define _CORBA_POLICYCURRENT___CI_
+ 
+@@ -1284,12 +1234,12 @@
+     return 0;
+ }
+ 
+-TAO_Export CORBA::Boolean operator<< (
++CORBA::Boolean TAO_Export operator<< (
+     TAO_OutputCDR &,
+     const CORBA_Policy_ptr
+   );
  
+-TAO_Export CORBA::Boolean operator>> (
++CORBA::Boolean TAO_Export operator>> (
+     TAO_InputCDR &,
+     CORBA_Policy_ptr &
+   );
diff --git a/TAO/tao/diffs/PollableC.cpp.diff b/TAO/tao/diffs/PollableC.cpp.diff
index 935e117e2c2..db9534d8578 100644
--- a/TAO/tao/diffs/PollableC.cpp.diff
+++ b/TAO/tao/diffs/PollableC.cpp.diff
@@ -1,44 +1,39 @@
---- orig/PollableC.cpp	Fri Apr 28 12:20:09 2000
-+++ PollableC.cpp	Fri Apr 28 12:12:21 2000
-@@ -9,10 +9,19 @@
+--- orig/PollableC.cpp	Mon Apr 16 22:13:53 2001
++++ PollableC.cpp	Mon Apr 16 22:41:17 2001
+@@ -1,4 +1,4 @@
+-// -*- C++ -*-
++// -*- C++ -*- $Id$ */
+ //
+ // $Id$
+ 
+@@ -21,21 +21,18 @@
  
  #include "PollableC.h"
  
 +#if (TAO_HAS_AMI_POLLER == 1)
 +
-+#include "tao/POA_CORBA.h"
-+#include "tao/Stub.h"
-+#include "tao/Invocation.h"
+ #include "tao/Stub.h"
+ #include "tao/Invocation.h"
+-#include "tao/ClientRequestInfo.h"
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+-
+-#if defined (__BORLANDC__)
+-#pragma option -w-rvl -w-rch -w-ccc -w-aus
+-#endif /* __BORLANDC__ */
 +#include "tao/Any.h"
-+
+ 
  #if !defined (__ACE_INLINE__)
  #include "PollableC.i"
  #endif /* !defined INLINE */
  
 +ACE_RCSID(tao, PollableC, "$Id$")
 +
- CORBA_Pollable_ptr CORBA_Pollable::_narrow (
-     CORBA::Object_ptr obj,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -43,7 +52,7 @@
-         );
- }
- 
--CORBA_Pollable_ptr 
-+CORBA_Pollable_ptr
- CORBA_Pollable::_duplicate (CORBA_Pollable_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-@@ -61,7 +70,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -69,7 +78,7 @@
+ // *************************************************************
+ // Operations for class CORBA_Pollable_var
+ // *************************************************************
+@@ -283,7 +280,7 @@
  
  const char* CORBA_Pollable::_interface_repository_id (void) const
  {
@@ -46,26 +41,8 @@
 +  return "IDL:omg.org/CORBA/Pollable:1.0";
  }
  
- CORBA_DIIPollable_ptr CORBA_DIIPollable::_narrow (
-@@ -102,7 +111,7 @@
-         );
- }
- 
--CORBA_DIIPollable_ptr 
-+CORBA_DIIPollable_ptr
- CORBA_DIIPollable::_duplicate (CORBA_DIIPollable_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-@@ -132,7 +141,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -140,7 +149,7 @@
+ // *************************************************************
+@@ -545,7 +542,7 @@
  
  const char* CORBA_DIIPollable::_interface_repository_id (void) const
  {
@@ -73,49 +50,45 @@
 +  return "IDL:omg.org/CORBA/DIIPollable:1.0";
  }
  
- CORBA_PollableSet_ptr CORBA_PollableSet::_narrow (
-@@ -173,7 +182,7 @@
-         );
+ // *************************************************************
+@@ -837,11 +834,6 @@
+     }
  }
  
--CORBA_PollableSet_ptr 
-+CORBA_PollableSet_ptr
- CORBA_PollableSet::_duplicate (CORBA_PollableSet_ptr obj)
- {
-   if (!CORBA::is_nil (obj))
-@@ -210,7 +219,7 @@
- CORBA_PollableSet::NoPossiblePollable *
- CORBA_PollableSet::NoPossiblePollable::_narrow (CORBA::Exception *exc)
- {
--  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA_PollableSet/NoPossiblePollable:1.0", exc->_id ())) // same type
-+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", exc->_id ())) // same type
-     return ACE_dynamic_cast (NoPossiblePollable *, exc);
-   else
-     return 0;
-@@ -275,7 +284,7 @@
- CORBA_PollableSet::UnknownPollable *
- CORBA_PollableSet::UnknownPollable::_narrow (CORBA::Exception *exc)
+-void CORBA_PollableSet::NoPossiblePollable::_raise ()
+-{
+-  TAO_RAISE (*this);
+-}
+-
+ void CORBA_PollableSet::NoPossiblePollable::_tao_encode (
+     TAO_OutputCDR &,
+     CORBA::Environment &ACE_TRY_ENV
+@@ -858,7 +850,7 @@
+   ACE_THROW (CORBA::MARSHAL ());
+ }
+ 
+-// TAO extension - the _alloc method.
++// TAO extension - the _alloc method
+ CORBA::Exception *CORBA_PollableSet::NoPossiblePollable::_alloc (void)
  {
--  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA_PollableSet/UnknownPollable:1.0", exc->_id ())) // same type
-+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", exc->_id ())) // same type
-     return ACE_dynamic_cast (UnknownPollable *, exc);
-   else
-     return 0;
-@@ -321,7 +330,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -329,6 +338,7 @@
+   CORBA::Exception *retval = 0;
+@@ -912,12 +904,12 @@
  
- const char* CORBA_PollableSet::_interface_repository_id (void) const
+ void CORBA_PollableSet::UnknownPollable::_tao_encode (
+     TAO_OutputCDR &,
+-    CORBA::Environment &ACE_TRY_ENV
+-  ) const
++    CORBA::Environment &ACE_TRY_ENV) const
  {
--  return "IDL:omg.org/CORBA_PollableSet:1.0";
-+  return "IDL:omg.org/CORBA/PollableSet:1.0";
+   ACE_THROW (CORBA::MARSHAL ());
  }
  
++
+ void CORBA_PollableSet::UnknownPollable::_tao_decode (
+     TAO_InputCDR &,
+     CORBA::Environment &ACE_TRY_ENV
+@@ -955,3 +947,4 @@
+   #  pragma instantiate TAO_Object_Manager<CORBA_PollableSet,CORBA_PollableSet_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ 
 +#endif /* TAO_HAS_AMI_POLLER == 1 */
diff --git a/TAO/tao/diffs/PollableC.h.diff b/TAO/tao/diffs/PollableC.h.diff
index 577be649118..0989d677f8f 100644
--- a/TAO/tao/diffs/PollableC.h.diff
+++ b/TAO/tao/diffs/PollableC.h.diff
@@ -1,23 +1,29 @@
---- orig/PollableC.h	Fri Apr 28 12:20:09 2000
-+++ PollableC.h	Fri Apr 28 12:02:10 2000
-@@ -7,20 +7,22 @@
+--- orig/PollableC.h	Mon Apr 16 22:13:53 2001
++++ PollableC.h	Tue Apr 17 01:35:37 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,17 +19,22 @@
  // Information about TAO is available at:
- //                 http://www.cs.wustl.edu/~schmidt/TAO.html
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
--#ifndef _TAO_IDL_ORIG_POLLABLEC_H_
--#define _TAO_IDL_ORIG_POLLABLEC_H_
+-#ifndef _TAO_IDL_POLLABLEC_H_
+-#define _TAO_IDL_POLLABLEC_H_
+-
 +#ifndef _TAO_IDL_TMP_POLLABLEC_H_
 +#define _TAO_IDL_TMP_POLLABLEC_H_
-+#include "ace/pre.h"
- 
+ #include "ace/pre.h"
 -#include "tao/corba.h"
++
 +#include "tao/corbafwd.h"
 +
 +#if (TAO_HAS_AMI_POLLER == 1)
- 
--#if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
--#include "ace/streams.h"
--#endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
++
 +#include "tao/Object.h"
 +#include "tao/Exception.h"
 +#include "tao/CDR.h"
@@ -30,245 +36,82 @@
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -61,14 +63,14 @@
-   CORBA_PollableSet_var (CORBA_PollableSet_ptr);
+@@ -71,7 +76,7 @@
+ {
+ public:
+   CORBA_PollableSet_var (void); // default constructor
+-  CORBA_PollableSet_var (CORBA_PollableSet_ptr p) : ptr_ (p) {} 
++  CORBA_PollableSet_var (CORBA_PollableSet_ptr);
    CORBA_PollableSet_var (const CORBA_PollableSet_var &); // copy constructor
    ~CORBA_PollableSet_var (void); // destructor
--  
-+
-   CORBA_PollableSet_var &operator= (CORBA_PollableSet_ptr);
-   CORBA_PollableSet_var &operator= (const CORBA_PollableSet_var &);
-   CORBA_PollableSet_ptr operator-> (void) const;
--  
-+
-   operator const CORBA_PollableSet_ptr &() const;
-   operator CORBA_PollableSet_ptr &();
--  // in, inout, out, _retn 
-+  // in, inout, out, _retn
-   CORBA_PollableSet_ptr in (void) const;
-   CORBA_PollableSet_ptr &inout (void);
-   CORBA_PollableSet_ptr &out (void);
-@@ -98,7 +100,7 @@
-   operator CORBA_PollableSet_ptr &();
-   CORBA_PollableSet_ptr &ptr (void);
-   CORBA_PollableSet_ptr operator-> (void);
--  
-+
- private:
-   CORBA_PollableSet_ptr &ptr_;
- };
-@@ -126,14 +128,14 @@
-   CORBA_Pollable_var (CORBA_Pollable_ptr);
+   
+@@ -147,7 +152,7 @@
+ {
+ public:
+   CORBA_Pollable_var (void); // default constructor
+-  CORBA_Pollable_var (CORBA_Pollable_ptr p) : ptr_ (p) {} 
++  CORBA_Pollable_var (CORBA_Pollable_ptr);
    CORBA_Pollable_var (const CORBA_Pollable_var &); // copy constructor
    ~CORBA_Pollable_var (void); // destructor
--  
-+
-   CORBA_Pollable_var &operator= (CORBA_Pollable_ptr);
-   CORBA_Pollable_var &operator= (const CORBA_Pollable_var &);
-   CORBA_Pollable_ptr operator-> (void) const;
--  
-+
-   operator const CORBA_Pollable_ptr &() const;
-   operator CORBA_Pollable_ptr &();
--  // in, inout, out, _retn 
-+  // in, inout, out, _retn
-   CORBA_Pollable_ptr in (void) const;
-   CORBA_Pollable_ptr &inout (void);
-   CORBA_Pollable_ptr &out (void);
-@@ -163,7 +165,7 @@
-   operator CORBA_Pollable_ptr &();
-   CORBA_Pollable_ptr &ptr (void);
-   CORBA_Pollable_ptr operator-> (void);
--  
-+
- private:
-   CORBA_Pollable_ptr &ptr_;
- };
-@@ -187,12 +189,12 @@
-   static CORBA_Pollable_ptr _duplicate (CORBA_Pollable_ptr obj);
-   static CORBA_Pollable_ptr _narrow (
-       CORBA::Object_ptr obj,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
-   static CORBA_Pollable_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
-   static CORBA_Pollable_ptr _nil (void)
-@@ -202,7 +204,7 @@
- 
-   virtual CORBA::Boolean is_ready (
-       CORBA::ULong timeout,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -210,7 +212,7 @@
-     )) = 0;
- 
-   virtual CORBA_PollableSet_ptr create_pollable_set (
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     )
-     ACE_THROW_SPEC ((
-@@ -218,7 +220,7 @@
-     )) = 0;
- 
-   virtual void *_tao_QueryInterface (ptr_arith_t type);
--  
-+
+   
+@@ -257,7 +262,7 @@
    virtual const char* _interface_repository_id (void) const;
  
  protected:
-@@ -252,14 +254,14 @@
-   CORBA_DIIPollable_var (CORBA_DIIPollable_ptr);
+-  CORBA_Pollable ();
++  CORBA_Pollable (void);
+   
+   virtual ~CORBA_Pollable (void);
+ private:
+@@ -285,7 +290,7 @@
+ {
+ public:
+   CORBA_DIIPollable_var (void); // default constructor
+-  CORBA_DIIPollable_var (CORBA_DIIPollable_ptr p) : ptr_ (p) {} 
++  CORBA_DIIPollable_var (CORBA_DIIPollable_ptr);
    CORBA_DIIPollable_var (const CORBA_DIIPollable_var &); // copy constructor
    ~CORBA_DIIPollable_var (void); // destructor
--  
-+
-   CORBA_DIIPollable_var &operator= (CORBA_DIIPollable_ptr);
-   CORBA_DIIPollable_var &operator= (const CORBA_DIIPollable_var &);
-   CORBA_DIIPollable_ptr operator-> (void) const;
--  
-+
-   operator const CORBA_DIIPollable_ptr &() const;
-   operator CORBA_DIIPollable_ptr &();
--  // in, inout, out, _retn 
-+  // in, inout, out, _retn
-   CORBA_DIIPollable_ptr in (void) const;
-   CORBA_DIIPollable_ptr &inout (void);
-   CORBA_DIIPollable_ptr &out (void);
-@@ -289,7 +291,7 @@
-   operator CORBA_DIIPollable_ptr &();
-   CORBA_DIIPollable_ptr &ptr (void);
-   CORBA_DIIPollable_ptr operator-> (void);
--  
-+
- private:
-   CORBA_DIIPollable_ptr &ptr_;
- };
-@@ -313,12 +315,12 @@
-   static CORBA_DIIPollable_ptr _duplicate (CORBA_DIIPollable_ptr obj);
-   static CORBA_DIIPollable_ptr _narrow (
-       CORBA::Object_ptr obj,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
-   static CORBA_DIIPollable_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
-   static CORBA_DIIPollable_ptr _nil (void)
-@@ -327,7 +329,7 @@
-     }
- 
-   virtual void *_tao_QueryInterface (ptr_arith_t type);
--  
-+
+   
+@@ -378,7 +383,7 @@
    virtual const char* _interface_repository_id (void) const;
  
  protected:
-@@ -361,14 +363,14 @@
-   CORBA_PollableSet_var (CORBA_PollableSet_ptr);
-   CORBA_PollableSet_var (const CORBA_PollableSet_var &); // copy constructor
-   ~CORBA_PollableSet_var (void); // destructor
--  
-+
-   CORBA_PollableSet_var &operator= (CORBA_PollableSet_ptr);
-   CORBA_PollableSet_var &operator= (const CORBA_PollableSet_var &);
-   CORBA_PollableSet_ptr operator-> (void) const;
--  
-+
-   operator const CORBA_PollableSet_ptr &() const;
-   operator CORBA_PollableSet_ptr &();
--  // in, inout, out, _retn 
-+  // in, inout, out, _retn
-   CORBA_PollableSet_ptr in (void) const;
-   CORBA_PollableSet_ptr &inout (void);
-   CORBA_PollableSet_ptr &out (void);
-@@ -398,7 +400,7 @@
-   operator CORBA_PollableSet_ptr &();
-   CORBA_PollableSet_ptr &ptr (void);
-   CORBA_PollableSet_ptr operator-> (void);
--  
-+
+-  CORBA_DIIPollable ();
++  CORBA_DIIPollable (void);
+   
+   virtual ~CORBA_DIIPollable (void);
  private:
-   CORBA_PollableSet_ptr &ptr_;
- };
-@@ -422,12 +424,12 @@
-   static CORBA_PollableSet_ptr _duplicate (CORBA_PollableSet_ptr obj);
-   static CORBA_PollableSet_ptr _narrow (
-       CORBA::Object_ptr obj,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
-   static CORBA_PollableSet_ptr _unchecked_narrow (
-       CORBA::Object_ptr obj,
--      CORBA::Environment &ACE_TRY_ENV = 
-+      CORBA::Environment &ACE_TRY_ENV =
-         TAO_default_environment ()
-     );
-   static CORBA_PollableSet_ptr _nil (void)
-@@ -506,7 +508,7 @@
+@@ -390,6 +395,15 @@
  #endif /* end #if !defined */
  
- virtual CORBA_DIIPollable_ptr create_dii_pollable (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((
-@@ -515,7 +517,7 @@
- 
- virtual void add_pollable (
-     CORBA_Pollable_ptr potential,
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((
-@@ -524,7 +526,7 @@
- 
- virtual CORBA_Pollable_ptr poll (
-     CORBA::ULong timeout,
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((
-@@ -534,7 +536,7 @@
  
- virtual void remove (
-     CORBA_Pollable_ptr potential,
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((
-@@ -543,7 +545,7 @@
-   )) = 0;
++#if !defined (_CORBA_POLLABLESET___PTR_CH_)
++#define _CORBA_POLLABLESET___PTR_CH_
++
++class CORBA_PollableSet;
++typedef CORBA_PollableSet *CORBA_PollableSet_ptr;
++
++#endif /* end #if !defined */
++
++
+ #if !defined (_CORBA_POLLABLESET_CH_)
+ #define _CORBA_POLLABLESET_CH_
  
- virtual CORBA::UShort number_left (
--    CORBA::Environment &ACE_TRY_ENV = 
-+    CORBA::Environment &ACE_TRY_ENV =
-       TAO_default_environment ()
-   )
-   ACE_THROW_SPEC ((
-@@ -580,4 +582,7 @@
- #pragma warning(pop)
- #endif /* _MSC_VER */
+@@ -550,7 +564,7 @@
+   virtual const char* _interface_repository_id (void) const;
  
-+#endif /* TAO_HAS_AMI_POLLER == 1 */
+ protected:
+-  CORBA_PollableSet ();
++  CORBA_PollableSet (void);
+   
+   virtual ~CORBA_PollableSet (void);
+ private:
+@@ -579,6 +593,8 @@
+ #if defined (__BORLANDC__)
+ #pragma option pop
+ #endif /* __BORLANDC__ */
 +
-+#include "ace/post.h"
++#endif /* TAO_HAS_AMI_POLLER == 1 */
+ 
+ #include "ace/post.h"
  #endif /* ifndef */
diff --git a/TAO/tao/diffs/PollableC.i.diff b/TAO/tao/diffs/PollableC.i.diff
index 55cb66553bd..32e5a925ef4 100644
--- a/TAO/tao/diffs/PollableC.i.diff
+++ b/TAO/tao/diffs/PollableC.i.diff
@@ -1,83 +1,16 @@
---- orig/PollableC.i	Fri Apr 28 12:20:09 2000
-+++ PollableC.i	Fri Apr 28 12:02:10 2000
-@@ -69,14 +69,14 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- CORBA_Pollable_var::operator const ::CORBA_Pollable_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE 
--CORBA_Pollable_var::operator ::CORBA_Pollable_ptr &() // cast 
-+ACE_INLINE
-+CORBA_Pollable_var::operator ::CORBA_Pollable_ptr &() // cast
- {
-   return this->ptr_;
- }
-@@ -168,7 +168,7 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- CORBA_Pollable_out::operator ::CORBA_Pollable_ptr &() // cast
- {
-   return this->ptr_;
-@@ -251,14 +251,14 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- CORBA_DIIPollable_var::operator const ::CORBA_DIIPollable_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE 
--CORBA_DIIPollable_var::operator ::CORBA_DIIPollable_ptr &() // cast 
-+ACE_INLINE
-+CORBA_DIIPollable_var::operator ::CORBA_DIIPollable_ptr &() // cast
- {
-   return this->ptr_;
- }
-@@ -350,7 +350,7 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- CORBA_DIIPollable_out::operator ::CORBA_DIIPollable_ptr &() // cast
- {
-   return this->ptr_;
-@@ -433,14 +433,14 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- CORBA_PollableSet_var::operator const ::CORBA_PollableSet_ptr &() const // cast
- {
-   return this->ptr_;
- }
- 
--ACE_INLINE 
--CORBA_PollableSet_var::operator ::CORBA_PollableSet_ptr &() // cast 
-+ACE_INLINE
-+CORBA_PollableSet_var::operator ::CORBA_PollableSet_ptr &() // cast
- {
-   return this->ptr_;
- }
-@@ -532,7 +532,7 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- CORBA_PollableSet_out::operator ::CORBA_PollableSet_ptr &() // cast
- {
-   return this->ptr_;
+--- orig/PollableC.i	Mon Apr 16 22:13:53 2001
++++ PollableC.i	Mon Apr 16 22:31:02 2001
+@@ -1,4 +1,4 @@
+-// -*- C++ -*-
++// -*- C++ -*- $Id$ */
+ //
+ // $Id$
+ 
+@@ -126,7 +126,6 @@
+ // *************************************************************
+ // Inline operations for exception CORBA_PollableSet::UnknownPollable
+ // *************************************************************
+-
+ 
+ #if !defined (_CORBA_POLLABLESET___CI_)
+ #define _CORBA_POLLABLESET___CI_
diff --git a/TAO/tao/diffs/PortableInterceptorC.cpp.diff b/TAO/tao/diffs/PortableInterceptorC.cpp.diff
new file mode 100644
index 00000000000..d7665abbf67
--- /dev/null
+++ b/TAO/tao/diffs/PortableInterceptorC.cpp.diff
@@ -0,0 +1,185 @@
+--- orig/PortableInterceptorC.cpp	Mon Apr 16 22:50:48 2001
++++ PortableInterceptorC.cpp	Mon Apr 16 23:18:23 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:
+@@ -21,13 +21,6 @@
+ 
+ #include "PortableInterceptorC.h"
+ 
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+-#include "tao/ClientRequestInfo.h"
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+-
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus
+ #endif /* __BORLANDC__ */
+@@ -36,6 +29,8 @@
+ #include "PortableInterceptorC.i"
+ #endif /* !defined INLINE */
+ 
++#include "CORBA_String.h"
++
+ // *************************************************************
+ // Operations for class PortableInterceptor::Interceptor_var
+ // *************************************************************
+@@ -445,7 +440,6 @@
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ForwardRequest, &_tc_TAO_tc_PortableInterceptor_ForwardRequest)
+ TAO_NAMESPACE_END
+ 
+-
+ // TAO extension - the virtual _type method.
+ CORBA::TypeCode_ptr PortableInterceptor::ForwardRequest::_type (void) const
+ {
+@@ -648,7 +642,6 @@
+   ACE_NTOHL (0x6c6f7400),  // name = InvalidSlot
+   0, // member count
+ };
+-
+ static CORBA::TypeCode _tc_TAO_tc_PortableInterceptor_InvalidSlot (
+     CORBA::tk_except,
+     sizeof (_oc_PortableInterceptor_InvalidSlot),
+@@ -662,13 +655,13 @@
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InvalidSlot, &_tc_TAO_tc_PortableInterceptor_InvalidSlot)
+ TAO_NAMESPACE_END
+ 
+-
+ // TAO extension - the virtual _type method.
+ CORBA::TypeCode_ptr PortableInterceptor::InvalidSlot::_type (void) const
+ {
+   return ::PortableInterceptor::_tc_InvalidSlot;
+ }
+ 
++
+ // *************************************************************
+ // Operations for class PortableInterceptor::Current_var
+ // *************************************************************
+@@ -931,6 +924,7 @@
+   return "IDL:PortableInterceptor/Current:1.0";
+ }
+ 
++
+ // *************************************************************
+ // Operations for class PortableInterceptor::RequestInfo_var
+ // *************************************************************
+@@ -1181,6 +1175,7 @@
+   return "IDL:PortableInterceptor/RequestInfo:1.0";
+ }
+ 
++
+ // *************************************************************
+ // Operations for class PortableInterceptor::ClientRequestInfo_var
+ // *************************************************************
+@@ -1443,6 +1438,7 @@
+   return "IDL:PortableInterceptor/ClientRequestInfo:1.0";
+ }
+ 
++
+ // *************************************************************
+ // Operations for class PortableInterceptor::ServerRequestInfo_var
+ // *************************************************************
+@@ -1705,6 +1701,7 @@
+   return "IDL:PortableInterceptor/ServerRequestInfo:1.0";
+ }
+ 
++
+ // *************************************************************
+ // Operations for class PortableInterceptor::ClientRequestInterceptor_var
+ // *************************************************************
+@@ -1967,6 +1964,7 @@
+   return "IDL:PortableInterceptor/ClientRequestInterceptor:1.0";
+ }
+ 
++
+ // *************************************************************
+ // Operations for class PortableInterceptor::ServerRequestInterceptor_var
+ // *************************************************************
+@@ -2229,6 +2227,7 @@
+   return "IDL:PortableInterceptor/ServerRequestInterceptor:1.0";
+ }
+ 
++
+ // *************************************************************
+ // Operations for class PortableInterceptor::IORInfo_var
+ // *************************************************************
+@@ -2479,6 +2478,7 @@
+   return "IDL:PortableInterceptor/IORInfo:1.0";
+ }
+ 
++
+ // *************************************************************
+ // Operations for class PortableInterceptor::IORInterceptor_var
+ // *************************************************************
+@@ -2741,6 +2741,7 @@
+   return "IDL:PortableInterceptor/IORInterceptor:1.0";
+ }
+ 
++
+ // *************************************************************
+ // Operations for class PortableInterceptor::PolicyFactory_var
+ // *************************************************************
+@@ -2991,6 +2992,7 @@
+   return "IDL:PortableInterceptor/PolicyFactory:1.0";
+ }
+ 
++
+ // *************************************************************
+ // Operations for class PortableInterceptor::ORBInitInfo_var
+ // *************************************************************
+@@ -3387,6 +3389,7 @@
+   return retval;
+ }
+ 
++
+ // *************************************************************
+ // Operations for class PortableInterceptor::ORBInitializer_var
+ // *************************************************************
+@@ -3683,12 +3686,14 @@
+   ACE_TRY_NEW_ENV
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+-    
+-    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_ForwardRequest, ACE_TRY_ENV);
++    CORBA::Boolean result =
++      type->equivalent (PortableInterceptor::_tc_ForwardRequest, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      return 0; // not equivalent
++      {
++        return 0;
++      }
+     
+     if (_tao_any.any_owns_data ())
+     {
+@@ -3773,12 +3778,14 @@
+   ACE_TRY_NEW_ENV
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+-    
+-    CORBA::Boolean result = type->equivalent (PortableInterceptor::_tc_InvalidSlot, ACE_TRY_ENV);
++    CORBA::Boolean result =
++      type->equivalent (PortableInterceptor::_tc_InvalidSlot, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      return 0; // not equivalent
++      {
++        return 0;
++      }
+     
+     if (_tao_any.any_owns_data ())
+     {
+@@ -3900,4 +3907,3 @@
+   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+   #  pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+-
diff --git a/TAO/tao/diffs/PortableInterceptorC.h.diff b/TAO/tao/diffs/PortableInterceptorC.h.diff
new file mode 100644
index 00000000000..0ffbad5daca
--- /dev/null
+++ b/TAO/tao/diffs/PortableInterceptorC.h.diff
@@ -0,0 +1,249 @@
+--- orig/PortableInterceptorC.h	Mon Apr 16 22:50:48 2001
++++ PortableInterceptorC.h	Mon Apr 16 23:01:28 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,19 +19,21 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#ifndef _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
+-#define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
++#ifndef _TAO_IDL_PORTABLEINTERCEPTORC_H_
++#define _TAO_IDL_PORTABLEINTERCEPTORC_H_
+ 
+ #include "ace/pre.h"
+-#include "tao/corba.h"
++
++#include "corbafwd.h"
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+ #endif /* ACE_LACKS_PRAGMA_ONCE */
+ 
+-#include "tao/corbafwd.h"
+ #include "DynamicC.h"
+ #include "MessagingC.h"
++#include "CurrentC.h"
++#include "IOPC.h"
+ 
+ #if defined (TAO_EXPORT_MACRO)
+ #undef TAO_EXPORT_MACRO
+@@ -164,16 +166,14 @@
+       }
+ 
+     virtual char * name (
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       )) = 0;
+ 
+     virtual void destroy (
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+@@ -624,6 +624,8 @@
+         CORBA::SystemException
+       )) = 0;
+ 
++#if TAO_HAS_CORBA_MESSAGING == 1
++
+     virtual Messaging::SyncScope sync_scope (
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+@@ -632,6 +634,8 @@
+         CORBA::SystemException
+       )) = 0;
+ 
++#endif  /* TAO_HAS_CORBA_MESSAGING == 1 */
++
+     virtual PortableInterceptor::ReplyStatus reply_status (
+         CORBA::Environment &ACE_TRY_ENV = 
+           TAO_default_environment ()
+@@ -1188,9 +1192,8 @@
+       }
+ 
+     virtual void send_request (
+-        PortableInterceptor::ClientRequestInfo_ptr ri,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        PortableInterceptor::ClientRequestInfo_ptr ri
++        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException,
+@@ -1198,27 +1201,24 @@
+       )) = 0;
+ 
+     virtual void send_poll (
+-        PortableInterceptor::ClientRequestInfo_ptr ri,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        PortableInterceptor::ClientRequestInfo_ptr ri
++        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       )) = 0;
+ 
+     virtual void receive_reply (
+-        PortableInterceptor::ClientRequestInfo_ptr ri,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        PortableInterceptor::ClientRequestInfo_ptr ri
++        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       )) = 0;
+ 
+     virtual void receive_exception (
+-        PortableInterceptor::ClientRequestInfo_ptr ri,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        PortableInterceptor::ClientRequestInfo_ptr ri
++        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException,
+@@ -1226,9 +1226,8 @@
+       )) = 0;
+ 
+     virtual void receive_other (
+-        PortableInterceptor::ClientRequestInfo_ptr ri,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        PortableInterceptor::ClientRequestInfo_ptr ri
++        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException,
+@@ -1357,9 +1356,8 @@
+       }
+ 
+     virtual void receive_request_service_contexts (
+-        PortableInterceptor::ServerRequestInfo_ptr ri,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        PortableInterceptor::ServerRequestInfo_ptr ri
++        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException,
+@@ -1367,9 +1365,8 @@
+       )) = 0;
+ 
+     virtual void receive_request (
+-        PortableInterceptor::ServerRequestInfo_ptr ri,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        PortableInterceptor::ServerRequestInfo_ptr ri
++        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException,
+@@ -1377,18 +1374,16 @@
+       )) = 0;
+ 
+     virtual void send_reply (
+-        PortableInterceptor::ServerRequestInfo_ptr ri,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        PortableInterceptor::ServerRequestInfo_ptr ri
++        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       )) = 0;
+ 
+     virtual void send_exception (
+-        PortableInterceptor::ServerRequestInfo_ptr ri,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        PortableInterceptor::ServerRequestInfo_ptr ri
++        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException,
+@@ -1396,9 +1391,8 @@
+       )) = 0;
+ 
+     virtual void send_other (
+-        PortableInterceptor::ServerRequestInfo_ptr ri,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        PortableInterceptor::ServerRequestInfo_ptr ri
++        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException,
+@@ -1676,9 +1670,8 @@
+       }
+ 
+     virtual void establish_components (
+-        PortableInterceptor::IORInfo_ptr info,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        PortableInterceptor::IORInfo_ptr info
++        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+@@ -1807,9 +1800,8 @@
+ 
+     virtual CORBA::Policy_ptr create_policy (
+         CORBA::PolicyType type,
+-        const CORBA::Any & value,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        const CORBA::Any & value
++        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException,
+@@ -2241,18 +2233,16 @@
+       }
+ 
+     virtual void pre_init (
+-        PortableInterceptor::ORBInitInfo_ptr info,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        PortableInterceptor::ORBInitInfo_ptr info
++        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+       )) = 0;
+ 
+     virtual void post_init (
+-        PortableInterceptor::ORBInitInfo_ptr info,
+-        CORBA::Environment &ACE_TRY_ENV = 
+-          TAO_default_environment ()
++        PortableInterceptor::ORBInitInfo_ptr info
++        TAO_ENV_ARG_DECL_WITH_DEFAULTS
+       )
+       ACE_THROW_SPEC ((
+         CORBA::SystemException
+@@ -2274,6 +2264,11 @@
+ 
+ #endif /* end #if !defined */
+ 
++/// Register an ORBInitializer with the global ORBInitializer
++/// table.
++TAO_NAMESPACE_STORAGE_CLASS void register_orb_initializer (
++  ORBInitializer_ptr init,
++  CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ());
+ 
+ }
+ TAO_NAMESPACE_CLOSE // module PortableInterceptor
diff --git a/TAO/tao/diffs/PortableInterceptorC.i.diff b/TAO/tao/diffs/PortableInterceptorC.i.diff
new file mode 100644
index 00000000000..133d04c66e3
--- /dev/null
+++ b/TAO/tao/diffs/PortableInterceptorC.i.diff
@@ -0,0 +1,10 @@
+--- orig/PortableInterceptorC.i	Mon Apr 16 22:50:48 2001
++++ PortableInterceptorC.i	Mon Apr 16 23:08:03 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/PortableServerC.cpp.diff b/TAO/tao/diffs/PortableServerC.cpp.diff
index e84f8755327..172925fadce 100644
--- a/TAO/tao/diffs/PortableServerC.cpp.diff
+++ b/TAO/tao/diffs/PortableServerC.cpp.diff
@@ -1,25 +1,39 @@
---- PortableServerC.cpp	Tue Jul 11 01:25:50 2000
-+++ PortableServerC.cpp.mod	Tue Jul 11 01:16:29 2000
-@@ -8,6 +8,8 @@
- //                 http://www.cs.wustl.edu/~schmidt/TAO.html
+--- orig/PortableServerC.cpp	Wed Apr 18 01:09:27 2001
++++ PortableServerC.cpp	Wed Apr 18 00:44:53 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:
+@@ -20,13 +20,8 @@
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
  #include "PortableServerC.h"
+-
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+-#include "tao/ClientRequestInfo.h"
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
 +#include "POA.h"
 +#include "tao/ORB.h"
  
- #if !defined (__ACE_INLINE__)
- #include "PortableServerC.i"
-@@ -209,6 +211,9 @@
- TAO_NAMESPACE_BEGIN (PortableServer)
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus
+@@ -263,6 +258,8 @@
  TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ObjectId, &_tc_TAO_tc_PortableServer_ObjectId)
  TAO_NAMESPACE_END
-+
+ 
 +#if (TAO_HAS_MINIMUM_CORBA == 0)
 +
- // default constructor
+ // Default constructor.
  PortableServer::ForwardRequest::ForwardRequest (void)
-   : CORBA_UserException (::PortableServer::_tc_ForwardRequest)
-@@ -340,6 +340,8 @@
+   : CORBA_UserException ("IDL:PortableServer/ForwardRequest:1.0")
+@@ -421,6 +418,8 @@
    return ::PortableServer::_tc_ForwardRequest;
  }
  
@@ -28,7 +42,7 @@
  TAO_NAMESPACE_TYPE (const CORBA::ULong)
  TAO_NAMESPACE_BEGIN (PortableServer)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREAD_POLICY_ID, 16U)
-@@ -342,6 +350,9 @@
+@@ -449,6 +448,9 @@
  TAO_NAMESPACE_BEGIN (PortableServer)
  TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_PROCESSING_POLICY_ID, 22U)
  TAO_NAMESPACE_END
@@ -38,7 +52,7 @@
  static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
  {
    TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -436,6 +447,8 @@
+@@ -760,6 +762,8 @@
    return "IDL:PortableServer/ThreadPolicy:1.0";
  }
  
@@ -47,7 +61,7 @@
  static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] =
  {
    TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -718,6 +731,8 @@
+@@ -1687,6 +1691,8 @@
    return "IDL:PortableServer/IdAssignmentPolicy:1.0";
  }
  
@@ -56,51 +70,53 @@
  static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
  {
    TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -1001,6 +1016,7 @@
+@@ -2642,6 +2648,8 @@
    return "IDL:PortableServer/RequestProcessingPolicy:1.0";
  }
  
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
- 
- // default constructor
- PortableServer::POAManager::POAManager (void)
-@@ -1048,6 +1064,8 @@
-   return obj;
++
+ // *************************************************************
+ // Operations for class PortableServer::POAManager_var
+ // *************************************************************
+@@ -2961,6 +2969,8 @@
+   return retval;
  }
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- // default constructor
- PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
- {
-@@ -1430,6 +1448,7 @@
+ // *************************************************************
+ // Operations for class PortableServer::AdapterActivator_var
+ // *************************************************************
+@@ -3989,6 +3999,8 @@
    return "IDL:PortableServer/ServantLocator:1.0";
  }
  
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
- 
- // default constructor
- PortableServer::POA::POA (void)
-@@ -1681,6 +1700,8 @@
-     this->index = _tao_index;
++
+ // *************************************************************
+ // Operations for class PortableServer::POA_var
+ // *************************************************************
+@@ -4454,6 +4466,8 @@
+   this->index = _tao_index;
  }
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- // default constructor
+ // Default constructor.
  PortableServer::POA::NoServant::NoServant (void)
- {
-@@ -1746,6 +1767,8 @@
+   : CORBA_UserException ("IDL:PortableServer/POA/NoServant:1.0")
+@@ -4522,6 +4536,8 @@
    return retval;
  }
  
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
 +
- // default constructor
+ // Default constructor.
  PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
- {
-@@ -2302,6 +2325,30 @@
-   return "IDL:PortableServer/Current:1.0";
+   : CORBA_UserException ("IDL:PortableServer/POA/ObjectAlreadyActive:1.0")
+@@ -5261,6 +5277,30 @@
+   return retval;
  }
  
 +char *
@@ -130,7 +146,7 @@
  void operator<<= (
      CORBA::Any &_tao_any,
      const PortableServer::ObjectId &_tao_elem
-@@ -2391,6 +2438,8 @@
+@@ -5352,6 +5392,8 @@
    return 0;
  }
  
@@ -139,7 +155,7 @@
  void operator<<= (CORBA::Any &_tao_any, const PortableServer::ForwardRequest &_tao_elem) // copying
  {
    TAO_OutputCDR stream;
-@@ -2479,6 +2528,10 @@
+@@ -5442,6 +5484,10 @@
    return 0;
  }
  
@@ -150,7 +166,7 @@
  void operator<<= (CORBA::Any &_tao_any, PortableServer::ThreadPolicyValue _tao_elem)
  {
    TAO_OutputCDR stream;
-@@ -2524,6 +2577,8 @@
+@@ -5489,6 +5535,8 @@
    #  pragma instantiate TAO_Object_Manager<PortableServer::ThreadPolicy,PortableServer::ThreadPolicy_var>
  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
  
@@ -159,7 +175,7 @@
  void operator<<= (CORBA::Any &_tao_any, PortableServer::LifespanPolicyValue _tao_elem)
  {
    TAO_OutputCDR stream;
-@@ -2659,6 +2714,8 @@
+@@ -5630,6 +5678,8 @@
    #  pragma instantiate TAO_Object_Manager<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var>
  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
  
@@ -168,7 +184,7 @@
  void operator<<= (CORBA::Any &_tao_any, PortableServer::ImplicitActivationPolicyValue _tao_elem)
  {
    TAO_OutputCDR stream;
-@@ -2794,6 +2851,8 @@
+@@ -5771,6 +5821,8 @@
    #  pragma instantiate TAO_Object_Manager<PortableServer::RequestProcessingPolicy,PortableServer::RequestProcessingPolicy_var>
  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
  
@@ -177,7 +193,7 @@
  #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
      defined (ACE_HAS_GNU_REPO)
      template class TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var>;
-@@ -2801,6 +2860,8 @@
+@@ -5778,6 +5830,8 @@
    #  pragma instantiate TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var>
  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
  
@@ -186,12 +202,12 @@
  #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
      defined (ACE_HAS_GNU_REPO)
      template class TAO_Object_Manager<PortableServer::AdapterActivator,PortableServer::AdapterActivator_var>;
-@@ -2829,6 +2890,8 @@
+@@ -5805,6 +5859,8 @@
+   #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
    #  pragma instantiate TAO_Object_Manager<PortableServer::ServantLocator,PortableServer::ServantLocator_var>
  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
 +
++#endif /* TAO_HAS_MINIMUM_POA == 0 */
+ 
  #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
      defined (ACE_HAS_GNU_REPO)
-     template class TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>;
diff --git a/TAO/tao/diffs/PortableServerC.h.diff b/TAO/tao/diffs/PortableServerC.h.diff
index c30ae80a66e..34863b73554 100644
--- a/TAO/tao/diffs/PortableServerC.h.diff
+++ b/TAO/tao/diffs/PortableServerC.h.diff
@@ -1,21 +1,22 @@
---- PortableServerC.h	Fri Jul 14 06:41:41 2000
-+++ PortableServerC.h.mod	Fri Jul 14 06:39:07 2000
-@@ -1,4 +1,4 @@
--/* -*- C++ -*- $Id$ */
-+/* -*- C++ -*- $Id$ */
- 
- // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
- // TAO and the TAO IDL Compiler have been developed by the Center for
-@@ -11,7 +11,7 @@
- #define _TAO_IDL_PORTABLESERVERC_H_
+--- orig/PortableServerC.h	Wed Apr 18 01:09:27 2001
++++ PortableServerC.h	Wed Apr 18 00:45: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:
+@@ -23,13 +23,17 @@
+ #define _TAO_IDL_ORIG_PORTABLESERVERC_H_
  
  #include "ace/pre.h"
 -#include "tao/corba.h"
++#include "portableserver_export.h"
 +#include "tao/corbafwd.h"
  
- #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
- #include "ace/streams.h"
-@@ -21,7 +21,10 @@
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
@@ -27,9 +28,9 @@
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -42,8 +45,22 @@
- #pragma warning(disable:4250)
- #endif /* _MSC_VER */
+@@ -54,8 +58,22 @@
+ #pragma option push -w-rvl -w-rch -w-ccc -w-inl
+ #endif /* __BORLANDC__ */
  
 +class TAO_ServantBase;
 +class TAO_ServantBase_var;
@@ -50,23 +51,7 @@
    class POA;
    
  #if !defined (_PORTABLESERVER_POA___PTR_CH_)
-@@ -297,13 +314,13 @@
- #endif /* ! __GNUC__ || g++ >= 2.8 */
- 
- 
--#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-+#if defined(TAO_NO_COPY_OCTET_SEQUENCES)
-     ObjectId (
-         CORBA::ULong length,
-         const ACE_Message_Block* mb
-       )
-       : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
--#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */
-+#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
- 
-   };
-   
-@@ -380,6 +397,8 @@
+@@ -403,6 +421,8 @@
    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ObjectId;
  
  
@@ -75,18 +60,18 @@
  #if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_)
  #define _PORTABLESERVER_FORWARDREQUEST_CH_
  
-@@ -421,6 +440,8 @@
+@@ -452,6 +472,8 @@
  
-   #endif /* end #if !defined */
+ #endif /* end #if !defined */
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong THREAD_POLICY_ID;
  
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong LIFESPAN_POLICY_ID;
-@@ -441,6 +462,9 @@
-       ORB_CTRL_MODEL,
-       SINGLE_THREAD_MODEL
+@@ -471,6 +493,9 @@
+         ORB_CTRL_MODEL,
+         SINGLE_THREAD_MODEL    
    };
 +
 +#if (TAO_HAS_MINIMUM_POA == 0)
@@ -94,7 +79,7 @@
    typedef ThreadPolicyValue &ThreadPolicyValue_out;
    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadPolicyValue;
  
-@@ -564,6 +588,8 @@
+@@ -603,6 +628,8 @@
  
  #endif /* end #if !defined */
  
@@ -102,10 +87,10 @@
 +
    enum LifespanPolicyValue
    {
-       TRANSIENT,
-@@ -957,6 +983,9 @@
-       IMPLICIT_ACTIVATION,
-       NO_IMPLICIT_ACTIVATION,
+         TRANSIENT,
+@@ -1019,6 +1046,9 @@
+         IMPLICIT_ACTIVATION,
+         NO_IMPLICIT_ACTIVATION    
    };
 +
 +#if (TAO_HAS_MINIMUM_POA == 0)
@@ -113,7 +98,7 @@
    typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue;
  
-@@ -1080,11 +1109,16 @@
+@@ -1151,11 +1181,16 @@
  
  #endif /* end #if !defined */
  
@@ -130,7 +115,7 @@
    typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue;
  
-@@ -1209,6 +1243,8 @@
+@@ -1288,12 +1323,17 @@
  
  #endif /* end #if !defined */
  
@@ -138,10 +123,9 @@
 +
    enum RequestProcessingPolicyValue
    {
-       USE_ACTIVE_OBJECT_MAP_ONLY,
-@@ -1216,6 +1252,9 @@
-       USE_DEFAULT_SERVANT,
-       USE_SERVANT_MANAGER
+         USE_ACTIVE_OBJECT_MAP_ONLY,
+         USE_DEFAULT_SERVANT,
+         USE_SERVANT_MANAGER    
    };
 +
 +#if (TAO_HAS_MINIMUM_POA == 0)
@@ -149,15 +133,16 @@
    typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue;
  
-@@ -1339,6 +1378,7 @@
- 
+@@ -1427,6 +1467,8 @@
  #endif /* end #if !defined */
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
  
++#endif /* TAO_HAS_MINIMUM_POA == 0 */
++
  #if !defined (_PORTABLESERVER_POAMANAGER___PTR_CH_)
  #define _PORTABLESERVER_POAMANAGER___PTR_CH_
-@@ -1489,6 +1529,8 @@
+ 
+@@ -1589,6 +1631,8 @@
          PortableServer::POAManager::AdapterInactive
        )) = 0;
  
@@ -166,16 +151,16 @@
      virtual void hold_requests (
          CORBA::Boolean wait_for_completion,
          CORBA::Environment &ACE_TRY_ENV = 
-@@ -1520,6 +1562,8 @@
+@@ -1620,6 +1664,8 @@
          PortableServer::POAManager::AdapterInactive
        )) = 0;
  
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
 +
      virtual PortableServer::POAManager::State get_state (
-                 CORBA::Environment &ACE_TRY_ENV = 
+         CORBA::Environment &ACE_TRY_ENV = 
            TAO_default_environment ()
-@@ -1544,6 +1588,8 @@
+@@ -1645,6 +1691,8 @@
  #endif /* end #if !defined */
  
  
@@ -184,7 +169,7 @@
  #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_)
  #define _PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_
  
-@@ -1876,23 +1922,27 @@
+@@ -2003,14 +2051,19 @@
  
      virtual PortableServer::Servant incarnate (
          const PortableServer::ObjectId & oid,
@@ -192,7 +177,7 @@
 -        CORBA::Environment &ACE_TRY_ENV = 
 -          TAO_default_environment ()
 +        PortableServer::POA_ptr adapter
-+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
++      TAO_ENV_ARG_DECL_WITH_DEFAULTS
        )
 +#if (TAO_HAS_MINIMUM_CORBA == 0)
        ACE_THROW_SPEC ((
@@ -200,26 +185,15 @@
          PortableServer::ForwardRequest
        )) = 0;
 +#else
-+      ACE_THROW_SPEC ((
-+        CORBA::SystemException
-+      )) = 0;
++    ACE_THROW_SPEC ((
++      CORBA::SystemException
++    )) = 0;
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
  
      virtual void etherealize (
          const PortableServer::ObjectId & oid,
-         PortableServer::POA_ptr adapter,
-         PortableServer::Servant serv,
-         CORBA::Boolean cleanup_in_progress,
--        CORBA::Boolean remaining_activations,
--        CORBA::Environment &ACE_TRY_ENV = 
--          TAO_default_environment ()
-+        CORBA::Boolean remaining_activations
-+        TAO_ENV_ARG_DECL_WITH_DEFAULTS
-       )
-       ACE_THROW_SPEC ((
-         CORBA::SystemException
-@@ -1988,6 +2038,9 @@
- class TAO_Export ServantLocator: public virtual ServantManager
+@@ -2124,6 +2177,9 @@
+ class TAO_PortableServer_Export ServantLocator: public virtual ServantManager
    {
    public:
 +
@@ -228,7 +202,7 @@
    #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
      typedef ServantLocator_ptr _ptr_type;
      typedef ServantLocator_var _var_type;
-@@ -2014,23 +2067,27 @@
+@@ -2150,23 +2206,27 @@
          const PortableServer::ObjectId & oid,
          PortableServer::POA_ptr adapter,
          const char * operation,
@@ -262,16 +236,16 @@
        )
        ACE_THROW_SPEC ((
          CORBA::SystemException
-@@ -2052,6 +2109,8 @@
+@@ -2189,6 +2249,8 @@
  #endif /* end #if !defined */
  
  
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
 +
- #if !defined (_PORTABLESERVER_POA___PTR_CH_)
- #define _PORTABLESERVER_POA___PTR_CH_
+ #if !defined (_PORTABLESERVER_POA_CH_)
+ #define _PORTABLESERVER_POA_CH_
  
-@@ -2258,6 +2317,8 @@
+@@ -2345,6 +2407,8 @@
  #endif /* end #if !defined */
  
  
@@ -280,15 +254,16 @@
  #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
  #define _PORTABLESERVER_POA_NOSERVANT_CH_
  
-@@ -2292,6 +2353,7 @@
- 
+@@ -2386,6 +2450,8 @@
  #endif /* end #if !defined */
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
  
++#endif /* TAO_HAS_MINIMUM_POA == 0 */
++
  #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_)
  #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_
-@@ -2536,6 +2598,8 @@
+ 
+@@ -2665,6 +2731,8 @@
          CORBA::SystemException
        )) = 0;
  
@@ -297,7 +272,7 @@
      virtual PortableServer::ThreadPolicy_ptr create_thread_policy (
          PortableServer::ThreadPolicyValue value,
          CORBA::Environment &ACE_TRY_ENV = 
-@@ -2545,6 +2609,8 @@
+@@ -2674,6 +2742,8 @@
          CORBA::SystemException
        )) = 0;
  
@@ -306,7 +281,7 @@
      virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (
          PortableServer::LifespanPolicyValue value,
          CORBA::Environment &ACE_TRY_ENV = 
-@@ -2572,6 +2638,8 @@
+@@ -2701,6 +2771,8 @@
          CORBA::SystemException
        )) = 0;
  
@@ -315,7 +290,7 @@
      virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
          PortableServer::ImplicitActivationPolicyValue value,
          CORBA::Environment &ACE_TRY_ENV = 
-@@ -2599,6 +2667,8 @@
+@@ -2728,6 +2800,8 @@
          CORBA::SystemException
        )) = 0;
  
@@ -324,7 +299,7 @@
      virtual char * the_name (
          CORBA::Environment &ACE_TRY_ENV = 
            TAO_default_environment ()
-@@ -2631,6 +2701,8 @@
+@@ -2760,6 +2834,8 @@
          CORBA::SystemException
        )) = 0;
  
@@ -333,7 +308,7 @@
      virtual PortableServer::AdapterActivator_ptr the_activator (
          CORBA::Environment &ACE_TRY_ENV = 
            TAO_default_environment ()
-@@ -2687,6 +2759,8 @@
+@@ -2816,6 +2892,8 @@
          PortableServer::POA::WrongPolicy
        )) = 0;
  
@@ -342,92 +317,93 @@
      virtual PortableServer::ObjectId * activate_object (
          PortableServer::Servant p_servant,
          CORBA::Environment &ACE_TRY_ENV = 
-@@ -2989,6 +3063,10 @@
- 
+@@ -3136,6 +3214,11 @@
  #endif /* end #if !defined */
  
+ 
 +  TAO_NAMESPACE_STORAGE_CLASS char *ObjectId_to_string (const PortableServer::ObjectId &id);
 +  TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id);
 +  TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *string_to_ObjectId (const char *id);
 +  TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
- 
++
  }
  TAO_NAMESPACE_CLOSE // module PortableServer
-@@ -2997,18 +3075,32 @@
- TAO_Export void operator<<= (CORBA::Any &, PortableServer::ObjectId*); // noncopying version
- TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated
- TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ObjectId *&);
+ 
+@@ -3143,18 +3226,32 @@
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ObjectId*); // noncopying version
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ObjectId *&);
 +
 +#if (TAO_HAS_MINIMUM_CORBA == 0)
 +
- TAO_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version
- TAO_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version
- TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated
- TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&);
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&);
 +
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- TAO_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
- TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
 +
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
 +
- TAO_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue);
- TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &);
- TAO_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue);
- TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &);
- TAO_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue);
- TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &);
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue);
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &);
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue);
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &);
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue);
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &);
 +
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- TAO_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
- TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
- TAO_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
-@@ -3016,6 +3108,8 @@
- TAO_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
- TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
+@@ -3162,6 +3259,8 @@
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
  
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
 +
  #ifndef __ACE_INLINE__
  
  
-@@ -3033,23 +3127,37 @@
+@@ -3179,23 +3278,37 @@
  
  #endif /* _TAO_CDR_OP_PortableServer_ObjectId_H_ */
  
 +#if (TAO_HAS_MINIMUM_CORBA == 0)
 +
- TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &);
- TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &);
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); // 
- TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); // 
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
 +
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
 +
- TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); // 
- TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
- TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); // 
- TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
- TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); // 
- TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); // 
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); // 
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); // 
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
 +
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); // 
- TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
- TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); // 
- TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
- TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); // 
- TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); // 
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); // 
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); // 
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
 +
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
  
diff --git a/TAO/tao/diffs/PortableServerC.i.diff b/TAO/tao/diffs/PortableServerC.i.diff
index 7efaed2a244..87a4c858442 100644
--- a/TAO/tao/diffs/PortableServerC.i.diff
+++ b/TAO/tao/diffs/PortableServerC.i.diff
@@ -1,31 +1,41 @@
---- PortableServerC.i	Tue Jul 11 01:25:50 2000
-+++ PortableServerC.i.mod	Tue Jul 11 01:16:42 2000
-@@ -739,6 +744,8 @@
+--- orig/PortableServerC.i	Wed Apr 18 01:09:27 2001
++++ PortableServerC.i	Tue Apr 17 23:56:19 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:
+@@ -628,6 +628,8 @@
  // *************************************************************
  
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- #if !defined (_PORTABLESERVER_THREADPOLICY___VAR_CI_)
- #define _PORTABLESERVER_THREADPOLICY___VAR_CI_
- 
-@@ -908,6 +920,7 @@
+ #if !defined (_PORTABLESERVER_THREADPOLICY___CI_)
+ #define _PORTABLESERVER_THREADPOLICY___CI_
  
+@@ -678,6 +680,8 @@
  #endif /* end #if !defined */
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
  
- #if !defined (_PORTABLESERVER_LIFESPANPOLICY___VAR_CI_)
- #define _PORTABLESERVER_LIFESPANPOLICY___VAR_CI_
-@@ -1418,6 +1446,7 @@
++#endif /* TAO_HAS_MINIMUM_POA == 0 */
++
+ #if !defined (_PORTABLESERVER_LIFESPANPOLICY___CI_)
+ #define _PORTABLESERVER_LIFESPANPOLICY___CI_
  
+@@ -828,6 +832,8 @@
  #endif /* end #if !defined */
  
+ 
 +#if (TAO_HAS_MINIMUM_POA == 0)
++
+ #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_)
+ #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_
  
- #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CI_)
- #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___VAR_CI_
-@@ -1928,6 +1972,8 @@
+@@ -977,6 +983,8 @@
  
  #endif /* end #if !defined */
  
@@ -34,15 +44,16 @@
  // *************************************************************
  // Inline operations for exception PortableServer::POAManager::AdapterInactive
  // *************************************************************
-@@ -2102,6 +2153,7 @@
- 
+@@ -1032,6 +1040,8 @@
  #endif /* end #if !defined */
  
+ 
 +#if (TAO_HAS_MINIMUM_POA == 0)
++
+ #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___CI_)
+ #define _PORTABLESERVER_ADAPTERACTIVATOR___CI_
  
- #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___VAR_CI_)
- #define _PORTABLESERVER_ADAPTERACTIVATOR___VAR_CI_
-@@ -2782,6 +2854,8 @@
+@@ -1231,6 +1241,8 @@
  
  #endif /* end #if !defined */
  
@@ -51,7 +62,7 @@
  // *************************************************************
  // Inline operations for exception PortableServer::POA::AdapterAlreadyExists
  // *************************************************************
-@@ -3021,6 +3100,8 @@
+@@ -1390,6 +1402,8 @@
  
  #endif /* _TAO_CDR_OP_PortableServer_ObjectId_I_ */
  
@@ -60,9 +71,9 @@
  ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ForwardRequest &_tao_aggregate)
  {
    // first marshal the repository ID
-@@ -3069,6 +3150,10 @@
- 
- #endif /* ACE_LACKS_IOSTREAM_TOTALLY */
+@@ -1418,6 +1432,10 @@
+     return 0;
+ }
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
@@ -70,27 +81,27 @@
 +
  ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ThreadPolicyValue &_tao_enumval)
  {
-   return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-@@ -3086,6 +3171,8 @@
-     return 0;
+   CORBA::ULong _tao_temp = _tao_enumval;
+@@ -1437,6 +1455,8 @@
+   return _tao_result;
  }
  
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
 +
  ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval)
  {
-   return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-@@ -3137,6 +3224,8 @@
-     return 0;
+   CORBA::ULong _tao_temp = _tao_enumval;
+@@ -1494,6 +1514,8 @@
+   return _tao_result;
  }
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
  ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
  {
-   return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-@@ -3188,3 +3277,4 @@
-     return 0;
+   CORBA::ULong _tao_temp = _tao_enumval;
+@@ -1551,3 +1573,4 @@
+   return _tao_result;
  }
  
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/diffs/RTCORBAC.cpp.diff b/TAO/tao/diffs/RTCORBAC.cpp.diff
index c3a482a3f69..125e2cc0142 100644
--- a/TAO/tao/diffs/RTCORBAC.cpp.diff
+++ b/TAO/tao/diffs/RTCORBAC.cpp.diff
@@ -1,9 +1,19 @@
---- orig/RTCORBAC.cpp	Wed Mar 28 20:41:10 2001
-+++ RTCORBAC.cpp	Wed Mar 28 20:41:53 2001
-@@ -24,6 +24,11 @@
+--- orig/RTCORBAC.cpp	Tue Apr 17 23:11:09 2001
++++ RTCORBAC.cpp	Tue Apr 17 23:10:41 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,7 +23,12 @@
+ 
  #include "tao/Stub.h"
  #include "tao/Invocation.h"
- 
+-#include "tao/ClientRequestInfo.h"
++
 +#if (TAO_HAS_RT_CORBA == 1)
 +
 +#include "tao/TAOS.h"
@@ -12,10 +22,114 @@
  #if TAO_HAS_INTERCEPTORS == 1
  #include "tao/RequestInfo_Util.h"
  #endif  /* TAO_HAS_INTERCEPTORS == 1 */
-@@ -1061,6 +1066,20 @@
-   return "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0";
+@@ -475,6 +480,7 @@
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PriorityModel, &_tc_TAO_tc_RTCORBA_PriorityModel)
+ TAO_NAMESPACE_END
+ 
++
+ // *************************************************************
+ // Operations for class RTCORBA::PriorityModelPolicy_var
+ // *************************************************************
+@@ -597,7 +603,6 @@
+     ACE_static_cast (PriorityModelPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class RTCORBA::PriorityModelPolicy_out
+ // *************************************************************
+@@ -742,6 +747,7 @@
+ TAO_NAMESPACE_BEGIN (RTCORBA)
+ TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREADPOOL_POLICY_TYPE, 41U)
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class RTCORBA::ThreadpoolPolicy_var
+ // *************************************************************
+@@ -864,7 +870,6 @@
+     ACE_static_cast (ThreadpoolPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class RTCORBA::ThreadpoolPolicy_out
+ // *************************************************************
+@@ -1005,6 +1010,7 @@
+   return "IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0";
+ }
+ 
++
+ // *************************************************************
+ // Operations for class RTCORBA::ProtocolProperties_var
+ // *************************************************************
+@@ -1127,7 +1133,6 @@
+     ACE_static_cast (ProtocolProperties **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class RTCORBA::ProtocolProperties_out
+ // *************************************************************
+@@ -1356,6 +1361,7 @@
+ TAO_NAMESPACE_BEGIN (RTCORBA)
+ TAO_NAMESPACE_DEFINE (const CORBA::ULong, SERVER_PROTOCOL_POLICY_TYPE, 42U)
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class RTCORBA::ServerProtocolPolicy_var
+ // *************************************************************
+@@ -1478,7 +1484,6 @@
+     ACE_static_cast (ServerProtocolPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class RTCORBA::ServerProtocolPolicy_out
+ // *************************************************************
+@@ -1623,6 +1628,7 @@
+ TAO_NAMESPACE_BEGIN (RTCORBA)
+ TAO_NAMESPACE_DEFINE (const CORBA::ULong, CLIENT_PROTOCOL_POLICY_TYPE, 43U)
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class RTCORBA::ClientProtocolPolicy_var
+ // *************************************************************
+@@ -1745,7 +1751,6 @@
+     ACE_static_cast (ClientProtocolPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class RTCORBA::ClientProtocolPolicy_out
+ // *************************************************************
+@@ -1890,6 +1895,7 @@
+ TAO_NAMESPACE_BEGIN (RTCORBA)
+ TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIVATE_CONNECTION_POLICY_TYPE, 44U)
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class RTCORBA::PrivateConnectionPolicy_var
+ // *************************************************************
+@@ -2012,7 +2018,6 @@
+     ACE_static_cast (PrivateConnectionPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class RTCORBA::PrivateConnectionPolicy_out
+ // *************************************************************
+@@ -2275,7 +2280,6 @@
+     ACE_static_cast (TCPProtocolProperties **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class RTCORBA::TCPProtocolProperties_out
+ // *************************************************************
+@@ -2336,6 +2340,21 @@
  }
  
+ 
 +//////////////////////////////////////////////////////
 +// CDR Encoding Support
 +
@@ -30,10 +144,123 @@
 +{
 +  return 1;
 +}
- 
++
  // default constructor
  RTCORBA::TCPProtocolProperties::TCPProtocolProperties ()
-@@ -2071,7 +2090,7 @@
+ {
+@@ -2416,6 +2435,7 @@
+   return "IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0";
+ }
+ 
++
+ // *************************************************************
+ // Operations for class RTCORBA::GIOPProtocolProperties_var
+ // *************************************************************
+@@ -2538,7 +2558,6 @@
+     ACE_static_cast (GIOPProtocolProperties **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class RTCORBA::GIOPProtocolProperties_out
+ // *************************************************************
+@@ -2679,6 +2698,7 @@
+   return "IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0";
+ }
+ 
++
+ // *************************************************************
+ // Operations for class RTCORBA::UnixDomainProtocolProperties_var
+ // *************************************************************
+@@ -2801,7 +2821,6 @@
+     ACE_static_cast (UnixDomainProtocolProperties **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class RTCORBA::UnixDomainProtocolProperties_out
+ // *************************************************************
+@@ -2942,6 +2961,7 @@
+   return "IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0";
+ }
+ 
++
+ // *************************************************************
+ // Operations for class RTCORBA::SharedMemoryProtocolProperties_var
+ // *************************************************************
+@@ -3064,7 +3084,6 @@
+     ACE_static_cast (SharedMemoryProtocolProperties **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class RTCORBA::SharedMemoryProtocolProperties_out
+ // *************************************************************
+@@ -3496,6 +3515,7 @@
+ TAO_NAMESPACE_BEGIN (RTCORBA)
+ TAO_NAMESPACE_DEFINE (const CORBA::ULong, PRIORITY_BANDED_CONNECTION_POLICY_TYPE, 45U)
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class RTCORBA::PriorityBandedConnectionPolicy_var
+ // *************************************************************
+@@ -3618,7 +3638,6 @@
+     ACE_static_cast (PriorityBandedConnectionPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class RTCORBA::PriorityBandedConnectionPolicy_out
+ // *************************************************************
+@@ -3759,6 +3778,7 @@
+   return "IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0";
+ }
+ 
++
+ // *************************************************************
+ // Operations for class RTCORBA::Current_var
+ // *************************************************************
+@@ -3881,7 +3901,6 @@
+     ACE_static_cast (Current **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class RTCORBA::Current_out
+ // *************************************************************
+@@ -4022,6 +4041,7 @@
+   return "IDL:omg.org/RTCORBA/Current:1.0";
+ }
+ 
++
+ // *************************************************************
+ // Operations for class RTCORBA::Mutex_var
+ // *************************************************************
+@@ -4144,7 +4164,6 @@
+     ACE_static_cast (Mutex **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class RTCORBA::Mutex_out
+ // *************************************************************
+@@ -4273,6 +4292,7 @@
+   return "IDL:omg.org/RTCORBA/Mutex:1.0";
+ }
+ 
++
+ // *************************************************************
+ // Operations for class RTCORBA::RTORB_var
+ // *************************************************************
+@@ -4395,7 +4415,6 @@
+     ACE_static_cast (RTORB **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class RTCORBA::RTORB_out
+ // *************************************************************
+@@ -4619,7 +4638,7 @@
  
  // Narrow.
  RTCORBA::RTORB::InvalidThreadpool *
@@ -42,9 +269,8 @@
  {
    if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0", exc->_id ()))
      {
-@@ -2681,3 +2700,5 @@
-   }
+@@ -5230,3 +5249,4 @@
    return 0; // error
  }
-+
+ 
 +#endif /* TAO_HAS_RT_CORBA == 1 */
diff --git a/TAO/tao/diffs/RTCORBAC.h.diff b/TAO/tao/diffs/RTCORBAC.h.diff
index 005d2108df4..27bd5df65aa 100644
--- a/TAO/tao/diffs/RTCORBAC.h.diff
+++ b/TAO/tao/diffs/RTCORBAC.h.diff
@@ -1,5 +1,13 @@
---- orig/RTCORBAC.h	Wed Mar 28 20:41:05 2001
-+++ RTCORBAC.h	Wed Mar 28 20:42:07 2001
+--- orig/RTCORBAC.h	Mon Apr 16 23:25:44 2001
++++ RTCORBAC.h	Mon Apr 16 23:34:56 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,16 +23,22 @@
  #define _TAO_IDL_ORIG_RTCORBAC_H_
  
@@ -42,7 +50,7 @@
    typedef CORBA::ULong ThreadpoolId;
    typedef CORBA::ULong_out ThreadpoolId_out;
      TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadpoolId;
-@@ -612,7 +621,8 @@
+@@ -636,7 +645,8 @@
  #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_)
  #define _RTCORBA_PROTOCOLPROPERTIES_CH_
  
@@ -52,8 +60,8 @@
    {
    public:
    #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-@@ -641,6 +651,11 @@
- 
+@@ -665,6 +675,11 @@
+     
      virtual const char* _interface_repository_id (void) const;
  
 +    // CDR Encoder/Decoder methods.
@@ -63,17 +71,17 @@
 +
    protected:
      ProtocolProperties ();
- 
-@@ -2661,7 +2676,7 @@
+     
+@@ -2773,7 +2788,7 @@
            CORBA::Environment &
          );
- 
+       
 -      static InvalidThreadpool *_downcast (CORBA::Exception *);
 +      static InvalidThreadpool *_narrow (CORBA::Exception *);
  
  
        // = TAO extension.
-@@ -2858,6 +2873,8 @@
+@@ -2968,6 +2983,8 @@
  #if defined (__BORLANDC__)
  #pragma option pop
  #endif /* __BORLANDC__ */
diff --git a/TAO/tao/diffs/RTCORBAC.i.diff b/TAO/tao/diffs/RTCORBAC.i.diff
index e69de29bb2d..3757df2b662 100644
--- a/TAO/tao/diffs/RTCORBAC.i.diff
+++ b/TAO/tao/diffs/RTCORBAC.i.diff
@@ -0,0 +1,15 @@
+--- orig/RTCORBAC.i	Mon Apr 16 23:25:44 2001
++++ RTCORBAC.i	Mon Apr 16 23:43:27 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:
+@@ -2514,4 +2514,3 @@
+   );
+ 
+ #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_I_ */
+-
diff --git a/TAO/tao/diffs/RTPortableServerC.cpp.diff b/TAO/tao/diffs/RTPortableServerC.cpp.diff
index 4d78209a4a8..12a00d94fc5 100644
--- a/TAO/tao/diffs/RTPortableServerC.cpp.diff
+++ b/TAO/tao/diffs/RTPortableServerC.cpp.diff
@@ -1,15 +1,28 @@
---- RTPortableServerC.cpp	Fri Sep 29 01:51:22 2000
-+++ ..\RTPortableServerC.cpp	Fri Sep 29 02:04:44 2000
-@@ -21,6 +21,8 @@
+--- orig/RTPortableServerC.cpp	Wed Apr 18 01:09:15 2001
++++ RTPortableServerC.cpp	Wed Apr 18 00:37: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:
+@@ -21,12 +21,7 @@
  
  #include "RTPortableServerC.h"
  
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+-#include "tao/ClientRequestInfo.h"
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
 +#if (TAO_HAS_RT_CORBA == 1)
-+
- #if !defined (__ACE_INLINE__)
- #include "RTPortableServerC.i"
- #endif /* !defined INLINE */
-@@ -112,3 +114,4 @@
+ 
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus
+@@ -306,3 +301,4 @@
    #  pragma instantiate TAO_Object_Manager<RTPortableServer::POA,RTPortableServer::POA_var>
  #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
  
diff --git a/TAO/tao/diffs/RTPortableServerC.h.diff b/TAO/tao/diffs/RTPortableServerC.h.diff
index 648465dd84b..f5e1cb3d6f5 100644
--- a/TAO/tao/diffs/RTPortableServerC.h.diff
+++ b/TAO/tao/diffs/RTPortableServerC.h.diff
@@ -1,7 +1,15 @@
---- RTPortableServerC.h	Fri Sep 29 01:51:22 2000
-+++ ..\RTPortableServerC.h	Fri Sep 29 02:04:44 2000
+--- orig/RTPortableServerC.h	Wed Apr 18 01:09:15 2001
++++ RTPortableServerC.h	Wed Apr 18 00:33:25 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,14 +23,15 @@
- #define _TAO_IDL_RTPORTABLESERVERC_H_
+ #define _TAO_IDL_ORIG_RTPORTABLESERVERC_H_
  
  #include "ace/pre.h"
 -#include "tao/corba.h"
@@ -19,19 +27,10 @@
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -125,7 +126,7 @@
- #if !defined (_RTPORTABLESERVER_POA_CH_)
- #define _RTPORTABLESERVER_POA_CH_
- 
--class TAO_PortableServer_Export POA: public virtual PortableServer::POA
-+class TAO_PortableServer_Export POA: public PortableServer::POA
-   {
-   public:
-   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-@@ -232,6 +233,8 @@
- #if defined(_MSC_VER) && (_MSC_VER >= 1200)
- #pragma warning(pop)
- #endif /* _MSC_VER */
+@@ -249,6 +250,8 @@
+ #if defined (__BORLANDC__)
+ #pragma option pop
+ #endif /* __BORLANDC__ */
 +
 +#endif /* TAO_HAS_RT_CORBA */
  
diff --git a/TAO/tao/diffs/RTPortableServerC.i.diff b/TAO/tao/diffs/RTPortableServerC.i.diff
new file mode 100644
index 00000000000..f4a40f6da82
--- /dev/null
+++ b/TAO/tao/diffs/RTPortableServerC.i.diff
@@ -0,0 +1,10 @@
+--- orig/RTPortableServerC.i	Wed Apr 18 01:09:15 2001
++++ RTPortableServerC.i	Wed Apr 18 00:34:05 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/TAOC.cpp.diff b/TAO/tao/diffs/TAOC.cpp.diff
index 46cd98c73e9..4c32c25adcc 100644
--- a/TAO/tao/diffs/TAOC.cpp.diff
+++ b/TAO/tao/diffs/TAOC.cpp.diff
@@ -1,12 +1,29 @@
---- orig/TAOC.cpp	Mon May  1 09:12:20 2000
-+++ TAOC.cpp	Mon May  1 09:11:02 2000
-@@ -9,10 +9,15 @@
+--- orig/TAOC.cpp	Tue Apr 17 23:12:54 2001
++++ TAOC.cpp	Tue Apr 17 23:12:44 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:
+@@ -21,21 +21,14 @@
  
  #include "TAOC.h"
  
-+#include "tao/TAOS.h"
+-#include "tao/Stub.h"
+-#include "tao/Invocation.h"
+-#include "tao/ClientRequestInfo.h"
+-#if TAO_HAS_INTERCEPTORS == 1
+-#include "tao/RequestInfo_Util.h"
+-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+-
+-#if defined (__BORLANDC__)
+-#pragma option -w-rvl -w-rch -w-ccc -w-aus
+-#endif /* __BORLANDC__ */
 +#include "tao/Typecode.h"
-+
+ 
  #if !defined (__ACE_INLINE__)
  #include "TAOC.i"
  #endif /* !defined INLINE */
@@ -16,30 +33,37 @@
  static const CORBA::Long _oc_TAO_PrioritySelectionMode[] =
  {
    TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -118,11 +123,11 @@
+@@ -171,6 +164,7 @@
+ TAO_NAMESPACE_BEGIN (TAO)
+ TAO_NAMESPACE_DEFINE (const CORBA::ULong, CLIENT_PRIORITY_POLICY_TYPE, 1413545984U)
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class TAO::ClientPriorityPolicy_var
+ // *************************************************************
+@@ -293,7 +287,6 @@
+     ACE_static_cast (ClientPriorityPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class TAO::ClientPriorityPolicy_out
+ // *************************************************************
+@@ -406,11 +399,11 @@
    void *retv = 0;
    if (type == ACE_reinterpret_cast
      (ptr_arith_t,
--      &ACE_NESTED_CLASS (TAO, ClientPriorityPolicy)::_narrow))
+-      &ACE_NESTED_CLASS (::TAO, ClientPriorityPolicy)::_narrow))
 +      &ClientPriorityPolicy::_narrow))
      retv = ACE_reinterpret_cast (void*, this);
    else if (type == ACE_reinterpret_cast
      (ptr_arith_t,
--      &ACE_NESTED_CLASS (CORBA, Policy)::_narrow))
+-      &::CORBA::Policy::_narrow))
 +      &CORBA::Policy::_narrow))
      retv = ACE_reinterpret_cast
        (
          void *,
-@@ -135,7 +140,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -146,6 +151,10 @@
+@@ -434,6 +427,10 @@
    return "IDL:TAO/ClientPriorityPolicy:1.0";
  }
  
@@ -50,30 +74,37 @@
  static const CORBA::Long _oc_TAO_BufferingConstraintMode[] =
  {
    TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -264,11 +273,11 @@
+@@ -592,6 +589,7 @@
+ TAO_NAMESPACE_BEGIN (TAO)
+ TAO_NAMESPACE_DEFINE (const CORBA::ULong, BUFFERING_CONSTRAINT_POLICY_TYPE, 1413545985U)
+ TAO_NAMESPACE_END
++
+ // *************************************************************
+ // Operations for class TAO::BufferingConstraintPolicy_var
+ // *************************************************************
+@@ -714,7 +712,6 @@
+     ACE_static_cast (BufferingConstraintPolicy **, src);
+   return *tmp;
+ }
+-
+ // *************************************************************
+ // Inline operations for class TAO::BufferingConstraintPolicy_out
+ // *************************************************************
+@@ -827,11 +824,11 @@
    void *retv = 0;
    if (type == ACE_reinterpret_cast
      (ptr_arith_t,
--      &ACE_NESTED_CLASS (TAO, BufferingConstraintPolicy)::_narrow))
+-      &ACE_NESTED_CLASS (::TAO, BufferingConstraintPolicy)::_narrow))
 +      &BufferingConstraintPolicy::_narrow))
      retv = ACE_reinterpret_cast (void*, this);
    else if (type == ACE_reinterpret_cast
      (ptr_arith_t,
--      &ACE_NESTED_CLASS (CORBA, Policy)::_narrow))
+-      &::CORBA::Policy::_narrow))
 +      &CORBA::Policy::_narrow))
      retv = ACE_reinterpret_cast
        (
          void *,
-@@ -281,7 +290,7 @@
-   else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
-     retv = ACE_reinterpret_cast (void *,
-       ACE_static_cast (CORBA::Object_ptr, this));
--    
-+
-   if (retv)
-     this->_add_ref ();
-   return retv;
-@@ -292,6 +301,8 @@
+@@ -855,6 +852,8 @@
    return "IDL:TAO/BufferingConstraintPolicy:1.0";
  }
  
@@ -82,31 +113,77 @@
  static const CORBA::Long _oc_TAO_SyncScope[] =
  {
    TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -329,7 +340,10 @@
+@@ -910,6 +909,9 @@
  TAO_NAMESPACE_BEGIN (TAO)
- TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_DELAYED_BUFFERING, -1)
+ TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_DELAYED_BUFFERING, -2)
  TAO_NAMESPACE_END
--void operator<<= (CORBA::Any &_tao_any, const TAO::PrioritySpecification &_tao_elem) // copying
 +
 +#if (TAO_HAS_CLIENT_PRIORITY_POLICY == 1)
 +
-+ void operator<<= (CORBA::Any &_tao_any, const TAO::PrioritySpecification &_tao_elem) // copying
+ void operator<<= (CORBA::Any &_tao_any, const TAO::PrioritySpecification &_tao_elem) // copying
  {
    TAO_OutputCDR stream;
-   stream << _tao_elem;
-@@ -410,6 +424,10 @@
+@@ -946,12 +948,14 @@
+   ACE_TRY_NEW_ENV
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+-    
+-    CORBA::Boolean result = type->equivalent (TAO::_tc_PrioritySpecification, ACE_TRY_ENV);
++    CORBA::Boolean result =
++      type->equivalent (TAO::_tc_PrioritySpecification, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      return 0; // not equivalent
++      {
++        return 0;
++      }
+     
+     if (_tao_any.any_owns_data ())
+     {
+@@ -993,12 +997,9 @@
    return 0;
  }
  
+-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+-    defined (ACE_HAS_GNU_REPO)
+-    template class TAO_Object_Manager<TAO::ClientPriorityPolicy,TAO::ClientPriorityPolicy_var>;
+-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+-  #  pragma instantiate TAO_Object_Manager<TAO::ClientPriorityPolicy,TAO::ClientPriorityPolicy_var>
+-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 +#endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */
 +
 +#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
-+
+ 
  void operator<<= (CORBA::Any &_tao_any, const TAO::BufferingConstraint &_tao_elem) // copying
  {
-   TAO_OutputCDR stream;
-@@ -491,3 +509,4 @@
+@@ -1036,12 +1037,14 @@
+   ACE_TRY_NEW_ENV
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+-    
+-    CORBA::Boolean result = type->equivalent (TAO::_tc_BufferingConstraint, ACE_TRY_ENV);
++    CORBA::Boolean result =
++      type->equivalent (TAO::_tc_BufferingConstraint, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+-      return 0; // not equivalent
++      {
++        return 0;
++      }
+     
+     if (_tao_any.any_owns_data ())
+     {
+@@ -1083,10 +1086,4 @@
    return 0;
  }
  
+-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
+-    defined (ACE_HAS_GNU_REPO)
+-    template class TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var>;
+-  #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+-  #  pragma instantiate TAO_Object_Manager<TAO::BufferingConstraintPolicy,TAO::BufferingConstraintPolicy_var>
+-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+-
 +#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
diff --git a/TAO/tao/diffs/TAOC.h.diff b/TAO/tao/diffs/TAOC.h.diff
index 3ce7d73e5c5..d473ce73082 100644
--- a/TAO/tao/diffs/TAOC.h.diff
+++ b/TAO/tao/diffs/TAOC.h.diff
@@ -1,13 +1,24 @@
---- orig/TAOC.h	Fri Aug 18 23:18:42 2000
-+++ TAOC.h	Tue Jun 27 22:47:12 2000
-@@ -1,4 +1,4 @@
--/* -*- C++ -*- $Id$ */
-+/* -*- C++ -*- $Id$ */
- 
- // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
- // TAO and the TAO IDL Compiler have been developed by the Center for
-@@ -9,17 +9,24 @@
- 
+--- orig/TAOC.h	Tue Apr 17 00:03:03 2001
++++ TAOC.h	Tue Apr 17 00:58:39 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$ Id: TAOC.h,v 1.24 2000/06/28 03:47:12 marina Exp $ */
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -19,19 +19,33 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
++// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
++// TAO and the TAO IDL Compiler have been developed by the Center for
++// Distributed Object Computing at Washington University, St. Louis.
++//
++// Information about TAO is available at:
++//                 http://www.cs.wustl.edu/~schmidt/TAO.html
++
  #ifndef _TAO_IDL_ORIG_TAOC_H_
  #define _TAO_IDL_ORIG_TAOC_H_
 -
@@ -36,7 +47,7 @@
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -42,6 +49,19 @@
+@@ -58,6 +72,19 @@
  
  TAO_NAMESPACE  TAO
  {
@@ -56,112 +67,17 @@
    typedef CORBA::Short PrioritySelectionMode;
    typedef CORBA::Short_out PrioritySelectionMode_out;
      TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrioritySelectionMode;
-@@ -54,7 +74,7 @@
- 
-   struct PrioritySpecification;
-   class PrioritySpecification_var;
--  
-+
-   struct TAO_Export PrioritySpecification
-   {
- 
-@@ -77,18 +97,18 @@
-     PrioritySpecification_var (const PrioritySpecification_var &); // copy constructor
-     PrioritySpecification_var (const PrioritySpecification &); // fixed-size types only
-     ~PrioritySpecification_var (void); // destructor
--    
-+
-     PrioritySpecification_var &operator= (PrioritySpecification *);
-     PrioritySpecification_var &operator= (const PrioritySpecification_var &);
-     PrioritySpecification_var &operator= (const PrioritySpecification &); // fixed-size types only
-     PrioritySpecification *operator-> (void);
-     const PrioritySpecification *operator-> (void) const;
--    
-+
-     operator const PrioritySpecification &() const;
-     operator PrioritySpecification &();
-     operator PrioritySpecification &() const;
--    
--    // in, inout, out, _retn 
-+
-+    // in, inout, out, _retn
-     const PrioritySpecification &in (void) const;
-     PrioritySpecification &inout (void);
-     PrioritySpecification &out (void);
-@@ -111,7 +131,7 @@
- 
-   class ClientPriorityPolicy;
-   typedef ClientPriorityPolicy *ClientPriorityPolicy_ptr;
--  
-+
- #endif /* end #if !defined */
- 
- 
-@@ -122,17 +142,17 @@
-   {
-   public:
-     ClientPriorityPolicy_var (void); // default constructor
--    ClientPriorityPolicy_var (ClientPriorityPolicy_ptr p) : ptr_ (p) {} 
-+    ClientPriorityPolicy_var (ClientPriorityPolicy_ptr);
-     ClientPriorityPolicy_var (const ClientPriorityPolicy_var &); // copy constructor
-     ~ClientPriorityPolicy_var (void); // destructor
--    
-+
-     ClientPriorityPolicy_var &operator= (ClientPriorityPolicy_ptr);
-     ClientPriorityPolicy_var &operator= (const ClientPriorityPolicy_var &);
-     ClientPriorityPolicy_ptr operator-> (void) const;
--    
-+
-     operator const ClientPriorityPolicy_ptr &() const;
-     operator ClientPriorityPolicy_ptr &();
--    // in, inout, out, _retn 
-+    // in, inout, out, _retn
-     ClientPriorityPolicy_ptr in (void) const;
-     ClientPriorityPolicy_ptr &inout (void);
-     ClientPriorityPolicy_ptr &out (void);
-@@ -165,7 +185,7 @@
-     operator ClientPriorityPolicy_ptr &();
-     ClientPriorityPolicy_ptr &ptr (void);
-     ClientPriorityPolicy_ptr operator-> (void);
--    
-+
-   private:
-     ClientPriorityPolicy_ptr &ptr_;
-   };
-@@ -189,12 +209,12 @@
-     static ClientPriorityPolicy_ptr _duplicate (ClientPriorityPolicy_ptr obj);
-     static ClientPriorityPolicy_ptr _narrow (
-         CORBA::Object_ptr obj,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
-     static ClientPriorityPolicy_ptr _unchecked_narrow (
-         CORBA::Object_ptr obj,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
-     static ClientPriorityPolicy_ptr _nil (void)
-@@ -203,7 +223,7 @@
-       }
- 
-     virtual TAO::PrioritySpecification priority_specification (
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((
-@@ -211,7 +231,7 @@
-       )) = 0;
- 
-     virtual void *_tao_QueryInterface (ptr_arith_t type);
--    
-+
+@@ -239,8 +266,7 @@
      virtual const char* _interface_repository_id (void) const;
  
    protected:
-@@ -225,6 +245,10 @@
+-    ClientPriorityPolicy ();
+-    
++    ClientPriorityPolicy (void);
+     virtual ~ClientPriorityPolicy (void);
+   private:
+     ClientPriorityPolicy (const ClientPriorityPolicy &);
+@@ -250,6 +276,10 @@
  
  #endif /* end #if !defined */
  
@@ -172,112 +88,17 @@
    typedef CORBA::UShort BufferingConstraintMode;
    typedef CORBA::UShort_out BufferingConstraintMode_out;
      TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_BufferingConstraintMode;
-@@ -239,7 +263,7 @@
- 
-   struct BufferingConstraint;
-   class BufferingConstraint_var;
--  
-+
-   struct TAO_Export BufferingConstraint
-   {
- 
-@@ -263,18 +287,18 @@
-     BufferingConstraint_var (const BufferingConstraint_var &); // copy constructor
-     BufferingConstraint_var (const BufferingConstraint &); // fixed-size types only
-     ~BufferingConstraint_var (void); // destructor
--    
-+
-     BufferingConstraint_var &operator= (BufferingConstraint *);
-     BufferingConstraint_var &operator= (const BufferingConstraint_var &);
-     BufferingConstraint_var &operator= (const BufferingConstraint &); // fixed-size types only
-     BufferingConstraint *operator-> (void);
-     const BufferingConstraint *operator-> (void) const;
--    
-+
-     operator const BufferingConstraint &() const;
-     operator BufferingConstraint &();
-     operator BufferingConstraint &() const;
--    
--    // in, inout, out, _retn 
-+
-+    // in, inout, out, _retn
-     const BufferingConstraint &in (void) const;
-     BufferingConstraint &inout (void);
-     BufferingConstraint &out (void);
-@@ -297,7 +321,7 @@
- 
-   class BufferingConstraintPolicy;
-   typedef BufferingConstraintPolicy *BufferingConstraintPolicy_ptr;
--  
-+
- #endif /* end #if !defined */
- 
- 
-@@ -308,17 +332,17 @@
-   {
-   public:
-     BufferingConstraintPolicy_var (void); // default constructor
--    BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr p) : ptr_ (p) {} 
-+    BufferingConstraintPolicy_var (BufferingConstraintPolicy_ptr);
-     BufferingConstraintPolicy_var (const BufferingConstraintPolicy_var &); // copy constructor
-     ~BufferingConstraintPolicy_var (void); // destructor
--    
-+
-     BufferingConstraintPolicy_var &operator= (BufferingConstraintPolicy_ptr);
-     BufferingConstraintPolicy_var &operator= (const BufferingConstraintPolicy_var &);
-     BufferingConstraintPolicy_ptr operator-> (void) const;
--    
-+
-     operator const BufferingConstraintPolicy_ptr &() const;
-     operator BufferingConstraintPolicy_ptr &();
--    // in, inout, out, _retn 
-+    // in, inout, out, _retn
-     BufferingConstraintPolicy_ptr in (void) const;
-     BufferingConstraintPolicy_ptr &inout (void);
-     BufferingConstraintPolicy_ptr &out (void);
-@@ -351,7 +375,7 @@
-     operator BufferingConstraintPolicy_ptr &();
-     BufferingConstraintPolicy_ptr &ptr (void);
-     BufferingConstraintPolicy_ptr operator-> (void);
--    
-+
-   private:
-     BufferingConstraintPolicy_ptr &ptr_;
-   };
-@@ -375,12 +399,12 @@
-     static BufferingConstraintPolicy_ptr _duplicate (BufferingConstraintPolicy_ptr obj);
-     static BufferingConstraintPolicy_ptr _narrow (
-         CORBA::Object_ptr obj,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
-     static BufferingConstraintPolicy_ptr _unchecked_narrow (
-         CORBA::Object_ptr obj,
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       );
-     static BufferingConstraintPolicy_ptr _nil (void)
-@@ -389,7 +413,7 @@
-       }
- 
-     virtual TAO::BufferingConstraint buffering_constraint (
--        CORBA::Environment &ACE_TRY_ENV = 
-+        CORBA::Environment &ACE_TRY_ENV =
-           TAO_default_environment ()
-       )
-       ACE_THROW_SPEC ((
-@@ -397,7 +421,7 @@
-       )) = 0;
- 
-     virtual void *_tao_QueryInterface (ptr_arith_t type);
--    
-+
+@@ -434,8 +464,7 @@
      virtual const char* _interface_repository_id (void) const;
  
    protected:
-@@ -411,6 +435,8 @@
+-    BufferingConstraintPolicy ();
+-    
++    BufferingConstraintPolicy (void);
+     virtual ~BufferingConstraintPolicy (void);
+   private:
+     BufferingConstraintPolicy (const BufferingConstraintPolicy &);
+@@ -445,6 +474,8 @@
  
  #endif /* end #if !defined */
  
@@ -286,7 +107,7 @@
    typedef CORBA::Short SyncScope;
    typedef CORBA::Short_out SyncScope_out;
      TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SyncScope;
-@@ -427,25 +453,41 @@
+@@ -461,25 +492,41 @@
  
    TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_DELAYED_BUFFERING;
  
diff --git a/TAO/tao/diffs/TAOC.i.diff b/TAO/tao/diffs/TAOC.i.diff
index 9e35578cfc5..bd722152fdc 100644
--- a/TAO/tao/diffs/TAOC.i.diff
+++ b/TAO/tao/diffs/TAOC.i.diff
@@ -1,6 +1,14 @@
---- orig/TAOC.i	Mon May  1 09:12:20 2000
-+++ TAOC.i	Mon May  1 09:10:57 2000
-@@ -11,6 +11,8 @@
+--- orig/TAOC.i	Tue Apr 17 00:03:03 2001
++++ TAOC.i	Tue Apr 17 00:13:28 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$ TAOC.i,v 1.8 2001/01/17 02:59:45 parsons Exp $ */
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -23,6 +23,8 @@
  // Inline operations for class TAO::PrioritySpecification_var
  // *************************************************************
  
@@ -9,62 +17,59 @@
  ACE_INLINE
  TAO::PrioritySpecification_var::PrioritySpecification_var (void) // default constructor
    : ptr_ (0)
-@@ -93,13 +95,13 @@
- }
- 
- ACE_INLINE
--TAO::PrioritySpecification_var::operator ::TAO::PrioritySpecification &() // cast 
-+TAO::PrioritySpecification_var::operator ::TAO::PrioritySpecification &() // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--TAO::PrioritySpecification_var::operator ::TAO::PrioritySpecification &() const // cast 
-+TAO::PrioritySpecification_var::operator ::TAO::PrioritySpecification &() const // cast
- {
-   return *this->ptr_;
- }
-@@ -116,7 +118,7 @@
-   return *this->ptr_;
- }
- 
--// mapping for fixed size 
-+// mapping for fixed size
- ACE_INLINE ::TAO::PrioritySpecification &
- TAO::PrioritySpecification_var::out (void)
- {
-@@ -197,14 +199,14 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- TAO::ClientPriorityPolicy_var::operator const ::TAO::ClientPriorityPolicy_ptr &() const // cast
- {
+@@ -75,12 +77,12 @@
+         }
+       else
+         {
+-          PrioritySpecification *deep_copy =
+-            new PrioritySpecification (*p.ptr_);
++          TAO::PrioritySpecification *deep_copy = 
++            new TAO::PrioritySpecification (*p.ptr_);
+           
+           if (deep_copy != 0)
+             {
+-              PrioritySpecification *tmp = deep_copy;
++              TAO::PrioritySpecification *tmp = deep_copy;
+               deep_copy = this->ptr_;
+               this->ptr_ = tmp;
+               delete deep_copy;
+@@ -164,7 +166,6 @@
    return this->ptr_;
  }
  
--ACE_INLINE 
--TAO::ClientPriorityPolicy_var::operator ::TAO::ClientPriorityPolicy_ptr &() // cast 
-+ACE_INLINE
-+TAO::ClientPriorityPolicy_var::operator ::TAO::ClientPriorityPolicy_ptr &() // cast
- {
-   return this->ptr_;
- }
-@@ -296,7 +298,7 @@
-   return *this;
- }
+-
+ #if !defined (_TAO_CLIENTPRIORITYPOLICY___CI_)
+ #define _TAO_CLIENTPRIORITYPOLICY___CI_
  
--ACE_INLINE 
-+ACE_INLINE
- TAO::ClientPriorityPolicy_out::operator ::TAO::ClientPriorityPolicy_ptr &() // cast
- {
-   return this->ptr_;
-@@ -317,6 +319,10 @@
+@@ -214,6 +215,35 @@
  
  #endif /* end #if !defined */
  
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO::PrioritySpecification &_tao_aggregate)
++{
++  if (
++    (strm << _tao_aggregate.mode) &&
++    (strm << _tao_aggregate.min_priority) &&
++    (strm << _tao_aggregate.max_priority)
++  )
++    return 1;
++  else
++    return 0;
++
++}
++
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::PrioritySpecification &_tao_aggregate)
++{
++  if (
++    (strm >> _tao_aggregate.mode) &&
++    (strm >> _tao_aggregate.min_priority) &&
++    (strm >> _tao_aggregate.max_priority)
++  )
++    return 1;
++  else
++    return 0;
++
++}
 +#endif /* TAO_HAS_CLIENT_PRIORITY_POLICY == 1 */
 +
 +#if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
@@ -72,91 +77,65 @@
  // *************************************************************
  // Inline operations for class TAO::BufferingConstraint_var
  // *************************************************************
-@@ -403,13 +409,13 @@
- }
- 
- ACE_INLINE
--TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() // cast 
-+TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() // cast
- {
-   return *this->ptr_;
- }
- 
- ACE_INLINE
--TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() const // cast 
-+TAO::BufferingConstraint_var::operator ::TAO::BufferingConstraint &() const // cast
- {
-   return *this->ptr_;
- }
-@@ -426,7 +432,7 @@
-   return *this->ptr_;
- }
- 
--// mapping for fixed size 
-+// mapping for fixed size
- ACE_INLINE ::TAO::BufferingConstraint &
- TAO::BufferingConstraint_var::out (void)
- {
-@@ -507,14 +513,14 @@
-   return *this;
- }
- 
--ACE_INLINE 
-+ACE_INLINE
- TAO::BufferingConstraintPolicy_var::operator const ::TAO::BufferingConstraintPolicy_ptr &() const // cast
- {
+@@ -270,12 +300,12 @@
+         }
+       else
+         {
+-          BufferingConstraint *deep_copy =
+-            new BufferingConstraint (*p.ptr_);
++          TAO::BufferingConstraint *deep_copy = 
++            new TAO::BufferingConstraint (*p.ptr_);
+           
+           if (deep_copy != 0)
+             {
+-              BufferingConstraint *tmp = deep_copy;
++              TAO::BufferingConstraint *tmp = deep_copy;
+               deep_copy = this->ptr_;
+               this->ptr_ = tmp;
+               delete deep_copy;
+@@ -359,7 +389,6 @@
    return this->ptr_;
  }
  
--ACE_INLINE 
--TAO::BufferingConstraintPolicy_var::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast 
-+ACE_INLINE
-+TAO::BufferingConstraintPolicy_var::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast
- {
-   return this->ptr_;
- }
-@@ -606,7 +612,7 @@
-   return *this;
- }
+-
+ #if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY___CI_)
+ #define _TAO_BUFFERINGCONSTRAINTPOLICY___CI_
  
--ACE_INLINE 
-+ACE_INLINE
- TAO::BufferingConstraintPolicy_out::operator ::TAO::BufferingConstraintPolicy_ptr &() // cast
- {
-   return this->ptr_;
-@@ -637,7 +643,7 @@
-     return 1;
-   else
-     return 0;
--  
-+
- }
+@@ -409,32 +438,6 @@
  
- ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::PrioritySpecification &_tao_aggregate)
-@@ -650,7 +656,7 @@
-     return 1;
-   else
-     return 0;
--  
-+
- }
+ #endif /* end #if !defined */
  
- ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO::BufferingConstraint &_tao_aggregate)
-@@ -664,7 +670,7 @@
-     return 1;
-   else
-     return 0;
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO::PrioritySpecification &_tao_aggregate)
+-{
+-  if (
+-    (strm << _tao_aggregate.mode) &&
+-    (strm << _tao_aggregate.min_priority) &&
+-    (strm << _tao_aggregate.max_priority)
+-  )
+-    return 1;
+-  else
+-    return 0;
 -  
-+
- }
- 
- ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::BufferingConstraint &_tao_aggregate)
-@@ -678,6 +684,7 @@
-     return 1;
-   else
-     return 0;
+-}
+-
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TAO::PrioritySpecification &_tao_aggregate)
+-{
+-  if (
+-    (strm >> _tao_aggregate.mode) &&
+-    (strm >> _tao_aggregate.min_priority) &&
+-    (strm >> _tao_aggregate.max_priority)
+-  )
+-    return 1;
+-  else
+-    return 0;
 -  
-+
+-}
+-
+ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO::BufferingConstraint &_tao_aggregate)
+ {
+   if (
+@@ -463,3 +466,4 @@
+   
  }
  
 +#endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */